Commit 70f3900e authored by Olof Johansson's avatar Olof Johansson

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
parents 068a565a 12431634
...@@ -48,17 +48,19 @@ gpio_keys { ...@@ -48,17 +48,19 @@ gpio_keys {
#size-cells = <0>; #size-cells = <0>;
button@1 { button@1 {
label = "Function Button"; label = "Function Button";
linux,code = <132>; linux,code = <357>;
gpios = <&gpio1 9 1>; gpios = <&gpio1 9 1>;
}; };
button@2 { button@2 {
label = "Power-on Switch"; label = "Power-on Switch";
linux,code = <116>; linux,code = <0>;
linux,input-type = <5>;
gpios = <&gpio1 10 1>; gpios = <&gpio1 10 1>;
}; };
button@3 { button@3 {
label = "Power-auto Switch"; label = "Power-auto Switch";
linux,code = <142>; linux,code = <1>;
linux,input-type = <5>;
gpios = <&gpio1 11 1>; gpios = <&gpio1 11 1>;
}; };
}; };
...@@ -67,28 +69,28 @@ gpio_leds { ...@@ -67,28 +69,28 @@ gpio_leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
led@1 { led@1 {
label = "lschlv2:blue:func"; label = "lsxl:blue:func";
gpios = <&gpio1 4 1>; gpios = <&gpio1 4 1>;
}; };
led@2 { led@2 {
label = "lschlv2:red:alarm"; label = "lsxl:red:alarm";
gpios = <&gpio1 5 1>; gpios = <&gpio1 5 1>;
}; };
led@3 { led@3 {
label = "lschlv2:amber:info"; label = "lsxl:amber:info";
gpios = <&gpio1 6 1>; gpios = <&gpio1 6 1>;
}; };
led@4 { led@4 {
label = "lschlv2:blue:power"; label = "lsxl:blue:power";
gpios = <&gpio1 7 1>; gpios = <&gpio1 7 1>;
linux,default-trigger = "default-on"; linux,default-trigger = "default-on";
}; };
led@5 { led@5 {
label = "lschlv2:red:func"; label = "lsxl:red:func";
gpios = <&gpio1 16 1>; gpios = <&gpio1 16 1>;
}; };
}; };
......
...@@ -51,9 +51,7 @@ static void __init kirkwood_dt_init(void) ...@@ -51,9 +51,7 @@ static void __init kirkwood_dt_init(void)
kirkwood_setup_cpu_mbus(); kirkwood_setup_cpu_mbus();
#ifdef CONFIG_CACHE_FEROCEON_L2
kirkwood_l2_init(); kirkwood_l2_init();
#endif
/* Setup root of clk tree */ /* Setup root of clk tree */
kirkwood_clk_init(); kirkwood_clk_init();
......
...@@ -633,6 +633,7 @@ char * __init kirkwood_id(void) ...@@ -633,6 +633,7 @@ char * __init kirkwood_id(void)
void __init kirkwood_l2_init(void) void __init kirkwood_l2_init(void)
{ {
#ifdef CONFIG_CACHE_FEROCEON_L2
#ifdef CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH #ifdef CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH
writel(readl(L2_CONFIG_REG) | L2_WRITETHROUGH, L2_CONFIG_REG); writel(readl(L2_CONFIG_REG) | L2_WRITETHROUGH, L2_CONFIG_REG);
feroceon_l2_init(1); feroceon_l2_init(1);
...@@ -640,6 +641,7 @@ void __init kirkwood_l2_init(void) ...@@ -640,6 +641,7 @@ void __init kirkwood_l2_init(void)
writel(readl(L2_CONFIG_REG) & ~L2_WRITETHROUGH, L2_CONFIG_REG); writel(readl(L2_CONFIG_REG) & ~L2_WRITETHROUGH, L2_CONFIG_REG);
feroceon_l2_init(0); feroceon_l2_init(0);
#endif #endif
#endif
} }
void __init kirkwood_init(void) void __init kirkwood_init(void)
...@@ -657,9 +659,7 @@ void __init kirkwood_init(void) ...@@ -657,9 +659,7 @@ void __init kirkwood_init(void)
kirkwood_setup_cpu_mbus(); kirkwood_setup_cpu_mbus();
#ifdef CONFIG_CACHE_FEROCEON_L2
kirkwood_l2_init(); kirkwood_l2_init();
#endif
/* Setup root of clk tree */ /* Setup root of clk tree */
kirkwood_clk_init(); kirkwood_clk_init();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment