Commit 9cad9a5f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'tegra/dt' into next/dt 

* tegra/dt:
  arm/tegra: Seaboard: Add GPIO key device tree nodes
  arm/dt: Add ADT7461 to Seaboard
  arm/dt: tegra: Use new compatible value for DVC I2C controller
  arm/tegra: initial device tree for tegra30
  arm/tegra: convert tegra20 to GIC devicetree binding
  arm/dt: tegra: Fix SDHCI nodes to match board files
  arm/dt: tegra: Fix serial nodes to match board files
  arm/dt: tegra: Fix I2C nodes to match board files
  arm/dt: tegra: Remove /chosen node
  arm/dt: tegra: Remove /memreserve/ from device-tree files
  arm/tegra: board-dt: Enable audio-related clocks
  arm/tegra: board-dt: Fix AUXDATA typo
  arm/dt: tegra: add dts file for paz00
  arm/tegra: Add device-tree support for TrimSlice board
  arm/dt: tegra: Clean up I2S and DAS nodes
  USB: ehci-tegra: add probing through device tree
  arm/dt: add basic usb nodes to tegra device trees
  arm/tegra: fix variable formatting in makefile

Conflicts:
	arch/arm/mach-tegra/Makefile
parents e817e49f bad13409

Documentation/devicetree/bindings/arm/tegra.txt

0 → 100644
+14 −0
Original line number Diff line number Diff line 
NVIDIA Tegra device tree bindings

-------------------------------------------



Boards with the tegra20 SoC shall have the following properties:



Required root node property:



compatible = "nvidia,tegra20";



Boards with the tegra30 SoC shall have the following properties:



Required root node property:



compatible = "nvidia,tegra30";

Documentation/devicetree/bindings/usb/tegra-usb.txt

0 → 100644
+13 −0
Original line number Diff line number Diff line 
Tegra SOC USB controllers



The device node for a USB controller that is part of a Tegra

SOC is as described in the document "Open Firmware Recommended

Practice : Universal Serial Bus" with the following modifications

and additions :



Required properties :

 - compatible : Should be "nvidia,tegra20-ehci" for USB controllers

   used in host mode.

 - phy_type : Should be one of "ulpi" or "utmi".

 - nvidia,vbus-gpio : If present, specifies a gpio that needs to be

   activated for the bus to be powered.

arch/arm/boot/dts/tegra-harmony.dts

+24 −5
Original line number Diff line number Diff line 
/dts-v1/;



/memreserve/ 0x1c000000 0x04000000;

/include/ "tegra20.dtsi"



/ {

	model = "NVIDIA Tegra2 Harmony evaluation board";

	compatible = "nvidia,harmony", "nvidia,tegra20";



	chosen {

		bootargs = "vmalloc=192M video=tegrafb console=ttyS0,115200n8 root=/dev/mmcblk0p2 rw rootwait";

	};



	memory@0 {

		reg = < 0x00000000 0x40000000 >;

	};
@@ -52,16 +47,40 @@ 
		ext-mic-en-gpios = <&gpio 185 0>;

	};



	serial@70006000 {

		status = "disable";

	};



	serial@70006040 {

		status = "disable";

	};



	serial@70006200 {

		status = "disable";

	};



	serial@70006300 {

		clock-frequency = < 216000000 >;

	};



	serial@70006400 {

		status = "disable";

	};



	sdhci@c8000000 {

		status = "disable";

	};



	sdhci@c8000200 {

		cd-gpios = <&gpio 69 0>; /* gpio PI5 */

		wp-gpios = <&gpio 57 0>; /* gpio PH1 */

		power-gpios = <&gpio 155 0>; /* gpio PT3 */

	};



	sdhci@c8000400 {

		status = "disable";

	};



	sdhci@c8000600 {

		cd-gpios = <&gpio 58 0>; /* gpio PH2 */

		wp-gpios = <&gpio 59 0>; /* gpio PH3 */

arch/arm/boot/dts/tegra-paz00.dts

0 → 100644
+77 −0
Original line number Diff line number Diff line 
/dts-v1/;



/include/ "tegra20.dtsi"



/ {

	model = "Toshiba AC100 / Dynabook AZ";

	compatible = "compal,paz00", "nvidia,tegra20";



	memory@0 {

		reg = <0x00000000 0x20000000>;

	};



	i2c@7000c000 {

		clock-frequency = <400000>;

	};



	i2c@7000c400 {

		clock-frequency = <400000>;

	};



	i2c@7000c500 {

		status = "disable";

	};



	nvec@7000c500 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "nvidia,nvec";

		reg = <0x7000C500 0x100>;

		interrupts = <0 92 0x04>;

		clock-frequency = <80000>;

		request-gpios = <&gpio 170 0>;

		slave-addr = <138>;

	};



	i2c@7000d000 {

		clock-frequency = <400000>;

	};



	serial@70006000 {

		clock-frequency = <216000000>;

	};



	serial@70006040 {

		status = "disable";

	};



	serial@70006200 {

		status = "disable";

	};



	serial@70006300 {

		clock-frequency = <216000000>;

	};



	serial@70006400 {

		status = "disable";

	};



	sdhci@c8000000 {

		cd-gpios = <&gpio 173 0>; /* gpio PV5 */

		wp-gpios = <&gpio 57 0>;  /* gpio PH1 */

		power-gpios = <&gpio 155 0>; /* gpio PT3 */

	};



	sdhci@c8000200 {

		status = "disable";

	};



	sdhci@c8000400 {

		status = "disable";

	};



	sdhci@c8000600 {

		support-8bit;

	};

};

arch/arm/boot/dts/tegra-seaboard.dts

+69 −5
Original line number Diff line number Diff line 
/dts-v1/;



/memreserve/ 0x1c000000 0x04000000;

/include/ "tegra20.dtsi"



/ {

	model = "NVIDIA Seaboard";

	compatible = "nvidia,seaboard", "nvidia,tegra20";



	chosen {

		bootargs = "vmalloc=192M video=tegrafb console=ttyS0,115200n8 root=/dev/mmcblk1p3 rw rootwait";

	};



	memory {

		device_type = "memory";

		reg = < 0x00000000 0x40000000 >;

	};



	i2c@7000c000 {

		clock-frequency = <400000>;

	};



	i2c@7000c400 {

		clock-frequency = <400000>;

	};



	i2c@7000c500 {

		clock-frequency = <400000>;

	};



	i2c@7000d000 {

		clock-frequency = <400000>;



		adt7461@4c {

			compatible = "adt7461";

			reg = <0x4c>;

		};

	};



	serial@70006000 {

		status = "disable";

	};



	serial@70006040 {

		status = "disable";

	};



	serial@70006200 {

		status = "disable";

	};



	serial@70006300 {

		clock-frequency = < 216000000 >;

	};



	serial@70006400 {

		status = "disable";

	};



	sdhci@c8000000 {

		status = "disable";

	};



	sdhci@c8000200 {

		status = "disable";

	};



	sdhci@c8000400 {

		cd-gpios = <&gpio 69 0>; /* gpio PI5 */

		wp-gpios = <&gpio 57 0>; /* gpio PH1 */
@@ -29,4 +69,28 @@ 
	sdhci@c8000600 {

		support-8bit;

	};



	usb@c5000000 {

		nvidia,vbus-gpio = <&gpio 24 0>; /* PD0 */

	};



	gpio-keys {

		compatible = "gpio-keys";



		power {

			label = "Power";

			gpios = <&gpio 170 1>; /* gpio PV2, active low */

			linux,code = <116>; /* KEY_POWER */

			gpio-key,wakeup;

		};



		lid {

			label = "Lid";

			gpios = <&gpio 23 0>; /* gpio PC7 */

			linux,input-type = <5>; /* EV_SW */

			linux,code = <0>; /* SW_LID */

			debounce-interval = <1>;

			gpio-key,wakeup;

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE