Commit 812655e9 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-cleanup-for-v3.5' of... 

Merge tag 'omap-cleanup-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup2

Clean up to make it easier to add support for new SoCs.

Note that these have a merge dependency to omap-devel-hwmod-for-v3.5
branch for the Makefile changes.

By Paul Walmsley (37) and others
via Tony Lindgren
* tag 'omap-cleanup-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (55 commits)
  GPMC: add ECC control definitions
  ARM: OMAP2+: dmtimer: remove redundant sysconfig context restore
  ARM: OMAP: AM35xx: convert 3517 detection/flags to AM35xx
  ARM: OMAP: AM35xx: remove redunant cpu_is checks for AM3505
  ARM: OMAP2+: dma: Define dma capabilities register bitfields and use them.
  ARM: OMAP4: Reduce the static IO mapping
  ARM: All OMAP2PLUS machines use omap2 directory so just add one entry
  ARM: OMAP: dma: Make use of cpu_class_is_omap2() to avoid future patching.
  ARM: OMAP4: Remove un-used WakeupGen register defines.
  ARM: OMAP2+: Clean up wrapping multiple objects in Makefile
  ARM: OMAP4: Don't compile cm2xxx_3xxx.c for OMAP4 only builds.
  ARM: OMAP4: hwmod data: add DEBUGSS skeleton
  ARM: OMAP4: hwmod data: add PRCM and related IP blocks
  ARM: OMAP4: hwmod data: add System Control Module
  ARM: OMAP4: hwmod data: add the OCP-WP IP block
  ARM: OMAP4: hwmod data: add OCM RAM IP block
  ARM: OMAP4: hwmod data: add remaining USB-related IP blocks
  ARM: OMAP4: hwmod data: add some interconnect-related IP blocks
  ARM: OMAP4: hwmod data: add McASP
  ARM: OMAP4: hwmod data: add the Slimbus IP blocks
  ...
parents d48b97b4 2c65e744

arch/arm/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -164,9 +164,7 @@ machine-$(CONFIG_ARCH_MXS) := mxs 
machine-$(CONFIG_ARCH_NETX)		:= netx

machine-$(CONFIG_ARCH_NOMADIK)		:= nomadik

machine-$(CONFIG_ARCH_OMAP1)		:= omap1

machine-$(CONFIG_ARCH_OMAP2)		:= omap2

machine-$(CONFIG_ARCH_OMAP3)		:= omap2

machine-$(CONFIG_ARCH_OMAP4)		:= omap2

machine-$(CONFIG_ARCH_OMAP2PLUS)	:= omap2

machine-$(CONFIG_ARCH_ORION5X)		:= orion5x

machine-$(CONFIG_ARCH_PICOXCELL)	:= picoxcell

machine-$(CONFIG_ARCH_PNX4008)		:= pnx4008

arch/arm/mach-omap2/Makefile

+80 −85
Original line number Diff line number Diff line
@@ -24,10 +24,11 @@ endif 
obj-$(CONFIG_TWL4030_CORE) += omap_twl.o



# SMP support ONLY available for OMAP4



obj-$(CONFIG_SMP)			+= omap-smp.o omap-headsmp.o

obj-$(CONFIG_HOTPLUG_CPU)		+= omap-hotplug.o

obj-$(CONFIG_ARCH_OMAP4)		+= omap4-common.o omap-wakeupgen.o \

					   sleep44xx.o

obj-$(CONFIG_ARCH_OMAP4)		+= omap4-common.o omap-wakeupgen.o

obj-$(CONFIG_ARCH_OMAP4)		+= sleep44xx.o



plus_sec := $(call as-instr,.arch_extension sec,+sec)

AFLAGS_omap-headsmp.o			:=-Wa,-march=armv7-a$(plus_sec)
@@ -64,10 +65,10 @@ endif 
ifeq ($(CONFIG_PM),y)

obj-$(CONFIG_ARCH_OMAP2)		+= pm24xx.o

obj-$(CONFIG_ARCH_OMAP2)		+= sleep24xx.o

obj-$(CONFIG_ARCH_OMAP3)		+= pm34xx.o sleep34xx.o \

					   cpuidle34xx.o

obj-$(CONFIG_ARCH_OMAP4)		+= pm44xx.o omap-mpuss-lowpower.o \

					   cpuidle44xx.o

obj-$(CONFIG_ARCH_OMAP3)		+= pm34xx.o sleep34xx.o

obj-$(CONFIG_ARCH_OMAP3)		+= cpuidle34xx.o

obj-$(CONFIG_ARCH_OMAP4)		+= pm44xx.o omap-mpuss-lowpower.o

obj-$(CONFIG_ARCH_OMAP4)		+= cpuidle44xx.o

obj-$(CONFIG_PM_DEBUG)			+= pm-debug.o

obj-$(CONFIG_OMAP_SMARTREFLEX)          += sr_device.o smartreflex.o

obj-$(CONFIG_OMAP_SMARTREFLEX_CLASS3)	+= smartreflex-class3.o
@@ -84,88 +85,86 @@ endif 
# PRCM

obj-y					+= prm_common.o

obj-$(CONFIG_ARCH_OMAP2)		+= prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o

obj-$(CONFIG_ARCH_OMAP3)		+= prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o \

					   vc3xxx_data.o vp3xxx_data.o

# XXX The presence of cm2xxx_3xxx.o on the line below is temporary and

# will be removed once the OMAP4 part of the codebase is converted to

# use OMAP4-specific PRCM functions.

obj-$(CONFIG_ARCH_OMAP4)		+= prcm.o cm2xxx_3xxx.o cminst44xx.o \

					   cm44xx.o prcm_mpu44xx.o \

					   prminst44xx.o vc44xx_data.o \

					   vp44xx_data.o prm44xx.o

obj-$(CONFIG_ARCH_OMAP3)		+= prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o

obj-$(CONFIG_ARCH_OMAP3)		+= vc3xxx_data.o vp3xxx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= prcm.o cminst44xx.o cm44xx.o

obj-$(CONFIG_ARCH_OMAP4)		+= prcm_mpu44xx.o prminst44xx.o

obj-$(CONFIG_ARCH_OMAP4)		+= vc44xx_data.o vp44xx_data.o prm44xx.o



# OMAP voltage domains

voltagedomain-common			:= voltage.o vc.o vp.o

obj-$(CONFIG_ARCH_OMAP2)		+= $(voltagedomain-common) \

					   voltagedomains2xxx_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= $(voltagedomain-common) \

					   voltagedomains3xxx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= $(voltagedomain-common) \

					   voltagedomains44xx_data.o

obj-$(CONFIG_ARCH_OMAP2)		+= $(voltagedomain-common)

obj-$(CONFIG_ARCH_OMAP2)		+= voltagedomains2xxx_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= $(voltagedomain-common)

obj-$(CONFIG_ARCH_OMAP3)		+= voltagedomains3xxx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= $(voltagedomain-common)

obj-$(CONFIG_ARCH_OMAP4)		+= voltagedomains44xx_data.o



# OMAP powerdomain framework

powerdomain-common			+= powerdomain.o powerdomain-common.o

obj-$(CONFIG_ARCH_OMAP2)		+= $(powerdomain-common) \

					   powerdomain2xxx_3xxx.o \

					   powerdomains2xxx_data.o \

					   powerdomains2xxx_3xxx_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= $(powerdomain-common) \

					   powerdomain2xxx_3xxx.o \

					   powerdomains3xxx_data.o \

					   powerdomains2xxx_3xxx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= $(powerdomain-common) \

					   powerdomain44xx.o \

					   powerdomains44xx_data.o

obj-$(CONFIG_ARCH_OMAP2)		+= $(powerdomain-common)

obj-$(CONFIG_ARCH_OMAP2)		+= powerdomains2xxx_data.o

obj-$(CONFIG_ARCH_OMAP2)		+= powerdomain2xxx_3xxx.o

obj-$(CONFIG_ARCH_OMAP2)		+= powerdomains2xxx_3xxx_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= $(powerdomain-common)

obj-$(CONFIG_ARCH_OMAP3)		+= powerdomain2xxx_3xxx.o

obj-$(CONFIG_ARCH_OMAP3)		+= powerdomains3xxx_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= powerdomains2xxx_3xxx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= $(powerdomain-common)

obj-$(CONFIG_ARCH_OMAP4)		+= powerdomain44xx.o

obj-$(CONFIG_ARCH_OMAP4)		+= powerdomains44xx_data.o



# PRCM clockdomain control

obj-$(CONFIG_ARCH_OMAP2)		+= clockdomain.o \

					   clockdomain2xxx_3xxx.o \

					   clockdomains2xxx_3xxx_data.o

clockdomain-common			+= clockdomain.o

clockdomain-common			+= clockdomains_common_data.o

obj-$(CONFIG_ARCH_OMAP2)		+= $(clockdomain-common)

obj-$(CONFIG_ARCH_OMAP2)		+= clockdomain2xxx_3xxx.o

obj-$(CONFIG_ARCH_OMAP2)		+= clockdomains2xxx_3xxx_data.o

obj-$(CONFIG_SOC_OMAP2420)		+= clockdomains2420_data.o

obj-$(CONFIG_SOC_OMAP2430)		+= clockdomains2430_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= clockdomain.o \

					   clockdomain2xxx_3xxx.o \

					   clockdomains2xxx_3xxx_data.o \

					   clockdomains3xxx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= clockdomain.o \

					   clockdomain44xx.o \

					   clockdomains44xx_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= $(clockdomain-common)

obj-$(CONFIG_ARCH_OMAP3)		+= clockdomain2xxx_3xxx.o

obj-$(CONFIG_ARCH_OMAP3)		+= clockdomains2xxx_3xxx_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= clockdomains3xxx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= $(clockdomain-common)

obj-$(CONFIG_ARCH_OMAP4)		+= clockdomain44xx.o

obj-$(CONFIG_ARCH_OMAP4)		+= clockdomains44xx_data.o



# Clock framework

obj-$(CONFIG_ARCH_OMAP2)		+= $(clock-common) clock2xxx.o \

					   clkt2xxx_sys.o \

					   clkt2xxx_dpllcore.o \

					   clkt2xxx_virt_prcm_set.o \

					   clkt2xxx_apll.o clkt2xxx_osc.o \

					   clkt2xxx_dpll.o clkt_iclk.o

obj-$(CONFIG_ARCH_OMAP2)		+= $(clock-common) clock2xxx.o

obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_sys.o

obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_dpllcore.o

obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_virt_prcm_set.o

obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_apll.o clkt2xxx_osc.o

obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_dpll.o clkt_iclk.o

obj-$(CONFIG_SOC_OMAP2420)		+= clock2420_data.o

obj-$(CONFIG_SOC_OMAP2430)		+= clock2430.o clock2430_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= $(clock-common) clock3xxx.o \

					   clock34xx.o clkt34xx_dpll3m2.o \

					   clock3517.o clock36xx.o \

					   dpll3xxx.o clock3xxx_data.o \

					   clkt_iclk.o

obj-$(CONFIG_ARCH_OMAP4)		+= $(clock-common) clock44xx_data.o \

					   dpll3xxx.o dpll44xx.o

obj-$(CONFIG_ARCH_OMAP3)		+= $(clock-common) clock3xxx.o

obj-$(CONFIG_ARCH_OMAP3)		+= clock34xx.o clkt34xx_dpll3m2.o

obj-$(CONFIG_ARCH_OMAP3)		+= clock3517.o clock36xx.o

obj-$(CONFIG_ARCH_OMAP3)		+= dpll3xxx.o clock3xxx_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= clkt_iclk.o

obj-$(CONFIG_ARCH_OMAP4)		+= $(clock-common) clock44xx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= dpll3xxx.o dpll44xx.o



# OMAP2 clock rate set data (old "OPP" data)

obj-$(CONFIG_SOC_OMAP2420)		+= opp2420_data.o

obj-$(CONFIG_SOC_OMAP2430)		+= opp2430_data.o



# hwmod data

obj-$(CONFIG_SOC_OMAP2420)		+= omap_hwmod_2xxx_ipblock_data.o \

					   omap_hwmod_2xxx_3xxx_ipblock_data.o \

					   omap_hwmod_2xxx_interconnect_data.o \

					   omap_hwmod_2xxx_3xxx_interconnect_data.o \

					   omap_hwmod_2420_data.o

obj-$(CONFIG_SOC_OMAP2430)		+= omap_hwmod_2xxx_ipblock_data.o \

					   omap_hwmod_2xxx_3xxx_ipblock_data.o \

					   omap_hwmod_2xxx_interconnect_data.o \

					   omap_hwmod_2xxx_3xxx_interconnect_data.o \

					   omap_hwmod_2430_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= omap_hwmod_2xxx_3xxx_ipblock_data.o \

					   omap_hwmod_2xxx_3xxx_interconnect_data.o \

					   omap_hwmod_3xxx_data.o

obj-$(CONFIG_SOC_OMAP2420)		+= omap_hwmod_2xxx_ipblock_data.o

obj-$(CONFIG_SOC_OMAP2420)		+= omap_hwmod_2xxx_3xxx_ipblock_data.o

obj-$(CONFIG_SOC_OMAP2420)		+= omap_hwmod_2xxx_interconnect_data.o

obj-$(CONFIG_SOC_OMAP2420)		+= omap_hwmod_2xxx_3xxx_interconnect_data.o

obj-$(CONFIG_SOC_OMAP2420)		+= omap_hwmod_2420_data.o

obj-$(CONFIG_SOC_OMAP2430)		+= omap_hwmod_2xxx_ipblock_data.o

obj-$(CONFIG_SOC_OMAP2430)		+= omap_hwmod_2xxx_3xxx_ipblock_data.o

obj-$(CONFIG_SOC_OMAP2430)		+= omap_hwmod_2xxx_interconnect_data.o

obj-$(CONFIG_SOC_OMAP2430)		+= omap_hwmod_2xxx_3xxx_interconnect_data.o

obj-$(CONFIG_SOC_OMAP2430)		+= omap_hwmod_2430_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= omap_hwmod_2xxx_3xxx_ipblock_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= omap_hwmod_2xxx_3xxx_interconnect_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= omap_hwmod_3xxx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= omap_hwmod_44xx_data.o



# EMU peripherals
@@ -203,23 +202,19 @@ obj-$(CONFIG_MACH_OMAP3EVM) += board-omap3evm.o 
obj-$(CONFIG_MACH_OMAP3_PANDORA)	+= board-omap3pandora.o

obj-$(CONFIG_MACH_OMAP_3430SDP)		+= board-3430sdp.o

obj-$(CONFIG_MACH_NOKIA_N8X0)		+= board-n8x0.o

obj-$(CONFIG_MACH_NOKIA_RM680)		+= board-rm680.o \

					   sdram-nokia.o

obj-$(CONFIG_MACH_NOKIA_RX51)		+= board-rx51.o \

					   sdram-nokia.o \

					   board-rx51-peripherals.o \

					   board-rx51-video.o

obj-$(CONFIG_MACH_OMAP_ZOOM2)		+= board-zoom.o \

					   board-zoom-peripherals.o \

					   board-zoom-display.o \

					   board-zoom-debugboard.o

obj-$(CONFIG_MACH_OMAP_ZOOM3)		+= board-zoom.o \

					   board-zoom-peripherals.o \

					   board-zoom-display.o \

					   board-zoom-debugboard.o

obj-$(CONFIG_MACH_OMAP_3630SDP)		+= board-3630sdp.o \

					   board-zoom-peripherals.o \

					   board-zoom-display.o

obj-$(CONFIG_MACH_NOKIA_RM680)		+= board-rm680.o sdram-nokia.o

obj-$(CONFIG_MACH_NOKIA_RX51)		+= board-rx51.o sdram-nokia.o

obj-$(CONFIG_MACH_NOKIA_RX51)		+= board-rx51-peripherals.o

obj-$(CONFIG_MACH_NOKIA_RX51)		+= board-rx51-video.o

obj-$(CONFIG_MACH_OMAP_ZOOM2)		+= board-zoom.o board-zoom-peripherals.o

obj-$(CONFIG_MACH_OMAP_ZOOM2)		+= board-zoom-display.o

obj-$(CONFIG_MACH_OMAP_ZOOM2)		+= board-zoom-debugboard.o

obj-$(CONFIG_MACH_OMAP_ZOOM3)		+= board-zoom.o board-zoom-peripherals.o

obj-$(CONFIG_MACH_OMAP_ZOOM3)		+= board-zoom-display.o

obj-$(CONFIG_MACH_OMAP_ZOOM3)		+= board-zoom-debugboard.o

obj-$(CONFIG_MACH_OMAP_3630SDP)		+= board-3630sdp.o

obj-$(CONFIG_MACH_OMAP_3630SDP)		+= board-zoom-peripherals.o

obj-$(CONFIG_MACH_OMAP_3630SDP)		+= board-zoom-display.o

obj-$(CONFIG_MACH_CM_T35)		+= board-cm-t35.o

obj-$(CONFIG_MACH_CM_T3517)		+= board-cm-t3517.o

obj-$(CONFIG_MACH_IGEP0020)		+= board-igep0020.o

arch/arm/mach-omap2/clockdomain44xx.c

+6 −0
Original line number Diff line number Diff line
@@ -51,6 +51,9 @@ static int omap4_clkdm_clear_all_wkup_sleep_deps(struct clockdomain *clkdm) 
	struct clkdm_dep *cd;

	u32 mask = 0;



	if (!clkdm->prcm_partition)

		return 0;



	for (cd = clkdm->wkdep_srcs; cd && cd->clkdm_name; cd++) {

		if (!cd->clkdm)

			continue; /* only happens if data is erroneous */
@@ -103,6 +106,9 @@ static int omap4_clkdm_clk_disable(struct clockdomain *clkdm) 
{

	bool hwsup = false;



	if (!clkdm->prcm_partition)

		return 0;



	hwsup = omap4_cminst_is_clkdm_in_hwsup(clkdm->prcm_partition,

					clkdm->cm_inst, clkdm->clkdm_offs);

arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c

+0 −10
Original line number Diff line number Diff line
@@ -89,13 +89,3 @@ struct clockdomain wkup_common_clkdm = { 
	.pwrdm		= { .name = "wkup_pwrdm" },

	.dep_bit	= OMAP_EN_WKUP_SHIFT,

};
 


struct clockdomain prm_common_clkdm = {

	.name		= "prm_clkdm",

	.pwrdm		= { .name = "wkup_pwrdm" },

};



struct clockdomain cm_common_clkdm = {

	.name		= "cm_clkdm",

	.pwrdm		= { .name = "core_pwrdm" },

};

arch/arm/mach-omap2/clockdomains44xx_data.c

+2 −0
Original line number Diff line number Diff line
@@ -430,6 +430,8 @@ static struct clockdomain *clockdomains_omap44xx[] __initdata = { 
	&l4_wkup_44xx_clkdm,

	&emu_sys_44xx_clkdm,

	&l3_dma_44xx_clkdm,

	&prm_common_clkdm,

	&cm_common_clkdm,

	NULL

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE