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

Commit 090ad104 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'omap/voltage' into next/pm

parents 24469df4 eff11ba9

arch/arm/mach-omap2/Makefile

+39 −49
Original line number Diff line number Diff line
@@ -89,14 +89,13 @@ obj-$(CONFIG_ARCH_OMAP4) += prcm.o cm2xxx_3xxx.o cminst44xx.o \ 
					   vp44xx_data.o



# OMAP voltage domains

ifeq ($(CONFIG_PM),y)

voltagedomain-common			:= voltage.o

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

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

endif



# OMAP powerdomain framework

powerdomain-common			+= powerdomain.o powerdomain-common.o
@@ -116,9 +115,12 @@ obj-$(CONFIG_ARCH_OMAP4) += $(powerdomain-common) \ 
obj-$(CONFIG_ARCH_OMAP2)		+= clockdomain.o \

					   clockdomain2xxx_3xxx.o \

					   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

					   clockdomains2xxx_3xxx_data.o \

					   clockdomains3xxx_data.o

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

					   clockdomain44xx.o \

					   clockdomains44xx_data.o
@@ -185,78 +187,66 @@ endif 
# Specific board support

obj-$(CONFIG_MACH_OMAP_GENERIC)		+= board-generic.o

obj-$(CONFIG_MACH_OMAP_H4)		+= board-h4.o

obj-$(CONFIG_MACH_OMAP_2430SDP)		+= board-2430sdp.o \

					   hsmmc.o

obj-$(CONFIG_MACH_OMAP_2430SDP)		+= board-2430sdp.o

obj-$(CONFIG_MACH_OMAP_APOLLON)		+= board-apollon.o

obj-$(CONFIG_MACH_OMAP3_BEAGLE)		+= board-omap3beagle.o \

					   hsmmc.o

obj-$(CONFIG_MACH_DEVKIT8000)     	+= board-devkit8000.o \

                                           hsmmc.o

obj-$(CONFIG_MACH_OMAP_LDP)		+= board-ldp.o \

					   board-flash.o \

					   hsmmc.o

obj-$(CONFIG_MACH_OMAP3530_LV_SOM)      += board-omap3logic.o \

					   hsmmc.o

obj-$(CONFIG_MACH_OMAP3_TORPEDO)        += board-omap3logic.o \

					   hsmmc.o

obj-$(CONFIG_MACH_OVERO)		+= board-overo.o \

					   hsmmc.o

obj-$(CONFIG_MACH_OMAP3EVM)		+= board-omap3evm.o \

					   hsmmc.o

obj-$(CONFIG_MACH_OMAP3_PANDORA)	+= board-omap3pandora.o \

					   hsmmc.o

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

					   hsmmc.o \

					   board-flash.o

obj-$(CONFIG_MACH_OMAP3_BEAGLE)		+= board-omap3beagle.o

obj-$(CONFIG_MACH_DEVKIT8000)     	+= board-devkit8000.o

obj-$(CONFIG_MACH_OMAP_LDP)		+= board-ldp.o

obj-$(CONFIG_MACH_OMAP3530_LV_SOM)      += board-omap3logic.o

obj-$(CONFIG_MACH_OMAP3_TORPEDO)        += board-omap3logic.o

obj-$(CONFIG_MACH_ENCORE)		+= board-omap3encore.o

obj-$(CONFIG_MACH_OVERO)		+= board-overo.o

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 \

					   hsmmc.o

					   sdram-nokia.o

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

					   sdram-nokia.o \

					   board-rx51-peripherals.o \

					   board-rx51-video.o \

					   hsmmc.o

					   board-rx51-video.o

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

					   board-zoom-peripherals.o \

					   board-zoom-display.o \

					   board-flash.o \

					   hsmmc.o \

					   board-zoom-debugboard.o

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

					   board-zoom-peripherals.o \

					   board-zoom-display.o \

					   board-flash.o \

					   hsmmc.o \

					   board-zoom-debugboard.o

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

					   board-zoom-peripherals.o \

					   board-zoom-display.o \

					   board-flash.o \

					   hsmmc.o

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

					   hsmmc.o

					   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 \

					   hsmmc.o

obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK)	+= board-omap3touchbook.o \

					   hsmmc.o

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

obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK)	+= board-omap3touchbook.o

obj-$(CONFIG_MACH_OMAP_4430SDP)		+= board-4430sdp.o \

					   hsmmc.o \

					   omap_phy_internal.o

obj-$(CONFIG_MACH_OMAP4_PANDA)		+= board-omap4panda.o \

					   hsmmc.o \

					   omap_phy_internal.o



obj-$(CONFIG_MACH_PCM049)		+= board-omap4pcm049.o \

					   omap_phy_internal.o



obj-$(CONFIG_MACH_OMAP3517EVM)		+= board-am3517evm.o \

					   omap_phy_internal.o \

					   omap_phy_internal.o



obj-$(CONFIG_MACH_CRANEBOARD)		+= board-am3517crane.o



obj-$(CONFIG_MACH_SBC3530)		+= board-omap3stalker.o \

					   hsmmc.o

obj-$(CONFIG_MACH_SBC3530)		+= board-omap3stalker.o

obj-$(CONFIG_MACH_TI8168EVM)		+= board-ti8168evm.o



# Platform specific device init code



omap-flash-$(CONFIG_MTD_NAND_OMAP2)	:= board-flash.o

omap-flash-$(CONFIG_MTD_ONENAND_OMAP2)	:= board-flash.o

obj-y					+= $(omap-flash-y) $(omap-flash-m)



omap-hsmmc-$(CONFIG_MMC_OMAP_HS)	:= hsmmc.o

obj-y					+= $(omap-hsmmc-m) $(omap-hsmmc-y)





usbfs-$(CONFIG_ARCH_OMAP_OTG)		:= usb-fs.o

obj-y					+= $(usbfs-m) $(usbfs-y)

obj-y					+= usb-musb.o

arch/arm/mach-omap2/board-2430sdp.c

+2 −7
Original line number Diff line number Diff line
@@ -141,12 +141,6 @@ static struct omap_board_config_kernel sdp2430_config[] __initdata = { 
	{OMAP_TAG_LCD, &sdp2430_lcd_config},

};



static void __init omap_2430sdp_init_early(void)

{

	omap2_init_common_infrastructure();

	omap2_init_common_devices(NULL, NULL);

}



static struct regulator_consumer_supply sdp2430_vmmc1_supplies[] = {

	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"),

};
@@ -235,6 +229,7 @@ static void __init omap_2430sdp_init(void) 


	platform_add_devices(sdp2430_devices, ARRAY_SIZE(sdp2430_devices));

	omap_serial_init();

	omap_sdrc_init(NULL, NULL);

	omap2_hsmmc_init(mmc);

	omap2_usbfs_init(&sdp2430_usb_config);
@@ -259,7 +254,7 @@ MACHINE_START(OMAP_2430SDP, "OMAP2430 sdp2430 board") 
	.boot_params	= 0x80000100,

	.reserve	= omap_reserve,

	.map_io		= omap_2430sdp_map_io,

	.init_early	= omap_2430sdp_init_early,

	.init_early	= omap2430_init_early,

	.init_irq	= omap2_init_irq,

	.init_machine	= omap_2430sdp_init,

	.timer		= &omap2_timer,

arch/arm/mach-omap2/board-3430sdp.c

+2 −7
Original line number Diff line number Diff line
@@ -225,12 +225,6 @@ static struct omap_dss_board_info sdp3430_dss_data = { 
static struct omap_board_config_kernel sdp3430_config[] __initdata = {

};



static void __init omap_3430sdp_init_early(void)

{

	omap2_init_common_infrastructure();

	omap2_init_common_devices(hyb18m512160af6_sdrc_params, NULL);

}



static struct omap2_hsmmc_info mmc[] = {

	{

		.mmc		= 1,
@@ -719,6 +713,7 @@ static void __init omap_3430sdp_init(void) 
		gpio_pendown = SDP3430_TS_GPIO_IRQ_SDPV1;

	omap_ads7846_init(1, gpio_pendown, 310, NULL);

	board_serial_init();

	omap_sdrc_init(hyb18m512160af6_sdrc_params, NULL);

	usb_musb_init(NULL);

	board_smc91x_init();

	board_flash_init(sdp_flash_partitions, chip_sel_3430, 0);
@@ -732,7 +727,7 @@ MACHINE_START(OMAP_3430SDP, "OMAP3430 3430SDP board") 
	.boot_params	= 0x80000100,

	.reserve	= omap_reserve,

	.map_io		= omap3_map_io,

	.init_early	= omap_3430sdp_init_early,

	.init_early	= omap3430_init_early,

	.init_irq	= omap3_init_irq,

	.init_machine	= omap_3430sdp_init,

	.timer		= &omap3_timer,

arch/arm/mach-omap2/board-3630sdp.c

+3 −8
Original line number Diff line number Diff line
@@ -70,13 +70,6 @@ static const struct usbhs_omap_board_data usbhs_bdata __initconst = { 
static struct omap_board_config_kernel sdp_config[] __initdata = {

};



static void __init omap_sdp_init_early(void)

{

	omap2_init_common_infrastructure();

	omap2_init_common_devices(h8mbx00u0mer0em_sdrc_params,

				  h8mbx00u0mer0em_sdrc_params);

}



#ifdef CONFIG_OMAP_MUX

static struct omap_board_mux board_mux[] __initdata = {

	{ .reg_offset = OMAP_MUX_TERMINATOR },
@@ -207,6 +200,8 @@ static void __init omap_sdp_init(void) 
	omap_board_config = sdp_config;

	omap_board_config_size = ARRAY_SIZE(sdp_config);

	zoom_peripherals_init();

	omap_sdrc_init(h8mbx00u0mer0em_sdrc_params,

				  h8mbx00u0mer0em_sdrc_params);

	zoom_display_init();

	board_smc91x_init();

	board_flash_init(sdp_flash_partitions, chip_sel_sdp, NAND_BUSWIDTH_16);
@@ -218,7 +213,7 @@ MACHINE_START(OMAP_3630SDP, "OMAP 3630SDP board") 
	.boot_params	= 0x80000100,

	.reserve	= omap_reserve,

	.map_io		= omap3_map_io,

	.init_early	= omap_sdp_init_early,

	.init_early	= omap3630_init_early,

	.init_irq	= omap3_init_irq,

	.init_machine	= omap_sdp_init,

	.timer		= &omap3_timer,

arch/arm/mach-omap2/board-4430sdp.c

+2 −7
Original line number Diff line number Diff line
@@ -389,12 +389,6 @@ static struct omap_board_config_kernel sdp4430_config[] __initdata = { 
	{ OMAP_TAG_LCD,		&sdp4430_lcd_config },

};



static void __init omap_4430sdp_init_early(void)

{

	omap2_init_common_infrastructure();

	omap2_init_common_devices(NULL, NULL);

}



static struct omap_musb_board_data musb_board_data = {

	.interface_type		= MUSB_INTERFACE_UTMI,

	.mode			= MUSB_OTG,
@@ -809,6 +803,7 @@ static void __init omap_4430sdp_init(void) 
	omap_sfh7741prox_init();

	platform_add_devices(sdp4430_devices, ARRAY_SIZE(sdp4430_devices));

	board_serial_init();

	omap_sdrc_init(NULL, NULL);

	omap4_sdp4430_wifi_init();

	omap4_twl6030_hsmmc_init(mmc);
@@ -841,7 +836,7 @@ MACHINE_START(OMAP_4430SDP, "OMAP4430 4430SDP board") 
	.boot_params	= 0x80000100,

	.reserve	= omap_reserve,

	.map_io		= omap_4430sdp_map_io,

	.init_early	= omap_4430sdp_init_early,

	.init_early	= omap4430_init_early,

	.init_irq	= gic_init_irq,

	.init_machine	= omap_4430sdp_init,

	.timer		= &omap4_timer,