Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions arch/arm/dts/sc59x.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -90,29 +90,29 @@
i2c3: i2c3@31001000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "adi-i2c";
compatible = "adi,twi";
reg = <0x31001000 0x100>;
clock-names = "i2c";
clock-names = "sclk0";
status = "disabled";
bootph-pre-ram;
};

i2c4: i2c4@31001100 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "adi-i2c";
compatible = "adi,twi";
reg = <0x31001100 0x100>;
clock-names = "i2c";
clock-names = "sclk0";
status = "disabled";
bootph-pre-ram;
};

i2c5: i2c5@31001200 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "adi-i2c";
compatible = "adi,twi";
reg = <0x31001200 0x100>;
clock-names = "i2c";
clock-names = "sclk0";
status = "disabled";
bootph-pre-ram;
};
Expand Down
12 changes: 6 additions & 6 deletions arch/arm/dts/sc5xx.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -139,29 +139,29 @@
i2c0: i2c0@31001400 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "adi-i2c";
compatible = "adi,twi";
reg = <0x31001400 0x100>;
clock-names = "i2c";
clock-names = "sclk0";
status = "disabled";
bootph-pre-ram;
};

i2c1: i2c1@31001500 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "adi-i2c";
compatible = "adi,twi";
reg = <0x31001500 0x100>;
clock-names = "i2c";
clock-names = "sclk0";
status = "disabled";
bootph-pre-ram;
};

i2c2: i2c2@31001600 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "adi-i2c";
compatible = "adi,twi";
reg = <0x31001600 0x100>;
clock-names = "i2c";
clock-names = "sclk0";
status = "disabled";
bootph-pre-ram;
};
Expand Down
2 changes: 1 addition & 1 deletion doc/develop/driver-model/i2c-howto.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion drivers/i2c/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions drivers/i2c/adi_i2c.c → drivers/i2c/adi_twi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 */ }
};

Expand Down
Loading