Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1c28b75 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm 

Pull ARM updates from Russell King:
 "Changes included in this pull request:

   - revert pxa2xx-flash back to using ioremap_cached() and switch
     memremap() to use arch_memremap_wb()

   - remove pci=firmware command line argument handling

   - remove unnecessary arm_dma_set_mask() implementation, the generic
     implementation will do for ARM

   - removal of the ARM kallsyms "hack" to work around mode switching
     veneers and vectors located below PAGE_OFFSET

   - tidy up build system output a little

   - add L2 cache power management DT bindings

   - remove duplicated local_irq_disable() in reboot paths

   - handle AMBA primecell devices better at registration time with PM
     domains (needed for Samsung SoCs)

   - ARM specific preparation to support Keystone II kexec"

* 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 8567/1: cache-uniphier: activate ways for secondary CPUs
  ARM: 8570/2: Documentation: devicetree: Add PL310 PM bindings
  ARM: 8569/1: pl2x0: Add OF control of cache power management
  ARM: 8568/1: reboot: remove duplicated local_irq_disable()
  ARM: 8566/1: drivers: amba: properly handle devices with power domains
  ARM: provide arm_has_idmap_alias() helper
  ARM: kexec: remove 512MB restriction on kexec crashdump
  ARM: provide improved virt_to_idmap() functionality
  ARM: kexec: fix crashkernel= handling
  ARM: 8557/1: specify install, zinstall, and uinstall as PHONY targets
  ARM: 8562/1: suppress "include/generated/mach-types.h is up to date."
  ARM: 8553/1: kallsyms: remove --page-offset command line option
  ARM: 8552/1: kallsyms: remove special lower address limit for CONFIG_ARM
  ARM: 8555/1: kallsyms: ignore ARM mode switching veneers
  ARM: 8548/1: dma-mapping: remove arm_dma_set_mask()
  ARM: 8554/1: kernel: pci: remove pci=firmware command line parameter handling
  ARM: memremap: implement arch_memremap_wb()
  memremap: add arch specific hook for MEMREMAP_WB mappings
  mtd: pxa2xx-flash: switch back from memremap to ioremap_cached
  ARM: reintroduce ioremap_cached() for creating cached I/O mappings
parents a05a70db 5632a9fb

Documentation/devicetree/bindings/arm/l2c2x0.txt

+6 −0
Original line number Diff line number Diff line
@@ -84,6 +84,12 @@ Optional properties: 
- prefetch-instr : Instruction prefetch. Value: <0> (forcibly disable),

  <1> (forcibly enable), property absent (retain settings set by

  firmware)

- arm,dynamic-clock-gating : L2 dynamic clock gating. Value: <0> (forcibly

  disable), <1> (forcibly enable), property absent (OS specific behavior,

  preferrably retain firmware settings)

- arm,standby-mode: L2 standby mode enable. Value <0> (forcibly disable),

  <1> (forcibly enable), property absent (OS specific behavior,

  preferrably retain firmware settings)



Example:

Documentation/kdump/kdump.txt

+3 −10
Original line number Diff line number Diff line
@@ -263,12 +263,6 @@ The syntax is: 
    crashkernel=<range1>:<size1>[,<range2>:<size2>,...][@offset]

    range=start-[end]



Please note, on arm, the offset is required.

    crashkernel=<range1>:<size1>[,<range2>:<size2>,...]@offset

    range=start-[end]



    'start' is inclusive and 'end' is exclusive.



For example:



    crashkernel=512M-2G:64M,2G-:128M
@@ -307,10 +301,9 @@ Boot into System Kernel 
   on the memory consumption of the kdump system. In general this is not

   dependent on the memory size of the production system.



   On arm, use "crashkernel=Y@X". Note that the start address of the kernel

   will be aligned to 128MiB (0x08000000), so if the start address is not then

   any space below the alignment point may be overwritten by the dump-capture kernel,

   which means it is possible that the vmcore is not that precise as expected.

   On arm, the use of "crashkernel=Y@X" is no longer necessary; the

   kernel will automatically locate the crash kernel image within the

   first 512MB of RAM if X is not given.





Load the Dump-capture Kernel

Documentation/kernel-parameters.txt

+0 −5
Original line number Diff line number Diff line
@@ -2959,11 +2959,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
				for broken drivers that don't call it.

		skip_isa_align	[X86] do not align io start addr, so can

				handle more pci cards

		firmware	[ARM] Do not re-enumerate the bus but instead

				just use the configuration from the

				bootloader. This is currently used on

				IXP2000 systems where the bus has to be

				configured a certain way for adjunct CPUs.

		noearly		[X86] Don't do any early type 1 scanning.

				This might help on some broken boards which

				machine check when some devices' config space

arch/arm/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ $(obj)/bootpImage: $(obj)/bootp/bootp FORCE 
	$(call if_changed,objcopy)

	@$(kecho) '  Kernel: $@ is ready'



PHONY += initrd

PHONY += initrd install zinstall uinstall

initrd:

	@test "$(INITRD_PHYS)" != "" || \

	(echo This machine does not support INITRD; exit -1)

arch/arm/include/asm/dma-mapping.h

+0 −2
Original line number Diff line number Diff line
@@ -162,8 +162,6 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size) 


static inline void dma_mark_clean(void *addr, size_t size) { }



extern int arm_dma_set_mask(struct device *dev, u64 dma_mask);



/**

 * arm_dma_alloc - allocate consistent memory for DMA

 * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices