GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-30 19:11:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ARM: tegra: fix Tegra186 I2C clock name

Browse source 
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 <swarren@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
This commit is contained in:
Stephen Warren 2016-08-18 11:08:43 -06:00 • committed by Tom Warren
parent 46fe9eb088
commit b4ee081e5a
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
arch/arm/dts/tegra186.dtsi
View file

@ -45,7 +45,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
clocks = <&bpmp TEGRA186_CLK_I2C1>; clocks = <&bpmp TEGRA186_CLK_I2C1>;
clock-names = "i2c"; clock-names = "div-clk";
resets = <&bpmp TEGRA186_RESET_I2C1>; resets = <&bpmp TEGRA186_RESET_I2C1>;
reset-names = "i2c"; reset-names = "i2c";
status = "disabled"; status = "disabled";
@ -58,7 +58,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
clocks = <&bpmp TEGRA186_CLK_I2C3>; clocks = <&bpmp TEGRA186_CLK_I2C3>;
clock-names = "i2c"; clock-names = "div-clk";
resets = <&bpmp TEGRA186_RESET_I2C3>; resets = <&bpmp TEGRA186_RESET_I2C3>;
reset-names = "i2c"; reset-names = "i2c";
status = "disabled"; status = "disabled";
@ -71,7 +71,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
clocks = <&bpmp TEGRA186_CLK_I2C4>; clocks = <&bpmp TEGRA186_CLK_I2C4>;
clock-names = "i2c"; clock-names = "div-clk";
resets = <&bpmp TEGRA186_RESET_I2C4>; resets = <&bpmp TEGRA186_RESET_I2C4>;
reset-names = "i2c"; reset-names = "i2c";
status = "disabled"; status = "disabled";
@ -84,7 +84,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
clocks = <&bpmp TEGRA186_CLK_I2C6>; clocks = <&bpmp TEGRA186_CLK_I2C6>;
clock-names = "i2c"; clock-names = "div-clk";
resets = <&bpmp TEGRA186_RESET_I2C6>; resets = <&bpmp TEGRA186_RESET_I2C6>;
reset-names = "i2c"; reset-names = "i2c";
status = "disabled"; status = "disabled";
@ -97,7 +97,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
clocks = <&bpmp TEGRA186_CLK_I2C7>; clocks = <&bpmp TEGRA186_CLK_I2C7>;
clock-names = "i2c"; clock-names = "div-clk";
resets = <&bpmp TEGRA186_RESET_I2C7>; resets = <&bpmp TEGRA186_RESET_I2C7>;
reset-names = "i2c"; reset-names = "i2c";
status = "disabled"; status = "disabled";
@ -110,7 +110,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
clocks = <&bpmp TEGRA186_CLK_I2C9>; clocks = <&bpmp TEGRA186_CLK_I2C9>;
clock-names = "i2c"; clock-names = "div-clk";
resets = <&bpmp TEGRA186_RESET_I2C9>; resets = <&bpmp TEGRA186_RESET_I2C9>;
reset-names = "i2c"; reset-names = "i2c";
status = "disabled"; status = "disabled";
@ -166,7 +166,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
clocks = <&bpmp TEGRA186_CLK_I2C2>; clocks = <&bpmp TEGRA186_CLK_I2C2>;
clock-names = "i2c"; clock-names = "div-clk";
resets = <&bpmp TEGRA186_RESET_I2C2>; resets = <&bpmp TEGRA186_RESET_I2C2>;
reset-names = "i2c"; reset-names = "i2c";
status = "disabled"; status = "disabled";
@ -179,7 +179,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
clocks = <&bpmp TEGRA186_CLK_I2C8>; clocks = <&bpmp TEGRA186_CLK_I2C8>;
clock-names = "i2c"; clock-names = "div-clk";
resets = <&bpmp TEGRA186_RESET_I2C8>; resets = <&bpmp TEGRA186_RESET_I2C8>;
reset-names = "i2c"; reset-names = "i2c";
status = "disabled"; status = "disabled";

2
drivers/i2c/tegra_i2c.c
View file

@ -414,7 +414,7 @@ static int tegra_i2c_probe(struct udevice *dev)
error("reset_get_by_name() failed: %d\n", ret); error("reset_get_by_name() failed: %d\n", ret);
return 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) { if (ret) {
error("clk_get_by_name() failed: %d\n", ret); error("clk_get_by_name() failed: %d\n", ret);
return ret; return ret;