diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-08-15 14:33:02 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-08-15 18:18:29 +0200 |
| commit | 0a224c514f3e9620e167f9f6497ae526a41df22c (patch) | |
| tree | 54193db2b3c577cb6b086481da689ac8cc8322c5 /arch/arm/boot | |
| parent | c6041d4adde006216cd7e8da4558323ddb2e4255 (diff) | |
| parent | b74ffd85e32d44e8ed405a2a0a175ef4cd39cf67 (diff) | |
| download | blackbird-op-linux-0a224c514f3e9620e167f9f6497ae526a41df22c.tar.gz blackbird-op-linux-0a224c514f3e9620e167f9f6497ae526a41df22c.zip | |
Merge branch 'fixes-for-v3.6' of git://git.infradead.org/users/jcooper/linux into fixes
From Jason Cooper <jason@lakedaemon.net>:
Small fixes for the orion platforms including kirkwood.
* 'fixes-for-v3.6' of git://git.infradead.org/users/jcooper/linux:
ARM: Kirkwood: fix Makefile.boot
ARM: Kirkwood: Fix iconnect leds
ARM: Orion: Set eth packet size csum offload limit
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-iconnect.dts | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts index 52d947045106..f8ca6fa88192 100644 --- a/arch/arm/boot/dts/kirkwood-iconnect.dts +++ b/arch/arm/boot/dts/kirkwood-iconnect.dts @@ -41,9 +41,13 @@ }; power-blue { label = "power:blue"; - gpios = <&gpio1 11 0>; + gpios = <&gpio1 10 0>; linux,default-trigger = "timer"; }; + power-red { + label = "power:red"; + gpios = <&gpio1 11 0>; + }; usb1 { label = "usb1:blue"; gpios = <&gpio1 12 0>; |
