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

Commit 9d67d462 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'imx-soc-4.5' of... 

Merge tag 'imx-soc-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/soc

The i.MX SoC updates for 4.5:
- Select HAVE_IMX_SRC for i.MX7 to avoid a randconfig build error
- Enable cpufreq support on i.MX7D
- A couple of random cleanup on iomux-imx31 and mach-imx6ul

* tag 'imx-soc-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux

:
  ARM: imx: select SRC for i.MX7
  ARM: mach-imx: iomux-imx31: fix spelling mistake in error message
  ARM: imx: enable cpufreq device on i.mx7d
  mach-imx/mach-imx6ul.c: proper constness with __initconst

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 45e2916b f1858b0e

arch/arm/mach-imx/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -563,6 +563,7 @@ config SOC_IMX7D 
	select ARM_GIC

	select HAVE_IMX_ANATOP

	select HAVE_IMX_MMDC

	select HAVE_IMX_SRC

	help

		This enables support for Freescale i.MX7 Dual processor.

arch/arm/mach-imx/iomux-imx31.c

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ int mxc_iomux_alloc_pin(unsigned int pin, const char *label) 
	unsigned pad = pin & IOMUX_PADNUM_MASK;



	if (pad >= (PIN_MAX + 1)) {

		printk(KERN_ERR "mxc_iomux: Attempt to request nonexistant pin %u for \"%s\"\n",

		printk(KERN_ERR "mxc_iomux: Attempt to request nonexistent pin %u for \"%s\"\n",

			pad, label ? label : "?");

		return -EINVAL;

	}

arch/arm/mach-imx/mach-imx6ul.c

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static void __init imx6ul_init_late(void) 
		platform_device_register_simple("imx6q-cpufreq", -1, NULL, 0);

}



static const char *imx6ul_dt_compat[] __initconst = {

static const char * const imx6ul_dt_compat[] __initconst = {

	"fsl,imx6ul",

	NULL,

};

arch/arm/mach-imx/mach-imx7d.c

+6 −0
Original line number Diff line number Diff line
@@ -105,6 +105,11 @@ static void __init imx7d_init_irq(void) 
	irqchip_init();

}



static void __init imx7d_init_late(void)

{

	platform_device_register_simple("cpufreq-dt", -1, NULL, 0);

}



static const char *const imx7d_dt_compat[] __initconst = {

	"fsl,imx7d",

	NULL,
@@ -112,6 +117,7 @@ static const char *const imx7d_dt_compat[] __initconst = { 


DT_MACHINE_START(IMX7D, "Freescale i.MX7 Dual (Device Tree)")

	.init_irq	= imx7d_init_irq,

	.init_late	= imx7d_init_late,

	.init_machine	= imx7d_init_machine,

	.dt_compat	= imx7d_dt_compat,

MACHINE_END