leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
177259c3ec
linux/Documentation/devicetree/bindings/arm
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
..
exynos ARM: EXYNOS: Hook up power domains to generic power domain infrastructure 2012-01-27 15:25:49 +09:00
mrvl Documentation: update docs for mmp dt 2012-05-05 16:40:08 +08:00
omap ARM: device tree work 2012-03-27 16:47:35 -07:00
samsung ARM: EXYNOS: Add device tree support for interrupt combiner 2012-05-16 07:03:44 +09:00
tegra arm-soc: driver specific updates 2012-05-26 12:22:27 -07:00
arch_timer.txt ARM: architected timers: add DT support 2012-04-27 13:35:34 +01:00
arm-boards arm/versatile: Add device tree support 2011-07-28 01:32:04 -06:00
atmel-adc.txt IIO: AT91: Add DT support to at91_adc driver 2012-05-14 13:25:33 -07:00
atmel-aic.txt ARM: at91/aic: add irq domain and device tree support 2012-03-01 13:29:00 +01:00
atmel-at91.txt ARM: at91: add Shutdown Controller (SHDWC) DT support 2012-03-15 23:38:02 +08:00
atmel-pmc.txt ARM: at91: add pmc DT support 2012-03-15 23:31:14 +08:00
calxeda.txt ARM: highbank: add devicetree source 2011-10-31 14:13:58 +01:00
fsl.txt Merge branch 'imx/dt/for-3.5' of git://git.linaro.org/people/shawnguo/linux-2.6.git into next/dt2 2012-05-14 15:28:19 +02:00
gic.txt ARM: DT: Add binding for GIC virtualization extentions (VGIC) 2012-05-11 09:15:02 -06:00
insignal-boards.txt ARM: EXYNOS: Add Exynos4 device tree enabled board file 2011-12-23 10:07:11 +09:00
l2cc.txt ARM: 7023/1: L2x0: Add interrupts property to OF binding 2011-10-17 09:11:44 +01:00
lpc32xx-mic.txt ARM: LPC32xx: Device tree support 2012-04-22 12:01:19 +02:00
lpc32xx.txt ARM: LPC32xx: Device tree support 2012-04-22 12:01:19 +02:00
picoxcell.txt picoxcell: support for Picochip picoxcell devices 2011-09-26 16:11:56 +01:00
pmu.txt
primecell.txt Devicetree: Expand on ARM Primecell binding documentation 2011-10-24 23:48:01 +02:00
samsung-boards.txt ARM: EXYNOS: Add Exynos4 device tree enabled board file 2011-12-23 10:07:11 +09:00
sirf.txt Documentation: Fix multiple typo in Documentation 2012-03-07 16:08:24 +01:00
spear-timer.txt SPEAr: Add DT bindings for SPEAr's timer 2012-05-12 21:03:26 +02:00
spear.txt SPEAr: Update MAINTAINERS and Documentation 2012-05-14 17:34:11 +02:00
tegra.txt arm/tegra: initial device tree for tegra30 2011-12-17 16:14:49 -08:00
twd.txt ARM: smp_twd: add device tree support 2012-03-13 13:27:51 +00:00
vexpress.txt ARM: vexpress: Add Device Tree support 2012-02-24 09:18:19 +00:00
vic.txt ARM: vic: device tree binding 2011-11-15 18:14:02 +00:00
xilinx.txt