korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-20 02:34:23 +08:00
Code Issues Packages Projects Releases Wiki Activity
afcf7924ec
linux/arch/arm/mach-s3c24xx
History
Olof Johansson afcf7924ec Merge branch 'fixes' into next/cleanup 
Merging in fixes since there's a conflict in the omap4 clock tables caused by
it.

* fixes: (245 commits)
  ARM: highbank: fix cache flush ordering for cpu hotplug
  ARM: OMAP4: hwmod data: make 'ocp2scp_usb_phy_phy_48m" as the main clock
  arm: mvebu: Fix the irq map function in SMP mode
  Fix GE0/GE1 init on ix2-200 as GE0 has no PHY
  ARM: S3C24XX: Fix interrupt pending register offset of the EINT controller
  ARM: S3C24XX: Correct NR_IRQS definition for s3c2440
  ARM i.MX6: Fix ldb_di clock selection
  ARM: imx: provide twd clock lookup from device tree
  ARM: imx35 Bugfix admux clock
  ARM: clk-imx35: Bugfix iomux clock
  + Linux 3.9-rc6

Signed-off-by: Olof Johansson <olof@lixom.net>

Conflicts:
	arch/arm/mach-omap2/cclock44xx_data.c
2013-04-28 15:01:12 -07:00
..
include/mach Merge branch 'fixes' into next/cleanup 2013-04-28 15:01:12 -07:00
anubis.h ARM: S3C24XX: make anubis-cpld, anubis-irq and anubis-map local 2013-01-10 10:45:34 -08:00
bast-ide.c ARM: S3C24XX: make bast-cpld.h, bast-irq.h and bast-map.h local 2013-01-10 10:45:35 -08:00
bast-irq.c ARM: S3C24XX: remove plat/irq.h in plat-samsung 2013-03-05 10:42:47 +09:00
bast.h ARM: S3C24XX: make bast-cpld.h, bast-irq.h and bast-map.h local 2013-01-10 10:45:35 -08:00
clock-dclk.c ARM: S3C24XX: Remove plat-s3c24xx directory in arch/arm/ 2013-02-03 16:17:10 -08:00
clock-s3c244x.c Merge branch 'next/cleanup-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2012-03-08 08:53:14 -08:00
clock-s3c2410.c ARM: S3C24XX: move plat-samsung/s3c24XX headers to local common.h 2013-03-05 10:42:48 +09:00
clock-s3c2412.c ARM: S3C24XX: move plat-samsung/s3c24XX headers to local common.h 2013-03-05 10:42:48 +09:00
clock-s3c2416.c ARM: S3C24XX: move plat-samsung/s3c24XX headers to local common.h 2013-03-05 10:42:48 +09:00
clock-s3c2440.c ARM: S3C24XX: Add clkdev entry for camif-upll clock 2012-11-28 08:03:28 +09:00
clock-s3c2443.c ARM: S3C24XX: move plat-samsung/s3c24XX headers to local common.h 2013-03-05 10:42:48 +09:00
common-s3c2443.c ARM: S3C24XX: Make 'clk_msysclk' static 2013-01-30 22:28:04 -08:00
common-smdk.c ARM: S3C24XX: plat/common-smdk.h local 2013-03-05 10:42:47 +09:00
common-smdk.h ARM: S3C24XX: plat/common-smdk.h local 2013-03-05 10:42:47 +09:00
common.c ARM: S3C24XX: move plat-samsung/s3c24XX headers to local common.h 2013-03-05 10:42:48 +09:00
common.h ARM: S3C24XX: cleanup the included soc init functions in common.h 2013-03-05 10:42:48 +09:00
cpufreq-debugfs.c ARM: S3C24XX: Remove plat-s3c24xx directory in arch/arm/ 2013-02-03 16:17:10 -08:00
cpufreq-s3c2410.c ARM: S3C24XX: Move mach-s3c2410/ cpufreq into mach-s3c24xx/ 2013-01-21 15:40:23 -08:00
cpufreq-s3c2412.c ARM: S3C24XX: header mach/regs-s3c2412-mem.h local 2013-02-04 10:31:38 -08:00
cpufreq-s3c2440.c ARM: S3C24XX: Move mach-s3c2440/ cpufreq driver into mach-s3c24xx/ 2013-01-21 17:05:22 -08:00
cpufreq-utils.c ARM: S3C24XX: header mach/regs-mem.h local 2013-02-04 10:31:43 -08:00
cpufreq.c ARM: S3C24XX: Remove plat-s3c24xx directory in arch/arm/ 2013-02-03 16:17:10 -08:00
dma-s3c2410.c mmc: s3cmci: moved mach/regs-sdi.h into s3cmci device driver 2013-03-05 10:42:47 +09:00
dma-s3c2412.c mmc: s3cmci: moved mach/regs-sdi.h into s3cmci device driver 2013-03-05 10:42:47 +09:00
dma-s3c2440.c mmc: s3cmci: moved mach/regs-sdi.h into s3cmci device driver 2013-03-05 10:42:47 +09:00
dma-s3c2443.c mmc: s3cmci: moved mach/regs-sdi.h into s3cmci device driver 2013-03-05 10:42:47 +09:00
dma.c ARM: S3C24XX: Remove plat-s3c24xx directory in arch/arm/ 2013-02-03 16:17:10 -08:00
gta02.h ARM: S3C24XX: make gta02.h local 2013-01-10 10:45:35 -08:00
h1940-bluetooth.c Merge branch 'next/cleanup-header' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2013-02-04 21:49:29 -08:00
h1940.h ARM: S3C24XX: make h1940.h and h1940-latch.h local 2013-01-10 10:45:35 -08:00
iotiming-s3c2410.c ARM: S3C24XX: header mach/regs-mem.h local 2013-02-04 10:31:43 -08:00
iotiming-s3c2412.c ARM: S3C24XX: header mach/regs-s3c2412-mem.h local 2013-02-04 10:31:38 -08:00
irq-pm.c ARM: S3C24XX: remove plat/irq.h in plat-samsung 2013-03-05 10:42:47 +09:00
irq-s3c244x.c Merge branch 'next/cleanup-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2012-03-08 08:53:14 -08:00
irq-s3c2412.c ARM: S3C24XX: header mach/regs-power.h local 2013-02-04 10:31:39 -08:00
irq-s3c2440.c Merge branch 'next/cleanup-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2012-03-08 08:53:14 -08:00
irq.c Merge branch 'fixes' into next/cleanup 2013-04-28 15:01:12 -07:00
Kconfig ARM: S3C24XX: Removed unneeded dependency on CPU_S3C2412 2013-04-04 10:04:00 +09:00
mach-amlm5900.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-anubis.c Merge branch 'next/cleanup-s3c24xx-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2013-02-05 17:01:56 -08:00
mach-at2440evb.c Merge branch 'next/cleanup-s3c24xx-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2013-02-05 17:01:56 -08:00
mach-bast.c Merge branch 'next/cleanup-s3c24xx-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2013-02-05 17:01:56 -08:00
mach-gta02.c Merge branch 'next/cleanup-s3c24xx-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2013-02-05 17:01:56 -08:00
mach-h1940.c Merge branch 'next/cleanup-header' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2013-02-04 21:49:29 -08:00
mach-jive.c ARM: S3C24XX: move plat-samsung/s3c24XX headers to local common.h 2013-03-05 10:42:48 +09:00
mach-mini2440.c Merge branch 'next/cleanup-s3c24xx-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2013-02-05 17:01:56 -08:00
mach-n30.c ARM: S3C24XX: move plat-samsung/s3c24XX headers to local common.h 2013-03-05 10:42:48 +09:00
mach-nexcoder.c ARM: S3C24XX: move plat-samsung/s3c24XX headers to local common.h 2013-03-05 10:42:48 +09:00
mach-osiris-dvs.c ARM: drivers: remove __dev* attributes. 2013-01-03 15:57:04 -08:00
mach-osiris.c arm-soc: cleanups 2013-02-21 14:58:40 -08:00
mach-otom.c ARM: S3C24XX: move plat-samsung/s3c24XX headers to local common.h 2013-03-05 10:42:48 +09:00
mach-qt2410.c ARM: S3C24XX: plat/common-smdk.h local 2013-03-05 10:42:47 +09:00
mach-rx1950.c Merge branch 'next/cleanup-header' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2013-02-04 21:49:29 -08:00
mach-rx3715.c Merge branch 'next/cleanup-header' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2013-02-04 21:49:29 -08:00
mach-smdk2410.c ARM: S3C24XX: plat/common-smdk.h local 2013-03-05 10:42:47 +09:00
mach-smdk2413.c ARM: S3C24XX: move plat-samsung/s3c24XX headers to local common.h 2013-03-05 10:42:48 +09:00
mach-smdk2416.c ARM: S3C24XX: move plat-samsung/s3c24XX headers to local common.h 2013-03-05 10:42:48 +09:00
mach-smdk2440.c ARM: S3C24XX: move plat-samsung/s3c24XX headers to local common.h 2013-03-05 10:42:48 +09:00
mach-smdk2443.c ARM: S3C24XX: move plat-samsung/s3c24XX headers to local common.h 2013-03-05 10:42:48 +09:00
mach-tct_hammer.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-vr1000.c Merge branch 'next/cleanup-header' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2013-02-04 21:49:29 -08:00
mach-vstms.c ARM: S3C24XX: move plat-samsung/s3c24XX headers to local common.h 2013-03-05 10:42:48 +09:00
Makefile ARM: S3C24XX: Remove plat-s3c24xx directory in arch/arm/ 2013-02-03 16:17:10 -08:00
Makefile.boot
osiris.h ARM: S3C24XX: make osiris-cpld.h and osiris-map.h local 2013-01-10 10:45:36 -08:00
otom.h ARM: S3C24XX: make otom-map.h local 2013-01-10 10:45:36 -08:00
pll-s3c2410.c ARM: S3C24XX: Move mach-s3c2410/ pll into mach-s3c24xx/ 2013-01-21 17:03:32 -08:00
pll-s3c2440-12000000.c ARM: S3C24XX: Move mach-s3c2440/ pll into mach-s3c24xx/ 2013-01-21 17:05:23 -08:00
pll-s3c2440-16934400.c ARM: S3C24XX: Move mach-s3c2440/ pll into mach-s3c24xx/ 2013-01-21 17:05:23 -08:00
pm-h1940.S ARM: samsung: fix assembly syntax for new gas 2013-02-14 15:04:34 +01:00
pm-s3c2410.c ARM: S3C24XX: make h1940.h and h1940-latch.h local 2013-01-10 10:45:35 -08:00
pm-s3c2412.c ARM: S3C24XX: move plat-samsung/s3c24XX headers to local common.h 2013-03-05 10:42:48 +09:00
pm-s3c2416.c arm-soc: cleanups 2013-02-21 14:58:40 -08:00
pm.c ARM: S3C24XX: header mach/regs-mem.h local 2013-02-04 10:31:43 -08:00
regs-dsc.h ARM: S3C24XX: Remove unused GPIO drive strength register definitions 2013-04-08 21:37:07 +09:00
regs-mem.h ARM: S3C24XX: header mach/regs-mem.h local 2013-02-04 10:31:43 -08:00
s3c244x.c ARM: S3C24XX: move plat-samsung/s3c24XX headers to local common.h 2013-03-05 10:42:48 +09:00
s3c2410.c ARM: S3C24XX: move plat-samsung/s3c24XX headers to local common.h 2013-03-05 10:42:48 +09:00
s3c2412-power.h ARM: S3C24XX: header mach/regs-power.h local 2013-02-04 10:31:39 -08:00
s3c2412.c ARM: S3C24XX: move plat-samsung/s3c24XX headers to local common.h 2013-03-05 10:42:48 +09:00
s3c2412.h ARM: S3C24XX: header mach/regs-s3c2412-mem.h local 2013-02-04 10:31:38 -08:00
s3c2416.c ARM: S3C24XX: move plat-samsung/s3c24XX headers to local common.h 2013-03-05 10:42:48 +09:00
s3c2440.c ARM: S3C24XX: move plat-samsung/s3c24XX headers to local common.h 2013-03-05 10:42:48 +09:00
s3c2442.c ARM: S3C24XX: move plat-samsung/s3c24XX headers to local common.h 2013-03-05 10:42:48 +09:00
s3c2443.c ARM: S3C24XX: move plat-samsung/s3c24XX headers to local common.h 2013-03-05 10:42:48 +09:00
setup-i2c.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
setup-sdhci-gpio.c
setup-spi.c ARM: SAMSUNG: Remove pdev pointer parameter from spi gpio setup functions 2012-07-13 15:23:46 +09:00
setup-ts.c ARM: S3C24XX: Convert the touchscreen setup code to common GPIO API 2012-07-13 18:05:05 +09:00
simtec-audio.c ARM: S3C24XX: make bast-cpld.h, bast-irq.h and bast-map.h local 2013-01-10 10:45:35 -08:00
simtec-nor.c ARM: S3C24XX: make bast-cpld.h, bast-irq.h and bast-map.h local 2013-01-10 10:45:35 -08:00
simtec-pm.c ARM: S3C24XX: header mach/regs-mem.h local 2013-02-04 10:31:43 -08:00
simtec-usb.c ARM: S3C24XX: make bast-cpld.h, bast-irq.h and bast-map.h local 2013-01-10 10:45:35 -08:00
simtec.h
sleep-s3c2410.S arm-soc: cleanups 2013-02-21 14:58:40 -08:00
sleep-s3c2412.S ARM: samsung: fix assembly syntax for new gas 2013-02-14 15:04:34 +01:00
sleep.S ARM: S3C24XX: header mach/regs-mem.h local 2013-02-04 10:31:43 -08:00
vr1000.h ARM: S3C24XX: make vr1000-cpld.h, vr1000-irq.h and vr1000-map.h local 2013-01-10 10:45:37 -08:00