Unverified Commit d6d3ddab authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

i.MX SoC change for 6.6:

- A change from Rob Herring to drop unused includes from i.MX platform
  code.

* tag 'imx-soc-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx: Drop unused includes

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 00e1ff04 66ba9c05

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

+0 −4
Original line number Diff line number Diff line
@@ -3,15 +3,11 @@ 
 *  Copyright (C) 2014 Alexander Shiyan <shc_work@mail.ru>

 */



#include <linux/of_platform.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>



#include "common.h"

#include "hardware.h"



#define MX1_AVIC_ADDR	0x00223000



static void __init imx1_init_early(void)

{

	mxc_set_cpu_type(MXC_CPU_MX1);

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

+0 −5
Original line number Diff line number Diff line
@@ -3,12 +3,7 @@ 
 * Copyright 2012 Sascha Hauer, Pengutronix

 */



#include <linux/irq.h>

#include <linux/of_address.h>

#include <linux/of_irq.h>

#include <linux/of_platform.h>

#include <asm/mach/arch.h>

#include <asm/mach/time.h>

#include "common.h"

#include "hardware.h"

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

+0 −6
Original line number Diff line number Diff line
@@ -4,14 +4,8 @@ 
 */



#include <linux/init.h>

#include <linux/irq.h>

#include <linux/of_address.h>

#include <linux/of_irq.h>

#include <linux/of_platform.h>

#include <linux/mm.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <asm/mach/time.h>



#include "common.h"

#include "hardware.h"

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

+0 −8
Original line number Diff line number Diff line
@@ -5,15 +5,7 @@ 
 * based on imx27-dt.c

 */



#include <linux/irq.h>

#include <linux/irqdomain.h>

#include <linux/of_irq.h>

#include <linux/of_platform.h>

#include <linux/clk-provider.h>

#include <linux/clocksource.h>

#include <asm/mach/arch.h>

#include <asm/mach/time.h>

#include <asm/hardware/cache-l2x0.h>

#include "common.h"

#include "mx35.h"

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

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
 * Copyright 2011 Linaro Ltd.

 */



#include <linux/of_platform.h>

#include <asm/mach/arch.h>



#include "common.h"