diff options
| author | Stephen Warren <swarren@nvidia.com> | 2013-11-07 12:59:42 -0500 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2013-12-11 18:44:55 -0500 |
| commit | 2bd541ffaab3609fbd79c80aded1960fb5bddf03 (patch) | |
| tree | 0dc9490245105a89c6691d3cd5e38f799e62483a | |
| parent | 75606f5d32fabef51c1337eac274492c0470d774 (diff) | |
ARM: tegra: remove legacy clock entries from DT
Now that all Tegra drivers have been converted to use the common reset
framework, we can remove all the legacy DT clocks/clock-names entries for
"clocks" that were only used with the old custom Tegra module reset API.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
| -rw-r--r-- | arch/arm/boot/dts/tegra114.dtsi | 17 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra20.dtsi | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra30.dtsi | 18 |
3 files changed, 6 insertions, 32 deletions
diff --git a/arch/arm/boot/dts/tegra114.dtsi b/arch/arm/boot/dts/tegra114.dtsi index b4f2e62909a7..d0da8b7aa4df 100644 --- a/arch/arm/boot/dts/tegra114.dtsi +++ b/arch/arm/boot/dts/tegra114.dtsi | |||
| @@ -406,21 +406,8 @@ | |||
| 406 | <&apbdma 12>, <&apbdma 13>, <&apbdma 14>, | 406 | <&apbdma 12>, <&apbdma 13>, <&apbdma 14>, |
| 407 | <&apbdma 29>; | 407 | <&apbdma 29>; |
| 408 | clocks = <&tegra_car TEGRA114_CLK_D_AUDIO>, | 408 | clocks = <&tegra_car TEGRA114_CLK_D_AUDIO>, |
| 409 | <&tegra_car TEGRA114_CLK_APBIF>, | 409 | <&tegra_car TEGRA114_CLK_APBIF>; |
| 410 | <&tegra_car TEGRA114_CLK_I2S0>, | 410 | clock-names = "d_audio", "apbif"; |
| 411 | <&tegra_car TEGRA114_CLK_I2S1>, | ||
| 412 | <&tegra_car TEGRA114_CLK_I2S2>, | ||
| 413 | <&tegra_car TEGRA114_CLK_I2S3>, | ||
| 414 | <&tegra_car TEGRA114_CLK_I2S4>, | ||
| 415 | <&tegra_car TEGRA114_CLK_DAM0>, | ||
| 416 | <&tegra_car TEGRA114_CLK_DAM1>, | ||
| 417 | <&tegra_car TEGRA114_CLK_DAM2>, | ||
| 418 | <&tegra_car TEGRA114_CLK_SPDIF_IN>, | ||
| 419 | <&tegra_car TEGRA114_CLK_AMX>, | ||
| 420 | <&tegra_car TEGRA114_CLK_ADX>; | ||
| 421 | clock-names = "d_audio", "apbif", "i2s0", "i2s1", "i2s2", | ||
| 422 | "i2s3", "i2s4", "dam0", "dam1", "dam2", | ||
| 423 | "spdif_in", "amx", "adx"; | ||
| 424 | resets = <&tegra_car 106>, /* d_audio */ | 411 | resets = <&tegra_car 106>, /* d_audio */ |
| 425 | <&tegra_car 107>, /* apbif */ | 412 | <&tegra_car 107>, /* apbif */ |
| 426 | <&tegra_car 30>, /* i2s0 */ | 413 | <&tegra_car 30>, /* i2s0 */ |
diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi index 437793067ad3..4d903affa7d0 100644 --- a/arch/arm/boot/dts/tegra20.dtsi +++ b/arch/arm/boot/dts/tegra20.dtsi | |||
| @@ -576,9 +576,8 @@ | |||
| 576 | 576 | ||
| 577 | clocks = <&tegra_car TEGRA20_CLK_PEX>, | 577 | clocks = <&tegra_car TEGRA20_CLK_PEX>, |
| 578 | <&tegra_car TEGRA20_CLK_AFI>, | 578 | <&tegra_car TEGRA20_CLK_AFI>, |
| 579 | <&tegra_car TEGRA20_CLK_PCIE_XCLK>, | ||
| 580 | <&tegra_car TEGRA20_CLK_PLL_E>; | 579 | <&tegra_car TEGRA20_CLK_PLL_E>; |
| 581 | clock-names = "pex", "afi", "pcie_xclk", "pll_e"; | 580 | clock-names = "pex", "afi", "pll_e"; |
| 582 | resets = <&tegra_car 70>, | 581 | resets = <&tegra_car 70>, |
| 583 | <&tegra_car 72>, | 582 | <&tegra_car 72>, |
| 584 | <&tegra_car 74>; | 583 | <&tegra_car 74>; |
diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi index bf2602b87a79..cf84edf0f435 100644 --- a/arch/arm/boot/dts/tegra30.dtsi +++ b/arch/arm/boot/dts/tegra30.dtsi | |||
| @@ -40,10 +40,9 @@ | |||
| 40 | 40 | ||
| 41 | clocks = <&tegra_car TEGRA30_CLK_PCIE>, | 41 | clocks = <&tegra_car TEGRA30_CLK_PCIE>, |
| 42 | <&tegra_car TEGRA30_CLK_AFI>, | 42 | <&tegra_car TEGRA30_CLK_AFI>, |
| 43 | <&tegra_car TEGRA30_CLK_PCIEX>, | ||
| 44 | <&tegra_car TEGRA30_CLK_PLL_E>, | 43 | <&tegra_car TEGRA30_CLK_PLL_E>, |
| 45 | <&tegra_car TEGRA30_CLK_CML0>; | 44 | <&tegra_car TEGRA30_CLK_CML0>; |
| 46 | clock-names = "pex", "afi", "pcie_xclk", "pll_e", "cml"; | 45 | clock-names = "pex", "afi", "pll_e", "cml"; |
| 47 | resets = <&tegra_car 70>, | 46 | resets = <&tegra_car 70>, |
| 48 | <&tegra_car 72>, | 47 | <&tegra_car 72>, |
| 49 | <&tegra_car 74>; | 48 | <&tegra_car 74>; |
| @@ -641,19 +640,8 @@ | |||
| 641 | interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>; | 640 | interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>; |
| 642 | nvidia,dma-request-selector = <&apbdma 1>; | 641 | nvidia,dma-request-selector = <&apbdma 1>; |
| 643 | clocks = <&tegra_car TEGRA30_CLK_D_AUDIO>, | 642 | clocks = <&tegra_car TEGRA30_CLK_D_AUDIO>, |
| 644 | <&tegra_car TEGRA30_CLK_APBIF>, | 643 | <&tegra_car TEGRA30_CLK_APBIF>; |
| 645 | <&tegra_car TEGRA30_CLK_I2S0>, | 644 | clock-names = "d_audio", "apbif"; |
| 646 | <&tegra_car TEGRA30_CLK_I2S1>, | ||
| 647 | <&tegra_car TEGRA30_CLK_I2S2>, | ||
| 648 | <&tegra_car TEGRA30_CLK_I2S3>, | ||
| 649 | <&tegra_car TEGRA30_CLK_I2S4>, | ||
| 650 | <&tegra_car TEGRA30_CLK_DAM0>, | ||
| 651 | <&tegra_car TEGRA30_CLK_DAM1>, | ||
| 652 | <&tegra_car TEGRA30_CLK_DAM2>, | ||
| 653 | <&tegra_car TEGRA30_CLK_SPDIF_IN>; | ||
| 654 | clock-names = "d_audio", "apbif", "i2s0", "i2s1", "i2s2", | ||
| 655 | "i2s3", "i2s4", "dam0", "dam1", "dam2", | ||
| 656 | "spdif_in"; | ||
| 657 | resets = <&tegra_car 106>, /* d_audio */ | 645 | resets = <&tegra_car 106>, /* d_audio */ |
| 658 | <&tegra_car 107>, /* apbif */ | 646 | <&tegra_car 107>, /* apbif */ |
| 659 | <&tegra_car 30>, /* i2s0 */ | 647 | <&tegra_car 30>, /* i2s0 */ |