Commit 9cf1c871 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-devel-board-late-v3-for-v3.7' of... 

Merge tag 'omap-devel-board-late-v3-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup

From Tony Lindgren:

These board and platform related patches have been posted
quite a while ago but have somehow fallen though the cracks
as most of the focus has been making things to work with
device tree. As the first patch depends on sparse IRQ
related removal of irqs.h and related header moves, these
are based on omap-cleanup-local-headers-for-v3.7 tag.

* tag 'omap-devel-board-late-v3-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: serial: Change MAX_HSUART_PORTS to 6
  ARM: OMAP4: twl-common: Support for additional devices on i2c1 bus
parents 268aebe4 cfc55bcc

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

+10 −2
Original line number Diff line number Diff line
@@ -545,6 +545,14 @@ static struct twl6040_platform_data twl6040_data = { 
	.audpwron_gpio	= 127,

};



static struct i2c_board_info __initdata sdp4430_i2c_1_boardinfo[] = {

	{

		I2C_BOARD_INFO("twl6040", 0x4b),

		.irq = 119 + OMAP44XX_IRQ_GIC_START,

		.platform_data = &twl6040_data,

	},

};



static struct twl4030_platform_data sdp4430_twldata = {

	/* Regulators */

	.vusim		= &sdp4430_vusim,
@@ -578,8 +586,8 @@ static int __init omap4_i2c_init(void) 
			TWL_COMMON_REGULATOR_CLK32KG |

			TWL_COMMON_REGULATOR_V1V8 |

			TWL_COMMON_REGULATOR_V2V1);

	omap4_pmic_init("twl6030", &sdp4430_twldata,

			&twl6040_data, 119 + OMAP44XX_IRQ_GIC_START);

	omap4_pmic_init("twl6030", &sdp4430_twldata, sdp4430_i2c_1_boardinfo,

			ARRAY_SIZE(sdp4430_i2c_1_boardinfo));

	omap_register_i2c_bus(2, 400, NULL, 0);

	omap_register_i2c_bus(3, 400, sdp4430_i2c_3_boardinfo,

				ARRAY_SIZE(sdp4430_i2c_3_boardinfo));

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

+10 −2
Original line number Diff line number Diff line
@@ -264,6 +264,14 @@ static struct twl6040_platform_data twl6040_data = { 
	.audpwron_gpio	= 127,

};



static struct i2c_board_info __initdata panda_i2c_1_boardinfo[] = {

	{

		I2C_BOARD_INFO("twl6040", 0x4b),

		.irq = 119 + OMAP44XX_IRQ_GIC_START,

		.platform_data = &twl6040_data,

	},

};



/* Panda board uses the common PMIC configuration */

static struct twl4030_platform_data omap4_panda_twldata;
@@ -291,8 +299,8 @@ static int __init omap4_panda_i2c_init(void) 
			TWL_COMMON_REGULATOR_CLK32KG |

			TWL_COMMON_REGULATOR_V1V8 |

			TWL_COMMON_REGULATOR_V2V1);

	omap4_pmic_init("twl6030", &omap4_panda_twldata,

			&twl6040_data, 119 + OMAP44XX_IRQ_GIC_START);

	omap4_pmic_init("twl6030", &omap4_panda_twldata, panda_i2c_1_boardinfo,

			ARRAY_SIZE(panda_i2c_1_boardinfo));

	omap_register_i2c_bus(2, 400, NULL, 0);

	/*

	 * Bus 3 is attached to the DVI port where devices like the pico DLP

arch/arm/mach-omap2/twl-common.c

+11 −26
Original line number Diff line number Diff line
@@ -40,16 +40,6 @@ static struct i2c_board_info __initdata pmic_i2c_board_info = { 
	.flags		= I2C_CLIENT_WAKE,

};



static struct i2c_board_info __initdata omap4_i2c1_board_info[] = {

	{

		.addr		= 0x48,

		.flags		= I2C_CLIENT_WAKE,

	},

	{

		I2C_BOARD_INFO("twl6040", 0x4b),

	},

};



#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)

static int twl_set_voltage(void *data, int target_uV)

{
@@ -79,29 +69,24 @@ void __init omap_pmic_init(int bus, u32 clkrate, 


void __init omap4_pmic_init(const char *pmic_type,

		    struct twl4030_platform_data *pmic_data,

		    struct twl6040_platform_data *twl6040_data, int twl6040_irq)

		    struct i2c_board_info *devices, int nr_devices)

{

	/* PMIC part*/

	omap_mux_init_signal("sys_nirq1", OMAP_PIN_INPUT_PULLUP | OMAP_PIN_OFF_WAKEUPENABLE);

	strncpy(omap4_i2c1_board_info[0].type, pmic_type,

		sizeof(omap4_i2c1_board_info[0].type));

	omap4_i2c1_board_info[0].irq = 7 + OMAP44XX_IRQ_GIC_START;

	omap4_i2c1_board_info[0].platform_data = pmic_data;



	/* TWL6040 audio IC part */

	omap4_i2c1_board_info[1].irq = twl6040_irq;

	omap4_i2c1_board_info[1].platform_data = twl6040_data;



	omap_register_i2c_bus(1, 400, omap4_i2c1_board_info, 2);

	omap_pmic_init(1, 400, pmic_type, 7 + OMAP44XX_IRQ_GIC_START, pmic_data);



	/* Register additional devices on i2c1 bus if needed */

	if (devices)

		i2c_register_board_info(1, devices, nr_devices);

}



void __init omap_pmic_late_init(void)

{

	/* Init the OMAP TWL parameters (if PMIC has been registered) */

	if (pmic_i2c_board_info.irq)

	/* Init the OMAP TWL parameters (if PMIC has been registerd) */

	if (!pmic_i2c_board_info.irq)

		return;



	omap3_twl_init();

	if (omap4_i2c1_board_info[0].irq)

	omap4_twl_init();

}

arch/arm/mach-omap2/twl-common.h

+2 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 


struct twl4030_platform_data;

struct twl6040_platform_data;

struct i2c_board_info;



void omap_pmic_init(int bus, u32 clkrate, const char *pmic_type, int pmic_irq,

		    struct twl4030_platform_data *pmic_data);
@@ -51,7 +52,7 @@ static inline void omap3_pmic_init(const char *pmic_type, 


void omap4_pmic_init(const char *pmic_type,

		    struct twl4030_platform_data *pmic_data,

		    struct twl6040_platform_data *audio_data, int twl6040_irq);

		    struct i2c_board_info *devices, int nr_devices);



void omap3_pmic_get_config(struct twl4030_platform_data *pmic_data,

			   u32 pdata_flags, u32 regulators_flags);

arch/arm/plat-omap/include/plat/omap-serial.h

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 


#define OMAP_UART_DMA_CH_FREE	-1



#define OMAP_MAX_HSUART_PORTS	4

#define OMAP_MAX_HSUART_PORTS	6



#define MSR_SAVE_FLAGS		UART_MSR_ANY_DELTA

CRA Git | Maintained and supported by SUSTech CRA and CCSE