Commit a4b58e00 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

i.MX SoC changes for 5.7:

 - A number of cleanups from Anson Huang to remove unneeded includes,
   drop unnecessary newlines and base check etc.
 - Apply Cortex-A9 specific errata only to Cortex-A9 based i.MX SoCs
   and avoid impacting Cortex-A7 based designs.

* tag 'imx-soc-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx: Drop unnecessary src_base check
  ARM: imx: Remove unnecessary blank lines
  ARM: imx: Add missing of_node_put()
  ARM: imx: Remove unused include of linux/of.h on mach-imx6sl.c
  ARM: imx: Remove unused includes on mach-imx6q.c
  ARM: imx: Remove unused include of linux/irqchip/arm-gic.h
  ARM: imx: limit errata selection to Cortex-A9 based designs

Link: https://lore.kernel.org/r/20200318051918.32579-2-shawnguo@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents ca1fa06b 756931e0

arch/arm/mach-imx/Kconfig

+8 −2
Original line number Diff line number Diff line
@@ -471,8 +471,6 @@ config SOC_IMX53 
config SOC_IMX6

	bool

	select ARM_CPU_SUSPEND if (PM || CPU_IDLE)

	select ARM_ERRATA_754322

	select ARM_ERRATA_775420

	select ARM_GIC

	select HAVE_IMX_ANATOP

	select HAVE_IMX_GPC
@@ -484,6 +482,8 @@ config SOC_IMX6 
config SOC_IMX6Q

	bool "i.MX6 Quad/DualLite support"

	select ARM_ERRATA_764369 if SMP

	select ARM_ERRATA_754322

	select ARM_ERRATA_775420

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD

	select PINCTRL_IMX6Q
@@ -494,6 +494,8 @@ config SOC_IMX6Q 


config SOC_IMX6SL

	bool "i.MX6 SoloLite support"

	select ARM_ERRATA_754322

	select ARM_ERRATA_775420

	select PINCTRL_IMX6SL

	select SOC_IMX6
@@ -502,6 +504,8 @@ config SOC_IMX6SL 


config SOC_IMX6SLL

	bool "i.MX6 SoloLiteLite support"

	select ARM_ERRATA_754322

	select ARM_ERRATA_775420

	select PINCTRL_IMX6SLL

	select SOC_IMX6
@@ -510,6 +514,8 @@ config SOC_IMX6SLL 


config SOC_IMX6SX

	bool "i.MX6 SoloX support"

	select ARM_ERRATA_754322

	select ARM_ERRATA_775420

	select PINCTRL_IMX6SX

	select SOC_IMX6

arch/arm/mach-imx/anatop.c

+4 −3
Original line number Diff line number Diff line
@@ -89,12 +89,11 @@ void imx_anatop_post_resume(void) 


	if (cpu_is_imx6sl())

		imx_anatop_disconnect_high_snvs(false);



}



void __init imx_init_revision_from_anatop(void)

{

	struct device_node *np;

	struct device_node *np, *src_np;

	void __iomem *anatop_base;

	unsigned int revision;

	u32 digprog;
@@ -135,9 +134,10 @@ void __init imx_init_revision_from_anatop(void) 
			void __iomem *src_base;

			u32 sbmr2;



			np = of_find_compatible_node(NULL, NULL,

			src_np = of_find_compatible_node(NULL, NULL,

						     "fsl,imx6ul-src");

			src_base = of_iomap(np, 0);

			of_node_put(src_np);

			WARN_ON(!src_base);

			sbmr2 = readl_relaxed(src_base + SRC_SBMR2);

			iounmap(src_base);
@@ -149,6 +149,7 @@ void __init imx_init_revision_from_anatop(void) 
			}

		}

	}

	of_node_put(np);



	mxc_set_cpu_type(digprog >> 16 & 0xff);

	imx_set_soc_revision(revision);

arch/arm/mach-imx/gpc.c

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_irq.h>

#include <linux/irqchip/arm-gic.h>



#include "common.h"

#include "hardware.h"
@@ -111,7 +111,6 @@ void imx_gpc_mask_all(void) 
		gpc_saved_imrs[i] = readl_relaxed(reg_imr1 + i * 4);

		writel_relaxed(~0, reg_imr1 + i * 4);

	}



}



void imx_gpc_restore_all(void)
@@ -282,4 +281,5 @@ void __init imx_gpc_check_dt(void) 
		/* map GPC, so that at least CPUidle and WARs keep working */

		gpc_base = of_iomap(np, 0);

	}

	of_node_put(np);

}

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

+0 −13
Original line number Diff line number Diff line
@@ -5,29 +5,16 @@ 
 */



#include <linux/clk.h>

#include <linux/clkdev.h>

#include <linux/cpu.h>

#include <linux/delay.h>

#include <linux/export.h>

#include <linux/init.h>

#include <linux/io.h>

#include <linux/irq.h>

#include <linux/irqchip.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_irq.h>

#include <linux/of_platform.h>

#include <linux/pm_opp.h>

#include <linux/pci.h>

#include <linux/phy.h>

#include <linux/reboot.h>

#include <linux/regmap.h>

#include <linux/micrel_phy.h>

#include <linux/mfd/syscon.h>

#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <asm/system_misc.h>



#include "common.h"

#include "cpuidle.h"

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

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
 */



#include <linux/irqchip.h>

#include <linux/of.h>

#include <linux/of_platform.h>

#include <linux/mfd/syscon.h>

#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE