On Fri, Nov 28, 2008 at 10:57:58AM +0530, ext Manikandan Pillai wrote:
> This patch provides the support framework for PR785 boards.
> More patches will follow that will allow complete programming
> support for PR785 boards.
> The board-omap3evm.c contains the I2C devices to be supported.
> CONFIG_PR785 is configuration used for the PR784 boards.
>
> Signed-off-by: Manikandan Pillai <mani.pillai@xxxxxx>
> ---
> arch/arm/mach-omap2/board-omap3evm.c | 29 ++++++++++++++++++++++++++---
> arch/arm/mach-omap2/mmc-twl4030.c | 5 +++--
> drivers/i2c/chips/Kconfig | 11 +++++++++++
> drivers/mfd/Kconfig | 14 ++++++++++++++
> drivers/video/omap/lcd_omap3evm.c | 4 ++++
> 5 files changed, 58 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
> index bc44cb5..f5f9ea5 100644
> --- a/arch/arm/mach-omap2/board-omap3evm.c
> +++ b/arch/arm/mach-omap2/board-omap3evm.c
> @@ -42,6 +42,9 @@
> #include "twl4030-generic-scripts.h"
> #include "mmc-twl4030.h"
>
> +#define OMAP3_I2C_STD 100
> +#define OMAP3_I2C_FAST 400
> +#define OMAP3_I2C_HS 2600
Why ?? <see below>
>
> static struct resource omap3evm_smc911x_resources[] = {
> [0] = {
> @@ -144,6 +147,19 @@ static struct twl4030_platform_data omap3evm_twldata = {
> .gpio = &omap3evm_gpio_data,
> };
>
> +#if defined(CONFIG_PR785)
> +static struct i2c_board_info __initdata tps_6235x_i2c_board_info[] = {
> + {
> + I2C_BOARD_INFO("tps62352_core_pwr", 0x4A),
> + .flags = I2C_CLIENT_WAKE,
> + },
> + {
> + I2C_BOARD_INFO("tps62353_mpu_pwr", 0x48),
> + .flags = I2C_CLIENT_WAKE,
> + },
> +};
> +#endif
> +#if defined(CONFIG_TWL4030_CORE)
No way. Create separated versions of the omap3evm_i2c_boardinfo[] for
the "conflicting" devices and register one or the other version based on
if (machine_is_XXX()) or something similar.
You can register as many i2c_board_infos as you want per bus.
> static struct i2c_board_info __initdata omap3evm_i2c_boardinfo[] = {
> {
> I2C_BOARD_INFO("twl4030", 0x48),
> @@ -152,13 +168,20 @@ static struct i2c_board_info __initdata omap3evm_i2c_boardinfo[] = {
> .platform_data = &omap3evm_twldata,
> },
> };
> +#endif
>
> static int __init omap3_evm_i2c_init(void)
> {
> - omap_register_i2c_bus(1, 2600, omap3evm_i2c_boardinfo,
> +#if defined(CONFIG_PR785)
> + omap_register_i2c_bus(1, OMAP3_I2C_HS, tps_6235x_i2c_board_info,
</see below> the numbers here will be easier to read.
> + ARRAY_SIZE(tps_6235x_i2c_board_info));
> +#endif
> +#if defined(CONFIG_TWL4030_CORE)
> + omap_register_i2c_bus(1, OMAP3_I2C_HS, omap3evm_i2c_boardinfo,
> ARRAY_SIZE(omap3evm_i2c_boardinfo));
> - omap_register_i2c_bus(2, 400, NULL, 0);
> - omap_register_i2c_bus(3, 400, NULL, 0);
> +#endif
> + omap_register_i2c_bus(2, OMAP3_I2C_FAST, NULL, 0);
> + omap_register_i2c_bus(3, OMAP3_I2C_FAST, NULL, 0);
> return 0;
> }
>
> diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/mmc-twl4030.c
> index 626d668..daf10f3 100644
> --- a/arch/arm/mach-omap2/mmc-twl4030.c
> +++ b/arch/arm/mach-omap2/mmc-twl4030.c
> @@ -167,7 +167,7 @@ static int twl_mmc_resume(struct device *dev, int slot)
> */
> static int twl_mmc_set_voltage(struct twl_mmc_controller *c, int vdd)
> {
> - int ret;
> + int ret = 0;
> u8 vmmc, dev_grp_val;
>
> switch (1 << vdd) {
> @@ -222,6 +222,7 @@ static int twl_mmc_set_voltage(struct twl_mmc_controller *c, int vdd)
> else
> dev_grp_val = LDO_CLR; /* Power down */
>
> +#if defined(CONFIG_TWL4030_CORE)
> ret = twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
> dev_grp_val, c->twl_vmmc_dev_grp);
> if (ret)
> @@ -229,7 +230,7 @@ static int twl_mmc_set_voltage(struct twl_mmc_controller *c, int vdd)
>
> ret = twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
> vmmc, c->twl_mmc_dedicated);
> -
> +#endif
> return ret;
> }
>
> diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
> index 4c73bb5..32cf887 100644
> --- a/drivers/i2c/chips/Kconfig
> +++ b/drivers/i2c/chips/Kconfig
> @@ -186,6 +186,17 @@ config TWL4030_POWEROFF
> tristate "TWL4030 device poweroff"
> depends on TWL4030_CORE
>
> +config TPS6235X
> + tristate "TPS6235x Power Management chips"
> + depends on I2C=y && ARCH_OMAP34XX && PR785=y
> + default n
> + help
> + If you say yes here you get support for the TPS6235x series of
> + Power Management chips.
> +
> + This driver can also be built as a module. If so, the module
> + will be called tps6235x.o.
> +
> config SENSORS_MAX6875
> tristate "Maxim MAX6875 Power supply supervisor"
> depends on EXPERIMENTAL
> diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
> index 2438aab..93f2c0a 100644
> --- a/drivers/mfd/Kconfig
> +++ b/drivers/mfd/Kconfig
> @@ -61,6 +61,8 @@ config UCB1400_CORE
> To compile this driver as a module, choose M here: the
> module will be called ucb1400_core.
>
> +menu "Texas Instruments Power board Support"
> +
> config TWL4030_CORE
> bool "Texas Instruments TWL4030/TPS659x0 Support"
> depends on I2C=y && GENERIC_HARDIRQS && (ARCH_OMAP2 || ARCH_OMAP3)
> @@ -84,6 +86,18 @@ config TWL4030_POWER
> oscillators are switched off or on or reset when a sleep, wakeup
> or warm reset event occurs.
>
> +config PR785
> + bool "A Texas Instruments TPS6235X based Power Module"
> + depends on I2C=y && MACH_OMAP3EVM=y && GENERIC_GPIO && (ARCH_OMAP3)
> + default n
> + help
> + Say yes here if you are using the TPS6235x based PR785 Power Module
> + for the EVM boards. This core driver provides register access and IRQ
> + handling facilities, and registers devices for the various functions
> + so that function-specific drivers can bind to them.
> +
> +endmenu
> +
> config MFD_TMIO
> bool
> default n
> diff --git a/drivers/video/omap/lcd_omap3evm.c b/drivers/video/omap/lcd_omap3evm.c
> index 90aa015..ac51dd0 100644
> --- a/drivers/video/omap/lcd_omap3evm.c
> +++ b/drivers/video/omap/lcd_omap3evm.c
> @@ -66,9 +66,11 @@ static int omap3evm_panel_init(struct lcd_panel *panel,
> gpio_direction_output(LCD_PANEL_LR, 1);
> gpio_direction_output(LCD_PANEL_UD, 1);
>
> +#if !defined(CONFIG_PR785)
> twl4030_i2c_write_u8(TWL4030_MODULE_LED, 0x11, TWL_LED_LEDEN);
> twl4030_i2c_write_u8(TWL4030_MODULE_PWMA, 0x01, TWL_PWMA_PWMAON);
> twl4030_i2c_write_u8(TWL4030_MODULE_PWMA, 0x02, TWL_PWMA_PWMAOFF);
> +#endif
> bklight_level = 100;
>
> return 0;
> @@ -97,12 +99,14 @@ static unsigned long omap3evm_panel_get_caps(struct lcd_panel *panel)
> static int omap3evm_bklight_setlevel(struct lcd_panel *panel,
> unsigned int level)
> {
> +#if !defined(CONFIG_PR785)
> u8 c;
> if ((level >= 0) && (level <= 100)) {
> c = (125 * (100 - level)) / 100 + 2;
> twl4030_i2c_write_u8(TWL4030_MODULE_PWMA, c, TWL_PWMA_PWMAOFF);
> bklight_level = level;
> }
> +#endif
No!!
NAK to all ifdefs. It'll break multiomap support.
--
balbi
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
