Commit a862d88d authored by Shawn Guo's avatar Shawn Guo
Browse files

Merge tag 'imx-cleanup-3.10' into imx/soc 

The imx cleanup for 3.10:

* Clean up a couple of unneeded function declarations
* Remove imx specific cpufreq driver as generic cpufreq-cpu0 works well
  as the replacement
* Remove platform ahci support
* Clean up unused ARCH/MACH Kconfig symbols
* Remove a couple of unused files
parents 7c3c1b8c 3442a7b5

arch/arm/Kconfig

+0 −7
Original line number Diff line number Diff line
@@ -2163,13 +2163,6 @@ if ARCH_HAS_CPUFREQ 


source "drivers/cpufreq/Kconfig"



config CPU_FREQ_IMX

	tristate "CPUfreq driver for i.MX CPUs"

	depends on ARCH_MXC && CPU_FREQ

	select CPU_FREQ_TABLE

	help

	  This enables the CPUfreq driver for i.MX CPUs.



config CPU_FREQ_SA1100

	bool

arch/arm/mach-imx/Kconfig

+0 −18
Original line number Diff line number Diff line
@@ -83,24 +83,12 @@ config ARCH_MXC_IOMUX_V3 
config ARCH_MX1

	bool



config MACH_MX21

	bool



config ARCH_MX25

	bool



config MACH_MX27

	bool



config ARCH_MX5

	bool



config ARCH_MX51

	bool



config ARCH_MX53

	bool



config SOC_IMX1

	bool

	select ARCH_MX1
@@ -114,7 +102,6 @@ config SOC_IMX21 
	select COMMON_CLK

	select CPU_ARM926T

	select IMX_HAVE_IOMUX_V1

	select MACH_MX21

	select MXC_AVIC



config SOC_IMX25
@@ -155,7 +142,6 @@ config SOC_IMX35 
config SOC_IMX5

	bool

	select ARCH_HAS_CPUFREQ

	select ARCH_MX5

	select ARCH_MXC_IOMUX_V3

	select COMMON_CLK

	select CPU_V7
@@ -163,8 +149,6 @@ config SOC_IMX5 


config	SOC_IMX51

	bool

	select ARCH_MX5

	select ARCH_MX51

	select PINCTRL

	select PINCTRL_IMX51

	select SOC_IMX5
@@ -789,8 +773,6 @@ comment "Device tree only" 


config	SOC_IMX53

	bool "i.MX53 support"

	select ARCH_MX5

	select ARCH_MX53

	select HAVE_CAN_FLEXCAN if CAN

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select PINCTRL

arch/arm/mach-imx/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ obj-$(CONFIG_SOC_IMX31) += mm-imx3.o cpu-imx31.o clk-imx31.o iomux-imx31.o ehci- 
obj-$(CONFIG_SOC_IMX35) += mm-imx3.o cpu-imx35.o clk-imx35.o ehci-imx35.o pm-imx3.o



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

obj-$(CONFIG_SOC_IMX5) += cpu-imx5.o mm-imx5.o clk-imx51-imx53.o ehci-imx5.o $(imx5-pm-y) cpu_op-mx51.o

obj-$(CONFIG_SOC_IMX5) += cpu-imx5.o mm-imx5.o clk-imx51-imx53.o ehci-imx5.o $(imx5-pm-y)



obj-$(CONFIG_COMMON_CLK) += clk-pllv1.o clk-pllv2.o clk-pllv3.o clk-gate2.o \

			    clk-pfd.o clk-busy.o clk.o
@@ -27,7 +27,6 @@ obj-$(CONFIG_IRAM_ALLOC) += iram_alloc.o 
obj-$(CONFIG_MXC_ULPI) += ulpi.o

obj-$(CONFIG_MXC_USE_EPIT) += epit.o

obj-$(CONFIG_MXC_DEBUG_BOARD) += 3ds_debugboard.o

obj-$(CONFIG_CPU_FREQ_IMX)    += cpufreq.o



ifeq ($(CONFIG_CPU_IDLE),y)

obj-y += cpuidle.o

arch/arm/mach-imx/Makefile.boot

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
zreladdr-$(CONFIG_SOC_IMX1)	+= 0x08008000

params_phys-$(CONFIG_SOC_IMX1)	:= 0x08000100

initrd_phys-$(CONFIG_SOC_IMX1)	:= 0x08800000



zreladdr-$(CONFIG_SOC_IMX21)	+= 0xC0008000

params_phys-$(CONFIG_SOC_IMX21)	:= 0xC0000100

initrd_phys-$(CONFIG_SOC_IMX21)	:= 0xC0800000



zreladdr-$(CONFIG_SOC_IMX25)	+= 0x80008000

params_phys-$(CONFIG_SOC_IMX25)	:= 0x80000100

initrd_phys-$(CONFIG_SOC_IMX25)	:= 0x80800000



zreladdr-$(CONFIG_SOC_IMX27)	+= 0xA0008000

params_phys-$(CONFIG_SOC_IMX27)	:= 0xA0000100

initrd_phys-$(CONFIG_SOC_IMX27)	:= 0xA0800000



zreladdr-$(CONFIG_SOC_IMX31)	+= 0x80008000

params_phys-$(CONFIG_SOC_IMX31)	:= 0x80000100

initrd_phys-$(CONFIG_SOC_IMX31)	:= 0x80800000



zreladdr-$(CONFIG_SOC_IMX35)	+= 0x80008000

params_phys-$(CONFIG_SOC_IMX35)	:= 0x80000100

initrd_phys-$(CONFIG_SOC_IMX35)	:= 0x80800000



zreladdr-$(CONFIG_SOC_IMX51)	+= 0x90008000

params_phys-$(CONFIG_SOC_IMX51)	:= 0x90000100

initrd_phys-$(CONFIG_SOC_IMX51)	:= 0x90800000



zreladdr-$(CONFIG_SOC_IMX53)	+= 0x70008000

params_phys-$(CONFIG_SOC_IMX53)	:= 0x70000100

initrd_phys-$(CONFIG_SOC_IMX53)	:= 0x70800000



zreladdr-$(CONFIG_SOC_IMX6Q)	+= 0x10008000

params_phys-$(CONFIG_SOC_IMX6Q)	:= 0x10000100

initrd_phys-$(CONFIG_SOC_IMX6Q)	:= 0x10800000

arch/arm/mach-imx/avic.c

+2 −2
Original line number Diff line number Diff line
@@ -54,8 +54,6 @@ 
void __iomem *avic_base;

static struct irq_domain *domain;



static u32 avic_saved_mask_reg[2];



#ifdef CONFIG_MXC_IRQ_PRIOR

static int avic_irq_set_priority(unsigned char irq, unsigned char prio)

{
@@ -113,6 +111,8 @@ static struct mxc_extra_irq avic_extra_irq = { 
};



#ifdef CONFIG_PM

static u32 avic_saved_mask_reg[2];



static void avic_irq_suspend(struct irq_data *d)

{

	struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);

CRA Git | Maintained and supported by SUSTech CRA and CCSE