1
0
Fork 0
freescale-linux-fslc/arch/arm/plat-samsung
Linus Torvalds eb3d3ec567 Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into next
Pull ARM updates from Russell King:

 - Major clean-up of the L2 cache support code.  The existing mess was
   becoming rather unmaintainable through all the additions that others
   have done over time.  This turns it into a much nicer structure, and
   implements a few performance improvements as well.

 - Clean up some of the CP15 control register tweaks for alignment
   support, moving some code and data into alignment.c

 - DMA properties for ARM, from Santosh and reviewed by DT people.  This
   adds DT properties to specify bus translations we can't discover
   automatically, and to indicate whether devices are coherent.

 - Hibernation support for ARM

 - Make ftrace work with read-only text in modules

 - add suspend support for PJ4B CPUs

 - rework interrupt masking for undefined instruction handling, which
   allows us to enable interrupts earlier in the handling of these
   exceptions.

 - support for big endian page tables

 - fix stacktrace support to exclude stacktrace functions from the
   trace, and add save_stack_trace_regs() implementation so that kprobes
   can record stack traces.

 - Add support for the Cortex-A17 CPU.

 - Remove last vestiges of ARM710 support.

 - Removal of ARM "meminfo" structure, finally converting us solely to
   memblock to handle the early memory initialisation.

* 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: (142 commits)
  ARM: ensure C page table setup code follows assembly code (part II)
  ARM: ensure C page table setup code follows assembly code
  ARM: consolidate last remaining open-coded alignment trap enable
  ARM: remove global cr_no_alignment
  ARM: remove CPU_CP15 conditional from alignment.c
  ARM: remove unused adjust_cr() function
  ARM: move "noalign" command line option to alignment.c
  ARM: provide common method to clear bits in CPU control register
  ARM: 8025/1: Get rid of meminfo
  ARM: 8060/1: mm: allow sub-architectures to override PCI I/O memory type
  ARM: 8066/1: correction for ARM patch 8031/2
  ARM: 8049/1: ftrace/add save_stack_trace_regs() implementation
  ARM: 8065/1: remove last use of CONFIG_CPU_ARM710
  ARM: 8062/1: Modify ldrt fixup handler to re-execute the userspace instruction
  ARM: 8047/1: rwsem: use asm-generic rwsem implementation
  ARM: l2c: trial at enabling some Cortex-A9 optimisations
  ARM: l2c: add warnings for stuff modifying aux_ctrl register values
  ARM: l2c: print a warning with L2C-310 caches if the cache size is modified
  ARM: l2c: remove old .set_debug method
  ARM: l2c: kill L2X0_AUX_CTRL_MASK before anyone else makes use of this
  ...
2014-06-05 15:57:04 -07:00
..
include/plat ARM: EXYNOS: Migrate Exynos specific macros from plat to mach 2014-05-26 04:04:59 +09:00
adc.c arch/arm/plat-samsung: don't check resource with devm_ioremap_resource 2013-05-18 11:59:33 +02:00
clock-clksrc.c driver-core: remove sysdev.h usage. 2011-12-21 16:26:03 -08:00
clock.c ARM: SAMSUNG: Remove hardware.h inclusion 2014-03-21 04:48:59 +09:00
cpu.c ARM: SAMSUNG: remove unneeded s3c24xx_init_cpu() 2014-02-14 07:17:53 +09:00
dev-backlight.c ARM: SAMSUNG: Initialize PWM backlight enable_gpio field 2013-10-16 09:05:57 +02:00
dev-uart.c ARM: SAMSUNG: Include devs.h in dev-uart.c to prototype devices 2011-03-04 15:46:26 +09:00
devs.c ARM: SAMSUNG: Remove hardware.h inclusion 2014-03-21 04:48:59 +09:00
dma-ops.c ARM: s3c64xx: Add support for DMA using generic amba-pl08x driver 2013-11-24 14:38:24 +00:00
dma.c ARM: SAMSUNG: DMA Cleanup as per sparse 2011-07-16 15:50:19 +09:00
init.c ARM: SoC: late cleanups 2014-04-05 15:46:37 -07:00
Kconfig Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP 2014-04-07 16:36:11 -07:00
Makefile ARM: EXYNOS: Enable multi-platform build support 2014-05-31 02:43:51 +09:00
platformdata.c ARM: SAMSUNG: remove all uses of clk_type member in sdhci platform data 2012-04-21 08:24:56 -07:00
pm-check.c ARM: SAMSUNG: Move s3c_pm_check_* prototypes to plat/pm-common.h 2014-03-21 04:09:26 +09:00
pm-common.c ARM: SAMSUNG: Move common save/restore helpers to separate file 2014-03-21 04:09:25 +09:00
pm-debug.c ARM: SAMSUNG: Move Samsung PM debug code into separate file 2014-03-21 04:09:16 +09:00
pm-gpio.c ARM: SAMSUNG: Remove Exynos specific code from devs, s5p-pm-irq and pm-gpio.c 2014-02-14 10:40:15 +09:00
pm.c Samsung PM related 2nd updates for v3.15 2014-03-29 02:02:56 +01:00
s3c-dma-ops.c ASoC: Samsung: Do not queue cyclic buffers multiple times 2013-08-29 17:31:02 +01:00
s5p-clock.c ARM: SAMSUNG: Update default rate for xusbxti clock 2012-07-13 15:34:30 +09:00
s5p-dev-mfc.c of/fdt: update of_get_flat_dt_prop in prep for libfdt 2014-04-30 00:59:15 -05:00
s5p-dev-uart.c ARM: SAMSUNG: Remove hardware.h inclusion 2014-03-21 04:48:59 +09:00
s5p-irq-eint.c ARM: SAMSUNG: if detected device tree skip irq init for S5P 2013-12-02 07:17:57 +09:00
s5p-irq-gpioint.c arm: Move chained_irq_(enter|exit) to a generic file 2013-03-26 16:11:43 +00:00
s5p-irq-pm.c ARM: SAMSUNG: Remove Exynos specific code from devs, s5p-pm-irq and pm-gpio.c 2014-02-14 10:40:15 +09:00
s5p-irq.c ARM: SAMSUNG: Remove remaining uses of plat/regs-timer.h header 2013-08-12 21:53:24 +02:00
s5p-pm.c ARM: SAMSUNG: move pm part for common s5p into plat-samsung 2012-05-13 07:01:34 +09:00
s5p-sleep.S ARM: l2c: exynos: convert to common l2c310 early resume functionality 2014-05-30 00:49:12 +01:00
setup-camif.c ARM: S3C[24|64]xx: move includes back under <mach/> scope 2014-01-14 15:24:06 +01:00
wakeup-mask.c driver-core: remove sysdev.h usage. 2011-12-21 16:26:03 -08:00
watchdog-reset.c ARM: SAMSUNG: Add watchdog reset driver 2013-06-19 03:13:16 +09:00