From: Simon Horman Date: Wed, 15 May 2013 02:10:00 +0000 (+0900) Subject: Merge branches 'heads/boards-ape6evm', 'heads/boards-bockw', 'heads/boards-lager... X-Git-Tag: next-20130521~8^2~1 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=55940d26da5efbd775e001ee607d16c9c8775ff6;p=karo-tx-linux.git Merge branches 'heads/boards-ape6evm', 'heads/boards-bockw', 'heads/boards-lager', 'heads/boards-marzen' and 'heads/boards-armadillo800eva' into next --- 55940d26da5efbd775e001ee607d16c9c8775ff6 diff --cc arch/arm/mach-shmobile/board-armadillo800eva.c index 448468e5e73a,7ed777d88e07,7ed777d88e07,7ed777d88e07,7ed777d88e07,ff04d1e2540a..fca18176d385 --- a/arch/arm/mach-shmobile/board-armadillo800eva.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c @@@@@@@ -1192,12 -1144,13 -1144,13 -1144,13 -1144,13 -1147,9 +1195,8 @@@@@@@ static void __init eva_init(void r8a7740_pinmux_init(); r8a7740_meram_workaround(); ----- /* SCIFA1 */ ----- gpio_request(GPIO_FN_SCIFA1_RXD, NULL); ----- gpio_request(GPIO_FN_SCIFA1_TXD, NULL); ----- /* LCDC0 */ gpio_request_one(61, GPIOF_OUT_INIT_HIGH, NULL); /* LCDDON */ ----- gpio_request_one(202, GPIOF_OUT_INIT_LOW, NULL); /* LCD0_LED_CONT */ /* Touchscreen */ gpio_request_one(166, GPIOF_OUT_INIT_HIGH, NULL); /* TP_RST_B */