Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-19 10:31:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
79568b9412
linux/arch/arm/plat-samsung/include/plat
History
Linus Torvalds 411f5c7a50 Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 
* 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm: (289 commits)
  davinci: DM644x EVM: register MUSB device earlier
  davinci: add spi devices on tnetv107x evm
  davinci: add ssp config for tnetv107x evm board
  davinci: add tnetv107x ssp platform device
  spi: add ti-ssp spi master driver
  mfd: add driver for sequencer serial port
  ARM: EXYNOS4: Implement Clock gating for System MMU
  ARM: EXYNOS4: Enhancement of System MMU driver
  ARM: EXYNOS4: Add support for gpio interrupts
  ARM: S5P: Add function to register gpio interrupt bank data
  ARM: S5P: Cleanup S5P gpio interrupt code
  ARM: EXYNOS4: Add missing GPYx banks
  ARM: S3C64XX: Fix section mismatch from cpufreq init
  ARM: EXYNOS4: Add keypad device to the SMDKV310
  ARM: EXYNOS4: Update clocks for keypad
  ARM: EXYNOS4: Update keypad base address
  ARM: EXYNOS4: Add keypad device helpers
  ARM: EXYNOS4: Add support for SATA on ARMLEX4210
  plat-nomadik: make GPIO interrupts work with cpuidle ApSleep
  mach-u300: define a dummy filter function for coh901318
  ...

Fix up various conflicts in
 - arch/arm/mach-exynos4/cpufreq.c
 - arch/arm/mach-mxs/gpio.c
 - drivers/net/Kconfig
 - drivers/tty/serial/Kconfig
 - drivers/tty/serial/Makefile
 - drivers/usb/gadget/fsl_mxc_udc.c
 - drivers/video/Kconfig
2011-03-17 19:08:06 -07:00
..
adc-core.h ARM: SAMSUNG: Implement set_name function for ADC devices 2010-08-05 18:32:50 +09:00
adc.h Update broken web addresses in arch directory. 2010-10-18 11:03:21 +02:00
ata-core.h ARM: SAMSUNG: Add Compact Flash device support for Samsung SoCs 2010-08-05 18:32:50 +09:00
ata.h ARM: SAMSUNG: Add Compact Flash device support for Samsung SoCs 2010-08-05 18:32:50 +09:00
audio.h ARM: SAMSUNG: Prepare audio header for new I2S driver 2010-11-19 08:49:44 +09:00
clock-clksrc.h
clock.h ARM: SAMSUNG: Add support for clock debugging through debug-fs interface 2011-01-12 13:40:04 +09:00
cpu-freq.h
cpu.h ARM: EXYNOS4: Suspend to RAM Support 2011-03-12 10:18:24 +09:00
debug-macro.S
devs.h ARM: EXYNOS4: Add support for SATA on ARMLEX4210 2011-03-15 18:35:30 +09:00
dma-core.h
dma-s3c24xx.h
dma.h S3C: DMA: Change argument of s3c2410_dma_devconfig 2010-05-17 16:43:49 +09:00
fb-core.h s3c-fb: add device name initialization 2010-08-11 08:59:10 -07:00
fb.h s3c-fb: add default window feature. 2010-08-11 08:59:09 -07:00
fimc-core.h ARM: S5P: Add platform definitions for FIMC3 2011-03-12 08:58:01 +09:00
gpio-cfg-helpers.h ARM: S3C2443: Implement GPIO pull-up/down configuration methods 2011-01-06 14:09:19 +09:00
gpio-cfg.h ARM: S5P: Add function to register gpio interrupt bank data 2011-03-15 21:17:43 +09:00
gpio-core.h ARM: SAMSUNG: Cleanup GPIOlib adding 2bit chips 2010-12-30 09:37:28 +09:00
hwmon.h ARM: SAMSUNG: Move HWMON from plat-s3c24xx to plat-samsung 2010-05-12 17:43:03 +09:00
iic-core.h ARM: S5PV210: add common I2C device helpers 2010-05-20 18:21:34 +09:00
iic.h ARM: S5PV310: Add I2C channel 3, 4, 5, 6, and 7 device support 2010-10-25 16:03:43 +09:00
irq-uart.h
irq-vic-timer.h
keypad-core.h ARM: S5PV210: Add keypad device helpers 2010-08-05 18:31:01 +09:00
keypad.h ARM: SAMSUNG: Add keypad device support 2010-08-06 21:27:50 +09:00
map-base.h ARM: SAMSUNG: Move the start address of Samsung SoCs' VA space 2010-10-25 16:11:38 +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 ARM: SAMSUNG: Add platform support code for OneNAND controller 2010-05-20 17:48:36 +09:00
pd.h ARM: EXYNOS4: Update device support 2011-02-22 13:51:15 +09:00
pll6553x.h ARM: SAMSUNG: Move S3C6400 PLL code to <plat/pll.h> for re-use 2010-05-10 11:44:37 +09:00
pm.h Merge branches 'at91', 'ep93xx', 'errata', 'footbridge', 'fncpy', 'gemini', 'irqdata', 'pm', 'sh', 'smp', 'spear', 'ux500' and 'via' into devel 2011-03-16 23:35:17 +00:00
regs-ac97.h
regs-adc.h
regs-ata.h ARM: SAMSUNG: Add Compact Flash device support for Samsung SoCs 2010-08-05 18:32:50 +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-irqtype.h
regs-nand.h
regs-onenand.h ARM: SAMSUNG: Add platform support code for OneNAND controller 2010-05-20 17:48:36 +09:00
regs-rtc.h ARM: SAMSUNG: Updates RTC register for support Alarm IRQ and Time Tick. 2010-08-05 18:32:51 +09:00
regs-sdhci.h
regs-serial.h ARM: SAMSUNG: serial: Add FRACVAL support for newer UART 2010-08-05 18:32:41 +09:00
regs-timer.h
regs-usb-hsotg-phy.h
regs-usb-hsotg.h USB: s3c-hsotg: Add initial detection and setup for dedicated FIFO mode 2010-08-10 14:35:42 -07:00
regs-watchdog.h
s3c64xx-spi.h Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2010-10-21 16:42:32 -07:00
s3c-dma-pl330.h ARM: S5P64X0: Move DMA support for S5P64X0 2010-10-18 18:33:03 +09:00
s3c-pl330-pdata.h S3C: DMA: Add api driver for PL330 2010-05-18 18:00:12 +09:00
sdhci.h ARM: EXYNOS4: Update device support 2011-02-22 13:51:15 +09:00
ts.h ARM: SAMSUNG: Implements cfg_gpio function for Samsung touchscreen 2010-05-19 18:25:22 +09:00
udc-hs.h
uncompress.h
usb-control.h
wakeup-mask.h ARM: SAMSUNG: Add support for interrupt wakeup-sources 2010-05-20 21:07:01 +09:00
watchdog-reset.h