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

Commit e3e1970f authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge tag 'for-v3.12/dra7xx' of... 

Merge tag 'for-v3.12/dra7xx' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.12/soc

This series adds basic TI DRA7xx PRCM and hwmod support.

Basic test logs are available here:

http://www.pwsan.com/omap/testlogs/dra7xx_prcm_devel_v3.12/20130823050445/

Note that DRA7xx could not be tested locally, since I don't have a board.
parents cf470a1b 7de516a6

arch/arm/mach-omap2/Makefile

+4 −0
Original line number Original line Diff line number Diff line
@@ -63,6 +63,7 @@ obj-$(CONFIG_SOC_AM33XX) += am33xx-restart.o 
obj-$(CONFIG_ARCH_OMAP3)		+= omap3-restart.o

obj-$(CONFIG_ARCH_OMAP3)		+= omap3-restart.o

obj-$(CONFIG_ARCH_OMAP4)		+= omap4-restart.o

obj-$(CONFIG_ARCH_OMAP4)		+= omap4-restart.o

obj-$(CONFIG_SOC_OMAP5)			+= omap4-restart.o

obj-$(CONFIG_SOC_OMAP5)			+= omap4-restart.o

obj-$(CONFIG_SOC_DRA7XX)		+= omap4-restart.o





# Pin multiplexing

# Pin multiplexing

obj-$(CONFIG_SOC_OMAP2420)		+= mux2420.o

obj-$(CONFIG_SOC_OMAP2420)		+= mux2420.o
@@ -148,6 +149,7 @@ obj-$(CONFIG_SOC_AM43XX) += $(powerdomain-common) 
obj-$(CONFIG_SOC_OMAP5)			+= $(powerdomain-common)

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

obj-$(CONFIG_SOC_OMAP5)			+= powerdomains54xx_data.o

obj-$(CONFIG_SOC_OMAP5)			+= powerdomains54xx_data.o

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

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

obj-$(CONFIG_SOC_DRA7XX)		+= powerdomains7xx_data.o





# PRCM clockdomain control

# PRCM clockdomain control

clockdomain-common			+= clockdomain.o

clockdomain-common			+= clockdomain.o
@@ -166,6 +168,7 @@ obj-$(CONFIG_SOC_AM43XX) += $(clockdomain-common) 
obj-$(CONFIG_SOC_OMAP5)			+= $(clockdomain-common)

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

obj-$(CONFIG_SOC_OMAP5)			+= clockdomains54xx_data.o

obj-$(CONFIG_SOC_OMAP5)			+= clockdomains54xx_data.o

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

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

obj-$(CONFIG_SOC_DRA7XX)		+= clockdomains7xx_data.o





# Clock framework

# Clock framework

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

obj-$(CONFIG_ARCH_OMAP2)		+= $(clock-common) clock2xxx.o
@@ -209,6 +212,7 @@ obj-$(CONFIG_ARCH_OMAP3) += omap_hwmod_3xxx_data.o 
obj-$(CONFIG_SOC_AM33XX)		+= omap_hwmod_33xx_data.o

obj-$(CONFIG_SOC_AM33XX)		+= omap_hwmod_33xx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= omap_hwmod_44xx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= omap_hwmod_44xx_data.o

obj-$(CONFIG_SOC_OMAP5)			+= omap_hwmod_54xx_data.o

obj-$(CONFIG_SOC_OMAP5)			+= omap_hwmod_54xx_data.o

obj-$(CONFIG_SOC_DRA7XX)		+= omap_hwmod_7xx_data.o





# EMU peripherals

# EMU peripherals

obj-$(CONFIG_OMAP3_EMU)			+= emu.o

obj-$(CONFIG_OMAP3_EMU)			+= emu.o

arch/arm/mach-omap2/board-generic.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -238,5 +238,6 @@ DT_MACHINE_START(DRA7XX_DT, "Generic DRA7XX (Flattened Device Tree)") 
	.init_machine	= omap_generic_init,

	.init_machine	= omap_generic_init,

	.init_time	= omap5_realtime_timer_init,

	.init_time	= omap5_realtime_timer_init,

	.dt_compat	= dra7xx_boards_compat,

	.dt_compat	= dra7xx_boards_compat,

	.restart	= omap44xx_restart,

MACHINE_END

MACHINE_END

#endif
 
#endif

arch/arm/mach-omap2/clockdomain.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -217,6 +217,7 @@ extern void __init omap3xxx_clockdomains_init(void); 
extern void __init am33xx_clockdomains_init(void);

extern void __init am33xx_clockdomains_init(void);

extern void __init omap44xx_clockdomains_init(void);

extern void __init omap44xx_clockdomains_init(void);

extern void __init omap54xx_clockdomains_init(void);

extern void __init omap54xx_clockdomains_init(void);

extern void __init dra7xx_clockdomains_init(void);





extern void clkdm_add_autodeps(struct clockdomain *clkdm);

extern void clkdm_add_autodeps(struct clockdomain *clkdm);

extern void clkdm_del_autodeps(struct clockdomain *clkdm);

extern void clkdm_del_autodeps(struct clockdomain *clkdm);

arch/arm/mach-omap2/clockdomains7xx_data.c

0 → 100644
+740 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-omap2/cm-regbits-7xx.h

0 → 100644
+51 −0

File added.

Preview size limit exceeded, changes collapsed.