Commit 84c2f68e authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'tegra-for-5.6-arm64-dt' of... 

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

arm64: tegra: Device tree changes for v5.6-rc1

These patches do some cleanup to existing nodes, add the memory
subsystem on Tegra186 and Tegra194 as well as the FUSE and APB MISC
nodes on Tegra194. There are also a few additions to the Jetson Nano
device tree to enable additional features and the force recovery
button on the Jetson AGX Xavier now produces a key code that is
actually valid. Finally, an alias is added for the Ethernet card on
Jetson TX2 to allow firmware to find it and pass a MAC address via
device tree.

* tag 'tegra-for-5.6-arm64-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  arm64: tegra: Allow bootloader to configure Ethernet MAC on Jetson TX2
  arm64: tegra: Redefine force recovery key on Jetson AGX Xavier
  arm64: tegra: Enable SDIO on Jetson Nano M.2 Key E
  arm64: tegra: Enable PWM fan on Jetson Nano
  arm64: tegra: Add fuse/apbmisc node on Tegra194
  arm64: tegra: Make XUSB node consistent with the rest
  arm64: tegra: Add the memory subsystem on Tegra194
  arm64: tegra: Add external memory controller on Tegra186
  arm64: tegra: Add interrupt for memory controller on Tegra186
  arm64: tegra: Rename EMC on Tegra132
  arm64: tegra: Let the EMC hardware use the EMC clock

Link: https://lore.kernel.org/r/20200111003553.2411874-7-thierry.reding@gmail.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 12c5beb9 f41f34dd

arch/arm64/boot/dts/nvidia/tegra132.dtsi

+3 −1
Original line number Diff line number Diff line
@@ -604,9 +604,11 @@ mc: memory-controller@70019000 { 
		#iommu-cells = <1>;

	};



	emc: emc@7001b000 {

	emc: external-memory-controller@7001b000 {

		compatible = "nvidia,tegra132-emc", "nvidia,tegra124-emc";

		reg = <0x0 0x7001b000 0x0 0x1000>;

		clocks = <&tegra_car TEGRA124_CLK_EMC>;

		clock-names = "emc";



		nvidia,memory-controller = <&mc>;

	};

arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ / { 
	compatible = "nvidia,p3310", "nvidia,tegra186";



	aliases {

		ethernet0 = "/ethernet@2490000";

		sdhci0 = "/sdhci@3460000";

		sdhci1 = "/sdhci@3400000";

		serial0 = &uarta;

arch/arm64/boot/dts/nvidia/tegra186.dtsi

+26 −8
Original line number Diff line number Diff line
@@ -142,7 +142,29 @@ agic: interrupt-controller@2a40000 { 
	memory-controller@2c00000 {

		compatible = "nvidia,tegra186-mc";

		reg = <0x0 0x02c00000 0x0 0xb0000>;

		interrupts = <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";



		#address-cells = <2>;

		#size-cells = <2>;



		ranges = <0x0 0x02c00000 0x0 0x02c00000 0x0 0xb0000>;



		/*

		 * Memory clients have access to all 40 bits that the memory

		 * controller can address.

		 */

		dma-ranges = <0x0 0x0 0x0 0x0 0x100 0x0>;



		emc: external-memory-controller@2c60000 {

			compatible = "nvidia,tegra186-emc";

			reg = <0x0 0x02c60000 0x0 0x50000>;

			interrupts = <GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&bpmp TEGRA186_CLK_EMC>;

			clock-names = "emc";



			nvidia,bpmp = <&bpmp>;

		};

	};



	uarta: serial@3100000 {
@@ -524,12 +546,9 @@ usb@3530000 { 
		reg = <0x0 0x03530000 0x0 0x8000>,

		      <0x0 0x03538000 0x0 0x1000>;

		reg-names = "hcd", "fpci";



		iommus = <&smmu TEGRA186_SID_XUSB_HOST>;

		interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;



		clocks = <&bpmp TEGRA186_CLK_XUSB_HOST>,

			 <&bpmp TEGRA186_CLK_XUSB_FALCON>,

			 <&bpmp TEGRA186_CLK_XUSB_SS>,
@@ -542,16 +561,15 @@ usb@3530000 { 
		clock-names = "xusb_host", "xusb_falcon_src", "xusb_ss",

			      "xusb_ss_src", "xusb_hs_src", "xusb_fs_src",

			      "pll_u_480m", "clk_m", "pll_e";



		power-domains = <&bpmp TEGRA186_POWER_DOMAIN_XUSBC>,

				<&bpmp TEGRA186_POWER_DOMAIN_XUSBA>;

		power-domain-names = "xusb_host", "xusb_ss";

		nvidia,xusb-padctl = <&padctl>;



		status = "disabled";



		iommus = <&smmu TEGRA186_SID_XUSB_HOST>;

		#address-cells = <1>;

		#size-cells = <0>;

		status = "disabled";



		nvidia,xusb-padctl = <&padctl>;

	};



	fuse@3820000 {

arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -48,6 +48,10 @@ phy: phy@0 { 
			};

		};



		memory-controller@2c00000 {

			status = "okay";

		};



		serial@3110000 {

			status = "okay";

		};

arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ force-recovery { 
			gpios = <&gpio TEGRA194_MAIN_GPIO(G, 0)

				       GPIO_ACTIVE_LOW>;

			linux,input-type = <EV_KEY>;

			linux,code = <BTN_1>;

			linux,code = <KEY_SLEEP>;

			debounce-interval = <10>;

		};