kernel: accidentally committed a few patches in the wrong place, move them

[openwrt/openwrt.git] / target / linux / bcm53xx / patches-3.18 / 305-ARM-BCM53XX-set-customized-AUXCTL.patch

diff --git a/target/linux/bcm53xx/patches-3.18/305-ARM-BCM53XX-set-customized-AUXCTL.patch b/target/linux/bcm53xx/patches-3.18/305-ARM-BCM53XX-set-customized-AUXCTL.patch
index 60ebbc75fabf79a4b581e7391e34fa971b657b82..a2bed2aeb79054fbe1c9ccd66e553ebcb5f2da49 100644 (file)
--- a/target/linux/bcm53xx/patches-3.18/305-ARM-BCM53XX-set-customized-AUXCTL.patch
+++ b/target/linux/bcm53xx/patches-3.18/305-ARM-BCM53XX-set-customized-AUXCTL.patch
@@ -14,7 +14,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 
 --- a/arch/arm/mach-bcm/bcm_5301x.c
 +++ b/arch/arm/mach-bcm/bcm_5301x.c
-@@ -80,7 +80,10 @@ static const char __initconst *bcm5301x_
+@@ -50,7 +50,12 @@ static const char __initconst *bcm5301x_
  };
  
  DT_MACHINE_START(BCM5301X, "BCM5301X")
@@ -22,7 +22,9 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 +      .l2c_aux_val    = L310_AUX_CTRL_CACHE_REPLACE_RR |
 +                        L310_AUX_CTRL_DATA_PREFETCH |
 +                        L310_AUX_CTRL_INSTR_PREFETCH |
-+                        L310_AUX_CTRL_EARLY_BRESP,
++                        L310_AUX_CTRL_EARLY_BRESP |
++                        L2C_AUX_CTRL_SHARED_OVERRIDE |
++                        L310_AUX_CTRL_FULL_LINE_ZERO,
        .l2c_aux_mask   = ~0,
        .init_early     = bcm5301x_init_early,
-       .restart        = bcm5301x_restart,
+       .dt_compat      = bcm5301x_dt_compat,