system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-29 07:50:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
linux/arch/arm/mach-msm
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 ARM: msm: Remove unused cpu.h header file 2013-03-05 12:05:43 -08:00
board-dt-8660.c Initial irqchip init infrastructure and GIC and VIC clean-ups 2013-01-14 19:55:03 -08:00
board-dt-8960.c Initial irqchip init infrastructure and GIC and VIC clean-ups 2013-01-14 19:55:03 -08:00
board-halibut.c gpio: Make gpio-msm-v1 into a platform driver 2013-03-05 12:05:43 -08:00
board-mahimahi.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-msm7x30.c gpio: Make gpio-msm-v1 into a platform driver 2013-03-05 12:05:43 -08:00
board-qsd8x50.c gpio: Make gpio-msm-v1 into a platform driver 2013-03-05 12:05:43 -08:00
board-sapphire.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-trout-gpio.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
board-trout-mmc.c ARM: msm: move platform_data definitions 2012-09-14 11:17:35 +02:00
board-trout-panel.c ARM: msm: move platform_data definitions 2012-09-14 11:17:35 +02:00
board-trout.c gpio: Make gpio-msm-v1 into a platform driver 2013-03-05 12:05:43 -08:00
board-trout.h Add GPIO support for HTC Dream. 2010-06-15 13:19:43 -07:00
clock-7x30.h msm: clock: Migrate to clkdev 2011-02-28 12:40:17 -08:00
clock-debug.c msm: clock: Remove references to clk_ops_pcom 2011-02-28 12:40:05 -08:00
clock-pcom.c ARM: msm: clock-pcom: Mark functions static 2012-09-13 10:45:02 -07:00
clock-pcom.h msm: clock: Migrate to clkdev 2011-02-28 12:40:17 -08:00
clock.c PM QoS: Move and rename the implementation files 2011-08-25 15:35:03 +02:00
clock.h msm: clock: Migrate to clkdev 2011-02-28 12:40:17 -08:00
common.h ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
core.h ARM: SoC: convert MSM to SMP operations 2012-09-14 11:14:57 +02:00
devices-iommu.c iommu/msm: Fix compile error in mach-msm/devices-iommu.c 2011-12-06 11:17:34 +01:00
devices-msm7x00.c gpio: Make gpio-msm-v1 into a platform driver 2013-03-05 12:05:43 -08:00
devices-msm7x30.c gpio: Make gpio-msm-v1 into a platform driver 2013-03-05 12:05:43 -08:00
devices-qsd8x50.c gpio: Make gpio-msm-v1 into a platform driver 2013-03-05 12:05:43 -08:00
devices.h gpio: Make gpio-msm-v1 into a platform driver 2013-03-05 12:05:43 -08:00
dma.c ARM: msm: Move dma.h #defines that are private to dma.c 2013-03-05 12:05:42 -08:00
gpiomux-8x50.c msm: 8x50: Add initial support for SDCC 2011-01-21 16:58:02 -08:00
gpiomux-8x60.c msm: add gpiomux api for gpio multiplex & configuration. 2010-10-06 09:01:15 -07:00
gpiomux-v1.c msm: add gpiomux api for gpio multiplex & configuration. 2010-10-06 09:01:15 -07:00
gpiomux-v1.h msm: add gpiomux api for gpio multiplex & configuration. 2010-10-06 09:01:15 -07:00
gpiomux-v2.c msm: add gpiomux api for gpio multiplex & configuration. 2010-10-06 09:01:15 -07:00
gpiomux-v2.h msm: add gpiomux api for gpio multiplex & configuration. 2010-10-06 09:01:15 -07:00
gpiomux.c msm: add gpiomux api for gpio multiplex & configuration. 2010-10-06 09:01:15 -07:00
gpiomux.h msm: gpiomux: Move public API to public header 2011-08-01 04:58:00 -07:00
headsmp.S ARM: msm: Add missing ENDPROC to headsmp.S 2012-01-16 08:36:02 -06:00
hotplug.c ARM: msm: Move core.h contents into common.h 2012-09-22 00:16:25 -07:00
io.c ARM: soc: board specific updates 2012-10-01 18:48:30 -07:00
irq-vic.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
irq.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
Kconfig ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
last_radio_log.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
Makefile These patches migrate both the 8660 and 8960 targets on msm to be 2012-09-16 18:03:50 -07:00
Makefile.boot ARM: dtb: move all dtb targets to common Makefile 2012-09-20 22:58:17 -07:00
platsmp.c irqchip: gic: Perform the gic_secondary_init() call via CPU notifier 2013-03-26 16:12:02 +00:00
proc_comm.c ARM: drivers: remove __dev* attributes. 2013-01-03 15:57:04 -08:00
proc_comm.h ARM: msm: proc_comm_boot_wait should not be __init 2013-02-11 17:42:28 -08:00
scm-boot.c msm: scm-boot: Support for setting cold/warm boot addresses 2011-01-07 15:54:43 -08:00
scm-boot.h msm: Use explicit GPLv2 licenses 2011-02-28 12:40:05 -08:00
scm.c ARM: msm: fix compilation flags for MSM_SCM (part 2) 2012-05-11 11:08:37 -07:00
scm.h msm: Use explicit GPLv2 licenses 2011-02-28 12:40:05 -08:00
sirc.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
smd.c ARM: drivers: remove __dev* attributes. 2013-01-03 15:57:04 -08:00
smd_debug.c ARM: msm: use machine specific hook for late init 2012-05-08 20:36:17 +08:00
smd_private.h arm: msm: smd: msm7x30 a2m clean up 2010-05-12 09:19:04 -07:00
timer.c ARM: msm: Stop counting before reprogramming clockevent 2013-03-22 10:45:39 -07:00
vreg.c ARM: msm: vreg is a module and so needs module.h 2012-01-06 11:07:57 -08:00