renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-20 03:04:01 +08:00
Code
2c922c51e6
linux-next/arch/arm/plat-samsung
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
..
include/plat arm-soc: soc specific changes, part 2 2012-05-26 13:05:55 -07:00
adc.c ARM: SAMSUNG: Add support s3c2416-adc for S3C2416/S3C2450 2011-10-14 15:15:42 +09:00
clock-clksrc.c driver-core: remove sysdev.h usage. 2011-12-21 16:26:03 -08:00
clock.c ARM: SAMSUNG: use spin_lock_irqsave() in clk_{enable,disable} 2012-02-12 01:03:02 +09:00
cpu.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
dev-backlight.c ARM: SAMSUNG: Add __init attribute to samsung_bl_set() 2012-03-09 08:03:13 -08:00
dev-uart.c ARM: SAMSUNG: Include devs.h in dev-uart.c to prototype devices 2011-03-04 15:46:26 +09:00
devs.c USB 3.5-rc1 pull request 2012-05-22 15:50:46 -07:00
dma-ops.c Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2012-03-29 15:34:57 -07:00
dma.c ARM: SAMSUNG: DMA Cleanup as per sparse 2011-07-16 15:50:19 +09:00
init.c ARM: SAMSUNG: Add support for handling of cpu revision 2011-08-24 19:25:19 +09:00
irq-vic-timer.c ARM: EXYNOS: add interrupt definitions for EXYNOS5250 2012-03-14 02:35:04 -07:00
Kconfig Merge branch 'samsung/cleanup-plat-s5p' into next/soc2 2012-05-16 15:53:15 +02:00
Makefile ARM: SAMSUNG: move setup code for s5p mfc and mipiphy into plat-samsung 2012-05-13 07:01:59 +09:00
pd.c ARM: SAMSUNG: inclusion export.h instead of module.h 2011-11-17 01:14:38 +09:00
platformdata.c ARM: SAMSUNG: remove all uses of clk_type member in sdhci platform data 2012-04-21 08:24:56 -07:00
pm-check.c treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +02:00
pm-gpio.c driver-core: remove sysdev.h usage. 2011-12-21 16:26:03 -08:00
pm.c ARM: SAMSUNG: Update the name of regarding Samsung GPIO 2011-09-21 15:07:04 +09:00
pwm-clock.c ARM: SAMSUNG: Consolidate plat/pwm-clock.h 2011-10-04 19:48:41 +09:00
pwm.c ARM: SAMSUNG: inclusion export.h instead of module.h 2011-11-17 01:14:38 +09:00
s3c-dma-ops.c arm: Add export.h to recently added files for EXPORT_SYMBOL 2011-11-07 10:28:58 -08:00
s5p-clock.c ARM: EXYNOS: Add pre-divider and fout mux clocks for bpll and mpll 2012-05-16 07:03:41 +09:00
s5p-dev-mfc.c ARM: SAMSUNG: move setup code for s5p mfc and mipiphy into plat-samsung 2012-05-13 07:01:59 +09:00
s5p-dev-uart.c ARM: SAMSUNG: move platform device for s5p uart into plat-samsung 2012-05-13 07:01:51 +09:00
s5p-irq-eint.c ARM: SAMSUNG: move interrupt part for common s5p into plat-samsung 2012-05-13 07:01:27 +09:00
s5p-irq-gpioint.c ARM: SAMSUNG: move interrupt part for common s5p into plat-samsung 2012-05-13 07:01:27 +09:00
s5p-irq-pm.c ARM: SAMSUNG: move pm part for common s5p into plat-samsung 2012-05-13 07:01:34 +09:00
s5p-irq.c ARM: SAMSUNG: move interrupt part for common s5p into plat-samsung 2012-05-13 07:01:27 +09:00
s5p-pm.c ARM: SAMSUNG: move pm part for common s5p into plat-samsung 2012-05-13 07:01:34 +09:00
s5p-sleep.S ARM: SAMSUNG: move pm part for common s5p into plat-samsung 2012-05-13 07:01:34 +09:00
s5p-time.c ARM: SAMSUNG: move hr timer for common s5p into plat-samsung 2012-05-13 07:01:43 +09:00
setup-mipiphy.c ARM: SAMSUNG: move setup code for s5p mfc and mipiphy into plat-samsung 2012-05-13 07:01:59 +09:00
time.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
wakeup-mask.c driver-core: remove sysdev.h usage. 2011-12-21 16:26:03 -08:00