Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2bd541ff authored by Stephen Warren's avatar Stephen Warren
Browse files

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: default avatarStephen Warren <swarren@nvidia.com>
Reviewed-by: default avatarThierry Reding <treding@nvidia.com>
parent 75606f5d

arch/arm/boot/dts/tegra114.dtsi

+2 −15
Original line number Diff line number Diff line
@@ -406,21 +406,8 @@ 
			<&apbdma 12>, <&apbdma 13>, <&apbdma 14>,

			<&apbdma 29>;

		clocks = <&tegra_car TEGRA114_CLK_D_AUDIO>,

			 <&tegra_car TEGRA114_CLK_APBIF>,

			 <&tegra_car TEGRA114_CLK_I2S0>,

			 <&tegra_car TEGRA114_CLK_I2S1>,

			 <&tegra_car TEGRA114_CLK_I2S2>,

			 <&tegra_car TEGRA114_CLK_I2S3>,

			 <&tegra_car TEGRA114_CLK_I2S4>,

			 <&tegra_car TEGRA114_CLK_DAM0>,

			 <&tegra_car TEGRA114_CLK_DAM1>,

			 <&tegra_car TEGRA114_CLK_DAM2>,

			 <&tegra_car TEGRA114_CLK_SPDIF_IN>,

			 <&tegra_car TEGRA114_CLK_AMX>,

			 <&tegra_car TEGRA114_CLK_ADX>;

		clock-names = "d_audio", "apbif", "i2s0", "i2s1", "i2s2",

			      "i2s3", "i2s4", "dam0", "dam1", "dam2",

			      "spdif_in", "amx", "adx";

			 <&tegra_car TEGRA114_CLK_APBIF>;

		clock-names = "d_audio", "apbif";

		resets = <&tegra_car 106>, /* d_audio */

			 <&tegra_car 107>, /* apbif */

			 <&tegra_car 30>,  /* i2s0 */

arch/arm/boot/dts/tegra20.dtsi

+1 −2
Original line number Diff line number Diff line
@@ -576,9 +576,8 @@ 


		clocks = <&tegra_car TEGRA20_CLK_PEX>,

			 <&tegra_car TEGRA20_CLK_AFI>,

			 <&tegra_car TEGRA20_CLK_PCIE_XCLK>,

			 <&tegra_car TEGRA20_CLK_PLL_E>;

		clock-names = "pex", "afi", "pcie_xclk", "pll_e";

		clock-names = "pex", "afi", "pll_e";

		resets = <&tegra_car 70>,

		         <&tegra_car 72>,

		         <&tegra_car 74>;

arch/arm/boot/dts/tegra30.dtsi

+3 −15
Original line number Diff line number Diff line
@@ -40,10 +40,9 @@ 


		clocks = <&tegra_car TEGRA30_CLK_PCIE>,

			 <&tegra_car TEGRA30_CLK_AFI>,

			 <&tegra_car TEGRA30_CLK_PCIEX>,

			 <&tegra_car TEGRA30_CLK_PLL_E>,

			 <&tegra_car TEGRA30_CLK_CML0>;

		clock-names = "pex", "afi", "pcie_xclk", "pll_e", "cml";

		clock-names = "pex", "afi", "pll_e", "cml";

		resets = <&tegra_car 70>,

		         <&tegra_car 72>,

		         <&tegra_car 74>;
@@ -641,19 +640,8 @@ 
		interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;

		nvidia,dma-request-selector = <&apbdma 1>;

		clocks = <&tegra_car TEGRA30_CLK_D_AUDIO>,

			 <&tegra_car TEGRA30_CLK_APBIF>,

			 <&tegra_car TEGRA30_CLK_I2S0>,

			 <&tegra_car TEGRA30_CLK_I2S1>,

			 <&tegra_car TEGRA30_CLK_I2S2>,

			 <&tegra_car TEGRA30_CLK_I2S3>,

			 <&tegra_car TEGRA30_CLK_I2S4>,

			 <&tegra_car TEGRA30_CLK_DAM0>,

			 <&tegra_car TEGRA30_CLK_DAM1>,

			 <&tegra_car TEGRA30_CLK_DAM2>,

			 <&tegra_car TEGRA30_CLK_SPDIF_IN>;

		clock-names = "d_audio", "apbif", "i2s0", "i2s1", "i2s2",

			      "i2s3", "i2s4", "dam0", "dam1", "dam2",

			      "spdif_in";

			 <&tegra_car TEGRA30_CLK_APBIF>;

		clock-names = "d_audio", "apbif";

		resets = <&tegra_car 106>, /* d_audio */

			 <&tegra_car 107>, /* apbif */

			 <&tegra_car 30>,  /* i2s0 */