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

Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc 

* 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc: (125 commits)
  ARM: mach-mxs: fix machines' initializers order
  mmc: mxcmmc: explicitly includes mach/hardware.h
  arm/imx: explicitly includes mach/hardware.h in pm-imx27.c
  arm/imx: remove mx27_setup_weimcs() from mx27.h
  arm/imx: explicitly includes mach/hardware.h in mach-kzm_arm11_01.c
  arm/imx: remove mx31_setup_weimcs() from mx31.h
  ARM: tegra: devices.c should include devices.h
  ARM: tegra: cpu-tegra: unexport two functions
  ARM: tegra: cpu-tegra: sparse type fix
  ARM: tegra: dma: staticify some tables and functions
  ARM: tegra: tegra2_clocks: don't export some tables
  ARM: tegra: tegra_powergate_is_powered should be static
  ARM: tegra: tegra_rtc_read_ms should be static
  ARM: tegra: tegra_init_cache should be static
  ARM: tegra: pcie: 0 -> NULL changes
  ARM: tegra: pcie: include board.h
  ARM: tegra: pcie: don't cast __iomem pointers
  ARM: tegra: tegra2_clocks: 0 -> NULL changes
  ARM: tegra: tegra2_clocks: don't cast __iomem pointers
  ARM: tegra: timer: don't cast __iomem pointers
  ...

Fix up trivial conflicts in
  arch/arm/mach-omap2/Makefile,
  arch/arm/mach-u300/{Makefile.boot,core.c}
  arch/arm/plat-{mxc,omap}/devices.c
parents 68e24ba7 3e965b17

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -861,6 +861,7 @@ config ARCH_U300 
	select HAVE_SCHED_CLOCK

	select HAVE_TCM

	select ARM_AMBA

	select ARM_PATCH_PHYS_VIRT

	select ARM_VIC

	select GENERIC_CLOCKEVENTS

	select CLKDEV_LOOKUP

arch/arm/configs/mx3_defconfig

+33 −13
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ CONFIG_SYSVIPC=y 
CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_SYSFS_DEPRECATED_V2=y

CONFIG_EXPERT=y

CONFIG_SLAB=y

CONFIG_MODULES=y
@@ -13,20 +12,21 @@ CONFIG_MODVERSIONS=y 
# CONFIG_BLK_DEV_BSG is not set

CONFIG_ARCH_MXC=y

CONFIG_MACH_MX31ADS_WM1133_EV1=y

CONFIG_MACH_MX31LILLY=y

CONFIG_MACH_MX31LITE=y

CONFIG_MACH_PCM037=y

CONFIG_MACH_PCM037_EET=y

CONFIG_MACH_MX31LITE=y

CONFIG_MACH_MX31_3DS=y

CONFIG_MACH_MX31MOBOARD=y

CONFIG_MACH_MX31LILLY=y

CONFIG_MACH_QONG=y

CONFIG_MACH_PCM043=y

CONFIG_MACH_ARMADILLO5X0=y

CONFIG_MACH_MX35_3DS=y

CONFIG_MACH_KZM_ARM11_01=y

CONFIG_MACH_PCM043=y

CONFIG_MACH_MX35_3DS=y

CONFIG_MACH_EUKREA_CPUIMX35=y

CONFIG_MXC_IRQ_PRIOR=y

CONFIG_MXC_PWM=y

CONFIG_ARM_ERRATA_411920=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_PREEMPT=y
@@ -35,7 +35,6 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 
CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="noinitrd console=ttymxc0,115200 root=/dev/mtdblock2 rw ip=off"

CONFIG_VFP=y

CONFIG_PM=y

CONFIG_PM_DEBUG=y

CONFIG_NET=y

CONFIG_PACKET=y
@@ -52,7 +51,6 @@ CONFIG_IP_PNP_DHCP=y 
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_FW_LOADER=m

CONFIG_MTD=y

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y
@@ -62,24 +60,27 @@ CONFIG_MTD_NAND=y 
CONFIG_MTD_NAND_MXC=y

CONFIG_MTD_UBI=y

# CONFIG_BLK_DEV is not set

CONFIG_MISC_DEVICES=y

CONFIG_EEPROM_AT24=y

CONFIG_NETDEVICES=y

CONFIG_SMSC_PHY=y

CONFIG_NET_ETHERNET=y

CONFIG_SMSC911X=y

CONFIG_DNET=y

CONFIG_FEC=y

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set

# CONFIG_INPUT is not set

# CONFIG_INPUT_MOUSEDEV is not set

# CONFIG_KEYBOARD_ATKBD is not set

CONFIG_KEYBOARD_IMX=y

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set

# CONFIG_VT is not set

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_8250=m

CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_SHARE_IRQ=y

CONFIG_SERIAL_IMX=y

CONFIG_SERIAL_IMX_CONSOLE=y

# CONFIG_LEGACY_PTYS is not set

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y
@@ -89,12 +90,15 @@ CONFIG_W1=y 
CONFIG_W1_MASTER_MXC=y

CONFIG_W1_SLAVE_THERM=y

# CONFIG_HWMON is not set

CONFIG_WATCHDOG=y

CONFIG_IMX2_WDT=y

CONFIG_MFD_WM8350_I2C=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_WM8350=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_VIDEO_DEV=y

# CONFIG_VIDEO_ALLOW_V4L1 is not set

# CONFIG_RC_CORE is not set

# CONFIG_MEDIA_TUNER_CUSTOMISE is not set

CONFIG_SOC_CAMERA=y

CONFIG_SOC_CAMERA_MT9M001=y

CONFIG_SOC_CAMERA_MT9M111=y
@@ -105,9 +109,26 @@ CONFIG_SOC_CAMERA_OV772X=y 
CONFIG_VIDEO_MX3=y

# CONFIG_RADIO_ADAPTERS is not set

CONFIG_FB=y

# CONFIG_USB_SUPPORT is not set

CONFIG_SOUND=y

CONFIG_SND=y

# CONFIG_SND_ARM is not set

# CONFIG_SND_SPI is not set

CONFIG_SND_SOC=y

CONFIG_SND_IMX_SOC=y

CONFIG_SND_MXC_SOC_WM1133_EV1=y

CONFIG_SND_SOC_PHYCORE_AC97=y

CONFIG_SND_SOC_EUKREA_TLV320=y

CONFIG_USB=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_MXC=y

CONFIG_USB_GADGET=m

CONFIG_USB_FSL_USB2=m

CONFIG_USB_G_SERIAL=m

CONFIG_USB_ULPI=y

CONFIG_MMC=y

CONFIG_MMC_MXC=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_MXC=y

CONFIG_DMADEVICES=y

# CONFIG_DNOTIFY is not set

CONFIG_TMPFS=y
@@ -119,6 +140,5 @@ CONFIG_NFS_V4=y 
CONFIG_ROOT_NFS=y

# CONFIG_ENABLE_WARN_DEPRECATED is not set

# CONFIG_ENABLE_MUST_CHECK is not set

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

CONFIG_SYSCTL_SYSCALL_CHECK=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set

arch/arm/include/asm/device.h

+5 −0
Original line number Diff line number Diff line
@@ -15,7 +15,12 @@ struct dev_archdata { 
#endif

};



struct omap_device;



struct pdev_archdata {

#ifdef CONFIG_ARCH_OMAP

	struct omap_device *od;

#endif

};



#endif

arch/arm/mach-davinci/devices-da8xx.c

+3 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ static struct edma_soc_info da830_edma_cc0_info = { 
	.n_cc			= 1,

	.queue_tc_mapping	= da8xx_queue_tc_mapping,

	.queue_priority_mapping	= da8xx_queue_priority_mapping,

	.default_queue		= EVENTQ_1,

};



static struct edma_soc_info *da830_edma_info[EDMA_MAX_CC] = {
@@ -151,6 +152,7 @@ static struct edma_soc_info da850_edma_cc_info[] = { 
		.n_cc			= 1,

		.queue_tc_mapping	= da8xx_queue_tc_mapping,

		.queue_priority_mapping	= da8xx_queue_priority_mapping,

		.default_queue		= EVENTQ_1,

	},

	{

		.n_channel		= 32,
@@ -160,6 +162,7 @@ static struct edma_soc_info da850_edma_cc_info[] = { 
		.n_cc			= 1,

		.queue_tc_mapping	= da850_queue_tc_mapping,

		.queue_priority_mapping	= da850_queue_priority_mapping,

		.default_queue		= EVENTQ_0,

	},

};

arch/arm/mach-davinci/devices-tnetv107x.c

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ static struct edma_soc_info edma_cc0_info = { 
	.n_cc			= 1,

	.queue_tc_mapping	= edma_tc_mapping,

	.queue_priority_mapping	= edma_priority_mapping,

	.default_queue		= EVENTQ_1,

};



static struct edma_soc_info *tnetv107x_edma_info[EDMA_MAX_CC] = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE