Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC device tree conversions from Arnd Bergmann:
 "These are device tree conversions for a number of platforms, with the
  intention of turning code from board files into device tree
  descriptions.  Notable changes are:

   - davinci bindings for pinctrl, MTD, RTC, watchdog and i2c

   - nomadik bindings for all devices, removing the board files

   - bcm2835 bindings for mmc and i2c

   - tegra bindings for hdmi, keyboard, audio, as well as some updates

   - at91 bindings for hardware ecc and for devices on RM9200

   - mxs bindings for cfa100xx

   - sunxi support for Miniand Hackberry board"

* tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (72 commits)
  Revert "sunxi: a10-cubieboard: Add user LEDs to the device tree"
  Revert "sunxi: a13-olinuxino: Add user LED to the device tree"
  clk: tegra: initialise parent of uart clocks
  ARM: tegra: remove clock-frequency properties from serial nodes
  clk: tegra: fix driver to match DT binding
  clk: tegra: local arrays should be static
  clk: tegra: Add missing spinlock for hclk and pclk
  clk: tegra: Implement locking for super clock
  clk: tegra: fix wrong clock index between se to sata_cold
  sunxi: a13-olinuxino: Add user LED to the device tree
  ARM: davinci: da850 DT: add support for machine reboot
  ARM: davinci: da850: add wdt DT node
  ARM: davinci: da850: add DT node for I2C0
  ARM: at91: at91sam9n12: add DT parameters to enable PMECC
  ARM: at91: at91sam9x5: add DT parameters to enable PMECC
  ARM: at91: add EMAC bindings to RM9200 DT
  ARM: at91: add SSC bindings to RM9200 DT
  ARM: at91: add MMC bindings to RM9200 DT
  ARM: at91: Animeo IP: enable watchdog support
  ARM: nomadik: fix OF compilation regression
  ...

1 files changed, 13 insertions, 2 deletions

diff --git a/arch/arm/boot/dts/tegra20-whistler.dts b/arch/arm/boot/dts/tegra20-whistler.dts
index 20d576ecd555..ea57c0f6dcce 100644
--- a/arch/arm/boot/dts/tegra20-whistler.dts
+++ b/arch/arm/boot/dts/tegra20-whistler.dts
@@ -3,7 +3,7 @@
 /include/ "tegra20.dtsi"
 
 / {
-        model = "NVIDIA Tegra2 Whistler evaluation board";
+        model = "NVIDIA Tegra20 Whistler evaluation board";
         compatible = "nvidia,whistler", "nvidia,tegra20";
 
         memory {
@@ -255,7 +255,6 @@
 
         serial@70006000 {
                 status = "okay";
-                clock-frequency = <216000000>;
         };
 
         hdmi_ddc: i2c@7000c400 {
@@ -520,6 +519,18 @@
                 bus-width = <8>;
         };
 
+        kbc {
+                status = "okay";
+                nvidia,debounce-delay-ms = <20>;
+                nvidia,repeat-delay-ms = <160>;
+                nvidia,kbc-row-pins = <0 1 2>;
+                nvidia,kbc-col-pins = <16 17>;
+                linux,keymap = <0x00000074      /* KEY_POWER */
+                                0x01000066      /* KEY_HOME */
+                                0x0101009E      /* KEY_BACK */
+                                0x0201008B>;    /* KEY_MENU */
+        };
+
         regulators {
                 compatible = "simple-bus";
                 #address-cells = <1>;