diff options
| author | Marcel Tunnissen <Marcel.Tuennissen@stericsson.com> | 2011-06-14 10:22:34 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 16:00:18 +0200 |
| commit | e909c7dad6f3ea3f4d1a21712e97806fc923017a (patch) | |
| tree | 405119597a7d477958a16e496aecbe5d4caaa607 /arch/arm/mach-ux500/board-mop500-pins.c | |
| parent | 8e6a8a7231be664ee46b4d8cb81d5e68aefcdcf8 (diff) | |
mcde: mach-ux500: Migrate the patches for kernel3.0
Migrate following patches for Kernel3.0
video: av8100: move GPIO pin setup to driver
arm: u8500: Correct build error
video: mcde: remove unused GPIO pin setup
ST-Ericsson ID: 352334
ST-Ericsson Linux next: NA
ST-Ericsson FOSS-OUT ID: NA
Signed-off-by: Rajagopala V <rajagopala.v@stericsson.com>
Change-Id: I34cef77b3fdcc1a21eb1f457ee4a829d885a8130
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/29591
Diffstat (limited to 'arch/arm/mach-ux500/board-mop500-pins.c')
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-pins.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c index 3b1122c1a6c..f8368b7edf0 100644 --- a/arch/arm/mach-ux500/board-mop500-pins.c +++ b/arch/arm/mach-ux500/board-mop500-pins.c @@ -67,10 +67,6 @@ static pin_cfg_t mop500_pins_common[] = { GPIO31_U2_CTSn | PIN_INPUT_PULLUP, GPIO32_U2_RTSn | PIN_OUTPUT_HIGH, - /* Display & HDMI HW sync */ - GPIO68_LCD_VSI0 | PIN_INPUT_PULLUP, - GPIO69_LCD_VSI1 | PIN_INPUT_PULLUP, - /* HSI */ GPIO219_HSIR_FLA0, GPIO220_HSIR_DAT0, @@ -306,6 +302,10 @@ static UX500_PINS(mop500_pins_mcde_tvout, GPIO150_LCDA_CLK, ); +static UX500_PINS(mop500_pins_mcde_hdmi, + GPIO69_LCD_VSI1 | PIN_INPUT_PULLUP, +); + static UX500_PINS(mop500_pins_ske, GPIO153_KP_I7 | PIN_INPUT_PULLDOWN | PIN_SLPM_INPUT_PULLUP, GPIO154_KP_I6 | PIN_INPUT_PULLDOWN | PIN_SLPM_INPUT_PULLUP, @@ -400,6 +400,7 @@ static UX500_PINS(mop500_pins_usb, static struct ux500_pin_lookup mop500_pins[] = { PIN_LOOKUP("mcde-dpi", &mop500_pins_mcde_dpi), PIN_LOOKUP("mcde-tvout", &mop500_pins_mcde_tvout), + PIN_LOOKUP("av8100-hdmi", &mop500_pins_mcde_hdmi), PIN_LOOKUP("nmk-i2c.0", &mop500_pins_i2c0), PIN_LOOKUP("nmk-i2c.1", &mop500_pins_i2c1), PIN_LOOKUP("nmk-i2c.2", &mop500_pins_i2c2), |