UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenCloudOS-Kernel/arch/arm/plat-samsung/include/plat
History
Arnd Bergmann dffd7e35a5 Merge branch 'cleanup/gpio-header-removal' into next/soc 
* cleanup/gpio-header-removal:
  ARM: delete old reference to ARM_GPIOLIB_COMPLEX
  ARM: kill CONFIG_NEED_MACH_GPIO_H
  ARM: mach-s5p: get rid of all <mach/gpio.h> headers
  ARM: s5p: cut the custom ARCH_NR_GPIOS definition

This resolves a massive amount of conflicts between the
mach/gpio.h removal and the s5p platform removal.

Almost all changes are trivial, as both sides remove
stuff.

Conflicts:
	arch/arm/Kconfig
	arch/arm/mach-s5p64x0/common.c
	arch/arm/mach-s5p64x0/dev-audio.c
	arch/arm/mach-s5p64x0/include/mach/gpio-samsung.h
	arch/arm/mach-s5p64x0/mach-smdk6440.c
	arch/arm/mach-s5p64x0/mach-smdk6450.c
	arch/arm/mach-s5p64x0/setup-fb-24bpp.c
	arch/arm/mach-s5p64x0/setup-i2c0.c
	arch/arm/mach-s5p64x0/setup-i2c1.c
	arch/arm/mach-s5p64x0/setup-sdhci-gpio.c
	arch/arm/mach-s5p64x0/setup-spi.c
	arch/arm/mach-s5pc100/dev-audio.c
	arch/arm/mach-s5pc100/include/mach/gpio-samsung.h
	arch/arm/mach-s5pc100/mach-smdkc100.c
	arch/arm/mach-s5pc100/setup-fb-24bpp.c
	arch/arm/mach-s5pc100/setup-i2c0.c
	arch/arm/mach-s5pc100/setup-i2c1.c
	arch/arm/mach-s5pc100/setup-ide.c
	arch/arm/mach-s5pc100/setup-keypad.c
	arch/arm/mach-s5pc100/setup-sdhci-gpio.c
	arch/arm/mach-s5pc100/setup-spi.c
	arch/arm/mach-s5pv210/dev-audio.c
	arch/arm/mach-s5pv210/include/mach/gpio-samsung.h
	arch/arm/mach-s5pv210/mach-aquila.c
	arch/arm/mach-s5pv210/mach-goni.c
	arch/arm/mach-s5pv210/mach-smdkv210.c
	arch/arm/mach-s5pv210/setup-fb-24bpp.c
	arch/arm/mach-s5pv210/setup-fimc.c
	arch/arm/mach-s5pv210/setup-i2c0.c
	arch/arm/mach-s5pv210/setup-i2c1.c
	arch/arm/mach-s5pv210/setup-i2c2.c
	arch/arm/mach-s5pv210/setup-ide.c
	arch/arm/mach-s5pv210/setup-keypad.c
	arch/arm/mach-s5pv210/setup-sdhci-gpio.c
	arch/arm/mach-s5pv210/setup-spi.c
	arch/arm/plat-samsung/Kconfig
	arch/arm/plat-samsung/s5p-irq-eint.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
 		2014-07-26 18:00:40 +02:00
..
adc-core.h ARM: SAMSUNG: Allow overriding of adc device name for S3C24XX 2011-10-12 21:34:42 +09:00
adc.h ARM defconfigs: add missing inclusions of linux/platform_device.h 2013-02-14 15:14:32 -08:00
ata-core.h ARM: SAMSUNG: Add Compact Flash device support for Samsung SoCs 2010-08-05 18:32:50 +09:00
backlight.h ARM: SAMSUNG: Fix Section mismatch in samsung_bl_set() 2011-08-19 20:57:20 +09:00
cpu-freq-core.h ARM: SAMSUNG: Remove legacy clock code 2014-07-19 04:24:59 +09:00
cpu-freq.h cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq 2013-05-20 23:04:28 +09:00
cpu.h ARM: SAMSUNG: Remove remaining legacy code 2014-07-19 04:32:18 +09:00
devs.h ARM: SAMSUNG: Remove remaining legacy code 2014-07-19 04:32:18 +09:00
dma-core.h
…
dma-ops.h ARM: SAMSUNG: Remove unnecessary code for dma 2013-04-08 21:42:10 +09:00
dma-pl330.h ARM: SAMSUNG: Remove unnecessary code for dma 2013-04-08 21:42:10 +09:00
dma-s3c24xx.h ARM: S3C24XX: remove obsolete s3c2412 specific dma settings 2013-05-21 01:01:41 +09:00
dma.h ARM: SAMSUNG: Guard against multiple inclusion of plat/dma.h 2012-01-12 02:00:16 +09:00
fb-core.h ARM: SAMSUNG: Remove remaining legacy code 2014-07-19 04:32:18 +09:00
fb-s3c2410.h ARM: S3C24XX: To merge s3c24xx devs.c files to one devs.c 2011-10-06 11:14:30 +09:00
fb.h ARM: SAMSUNG: Remove remaining legacy code 2014-07-19 04:32:18 +09:00
gpio-cfg-helpers.h ARM: SAMSUNG: Update the name of regarding Samsung GPIO 2011-09-21 15:07:04 +09:00
gpio-cfg.h ARM: SAMSUNG: Remove remaining legacy code 2014-07-19 04:32:18 +09:00
gpio-core.h ARM: mach-s5p: get rid of all <mach/gpio.h> headers 2014-06-30 21:37:21 +02:00
iic-core.h ARM: S5PV210: add common I2C device helpers 2010-05-20 18:21:34 +09:00
irq-uart.h
…
keypad-core.h ARM: S5PV210: Add keypad device helpers 2010-08-05 18:31:01 +09:00
keypad.h Input: samsung-keypad - enable compiling on other platforms 2011-11-15 09:46:14 -08:00
map-base.h ARM: SAMSUNG: Move the start address of Samsung SoCs' VA space 2010-10-25 16:11:38 +09:00
map-s3c.h ARM: SAMSUNG: Fix for S3C2412 EBI memory mapping 2012-06-21 03:53:46 +09:00
map-s5p.h ARM: EXYNOS: Refactored code for using PMU address via DT 2014-07-23 08:20:30 +09:00
nand-core.h ARM: SAMSUNG: Add setname core function for S3C24XX NAND 2010-10-18 19:56:45 +09:00
onenand-core.h ARM: SAMSUNG: Add platform support code for OneNAND controller 2010-05-20 17:48:36 +09:00
pm-common.h ARM: SAMSUNG: Move s3c_pm_check_* prototypes to plat/pm-common.h 2014-03-21 04:09:26 +09:00
pm.h ARM: SAMSUNG: Move s3c_pm_check_* prototypes to plat/pm-common.h 2014-03-21 04:09:26 +09:00
pwm-core.h ARM: SAMSUNG: Add new PWM platform device 2013-08-06 01:21:45 +02:00
regs-adc.h ARM: SAMSUNG: Add adc registers for S3C2443/S3C2416 2011-10-12 21:34:32 +09:00
regs-dma.h ARM: S3C24XX: Reuse S3C2443 dma for S3C2416 2012-03-07 01:53:17 -08:00
regs-irqtype.h
…
regs-spi.h ARM: SAMSUNG: Move S3C24XX header files to plat-samsung 2011-10-04 19:48:44 +09:00
regs-srom.h ARM: SAMSUNG: Move S5P header files to plat-samsung 2011-10-04 19:48:45 +09:00
regs-udc.h ARM: SAMSUNG: Move S3C24XX header files to plat-samsung 2011-10-04 19:48:44 +09:00
regs-usb-hsotg-phy.h ARM: S3C64XX: Add usb otg phy control 2012-03-09 07:31:30 -08:00
samsung-time.h ARM: SAMSUNG: Remove old samsung-time driver 2013-08-06 01:21:47 +02:00
sdhci.h ARM: SAMSUNG: Remove remaining legacy code 2014-07-19 04:32:18 +09:00
spi-core.h ARM: SAMSUNG: Add naming of s3c64xx-spi devices 2012-10-17 16:47:32 +09:00
usb-phy.h usb: exynos: do not include plat/usb-phy.h 2013-04-11 14:27:55 -07:00
wakeup-mask.h ARM: SAMSUNG: Add support for interrupt wakeup-sources 2010-05-20 21:07:01 +09:00
watchdog-reset.h ARM: SAMSUNG: Remove legacy watchdog reset code 2013-06-19 03:13:17 +09:00