Merge tag 'kirkwood_fixes_for_v3.7' of git://git.infradead.org/users/jcooper/linux into fixes

From Jason Cooper:
 - improve #ifdef logic to prevent linker errors with CACHE_FEROCEON_L2
 - lsxl board dts fixes

* tag 'kirkwood_fixes_for_v3.7' of git://git.infradead.org/users/jcooper/linux:
  ARM: kirkwood: fix buttons on lsxl boards
  ARM: kirkwood: fix LEDs names for lsxl boards
  ARM: Kirkwood: fix disabling CACHE_FEROCEON_L2

3 files changed, 12 insertions, 12 deletions

diff --git a/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
index 8ac51c08269d..8fea375c734d 100644
--- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi
+++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
@@ -48,17 +48,19 @@
                 #size-cells = <0>;
                 button@1 {
                         label = "Function Button";
-                        linux,code = <132>;
+                        linux,code = <357>;
                         gpios = <&gpio1 9 1>;
                 };
                 button@2 {
                         label = "Power-on Switch";
-                        linux,code = <116>;
+                        linux,code = <0>;
+                        linux,input-type = <5>;
                         gpios = <&gpio1 10 1>;
                 };
                 button@3 {
                         label = "Power-auto Switch";
-                        linux,code = <142>;
+                        linux,code = <1>;
+                        linux,input-type = <5>;
                         gpios = <&gpio1 11 1>;
                 };
         };
@@ -67,28 +69,28 @@
                 compatible = "gpio-leds";
 
                 led@1 {
-                        label = "lschlv2:blue:func";
+                        label = "lsxl:blue:func";
                         gpios = <&gpio1 4 1>;
                 };
 
                 led@2 {
-                        label = "lschlv2:red:alarm";
+                        label = "lsxl:red:alarm";
                         gpios = <&gpio1 5 1>;
                 };
 
                 led@3 {
-                        label = "lschlv2:amber:info";
+                        label = "lsxl:amber:info";
                         gpios = <&gpio1 6 1>;
                 };
 
                 led@4 {
-                        label = "lschlv2:blue:power";
+                        label = "lsxl:blue:power";
                         gpios = <&gpio1 7 1>;
                         linux,default-trigger = "default-on";
                 };
 
                 led@5 {
-                        label = "lschlv2:red:func";
+                        label = "lsxl:red:func";
                         gpios = <&gpio1 16 1>;
                 };
         };
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
index 70c5a2882409..d94872fed8c0 100644
--- a/arch/arm/mach-kirkwood/board-dt.c
+++ b/arch/arm/mach-kirkwood/board-dt.c
@@ -51,9 +51,7 @@ static void __init kirkwood_dt_init(void)
 
         kirkwood_setup_cpu_mbus();
 
-#ifdef CONFIG_CACHE_FEROCEON_L2
         kirkwood_l2_init();
-#endif
 
         /* Setup root of clk tree */
         kirkwood_clk_init();
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index 3991077f58a2..2c6c218fb79e 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -633,6 +633,7 @@ char * __init kirkwood_id(void)
 
 void __init kirkwood_l2_init(void)
 {
+#ifdef CONFIG_CACHE_FEROCEON_L2
 #ifdef CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH
         writel(readl(L2_CONFIG_REG) | L2_WRITETHROUGH, L2_CONFIG_REG);
         feroceon_l2_init(1);
@@ -640,6 +641,7 @@ void __init kirkwood_l2_init(void)
         writel(readl(L2_CONFIG_REG) & ~L2_WRITETHROUGH, L2_CONFIG_REG);
         feroceon_l2_init(0);
 #endif
+#endif
 }
 
 void __init kirkwood_init(void)
@@ -657,9 +659,7 @@ void __init kirkwood_init(void)
 
         kirkwood_setup_cpu_mbus();
 
-#ifdef CONFIG_CACHE_FEROCEON_L2
         kirkwood_l2_init();
-#endif
 
         /* Setup root of clk tree */
         kirkwood_clk_init();