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
  ...

1 files changed, 154 insertions, 4 deletions

diff --git a/arch/arm/boot/dts/tegra20-seaboard.dts b/arch/arm/boot/dts/tegra20-seaboard.dts
index 607bf0c6bf9c..37b3a57ec0f1 100644
--- a/arch/arm/boot/dts/tegra20-seaboard.dts
+++ b/arch/arm/boot/dts/tegra20-seaboard.dts
@@ -10,6 +10,18 @@
                 reg = <0x00000000 0x40000000>;
         };
 
+        host1x {
+                hdmi {
+                        status = "okay";
+
+                        vdd-supply = <&hdmi_vdd_reg>;
+                        pll-supply = <&hdmi_pll_reg>;
+
+                        nvidia,ddc-i2c-bus = <&hdmi_ddc>;
+                        nvidia,hpd-gpio = <&gpio 111 0>; /* PN7 */
+                };
+        };
+
         pinmux {
                 pinctrl-names = "default";
                 pinctrl-0 = <&state_default>;
@@ -291,7 +303,6 @@
 
         serial@70006300 {
                 status = "okay";
-                clock-frequency = <216000000>;
         };
 
         i2c@7000c000 {
@@ -345,7 +356,7 @@
                 pinctrl-1 = <&state_i2cmux_pta>;
                 pinctrl-2 = <&state_i2cmux_idle>;
 
-                i2c@0 {
+                hdmi_ddc: i2c@0 {
                         reg = <0>;
                         #address-cells = <1>;
                         #size-cells = <0>;
@@ -463,13 +474,13 @@
                                         regulator-max-microvolt = <1800000>;
                                 };
 
-                                ldo7 {
+                                hdmi_vdd_reg: ldo7 {
                                         regulator-name = "vdd_ldo7,avdd_hdmi,vdd_fuse";
                                         regulator-min-microvolt = <3300000>;
                                         regulator-max-microvolt = <3300000>;
                                 };
 
-                                ldo8 {
+                                hdmi_pll_reg: ldo8 {
                                         regulator-name = "vdd_ldo8,avdd_hdmi_pll";
                                         regulator-min-microvolt = <1800000>;
                                         regulator-max-microvolt = <1800000>;
@@ -604,6 +615,145 @@
                 };
         };
 
+        kbc {
+                status = "okay";
+                nvidia,debounce-delay-ms = <32>;
+                nvidia,repeat-delay-ms = <160>;
+                nvidia,ghost-filter;
+                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 */
+
+                                0x0107007D      /* KEY_LEFTMETA */
+                                0x02060064      /* KEY_RIGHTALT */
+                                0x02070038      /* KEY_LEFTALT */
+
+                                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 */
+
+                                0x08040036      /* KEY_RIGHTSHIFT */
+                                0x0805002A      /* KEY_LEFTSHIFT */
+
+                                0x09050061      /* KEY_RIGHTCTRL */
+                                0x0907001D      /* KEY_LEFTCTRL */
+
+                                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 */
+
+                                /* Software Handled Function Keys */
+                                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 */
+                                0x1D0500E0      /* KEY_BRIGHTNESSDOWN */
+                                0x1D060072      /* KEY_VOLUMEDOWN */
+                                0x1D0700E1      /* KEY_BRIGHTNESSUP */
+
+                                0x1E000045      /* KEY_NUMLOCK */
+                                0x1E010046      /* KEY_SCROLLLOCK */
+                                0x1E020071      /* KEY_MUTE */
+
+                                0x1F04008A>;    /* KEY_HELP */
+        };
         regulators {
                 compatible = "simple-bus";
                 #address-cells = <1>;