diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-03-04 22:21:52 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-04 22:22:33 +0100 |
commit | 2eed4e7d8631d8404fdef9c09d26a48376186ad1 (patch) | |
tree | e3f85a5f6e0d643216b1d8994dc023fc4e0c0b2b /arch/arm/boot/dts/tegra-paz00.dts | |
parent | Merge branch 'features/imx31-moboard' of git://git.pengutronix.de/git/imx/lin... (diff) | |
parent | ARM: tegra: match SoC name not board name in DT board files (diff) | |
download | linux-2eed4e7d8631d8404fdef9c09d26a48376186ad1.tar.xz linux-2eed4e7d8631d8404fdef9c09d26a48376186ad1.zip |
Merge tag 'tegra-boards' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into tegra/boards
Tegra board updates. Most of the board updates for tegra30 and for some
of the driver device-tree conversions have gone in through the other
branches, so that leaves quite little left here -- mostly a couple
of updates to the not-yet-converted tegra2 boards and a couple of
device-tree updates.
* tag 'tegra-boards' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra:
ARM: tegra: match SoC name not board name in DT board files
ARM: tegra: PCIe: Provide 3.3V supply voltage
ARM: dt: tegra: add the wifi led to paz00 device tree
ARM: dt: tegra: add the power gpio key to paz00 device tree
ARM: dt: tegra: add ADT7461 temperature sensor to paz00 device tree
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/tegra-paz00.dts')
-rw-r--r-- | arch/arm/boot/dts/tegra-paz00.dts | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/tegra-paz00.dts b/arch/arm/boot/dts/tegra-paz00.dts index 825d2957da0b..61f385809970 100644 --- a/arch/arm/boot/dts/tegra-paz00.dts +++ b/arch/arm/boot/dts/tegra-paz00.dts @@ -35,6 +35,11 @@ i2c@7000d000 { clock-frequency = <400000>; + + adt7461@4c { + compatible = "adi,adt7461"; + reg = <0x4c>; + }; }; serial@70006000 { @@ -74,4 +79,25 @@ sdhci@c8000600 { support-8bit; }; + + gpio-keys { + compatible = "gpio-keys"; + + power { + label = "Power"; + gpios = <&gpio 79 1>; /* gpio PJ7, active low */ + linux,code = <116>; /* KEY_POWER */ + gpio-key,wakeup; + }; + }; + + gpio-leds { + compatible = "gpio-leds"; + + wifi { + label = "wifi-led"; + gpios = <&gpio 24 0>; + linux,default-trigger = "rfkill0"; + }; + }; }; |