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

..

devices

ARM i.MX53: remove platform ahci support

2013-04-09 21:07:20 +08:00

3ds_debugboard.c

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

3ds_debugboard.h

ARM: imx: include board headers in the same folder

2012-10-15 09:18:14 +08:00

avic.c

ARM: imx: avic: Move avic_saved_mask_reg under CONFIG_PM

2013-04-02 20:43:07 +08:00

board-mx31lilly.h

ARM: imx: include board headers in the same folder

2012-10-15 09:18:14 +08:00

board-mx31lite.h

ARM: imx: include board headers in the same folder

2012-10-15 09:18:14 +08:00

board-mx31moboard.h

ARM: imx: include board headers in the same folder

2012-10-15 09:18:14 +08:00

board-pcm038.h

ARM: imx: include board headers in the same folder

2012-10-15 09:18:14 +08:00

clk-busy.c

ARM: imx: adapt clk_busy_mux to new clk_mux struct

2013-03-27 08:35:18 -07:00

clk-gate2.c

ARM i.MX: fix error-valued pointer dereference in clk_register_gate2()

2012-11-16 15:53:57 +01:00

clk-imx1.c

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

clk-imx6q.c

ARM i.MX6: Fix ldb_di clock selection

2013-04-09 19:48:09 +08:00

clk-imx21.c

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

clk-imx25.c

ARM: i.MX25: clk: parent per5_clk to AHB clock

2013-02-05 10:54:35 +01:00

clk-imx27.c

ARM: imx: clk-imx27: Do not register peripheral clock for SSI

2013-04-02 20:43:21 +08:00

clk-imx31.c

Linux 3.8-rc6

2013-02-04 22:56:41 -08:00

clk-imx35.c

ARM: imx35 Bugfix admux clock

2013-04-09 19:46:30 +08:00

clk-imx51-imx53.c

ARM: i.MX53: Add clocks for i.mx53 onewire master.

2013-02-10 23:25:46 +08:00

clk-pfd.c

ARM: imx: add common clock support for pfd

2012-05-02 12:08:20 +02:00

clk-pllv1.c

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

clk-pllv2.c

ARM i.MX pllv2: make round_rate accurate

2012-06-04 15:23:47 +02:00

clk-pllv3.c

ARM i.MX6: remove gate_mask from pllv3

2012-11-22 15:32:39 +01:00

clk.c

ARM: i.MX remove last leftovers from legacy clock support

2012-09-12 11:46:51 +02:00

clk.h

ARM i.MX6: remove gate_mask from pllv3

2012-11-22 15:32:39 +01:00

common.h

Merge branch 'fixes' into next/cleanup

2013-04-28 15:01:12 -07:00

cpu-imx5.c

ARM: imx: Remove mx508 support

2013-01-29 14:05:43 +08:00

cpu-imx25.c

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

cpu-imx27.c

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

cpu-imx31.c

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

cpu-imx35.c

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

cpu.c

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

cpuidle-imx6q.c

ARM: imx6q: support WAIT mode using cpuidle

2013-01-30 21:09:31 +08:00

cpuidle.c

ARM: imx: merge plat-mxc into mach-imx

2012-10-15 10:02:19 +08:00

cpuidle.h

ARM: imx: move imx6q_cpuidle_driver into a separate file

2013-01-30 21:08:42 +08:00

crm-regs-imx5.h

ARM i.MX53: Fix PLL4 base address

2012-06-04 15:23:57 +02:00

crmregs-imx3.h

ARM i.MX3: Make ccm base address a variable

2012-04-25 17:03:45 +02:00

devices-imx1.h

ARM: imx: move platform device code into mach-imx

2012-10-15 09:18:15 +08:00

devices-imx21.h

ARM: imx: move platform device code into mach-imx

2012-10-15 09:18:15 +08:00

devices-imx25.h

ARM: imx: move platform device code into mach-imx

2012-10-15 09:18:15 +08:00

devices-imx27.h

ARM : i.MX27 : split code for allocation of ressources of camera and eMMA

2012-11-16 16:21:48 +01:00

devices-imx31.h

ARM: imx: move platform device code into mach-imx

2012-10-15 09:18:15 +08:00

devices-imx35.h

ARM: imx: move platform device code into mach-imx

2012-10-15 09:18:15 +08:00

devices-imx51.h

ARM: imx: move platform device code into mach-imx

2012-10-15 09:18:15 +08:00

ehci-imx5.c

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

ehci-imx25.c

Merge branch 'next/cam-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc

2012-11-30 09:27:57 -08:00

ehci-imx27.c

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

ehci-imx31.c

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

ehci-imx35.c

Merge branch 'next/cam-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc

2012-11-30 09:27:57 -08:00

epit.c

ARM: use clockevents_config_and_register() where possible

2013-01-14 10:12:42 -08:00

eukrea_mbimx27-baseboard.c

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

eukrea_mbimxsd25-baseboard.c

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

eukrea_mbimxsd35-baseboard.c

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

eukrea_mbimxsd51-baseboard.c

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

eukrea-baseboards.h

ARM: imx: include board headers in the same folder

2012-10-15 09:18:14 +08:00

gpc.c

imx6q cpuidle support for 3.9

2013-02-04 22:24:20 -08:00

hardware.h

ARM: imx: remove mx6q.h

2013-04-02 22:06:01 +08:00

headsmp.S

ARM: mach-imx: move early resume code out of the .data section

2013-03-04 09:20:09 +08:00

hotplug.c

ARM: imx: fix sync issue between imx_cpu_die and imx_cpu_kill

2013-03-26 20:25:45 +08:00

iim.h

ARM: imx: include iim.h rather than mach/iim.h

2012-10-15 10:03:10 +08:00

imx25-dt.c

ARM: i.MX25: Fix DT compilation

2013-03-14 12:52:39 +01:00

imx27-dt.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

imx31-dt.c

arm-soc: soc-specific updates

2013-02-21 15:27:22 -08:00

imx51-dt.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

iomux-imx31.c

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

iomux-mx1.h

ARM: imx: move iomux drivers and headers into mach-imx

2012-10-15 09:18:14 +08:00

iomux-mx2x.h

ARM: imx: move iomux drivers and headers into mach-imx

2012-10-15 09:18:14 +08:00

iomux-mx3.h

ARM: imx: move iomux drivers and headers into mach-imx

2012-10-15 09:18:14 +08:00

iomux-mx21.h

ARM: imx: move iomux drivers and headers into mach-imx

2012-10-15 09:18:14 +08:00

iomux-mx25.h

ARM: imx: move iomux drivers and headers into mach-imx

2012-10-15 09:18:14 +08:00

iomux-mx27.h

ARM: imx: move iomux drivers and headers into mach-imx

2012-10-15 09:18:14 +08:00

iomux-mx35.h

ARM: imx: move iomux drivers and headers into mach-imx

2012-10-15 09:18:14 +08:00

iomux-mx51.h

ARM: imx: move iomux drivers and headers into mach-imx

2012-10-15 09:18:14 +08:00

iomux-v1.c

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

iomux-v1.h

ARM: imx: move iomux drivers and headers into mach-imx

2012-10-15 09:18:14 +08:00

iomux-v3.c

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

iomux-v3.h

ARM: imx: move iomux drivers and headers into mach-imx

2012-10-15 09:18:14 +08:00

iram_alloc.c

[media] coda: Fix build due to iram.h rename

2013-01-08 09:44:06 +01:00

irq-common.c

ARM: imx: merge plat-mxc into mach-imx

2012-10-15 10:02:19 +08:00

irq-common.h

ARM: imx: remove header file mach/irqs.h

2012-10-15 10:05:43 +08:00

Kconfig

ARM: i.MX: remove unused ARCH_* configs

2013-04-09 21:07:36 +08:00

mach-apf9328.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

mach-armadillo5x0.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

mach-bug.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

mach-cpuimx27.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

mach-cpuimx35.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

mach-cpuimx51sd.c

ARM: imx: Remove cpufreq driver

2013-04-01 16:17:34 +08:00

mach-eukrea_cpuimx25.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

mach-imx6q.c

ARM: smp_twd: convert to use CLKSRC_OF init

2013-03-11 08:42:08 -05:00

mach-imx27_visstrim_m10.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

mach-imx27ipcam.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

mach-imx27lite.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

mach-imx53.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

mach-kzm_arm11_01.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

mach-mx1ads.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

mach-mx21ads.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

mach-mx25_3ds.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

mach-mx27_3ds.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

mach-mx27ads.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

mach-mx31_3ds.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

mach-mx31ads.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

mach-mx31lilly.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

mach-mx31lite.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

mach-mx31moboard.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

mach-mx35_3ds.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

mach-mx51_babbage.c

ARM: imx: Remove cpufreq driver

2013-04-01 16:17:34 +08:00

mach-mxt_td60.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

mach-pca100.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

mach-pcm037_eet.c

ARM: imx: include common.h rather than mach/common.h

2012-10-15 10:03:10 +08:00

mach-pcm037.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

mach-pcm038.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

mach-pcm043.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

mach-qong.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

mach-scb9328.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

mach-vpr200.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

Makefile

ARM: imx: Remove cpufreq driver

2013-04-01 16:17:34 +08:00

mm-imx1.c

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

mm-imx3.c

Merge remote-tracking branch 'arm-soc/imx/multiplatform' into x

2012-11-16 16:21:27 +01:00

mm-imx5.c

ARM: imx: Remove mx508 support

2013-01-29 14:05:43 +08:00

mm-imx21.c

ARM: imx: call mxc_device_init() in soc specific function

2012-10-15 10:05:43 +08:00

mm-imx25.c

ARM: imx: call mxc_device_init() in soc specific function

2012-10-15 10:05:43 +08:00

mm-imx27.c

ARM: imx: call mxc_device_init() in soc specific function

2012-10-15 10:05:43 +08:00

mmdc.c

ARM: drivers: remove __dev* attributes.

2013-01-03 15:57:04 -08:00

mx1-camera-fiq-ksym.c

ARM: imx: move platform_data definitions

2012-09-14 11:17:21 +02:00

mx1-camera-fiq.S

ARM: imx: move mx1 support to mach-imx

2010-06-30 08:59:44 +02:00

mx1.h

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

mx2x.h

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

mx3x.h

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

mx21.h

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

mx25.h

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

mx27.h

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

mx31.h

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

mx31lilly-db.c

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

mx31lite-db.c

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

mx31moboard-devboard.c

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

mx31moboard-marxbot.c

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

mx31moboard-smartbot.c

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

mx35.h

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

mx51.h

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

mx53.h

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

mxc.h

ARM: imx: Remove mx508 support

2013-01-29 14:05:43 +08:00

pcm037.h

ARM: imx: use machine specific hook for late init

2012-05-08 20:36:16 +08:00

pcm970-baseboard.c

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

platsmp.c

irqchip: gic: Perform the gic_secondary_init() call via CPU notifier

2013-03-26 16:12:02 +00:00

pm-imx3.c

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

pm-imx5.c

ARM: imx: Remove mx508 support

2013-01-29 14:05:43 +08:00

pm-imx6q.c

ARM: mach-imx: move early resume code out of the .data section

2013-03-04 09:20:09 +08:00

pm-imx27.c

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

src.c

ARM: imx: fix sync issue between imx_cpu_die and imx_cpu_kill

2013-03-26 20:25:45 +08:00

ssi-fiq-ksym.c

ARM: imx: merge plat-mxc into mach-imx

2012-10-15 10:02:19 +08:00

ssi-fiq.S

ARM: imx: merge plat-mxc into mach-imx

2012-10-15 10:02:19 +08:00

system.c

ARM: imx: include hardware.h rather than mach/hardware.h

2012-10-15 10:05:43 +08:00

time.c

imx6q cpuidle support for 3.9

2013-02-04 22:24:20 -08:00

tzic.c

ARM: imx: remove header file mach/irqs.h

2012-10-15 10:05:43 +08:00

ulpi.c

ARM: imx: include ulpi.h rather than mach/ulpi.h

2012-10-15 10:03:11 +08:00

ulpi.h

ARM: imx: include ulpi.h rather than mach/ulpi.h

2012-10-15 10:03:11 +08:00