Skip to content

Commit

Permalink
Merge tag 'kirkwood_fixes_for_v3.7' of git://git.infradead.org/users/…
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
olofj committed Oct 19, 2012
2 parents 068a565 + 1243163 commit 70f3900
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
18 changes: 10 additions & 8 deletions arch/arm/boot/dts/kirkwood-lsxl.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
};
};
Expand All @@ -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>;
};
};
Expand Down
2 changes: 0 additions & 2 deletions arch/arm/mach-kirkwood/board-dt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-kirkwood/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -633,13 +633,15 @@ 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);
#else
writel(readl(L2_CONFIG_REG) & ~L2_WRITETHROUGH, L2_CONFIG_REG);
feroceon_l2_init(0);
#endif
#endif
}

void __init kirkwood_init(void)
Expand All @@ -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();
Expand Down

0 comments on commit 70f3900

Please sign in to comment.