From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 5 Jun 2014 11:35:52 +0000 (+0100)
Subject: Merge branches 'alignment', 'fixes', 'l2c' (early part) and 'misc' into for-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1fb333489fb917c704ad43e51b45c12f52215a9c;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge branches 'alignment', 'fixes', 'l2c' (early part) and 'misc' into for-next
---

1fb333489fb917c704ad43e51b45c12f52215a9c
diff --cc arch/arm/Kconfig
index db3c5414223e,db3c5414223e,c9d7196fd0bd,03551fafb1fd..8615dfa604c4
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@@@ -1105,15 -1105,15 -1105,15 -1101,10 +1102,10 @@@@@ source "arch/arm/firmware/Kconfig
    
    source arch/arm/mm/Kconfig
    
--- config ARM_NR_BANKS
--- 	int
--- 	default 16 if ARCH_EP93XX
--- 	default 8
--- 
    config IWMMXT
   -	bool "Enable iWMMXt support" if !CPU_PJ4
   -	depends on CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_PJ4
   -	default y if PXA27x || PXA3xx || ARCH_MMP || CPU_PJ4
   +	bool "Enable iWMMXt support"
   +	depends on CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_PJ4 || CPU_PJ4B
   +	default y if PXA27x || PXA3xx || ARCH_MMP || CPU_PJ4 || CPU_PJ4B
    	help
    	  Enable support for iWMMXt context switching at run time if
    	  running on a CPU that supports it.
diff --cc arch/arm/include/asm/mach/arch.h
index 17a3fa2979e8,17a3fa2979e8,5249cc3c52f4,c43473afde8a..060a75e99263
--- a/arch/arm/include/asm/mach/arch.h
+++ b/arch/arm/include/asm/mach/arch.h
@@@@@ -45,10 -45,10 -45,13 -44,9 +44,12 @@@@@ struct machine_desc 
    	unsigned char		reserve_lp1 :1;	/* never has lp1	*/
    	unsigned char		reserve_lp2 :1;	/* never has lp2	*/
    	enum reboot_mode	reboot_mode;	/* default restart mode	*/
++ +	unsigned		l2c_aux_val;	/* L2 cache aux value	*/
++ +	unsigned		l2c_aux_mask;	/* L2 cache aux mask	*/
++ +	void			(*l2c_write_sec)(unsigned long, unsigned);
    	struct smp_operations	*smp;		/* SMP operations	*/
    	bool			(*smp_init)(void);
--- 	void			(*fixup)(struct tag *, char **,
--- 					 struct meminfo *);
+++ 	void			(*fixup)(struct tag *, char **);
    	void			(*init_meminfo)(void);
    	void			(*reserve)(void);/* reserve mem blocks	*/
    	void			(*map_io)(void);/* IO mapping function	*/
diff --cc arch/arm/kernel/iwmmxt.S
index 2452dd1bef53,2452dd1bef53,2452dd1bef53,4bb029ea8917..a5599cfc43cb
--- a/arch/arm/kernel/iwmmxt.S
+++ b/arch/arm/kernel/iwmmxt.S
@@@@@ -18,17 -18,17 -18,17 -18,14 +18,18 @@@@@
    #include <asm/ptrace.h>
    #include <asm/thread_info.h>
    #include <asm/asm-offsets.h>
+++ #include <asm/assembler.h>
    
   -#if defined(CONFIG_CPU_PJ4)
   +#if defined(CONFIG_CPU_PJ4) || defined(CONFIG_CPU_PJ4B)
    #define PJ4(code...)		code
    #define XSC(code...)
   -#else
   +#elif defined(CONFIG_CPU_MOHAWK) || \
   +	defined(CONFIG_CPU_XSC3) || \
   +	defined(CONFIG_CPU_XSCALE)
    #define PJ4(code...)
    #define XSC(code...)		code
   +#else
   +#error "Unsupported iWMMXt architecture"
    #endif
    
    #define MMX_WR0		 	(0x00)