From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Sep 2016 03:13:14 +0000 (+1000)
Subject: Merge remote-tracking branch 'gpio/for-next'
X-Git-Url: http://git.efficios.com/?p=deliverable%2Flinux.git;a=commitdiff_plain;h=f770d3b26a410a0bbb2c8f302d35b634e3bfb0c2

Merge remote-tracking branch 'gpio/for-next'
---

f770d3b26a410a0bbb2c8f302d35b634e3bfb0c2
diff --cc arch/arm64/Kconfig.platforms
index 4e0e1071f2e8,41d82b327e6a..f14e0613b9de
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@@ -163,9 -158,9 +162,10 @@@ config ARCH_TEGR
  	select CLKSRC_MMIO
  	select CLKSRC_OF
  	select GENERIC_CLOCKEVENTS
+ 	select GPIOLIB
 -	select HAVE_CLK
  	select PINCTRL
 +	select PM
 +	select PM_GENERIC_DOMAINS
  	select RESET_CONTROLLER
  	help
  	  This enables support for the NVIDIA Tegra SoC family.
diff --cc drivers/gpio/gpio-mxc.c
index e38989a4fa0c,e35af5249478..c1a1e00b8cb0
--- a/drivers/gpio/gpio-mxc.c
+++ b/drivers/gpio/gpio-mxc.c
@@@ -515,10 -510,4 +515,4 @@@ static int __init gpio_mxc_init(void
  {
  	return platform_driver_register(&mxc_gpio_driver);
  }
 -postcore_initcall(gpio_mxc_init);
 +subsys_initcall(gpio_mxc_init);
- 
- MODULE_AUTHOR("Freescale Semiconductor, "
- 	      "Daniel Mack <danielncaiaq.de>, "
- 	      "Juergen Beisert <kernel@pengutronix.de>");
- MODULE_DESCRIPTION("Freescale MXC GPIO");
- MODULE_LICENSE("GPL");