clk: tegra: Fix cdev1 and cdev2 IDs
PATCH 1/1 clk: tegra: Fix cdev1 and cdev2 IDs
From: Prashant Gaikwad <[email protected]>
Correct IDs for cdev1 and cdev2 are 94 and 93 respectively.
---
I split this patch in two when applying it. Reposting just so everyone can see exactly what I applied. This is the patch from Tegra's for-3.10/clk branch.
Documentation/devicetree/bindings/clock/nvidia,tegra20-car.txt | 4 ++-- drivers/clk/tegra/clk-tegra20.c | 2 +- drivers/clk/tegra/clk-tegra30.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/clock/nvidia,tegra20-car.txt +2 -2
@@ -120,8 +120,8 @@ Required properties : 90 clk_d 91 unassigned 92 sus - 93 cdev1 - 94 cdev2 + 93 cdev2 + 94 cdev1 95 unassigned 96 uart2
drivers/clk/tegra/clk-tegra20.c +1 -1
@@ -236,7 +236,7 @@ enum tegra20_clk { dvc, dsi, mipi =50 , hdmi, csi, tvdac, i2c2, uartc, emc =57 , usb2, usb3, mpe, vde, bsea, bsev, speedo, uartd, uarte, i2c3, sbc4, sdmmc3, pex, owr, afi, csite, pcie_xclk, avpucq =75 , la, irama =84 , iramb, - iramc, iramd, cram2, audio_2x, clk_d, csus =92 , cdev1, cdev2, + iramc, iramd, cram2, audio_2x, clk_d, csus =92 , cdev2, cdev1, uartb =96 , vfir, spdif_in, spdif_out, vi, vi_sensor, tvo, cve, osc, clk_32k, clk_m, sclk, cclk, hclk, pclk, blink, pll_a, pll_a_out0, pll_c, pll_c_out1, pll_d, pll_d_out0, pll_e, pll_m, pll_m_out1,
drivers/clk/tegra/clk-tegra30.c +1 -1
@@ -330,7 +330,7 @@ enum tegra30_clk { usb3, mpe, vde, bsea, bsev, speedo, uartd, uarte, i2c3, sbc4, sdmmc3, pcie, owr, afi, csite, pciex, avpucq, la, dtv =79 , ndspeed, i2cslow, dsib, irama =84 , iramb, iramc, iramd, cram2, audio_2x =90 , csus =92 , - cdev1, cdev2, cpu_g =96 , cpu_lp, gr3d2, mselect, tsensor, i2s3, i2s4, + cdev2, cdev1, cpu_g =96 , cpu_lp, gr3d2, mselect, tsensor, i2s3, i2s4, i2c4, sbc5, sbc6, d_audio, apbif, dam0, dam1, dam2, hda2codec_2x, atomics, audio0_2x, audio1_2x, audio2_2x, audio3_2x, audio4_2x, spdif_2x, actmon, extern1, extern2, extern3, sata_oob, sata, hda,
Signature · 1 line
1.7.10.4
PATCH 1/1 clk: tegra: Fix cdev1 and cdev2 IDs
From: Prashant Gaikwad <[email protected]>
Correct IDs for cdev1 and cdev2 are 94 and 93 respectively.
---
I split this patch in two when applying it. Reposting just so everyone can see exactly what I applied. This is the patch from Tegra's for-3.10/dt branch.
arch/arm/boot/dts/tegra20-colibri-512.dtsi | 2 +- arch/arm/boot/dts/tegra20-harmony.dts | 2 +- arch/arm/boot/dts/tegra20-medcom-wide.dts | 2 +- arch/arm/boot/dts/tegra20-paz00.dts | 2 +- arch/arm/boot/dts/tegra20-plutux.dts | 2 +- arch/arm/boot/dts/tegra20-seaboard.dts | 2 +- arch/arm/boot/dts/tegra20-tec.dts | 2 +- arch/arm/boot/dts/tegra20-trimslice.dts | 2 +- arch/arm/boot/dts/tegra20-ventana.dts | 2 +- arch/arm/boot/dts/tegra20-whistler.dts | 2 +- arch/arm/boot/dts/tegra20.dtsi | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-)
arch/arm/boot/dts/tegra20-colibri-512.dtsi +1 -1
@@ -483,7 +483,7 @@ nvidia,ac97-controller = <&ac97>; - clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>; + clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>; clock-names = "pll_a", "pll_a_out0", "mclk"; };
arch/arm/boot/dts/tegra20-harmony.dts +1 -1
@@ -687,7 +687,7 @@ nvidia,int-mic-en-gpios = <&gpio 184 0>; /*gpio PX0 */ nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */ - clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>; + clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>; clock-names = "pll_a", "pll_a_out0", "mclk"; }; };
arch/arm/boot/dts/tegra20-medcom-wide.dts +1 -1
@@ -59,7 +59,7 @@ nvidia,spkr-en-gpios = <&wm8903 2 0>; nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */ - clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>; + clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>; clock-names = "pll_a", "pll_a_out0", "mclk"; }; };
arch/arm/boot/dts/tegra20-paz00.dts +1 -1
@@ -522,7 +522,7 @@ nvidia,i2s-controller = <&tegra_i2s1>; nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */ - clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>; + clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>; clock-names = "pll_a", "pll_a_out0", "mclk"; }; };
arch/arm/boot/dts/tegra20-plutux.dts +1 -1
@@ -53,7 +53,7 @@ nvidia,spkr-en-gpios = <&wm8903 2 0>; nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */ - clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>; + clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>; clock-names = "pll_a", "pll_a_out0", "mclk"; }; };
arch/arm/boot/dts/tegra20-seaboard.dts +1 -1
@@ -830,7 +830,7 @@ nvidia,spkr-en-gpios = <&wm8903 2 0>; nvidia,hp-det-gpios = <&gpio 185 0>; /* gpio PX1 */ - clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>; + clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>; clock-names = "pll_a", "pll_a_out0", "mclk"; }; };
arch/arm/boot/dts/tegra20-tec.dts +1 -1
@@ -53,7 +53,7 @@ nvidia,spkr-en-gpios = <&wm8903 2 0>; nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */ - clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>; + clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>; clock-names = "pll_a", "pll_a_out0", "mclk"; }; };
arch/arm/boot/dts/tegra20-trimslice.dts +1 -1
@@ -397,7 +397,7 @@ nvidia,i2s-controller = <&tegra_i2s1>; nvidia,audio-codec = <&codec>; - clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>; + clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>; clock-names = "pll_a", "pll_a_out0", "mclk"; }; };
arch/arm/boot/dts/tegra20-ventana.dts +1 -1
@@ -640,7 +640,7 @@ nvidia,int-mic-en-gpios = <&gpio 184 0>; /* gpio PX0 */ nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */ - clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>; + clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>; clock-names = "pll_a", "pll_a_out0", "mclk"; }; };
arch/arm/boot/dts/tegra20-whistler.dts +1 -1
@@ -584,7 +584,7 @@ nvidia,i2s-controller = <&tegra_i2s1>; nvidia,audio-codec = <&codec>; - clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>; + clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>; clock-names = "pll_a", "pll_a_out0", "mclk"; }; };
arch/arm/boot/dts/tegra20.dtsi +1 -1
@@ -478,7 +478,7 @@ compatible = "nvidia,tegra20-usb-phy"; reg = <0xc5004400 0x3c00>; phy_type = "ulpi"; - clocks = <&tegra_car 94>, <&tegra_car 127>; + clocks = <&tegra_car 93>, <&tegra_car 127>; clock-names = "phy", "pll_u"; };
Signature · 1 line
1.7.10.4
PATCH 1/1 clk: tegra: Fix cdev1 and cdev2 IDs
In reply to Stephen WarrenQuoting Stephen Warren (2013-04-04 16:26:58)
Quoted 7 lines
From: Prashant Gaikwad <[email protected]>
Correct IDs for cdev1 and cdev2 are 94 and 93 respectively.
Signed-off-by Prashant Gaikwad <[email protected]>[swarren: split into separate driver and device-tree patches]Signed-off-by Stephen Warren <[email protected]>
Quoted 53 lines
---
I split this patch in two when applying it. Reposting just so everyone can see exactly what I applied. This is the patch from Tegra's for-3.10/clk branch.Documentation/devicetree/bindings/clock/nvidia,tegra20-car.txt | 4 ++-- drivers/clk/tegra/clk-tegra20.c | 2 +- drivers/clk/tegra/clk-tegra30.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)Documentation/devicetree/bindings/clock/nvidia,tegra20-car.txt +2
-2@@ -120,8 +120,8 @@ Required properties : 90 clk_d 91 unassigned 92 sus - 93 cdev1 - 94 cdev2 + 93 cdev2 + 94 cdev1 95 unassigned 96 uart2drivers/clk/tegra/clk-tegra20.c +1
-1@@ -236,7 +236,7 @@ enum tegra20_clk { dvc, dsi, mipi =50 , hdmi, csi, tvdac, i2c2, uartc, emc =57 , usb2, usb3, mpe, vde, bsea, bsev, speedo, uartd, uarte, i2c3, sbc4, sdmmc3, pex, owr, afi, csite, pcie_xclk, avpucq =75 , la, irama =84 , iramb, - iramc, iramd, cram2, audio_2x, clk_d, csus =92 , cdev1, cdev2, + iramc, iramd, cram2, audio_2x, clk_d, csus =92 , cdev2, cdev1, uartb =96 , vfir, spdif_in, spdif_out, vi, vi_sensor, tvo, cve, osc, clk_32k, clk_m, sclk, cclk, hclk, pclk, blink, pll_a, pll_a_out0, pll_c, pll_c_out1, pll_d, pll_d_out0, pll_e, pll_m, pll_m_out1,drivers/clk/tegra/clk-tegra30.c +1
-1@@ -330,7 +330,7 @@ enum tegra30_clk { usb3, mpe, vde, bsea, bsev, speedo, uartd, uarte, i2c3, sbc4, sdmmc3, pcie, owr, afi, csite, pciex, avpucq, la, dtv =79 , ndspeed, i2cslow, dsib, irama =84 , iramb, iramc, iramd, cram2, audio_2x =90 , csus =92 , - cdev1, cdev2, cpu_g =96 , cpu_lp, gr3d2, mselect, tsensor, i2s3, i2s4, + cdev2, cdev1, cpu_g =96 , cpu_lp, gr3d2, mselect, tsensor, i2s3, i2s4, i2c4, sbc5, sbc6, d_audio, apbif, dam0, dam1, dam2, hda2codec_2x, atomics, audio0_2x, audio1_2x, audio2_2x, audio3_2x, audio4_2x, spdif_2x, actmon, extern1, extern2, extern3, sata_oob, sata, hda,Signature · 1 line
1.7.10.4