Commit 3e965b17 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'next/fixes' into next/cleanup 

Conflicts:
	arch/arm/mach-mxs/include/mach/gpio.h
	arch/arm/plat-mxc/include/mach/gpio.h
	drivers/video/omap/lcd_apollon.c
	drivers/video/omap/lcd_ldp.c
	drivers/video/omap/lcd_overo.c
parents 034ee299 5839fec9

arch/arm/Kconfig

+38 −10
Original line number Diff line number Diff line
@@ -196,7 +196,8 @@ config VECTORS_BASE 
	  The base address of exception vectors.



config ARM_PATCH_PHYS_VIRT

	bool "Patch physical to virtual translations at runtime"

	bool "Patch physical to virtual translations at runtime" if EMBEDDED

	default y

	depends on !XIP_KERNEL && MMU

	depends on !ARCH_REALVIEW || !SPARSEMEM

	help
@@ -205,16 +206,25 @@ config ARM_PATCH_PHYS_VIRT 
	  kernel in system memory.



	  This can only be used with non-XIP MMU kernels where the base

	  of physical memory is at a 16MB boundary, or theoretically 64K

	  for the MSM machine class.

	  of physical memory is at a 16MB boundary.



config ARM_PATCH_PHYS_VIRT_16BIT

	def_bool y

	depends on ARM_PATCH_PHYS_VIRT && ARCH_MSM

	  Only disable this option if you know that you do not require

	  this feature (eg, building a kernel for a single machine) and

	  you need to shrink the kernel to the minimal size.



config NEED_MACH_MEMORY_H

	bool

	help

	  This option extends the physical to virtual translation patching

	  to allow physical memory down to a theoretical minimum of 64K

	  boundaries.

	  Select this when mach/memory.h is required to provide special

	  definitions for this platform.  The need for mach/memory.h should

	  be avoided when possible.



config PHYS_OFFSET

	hex "Physical address of main memory"

	depends on !ARM_PATCH_PHYS_VIRT && !NEED_MACH_MEMORY_H

	help

	  Please provide the physical address corresponding to the

	  location of main memory in your system.



source "init/Kconfig"
@@ -247,6 +257,7 @@ config ARCH_INTEGRATOR 
	select GENERIC_CLOCKEVENTS

	select PLAT_VERSATILE

	select PLAT_VERSATILE_FPGA_IRQ

	select NEED_MACH_MEMORY_H

	help

	  Support for ARM's Integrator platform.
@@ -262,6 +273,7 @@ config ARCH_REALVIEW 
	select PLAT_VERSATILE_CLCD

	select ARM_TIMER_SP804

	select GPIO_PL061 if GPIOLIB

	select NEED_MACH_MEMORY_H

	help

	  This enables support for ARM Ltd RealView boards.
@@ -302,7 +314,6 @@ config ARCH_AT91 
	select ARCH_REQUIRE_GPIOLIB

	select HAVE_CLK

	select CLKDEV_LOOKUP

	select ARM_PATCH_PHYS_VIRT if MMU

	help

	  This enables support for systems based on the Atmel AT91RM9200,

	  AT91SAM9 and AT91CAP9 processors.
@@ -323,6 +334,7 @@ config ARCH_CLPS711X 
	bool "Cirrus Logic CLPS711x/EP721x-based"

	select CPU_ARM720T

	select ARCH_USES_GETTIMEOFFSET

	select NEED_MACH_MEMORY_H

	help

	  Support for Cirrus Logic 711x/721x based boards.
@@ -363,6 +375,7 @@ config ARCH_EBSA110 
	select ISA

	select NO_IOPORT

	select ARCH_USES_GETTIMEOFFSET

	select NEED_MACH_MEMORY_H

	help

	  This is an evaluation board for the StrongARM processor available

	  from Digital. It has limited hardware on-board, including an
@@ -378,6 +391,7 @@ config ARCH_EP93XX 
	select ARCH_REQUIRE_GPIOLIB

	select ARCH_HAS_HOLES_MEMORYMODEL

	select ARCH_USES_GETTIMEOFFSET

	select NEED_MEMORY_H

	help

	  This enables support for the Cirrus EP93xx series of CPUs.
@@ -386,6 +400,7 @@ config ARCH_FOOTBRIDGE 
	select CPU_SA110

	select FOOTBRIDGE

	select GENERIC_CLOCKEVENTS

	select NEED_MACH_MEMORY_H

	help

	  Support for systems based on the DC21285 companion chip

	  ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
@@ -435,6 +450,7 @@ config ARCH_IOP13XX 
	select PCI

	select ARCH_SUPPORTS_MSI

	select VMSPLIT_1G

	select NEED_MACH_MEMORY_H

	help

	  Support for Intel's IOP13XX (XScale) family of processors.
@@ -465,6 +481,7 @@ config ARCH_IXP23XX 
	select CPU_XSC3

 	select PCI

	select ARCH_USES_GETTIMEOFFSET

	select NEED_MACH_MEMORY_H

	help

	  Support for Intel's IXP23xx (XScale) family of processors.
@@ -474,6 +491,7 @@ config ARCH_IXP2000 
	select CPU_XSCALE

	select PCI

	select ARCH_USES_GETTIMEOFFSET

	select NEED_MACH_MEMORY_H

	help

	  Support for Intel's IXP2400/2800 (XScale) family of processors.
@@ -567,6 +585,7 @@ config ARCH_KS8695 
	select CPU_ARM922T

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_USES_GETTIMEOFFSET

	select NEED_MACH_MEMORY_H

	help

	  Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based

	  System-on-Chip devices.
@@ -658,6 +677,7 @@ config ARCH_SHMOBILE 
	select SPARSE_IRQ

	select MULTI_IRQ_HANDLER

	select PM_GENERIC_DOMAINS if PM

	select NEED_MACH_MEMORY_H

	help

	  Support for Renesas's SH-Mobile and R-Mobile ARM platforms.
@@ -672,6 +692,7 @@ config ARCH_RPC 
	select NO_IOPORT

	select ARCH_SPARSEMEM_ENABLE

	select ARCH_USES_GETTIMEOFFSET

	select NEED_MACH_MEMORY_H

	help

	  On the Acorn Risc-PC, Linux can support the internal IDE disk and

	  CD-ROM interface, serial and parallel port, and the floppy drive.
@@ -690,6 +711,7 @@ config ARCH_SA1100 
	select HAVE_SCHED_CLOCK

	select TICK_ONESHOT

	select ARCH_REQUIRE_GPIOLIB

	select NEED_MACH_MEMORY_H

	help

	  Support for StrongARM 11x0 based boards.
@@ -782,6 +804,7 @@ config ARCH_S5PV210 
	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C_RTC if RTC_CLASS

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select NEED_MACH_MEMORY_H

	help

	  Samsung S5PV210/S5PC110 series based systems
@@ -798,6 +821,7 @@ config ARCH_EXYNOS4 
	select HAVE_S3C_RTC if RTC_CLASS

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select NEED_MACH_MEMORY_H

	help

	  Samsung EXYNOS4 series based systems
@@ -809,6 +833,7 @@ config ARCH_SHARK 
	select ZONE_DMA

	select PCI

	select ARCH_USES_GETTIMEOFFSET

	select NEED_MACH_MEMORY_H

	help

	  Support for the StrongARM based Digital DNARD machine, also known

	  as "Shark" (<http://www.shark-linux.de/shark.html>).
@@ -837,6 +862,8 @@ config ARCH_U300 
	select CLKDEV_LOOKUP

	select HAVE_MACH_CLKDEV

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	select NEED_MACH_MEMORY_H

	help

	  Support for ST-Ericsson U300 series mobile platforms.
@@ -1987,6 +2014,7 @@ config CPU_FREQ_PXA 
	bool

	depends on CPU_FREQ && ARCH_PXA && PXA25x

	default y

	select CPU_FREQ_TABLE

	select CPU_FREQ_DEFAULT_GOV_USERSPACE



config CPU_FREQ_S3C

arch/arm/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -128,6 +128,9 @@ textofs-$(CONFIG_PM_H1940) := 0x00108000 
ifeq ($(CONFIG_ARCH_SA1100),y)

textofs-$(CONFIG_SA1111) := 0x00208000

endif

textofs-$(CONFIG_ARCH_MSM7X30) := 0x00208000

textofs-$(CONFIG_ARCH_MSM8X60) := 0x00208000

textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000



# Machine directory name.  This list is sorted alphanumerically

# by CONFIG_* macro name.

arch/arm/boot/dts/tegra-harmony.dts

+1 −0
Original line number Diff line number Diff line
@@ -66,5 +66,6 @@ sdhci@c8000600 { 
		cd-gpios = <&gpio 58 0>; /* gpio PH2 */

		wp-gpios = <&gpio 59 0>; /* gpio PH3 */

		power-gpios = <&gpio 70 0>; /* gpio PI6 */

		support-8bit;

	};

};

arch/arm/boot/dts/tegra-seaboard.dts

+4 −0
Original line number Diff line number Diff line
@@ -25,4 +25,8 @@ sdhci@c8000400 { 
		wp-gpios = <&gpio 57 0>; /* gpio PH1 */

		power-gpios = <&gpio 70 0>; /* gpio PI6 */

	};



	sdhci@c8000600 {

		support-8bit;

	};

};

arch/arm/common/scoop.c

+1 −1
Original line number Diff line number Diff line
@@ -12,11 +12,11 @@ 
 */



#include <linux/device.h>

#include <linux/gpio.h>

#include <linux/string.h>

#include <linux/slab.h>

#include <linux/platform_device.h>

#include <linux/io.h>

#include <asm/gpio.h>

#include <asm/hardware/scoop.h>



/* PCMCIA to Scoop linkage