diff options
| author | Marcel Tunnissen <Marcel.Tuennissen@stericsson.com> | 2011-06-14 10:22:34 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@linaro.org> | 2012-03-19 08:54:31 +0100 |
| commit | c8116d66572c9d4dd4866ed2f7773c9052b42642 (patch) | |
| tree | fada50256cdba31625365ae816be0e1674adf7f7 /arch | |
| parent | b5db4beb821797c8c6c4889d84ba09309bf68581 (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')
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-pins.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c index 4efe88807e4..ee6b435f89b 100644 --- a/arch/arm/mach-ux500/board-mop500-pins.c +++ b/arch/arm/mach-ux500/board-mop500-pins.c @@ -65,9 +65,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, }; static pin_cfg_t mop500_pins_default[] = { @@ -294,6 +291,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, @@ -388,6 +389,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), |