Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ec3dc29 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'imx-cleanup-4.8' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents 49a7114f 44af7822

arch/arm/mach-imx/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -44,9 +44,6 @@ config MXC_USE_EPIT 
	  uses the same clocks as the GPT. Anyway, on some systems the GPT

	  may be in use for other purposes.



config ARCH_HAS_RNGA

	bool



config HAVE_IMX_ANATOP

	bool
@@ -90,7 +87,6 @@ config SOC_IMX27 
config SOC_IMX31

	bool

	select CPU_V6

	select IMX_HAVE_PLATFORM_MXC_RNGA

	select MXC_AVIC

	select SMP_ON_UP if SMP

arch/arm/mach-imx/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ obj-$(CONFIG_SOC_IMX25) += cpu-imx25.o mach-imx25.o pm-imx25.o 
obj-$(CONFIG_SOC_IMX27) += cpu-imx27.o pm-imx27.o

obj-$(CONFIG_SOC_IMX27) += mm-imx27.o ehci-imx27.o



obj-$(CONFIG_SOC_IMX31) += mm-imx3.o cpu-imx31.o iomux-imx31.o ehci-imx31.o pm-imx3.o

obj-$(CONFIG_SOC_IMX35) += mm-imx3.o cpu-imx35.o ehci-imx35.o pm-imx3.o

obj-$(CONFIG_SOC_IMX31) += mm-imx3.o cpu-imx31.o iomux-imx31.o ehci-imx31.o

obj-$(CONFIG_SOC_IMX35) += mm-imx3.o cpu-imx35.o ehci-imx35.o



imx5-pm-$(CONFIG_PM) += pm-imx5.o

obj-$(CONFIG_SOC_IMX5) += cpu-imx5.o $(imx5-pm-y)

arch/arm/mach-imx/common.h

+2 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ void imx27_init_early(void); 
void imx31_init_early(void);

void imx35_init_early(void);

void mxc_init_irq(void __iomem *);

void tzic_init_irq(void);

void mx1_init_irq(void);

void mx21_init_irq(void);

void mx27_init_irq(void);
@@ -55,6 +54,7 @@ struct platform_device *mxc_register_gpio(char *name, int id, 
void mxc_set_cpu_type(unsigned int type);

void mxc_restart(enum reboot_mode, const char *);

void mxc_arch_reset_init(void __iomem *);

void imx1_reset_init(void __iomem *);

void imx_set_aips(void __iomem *);

void imx_aips_allow_unprivileged_access(const char *compat);

int mxc_device_init(void);
@@ -67,6 +67,7 @@ void imx_gpc_set_arm_power_in_lpm(bool power_off); 
void imx_gpc_set_arm_power_up_timing(u32 sw2iso, u32 sw);

void imx_gpc_set_arm_power_down_timing(u32 sw2iso, u32 sw);

void imx25_pm_init(void);

void imx27_pm_init(void);



enum mxc_cpu_pwr_mode {

	WAIT_CLOCKED,		/* wfi only */

arch/arm/mach-imx/cpu-imx5.c

+0 −8
Original line number Diff line number Diff line
@@ -60,13 +60,9 @@ static int get_mx51_srev(void) 
/*

 * Returns:

 *	the silicon revision of the cpu

 *	-EINVAL - not a mx51

 */

int mx51_revision(void)

{

	if (!cpu_is_mx51())

		return -EINVAL;



	if (mx5_cpu_rev == -1)

		mx5_cpu_rev = get_mx51_srev();
@@ -112,13 +108,9 @@ static int get_mx53_srev(void) 
/*

 * Returns:

 *	the silicon revision of the cpu

 *	-EINVAL - not a mx53

 */

int mx53_revision(void)

{

	if (!cpu_is_mx53())

		return -EINVAL;



	if (mx5_cpu_rev == -1)

		mx5_cpu_rev = get_mx53_srev();

arch/arm/mach-imx/cpu.c

+0 −2
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ 
#include "common.h"



unsigned int __mxc_cpu_type;

EXPORT_SYMBOL(__mxc_cpu_type);



static unsigned int imx_soc_revision;



void mxc_set_cpu_type(unsigned int type)