Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC board specific changes from Arnd Bergmann:
 "These updates are all for board specific code, including

   - defconfig updates for shmobile, davinci, bcm2835, imx, omap and
     tegra

   - SD/MMC and I2C support on bcm2835 (Raspberry PI)

   - minor updates for PXA

   - shmobile updates to GPIO usage in board files

   - More things in OMAP board files are moved over to device tree
     probing

   - Better support for audio devices on some OMAP platforms"

* tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (55 commits)
  ARM: imx_v4_v5_defconfig: Add VPU support
  ARM: imx: configs: enable netfilter support
  ARM: OMAP2+: Fix twl section warnings related to omap_twl4030_audio_init
  ARM: OMAP2+: omap2plus_defconfig: enable omap1 rtc
  RX-51: Register twl4030-madc device
  RX-51: Add leds lp5523 names from Maemo 5 2.6.28 kernel
  ARM: OMAP2+: AM33XX: omap2plus_defconfig: Add support for few drivers
  ARM: OMAP1: nokia770: enable CBUS/Retu
  ARM: OMAP2+: omap2plus_defconfig: enable CMA allocator
  ARM: OMAP2+: omap2plus_defconfig: enable TFP410 chip support
  ARM: OMAP3: igep0020: simplify GPIO LEDs dependencies
  ARM: OMAP2+: craneboard: support the TPS65910 PMU
  ARM: OMAP2+: craneboard: support NAND device
  ARM: OMAP3: cm-t3517: add MMC support
  ARM: OMAP2+: Remove apollon board support
  ARM: shmobile: armadillo800eva: set clock rates before timer init
  ARM: tegra: defconfig updates
  ARM: shmobile: mackerel: Use gpio_request_one()
  ARM: shmobile: kzm9g: Use gpio_request_one()
  ARM: shmobile: bonito: Use gpio_request_one()
  ...

1 files changed, 13 insertions, 24 deletions

diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c
index 2928cd686808..38f1259a0daf 100644
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -143,6 +143,10 @@
  *
  * SW41 :  ON : SH-Mobile AP4 Audio Mode
  *      : OFF : Bluetooth Audio Mode
+ *
+ * it needs amixer settings for playing
+ *
+ * amixer set "Headphone Enable" on
  */
 
 /*
@@ -1036,9 +1040,7 @@ static int ts_get_pendown_state(void)
 
         gpio_free(GPIO_TSC_IRQ);
 
-        gpio_request(GPIO_TSC_PORT, NULL);
-
-        gpio_direction_input(GPIO_TSC_PORT);
+        gpio_request_one(GPIO_TSC_PORT, GPIOF_IN, NULL);
 
         val = gpio_get_value(GPIO_TSC_PORT);
 
@@ -1119,18 +1121,10 @@ static void __init ap4evb_init(void)
         gpio_request(GPIO_FN_IRQ6_39,   NULL);
 
         /* enable Debug switch (S6) */
-        gpio_request(GPIO_PORT32, NULL);
-        gpio_request(GPIO_PORT33, NULL);
-        gpio_request(GPIO_PORT34, NULL);
-        gpio_request(GPIO_PORT35, NULL);
-        gpio_direction_input(GPIO_PORT32);
-        gpio_direction_input(GPIO_PORT33);
-        gpio_direction_input(GPIO_PORT34);
-        gpio_direction_input(GPIO_PORT35);
-        gpio_export(GPIO_PORT32, 0);
-        gpio_export(GPIO_PORT33, 0);
-        gpio_export(GPIO_PORT34, 0);
-        gpio_export(GPIO_PORT35, 0);
+        gpio_request_one(GPIO_PORT32, GPIOF_IN | GPIOF_EXPORT, NULL);
+        gpio_request_one(GPIO_PORT33, GPIOF_IN | GPIOF_EXPORT, NULL);
+        gpio_request_one(GPIO_PORT34, GPIOF_IN | GPIOF_EXPORT, NULL);
+        gpio_request_one(GPIO_PORT35, GPIOF_IN | GPIOF_EXPORT, NULL);
 
         /* SDHI0 */
         gpio_request(GPIO_FN_SDHICD0, NULL);
@@ -1178,8 +1172,7 @@ static void __init ap4evb_init(void)
         gpio_request(GPIO_FN_FSIAILR,   NULL);
         gpio_request(GPIO_FN_FSIAISLD,  NULL);
         gpio_request(GPIO_FN_FSIAOSLD,  NULL);
-        gpio_request(GPIO_PORT161,      NULL);
-        gpio_direction_output(GPIO_PORT161, 0); /* slave */
+        gpio_request_one(GPIO_PORT161, GPIOF_OUT_INIT_LOW, NULL); /* slave */
 
         gpio_request(GPIO_PORT9, NULL);
         gpio_request(GPIO_PORT10, NULL);
@@ -1187,8 +1180,7 @@ static void __init ap4evb_init(void)
         gpio_direction_none(GPIO_PORT10CR); /* FSIAOLR needs no direction */
 
         /* card detect pin for MMC slot (CN7) */
-        gpio_request(GPIO_PORT41, NULL);
-        gpio_direction_input(GPIO_PORT41);
+        gpio_request_one(GPIO_PORT41, GPIOF_IN, NULL);
 
         /* setup FSI2 port B (HDMI) */
         gpio_request(GPIO_FN_FSIBCK, NULL);
@@ -1276,11 +1268,8 @@ static void __init ap4evb_init(void)
         gpio_request(GPIO_FN_LCDDISP,  NULL);
         gpio_request(GPIO_FN_LCDDCK,   NULL);
 
-        gpio_request(GPIO_PORT189, NULL); /* backlight */
-        gpio_direction_output(GPIO_PORT189, 1);
-
-        gpio_request(GPIO_PORT151, NULL); /* LCDDON */
-        gpio_direction_output(GPIO_PORT151, 1);
+        gpio_request_one(GPIO_PORT189, GPIOF_OUT_INIT_HIGH, NULL); /* backlight */
+        gpio_request_one(GPIO_PORT151, GPIOF_OUT_INIT_HIGH, NULL); /* LCDDON */
 
         lcdc_info.clock_source                  = LCDC_CLK_BUS;
         lcdc_info.ch[0].interface_type          = RGB18;