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

Commit 5b22c33e authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'tegra-for-3.9-dt' of...

Merge tag 'tegra-for-3.9-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/dt

From Stephen Warren:
ARM: tegra: device tree updates

Numerous updates to the various Tegra device trees are made:

* Addition of NVIDIA Beaver (Tegra30) and Toradex Colibri T20 and Iris
  carrier boards.
* Enablement of the HDMI connector on most boards.
* Enablement of the keyboard controller on a few boards.
* Addition of the AC'97 controller to Tegra20.
* Addition of a GPIO poweroff node for TrimSlice.
* Changes to support the new "high speed UART" (DMA-capable) driver for
  Tegra serial ports, and enablement for Cardhu's UART C.
* A few cleanups, such as compatible flag fixes, node renames, node
  ordering fixes, commonizing properties into SoC .dtsi files, etc..

This pull request is based on (most of) the previous pull request with
tag tegra-for-3.9-soc-t114.

* tag 'tegra-for-3.9-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: (22 commits)
  ARM: dt: tegra30: Rename "smmu" to "iommu"
  ARM: dt: tegra20: Rename "gart" to "iommu"
  ARM: tegra: move serial clock-frequency attr into the Tegra30 dtsi
  ARM: tegra: Add Toradex Iris carrier board DT with T20 512MB COM
  ARM: tegra: Add Colibri T20 512MB COM device tree
  ARM: tegra: move serial clock-frequency attr into the Tegra20 dtsi
  ARM: tegra: harmony: enable keyboard in DT
  ARM: tegra: whistler: enable keyboard in DT
  ARM: tegra: cardhu: register UARTC
  ARM: tegra: seaboard: enable keyboard in DT
  ARM: tegra: add DT entry for KBC controller
  ARM: tegra: swap cache-/interrupt-ctrlr nodes in DT
  ASoC: tegra: add ac97 host controller to device tree
  ARM: DT: tegra: Add Tegra30 Beaver board support
  ARM: DT: tegra: Add board level compatible properties
  ARM: tegra: paz00: enable HDMI port
  ARM: tegra: ventana: enable HDMI port
  ARM: tegra: seaboard: enable HDMI port
  ARM: tegra: trimslice: add gpio-poweroff node to DT
  ARM: DT: tegra: Unify the description of Tegra20 boards
  ...
parents 0b6ad80a 3fbf07d8
Loading
Loading
Loading
Loading
+26 −6
Original line number Diff line number Diff line
NVIDIA Tegra device tree bindings
-------------------------------------------

Boards with the tegra20 SoC shall have the following properties:
SoCs
-------------------------------------------

Required root node property:
Each device tree must specify which Tegra SoC it uses, using one of the
following compatible values:

compatible = "nvidia,tegra20";
  nvidia,tegra20
  nvidia,tegra30

Boards with the tegra30 SoC shall have the following properties:
Boards
-------------------------------------------

Required root node property:
Each device tree must specify which one or more of the following
board-specific compatible values:

compatible = "nvidia,tegra30";
  ad,medcom-wide
  ad,plutux
  ad,tamonten
  ad,tec
  compal,paz00
  compulab,trimslice
  nvidia,beaver
  nvidia,cardhu
  nvidia,cardhu-a02
  nvidia,cardhu-a04
  nvidia,harmony
  nvidia,seaboard
  nvidia,ventana
  nvidia,whistler
  toradex,colibri_t20-512
  toradex,iris
+2 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ dtb-$(CONFIG_ARCH_SPEAR6XX)+= spear600-evb.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun4i-a10-cubieboard.dtb \
	sun5i-a13-olinuxino.dtb
dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
	tegra20-iris-512.dtb \
	tegra20-medcom-wide.dtb \
	tegra20-paz00.dtb \
	tegra20-plutux.dtb \
@@ -144,6 +145,7 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
	tegra20-trimslice.dtb \
	tegra20-ventana.dtb \
	tegra20-whistler.dtb \
	tegra30-beaver.dtb \
	tegra30-cardhu-a02.dtb \
	tegra30-cardhu-a04.dtb \
	tegra114-dalmore.dtb \
+491 −0
Original line number Diff line number Diff line
/include/ "tegra20.dtsi"

/ {
	model = "Toradex Colibri T20 512MB";
	compatible = "toradex,colibri_t20-512", "nvidia,tegra20";

	memory {
		reg = <0x00000000 0x20000000>;
	};

	host1x {
		hdmi {
			vdd-supply = <&hdmi_vdd_reg>;
			pll-supply = <&hdmi_pll_reg>;

			nvidia,ddc-i2c-bus = <&i2c_ddc>;
			nvidia,hpd-gpio = <&gpio 111 0>; /* PN7 */
		};
	};

	pinmux {
		pinctrl-names = "default";
		pinctrl-0 = <&state_default>;

		state_default: pinmux {
			audio_refclk {
				nvidia,pins = "cdev1";
				nvidia,function = "plla_out";
				nvidia,pull = <0>;
				nvidia,tristate = <0>;
			};
			crt {
				nvidia,pins = "crtp";
				nvidia,function = "crt";
				nvidia,pull = <0>;
				nvidia,tristate = <1>;
			};
			dap3 {
				nvidia,pins = "dap3";
				nvidia,function = "dap3";
				nvidia,pull = <0>;
				nvidia,tristate = <0>;
			};
			displaya {
				nvidia,pins = "ld0", "ld1", "ld2", "ld3",
					"ld4", "ld5", "ld6", "ld7", "ld8",
					"ld9", "ld10", "ld11", "ld12", "ld13",
					"ld14", "ld15", "ld16", "ld17",
					"lhs", "lpw0", "lpw2", "lsc0",
					"lsc1", "lsck", "lsda", "lspi", "lvs";
				nvidia,function = "displaya";
				nvidia,tristate = <1>;
			};
			gpio_dte {
				nvidia,pins = "dte";
				nvidia,function = "rsvd1";
				nvidia,pull = <0>;
				nvidia,tristate = <0>;
			};
			gpio_gmi {
				nvidia,pins = "ata", "atc", "atd", "ate",
					"dap1", "dap2", "dap4", "gpu", "irrx",
					"irtx", "spia", "spib", "spic";
				nvidia,function = "gmi";
				nvidia,pull = <0>;
				nvidia,tristate = <0>;
			};
			gpio_pta {
				nvidia,pins = "pta";
				nvidia,function = "rsvd4";
				nvidia,pull = <0>;
				nvidia,tristate = <0>;
			};
			gpio_uac {
				nvidia,pins = "uac";
				nvidia,function = "rsvd2";
				nvidia,pull = <0>;
				nvidia,tristate = <0>;
			};
			hdint {
				nvidia,pins = "hdint";
				nvidia,function = "hdmi";
				nvidia,tristate = <1>;
			};
			i2c1 {
				nvidia,pins = "rm";
				nvidia,function = "i2c1";
				nvidia,pull = <0>;
				nvidia,tristate = <1>;
			};
			i2c3 {
				nvidia,pins = "dtf";
				nvidia,function = "i2c3";
				nvidia,pull = <0>;
				nvidia,tristate = <1>;
			};
			i2cddc {
				nvidia,pins = "ddc";
				nvidia,function = "i2c2";
				nvidia,pull = <2>;
				nvidia,tristate = <1>;
			};
			i2cp {
				nvidia,pins = "i2cp";
				nvidia,function = "i2cp";
				nvidia,pull = <0>;
				nvidia,tristate = <0>;
			};
			irda {
				nvidia,pins = "uad";
				nvidia,function = "irda";
				nvidia,pull = <0>;
				nvidia,tristate = <1>;
			};
			nand {
				nvidia,pins = "kbca", "kbcc", "kbcd",
					"kbce", "kbcf";
				nvidia,function = "nand";
				nvidia,pull = <0>;
				nvidia,tristate = <0>;
			};
			owc {
				nvidia,pins = "owc";
				nvidia,function = "owr";
				nvidia,pull = <0>;
				nvidia,tristate = <1>;
			};
			pmc {
				nvidia,pins = "pmc";
				nvidia,function = "pwr_on";
				nvidia,tristate = <0>;
			};
			pwm {
				nvidia,pins = "sdb", "sdc", "sdd";
				nvidia,function = "pwm";
				nvidia,tristate = <1>;
			};
			sdio4 {
				nvidia,pins = "atb", "gma", "gme";
				nvidia,function = "sdio4";
				nvidia,pull = <0>;
				nvidia,tristate = <1>;
			};
			spi1 {
				nvidia,pins = "spid", "spie", "spif";
				nvidia,function = "spi1";
				nvidia,pull = <0>;
				nvidia,tristate = <1>;
			};
			spi4 {
				nvidia,pins = "slxa", "slxc", "slxd", "slxk";
				nvidia,function = "spi4";
				nvidia,pull = <0>;
				nvidia,tristate = <1>;
			};
			uarta {
				nvidia,pins = "sdio1";
				nvidia,function = "uarta";
				nvidia,pull = <0>;
				nvidia,tristate = <1>;
			};
			uartd {
				nvidia,pins = "gmc";
				nvidia,function = "uartd";
				nvidia,pull = <0>;
				nvidia,tristate = <1>;
			};
			ulpi {
				nvidia,pins = "uaa", "uab", "uda";
				nvidia,function = "ulpi";
				nvidia,pull = <0>;
				nvidia,tristate = <0>;
			};
			ulpi_refclk {
				nvidia,pins = "cdev2";
				nvidia,function = "pllp_out4";
				nvidia,pull = <0>;
				nvidia,tristate = <0>;
			};
			usb_gpio {
				nvidia,pins = "spig", "spih";
				nvidia,function = "spi2_alt";
				nvidia,pull = <0>;
				nvidia,tristate = <0>;
			};
			vi {
				nvidia,pins = "dta", "dtb", "dtc", "dtd";
				nvidia,function = "vi";
				nvidia,pull = <0>;
				nvidia,tristate = <1>;
			};
			vi_sc {
				nvidia,pins = "csus";
				nvidia,function = "vi_sensor_clk";
				nvidia,pull = <0>;
				nvidia,tristate = <1>;
			};
		};
	};

	i2c@7000c000 {
		clock-frequency = <400000>;
	};

	i2c_ddc: i2c@7000c400 {
		clock-frequency = <100000>;
	};

	i2c@7000c500 {
		clock-frequency = <400000>;
	};

	i2c@7000d000 {
		status = "okay";
		clock-frequency = <400000>;

		pmic: tps6586x@34 {
			compatible = "ti,tps6586x";
			reg = <0x34>;
			interrupts = <0 86 0x4>;

			ti,system-power-controller;

			#gpio-cells = <2>;
			gpio-controller;

			sys-supply = <&vdd_5v0_reg>;
			vin-sm0-supply = <&sys_reg>;
			vin-sm1-supply = <&sys_reg>;
			vin-sm2-supply = <&sys_reg>;
			vinldo01-supply = <&sm2_reg>;
			vinldo23-supply = <&sm2_reg>;
			vinldo4-supply = <&sm2_reg>;
			vinldo678-supply = <&sm2_reg>;
			vinldo9-supply = <&sm2_reg>;

			regulators {
				#address-cells = <1>;
				#size-cells = <0>;

				sys_reg: regulator@0 {
					reg = <0>;
					regulator-compatible = "sys";
					regulator-name = "vdd_sys";
					regulator-always-on;
				};

				regulator@1 {
					reg = <1>;
					regulator-compatible = "sm0";
					regulator-name = "vdd_sm0,vdd_core";
					regulator-min-microvolt = <1275000>;
					regulator-max-microvolt = <1275000>;
					regulator-always-on;
				};

				regulator@2 {
					reg = <2>;
					regulator-compatible = "sm1";
					regulator-name = "vdd_sm1,vdd_cpu";
					regulator-min-microvolt = <1100000>;
					regulator-max-microvolt = <1100000>;
					regulator-always-on;
				};

				sm2_reg: regulator@3 {
					reg = <3>;
					regulator-compatible = "sm2";
					regulator-name = "vdd_sm2,vin_ldo*";
					regulator-min-microvolt = <3700000>;
					regulator-max-microvolt = <3700000>;
					regulator-always-on;
				};

				/* LDO0 is not connected to anything */

				regulator@5 {
					reg = <5>;
					regulator-compatible = "ldo1";
					regulator-name = "vdd_ldo1,avdd_pll*";
					regulator-min-microvolt = <1100000>;
					regulator-max-microvolt = <1100000>;
					regulator-always-on;
				};

				regulator@6 {
					reg = <6>;
					regulator-compatible = "ldo2";
					regulator-name = "vdd_ldo2,vdd_rtc";
					regulator-min-microvolt = <1200000>;
					regulator-max-microvolt = <1200000>;
				};

				/* LDO3 is not connected to anything */

				regulator@8 {
					reg = <8>;
					regulator-compatible = "ldo4";
					regulator-name = "vdd_ldo4,avdd_osc,vddio_sys";
					regulator-min-microvolt = <1800000>;
					regulator-max-microvolt = <1800000>;
					regulator-always-on;
				};

				ldo5_reg: regulator@9 {
					reg = <9>;
					regulator-compatible = "ldo5";
					regulator-name = "vdd_ldo5,vdd_fuse";
					regulator-min-microvolt = <3300000>;
					regulator-max-microvolt = <3300000>;
					regulator-always-on;
				};

				regulator@10 {
					reg = <10>;
					regulator-compatible = "ldo6";
					regulator-name = "vdd_ldo6,avdd_vdac,vddio_vi,vddio_cam";
					regulator-min-microvolt = <1800000>;
					regulator-max-microvolt = <1800000>;
				};

				hdmi_vdd_reg: regulator@11 {
					reg = <11>;
					regulator-compatible = "ldo7";
					regulator-name = "vdd_ldo7,avdd_hdmi";
					regulator-min-microvolt = <3300000>;
					regulator-max-microvolt = <3300000>;
				};

				hdmi_pll_reg: regulator@12 {
					reg = <12>;
					regulator-compatible = "ldo8";
					regulator-name = "vdd_ldo8,avdd_hdmi_pll";
					regulator-min-microvolt = <1800000>;
					regulator-max-microvolt = <1800000>;
				};

				regulator@13 {
					reg = <13>;
					regulator-compatible = "ldo9";
					regulator-name = "vdd_ldo9,avdd_2v85,vdd_ddr_rx";
					regulator-min-microvolt = <2850000>;
					regulator-max-microvolt = <2850000>;
					regulator-always-on;
				};

				regulator@14 {
					reg = <14>;
					regulator-compatible = "ldo_rtc";
					regulator-name = "vdd_rtc_out,vdd_cell";
					regulator-min-microvolt = <3300000>;
					regulator-max-microvolt = <3300000>;
					regulator-always-on;
				};
			};
		};

		temperature-sensor@4c {
			compatible = "national,lm95245";
			reg = <0x4c>;
		};
	};

	memory-controller@7000f400 {
		emc-table@83250 {
			reg = <83250>;
			compatible = "nvidia,tegra20-emc-table";
			clock-frequency = <83250>;
			nvidia,emc-registers =   <0x00000005 0x00000011
				0x00000004 0x00000002 0x00000004 0x00000004
				0x00000001 0x0000000a 0x00000002 0x00000002
				0x00000001 0x00000001 0x00000003 0x00000004
				0x00000003 0x00000009 0x0000000c 0x0000025f
				0x00000000 0x00000003 0x00000003 0x00000002
				0x00000002 0x00000001 0x00000008 0x000000c8
				0x00000003 0x00000005 0x00000003 0x0000000c
				0x00000002 0x00000000 0x00000000 0x00000002
				0x00000000 0x00000000 0x00000083 0x00520006
				0x00000010 0x00000008 0x00000000 0x00000000
				0x00000000 0x00000000 0x00000000 0x00000000>;
		};
		emc-table@133200 {
			reg = <133200>;
			compatible = "nvidia,tegra20-emc-table";
			clock-frequency = <133200>;
			nvidia,emc-registers =   <0x00000008 0x00000019
				0x00000006 0x00000002 0x00000004 0x00000004
				0x00000001 0x0000000a 0x00000002 0x00000002
				0x00000002 0x00000001 0x00000003 0x00000004
				0x00000003 0x00000009 0x0000000c 0x0000039f
				0x00000000 0x00000003 0x00000003 0x00000002
				0x00000002 0x00000001 0x00000008 0x000000c8
				0x00000003 0x00000007 0x00000003 0x0000000c
				0x00000002 0x00000000 0x00000000 0x00000002
				0x00000000 0x00000000 0x00000083 0x00510006
				0x00000010 0x00000008 0x00000000 0x00000000
				0x00000000 0x00000000 0x00000000 0x00000000>;
		};
		emc-table@166500 {
			reg = <166500>;
			compatible = "nvidia,tegra20-emc-table";
			clock-frequency = <166500>;
			nvidia,emc-registers =   <0x0000000a 0x00000021
				0x00000008 0x00000003 0x00000004 0x00000004
				0x00000002 0x0000000a 0x00000003 0x00000003
				0x00000002 0x00000001 0x00000003 0x00000004
				0x00000003 0x00000009 0x0000000c 0x000004df
				0x00000000 0x00000003 0x00000003 0x00000003
				0x00000003 0x00000001 0x00000009 0x000000c8
				0x00000003 0x00000009 0x00000004 0x0000000c
				0x00000002 0x00000000 0x00000000 0x00000002
				0x00000000 0x00000000 0x00000083 0x004f0006
				0x00000010 0x00000008 0x00000000 0x00000000
				0x00000000 0x00000000 0x00000000 0x00000000>;
		};
		emc-table@333000 {
			reg = <333000>;
			compatible = "nvidia,tegra20-emc-table";
			clock-frequency = <333000>;
			nvidia,emc-registers =   <0x00000014 0x00000041
				0x0000000f 0x00000005 0x00000004 0x00000005
				0x00000003 0x0000000a 0x00000005 0x00000005
				0x00000004 0x00000001 0x00000003 0x00000004
				0x00000003 0x00000009 0x0000000c 0x000009ff
				0x00000000 0x00000003 0x00000003 0x00000005
				0x00000005 0x00000001 0x0000000e 0x000000c8
				0x00000003 0x00000011 0x00000006 0x0000000c
				0x00000002 0x00000000 0x00000000 0x00000002
				0x00000000 0x00000000 0x00000083 0x00380006
				0x00000010 0x00000008 0x00000000 0x00000000
				0x00000000 0x00000000 0x00000000 0x00000000>;
		};
	};

	ac97: ac97 {
		status = "okay";
		nvidia,codec-reset-gpio = <&gpio 168 0>; /* gpio PV0 */
		nvidia,codec-sync-gpio = <&gpio 120 0>; /* gpio PP0 */
	};

	usb@c5004000 {
		status = "okay";
		nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */
	};

	sdhci@c8000600 {
		cd-gpios = <&gpio 23 0>; /* gpio PC7 */
	};

	sound {
		compatible = "nvidia,tegra-audio-wm9712-colibri_t20",
			         "nvidia,tegra-audio-wm9712";
		nvidia,model = "Colibri T20 AC97 Audio";

		nvidia,audio-routing =
			"Headphone", "HPOUTL",
			"Headphone", "HPOUTR",
			"LineIn", "LINEINL",
			"LineIn", "LINEINR",
			"Mic", "MIC1";

		nvidia,ac97-controller = <&ac97>;
	};

	regulators {
		compatible = "simple-bus";
		#address-cells = <1>;
		#size-cells = <0>;

		vdd_5v0_reg: regulator@100 {
			compatible = "regulator-fixed";
			reg = <100>;
			regulator-name = "vdd_5v0";
			regulator-min-microvolt = <5000000>;
			regulator-max-microvolt = <5000000>;
			regulator-always-on;
		};

		regulator@101 {
			compatible = "regulator-fixed";
			reg = <101>;
			regulator-name = "internal_usb";
			regulator-min-microvolt = <5000000>;
			regulator-max-microvolt = <5000000>;
			enable-active-high;
			regulator-boot-on;
			regulator-always-on;
			gpio = <&gpio 217 0>;
		};
	};
};
+118 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@
/include/ "tegra20.dtsi"

/ {
	model = "NVIDIA Tegra2 Harmony evaluation board";
	model = "NVIDIA Tegra20 Harmony evaluation board";
	compatible = "nvidia,harmony", "nvidia,tegra20";

	memory {
@@ -252,7 +252,6 @@

	serial@70006300 {
		status = "okay";
		clock-frequency = <216000000>;
	};

	i2c@7000c000 {
@@ -452,6 +451,123 @@
		bus-width = <8>;
	};

	kbc {
		status = "okay";
		nvidia,debounce-delay-ms = <2>;
		nvidia,repeat-delay-ms = <160>;
		nvidia,kbc-row-pins = <0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15>;
		nvidia,kbc-col-pins = <16 17 18 19 20 21 22 23>;
		linux,keymap = <0x00020011	/* KEY_W */
				0x0003001F	/* KEY_S */
				0x0004001E	/* KEY_A */
				0x0005002C	/* KEY_Z */
				0x000701D0	/* KEY_FN */
				0x0107008B	/* KEY_MENU */
				0x02060038	/* KEY_LEFTALT */
				0x02070064	/* KEY_RIGHTALT */
				0x03000006	/* KEY_5 */
				0x03010005	/* KEY_4 */
				0x03020013	/* KEY_R */
				0x03030012	/* KEY_E */
				0x03040021	/* KEY_F */
				0x03050020	/* KEY_D */
				0x0306002D	/* KEY_X */
				0x04000008	/* KEY_7 */
				0x04010007	/* KEY_6 */
				0x04020014	/* KEY_T */
				0x04030023	/* KEY_H */
				0x04040022	/* KEY_G */
				0x0405002F	/* KEY_V */
				0x0406002E	/* KEY_C */
				0x04070039	/* KEY_SPACE */
				0x0500000A	/* KEY_9 */
				0x05010009	/* KEY_8 */
				0x05020016	/* KEY_U */
				0x05030015	/* KEY_Y */
				0x05040024	/* KEY_J */
				0x05050031	/* KEY_N */
				0x05060030	/* KEY_B */
				0x0507002B	/* KEY_BACKSLASH */
				0x0600000C	/* KEY_MINUS */
				0x0601000B	/* KEY_0 */
				0x06020018	/* KEY_O */
				0x06030017	/* KEY_I */
				0x06040026	/* KEY_L */
				0x06050025	/* KEY_K */
				0x06060033	/* KEY_COMMA */
				0x06070032	/* KEY_M */
				0x0701000D	/* KEY_EQUAL */
				0x0702001B	/* KEY_RIGHTBRACE */
				0x0703001C	/* KEY_ENTER */
				0x0707008B	/* KEY_MENU */
				0x0804002A	/* KEY_LEFTSHIFT */
				0x08050036	/* KEY_RIGHTSHIFT */
				0x0905001D	/* KEY_LEFTCTRL */
				0x09070061	/* KEY_RIGHTCTRL */
				0x0B00001A	/* KEY_LEFTBRACE */
				0x0B010019	/* KEY_P */
				0x0B020028	/* KEY_APOSTROPHE */
				0x0B030027	/* KEY_SEMICOLON */
				0x0B040035	/* KEY_SLASH */
				0x0B050034	/* KEY_DOT */
				0x0C000044	/* KEY_F10 */
				0x0C010043	/* KEY_F9 */
				0x0C02000E	/* KEY_BACKSPACE */
				0x0C030004	/* KEY_3 */
				0x0C040003	/* KEY_2 */
				0x0C050067	/* KEY_UP */
				0x0C0600D2	/* KEY_PRINT */
				0x0C070077	/* KEY_PAUSE */
				0x0D00006E	/* KEY_INSERT */
				0x0D01006F	/* KEY_DELETE */
				0x0D030068	/* KEY_PAGEUP */
				0x0D04006D	/* KEY_PAGEDOWN */
				0x0D05006A	/* KEY_RIGHT */
				0x0D06006C	/* KEY_DOWN */
				0x0D070069	/* KEY_LEFT */
				0x0E000057	/* KEY_F11 */
				0x0E010058	/* KEY_F12 */
				0x0E020042	/* KEY_F8 */
				0x0E030010	/* KEY_Q */
				0x0E04003E	/* KEY_F4 */
				0x0E05003D	/* KEY_F3 */
				0x0E060002	/* KEY_1 */
				0x0E070041	/* KEY_F7 */
				0x0F000001	/* KEY_ESC */
				0x0F010029	/* KEY_GRAVE */
				0x0F02003F	/* KEY_F5 */
				0x0F03000F	/* KEY_TAB */
				0x0F04003B	/* KEY_F1 */
				0x0F05003C	/* KEY_F2 */
				0x0F06003A	/* KEY_CAPSLOCK */
				0x0F070040	/* KEY_F6 */
				0x14000047	/* KEY_KP7 */
				0x15000049	/* KEY_KP9 */
				0x15010048	/* KEY_KP8 */
				0x1502004B	/* KEY_KP4 */
				0x1504004F	/* KEY_KP1 */
				0x1601004E	/* KEY_KPSLASH */
				0x1602004D	/* KEY_KP6 */
				0x1603004C	/* KEY_KP5 */
				0x16040051	/* KEY_KP3 */
				0x16050050	/* KEY_KP2 */
				0x16070052	/* KEY_KP0 */
				0x1B010037	/* KEY_KPASTERISK */
				0x1B03004A	/* KEY_KPMINUS */
				0x1B04004E	/* KEY_KPPLUS */
				0x1B050053	/* KEY_KPDOT */
				0x1C050073	/* KEY_VOLUMEUP */
				0x1D030066	/* KEY_HOME */
				0x1D04006B	/* KEY_END */
				0x1D0500E1	/* KEY_BRIGHTNESSUP */
				0x1D060072	/* KEY_VOLUMEDOWN */
				0x1D0700E0	/* KEY_BRIGHTNESSDOWN */
				0x1E000045	/* KEY_NUMLOCK */
				0x1E010046	/* KEY_SCROLLLOCK */
				0x1E020071	/* KEY_MUTE */
				0x1F0400D6>;	/* KEY_QUESTION */
	};

	regulators {
		compatible = "simple-bus";
		#address-cells = <1>;
+89 −0
Original line number Diff line number Diff line
/dts-v1/;

/include/ "tegra20-colibri-512.dtsi"

/ {
	model = "Toradex Colibri T20 512MB on Iris";
	compatible = "toradex,iris", "toradex,colibri_t20-512", "nvidia,tegra20";

	host1x {
		hdmi {
			status = "okay";
		};
	};

	pinmux {
		state_default: pinmux {
			hdint {
				nvidia,tristate = <0>;
			};

			i2cddc {
				nvidia,tristate = <0>;
			};

			sdio4 {
				nvidia,tristate = <0>;
			};

			uarta {
				nvidia,tristate = <0>;
			};

			uartd {
				nvidia,tristate = <0>;
			};
		};
	};

	usb@c5000000 {
		status = "okay";
		dr_mode = "otg";
	};

	usb@c5008000 {
		status = "okay";
	};

	serial@70006000 {
		status = "okay";
	};

	serial@70006300 {
		status = "okay";
	};

	i2c_ddc: i2c@7000c400 {
		status = "okay";
	};

	sdhci@c8000600 {
		status = "okay";
		bus-width = <4>;
		vmmc-supply = <&vcc_sd_reg>;
		vqmmc-supply = <&vcc_sd_reg>;
	};

	regulators {
		regulator@0 {
			compatible = "regulator-fixed";
			reg = <0>;
			regulator-name = "usb_host_vbus";
			regulator-min-microvolt = <5000000>;
			regulator-max-microvolt = <5000000>;
			regulator-boot-on;
			regulator-always-on;
			gpio = <&gpio 178 0>;
		};

		vcc_sd_reg: regulator@1 {
			compatible = "regulator-fixed";
			reg = <1>;
			regulator-name = "vcc_sd";
			regulator-min-microvolt = <3300000>;
			regulator-max-microvolt = <3300000>;
			regulator-boot-on;
			regulator-always-on;
		};
	};
};
Loading