leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
f6d5d8a5ed
linux/arch/arm/plat-samsung/include/plat
History
Olof Johansson e3a66aa33a Merge branch 'multiplatform/platform-data' into next/multiplatform 
* multiplatform/platform-data:
  ARM: spear: move platform_data definitions
  ARM: samsung: move platform_data definitions
  ARM: orion: move platform_data definitions
  ARM: nomadik: move platform_data definitions
  ARM: w90x900: move platform_data definitions
  ARM: vt8500: move platform_data definitions
  ARM: tegra: move sdhci platform_data definition
  ARM: sa1100: move platform_data definitions
  ARM: pxa: move platform_data definitions
  ARM: netx: move platform_data definitions
  ARM: msm: move platform_data definitions
  ARM: imx: move platform_data definitions
  ARM: ep93xx: move platform_data definitions
  ARM: davinci: move platform_data definitions
  ARM: at91: move platform_data definitions

Conflicts due to removed files:
	arch/arm/mach-tegra/board-harmony.c
	arch/arm/mach-tegra/board-trimslice.c

Conflicts due to code removal:
	arch/arm/mach-tegra/board-paz00.c

Context conflicts in:
	drivers/mmc/host/sdhci-tegra.c
	drivers/net/irda/pxaficp_ir.c

Signed-off-by: Olof Johansson <olof@lixom.net>
2012-09-22 01:07:21 -07:00
..
adc-core.h ARM: SAMSUNG: Allow overriding of adc device name for S3C24XX 2011-10-12 21:34:42 +09:00
adc.h
ata-core.h
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: S3C24XX: remove XXX_setup_clocks method from S3C2443 2012-03-07 02:00:04 -08: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: EXYNOS: Update HSOTG PHY clock setting for EXYNOS4X12 2012-07-13 06:45:55 +09:00
debug-macro.S ARM: S5P6442: Removing ARCH_S5P6442 2011-05-12 08:10:53 +09:00
devs.h ARM: EXYNOS: Remove leftovers of the Samsung specific power domain control 2012-06-27 09:41:03 +09:00
dma-core.h
dma-ops.h ARM: SAMSUNG: Add config() function in DMA common operations 2012-06-20 08:07:35 +09:00
dma-pl330.h ARM: EXYNOS: Support DMA for EXYNOS5250 SoC 2012-05-13 08:20:04 +09:00
dma-s3c24xx.h arm: convert sysdev_class to a regular subsystem 2011-12-21 16:01:38 -08: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: 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: SAMSUNG: Remove description corresponding to a deleted element 2012-06-20 09:18:39 +09:00
fimc-core.h
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 treewide: Put a space between #include and FILE 2012-06-28 11:44:36 +02: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: S3C24XX: Remove obsolete GPIO API declarations 2012-08-28 09:06:49 -07:00
hdmi.h ARM: SAMSUNG: Add API to set platform data for s5p-tv driver 2012-08-08 15:53:38 +09:00
iic-core.h
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 Input: samsung-keypad - enable compiling on other platforms 2011-11-15 09:46:14 -08:00
map-base.h
map-s3c.h ARM: SAMSUNG: Fix for S3C2412 EBI memory mapping 2012-06-21 03:53:46 +09:00
map-s5p.h ARM: SAMSUNG: Move map header file into plat-samsung 2011-09-16 20:20:33 +09:00
mfc.h ARM: SAMSUNG: Move S5P header files to plat-samsung 2011-10-04 19:48:45 +09:00
nand-core.h
onenand-core.h
pll.h ARM: SAMSUNG: Consolidate plat/pll.h 2011-10-04 19:48:42 +09:00
pm.h Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 2012-01-08 13:10:57 -08: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: S3C24XX: Reuse S3C2443 dma for S3C2416 2012-03-07 01:53:17 -08:00
regs-fb-v4.h
regs-fb.h video: s3c-fb: Add support EXYNOS5 FIMD 2012-03-06 11:57:14 +00: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 rtc-s3c: add variants for S3C2443 and S3C2416 2012-02-07 08:03:42 +09:00
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 ARM: S3C64XX: Add usb otg phy control 2012-03-09 07:31:30 -08:00
regs-watchdog.h
rtc-core.h ARM: S3C2443/S3C2416: add s3c_rtc_setname and rename rtc devices 2012-02-07 08:03:43 +09:00
s3c244x.h ARM: SAMSUNG: Moving each SoC support header files 2011-10-04 19:48:43 +09:00
s3c2410.h ARM: S3C2410: move s3c2410_baseclk_add to clock.h 2012-01-31 20:06: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: S3C24XX: add support for second irq set of S3C2416 2012-05-20 03:05:04 +09:00
s3c2443.h ARM: S3C24XX: move common S3C2443 clock definitions to clock.h 2012-01-31 20:06:42 +09:00
s5p-clock.h ARM: EXYNOS: Add pre-divider and fout mux clocks for bpll and mpll 2012-05-16 07:03:41 +09:00
s5p-time.h ARM: SAMSUNG: Move S5P header files to plat-samsung 2011-10-04 19:48:45 +09:00
sdhci.h Merge branch 'next/cleanup-samsung-macro' into next/cleanup-samsung 2012-05-13 06:48:21 +09:00
tv-core.h ARM: S5P: add support for tv device 2011-10-04 18:58:26 +09:00
uncompress.h ARM: EXYNOS: add support uart for EXYNOS4 and EXYNOS5 2012-03-14 02:13:05 -07:00
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: SAMSUNG: Should check for IS_ERR(clk) instead of NULL 2012-06-20 17:05:44 +09:00