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

Merge branch 'imx/devel' into next/dt 



The board changes in the imx/devel branch conflict with other changes in
the device imx/dt branch.

Conflicts:
	arch/arm/mach-mx5/board-mx53_loco.c
	arch/arm/mach-mx5/board-mx53_smd.c
	arch/arm/plat-mxc/include/mach/common.h
	arch/arm/plat-mxc/include/mach/memory.h

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 7e1efcf5 b4cbb8a4

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -413,6 +413,7 @@ config ARCH_MXC 
	select CLKSRC_MMIO

	select GENERIC_IRQ_CHIP

	select HAVE_SCHED_CLOCK

	select MULTI_IRQ_HANDLER

	help

	  Support for Freescale MXC/iMX-based family of processors

arch/arm/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -157,9 +157,7 @@ machine-$(CONFIG_ARCH_LPC32XX) := lpc32xx 
machine-$(CONFIG_ARCH_MMP)		:= mmp

machine-$(CONFIG_ARCH_MSM)		:= msm

machine-$(CONFIG_ARCH_MV78XX0)		:= mv78xx0

machine-$(CONFIG_ARCH_MX1)		:= imx

machine-$(CONFIG_ARCH_MX2)		:= imx

machine-$(CONFIG_ARCH_MX25)		:= imx

machine-$(CONFIG_ARCH_IMX_V4_V5)	:= imx

machine-$(CONFIG_ARCH_MX3)		:= imx

machine-$(CONFIG_ARCH_MX5)		:= mx5

machine-$(CONFIG_ARCH_MXS)		:= mxs

arch/arm/configs/mx27_defconfig→arch/arm/configs/imx_v4_v5_defconfig

+54 −14
Original line number Diff line number Diff line
@@ -3,9 +3,7 @@ CONFIG_EXPERIMENTAL=y 
CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_LOG_BUF_SHIFT=14

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_EXPERT=y

CONFIG_KALLSYMS_EXTRA_PASS=y

# CONFIG_COMPAT_BRK is not set

CONFIG_SLAB=y

CONFIG_PROFILING=y
@@ -17,8 +15,12 @@ CONFIG_MODULE_UNLOAD=y 
# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_MXC=y

CONFIG_ARCH_MX2=y

CONFIG_MACH_MX27=y

CONFIG_ARCH_IMX_V4_V5=y

CONFIG_ARCH_MX1ADS=y

CONFIG_MACH_SCB9328=y

CONFIG_MACH_MX21ADS=y

CONFIG_MACH_MX25_3DS=y

CONFIG_MACH_EUKREA_CPUIMX25=y

CONFIG_MACH_MX27ADS=y

CONFIG_MACH_PCM038=y

CONFIG_MACH_CPUIMX27=y
@@ -29,6 +31,7 @@ CONFIG_MACH_IMX27_VISSTRIM_M10=y 
CONFIG_MACH_IMX27LITE=y

CONFIG_MACH_PCA100=y

CONFIG_MACH_MXT_TD60=y

CONFIG_MACH_IMX27IPCAM=y

CONFIG_MXC_IRQ_PRIOR=y

CONFIG_MXC_PWM=y

CONFIG_NO_HZ=y
@@ -39,7 +42,6 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 
CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_FPE_NWFPE=y

CONFIG_FPE_NWFPE_XP=y

CONFIG_PM=y

CONFIG_PM_DEBUG=y

CONFIG_NET=y

CONFIG_PACKET=y
@@ -55,8 +57,9 @@ CONFIG_IP_PNP_DHCP=y 
# CONFIG_INET_DIAG is not set

# CONFIG_IPV6 is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_MTD=y

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y
@@ -69,12 +72,15 @@ CONFIG_MTD_CFI_GEOMETRY=y 
CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_PHYSMAP=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_MXC=y

CONFIG_MTD_UBI=y

CONFIG_MISC_DEVICES=y

CONFIG_EEPROM_AT24=y

CONFIG_EEPROM_AT25=y

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_FEC=y

CONFIG_SMC91X=y

CONFIG_DM9000=y

CONFIG_SMC911X=y

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set

# CONFIG_INPUT_MOUSEDEV is not set
@@ -84,10 +90,10 @@ CONFIG_INPUT_EVDEV=y 
CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_ADS7846=m

# CONFIG_SERIO is not set

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_8250=m

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
@@ -98,19 +104,56 @@ 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_MC13XXX=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_MC13783=y

CONFIG_REGULATOR_MC13892=y

CONFIG_FB=y

CONFIG_FB_IMX=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

CONFIG_LCD_CLASS_DEVICE=y

CONFIG_BACKLIGHT_CLASS_DEVICE=y

CONFIG_BACKLIGHT_PWM=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FONTS=y

CONFIG_FONT_8x8=y

# CONFIG_HID_SUPPORT is not set

CONFIG_USB=m

CONFIG_LOGO=y

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_SOC_MX27VIS_AIC32X4=y

CONFIG_SND_SOC_PHYCORE_AC97=y

CONFIG_SND_SOC_EUKREA_TLV320=y

CONFIG_USB_HID=m

CONFIG_USB=y

# CONFIG_USB_DEVICE_CLASS is not set

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_MXC=y

CONFIG_USB_ULPI=y

CONFIG_MMC=y

CONFIG_MMC_MXC=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_MC13783=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_LEDS_TRIGGER_BACKLIGHT=y

CONFIG_LEDS_TRIGGER_GPIO=y

CONFIG_LEDS_TRIGGER_DEFAULT_ON=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_PCF8563=y

CONFIG_RTC_DRV_IMXDI=y

CONFIG_RTC_MXC=y

CONFIG_DMADEVICES=y

CONFIG_IMX_SDMA=y

CONFIG_IMX_DMA=y

# CONFIG_IOMMU_SUPPORT is not set

# CONFIG_DNOTIFY is not set

# CONFIG_PROC_PAGE_MONITOR is not set

CONFIG_TMPFS=y
@@ -119,12 +162,9 @@ CONFIG_UBIFS_FS=y 
CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_ROOT_NFS=y

CONFIG_NLS=y

CONFIG_NLS_CODEPAGE_437=m

CONFIG_NLS_CODEPAGE_850=m

CONFIG_NLS_ISO8859_1=y

CONFIG_NLS_ISO8859_15=m

CONFIG_DEBUG_FS=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

CONFIG_SYSCTL_SYSCALL_CHECK=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set

arch/arm/configs/mx1_defconfig

deleted100644 → 0
+0 −91
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

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

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_MODVERSIONS=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_ARCH_MXC=y

CONFIG_ARCH_MX1=y

CONFIG_ARCH_MX1ADS=y

CONFIG_MACH_SCB9328=y

CONFIG_MACH_APF9328=y

CONFIG_MXC_IRQ_PRIOR=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_PREEMPT=y

CONFIG_AEABI=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

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

CONFIG_PM=y

CONFIG_PM_DEBUG=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

# CONFIG_INET_DIAG is not set

# CONFIG_IPV6 is not set

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

CONFIG_MTD_CFI=y

CONFIG_MTD_PHYSMAP=y

# CONFIG_BLK_DEV is not set

# CONFIG_MISC_DEVICES is not set

CONFIG_NETDEVICES=y

CONFIG_PHYLIB=y

CONFIG_SMSC_PHY=y

CONFIG_NET_ETHERNET=y

CONFIG_DM9000=y

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set

# CONFIG_INPUT is not set

# CONFIG_SERIO is not set

# CONFIG_VT is not set

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

CONFIG_I2C_IMX=y

CONFIG_W1=y

CONFIG_W1_MASTER_MXC=y

CONFIG_W1_SLAVE_THERM=y

# CONFIG_HWMON is not set

CONFIG_FB=y

CONFIG_USB_GADGET=y

CONFIG_USB_GADGET_IMX=y

CONFIG_USB_ETH=m

CONFIG_MMC=y

CONFIG_MMC_MXC=y

# CONFIG_DNOTIFY is not set

CONFIG_INOTIFY=y

CONFIG_TMPFS=y

CONFIG_JFFS2_FS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

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/configs/mx21_defconfig

deleted100644 → 0
+0 −97
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_SYSFS_DEPRECATED_V2=y

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_EXPERT=y

CONFIG_KALLSYMS_EXTRA_PASS=y

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_MXC=y

CONFIG_ARCH_MX2=y

CONFIG_MACH_MX21ADS=y

CONFIG_MXC_PWM=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_PREEMPT=y

CONFIG_AEABI=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_NET=y

CONFIG_INET=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=y

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

# CONFIG_INET_DIAG is not set

# CONFIG_IPV6 is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

# CONFIG_FW_LOADER is not set

CONFIG_MTD=y

CONFIG_MTD_DEBUG=y

CONFIG_MTD_DEBUG_VERBOSE=3

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_REDBOOT_PARTS=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_ADV_OPTIONS=y

CONFIG_MTD_CFI_GEOMETRY=y

# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_PHYSMAP=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_MXC=y

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_MII=y

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set

# CONFIG_INPUT_MOUSEDEV is not set

CONFIG_INPUT_EVDEV=y

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

# CONFIG_SERIO is not set

# CONFIG_CONSOLE_TRANSLATIONS is not set

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_NR_UARTS=1

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

CONFIG_I2C_IMX=y

CONFIG_SPI=y

# CONFIG_HWMON is not set

CONFIG_FB=y

CONFIG_FB_IMX=y

# CONFIG_VGA_CONSOLE is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FONTS=y

CONFIG_FONT_8x8=y

CONFIG_LOGO=y

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_MMC=y

CONFIG_MMC_MXC=y

# CONFIG_DNOTIFY is not set

CONFIG_MSDOS_FS=y

CONFIG_TMPFS=y

CONFIG_JFFS2_FS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_ROOT_NFS=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

CONFIG_SYSCTL_SYSCALL_CHECK=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CRA Git | Maintained and supported by SUSTech CRA and CCSE