Marek Szyprowski wrote:
>
> From: Tomasz Stanislawski <[email protected]>
>
> This patch adds platform devices and regulators for TV devices on
> Samsung Universal C210 board.
>
> Signed-off-by: Tomasz Stanislawski <[email protected]>
> Signed-off-by: Kyungmin Park <[email protected]>
> Signed-off-by: Marek Szyprowski <[email protected]>
> ---
> arch/arm/mach-exynos4/Kconfig | 2 +
> arch/arm/mach-exynos4/mach-universal_c210.c | 76
> +++++++++++++++++++++++++++
> 2 files changed, 78 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig
> index 8236ffb..494ff7b 100644
> --- a/arch/arm/mach-exynos4/Kconfig
> +++ b/arch/arm/mach-exynos4/Kconfig
> @@ -166,9 +166,11 @@ config MACH_UNIVERSAL_C210
> select S3C_DEV_I2C1
> select S3C_DEV_I2C3
> select S3C_DEV_I2C5
> + select S3C_DEV_I2C8
> select S5P_DEV_MFC
> select S5P_DEV_ONENAND
> select EXYNOS4_DEV_PD
> + select S5P_DEV_TV
> select EXYNOS4_SETUP_I2C1
> select EXYNOS4_SETUP_I2C3
> select EXYNOS4_SETUP_I2C5
> diff --git a/arch/arm/mach-exynos4/mach-universal_c210.c b/arch/arm/mach-
> exynos4/mach-universal_c210.c
> index 0e280d1..0fd81be 100644
> --- a/arch/arm/mach-exynos4/mach-universal_c210.c
> +++ b/arch/arm/mach-exynos4/mach-universal_c210.c
> @@ -110,6 +110,8 @@ static struct regulator_consumer_supply
> lp3974_buck1_consumer =
> static struct regulator_consumer_supply lp3974_buck2_consumer =
> REGULATOR_SUPPLY("vddg3d", NULL);
>
> +static struct regulator_consumer_supply lp3974_buck3_consumer =
> + REGULATOR_SUPPLY("vdet", "s5p-sdo");
> static struct regulator_init_data lp3974_buck1_data = {
> .constraints = {
> .name = "VINT_1.1V",
> @@ -153,6 +155,8 @@ static struct regulator_init_data lp3974_buck3_data =
{
> .enabled = 1,
> },
> },
> + .num_consumer_supplies = 1,
> + .consumer_supplies = &lp3974_buck3_consumer,
> };
>
> static struct regulator_init_data lp3974_buck4_data = {
> @@ -181,6 +185,13 @@ static struct regulator_init_data lp3974_ldo2_data =
{
> },
> };
>
> +static struct regulator_consumer_supply lp3974_ldo3_consumer[] = {
> + REGULATOR_SUPPLY("vusb_a", "s3c-hsotg"),
> + REGULATOR_SUPPLY("vdd11", "s5p-mipi-csis.0"),
Is this for TV?
> + REGULATOR_SUPPLY("vdd", "exynos4-hdmi"),
> + REGULATOR_SUPPLY("vdd_pll", "exynos4-hdmi"),
> +};
> +
> static struct regulator_init_data lp3974_ldo3_data = {
> .constraints = {
> .name = "VUSB+MIPI_1.1V",
> @@ -192,6 +203,12 @@ static struct regulator_init_data lp3974_ldo3_data =
{
> .disabled = 1,
> },
> },
> + .num_consumer_supplies = ARRAY_SIZE(lp3974_ldo3_consumer),
> + .consumer_supplies = lp3974_ldo3_consumer,
> +};
> +
> +static struct regulator_consumer_supply lp3974_ldo4_consumer[] = {
> + REGULATOR_SUPPLY("vdd_osc", "exynos4-hdmi"),
> };
>
> static struct regulator_init_data lp3974_ldo4_data = {
> @@ -205,6 +222,8 @@ static struct regulator_init_data lp3974_ldo4_data = {
> .disabled = 1,
> },
> },
> + .num_consumer_supplies = ARRAY_SIZE(lp3974_ldo4_consumer),
> + .consumer_supplies = lp3974_ldo4_consumer,
> };
>
> static struct regulator_init_data lp3974_ldo5_data = {
> @@ -246,6 +265,11 @@ static struct regulator_init_data lp3974_ldo7_data =
{
> },
> };
>
> +static struct regulator_consumer_supply lp3974_ldo8_consumer[] = {
> + REGULATOR_SUPPLY("vusb_d", "s3c-hsotg"),
Same as above.
> + REGULATOR_SUPPLY("vdd33a_dac", "s5p-sdo"),
> +};
> +
> static struct regulator_init_data lp3974_ldo8_data = {
> .constraints = {
> .name = "VUSB+VDAC_3.3V",
> @@ -257,6 +281,8 @@ static struct regulator_init_data lp3974_ldo8_data = {
> .disabled = 1,
> },
> },
> + .num_consumer_supplies = ARRAY_SIZE(lp3974_ldo8_consumer),
> + .consumer_supplies = lp3974_ldo8_consumer,
> };
>
> static struct regulator_init_data lp3974_ldo9_data = {
> @@ -472,6 +498,34 @@ static struct max8998_platform_data
> universal_lp3974_pdata = {
> .wakeup = true,
> };
>
> +static struct regulator_consumer_supply hdmi_fixed_consumer =
> + REGULATOR_SUPPLY("hdmi-en", "exynos4-hdmi");
> +
> +static struct regulator_init_data hdmi_fixed_voltage_init_data = {
> + .constraints = {
> + .name = "HDMI_5V",
> + .valid_ops_mask = REGULATOR_CHANGE_STATUS,
> + },
> + .num_consumer_supplies = 1,
> + .consumer_supplies = &hdmi_fixed_consumer,
> +};
> +
> +static struct fixed_voltage_config hdmi_fixed_voltage_config = {
> + .supply_name = "HDMI_EN1",
> + .microvolts = 5000000,
> + .gpio = EXYNOS4_GPE0(1),
> + .enable_high = true,
> + .init_data = &hdmi_fixed_voltage_init_data,
> +};
> +
> +static struct platform_device hdmi_fixed_voltage = {
> + .name = "reg-fixed-voltage",
> + .id = 6,
> + .dev = {
> + .platform_data = &hdmi_fixed_voltage_config,
> + },
> +};
> +
> /* GPIO I2C 5 (PMIC) */
> static struct i2c_board_info i2c5_devs[] __initdata = {
> {
> @@ -714,6 +768,12 @@ static struct platform_device *universal_devices[]
> __initdata = {
> &s3c_device_hsmmc3,
> &s3c_device_i2c3,
> &s3c_device_i2c5,
> + &s3c_device_i2c8,
> + &hdmi_fixed_voltage,
> + &exynos4_device_pd[PD_TV],
> + &s5p_device_hdmi,
> + &s5p_device_sdo,
> + &s5p_device_mixer,
>
> /* Universal Devices */
> &i2c_gpio12,
> @@ -732,6 +792,20 @@ static void __init universal_map_io(void)
> s3c24xx_init_uarts(universal_uartcfgs,
ARRAY_SIZE(universal_uartcfgs));
> }
>
> +void s5p_tv_setup(void)
> +{
> + /* direct HPD to HDMI chip */
> + gpio_request(EXYNOS4_GPX3(7), "hpd-plug");
> +
> + gpio_direction_input(EXYNOS4_GPX3(7));
> + s3c_gpio_cfgpin(EXYNOS4_GPX3(7), S3C_GPIO_SFN(0x3));
> + s3c_gpio_setpull(EXYNOS4_GPX3(7), S3C_GPIO_PULL_NONE);
> +
> + /* setup dependencies between TV devices */
> + s5p_device_hdmi.dev.parent = &exynos4_device_pd[PD_TV].dev;
> + s5p_device_mixer.dev.parent = &exynos4_device_pd[PD_TV].dev;
> +}
> +
> static void __init universal_reserve(void)
> {
> s5p_mfc_reserve_mem(0x43000000, 8 << 20, 0x51000000, 8 << 20);
> @@ -740,6 +814,7 @@ static void __init universal_reserve(void)
> static void __init universal_machine_init(void)
> {
> universal_sdhci_init();
> + s5p_tv_setup();
>
> i2c_register_board_info(0, i2c0_devs, ARRAY_SIZE(i2c0_devs));
> i2c_register_board_info(1, i2c1_devs, ARRAY_SIZE(i2c1_devs));
> @@ -749,6 +824,7 @@ static void __init universal_machine_init(void)
> i2c_register_board_info(3, i2c3_devs, ARRAY_SIZE(i2c3_devs));
>
> s3c_i2c5_set_platdata(NULL);
> + s3c_i2c8_set_platdata(NULL);
> i2c_register_board_info(5, i2c5_devs, ARRAY_SIZE(i2c5_devs));
>
> universal_touchkey_init();
> --
> 1.7.1.569.g6f426
Please don't mix some changes in one patch.
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
