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

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

Merge branches 'devel-cleanup', 'devel-omap4', 'devel-board' and 'devel-nand' into omap-for-linus

parents 04aa67de adc5430b e49c4d27 7715db5a c497dd55

arch/arm/configs/omap2plus_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ CONFIG_ARM_ERRATA_411920=y 
CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_SMP=y

CONFIG_NR_CPUS=2

# CONFIG_LOCAL_TIMERS is not set

CONFIG_AEABI=y

CONFIG_LEDS=y

arch/arm/mach-omap2/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -310,6 +310,7 @@ config MACH_OMAP_4430SDP 
	depends on ARCH_OMAP4

	select OMAP_PACKAGE_CBL

	select OMAP_PACKAGE_CBS

	select REGULATOR_FIXED_VOLTAGE



config MACH_OMAP4_PANDA

	bool "OMAP4 Panda Board"
@@ -317,6 +318,7 @@ config MACH_OMAP4_PANDA 
	depends on ARCH_OMAP4

	select OMAP_PACKAGE_CBL

	select OMAP_PACKAGE_CBS

	select REGULATOR_FIXED_VOLTAGE



config OMAP3_EMU

	bool "OMAP3 debugging peripherals"

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

+21 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/mmc/host.h>

#include <linux/delay.h>

#include <linux/i2c/twl.h>

#include <linux/regulator/machine.h>

#include <linux/err.h>

#include <linux/clk.h>

#include <linux/io.h>
@@ -147,6 +148,25 @@ static void __init omap_2430sdp_init_early(void) 
	omap2_init_common_devices(NULL, NULL);

}



static struct regulator_consumer_supply sdp2430_vmmc1_supplies[] = {

	REGULATOR_SUPPLY("vmmc", "mmci-omap-hs.0"),

};



/* VMMC1 for OMAP VDD_MMC1 (i/o) and MMC1 card */

static struct regulator_init_data sdp2430_vmmc1 = {

	.constraints = {

		.min_uV			= 1850000,

		.max_uV			= 3150000,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask		= REGULATOR_CHANGE_VOLTAGE

					| REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies	= ARRAY_SIZE(sdp2430_vmmc1_supplies),

	.consumer_supplies	= &sdp2430_vmmc1_supplies[0],

};



static struct twl4030_gpio_platform_data sdp2430_gpio_data = {

	.gpio_base	= OMAP_MAX_GPIO_LINES,

	.irq_base	= TWL4030_GPIO_IRQ_BASE,
@@ -159,6 +179,7 @@ static struct twl4030_platform_data sdp2430_twldata = { 


	/* platform_data for children goes here */

	.gpio		= &sdp2430_gpio_data,

	.vmmc1		= &sdp2430_vmmc1,

};



static struct i2c_board_info __initdata sdp2430_i2c_boardinfo[] = {

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

+39 −41
Original line number Diff line number Diff line
@@ -315,11 +315,6 @@ static struct platform_device sdp3430_dss_device = { 
	},

};



static struct regulator_consumer_supply sdp3430_vdda_dac_supply = {

	.supply		= "vdda_dac",

	.dev		= &sdp3430_dss_device.dev,

};



static struct platform_device *sdp3430_devices[] __initdata = {

	&sdp3430_dss_device,

};
@@ -369,18 +364,6 @@ static struct omap2_hsmmc_info mmc[] = { 
	{}	/* Terminator */

};



static struct regulator_consumer_supply sdp3430_vmmc1_supply = {

	.supply			= "vmmc",

};



static struct regulator_consumer_supply sdp3430_vsim_supply = {

	.supply			= "vmmc_aux",

};



static struct regulator_consumer_supply sdp3430_vmmc2_supply = {

	.supply			= "vmmc",

};



static int sdp3430_twl_gpio_setup(struct device *dev,

		unsigned gpio, unsigned ngpio)

{
@@ -391,13 +374,6 @@ static int sdp3430_twl_gpio_setup(struct device *dev, 
	mmc[1].gpio_cd = gpio + 1;

	omap2_hsmmc_init(mmc);



	/* link regulators to MMC adapters ... we "know" the

	 * regulators will be set up only *after* we return.

	 */

	sdp3430_vmmc1_supply.dev = mmc[0].dev;

	sdp3430_vsim_supply.dev = mmc[0].dev;

	sdp3430_vmmc2_supply.dev = mmc[1].dev;



	/* gpio + 7 is "sub_lcd_en_bkl" (output/PWM1) */

	gpio_request(gpio + 7, "sub_lcd_en_bkl");

	gpio_direction_output(gpio + 7, 0);
@@ -426,6 +402,34 @@ static struct twl4030_madc_platform_data sdp3430_madc_data = { 
	.irq_line	= 1,

};



/* regulator consumer mappings */



/* ads7846 on SPI */

static struct regulator_consumer_supply sdp3430_vaux3_supplies[] = {

	REGULATOR_SUPPLY("vcc", "spi1.0"),

};



static struct regulator_consumer_supply sdp3430_vdda_dac_supplies[] = {

	REGULATOR_SUPPLY("vdda_dac", "omapdss"),

};



/* VPLL2 for digital video outputs */

static struct regulator_consumer_supply sdp3430_vpll2_supplies[] = {

	REGULATOR_SUPPLY("vdds_dsi", "omapdss"),

};



static struct regulator_consumer_supply sdp3430_vmmc1_supplies[] = {

	REGULATOR_SUPPLY("vmmc", "mmci-omap-hs.0"),

};



static struct regulator_consumer_supply sdp3430_vsim_supplies[] = {

	REGULATOR_SUPPLY("vmmc_aux", "mmci-omap-hs.0"),

};



static struct regulator_consumer_supply sdp3430_vmmc2_supplies[] = {

	REGULATOR_SUPPLY("vmmc", "mmci-omap-hs.1"),

};



/*

 * Apply all the fixed voltages since most versions of U-Boot

 * don't bother with that initialization.
@@ -468,6 +472,8 @@ static struct regulator_init_data sdp3430_vaux3 = { 
		.valid_ops_mask		= REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies		= ARRAY_SIZE(sdp3430_vaux3_supplies),

	.consumer_supplies		= sdp3430_vaux3_supplies,

};



/* VAUX4 for OMAP VDD_CSI2 (camera) */
@@ -494,8 +500,8 @@ static struct regulator_init_data sdp3430_vmmc1 = { 
					| REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies	= 1,

	.consumer_supplies	= &sdp3430_vmmc1_supply,

	.num_consumer_supplies	= ARRAY_SIZE(sdp3430_vmmc1_supplies),

	.consumer_supplies	= sdp3430_vmmc1_supplies,

};



/* VMMC2 for MMC2 card */
@@ -509,8 +515,8 @@ static struct regulator_init_data sdp3430_vmmc2 = { 
		.valid_ops_mask		= REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies	= 1,

	.consumer_supplies	= &sdp3430_vmmc2_supply,

	.num_consumer_supplies	= ARRAY_SIZE(sdp3430_vmmc2_supplies),

	.consumer_supplies	= sdp3430_vmmc2_supplies,

};



/* VSIM for OMAP VDD_MMC1A (i/o for DAT4..DAT7) */
@@ -524,8 +530,8 @@ static struct regulator_init_data sdp3430_vsim = { 
					| REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies	= 1,

	.consumer_supplies	= &sdp3430_vsim_supply,

	.num_consumer_supplies	= ARRAY_SIZE(sdp3430_vsim_supplies),

	.consumer_supplies	= sdp3430_vsim_supplies,

};



/* VDAC for DSS driving S-Video */
@@ -539,16 +545,8 @@ static struct regulator_init_data sdp3430_vdac = { 
		.valid_ops_mask		= REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies	= 1,

	.consumer_supplies	= &sdp3430_vdda_dac_supply,

};



/* VPLL2 for digital video outputs */

static struct regulator_consumer_supply sdp3430_vpll2_supplies[] = {

	{

		.supply		= "vdds_dsi",

		.dev		= &sdp3430_dss_device.dev,

	}

	.num_consumer_supplies	= ARRAY_SIZE(sdp3430_vdda_dac_supplies),

	.consumer_supplies	= sdp3430_vdda_dac_supplies,

};



static struct regulator_init_data sdp3430_vpll2 = {
@@ -812,7 +810,7 @@ static void __init omap_3430sdp_init(void) 
	omap_serial_init();

	usb_musb_init(&musb_board_data);

	board_smc91x_init();

	board_flash_init(sdp_flash_partitions, chip_sel_3430);

	board_flash_init(sdp_flash_partitions, chip_sel_3430, 0);

	sdp3430_display_init();

	enable_board_wakeup_source();

	usb_ehci_init(&ehci_pdata);

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

+2 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/platform_device.h>

#include <linux/input.h>

#include <linux/gpio.h>

#include <linux/mtd/nand.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>
@@ -208,7 +209,7 @@ static void __init omap_sdp_init(void) 
	zoom_peripherals_init();

	zoom_display_init();

	board_smc91x_init();

	board_flash_init(sdp_flash_partitions, chip_sel_sdp);

	board_flash_init(sdp_flash_partitions, chip_sel_sdp, NAND_BUSWIDTH_16);

	enable_board_wakeup_source();

	usb_ehci_init(&ehci_pdata);

}