Commit 69f1d1a6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 

* 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (128 commits)
  ARM: S5P64X0: External Interrupt Support
  ARM: EXYNOS4: Enable MFC on Samsung NURI
  ARM: EXYNOS4: Enable MFC on universal_c210
  ARM: S5PV210: Enable MFC on Goni
  ARM: S5P: Add support for MFC device
  ARM: EXYNOS4: Add support FIMD on SMDKC210
  ARM: EXYNOS4: Add platform device and helper functions for FIMD
  ARM: EXYNOS4: Add resource definition for FIMD
  ARM: EXYNOS4: Change devname for FIMD clkdev
  ARM: SAMSUNG: Add IRQ_I2S0 definition
  ARM: SAMSUNG: Add platform device for idma
  ARM: EXYNOS4: Add more registers to be saved and restored for PM
  ARM: EXYNOS4: Add more register addresses of CMU
  ARM: EXYNOS4: Add platform device for dwmci driver
  ARM: EXYNOS4: configure rtc-s3c on NURI
  ARM: EXYNOS4: configure MAX8903 secondary charger on NURI
  ARM: EXYNOS4: configure ADC on NURI
  ARM: EXYNOS4: configure MAX17042 fuel gauge on NURI
  ARM: EXYNOS4: configure regulators and PMIC(MAX8997) on NURI
  ARM: EXYNOS4: Increase NR_IRQS for devices with more IRQs
  ...

Fix up tons of silly conflicts:
 - arch/arm/mach-davinci/include/mach/psc.h
 - arch/arm/mach-exynos4/Kconfig
 - arch/arm/mach-exynos4/mach-smdkc210.c
 - arch/arm/mach-exynos4/pm.c
 - arch/arm/mach-imx/mm-imx1.c
 - arch/arm/mach-imx/mm-imx21.c
 - arch/arm/mach-imx/mm-imx25.c
 - arch/arm/mach-imx/mm-imx27.c
 - arch/arm/mach-imx/mm-imx31.c
 - arch/arm/mach-imx/mm-imx35.c
 - arch/arm/mach-mx5/mm.c
 - arch/arm/mach-s5pv210/mach-goni.c
 - arch/arm/mm/Kconfig
parents 2d86a3f0 1e09939b

arch/arm/Kconfig

+6 −2
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ config ARCH_CLPS711X 


config ARCH_CNS3XXX

	bool "Cavium Networks CNS3XXX family"

	select CPU_V6

	select CPU_V6K

	select GENERIC_CLOCKEVENTS

	select ARM_GIC

	select MIGHT_HAVE_PCI
@@ -396,6 +396,7 @@ config ARCH_MXC 
	select ARCH_REQUIRE_GPIOLIB

	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select GENERIC_IRQ_CHIP

	select HAVE_SCHED_CLOCK

	help

	  Support for Freescale MXC/iMX-based family of processors
@@ -603,7 +604,6 @@ config ARCH_TEGRA 
	select GENERIC_GPIO

	select HAVE_CLK

	select HAVE_SCHED_CLOCK

	select ARCH_HAS_BARRIERS if CACHE_L2X0

	select ARCH_HAS_CPUFREQ

	help

	  This enables support for NVIDIA Tegra based systems (Tegra APX,
@@ -630,6 +630,8 @@ config ARCH_PXA 
	select TICK_ONESHOT

	select PLAT_PXA

	select SPARSE_IRQ

	select AUTO_ZRELADDR

	select MULTI_IRQ_HANDLER

	help

	  Support for Intel/Marvell's PXA2xx/PXA3xx processor line.
@@ -768,6 +770,7 @@ config ARCH_S5PV210 
	bool "Samsung S5PV210/S5PC110"

	select CPU_V7

	select ARCH_SPARSEMEM_ENABLE

	select ARCH_HAS_HOLES_MEMORYMODEL

	select GENERIC_GPIO

	select HAVE_CLK

	select CLKDEV_LOOKUP
@@ -786,6 +789,7 @@ config ARCH_EXYNOS4 
	bool "Samsung EXYNOS4"

	select CPU_V7

	select ARCH_SPARSEMEM_ENABLE

	select ARCH_HAS_HOLES_MEMORYMODEL

	select GENERIC_GPIO

	select HAVE_CLK

	select CLKDEV_LOOKUP

arch/arm/common/gic.c

+0 −6
Original line number Diff line number Diff line
@@ -38,12 +38,6 @@ static DEFINE_SPINLOCK(irq_controller_lock); 
/* Address of GIC 0 CPU interface */

void __iomem *gic_cpu_base_addr __read_mostly;



struct gic_chip_data {

	unsigned int irq_offset;

	void __iomem *dist_base;

	void __iomem *cpu_base;

};



/*

 * Supported arch specific GIC irq extension.

 * Default make them NULL.

arch/arm/configs/mxs_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ CONFIG_BLK_DEV_INTEGRITY=y 
# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_MXS=y

CONFIG_MACH_MX23EVK=y

CONFIG_MACH_MX28EVK=y

CONFIG_MACH_STMP378X_DEVB=y

CONFIG_MACH_TX28=y

# CONFIG_ARM_THUMB is not set

arch/arm/configs/u8500_defconfig

+24 −8
Original line number Diff line number Diff line
@@ -11,12 +11,12 @@ CONFIG_ARCH_U8500=y 
CONFIG_UX500_SOC_DB5500=y

CONFIG_UX500_SOC_DB8500=y

CONFIG_MACH_U8500=y

CONFIG_MACH_SNOWBALL=y

CONFIG_MACH_U5500=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_SMP=y

CONFIG_NR_CPUS=2

CONFIG_HOTPLUG_CPU=y

CONFIG_PREEMPT=y

CONFIG_AEABI=y

CONFIG_CMDLINE="root=/dev/ram0 console=ttyAMA2,115200n8"
@@ -25,8 +25,13 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y 
CONFIG_VFP=y

CONFIG_NEON=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_NETFILTER=y

CONFIG_PHONET=y

CONFIG_PHONET_PIPECTRLR=y

# CONFIG_WIRELESS is not set

CONFIG_CAIF=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
@@ -35,6 +40,13 @@ CONFIG_BLK_DEV_RAM_SIZE=65536 
CONFIG_MISC_DEVICES=y

CONFIG_AB8500_PWM=y

CONFIG_SENSORS_BH1780=y

CONFIG_NETDEVICES=y

CONFIG_SMSC_PHY=y

CONFIG_NET_ETHERNET=y

CONFIG_SMSC911X=y

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set

# CONFIG_WLAN is not set

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

CONFIG_INPUT_EVDEV=y

# CONFIG_KEYBOARD_ATKBD is not set
@@ -49,9 +61,9 @@ CONFIG_INPUT_MISC=y 
CONFIG_INPUT_AB8500_PONKEY=y

# CONFIG_SERIO is not set

CONFIG_VT_HW_CONSOLE_BINDING=y

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_AMBA_PL011=y

CONFIG_SERIAL_AMBA_PL011_CONSOLE=y

# CONFIG_LEGACY_PTYS is not set

CONFIG_HW_RANDOM=y

CONFIG_HW_RANDOM_NOMADIK=y

CONFIG_I2C=y
@@ -64,14 +76,19 @@ CONFIG_GPIO_TC3589X=y 
CONFIG_MFD_STMPE=y

CONFIG_MFD_TC3589X=y

CONFIG_AB8500_CORE=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_AB8500=y

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_USB_MUSB_HDRC=y

CONFIG_USB_GADGET_MUSB_HDRC=y

CONFIG_MUSB_PIO_ONLY=y

CONFIG_USB_GADGET=y

CONFIG_AB8500_USB=y

CONFIG_MMC=y

CONFIG_MMC_CLKGATE=y

CONFIG_MMC_ARMMMCI=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_LM3530=y

CONFIG_LEDS_LP5521=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_AB8500=y
@@ -79,7 +96,6 @@ CONFIG_RTC_DRV_PL031=y 
CONFIG_DMADEVICES=y

CONFIG_STE_DMA40=y

CONFIG_STAGING=y

# CONFIG_STAGING_EXCLUDE_BUILD is not set

CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=y

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y
@@ -91,6 +107,8 @@ CONFIG_TMPFS=y 
CONFIG_TMPFS_POSIX_ACL=y

CONFIG_CONFIGFS_FS=m

# CONFIG_MISC_FILESYSTEMS is not set

CONFIG_NFS_FS=y

CONFIG_ROOT_NFS=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

CONFIG_MAGIC_SYSRQ=y
@@ -99,7 +117,5 @@ CONFIG_DEBUG_KERNEL=y 
# CONFIG_SCHED_DEBUG is not set

# CONFIG_DEBUG_PREEMPT is not set

CONFIG_DEBUG_INFO=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

# CONFIG_FTRACE is not set

CONFIG_DEBUG_USER=y
 
CONFIG_DEBUG_ERRORS=y

arch/arm/include/asm/hardware/gic.h

+6 −0
Original line number Diff line number Diff line
@@ -41,6 +41,12 @@ void gic_secondary_init(unsigned int); 
void gic_cascade_irq(unsigned int gic_nr, unsigned int irq);

void gic_raise_softirq(const struct cpumask *mask, unsigned int irq);

void gic_enable_ppi(unsigned int);



struct gic_chip_data {

	unsigned int irq_offset;

	void __iomem *dist_base;

	void __iomem *cpu_base;

};

#endif



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE