renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 13:43:55 +08:00
Code
142f2101a8
linux-next/arch/arm/plat-samsung/include/plat
History
Arnd Bergmann 142f2101a8 Merge branch 'samsung/cleanup' into samsung/driver 
Conflicts:
	arch/arm/mach-s5p64x0/cpu.c -> common.c

More changes to a file that got moved into common.c,
see previous conflict resolutions.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-01-09 16:14:07 +00:00
..
adc-core.h ARM: SAMSUNG: Allow overriding of adc device name for S3C24XX 2011-10-12 21:34:42 +09:00
adc.h Update broken web addresses in arch directory. 2010-10-18 11:03:21 +02:00
ata-core.h
ata.h
audio-simtec.h ARM: SAMSUNG: Move S3C24XX header files to plat-samsung 2011-10-04 19:48:44 +09:00
audio.h ARM: SAMSUNG: Add platform device for idma 2011-07-21 14:12:19 +09:00
backlight.h ARM: SAMSUNG: Fix Section mismatch in samsung_bl_set() 2011-08-19 20:57:20 +09:00
camport.h ARM: SAMSUNG: Move S5P header files to plat-samsung 2011-10-04 19:48:45 +09:00
clock-clksrc.h
clock.h ARM: SAMSUNG: fix to prevent declaring duplicated 2011-09-15 15:54:15 +09:00
common-smdk.h ARM: SAMSUNG: Move S3C24XX header files to plat-samsung 2011-10-04 19:48:44 +09:00
cpu-freq-core.h ARM: SAMSUNG: Fix build error when selecting CPU_FREQ_S3C24XX_DEBUGFS on S3C2440 2011-12-28 15:08:28 +09:00
cpu-freq.h
cpu.h ARM: 7257/1: EXYNOS: introduce arch/arm/mach-exynos/common.[ch] 2012-01-03 10:25:04 +00:00
debug-macro.S ARM: S5P6442: Removing ARCH_S5P6442 2011-05-12 08:10:53 +09:00
devs.h ARM: SAMSUNG: Consolidation of SPI platform devices to plat-samsung 2011-12-23 10:49:53 +09:00
dma-core.h
dma-ops.h ARM: SAMSUNG: Add device tree support for pl330 dma engine wrappers 2011-12-23 10:07:05 +09:00
dma-pl330.h ARM: SAMSUNG: Add device tree support for pl330 dma engine wrappers 2011-12-23 10:07:05 +09:00
dma-s3c24xx.h Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2011-11-04 18:02:25 -07:00
dma.h ARM: SAMSUNG: Remove Samsung specific enum type for dma direction 2011-09-14 11:10:04 +05:30
ehci.h ARM: SAMSUNG: Move S5P header files to plat-samsung 2011-10-04 19:48:45 +09:00
fb-core.h ARM: EXYNOS4: Add platform device and helper functions for FIMD 2011-07-21 17:28:51 +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: S5P64X0: Add GPIO setup for LCD 2011-10-04 19:00:53 +09:00
fimc-core.h ARM: S5P: Add platform definitions for FIMC3 2011-03-12 08:58:01 +09:00
fiq.h ARM: SAMSUNG: Move S3C24XX header files to plat-samsung 2011-10-04 19:48:44 +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: include linux/types.h at gpio-cfg.h 2011-11-17 01:17:18 +09:00
gpio-core.h ARM: SAMSUNG: Update the name of regarding Samsung GPIO 2011-09-21 15:07:04 +09:00
gpio-fns.h ARM: SAMSUNG: Update the name of regarding Samsung GPIO 2011-09-21 15:07:04 +09:00
hwmon.h
iic-core.h
iic.h ARM: SAMSUNG: add i2c hdmiphy controller definitions 2011-10-04 18:58:21 +09:00
irq-uart.h
irq-vic-timer.h ARM: SAMSUNG: Convert irq-vic-timer to generic irq chip 2011-05-09 10:12:39 +02:00
irq.h ARM: SAMSUNG: Move S3C24XX header files to plat-samsung 2011-10-04 19:48:44 +09:00
irqs.h ARM: SAMSUNG: Move timer irq numbers to end of linux irq space 2011-12-23 10:04:39 +09:00
keypad-core.h
keypad.h
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: Move map header file into plat-samsung 2011-09-16 20:20:33 +09:00
map-s5p.h ARM: SAMSUNG: Move map header file into plat-samsung 2011-09-16 20:20:33 +09:00
mci.h ARM: SAMSUNG: Move S3C24XX header files to plat-samsung 2011-10-04 19:48:44 +09:00
mfc.h ARM: SAMSUNG: Move S5P header files to plat-samsung 2011-10-04 19:48:45 +09:00
mipi_csis.h ARM: SAMSUNG: Move S5P header files to plat-samsung 2011-10-04 19:48:45 +09:00
nand-core.h ARM: SAMSUNG: Add setname core function for S3C24XX NAND 2010-10-18 19:56:45 +09:00
nand.h
onenand-core.h
pd.h ARM: EXYNOS4: Update device support 2011-02-22 13:51:15 +09:00
pll.h ARM: SAMSUNG: Consolidate plat/pll.h 2011-10-04 19:48:42 +09:00
pm.h ARM: SAMSUNG: Update the name of regarding Samsung GPIO 2011-09-21 15:07:04 +09:00
pwm-clock.h ARM: SAMSUNG: Consolidate plat/pwm-clock.h 2011-10-04 19:48:41 +09:00
regs-ac97.h
regs-adc.h ARM: SAMSUNG: Add adc registers for S3C2443/S3C2416 2011-10-12 21:34:32 +09:00
regs-ata.h
regs-dma.h ARM: SAMSUNG: Move S3C24XX header files to plat-samsung 2011-10-04 19:48:44 +09:00
regs-fb-v4.h s3c-fb: integrate palette setup code into main driver 2010-08-11 08:59:10 -07:00
regs-fb.h s3c-fb: add support for DMA channel control on S5PV210 2010-08-11 08:59:12 -07:00
regs-iic.h
regs-iis.h ARM: SAMSUNG: Move S3C24XX header files to plat-samsung 2011-10-04 19:48:44 +09:00
regs-irqtype.h
regs-nand.h
regs-onenand.h
regs-rtc.h
regs-sdhci.h
regs-serial.h serial: samsung: merge probe() function from all SoC specific extensions 2011-12-23 10:07:00 +09:00
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-timer.h
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
regs-usb-hsotg.h
regs-watchdog.h
s3c64xx-spi.h ARM: S5PC100: Modified files for SPI consolidation work 2011-12-23 10:50:01 +09:00
s3c244x.h ARM: SAMSUNG: Moving each SoC support header files 2011-10-04 19:48:43 +09:00
s3c2410.h ARM: SAMSUNG: Moving each SoC support header files 2011-10-04 19:48:43 +09:00
s3c2412.h ARM: 7254/1: restart: S3C24XX: move SWRST based S3C platforms to 2012-01-05 12:57:18 +00:00
s3c2416.h ARM: 7254/1: restart: S3C24XX: move SWRST based S3C platforms to 2012-01-05 12:57:18 +00:00
s3c2443.h ARM: 7254/1: restart: S3C24XX: move SWRST based S3C platforms to 2012-01-05 12:57:18 +00:00
s5p-clock.h ARM: SAMSUNG: Move S5P header files to plat-samsung 2011-10-04 19:48:45 +09:00
s5p-time.h ARM: SAMSUNG: Move S5P header files to plat-samsung 2011-10-04 19:48:45 +09:00
sdhci.h ARM: S5P64X0: Add HSMMC setup for host Controller 2011-12-26 16:30:43 +09:00
sysmmu.h ARM: SAMSUNG: Move S5P header files to plat-samsung 2011-10-04 19:48:45 +09:00
ts.h
tv-core.h ARM: S5P: add support for tv device 2011-10-04 18:58:26 +09:00
udc-hs.h
udc.h ARM: SAMSUNG: Move S3C24XX header files to plat-samsung 2011-10-04 19:48:44 +09:00
uncompress.h ARM: zImage: remove the static qualifier from global data variables 2011-05-07 00:08:02 -04:00
usb-control.h
usb-phy.h ARM: SAMSUNG: Move S5P header files to plat-samsung 2011-10-04 19:48:45 +09:00
wakeup-mask.h
watchdog-reset.h ARM: 7266/1: restart: S3C64XX: use new restart hook 2012-01-05 12:57:18 +00:00