Felix Held submitted this change.

View Change

soc/amd/*/i2c: drop unused mainboard_i2c_override

No mainboard in the current tree implements mainboard_i2c_override. In a
follow-up commit the i2c_pad_control struct is introduced to be able to
make more parameters controllable by devicetree settings in the future.

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: I8f9ed5d50d26e4623dc5888cc8af090fdd00fc03
Reviewed-on: https://review.coreboot.org/c/coreboot/+/61566
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
M src/soc/amd/cezanne/i2c.c
M src/soc/amd/cezanne/include/soc/southbridge.h
M src/soc/amd/picasso/i2c.c
M src/soc/amd/picasso/include/soc/southbridge.h
M src/soc/amd/sabrina/i2c.c
M src/soc/amd/sabrina/include/soc/southbridge.h
6 files changed, 0 insertions(+), 20 deletions(-)

diff --git a/src/soc/amd/cezanne/i2c.c b/src/soc/amd/cezanne/i2c.c
index 008b261..153fa7c 100644
--- a/src/soc/amd/cezanne/i2c.c
+++ b/src/soc/amd/cezanne/i2c.c
@@ -33,8 +33,6 @@
 }
 #endif
 
-__weak void mainboard_i2c_override(int bus, uint32_t *pad_settings) { }
-
 void soc_i2c_misc_init(unsigned int bus, const struct dw_i2c_bus_config *cfg)
 {
 	const struct soc_amd_cezanne_config *config = config_of_soc();
@@ -57,8 +55,6 @@
 	pad_ctrl |= cfg->speed == I2C_SPEED_STANDARD ?
 		I2C_PAD_CTRL_FALLSLEW_STD : I2C_PAD_CTRL_FALLSLEW_LOW;
 	pad_ctrl |= I2C_PAD_CTRL_FALLSLEW_EN;
-
-	mainboard_i2c_override(bus, &pad_ctrl);
 	misc_write32(misc_reg, pad_ctrl);
 }
 
diff --git a/src/soc/amd/cezanne/include/soc/southbridge.h b/src/soc/amd/cezanne/include/soc/southbridge.h
index 4f372ad..113395e 100644
--- a/src/soc/amd/cezanne/include/soc/southbridge.h
+++ b/src/soc/amd/cezanne/include/soc/southbridge.h
@@ -147,7 +147,4 @@
 void enable_aoac_devices(void);
 void wait_for_aoac_enabled(unsigned int dev);
 
-/* Allow the board to change the default I2C pad configuration */
-void mainboard_i2c_override(int bus, uint32_t *pad_settings);
-
 #endif /* AMD_CEZANNE_SOUTHBRIDGE_H */
diff --git a/src/soc/amd/picasso/i2c.c b/src/soc/amd/picasso/i2c.c
index 18660f6..925a832 100644
--- a/src/soc/amd/picasso/i2c.c
+++ b/src/soc/amd/picasso/i2c.c
@@ -38,8 +38,6 @@
 }
 #endif
 
-__weak void mainboard_i2c_override(int bus, uint32_t *pad_settings) { }
-
 void soc_i2c_misc_init(unsigned int bus, const struct dw_i2c_bus_config *cfg)
 {
 	uint32_t pad_ctrl;
@@ -59,7 +57,6 @@
 		I2C_PAD_CTRL_FALLSLEW_STD : I2C_PAD_CTRL_FALLSLEW_LOW;
 	pad_ctrl |= I2C_PAD_CTRL_FALLSLEW_EN;
 
-	mainboard_i2c_override(bus, &pad_ctrl);
 	misc_write32(misc_reg, pad_ctrl);
 }
 
diff --git a/src/soc/amd/picasso/include/soc/southbridge.h b/src/soc/amd/picasso/include/soc/southbridge.h
index 2936600..d439e92 100644
--- a/src/soc/amd/picasso/include/soc/southbridge.h
+++ b/src/soc/amd/picasso/include/soc/southbridge.h
@@ -136,7 +136,4 @@
 void enable_aoac_devices(void);
 void wait_for_aoac_enabled(unsigned int dev);
 
-/* Allow the board to change the default I2C pad configuration */
-void mainboard_i2c_override(int bus, uint32_t *pad_settings);
-
 #endif /* AMD_PICASSO_SOUTHBRIDGE_H */
diff --git a/src/soc/amd/sabrina/i2c.c b/src/soc/amd/sabrina/i2c.c
index 2030f40..f3eaf4e 100644
--- a/src/soc/amd/sabrina/i2c.c
+++ b/src/soc/amd/sabrina/i2c.c
@@ -35,8 +35,6 @@
 }
 #endif
 
-__weak void mainboard_i2c_override(int bus, uint32_t *pad_settings) { }
-
 void soc_i2c_misc_init(unsigned int bus, const struct dw_i2c_bus_config *cfg)
 {
 	const struct soc_amd_sabrina_config *config = config_of_soc();
@@ -59,8 +57,6 @@
 	pad_ctrl |= cfg->speed == I2C_SPEED_STANDARD ?
 		I2C_PAD_CTRL_FALLSLEW_STD : I2C_PAD_CTRL_FALLSLEW_LOW;
 	pad_ctrl |= I2C_PAD_CTRL_FALLSLEW_EN;
-
-	mainboard_i2c_override(bus, &pad_ctrl);
 	misc_write32(misc_reg, pad_ctrl);
 }
 
diff --git a/src/soc/amd/sabrina/include/soc/southbridge.h b/src/soc/amd/sabrina/include/soc/southbridge.h
index 4b25c5e..7b5644b 100644
--- a/src/soc/amd/sabrina/include/soc/southbridge.h
+++ b/src/soc/amd/sabrina/include/soc/southbridge.h
@@ -151,7 +151,4 @@
 void enable_aoac_devices(void);
 void wait_for_aoac_enabled(unsigned int dev);
 
-/* Allow the board to change the default I2C pad configuration */
-void mainboard_i2c_override(int bus, uint32_t *pad_settings);
-
 #endif /* AMD_SABRINA_SOUTHBRIDGE_H */

To view, visit change 61566. To unsubscribe, or for help writing mail filters, visit settings.