Marek Szyprowski wrote:
>
> Add required platform definitions for MMC power regulators on Samsung
> Goni board.
>
> Signed-off-by: Marek Szyprowski <[email protected]>
> Signed-off-by: Kyungmin Park <[email protected]>
> CC: Mark Brown <[email protected]>
> ---
> arch/arm/mach-s5pv210/mach-goni.c | 44
> ++++++++++++++++++++++++++++++++++--
> 1 files changed, 41 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-s5pv210/mach-goni.c
b/arch/arm/mach-s5pv210/mach-
> goni.c
> index b28a42b..595afc37 100644
> --- a/arch/arm/mach-s5pv210/mach-goni.c
> +++ b/arch/arm/mach-s5pv210/mach-goni.c
> @@ -16,6 +16,7 @@
> #include <linux/i2c.h>
> #include <linux/i2c-gpio.h>
> #include <linux/mfd/max8998.h>
> +#include <linux/regulator/fixed.h>
> #include <linux/spi/spi.h>
> #include <linux/spi/spi_gpio.h>
> #include <linux/lcd.h>
> @@ -227,6 +228,10 @@ static void __init goni_radio_init(void)
> /* MAX8998 regulators */
> #if defined(CONFIG_REGULATOR_MAX8998) ||
> defined(CONFIG_REGULATOR_MAX8998_MODULE)
>
> +static struct regulator_consumer_supply goni_ldo5_consumers[] = {
> + { .supply = "vmmc", .dev = &s3c_device_hsmmc0.dev },
> +};
> +
> static struct regulator_init_data goni_ldo2_data = {
> .constraints = {
> .name = "VALIVE_1.1V",
> @@ -266,6 +271,8 @@ static struct regulator_init_data goni_ldo5_data = {
> .max_uV = 2800000,
> .apply_uV = 1,
> },
> + .num_consumer_supplies = ARRAY_SIZE(goni_ldo5_consumers),
> + .consumer_supplies = goni_ldo5_consumers,
> };
>
> static struct regulator_init_data goni_ldo6_data = {
> @@ -471,6 +478,39 @@ static struct max8998_platform_data
> goni_max8998_pdata = {
> .num_regulators = ARRAY_SIZE(goni_regulators),
> .regulators = goni_regulators,
> };
> +
> +static struct regulator_consumer_supply mmc2_supplies[] = {
> + {
> + .dev = &s3c_device_hsmmc2.dev,
> + .supply = "vmmc",
> + },
> +};
> +
> +static struct regulator_init_data mmc2_fixed_voltage_init_data = {
> + .constraints = {
> + .name = "V_TF_2.8V",
> + .valid_ops_mask = REGULATOR_CHANGE_STATUS,
> + },
> + .num_consumer_supplies = ARRAY_SIZE(mmc2_supplies),
> + .consumer_supplies = mmc2_supplies,
> +};
> +
> +static struct fixed_voltage_config mmc2_fixed_voltage_config = {
> + .supply_name = "T_FLASH_EN",
> + .microvolts = 2800000,
> + .gpio = S5PV210_MP05(4), /* XM0ADDR_12 */
> + .enable_high = true,
> + .init_data = &mmc2_fixed_voltage_init_data,
> +};
> +
> +static struct platform_device mmc2_fixed_voltage = {
> + .name = "reg-fixed-voltage",
> + .id = 2,
> + .dev = {
> + .platform_data = &mmc2_fixed_voltage_config,
> + },
> +};
> +
> #endif
>
> /* GPIO I2C PMIC */
> @@ -559,9 +599,6 @@ static struct s3c_sdhci_platdata goni_hsmmc2_data
> __initdata = {
>
> static void goni_setup_sdhci(void)
> {
> - gpio_request(GONI_EXT_FLASH_EN, "FLASH_EN");
> - gpio_direction_output(GONI_EXT_FLASH_EN, 1);
> -
Why need above changes in this patch?
Others, looks ok.
> s3c_sdhci0_set_platdata(&goni_hsmmc0_data);
> s3c_sdhci1_set_platdata(&goni_hsmmc1_data);
> s3c_sdhci2_set_platdata(&goni_hsmmc2_data);
> @@ -573,6 +610,7 @@ static struct platform_device *goni_devices[]
__initdata = {
> &goni_spi_gpio,
> &s3c_device_usb_hsotg,
> &goni_i2c_gpio_pmic,
> + &mmc2_fixed_voltage,
> &goni_device_gpiokeys,
> &s5p_device_fimc0,
> &s5p_device_fimc1,
> --
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
