diff options
| author | Olof Johansson <olof@lixom.net> | 2016-07-06 06:57:57 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-07-06 06:57:57 +0300 |
| commit | 8ec3dc29e6f8362e87062bb820e61a8e1b671a93 (patch) | |
| tree | 0914590570da5333b1c0efb3cea2f06aa02a9673 /arch/arm/mach-imx/mach-imx6sx.c | |
| parent | 49a7114fa9b4a8879d055385eca708600190f40b (diff) | |
| parent | 44af782227b3977b98be6967533b0d23add40eb4 (diff) | |
| download | linux-8ec3dc29e6f8362e87062bb820e61a8e1b671a93.tar.xz | |
Merge tag 'imx-cleanup-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/cleanup
The i.MX cleanup for 4.8:
- A series from Arnd to clean up cpu_is_mx*() from i.MX platform
- A series from Andrey to clean up i.MX L2-cache code by using
core support as much as possible
- Remove the orphan header eukrea-baseboards.h from i.MX platform
- Remove boilerplate code from TZIC driver by using IRQCHIP_DECLARE
* tag 'imx-cleanup-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: imx: remove cpu_is_mx*()
ARM: imx: remove last call to cpu_is_mx5*
ARM: imx: rework mx27_pm_init() call
ARM: imx: deconstruct mx3_idle
ARM: imx: deconstruct mxc_rnga initialization
ARM: imx: remove cpu_is_mx1 check
ARM: i.MX: Do not explicitly call l2x0_of_init()
ARM: i.MX: system.c: Tweak prefetch settings for performance
ARM: i.MX: system.c: Replace magic numbers
ARM: i.MX: system.c: Remove redundant errata 752271 code
ARM: i.MX: system.c: Convert goto to if statement
ARM: imx: Use IRQCHIP_DECLARE for TZIC
ARM: imx: Remove orphan header
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-imx/mach-imx6sx.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-imx6sx.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mach-imx6sx.c b/arch/arm/mach-imx/mach-imx6sx.c index 6a0b0614de29..07a3a340f151 100644 --- a/arch/arm/mach-imx/mach-imx6sx.c +++ b/arch/arm/mach-imx/mach-imx6sx.c @@ -103,6 +103,8 @@ static const char * const imx6sx_dt_compat[] __initconst = { }; DT_MACHINE_START(IMX6SX, "Freescale i.MX6 SoloX (Device Tree)") + .l2c_aux_val = 0, + .l2c_aux_mask = ~0, .init_irq = imx6sx_init_irq, .init_machine = imx6sx_init_machine, .dt_compat = imx6sx_dt_compat, |