Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / phy3250.dts

diff --git a/arch/arm/boot/dts/phy3250.dts b/arch/arm/boot/dts/phy3250.dts
index 802ec5b2fd00d0d40977624a9ae382b55e416b76..90fdbd77f2740f36c09a3daeaa359625107e8fe8 100644 (file)
--- a/arch/arm/boot/dts/phy3250.dts
+++ b/arch/arm/boot/dts/phy3250.dts
@@ -135,13 +135,11 @@
                        ssp0: ssp@20084000 {
                                #address-cells = <1>;
                                #size-cells = <0>;
-                               pl022,num-chipselects = <1>;
+                               num-cs = <1>;
                                cs-gpios = <&gpio 3 5 0>;
 
                                eeprom: at25@0 {
-                                       pl022,hierarchy = <0>;
                                        pl022,interface = <0>;
-                                       pl022,slave-tx-disable = <0>;
                                        pl022,com-mode = <0>;
                                        pl022,rx-level-trig = <1>;
                                        pl022,tx-level-trig = <1>;
@@ -191,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";
                };
        };
 };