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

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

Merge tag 'tegra-for-4.7-arm64' of... 

Merge tag 'tegra-for-4.7-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt64

Merge "arm64: tegra: Changes for v4.7-rc1" from Thierry Reding

A couple of cleanups and fixes to various device trees, enable power and
volume keys on Jetson TX1, use stdout-path to define the serial port (so
it doesn't have to be specified on the kernel command-line) and add
Google Pixel C (a.k.a. Smaug) support.

* tag 'tegra-for-4.7-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  arm64: tegra: Enable cros-ec and charger on Smaug
  arm64: tegra: Add pinmux for Smaug board
  arm64: tegra: Add stdout-path for various boards
  arm64: tegra: Remove unused #power-domain-cells property
  arm64: tegra: Add gpio-keys nodes for Smaug
  arm64: tegra: Enable power and volume keys on Jetson TX1
  arm64: tegra: Add support for Google Pixel C
  arm64: tegra: Replace legacy *,wakeup property with wakeup-source
  arm64: tegra: Fix copy/paste typo in several DTS includes
  arm64: tegra: Remove 0, prefix from unit-addresses
parents 318085c7 8d53957c

arch/arm64/boot/dts/nvidia/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ dtb-$(CONFIG_ARCH_TEGRA_132_SOC) += tegra132-norrin.dtb 
dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-p2371-0000.dtb

dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-p2371-2180.dtb

dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-p2571.dtb

dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-smaug.dtb



always		:= $(dtb-y)

clean-files	:= *.dtb

arch/arm64/boot/dts/nvidia/tegra132-norrin.dts

+29 −26
Original line number Diff line number Diff line
@@ -8,19 +8,22 @@ 
	compatible = "nvidia,norrin", "nvidia,tegra132", "nvidia,tegra124";



	aliases {

		rtc0 = "/i2c@0,7000d000/as3722@40";

		rtc1 = "/rtc@0,7000e000";

		rtc0 = "/i2c@7000d000/as3722@40";

		rtc1 = "/rtc@7000e000";

		serial0 = &uarta;

	};



	chosen { };

	chosen {

		stdout-path = "serial0:115200n8";

	};



	memory {

		device_type = "memory";

		reg = <0x0 0x80000000 0x0 0x80000000>;

	};



	host1x@0,50000000 {

		hdmi@0,54280000 {

	host1x@50000000 {

		hdmi@54280000 {

			status = "disabled";



			vdd-supply = <&vdd_3v3_hdmi>;
@@ -32,26 +35,26 @@ 
				<&gpio TEGRA_GPIO(N, 7) GPIO_ACTIVE_HIGH>;

		};



		sor@0,54540000 {

		sor@54540000 {

			status = "okay";



			nvidia,dpaux = <&dpaux>;

			nvidia,panel = <&panel>;

		};



		dpaux: dpaux@0,545c0000 {

		dpaux: dpaux@545c0000 {

			vdd-supply = <&vdd_3v3_panel>;

			status = "okay";

		};

	};



	gpu@0,57000000 {

	gpu@57000000 {

		status = "okay";



		vdd-supply = <&vdd_gpu>;

	};



	pinmux@0,70000868 {

	pinmux@70000868 {

		pinctrl-names = "default";

		pinctrl-0 = <&pinmux_default>;
@@ -523,21 +526,21 @@ 
		};

	};



	serial@0,70006000 {

	serial@70006000 {

		status = "okay";

	};



	pwm: pwm@0,7000a000 {

	pwm: pwm@7000a000 {

		status = "okay";

	};



	/* HDMI DDC */

	hdmi_ddc: i2c@0,7000c700 {

	hdmi_ddc: i2c@7000c700 {

		status = "okay";

		clock-frequency = <100000>;

	};



	i2c@0,7000d000 {

	i2c@7000d000 {

		status = "okay";

		clock-frequency = <400000>;
@@ -744,7 +747,7 @@ 
		};

	};



	spi@0,7000d400 {

	spi@7000d400 {

		status = "okay";



		ec: cros-ec@0 {
@@ -876,7 +879,7 @@ 
		};

	};



	pmc@0,7000e400 {

	pmc@7000e400 {

		nvidia,invert-interrupt;

		nvidia,suspend-mode = <0>;

		#wake-cells = <3>;
@@ -890,12 +893,12 @@ 
	};



	/* WIFI/BT module */

	sdhci@0,700b0000 {

	sdhci@700b0000 {

		status = "disabled";

	};



	/* external SD/MMC */

	sdhci@0,700b0400 {

	sdhci@700b0400 {

		cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;

		power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>;

		wp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_HIGH>;
@@ -905,35 +908,35 @@ 
	};



	/* EMMC 4.51 */

	sdhci@0,700b0600 {

	sdhci@700b0600 {

		status = "okay";

		bus-width = <8>;

		non-removable;

	};



	usb@0,7d000000 {

	usb@7d000000 {

		status = "okay";

	};



	usb-phy@0,7d000000 {

	usb-phy@7d000000 {

		status = "okay";

		vbus-supply = <&vdd_usb1_vbus>;

	};



	usb@0,7d004000 {

	usb@7d004000 {

		status = "okay";

	};



	usb-phy@0,7d004000 {

	usb-phy@7d004000 {

		status = "okay";

		vbus-supply = <&vdd_run_cam>;

	};



	usb@0,7d008000 {

	usb@7d008000 {

		status = "okay";

	};



	usb-phy@0,7d008000 {

	usb-phy@7d008000 {

		status = "okay";

		vbus-supply = <&vdd_usb3_vbus>;

	};
@@ -973,7 +976,7 @@ 
			linux,input-type = <5>;

			linux,code = <0>;

			debounce-interval = <1>;

			gpio-key,wakeup;

			wakeup-source;

		};



		power {
@@ -981,7 +984,7 @@ 
			gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;

			linux,code = <KEY_POWER>;

			debounce-interval = <10>;

			gpio-key,wakeup;

			wakeup-source;

		};

	};

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

+60 −60
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
	#address-cells = <2>;

	#size-cells = <2>;



	pcie-controller@0,01003000 {

	pcie-controller@01003000 {

		compatible = "nvidia,tegra124-pcie";

		device_type = "pci";

		reg = <0x0 0x01003000 0x0 0x00000800   /* PADS registers */
@@ -77,7 +77,7 @@ 
		};

	};



	host1x@0,50000000 {

	host1x@50000000 {

		compatible = "nvidia,tegra124-host1x", "simple-bus";

		reg = <0x0 0x50000000 0x0 0x00034000>;

		interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>, /* syncpt */
@@ -92,7 +92,7 @@ 


		ranges = <0 0x54000000 0 0x54000000 0 0x01000000>;



		dc@0,54200000 {

		dc@54200000 {

			compatible = "nvidia,tegra124-dc";

			reg = <0x0 0x54200000 0x0 0x00040000>;

			interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
@@ -107,7 +107,7 @@ 
			nvidia,head = <0>;

		};



		dc@0,54240000 {

		dc@54240000 {

			compatible = "nvidia,tegra124-dc";

			reg = <0x0 0x54240000 0x0 0x00040000>;

			interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
@@ -122,7 +122,7 @@ 
			nvidia,head = <1>;

		};



		hdmi@0,54280000 {

		hdmi@54280000 {

			compatible = "nvidia,tegra124-hdmi";

			reg = <0x0 0x54280000 0x0 0x00040000>;

			interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
@@ -134,7 +134,7 @@ 
			status = "disabled";

		};



		sor@0,54540000 {

		sor@54540000 {

			compatible = "nvidia,tegra124-sor";

			reg = <0x0 0x54540000 0x0 0x00040000>;

			interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
@@ -148,7 +148,7 @@ 
			status = "disabled";

		};



		dpaux: dpaux@0,545c0000 {

		dpaux: dpaux@545c0000 {

			compatible = "nvidia,tegra124-dpaux";

			reg = <0x0 0x545c0000 0x0 0x00040000>;

			interrupts = <GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>;
@@ -161,7 +161,7 @@ 
		};

	};



	gic: interrupt-controller@0,50041000 {

	gic: interrupt-controller@50041000 {

		compatible = "arm,cortex-a15-gic";

		#interrupt-cells = <3>;

		interrupt-controller;
@@ -174,7 +174,7 @@ 
		interrupt-parent = <&gic>;

	};



	gpu@0,57000000 {

	gpu@57000000 {

		compatible = "nvidia,gk20a";

		reg = <0x0 0x57000000 0x0 0x01000000>,

		      <0x0 0x58000000 0x0 0x01000000>;
@@ -201,7 +201,7 @@ 
		interrupt-parent = <&gic>;

	};



	timer@0,60005000 {

	timer@60005000 {

		compatible = "nvidia,tegra124-timer", "nvidia,tegra20-timer";

		reg = <0x0 0x60005000 0x0 0x400>;

		interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
@@ -214,7 +214,7 @@ 
		clock-names = "timer";

	};



	tegra_car: clock@0,60006000 {

	tegra_car: clock@60006000 {

		compatible = "nvidia,tegra132-car";

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

		#clock-cells = <1>;
@@ -222,12 +222,12 @@ 
		nvidia,external-memory-controller = <&emc>;

	};



	flow-controller@0,60007000 {

	flow-controller@60007000 {

		compatible = "nvidia,tegra124-flowctrl";

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

	};



	actmon@0,6000c800 {

	actmon@6000c800 {

		compatible = "nvidia,tegra124-actmon";

		reg = <0x0 0x6000c800 0x0 0x400>;

		interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
@@ -238,7 +238,7 @@ 
		reset-names = "actmon";

	};



	gpio: gpio@0,6000d000 {

	gpio: gpio@6000d000 {

		compatible = "nvidia,tegra124-gpio", "nvidia,tegra30-gpio";

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

		interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>,
@@ -255,7 +255,7 @@ 
		interrupt-controller;

	};



	apbdma: dma@0,60020000 {

	apbdma: dma@60020000 {

		compatible = "nvidia,tegra124-apbdma", "nvidia,tegra148-apbdma";

		reg = <0x0 0x60020000 0x0 0x1400>;

		interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>,
@@ -297,13 +297,13 @@ 
		#dma-cells = <1>;

	};



	apbmisc@0,70000800 {

	apbmisc@70000800 {

		compatible = "nvidia,tegra124-apbmisc", "nvidia,tegra20-apbmisc";

		reg = <0x0 0x70000800 0x0 0x64>,   /* Chip revision */

		      <0x0 0x7000e864 0x0 0x04>;   /* Strapping options */

	};



	pinmux: pinmux@0,70000868 {

	pinmux: pinmux@70000868 {

		compatible = "nvidia,tegra124-pinmux";

		reg = <0x0 0x70000868 0x0 0x164>, /* Pad control registers */

		      <0x0 0x70003000 0x0 0x434>, /* Mux registers */
@@ -315,10 +315,10 @@ 
	 * driver and APB DMA based serial driver for higher baudrate

	 * and performance. To enable the 8250 based driver, the compatible

	 * is "nvidia,tegra124-uart", "nvidia,tegra20-uart" and to enable

	 * the APB DMA based serial driver, the comptible is

	 * the APB DMA based serial driver, the compatible is

	 * "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart".

	 */

	uarta: serial@0,70006000 {

	uarta: serial@70006000 {

		compatible = "nvidia,tegra124-uart", "nvidia,tegra20-uart";

		reg = <0x0 0x70006000 0x0 0x40>;

		reg-shift = <2>;
@@ -332,7 +332,7 @@ 
		status = "disabled";

	};



	uartb: serial@0,70006040 {

	uartb: serial@70006040 {

		compatible = "nvidia,tegra124-uart", "nvidia,tegra20-uart";

		reg = <0x0 0x70006040 0x0 0x40>;

		reg-shift = <2>;
@@ -346,7 +346,7 @@ 
		status = "disabled";

	};



	uartc: serial@0,70006200 {

	uartc: serial@70006200 {

		compatible = "nvidia,tegra124-uart", "nvidia,tegra20-uart";

		reg = <0x0 0x70006200 0x0 0x40>;

		reg-shift = <2>;
@@ -360,7 +360,7 @@ 
		status = "disabled";

	};



	uartd: serial@0,70006300 {

	uartd: serial@70006300 {

		compatible = "nvidia,tegra124-uart", "nvidia,tegra20-uart";

		reg = <0x0 0x70006300 0x0 0x40>;

		reg-shift = <2>;
@@ -374,7 +374,7 @@ 
		status = "disabled";

	};



	pwm: pwm@0,7000a000 {

	pwm: pwm@7000a000 {

		compatible = "nvidia,tegra124-pwm", "nvidia,tegra20-pwm";

		reg = <0x0 0x7000a000 0x0 0x100>;

		#pwm-cells = <2>;
@@ -385,7 +385,7 @@ 
		status = "disabled";

	};



	i2c@0,7000c000 {

	i2c@7000c000 {

		compatible = "nvidia,tegra124-i2c", "nvidia,tegra114-i2c";

		reg = <0x0 0x7000c000 0x0 0x100>;

		interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;
@@ -400,7 +400,7 @@ 
		status = "disabled";

	};



	i2c@0,7000c400 {

	i2c@7000c400 {

		compatible = "nvidia,tegra124-i2c", "nvidia,tegra114-i2c";

		reg = <0x0 0x7000c400 0x0 0x100>;

		interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
@@ -415,7 +415,7 @@ 
		status = "disabled";

	};



	i2c@0,7000c500 {

	i2c@7000c500 {

		compatible = "nvidia,tegra124-i2c", "nvidia,tegra114-i2c";

		reg = <0x0 0x7000c500 0x0 0x100>;

		interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
@@ -430,7 +430,7 @@ 
		status = "disabled";

	};



	i2c@0,7000c700 {

	i2c@7000c700 {

		compatible = "nvidia,tegra124-i2c", "nvidia,tegra114-i2c";

		reg = <0x0 0x7000c700 0x0 0x100>;

		interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
@@ -445,7 +445,7 @@ 
		status = "disabled";

	};



	i2c@0,7000d000 {

	i2c@7000d000 {

		compatible = "nvidia,tegra124-i2c", "nvidia,tegra114-i2c";

		reg = <0x0 0x7000d000 0x0 0x100>;

		interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;
@@ -460,7 +460,7 @@ 
		status = "disabled";

	};



	i2c@0,7000d100 {

	i2c@7000d100 {

		compatible = "nvidia,tegra124-i2c", "nvidia,tegra114-i2c";

		reg = <0x0 0x7000d100 0x0 0x100>;

		interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
@@ -475,7 +475,7 @@ 
		status = "disabled";

	};



	spi@0,7000d400 {

	spi@7000d400 {

		compatible = "nvidia,tegra124-spi", "nvidia,tegra114-spi";

		reg = <0x0 0x7000d400 0x0 0x200>;

		interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;
@@ -490,7 +490,7 @@ 
		status = "disabled";

	};



	spi@0,7000d600 {

	spi@7000d600 {

		compatible = "nvidia,tegra124-spi", "nvidia,tegra114-spi";

		reg = <0x0 0x7000d600 0x0 0x200>;

		interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
@@ -505,7 +505,7 @@ 
		status = "disabled";

	};



	spi@0,7000d800 {

	spi@7000d800 {

		compatible = "nvidia,tegra124-spi", "nvidia,tegra114-spi";

		reg = <0x0 0x7000d800 0x0 0x200>;

		interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
@@ -520,7 +520,7 @@ 
		status = "disabled";

	};



	spi@0,7000da00 {

	spi@7000da00 {

		compatible = "nvidia,tegra124-spi", "nvidia,tegra114-spi";

		reg = <0x0 0x7000da00 0x0 0x200>;

		interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>;
@@ -535,7 +535,7 @@ 
		status = "disabled";

	};



	spi@0,7000dc00 {

	spi@7000dc00 {

		compatible = "nvidia,tegra124-spi", "nvidia,tegra114-spi";

		reg = <0x0 0x7000dc00 0x0 0x200>;

		interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;
@@ -550,7 +550,7 @@ 
		status = "disabled";

	};



	spi@0,7000de00 {

	spi@7000de00 {

		compatible = "nvidia,tegra124-spi", "nvidia,tegra114-spi";

		reg = <0x0 0x7000de00 0x0 0x200>;

		interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;
@@ -565,7 +565,7 @@ 
		status = "disabled";

	};



	rtc@0,7000e000 {

	rtc@7000e000 {

		compatible = "nvidia,tegra124-rtc", "nvidia,tegra20-rtc";

		reg = <0x0 0x7000e000 0x0 0x100>;

		interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
@@ -573,14 +573,14 @@ 
		clock-names = "rtc";

	};



	pmc@0,7000e400 {

	pmc@7000e400 {

		compatible = "nvidia,tegra124-pmc";

		reg = <0x0 0x7000e400 0x0 0x400>;

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

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

	};



	fuse@0,7000f800 {

	fuse@7000f800 {

		compatible = "nvidia,tegra124-efuse";

		reg = <0x0 0x7000f800 0x0 0x400>;

		clocks = <&tegra_car TEGRA124_CLK_FUSE>;
@@ -589,7 +589,7 @@ 
		reset-names = "fuse";

	};



	mc: memory-controller@0,70019000 {

	mc: memory-controller@70019000 {

		compatible = "nvidia,tegra132-mc";

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

		clocks = <&tegra_car TEGRA124_CLK_MC>;
@@ -600,14 +600,14 @@ 
		#iommu-cells = <1>;

	};



	emc: emc@0,7001b000 {

	emc: emc@7001b000 {

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

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



		nvidia,memory-controller = <&mc>;

	};



	sata@0,70020000 {

	sata@70020000 {

		compatible = "nvidia,tegra124-ahci";

		reg = <0x0 0x70027000 0x0 0x2000>, /* AHCI */

		      <0x0 0x70020000 0x0 0x7000>; /* SATA */
@@ -626,7 +626,7 @@ 
		status = "disabled";

	};



	hda@0,70030000 {

	hda@70030000 {

		compatible = "nvidia,tegra132-hda", "nvidia,tegra124-hda",

			     "nvidia,tegra30-hda";

		reg = <0x0 0x70030000 0x0 0x10000>;
@@ -642,7 +642,7 @@ 
		status = "disabled";

	};



	padctl: padctl@0,7009f000 {

	padctl: padctl@7009f000 {

		compatible = "nvidia,tegra132-xusb-padctl",

			     "nvidia,tegra124-xusb-padctl";

		reg = <0x0 0x7009f000 0x0 0x1000>;
@@ -682,7 +682,7 @@ 
		};

	};



	sdhci@0,700b0000 {

	sdhci@700b0000 {

		compatible = "nvidia,tegra124-sdhci";

		reg = <0x0 0x700b0000 0x0 0x200>;

		interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
@@ -693,7 +693,7 @@ 
		status = "disabled";

	};



	sdhci@0,700b0200 {

	sdhci@700b0200 {

		compatible = "nvidia,tegra124-sdhci";

		reg = <0x0 0x700b0200 0x0 0x200>;

		interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
@@ -704,7 +704,7 @@ 
		status = "disabled";

	};



	sdhci@0,700b0400 {

	sdhci@700b0400 {

		compatible = "nvidia,tegra124-sdhci";

		reg = <0x0 0x700b0400 0x0 0x200>;

		interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
@@ -715,7 +715,7 @@ 
		status = "disabled";

	};



	sdhci@0,700b0600 {

	sdhci@700b0600 {

		compatible = "nvidia,tegra124-sdhci";

		reg = <0x0 0x700b0600 0x0 0x200>;

		interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
@@ -726,7 +726,7 @@ 
		status = "disabled";

	};



	soctherm: thermal-sensor@0,700e2000 {

	soctherm: thermal-sensor@700e2000 {

		compatible = "nvidia,tegra124-soctherm";

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

		interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;
@@ -738,7 +738,7 @@ 
		#thermal-sensor-cells = <1>;

	};



	ahub@0,70300000 {

	ahub@70300000 {

		compatible = "nvidia,tegra124-ahub";

		reg = <0x0 0x70300000 0x0 0x200>,

		      <0x0 0x70300800 0x0 0x800>,
@@ -790,7 +790,7 @@ 
		#address-cells = <2>;

		#size-cells = <2>;



		tegra_i2s0: i2s@0,70301000 {

		tegra_i2s0: i2s@70301000 {

			compatible = "nvidia,tegra124-i2s";

			reg = <0x0 0x70301000 0x0 0x100>;

			nvidia,ahub-cif-ids = <4 4>;
@@ -801,7 +801,7 @@ 
			status = "disabled";

		};



		tegra_i2s1: i2s@0,70301100 {

		tegra_i2s1: i2s@70301100 {

			compatible = "nvidia,tegra124-i2s";

			reg = <0x0 0x70301100 0x0 0x100>;

			nvidia,ahub-cif-ids = <5 5>;
@@ -812,7 +812,7 @@ 
			status = "disabled";

		};



		tegra_i2s2: i2s@0,70301200 {

		tegra_i2s2: i2s@70301200 {

			compatible = "nvidia,tegra124-i2s";

			reg = <0x0 0x70301200 0x0 0x100>;

			nvidia,ahub-cif-ids = <6 6>;
@@ -823,7 +823,7 @@ 
			status = "disabled";

		};



		tegra_i2s3: i2s@0,70301300 {

		tegra_i2s3: i2s@70301300 {

			compatible = "nvidia,tegra124-i2s";

			reg = <0x0 0x70301300 0x0 0x100>;

			nvidia,ahub-cif-ids = <7 7>;
@@ -834,7 +834,7 @@ 
			status = "disabled";

		};



		tegra_i2s4: i2s@0,70301400 {

		tegra_i2s4: i2s@70301400 {

			compatible = "nvidia,tegra124-i2s";

			reg = <0x0 0x70301400 0x0 0x100>;

			nvidia,ahub-cif-ids = <8 8>;
@@ -846,7 +846,7 @@ 
		};

	};



	usb@0,7d000000 {

	usb@7d000000 {

		compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci", "usb-ehci";

		reg = <0x0 0x7d000000 0x0 0x4000>;

		interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
@@ -859,7 +859,7 @@ 
		status = "disabled";

	};



	phy1: usb-phy@0,7d000000 {

	phy1: usb-phy@7d000000 {

		compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy";

		reg = <0x0 0x7d000000 0x0 0x4000>,

		      <0x0 0x7d000000 0x0 0x4000>;
@@ -884,7 +884,7 @@ 
		status = "disabled";

	};



	usb@0,7d004000 {

	usb@7d004000 {

		compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci", "usb-ehci";

		reg = <0x0 0x7d004000 0x0 0x4000>;

		interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
@@ -897,7 +897,7 @@ 
		status = "disabled";

	};



	phy2: usb-phy@0,7d004000 {

	phy2: usb-phy@7d004000 {

		compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy";

		reg = <0x0 0x7d004000 0x0 0x4000>,

		      <0x0 0x7d000000 0x0 0x4000>;
@@ -921,7 +921,7 @@ 
		status = "disabled";

	};



	usb@0,7d008000 {

	usb@7d008000 {

		compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci", "usb-ehci";

		reg = <0x0 0x7d008000 0x0 0x4000>;

		interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
@@ -934,7 +934,7 @@ 
		status = "disabled";

	};



	phy3: usb-phy@0,7d008000 {

	phy3: usb-phy@7d008000 {

		compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy";

		reg = <0x0 0x7d008000 0x0 0x4000>,

		      <0x0 0x7d000000 0x0 0x4000>;

arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
	compatible = "nvidia,p2180", "nvidia,tegra210";



	aliases {

		rtc1 = "/rtc@0,7000e000";

		rtc1 = "/rtc@7000e000";

		serial0 = &uarta;

	};
@@ -15,16 +15,16 @@ 
	};



	/* debug port */

	serial@0,70006000 {

	serial@70006000 {

		status = "okay";

	};



	pmc@0,7000e400 {

	pmc@7000e400 {

		nvidia,invert-interrupt;

	};



	/* eMMC */

	sdhci@0,700b0600 {

	sdhci@700b0600 {

		status = "okay";

		bus-width = <8>;

		non-removable;

arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi

+9 −5
Original line number Diff line number Diff line
@@ -5,31 +5,35 @@ 
	compatible = "nvidia,p2530", "nvidia,tegra210";



	aliases {

		rtc1 = "/rtc@0,7000e000";

		rtc1 = "/rtc@7000e000";

		serial0 = &uarta;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	memory {

		device_type = "memory";

		reg = <0x0 0x80000000 0x0 0xc0000000>;

	};



	/* debug port */

	serial@0,70006000 {

	serial@70006000 {

		status = "okay";

	};



	i2c@0,7000d000 {

	i2c@7000d000 {

		status = "okay";

		clock-frequency = <400000>;

	};



	pmc@0,7000e400 {

	pmc@7000e400 {

		nvidia,invert-interrupt;

	};



	/* eMMC */

	sdhci@0,700b0600 {

	sdhci@700b0600 {

		status = "okay";

		bus-width = <8>;

		non-removable;