From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 4 May 2013 19:34:30 +0000 (-0700)
Subject: Merge tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm... 
X-Git-Tag: v3.12-rc1~907
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=150a8dcf109f68f322bf112c7604f2d950303f00;p=kernel%2Fkernel-generic.git

Merge tag 'boards-for-linus' of git://git./linux/kernel/git/arm/arm-soc

Pull ARM SoC board specific changes (part 1) from Olof Johansson:
 "These changes are all for board specific files.  These used to make up
  a large portion of the ARM changes in the past, but as we are
  generalizing the support and moving to device tree probing, this has
  gotten significantly smaller.

  The only platform actually adding new code here at the moment is
  Renesas shmobile, as they are still busy converting their code to
  device tree and have not come far enough to not need it."

* tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (43 commits)
  ARM: msm: USB_MSM_OTG needs USB_PHY
  ARM: davinci: da850 evm: fix const qualifier placement
  ARM: davinci: da850 board: add remoteproc support
  ARM: pxa: move debug uart code
  ARM: pxa: select PXA935 on saar & tavorevb
  ARM: mmp: add more compatible names in gpio driver
  ARM: pxa: move PXA_GPIO_TO_IRQ macro
  ARM: pxa: remove cpu_is_xxx in gpio driver
  ARM: Kirkwood: update Network Space Mini v2 description
  ARM: Kirkwood: DT board setup for CloudBox
  ARM: Kirkwood: sort board entries by ASCII-code order
  ARM: OMAP: board-4430sdp: Provide regulator to pwm-backlight
  ARM: OMAP: zoom: Use pwm stack for lcd and keyboard backlight
  ARM: OMAP2+: omap2plus_defconfig: Add support for BMP085 pressure sensor
  omap2+: Remove useless Makefile line
  omap2+: Remove useless Makefile line
  ARM: OMAP: RX-51: add missing regulator supply definitions for lis3lv02d
  ARM: OMAP1: fix omap_udc registration
  ARM: davinci: use is IS_ENABLED macro
  ARM: kirkwood: add MACH_GURUPLUG_DT to defconfig
  ...
---

150a8dcf109f68f322bf112c7604f2d950303f00
diff --cc arch/arm/Kconfig.debug
index 5c8e59f,e5d2e6b..f57a6ba
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -612,9 -587,6 +619,10 @@@ endchoic
  
  config DEBUG_LL_INCLUDE
  	string
 +	default "debug/bcm2835.S" if DEBUG_BCM2835
 +	default "debug/cns3xxx.S" if DEBUG_CNS3XXX
 +	default "debug/exynos.S" if DEBUG_EXYNOS_UART
++	default "debug/highbank.S" if DEBUG_HIGHBANK_UART
  	default "debug/icedcc.S" if DEBUG_ICEDCC
  	default "debug/imx.S" if DEBUG_IMX1_UART || \
  				 DEBUG_IMX25_UART || \
@@@ -624,20 -596,18 +632,21 @@@
  				 DEBUG_IMX51_UART || \
  				 DEBUG_IMX53_UART ||\
  				 DEBUG_IMX6Q_UART
--	default "debug/highbank.S" if DEBUG_HIGHBANK_UART
  	default "debug/mvebu.S" if DEBUG_MVEBU_UART
 +	default "debug/mxs.S" if DEBUG_IMX23_UART || DEBUG_IMX28_UART
 +	default "debug/nomadik.S" if DEBUG_NOMADIK_UART
  	default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART
  	default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART
+ 	default "debug/pxa.S" if DEBUG_PXA_UART1 || DEBUG_MMP_UART2 || \
+ 				 DEBUG_MMP_UART3
 +	default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || DEBUG_SIRFMARCO_UART1
  	default "debug/socfpga.S" if DEBUG_SOCFPGA_UART
  	default "debug/sunxi.S" if DEBUG_SUNXI_UART0 || DEBUG_SUNXI_UART1
++	default "debug/tegra.S" if DEBUG_TEGRA_UART
++	default "debug/ux500.S" if DEBUG_UX500_UART
  	default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \
  		DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1
  	default "debug/vt8500.S" if DEBUG_VT8500_UART0
--	default "debug/tegra.S" if DEBUG_TEGRA_UART
- 	default "debug/ux500.S" if DEBUG_UX500_UART
  	default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1
  	default "mach/debug-macro.S"
  
diff --cc drivers/gpio/gpio-pxa.c
index 2d3af98,b80717e..d7a5c9d
--- a/drivers/gpio/gpio-pxa.c
+++ b/drivers/gpio/gpio-pxa.c
@@@ -640,13 -679,9 +678,14 @@@ static struct platform_driver pxa_gpio_
  		.name	= "pxa-gpio",
  		.of_match_table = of_match_ptr(pxa_gpio_dt_ids),
  	},
+ 	.id_table	= gpio_id_table,
  };
 -module_platform_driver(pxa_gpio_driver);
 +
 +static int __init pxa_gpio_init(void)
 +{
 +	return platform_driver_register(&pxa_gpio_driver);
 +}
 +postcore_initcall(pxa_gpio_init);
  
  #ifdef CONFIG_PM
  static int pxa_gpio_suspend(void)