4 files changed, 5 insertions, 47 deletions

diff --git a/src/soc/amd/sabrina/Kconfig b/src/soc/amd/sabrina/Kconfig
index ca7a83c5e7..2e34e3f519 100644
--- a/src/soc/amd/sabrina/Kconfig
+++ b/src/soc/amd/sabrina/Kconfig
@@ -52,6 +52,7 @@ config SOC_SPECIFIC_OPTIONS
 	select SOC_AMD_COMMON_BLOCK_GRAPHICS	# TODO: Check if this is still correct
 	select SOC_AMD_COMMON_BLOCK_HAS_ESPI	# TODO: Check if this is still correct
 	select SOC_AMD_COMMON_BLOCK_I2C		# TODO: Check if this is still correct
+	select SOC_AMD_COMMON_BLOCK_I2C_PAD_CTRL
 	select SOC_AMD_COMMON_BLOCK_IOMMU	# TODO: Check if this is still correct
 	select SOC_AMD_COMMON_BLOCK_LPC		# TODO: Check if this is still correct
 	select SOC_AMD_COMMON_BLOCK_MCAX	# TODO: Check if this is still correct
diff --git a/src/soc/amd/sabrina/chip.h b/src/soc/amd/sabrina/chip.h
index a7acb7f29f..c272f9f2dc 100644
--- a/src/soc/amd/sabrina/chip.h
+++ b/src/soc/amd/sabrina/chip.h
@@ -6,6 +6,7 @@
 #define SABRINA_CHIP_H
 
 #include <amdblocks/chip.h>
+#include <amdblocks/i2c.h>
 #include <gpio.h>
 #include <soc/i2c.h>
 #include <soc/southbridge.h>
@@ -17,7 +18,7 @@ struct soc_amd_sabrina_config {
 	struct soc_amd_common_config common_config;
 	u8 i2c_scl_reset;
 	struct dw_i2c_bus_config i2c[I2C_CTRLR_COUNT];
-	u8 i2c_pad_ctrl_rx_sel[I2C_CTRLR_COUNT];
+	struct i2c_pad_control i2c_pad[I2C_CTRLR_COUNT];
 
 	/* Enable S0iX support */
 	bool s0ix_enable;
diff --git a/src/soc/amd/sabrina/i2c.c b/src/soc/amd/sabrina/i2c.c
index 89751d5d43..88da74e224 100644
--- a/src/soc/amd/sabrina/i2c.c
+++ b/src/soc/amd/sabrina/i2c.c
@@ -2,7 +2,6 @@
 
 /* TODO: Check if this is still correct */
 
-#include <amdblocks/acpimmio.h>
 #include <amdblocks/i2c.h>
 #include <console/console.h>
 #include <soc/i2c.h>
@@ -38,24 +37,11 @@ void i2c_set_bar(unsigned int bus, uintptr_t bar)
 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();
-	uint32_t pad_ctrl;
 
-	if (bus >= ARRAY_SIZE(config->i2c_pad_ctrl_rx_sel))
+	if (bus >= ARRAY_SIZE(config->i2c_pad))
 		return;
 
-	pad_ctrl = misc_read32(MISC_I2C_PAD_CTRL(bus));
-
-	pad_ctrl &= ~I2C_PAD_CTRL_NG_MASK;
-	pad_ctrl |= I2C_PAD_CTRL_NG_NORMAL;
-
-	pad_ctrl &= ~I2C_PAD_CTRL_RX_SEL_MASK;
-	pad_ctrl |= config->i2c_pad_ctrl_rx_sel[bus];
-
-	pad_ctrl &= ~I2C_PAD_CTRL_FALLSLEW_MASK;
-	pad_ctrl |= cfg->speed == I2C_SPEED_STANDARD ?
-		I2C_PAD_CTRL_FALLSLEW_STD : I2C_PAD_CTRL_FALLSLEW_LOW;
-	pad_ctrl |= I2C_PAD_CTRL_FALLSLEW_EN;
-	misc_write32(MISC_I2C_PAD_CTRL(bus), pad_ctrl);
+	fch_i2c_pad_init(bus, cfg->speed, &config->i2c_pad[bus]);
 }
 
 const struct soc_i2c_ctrlr_info *soc_get_i2c_ctrlr_info(size_t *num_ctrlrs)
diff --git a/src/soc/amd/sabrina/include/soc/southbridge.h b/src/soc/amd/sabrina/include/soc/southbridge.h
index e85a052a3a..e755d5019c 100644
--- a/src/soc/amd/sabrina/include/soc/southbridge.h
+++ b/src/soc/amd/sabrina/include/soc/southbridge.h
@@ -113,36 +113,6 @@
 #define MISC_CLK_CNTL0			0x40 /* named MISC_CLK_CNTL1 on Picasso */
 #define   BP_X48M0_S0I3_DIS		BIT(4)
 #define   BP_X48M0_OUTPUT_EN		BIT(2) /* 1=En, unlike Hudson, Kern */
-#define MISC_I2C0_PAD_CTRL		0xd8
-#define MISC_I2C1_PAD_CTRL		0xdc
-#define MISC_I2C2_PAD_CTRL		0xe0
-#define MISC_I2C3_PAD_CTRL		0xe4
-#define MISC_I2C_PAD_CTRL(bus)		(MISC_I2C0_PAD_CTRL + 4 * (bus))
-#define   I2C_PAD_CTRL_NG_MASK		(BIT(0) | BIT(1) | BIT(2) | BIT(3))
-#define     I2C_PAD_CTRL_NG_NORMAL	0xc
-#define   I2C_PAD_CTRL_RX_SEL_MASK	(BIT(4) | BIT(5))
-#define     I2C_PAD_CTRL_RX_SHIFT	4
-#define     I2C_PAD_CTRL_RX_SEL_OFF	(0 << I2C_PAD_CTRL_RX_SHIFT)
-#define     I2C_PAD_CTRL_RX_SEL_3_3V	(1 << I2C_PAD_CTRL_RX_SHIFT)
-#define     I2C_PAD_CTRL_RX_SEL_1_8V	(3 << I2C_PAD_CTRL_RX_SHIFT)
-#define   I2C_PAD_CTRL_PULLDOWN_EN	BIT(6)
-#define   I2C_PAD_CTRL_FALLSLEW_MASK	(BIT(7) | BIT(8))
-#define     I2C_PAD_CTRL_FALLSLEW_SHIFT	7
-#define     I2C_PAD_CTRL_FALLSLEW_STD	(0 << I2C_PAD_CTRL_FALLSLEW_SHIFT)
-#define     I2C_PAD_CTRL_FALLSLEW_LOW	(1 << I2C_PAD_CTRL_FALLSLEW_SHIFT)
-#define   I2C_PAD_CTRL_FALLSLEW_EN	BIT(9)
-#define   I2C_PAD_CTRL_SPIKE_RC_EN	BIT(10)
-#define   I2C_PAD_CTRL_SPIKE_RC_SEL	BIT(11) /* 0 = 50ns, 1 = 20ns */
-#define   I2C_PAD_CTRL_CAP_DOWN		BIT(12)
-#define   I2C_PAD_CTRL_CAP_UP		BIT(13)
-#define   I2C_PAD_CTRL_RES_DOWN		BIT(14)
-#define   I2C_PAD_CTRL_RES_UP		BIT(15)
-#define   I2C_PAD_CTRL_BIAS_CRT_EN	BIT(16)
-#define   I2C_PAD_CTRL_SPARE0		BIT(17)
-#define   I2C_PAD_CTRL_SPARE1		BIT(18)
-#define   I2C_PAD_CTRL_PD_EN		BIT(19)
-#define   I2C_PAD_CTRL_COMP_SEL		BIT(20)
-#define   I2C_PAD_CTRL_RES_BIAS_EN	BIT(21)
 
 void fch_pre_init(void);
 void fch_early_init(void);