Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-02 17:11:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
7b12c1b9ee
linux/drivers/pinctrl
History
Linus Torvalds 30b842889e arm-soc: soc specific changes, part 2 
This adds support for the spear13xx platform, which has first been under
 review a long time ago and finally been completed after generic spear
 work has gone into the clock, dt and pinctrl branches.
 
 Also a number of updates for the samsung socs are part of this branch.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJPuezDAAoJEIwa5zzehBx3mooP/iTHd1wRjr2MzKNx4+LpLWgl
 aAXH002xe9Lvu7m75BRvEYWWdRLkyEy9ARM4s2wJCnxU41KmbF65ED1erxK8xaSe
 Ako34vzH+HiUCM2DLzIP6FXyJMM7OcfrdGaY/GxOv+U+MzGUHeu3Q+8b0B/yfBnm
 M3HdDrpyZHKZP9UM3wVQ4/ilDck6vEjYSV2jC11IaHiDMRD2nSpfRKh8H3+gv65S
 gtj9EZpWM8CZg/fCe5lsm3PZnBnqHHW3WVafVnDQfGWeJYqZxMB5QKLU6qf/ntpx
 LU2WjXoGaMmGBVZWynrwNEY6GVp3fZrDV30/q8Htf0/fBpEjUncrLHXtw0DxkpnK
 UuyoRgn7zxOc3kDzohFNIexp1K3q+PNzXklR9hg7OSVji+9bPd2LIOEnpBeghBGj
 WzZIebz5dIdddHlnOl4fRdmxZva2UTuI4bFAJ0izi10Mup7A9lrENnFHG/iVA0rQ
 QlqJZoyeDCvbXQqZCgHirYRPhIxXdQj4G5IivfRxQ7Jgjy76Kt9uDp1egwezF/3a
 2jVtcK42XokVv3Dhsvq9UNFn9GWdVImZ7eh70XLv+q834zAVxSzjWLtlS8I1Q5WO
 7BGIJaICtugNwgYr44Dif6nsoVUmMnSwU5hVw1pApKZspN6EhMhMdp2hw8JPHFUs
 mrZdHi1NAWuYSbObc3UB
 =W2Ri
 -----END PGP SIGNATURE-----

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

Pull arm-soc: soc specific changes (part 2) from Olof Johansson:
 "This adds support for the spear13xx platform, which has first been
  under review a long time ago and finally been completed after generic
  spear work has gone into the clock, dt and pinctrl branches.

  Also a number of updates for the samsung socs are part of this branch."

Fix up trivial conflicts in drivers/gpio/gpio-samsung.c that look much
worse than they are: the exonys5 init code was refactored in commit
fd454997d6 ("gpio: samsung: refactor gpiolib init for exynos4/5"), and
then commit f10590c983 ("ARM: EXYNOS: add GPC4 bank instance") added a
new gpio chip define and did tiny updates to the init code.

So the conflict diff looks like hell, but it's actually a fairly simple
change.

* tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (34 commits)
  ARM: exynos: fix building with CONFIG_OF disabled
  ARM: EXYNOS: Add AUXDATA for i2c controllers
  ARM: dts: Update device tree source files for EXYNOS5250
  ARM: EXYNOS: Add device tree support for interrupt combiner
  ARM: EXYNOS: Add irq_domain support for interrupt combiner
  ARM: EXYNOS: Remove a new bus_type instance for EXYNOS5
  ARM: EXYNOS: update irqs for EXYNOS5250 SoC
  ARM: EXYNOS: Add pre-divider and fout mux clocks for bpll and mpll
  ARM: EXYNOS: add GPC4 bank instance
  ARM: EXYNOS: Redefine IRQ_MCT_L0,1 definition
  ARM: EXYNOS: Modify the GIC physical address for static io-mapping
  ARM: EXYNOS: Add watchdog timer clock instance
  pinctrl: SPEAr1310: Fix pin numbers for clcd_high_res
  SPEAr: Update MAINTAINERS and Documentation
  SPEAr13xx: Add defconfig
  SPEAr13xx: Add compilation support
  SPEAr13xx: Add dts and dtsi files
  pinctrl: Add SPEAr13xx pinctrl drivers
  pinctrl: SPEAr: Create macro for declaring GPIO PINS
  SPEAr13xx: Add common clock framework support
  ...
2012-05-26 13:05:55 -07:00
..
spear pinctrl: SPEAr1310: Fix pin numbers for clcd_high_res 2012-05-14 17:34:11 +02:00
core.c pinctrl: support gpio request deferred probing 2012-05-02 01:14:20 +02:00
core.h pinctrl: show pin name for pingroups in sysfs 2012-04-18 13:53:13 +02:00
devicetree.c pinctrl: implement pinctrl deferred probing 2012-04-18 13:53:11 +02:00
devicetree.h pinctrl: core device tree mapping table parsing support 2012-04-18 13:53:10 +02:00
Kconfig arm-soc: soc-specific pinctrl changes 2012-05-22 09:39:42 -07:00
Makefile arm-soc: soc-specific pinctrl changes 2012-05-22 09:39:42 -07:00
pinconf-generic.c pinctrl: introduce generic pin config 2012-03-12 22:49:02 +01:00
pinconf.c pinctrl: a minor error checking improvement for pinconf 2012-05-15 09:43:18 +02:00
pinconf.h pinctrl: pinconf: fix compilation error if PINCONF is not selected 2012-04-18 13:53:12 +02:00
pinctrl-coh901.c pinctrl: mark const init data with __initconst instead of __initdata 2012-04-18 13:53:10 +02:00
pinctrl-coh901.h pinctrl: support pinconfig on the U300 2012-03-12 22:49:03 +01:00
pinctrl-imx6q.c pinctrl: pinctrl-imx: add imx6q pinctrl driver 2012-05-02 01:14:40 +02:00
pinctrl-imx23.c pinctrl: add pinctrl-mxs support 2012-05-02 01:18:27 +02:00
pinctrl-imx28.c pinctrl: add pinctrl-mxs support 2012-05-02 01:18:27 +02:00
pinctrl-imx51.c pinctrl: pinctrl-imx: add imx51 pinctrl driver 2012-05-20 21:00:41 +02:00
pinctrl-imx53.c pinctrl: pinctrl-imx: add imx53 pinctrl driver 2012-05-20 21:00:18 +02:00
pinctrl-imx.c pinctrl: pinctrl-imx: remove empty pinmux disable function 2012-05-15 09:46:41 +02:00
pinctrl-imx.h pinctrl: pinctrl-imx: add imx pinctrl core driver 2012-05-02 01:14:40 +02:00
pinctrl-mmp2.c pinctrl: enable pinmux for mmp series 2012-02-01 19:42:35 +01:00
pinctrl-mxs.c pinctrl: pinctrl-mxs: remove empty pinmux disable function 2012-05-15 09:48:07 +02:00
pinctrl-mxs.h pinctrl: add pinctrl-mxs support 2012-05-02 01:18:27 +02:00
pinctrl-nomadik-db8500.c pinctrl/nomadik: implement pin multiplexing 2012-05-11 11:14:16 +02:00
pinctrl-nomadik.c pinctrl/nomadik: implement pin configuration 2012-05-11 11:14:16 +02:00
pinctrl-nomadik.h pinctrl/nomadik: implement pin multiplexing 2012-05-11 11:14:16 +02:00
pinctrl-pxa3xx.c pinctrl: pinctrl-pxa3xx: remove empty pinmux disable function 2012-05-15 09:59:50 +02:00
pinctrl-pxa3xx.h pinctrl: enable pinmux for mmp series 2012-02-01 19:42:35 +01:00
pinctrl-pxa168.c pinctrl: enable pinmux for mmp series 2012-02-01 19:42:35 +01:00
pinctrl-pxa910.c pinctrl: enable pinmux for mmp series 2012-02-01 19:42:35 +01:00
pinctrl-sirf.c pinctrl: replace list_*() with get_*_count() 2012-04-18 13:53:10 +02:00
pinctrl-tegra20.c pinctrl: tegra: refactor probe handling 2012-04-18 10:26:40 -06:00
pinctrl-tegra30.c pinctrl: tegra: refactor probe handling 2012-04-18 10:26:40 -06:00
pinctrl-tegra.c pinctrl: tegra: error reporting cleanup 2012-04-25 15:21:47 -06:00
pinctrl-tegra.h pinctrl: tegra: refactor probe handling 2012-04-18 10:26:40 -06:00
pinctrl-u300.c pinctrl: replace list_*() with get_*_count() 2012-04-18 13:53:10 +02:00
pinmux.c pinctrl: make pinmux disable function optional 2012-05-15 09:44:50 +02:00
pinmux.h pinctrl: ifdef CONFIG_DEBUG_FS cleanup 2012-04-18 13:53:12 +02:00