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

Commit d6bb0f27 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'imx/cleanup' into next/cleanup

parents 2f540738 91056a63

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/mach-imx/mach-kzm_arm11_01.c

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 


#include <mach/clock.h>

#include <mach/common.h>

#include <mach/hardware.h>

#include <mach/iomux-mx3.h>



#include "devices-imx31.h"

arch/arm/mach-imx/mach-pcm038.c

+3 −1
Original line number Diff line number Diff line
@@ -176,7 +176,9 @@ static struct platform_device *platform_devices[] __initdata = { 
 * setup other stuffs to access the sram. */

static void __init pcm038_init_sram(void)

{

	mx27_setup_weimcs(1, 0x0000d843, 0x22252521, 0x22220a00);

	__raw_writel(0x0000d843, MX27_IO_ADDRESS(MX27_WEIM_CSCRxU(1)));

	__raw_writel(0x22252521, MX27_IO_ADDRESS(MX27_WEIM_CSCRxL(1)));

	__raw_writel(0x22220a00, MX27_IO_ADDRESS(MX27_WEIM_CSCRxA(1)));

}



static const struct imxi2c_platform_data pcm038_i2c1_data __initconst = {

arch/arm/mach-imx/mach-qong.c

+4 −1
Original line number Diff line number Diff line
@@ -190,7 +190,10 @@ static struct platform_device qong_nand_device = { 
static void __init qong_init_nand_mtd(void)

{

	/* init CS */

	mx31_setup_weimcs(3, 0x00004f00, 0x20013b31, 0x00020800);

	__raw_writel(0x00004f00, MX31_IO_ADDRESS(MX31_WEIM_CSCRxU(3)));

	__raw_writel(0x20013b31, MX31_IO_ADDRESS(MX31_WEIM_CSCRxL(3)));

	__raw_writel(0x00020800, MX31_IO_ADDRESS(MX31_WEIM_CSCRxA(3)));



	mxc_iomux_set_gpr(MUX_SDCTL_CSD1_SEL, true);



	/* enable pin */

arch/arm/mach-mxs/mach-mx23evk.c

+1 −1
Original line number Diff line number Diff line
@@ -181,6 +181,6 @@ MACHINE_START(MX23EVK, "Freescale MX23 EVK") 
	/* Maintainer: Freescale Semiconductor, Inc. */

	.map_io		= mx23_map_io,

	.init_irq	= mx23_init_irq,

	.init_machine	= mx23evk_init,

	.timer		= &mx23evk_timer,

	.init_machine	= mx23evk_init,

MACHINE_END