Commit eccbb5e7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tegra-for-5.7-arm-dt' of... 

Merge tag 'tegra-for-5.7-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/dt

ARM: tegra: Device tree changes for v5.7-rc1

Minor fixes and additions for 32-bit Tegra SoC device trees.

* tag 'tegra-for-5.7-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: Update sound node clocks in device tree
  ARM: tegra: Add clock-cells property to PMC
  ARM: tegra: Remove USB 2-0 port from Jetson TK1 padctl

Link: https://lore.kernel.org/r/20200313165848.2915133-6-thierry.reding@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents eaf36fbb bdb2c52a

arch/arm/boot/dts/tegra114-dalmore.dts

+7 −1
Original line number Diff line number Diff line
@@ -1296,7 +1296,13 @@ 


		clocks = <&tegra_car TEGRA114_CLK_PLL_A>,

			 <&tegra_car TEGRA114_CLK_PLL_A_OUT0>,

			 <&tegra_car TEGRA114_CLK_EXTERN1>;

			 <&tegra_pmc TEGRA_PMC_CLK_OUT_1>;

		clock-names = "pll_a", "pll_a_out0", "mclk";



		assigned-clocks = <&tegra_car TEGRA114_CLK_EXTERN1>,

				  <&tegra_pmc TEGRA_PMC_CLK_OUT_1>;



		assigned-clock-parents = <&tegra_car TEGRA114_CLK_PLL_A_OUT0>,

					 <&tegra_car TEGRA114_CLK_EXTERN1>;

	};

};

arch/arm/boot/dts/tegra114.dtsi

+3 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <dt-bindings/memory/tegra114-mc.h>

#include <dt-bindings/pinctrl/pinctrl-tegra.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>

#include <dt-bindings/soc/tegra-pmc.h>



/ {

	compatible = "nvidia,tegra114";
@@ -514,11 +515,12 @@ 
		status = "disabled";

	};



	pmc@7000e400 {

	tegra_pmc: pmc@7000e400 {

		compatible = "nvidia,tegra114-pmc";

		reg = <0x7000e400 0x400>;

		clocks = <&tegra_car TEGRA114_CLK_PCLK>, <&clk32k_in>;

		clock-names = "pclk", "clk32k_in";

		#clock-cells = <1>;

	};



	fuse@7000f800 {

arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi

+7 −1
Original line number Diff line number Diff line
@@ -2009,8 +2009,14 @@ 
		nvidia,audio-codec = <&sgtl5000>;

		clocks = <&tegra_car TEGRA124_CLK_PLL_A>,

			 <&tegra_car TEGRA124_CLK_PLL_A_OUT0>,

			 <&tegra_car TEGRA124_CLK_EXTERN1>;

			 <&tegra_pmc TEGRA_PMC_CLK_OUT_1>;

		clock-names = "pll_a", "pll_a_out0", "mclk";



		assigned-clocks = <&tegra_car TEGRA124_CLK_EXTERN1>,

				  <&tegra_pmc TEGRA_PMC_CLK_OUT_1>;



		assigned-clock-parents = <&tegra_car TEGRA124_CLK_PLL_A_OUT0>,

					 <&tegra_car TEGRA124_CLK_EXTERN1>;

	};



	thermal-zones {

arch/arm/boot/dts/tegra124-apalis.dtsi

+7 −1
Original line number Diff line number Diff line
@@ -2001,8 +2001,14 @@ 
		nvidia,audio-codec = <&sgtl5000>;

		clocks = <&tegra_car TEGRA124_CLK_PLL_A>,

			 <&tegra_car TEGRA124_CLK_PLL_A_OUT0>,

			 <&tegra_car TEGRA124_CLK_EXTERN1>;

			 <&tegra_pmc TEGRA_PMC_CLK_OUT_1>;

		clock-names = "pll_a", "pll_a_out0", "mclk";



		assigned-clocks = <&tegra_car TEGRA124_CLK_EXTERN1>,

				  <&tegra_pmc TEGRA_PMC_CLK_OUT_1>;



		assigned-clock-parents = <&tegra_car TEGRA124_CLK_PLL_A_OUT0>,

					 <&tegra_car TEGRA124_CLK_EXTERN1>;

	};



	thermal-zones {

arch/arm/boot/dts/tegra124-jetson-tk1.dts

+7 −7
Original line number Diff line number Diff line
@@ -1782,12 +1782,6 @@ 
		};



		ports {

			/* Micro A/B */

			usb2-0 {

				status = "okay";

				mode = "otg";

			};



			/* Mini PCIe */

			usb2-1 {

				status = "okay";
@@ -2058,8 +2052,14 @@ 


		clocks = <&tegra_car TEGRA124_CLK_PLL_A>,

			 <&tegra_car TEGRA124_CLK_PLL_A_OUT0>,

			 <&tegra_car TEGRA124_CLK_EXTERN1>;

			 <&tegra_pmc TEGRA_PMC_CLK_OUT_1>;

		clock-names = "pll_a", "pll_a_out0", "mclk";



		assigned-clocks = <&tegra_car TEGRA124_CLK_EXTERN1>,

				  <&tegra_pmc TEGRA_PMC_CLK_OUT_1>;



		assigned-clock-parents = <&tegra_car TEGRA124_CLK_PLL_A_OUT0>,

					 <&tegra_car TEGRA124_CLK_EXTERN1>;

	};



	thermal-zones {

CRA Git | Maintained and supported by SUSTech CRA and CCSE