diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-29 14:26:35 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-29 14:26:35 -0700 |
| commit | 99261fbad0a16f105b262d7525801697588ba526 (patch) | |
| tree | 4ec0482e58f36bcabe49d47843cbbc7d34b73ebb | |
| parent | 325f06713337928df572d12d65bdaf91f4d53d83 (diff) | |
| parent | 07c7e12ca7e32e942d2c42dd67329c5fc3886b07 (diff) | |
| download | olio-linux-3.10-99261fbad0a16f105b262d7525801697588ba526.tar.xz olio-linux-3.10-99261fbad0a16f105b262d7525801697588ba526.zip | |
Merge branch 'lpc32xx/dts' of git://git.antcom.de/linux-2.6 into next/dt
From Roland Stigge. Pulling in one bugfix to the lpc32xx DT conversion.
* 'lpc32xx/dts' of git://git.antcom.de/linux-2.6:
ARM: LPC32xx: LED fix in PHY3250 DTS file
| -rw-r--r-- | arch/arm/boot/dts/phy3250.dts | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/phy3250.dts b/arch/arm/boot/dts/phy3250.dts index a7ad85e4b8f..90fdbd77f27 100644 --- a/arch/arm/boot/dts/phy3250.dts +++ b/arch/arm/boot/dts/phy3250.dts @@ -189,16 +189,14 @@ leds { compatible = "gpio-leds"; - led0 { - gpios = <&gpio 5 1 1>; /* GPO_P3 1, GPIO 80, active low */ - linux,default-trigger = "heartbeat"; + led0 { /* red */ + gpios = <&gpio 5 1 0>; /* GPO_P3 1, GPIO 80, active high */ default-state = "off"; }; - led1 { - gpios = <&gpio 5 14 1>; /* GPO_P3 14, GPIO 93, active low */ - linux,default-trigger = "timer"; - default-state = "off"; + led1 { /* green */ + gpios = <&gpio 5 14 0>; /* GPO_P3 14, GPIO 93, active high */ + linux,default-trigger = "heartbeat"; }; }; }; |