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

Commit 152831be authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm: (30 commits)
  ARM: Update mach-types
  ARM: Partially revert "Auto calculate ZRELADDR and provide option for exceptions"
  ARM: Ensure PTE modifications via dma_alloc_coherent are visible
  ARM: 6359/1: ep93xx: move clock initialization earlier
  Revert "[ARM] pxa: remove now unnecessary dma_needs_bounce()"
  ARM: 6352/1: perf: fix event validation
  ARM: 6344/1: Mark CPU_32v6K as depended on CPU_V7
  ARM: 6343/1: wire up fanotify and prlimit64 syscalls on ARM
  ARM: 6330/1: perf: reword comments relating to perf_event_do_pending
  ARM: pxa168fb: fix section mismatch
  ARM: pxa: Make id const in pwm_probe()
  ARM: pxa: fix CI_HSYNC and CI_VSYNC MFP defines for pxa300
  ARM: pxa: remove __init from cpufreq_driver->init()
  ARM: imx: set cache line size to 64 bytes for i.MX5
  mx5/clock: fix clear bit fields issue in _clk_ccgr_disable function
  mxc/tzic: add base address when accessing TZIC registers
  ARM: mach-shmobile: ap4evb: fix write protect for SDHI1
  ARM: mach-shmobile: ap4evb: modify FSI2 ID
  ARM: mach-shmobile: do not enable the PLLC2 clock on init
  ARM: mach-shmobile: Clock framework comment fix
  ...
parents a73f8844 a14d0404

arch/arm/Kconfig

+0 −91
Original line number Diff line number Diff line
@@ -1576,97 +1576,6 @@ config AUTO_ZRELADDR 
	  0xf8000000. This assumes the zImage being placed in the first 128MB

	  from start of memory.



config ZRELADDR

	hex "Physical address of the decompressed kernel image"

	depends on !AUTO_ZRELADDR

	default 0x00008000 if ARCH_BCMRING ||\

		ARCH_CNS3XXX ||\

		ARCH_DOVE ||\

		ARCH_EBSA110 ||\

		ARCH_FOOTBRIDGE ||\

		ARCH_INTEGRATOR ||\

		ARCH_IOP13XX ||\

		ARCH_IOP33X ||\

		ARCH_IXP2000 ||\

		ARCH_IXP23XX ||\

		ARCH_IXP4XX ||\

		ARCH_KIRKWOOD ||\

		ARCH_KS8695 ||\

		ARCH_LOKI ||\

		ARCH_MMP ||\

		ARCH_MV78XX0 ||\

		ARCH_NOMADIK ||\

		ARCH_NUC93X ||\

		ARCH_NS9XXX ||\

		ARCH_ORION5X ||\

		ARCH_SPEAR3XX ||\

		ARCH_SPEAR6XX ||\

		ARCH_TEGRA ||\

		ARCH_U8500 ||\

		ARCH_VERSATILE ||\

		ARCH_W90X900

	default 0x08008000 if ARCH_MX1 ||\

		ARCH_SHARK

	default 0x10008000 if ARCH_MSM ||\

		ARCH_OMAP1 ||\

		ARCH_RPC

	default 0x20008000 if ARCH_S5P6440 ||\

		ARCH_S5P6442 ||\

		ARCH_S5PC100 ||\

		ARCH_S5PV210

	default 0x30008000 if ARCH_S3C2410 ||\

		ARCH_S3C2400 ||\

		ARCH_S3C2412 ||\

		ARCH_S3C2416 ||\

		ARCH_S3C2440 ||\

		ARCH_S3C2443

	default 0x40008000 if ARCH_STMP378X ||\

		ARCH_STMP37XX ||\

		ARCH_SH7372 ||\

		ARCH_SH7377 ||\

		ARCH_S5PV310

	default 0x50008000 if ARCH_S3C64XX ||\

		ARCH_SH7367

	default 0x60008000 if ARCH_VEXPRESS

	default 0x80008000 if ARCH_MX25 ||\

		ARCH_MX3 ||\

		ARCH_NETX ||\

		ARCH_OMAP2PLUS ||\

		ARCH_PNX4008

	default 0x90008000 if ARCH_MX5 ||\

		ARCH_MX91231

	default 0xa0008000 if ARCH_IOP32X ||\

		ARCH_PXA ||\

		MACH_MX27

	default 0xc0008000 if ARCH_LH7A40X ||\

		MACH_MX21

	default 0xf0008000 if ARCH_AAEC2000 ||\

		ARCH_L7200

	default 0xc0028000 if ARCH_CLPS711X

	default 0x70008000 if ARCH_AT91 && (ARCH_AT91CAP9 || ARCH_AT91SAM9G45)

	default 0x20008000 if ARCH_AT91 && !(ARCH_AT91CAP9 || ARCH_AT91SAM9G45)

	default 0xc0008000 if ARCH_DAVINCI && ARCH_DAVINCI_DA8XX

	default 0x80008000 if ARCH_DAVINCI && !ARCH_DAVINCI_DA8XX

	default 0x00008000 if ARCH_EP93XX && EP93XX_SDCE3_SYNC_PHYS_OFFSET

	default 0xc0008000 if ARCH_EP93XX && EP93XX_SDCE0_PHYS_OFFSET

	default 0xd0008000 if ARCH_EP93XX && EP93XX_SDCE1_PHYS_OFFSET

	default 0xe0008000 if ARCH_EP93XX && EP93XX_SDCE2_PHYS_OFFSET

	default 0xf0008000 if ARCH_EP93XX && EP93XX_SDCE3_ASYNC_PHYS_OFFSET

	default 0x00008000 if ARCH_GEMINI && GEMINI_MEM_SWAP

	default 0x10008000 if ARCH_GEMINI && !GEMINI_MEM_SWAP

	default 0x70008000 if ARCH_REALVIEW && REALVIEW_HIGH_PHYS_OFFSET

	default 0x00008000 if ARCH_REALVIEW && !REALVIEW_HIGH_PHYS_OFFSET

	default 0xc0208000 if ARCH_SA1100 && SA1111

	default 0xc0008000 if ARCH_SA1100 && !SA1111

	default 0x30108000 if ARCH_S3C2410 && PM_H1940

	default 0x28E08000 if ARCH_U300 && MACH_U300_SINGLE_RAM

	default 0x48008000 if ARCH_U300 && !MACH_U300_SINGLE_RAM

	help

	  ZRELADDR is the physical address where the decompressed kernel

	  image will be placed. ZRELADDR has to be specified when the

	  assumption of AUTO_ZRELADDR is not valid, or when ZBOOT_ROM is

	  selected.



endmenu



menu "CPU Power Management"

arch/arm/boot/Makefile

+5 −3
Original line number Diff line number Diff line
@@ -14,16 +14,18 @@ 
MKIMAGE         := $(srctree)/scripts/mkuboot.sh



ifneq ($(MACHINE),)

-include $(srctree)/$(MACHINE)/Makefile.boot

include $(srctree)/$(MACHINE)/Makefile.boot

endif



# Note: the following conditions must always be true:

#   ZRELADDR == virt_to_phys(PAGE_OFFSET + TEXT_OFFSET)

#   PARAMS_PHYS must be within 4MB of ZRELADDR

#   INITRD_PHYS must be in RAM

ZRELADDR    := $(zreladdr-y)

PARAMS_PHYS := $(params_phys-y)

INITRD_PHYS := $(initrd_phys-y)



export INITRD_PHYS PARAMS_PHYS

export ZRELADDR INITRD_PHYS PARAMS_PHYS



targets := Image zImage xipImage bootpImage uImage
@@ -65,7 +67,7 @@ quiet_cmd_uimage = UIMAGE $@ 
ifeq ($(CONFIG_ZBOOT_ROM),y)

$(obj)/uImage: LOADADDR=$(CONFIG_ZBOOT_ROM_TEXT)

else

$(obj)/uImage: LOADADDR=$(CONFIG_ZRELADDR)

$(obj)/uImage: LOADADDR=$(ZRELADDR)

endif



ifeq ($(CONFIG_THUMB2_KERNEL),y)

arch/arm/boot/compressed/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -79,6 +79,10 @@ endif 
EXTRA_CFLAGS  := -fpic -fno-builtin

EXTRA_AFLAGS  := -Wa,-march=all



# Supply ZRELADDR to the decompressor via a linker symbol.

ifneq ($(CONFIG_AUTO_ZRELADDR),y)

LDFLAGS_vmlinux := --defsym zreladdr=$(ZRELADDR)

endif

ifeq ($(CONFIG_CPU_ENDIAN_BE8),y)

LDFLAGS_vmlinux += --be8

endif

arch/arm/boot/compressed/head.S

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ not_angel: 
		and	r4, pc, #0xf8000000

		add	r4, r4, #TEXT_OFFSET

#else

		ldr	r4, =CONFIG_ZRELADDR

		ldr	r4, =zreladdr

#endif

		subs	r0, r0, r1		@ calculate the delta offset

arch/arm/common/it8152.c

+8 −0
Original line number Diff line number Diff line
@@ -263,6 +263,14 @@ static int it8152_pci_platform_notify_remove(struct device *dev) 
	return 0;

}



int dma_needs_bounce(struct device *dev, dma_addr_t dma_addr, size_t size)

{

	dev_dbg(dev, "%s: dma_addr %08x, size %08x\n",

		__func__, dma_addr, size);

	return (dev->bus == &pci_bus_type) &&

		((dma_addr + size - PHYS_OFFSET) >= SZ_64M);

}



int __init it8152_pci_setup(int nr, struct pci_sys_data *sys)

{

	it8152_io.start = IT8152_IO_BASE + 0x12000;