From a3b465c70529df0a46b86383b7dca0b78866c5a6 Mon Sep 17 00:00:00 2001 From: "Arnaud Patard (Rtp)" Date: Sun, 5 Aug 2012 22:35:56 +0200 Subject: [PATCH] --- yaml --- r: 322310 b: refs/heads/master c: 03810a20308af54d01b096bc19a8c145684bd6b2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/boot/dts/kirkwood-iconnect.dts | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ae5f90014b00..4834c0ac745c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 58569aee5a1a5dcc25c34a0a2ed9a377874e6b05 +refs/heads/master: 03810a20308af54d01b096bc19a8c145684bd6b2 diff --git a/trunk/arch/arm/boot/dts/kirkwood-iconnect.dts b/trunk/arch/arm/boot/dts/kirkwood-iconnect.dts index 52d947045106..f8ca6fa88192 100644 --- a/trunk/arch/arm/boot/dts/kirkwood-iconnect.dts +++ b/trunk/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>;