From b4ee081e5a4f8d7a2712ddbd075dde203d559c15 Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Thu, 18 Aug 2016 11:08:43 -0600 Subject: [PATCH] ARM: tegra: fix Tegra186 I2C clock name The Tegra I2C binding dictates that the clock name for the Tegra I2C clock be "div-clk" not "i2c". Fix the Tegra186 DT and I2C driver to honor this. Signed-off-by: Stephen Warren Signed-off-by: Tom Warren --- arch/arm/dts/tegra186.dtsi | 16 ++++++++-------- drivers/i2c/tegra_i2c.c | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/dts/tegra186.dtsi b/arch/arm/dts/tegra186.dtsi index d9e7f03..54ef7e3 100644 --- a/arch/arm/dts/tegra186.dtsi +++ b/arch/arm/dts/tegra186.dtsi @@ -45,7 +45,7 @@ #address-cells = <1>; #size-cells = <0>; clocks = <&bpmp TEGRA186_CLK_I2C1>; - clock-names = "i2c"; + clock-names = "div-clk"; resets = <&bpmp TEGRA186_RESET_I2C1>; reset-names = "i2c"; status = "disabled"; @@ -58,7 +58,7 @@ #address-cells = <1>; #size-cells = <0>; clocks = <&bpmp TEGRA186_CLK_I2C3>; - clock-names = "i2c"; + clock-names = "div-clk"; resets = <&bpmp TEGRA186_RESET_I2C3>; reset-names = "i2c"; status = "disabled"; @@ -71,7 +71,7 @@ #address-cells = <1>; #size-cells = <0>; clocks = <&bpmp TEGRA186_CLK_I2C4>; - clock-names = "i2c"; + clock-names = "div-clk"; resets = <&bpmp TEGRA186_RESET_I2C4>; reset-names = "i2c"; status = "disabled"; @@ -84,7 +84,7 @@ #address-cells = <1>; #size-cells = <0>; clocks = <&bpmp TEGRA186_CLK_I2C6>; - clock-names = "i2c"; + clock-names = "div-clk"; resets = <&bpmp TEGRA186_RESET_I2C6>; reset-names = "i2c"; status = "disabled"; @@ -97,7 +97,7 @@ #address-cells = <1>; #size-cells = <0>; clocks = <&bpmp TEGRA186_CLK_I2C7>; - clock-names = "i2c"; + clock-names = "div-clk"; resets = <&bpmp TEGRA186_RESET_I2C7>; reset-names = "i2c"; status = "disabled"; @@ -110,7 +110,7 @@ #address-cells = <1>; #size-cells = <0>; clocks = <&bpmp TEGRA186_CLK_I2C9>; - clock-names = "i2c"; + clock-names = "div-clk"; resets = <&bpmp TEGRA186_RESET_I2C9>; reset-names = "i2c"; status = "disabled"; @@ -166,7 +166,7 @@ #address-cells = <1>; #size-cells = <0>; clocks = <&bpmp TEGRA186_CLK_I2C2>; - clock-names = "i2c"; + clock-names = "div-clk"; resets = <&bpmp TEGRA186_RESET_I2C2>; reset-names = "i2c"; status = "disabled"; @@ -179,7 +179,7 @@ #address-cells = <1>; #size-cells = <0>; clocks = <&bpmp TEGRA186_CLK_I2C8>; - clock-names = "i2c"; + clock-names = "div-clk"; resets = <&bpmp TEGRA186_RESET_I2C8>; reset-names = "i2c"; status = "disabled"; diff --git a/drivers/i2c/tegra_i2c.c b/drivers/i2c/tegra_i2c.c index 31ba263..0dbcc5a 100644 --- a/drivers/i2c/tegra_i2c.c +++ b/drivers/i2c/tegra_i2c.c @@ -414,7 +414,7 @@ static int tegra_i2c_probe(struct udevice *dev) error("reset_get_by_name() failed: %d\n", ret); return ret; } - ret = clk_get_by_name(dev, "i2c", &i2c_bus->clk); + ret = clk_get_by_name(dev, "div-clk", &i2c_bus->clk); if (ret) { error("clk_get_by_name() failed: %d\n", ret); return ret;