From 8fe1b458efa21ca0493b2623d124c3a25acb1aa4 Mon Sep 17 00:00:00 2001 From: Jie Zhang Date: Mon, 11 May 2026 12:17:49 -0400 Subject: [PATCH 1/2] i2c: adi: rename driver file and compatible string to match Linux Rename adi_i2c.c to adi_twi.c and update the compatible string from "adi-i2c" to "adi,twi" to match the Linux kernel driver (drivers/i2c/busses/i2c-adi-twi.c). Update DTS files, Makefile, MAINTAINERS and docs accordingly. Signed-off-by: Jie Zhang --- MAINTAINERS | 2 +- arch/arm/dts/sc59x.dtsi | 6 +++--- arch/arm/dts/sc5xx.dtsi | 6 +++--- doc/develop/driver-model/i2c-howto.rst | 2 +- drivers/i2c/Makefile | 2 +- drivers/i2c/{adi_i2c.c => adi_twi.c} | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) rename drivers/i2c/{adi_i2c.c => adi_twi.c} (99%) diff --git a/MAINTAINERS b/MAINTAINERS index 3a8eb2eb4ce9..6a7afe886445 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -638,7 +638,7 @@ F: drivers/clk/adi/ F: drivers/dma/adi_dma.c F: drivers/gpio/adp5588_gpio.c F: drivers/gpio/gpio-adi-adsp.c -F: drivers/i2c/adi_i2c.c +F: drivers/i2c/adi_twi.c F: drivers/mmc/adi_sdhci.c F: drivers/net/dwc_eth_qos_adi.c F: drivers/pinctrl/pinctrl-adi-adsp.c diff --git a/arch/arm/dts/sc59x.dtsi b/arch/arm/dts/sc59x.dtsi index 64e5a1afc539..0a1262759f38 100644 --- a/arch/arm/dts/sc59x.dtsi +++ b/arch/arm/dts/sc59x.dtsi @@ -90,7 +90,7 @@ i2c3: i2c3@31001000 { #address-cells = <1>; #size-cells = <0>; - compatible = "adi-i2c"; + compatible = "adi,twi"; reg = <0x31001000 0x100>; clock-names = "i2c"; status = "disabled"; @@ -100,7 +100,7 @@ i2c4: i2c4@31001100 { #address-cells = <1>; #size-cells = <0>; - compatible = "adi-i2c"; + compatible = "adi,twi"; reg = <0x31001100 0x100>; clock-names = "i2c"; status = "disabled"; @@ -110,7 +110,7 @@ i2c5: i2c5@31001200 { #address-cells = <1>; #size-cells = <0>; - compatible = "adi-i2c"; + compatible = "adi,twi"; reg = <0x31001200 0x100>; clock-names = "i2c"; status = "disabled"; diff --git a/arch/arm/dts/sc5xx.dtsi b/arch/arm/dts/sc5xx.dtsi index b821deddda77..252f066e6b58 100644 --- a/arch/arm/dts/sc5xx.dtsi +++ b/arch/arm/dts/sc5xx.dtsi @@ -139,7 +139,7 @@ i2c0: i2c0@31001400 { #address-cells = <1>; #size-cells = <0>; - compatible = "adi-i2c"; + compatible = "adi,twi"; reg = <0x31001400 0x100>; clock-names = "i2c"; status = "disabled"; @@ -149,7 +149,7 @@ i2c1: i2c1@31001500 { #address-cells = <1>; #size-cells = <0>; - compatible = "adi-i2c"; + compatible = "adi,twi"; reg = <0x31001500 0x100>; clock-names = "i2c"; status = "disabled"; @@ -159,7 +159,7 @@ i2c2: i2c2@31001600 { #address-cells = <1>; #size-cells = <0>; - compatible = "adi-i2c"; + compatible = "adi,twi"; reg = <0x31001600 0x100>; clock-names = "i2c"; status = "disabled"; diff --git a/doc/develop/driver-model/i2c-howto.rst b/doc/develop/driver-model/i2c-howto.rst index 27e7440cd460..3cafebd58cb7 100644 --- a/doc/develop/driver-model/i2c-howto.rst +++ b/doc/develop/driver-model/i2c-howto.rst @@ -6,7 +6,7 @@ How to port an I2C driver to driver model Over half of the I2C drivers have been converted as at November 2016. These ones remain: - * adi_i2c + * adi_twi * davinci_i2c * fti2c010 * ihs_i2c diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile index 42326db85f60..906acae74131 100644 --- a/drivers/i2c/Makefile +++ b/drivers/i2c/Makefile @@ -11,7 +11,7 @@ obj-$(CONFIG_$(PHASE_)I2C_CROS_EC_TUNNEL) += cros_ec_tunnel.o obj-$(CONFIG_$(PHASE_)I2C_CROS_EC_LDO) += cros_ec_ldo.o obj-$(CONFIG_$(PHASE_)SYS_I2C_LEGACY) += i2c_core.o -obj-$(CONFIG_SYS_I2C_ADI) += adi_i2c.o +obj-$(CONFIG_SYS_I2C_ADI) += adi_twi.o obj-$(CONFIG_SYS_I2C_ASPEED) += ast_i2c.o obj-$(CONFIG_SYS_I2C_AST2600) += ast2600_i2c.o obj-$(CONFIG_SYS_I2C_AT91) += at91_i2c.o diff --git a/drivers/i2c/adi_i2c.c b/drivers/i2c/adi_twi.c similarity index 99% rename from drivers/i2c/adi_i2c.c rename to drivers/i2c/adi_twi.c index c80a1517b5f8..d24e3305ce9a 100644 --- a/drivers/i2c/adi_i2c.c +++ b/drivers/i2c/adi_twi.c @@ -368,7 +368,7 @@ static const struct dm_i2c_ops adi_i2c_ops = { }; static const struct udevice_id adi_i2c_ids[] = { - { .compatible = "adi-i2c", }, + { .compatible = "adi,twi", }, { /* sentinel */ } }; From 2cc02ef84c4e60744f345f9783ba2adafc4b314e Mon Sep 17 00:00:00 2001 From: Jie Zhang Date: Mon, 11 May 2026 13:26:34 -0400 Subject: [PATCH 2/2] i2c: adi: rename clock-names from i2c to sclk0 Use sclk0 instead of i2c as clock-names for i2c to match linux kernel. Update the driver and dts files accordingly. Signed-off-by: Jie Zhang --- arch/arm/dts/sc59x.dtsi | 6 +++--- arch/arm/dts/sc5xx.dtsi | 6 +++--- drivers/i2c/adi_twi.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/dts/sc59x.dtsi b/arch/arm/dts/sc59x.dtsi index 0a1262759f38..057c8066a1ac 100644 --- a/arch/arm/dts/sc59x.dtsi +++ b/arch/arm/dts/sc59x.dtsi @@ -92,7 +92,7 @@ #size-cells = <0>; compatible = "adi,twi"; reg = <0x31001000 0x100>; - clock-names = "i2c"; + clock-names = "sclk0"; status = "disabled"; bootph-pre-ram; }; @@ -102,7 +102,7 @@ #size-cells = <0>; compatible = "adi,twi"; reg = <0x31001100 0x100>; - clock-names = "i2c"; + clock-names = "sclk0"; status = "disabled"; bootph-pre-ram; }; @@ -112,7 +112,7 @@ #size-cells = <0>; compatible = "adi,twi"; reg = <0x31001200 0x100>; - clock-names = "i2c"; + clock-names = "sclk0"; status = "disabled"; bootph-pre-ram; }; diff --git a/arch/arm/dts/sc5xx.dtsi b/arch/arm/dts/sc5xx.dtsi index 252f066e6b58..c83235b21b2b 100644 --- a/arch/arm/dts/sc5xx.dtsi +++ b/arch/arm/dts/sc5xx.dtsi @@ -141,7 +141,7 @@ #size-cells = <0>; compatible = "adi,twi"; reg = <0x31001400 0x100>; - clock-names = "i2c"; + clock-names = "sclk0"; status = "disabled"; bootph-pre-ram; }; @@ -151,7 +151,7 @@ #size-cells = <0>; compatible = "adi,twi"; reg = <0x31001500 0x100>; - clock-names = "i2c"; + clock-names = "sclk0"; status = "disabled"; bootph-pre-ram; }; @@ -161,7 +161,7 @@ #size-cells = <0>; compatible = "adi,twi"; reg = <0x31001600 0x100>; - clock-names = "i2c"; + clock-names = "sclk0"; status = "disabled"; bootph-pre-ram; }; diff --git a/drivers/i2c/adi_twi.c b/drivers/i2c/adi_twi.c index d24e3305ce9a..515187221f32 100644 --- a/drivers/i2c/adi_twi.c +++ b/drivers/i2c/adi_twi.c @@ -297,7 +297,7 @@ static int adi_i2c_of_to_plat(struct udevice *bus) dev->speed = dev_read_u32_default(bus, "clock-frequency", I2C_SPEED_FAST_RATE); - ret = clk_get_by_name(bus, "i2c", &clock); + ret = clk_get_by_name(bus, "sclk0", &clock); if (ret < 0) printf("%s: Can't get I2C clk: %d\n", __func__, ret); else