[U-Boot] [PATCH 1/2] ARM: tegra: fix Tegra186 I2C clock name
From: Stephen Warren swarren@nvidia.com
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 --- 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 d9e7f0351f57..54ef7e3e4adc 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 31ba263b7295..0dbcc5a1cfea 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;
From: Stephen Warren swarren@nvidia.com
The Tegra SDHCI binding dictates that the reseet name for the Tegra SDHCI clock be "sdhci" not "sdmmc", and that the clock is accessed by index rather than by name. Fix the Tegra186 DT and MMC driver to honor this.
Signed-off-by: Stephen Warren swarren@nvidia.com --- arch/arm/dts/tegra186.dtsi | 6 ++---- drivers/mmc/tegra_mmc.c | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/arch/arm/dts/tegra186.dtsi b/arch/arm/dts/tegra186.dtsi index 54ef7e3e4adc..65ff4246c01e 100644 --- a/arch/arm/dts/tegra186.dtsi +++ b/arch/arm/dts/tegra186.dtsi @@ -120,9 +120,8 @@ compatible = "nvidia,tegra186-sdhci"; reg = <0x0 0x03400000 0x0 0x200>; resets = <&bpmp TEGRA186_RESET_SDMMC1>; - reset-names = "sdmmc"; + reset-names = "sdhci"; clocks = <&bpmp TEGRA186_CLK_SDMMC1>; - clock-names = "sdmmc"; interrupts = <GIC_SPI 62 0x04>; status = "disabled"; }; @@ -131,9 +130,8 @@ compatible = "nvidia,tegra186-sdhci"; reg = <0x0 0x03460000 0x0 0x200>; resets = <&bpmp TEGRA186_RESET_SDMMC4>; - reset-names = "sdmmc"; + reset-names = "sdhci"; clocks = <&bpmp TEGRA186_CLK_SDMMC4>; - clock-names = "sdmmc"; interrupts = <GIC_SPI 31 0x04>; status = "disabled"; }; diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c index f0a39a63c641..3d0845e31735 100644 --- a/drivers/mmc/tegra_mmc.c +++ b/drivers/mmc/tegra_mmc.c @@ -648,12 +648,12 @@ static int mmc_get_config(const void *blob, int node, struct mmc_host *host, struct udevice dev; int ret; dev.of_offset = node; - ret = reset_get_by_name(&dev, "sdmmc", &host->reset_ctl); + ret = reset_get_by_name(&dev, "sdhci", &host->reset_ctl); if (ret) { - debug("reset_get_by_index() failed: %d\n", ret); + debug("reset_get_by_name() failed: %d\n", ret); return ret; } - ret = clk_get_by_name(&dev, "sdmmc", &host->clk); + ret = clk_get_by_index(&dev, 0, &host->clk); if (ret) { debug("clk_get_by_index() failed: %d\n", ret); return ret;
On 18 August 2016 at 11:08, Stephen Warren swarren@wwwdotorg.org wrote:
From: Stephen Warren swarren@nvidia.com
The Tegra SDHCI binding dictates that the reseet name for the Tegra SDHCI clock be "sdhci" not "sdmmc", and that the clock is accessed by index rather than by name. Fix the Tegra186 DT and MMC driver to honor this.
Signed-off-by: Stephen Warren swarren@nvidia.com
arch/arm/dts/tegra186.dtsi | 6 ++---- drivers/mmc/tegra_mmc.c | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
On 18 August 2016 at 11:08, Stephen Warren swarren@wwwdotorg.org wrote:
From: Stephen Warren swarren@nvidia.com
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
arch/arm/dts/tegra186.dtsi | 16 ++++++++-------- drivers/i2c/tegra_i2c.c | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
participants (2)
-
Simon Glass -
Stephen Warren