From 4d005e831f693f35403063b283ccec1f2f7f076b Mon Sep 17 00:00:00 2001 From: Robert Marklund Date: Tue, 19 Apr 2011 16:31:29 +0200 Subject: video: mcde: Fix Kconfig to match the ux500 update Change the dependencies of MCDE Kconfigs to match the mach-ux500 update. Change name of the regulators used by the mcde driver to match the mach-ux500 update. Added the EGPIO used by mcde. Signed-off-by: Robert Marklund --- arch/arm/configs/u8500_defconfig | 6 +++++- arch/arm/mach-ux500/Kconfig-arch | 4 ++-- arch/arm/mach-ux500/board-mop500-mcde.c | 27 ++++++++++++++------------- arch/arm/mach-ux500/board-mop500-regulators.c | 2 +- arch/arm/mach-ux500/board-mop500.h | 1 + arch/arm/mach-ux500/board-u5500-mcde.c | 12 ++++++------ 6 files changed, 29 insertions(+), 23 deletions(-) (limited to 'arch') diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig index b45e9098de8..8ac6259e9ac 100644 --- a/arch/arm/configs/u8500_defconfig +++ b/arch/arm/configs/u8500_defconfig @@ -24,7 +24,7 @@ CONFIG_UX500_SOC_DB8500=y CONFIG_MACH_U8500=y CONFIG_MACH_SNOWBALL=y CONFIG_MACH_HREFV60=y -CONFIG_MACH_U5500=y +# CONFIG_MACH_U5500 is not set CONFIG_UX500_PRCMU_TIMER=y CONFIG_DB8500_MLOADER=y CONFIG_UX500_SUSPEND=y @@ -170,6 +170,10 @@ CONFIG_VIDEO_DEV=y CONFIG_FB=y CONFIG_FB_MCDE=y CONFIG_MCDE_DISPLAY_GENERIC_DSI=y +CONFIG_MCDE_DISPLAY_PRIMARY_32BPP=y +CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_ROTATION_90=y +CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_ROTATION_ANGLE=90 +CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_VSYNC=y CONFIG_FB_B2R2=y CONFIG_B2R2_PLUG_CONF=y CONFIG_AV8100=y diff --git a/arch/arm/mach-ux500/Kconfig-arch b/arch/arm/mach-ux500/Kconfig-arch index 8db0680f3fe..596399284ad 100644 --- a/arch/arm/mach-ux500/Kconfig-arch +++ b/arch/arm/mach-ux500/Kconfig-arch @@ -12,7 +12,7 @@ menu "Display selection" config DISPLAY_GENERIC_PRIMARY bool "Generic primary display support" - depends on (MACH_U8500_MOP || MACH_B5500) + depends on (MACH_U8500 || MACH_U5500) default y choice @@ -31,7 +31,7 @@ config DISPLAY_GENERIC_DSI_PRIMARY config MCDE_DISPLAY_DPI_PRIMARY bool "DPI display" select MCDE_DISPLAY_DPI - depends on MACH_8500_MOP + depends on MACH_U8500 help Say yes here when using a DPI display diff --git a/arch/arm/mach-ux500/board-mop500-mcde.c b/arch/arm/mach-ux500/board-mop500-mcde.c index 59bc22c01d1..97778a4b426 100644 --- a/arch/arm/mach-ux500/board-mop500-mcde.c +++ b/arch/arm/mach-ux500/board-mop500-mcde.c @@ -23,6 +23,7 @@ #include "pins-db8500.h" #include "pins.h" #include "board-mop500.h" +#include "asm/mach-types.h" #define DSI_UNIT_INTERVAL_0 0x9 @@ -91,16 +92,16 @@ static struct mcde_port port0 = { }, }; -struct mcde_display_generic_platform_data generic_display0_pdata = { +struct mcde_display_generic_platform_data mop500_generic_display0_pdata = { .reset_delay = 1, #ifdef CONFIG_REGULATOR - .regulator_id = "v-display", + .regulator_id = "vaux12v5", .min_supply_voltage = 2500000, /* 2.5V */ .max_supply_voltage = 2700000 /* 2.7V */ #endif }; -struct mcde_display_device generic_display0 = { +struct mcde_display_device mop500_generic_display0 = { .name = "mcde_disp_generic", .id = PRIMARY_DISPLAY_ID, .port = &port0, @@ -118,7 +119,7 @@ struct mcde_display_device generic_display0 = { .rotbuf1 = U8500_ESRAM_BASE + 0x20000 * 4, .rotbuf2 = U8500_ESRAM_BASE + 0x20000 * 4 + 0x10000, .dev = { - .platform_data = &generic_display0_pdata, + .platform_data = &mop500_generic_display0_pdata, }, }; #endif /* CONFIG_DISPLAY_GENERIC_DSI_PRIMARY */ @@ -195,7 +196,7 @@ static struct mcde_port port0 = { }, }; -struct mcde_display_dpi_platform_data generic_display0_pdata = {0}; +struct mcde_display_dpi_platform_data mop500_generic_display0_pdata = {0}; static struct ux500_pins *dpi_pins; static int dpi_display_platform_enable(struct mcde_display_device *ddev) @@ -230,7 +231,7 @@ static int dpi_display_platform_disable(struct mcde_display_device *ddev) } -struct mcde_display_device generic_display0 = { +struct mcde_display_device mop500_generic_display0 = { .name = "mcde_display_dpi", .id = 0, .port = &port0, @@ -245,7 +246,7 @@ struct mcde_display_device generic_display0 = { .native_y_res = 480, /* .synchronized_update: Don't care: port is set to update_auto_trig */ .dev = { - .platform_data = &generic_display0_pdata, + .platform_data = &mop500_generic_display0_pdata, }, .platform_enable = dpi_display_platform_enable, .platform_disable = dpi_display_platform_disable, @@ -610,9 +611,9 @@ int __init init_display_devices(void) #ifdef CONFIG_DISPLAY_GENERIC_PRIMARY if (machine_is_hrefv60()) - generic_display0_pdata.reset_gpio = HREFV60_DISP1_RST_GPIO; + mop500_generic_display0_pdata.reset_gpio = HREFV60_DISP1_RST_GPIO; else - generic_display0_pdata.reset_gpio = EGPIO_PIN_15; + mop500_generic_display0_pdata.reset_gpio = GPIO_MCDE_RESET; #ifdef CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_VSYNC i2c0 = i2c_get_adapter(0); @@ -626,16 +627,16 @@ int __init init_display_devices(void) i2c_put_adapter(i2c0); /* ret == 0 => U8500 UIB connected */ - generic_display0.synchronized_update = (ret == 0); + mop500_generic_display0.synchronized_update = (ret == 0); } #endif if (display_initialized_during_boot) - generic_display0.power_mode = MCDE_DISPLAY_PM_STANDBY; - ret = mcde_display_device_register(&generic_display0); + mop500_generic_display0.power_mode = MCDE_DISPLAY_PM_STANDBY; + ret = mcde_display_device_register(&mop500_generic_display0); if (ret) pr_warning("Failed to register generic display device 0\n"); - displays[0] = &generic_display0; + displays[0] = &mop500_generic_display0; #endif #ifdef CONFIG_DISPLAY_GENERIC_DSI_SECONDARY diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c index 0f1def25c5e..60ab102f201 100644 --- a/arch/arm/mach-ux500/board-mop500-regulators.c +++ b/arch/arm/mach-ux500/board-mop500-regulators.c @@ -39,7 +39,7 @@ struct regulator_init_data tps61052_regulator = { static struct regulator_consumer_supply ab8500_vaux1_consumers[] = { /* External displays, connector on board 2v5 power supply */ - REGULATOR_SUPPLY("vaux12v5", "mcde.0"), + REGULATOR_SUPPLY("vaux12v5", "mcde_disp_generic.0"), /* SFH7741 proximity sensor */ REGULATOR_SUPPLY("vcc", "gpio-keys.0"), /* BH1780GLS ambient light sensor */ diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h index 226b43fde89..565551ff6dd 100644 --- a/arch/arm/mach-ux500/board-mop500.h +++ b/arch/arm/mach-ux500/board-mop500.h @@ -34,6 +34,7 @@ #define GPIO_ACCEL_INT1 MOP500_EGPIO(10) #define GPIO_ACCEL_INT2 MOP500_EGPIO(11) #define GPIO_BU21013_CS MOP500_EGPIO(13) +#define GPIO_MCDE_RESET 283 #define GPIO_SDMMC_EN MOP500_EGPIO(17) #define GPIO_SDMMC_1V8_3V_SEL MOP500_EGPIO(18) #define MOP500_EGPIO_END MOP500_EGPIO(24) diff --git a/arch/arm/mach-ux500/board-u5500-mcde.c b/arch/arm/mach-ux500/board-u5500-mcde.c index 38811d5db1f..8d755b2ec80 100644 --- a/arch/arm/mach-ux500/board-u5500-mcde.c +++ b/arch/arm/mach-ux500/board-u5500-mcde.c @@ -67,7 +67,7 @@ static struct mcde_port port0 = { }, }; -struct mcde_display_generic_platform_data generic_display0_pdata = { +struct mcde_display_generic_platform_data u5500_generic_display0_pdata = { .reset_gpio = 226, .reset_delay = 10, .sleep_out_delay = 140, @@ -78,7 +78,7 @@ struct mcde_display_generic_platform_data generic_display0_pdata = { #endif }; -struct mcde_display_device generic_display0 = { +struct mcde_display_device u5500_generic_display0 = { .name = "mcde_disp_generic", .id = PRIMARY_DISPLAY_ID, .port = &port0, @@ -96,7 +96,7 @@ struct mcde_display_device generic_display0 = { .rotbuf1 = U5500_ESRAM_BASE, .rotbuf2 = U5500_ESRAM_BASE + 0x10000, .dev = { - .platform_data = &generic_display0_pdata, + .platform_data = &u5500_generic_display0_pdata, }, }; #endif /* CONFIG_DISPLAY_GENERIC_DSI_PRIMARY */ @@ -265,11 +265,11 @@ int __init init_display_devices_u5500(void) #ifdef CONFIG_DISPLAY_GENERIC_PRIMARY if (display_initialized_during_boot) - generic_display0.power_mode = MCDE_DISPLAY_PM_STANDBY; - ret = mcde_display_device_register(&generic_display0); + u5500_generic_display0.power_mode = MCDE_DISPLAY_PM_STANDBY; + ret = mcde_display_device_register(&u5500_generic_display0); if (ret) pr_warning("Failed to register generic display device 0\n"); - displays[0] = &generic_display0; + displays[0] = &u5500_generic_display0; #endif return ret; } -- cgit v1.2.3