* i.MX multi SoC patches
@ 2011-08-24 8:03 Sascha Hauer
2011-08-24 8:03 ` [PATCH 1/4] ARM i.MX: allow to compile together ARMv4 and ARMv5 based SoCs Sascha Hauer
` (5 more replies)
0 siblings, 6 replies; 15+ messages in thread
From: Sascha Hauer @ 2011-08-24 8:03 UTC (permalink / raw)
To: linux-arm-kernel
This is hopefully the last iteration of the patches for compiling
all ARMv4/v5 based i.MXs together. CONFIG_ARM_PATCH_PHYS_VIRT
lost its experimental status and we can still build uImages
even with CONFIG_AUTO_ZRELADDR enabled. This series selects
these options and makes a multi SoC image the default.
Also, we can now build all i.MX5 SoCs into a single image.
This series also updates the defconfigs.
Sascha Hauer (4):
ARM i.MX: allow to compile together ARMv4 and ARMv5 based SoCs
ARM i.MX: allow to compile together all i.MX5 based SoCs
ARM i.MX5: update defconfig
ARM i.MX defconfigs: use one defconfig for all ARMv4/v5 SoCs
arch/arm/Makefile | 4 +-
.../{mx27_defconfig => imx_v4_v5_defconfig} | 68 +++++++++++---
arch/arm/configs/mx1_defconfig | 91 ------------------
arch/arm/configs/mx21_defconfig | 97 --------------------
arch/arm/configs/{mx51_defconfig => mx5_defconfig} | 65 ++++++-------
arch/arm/mach-imx/Kconfig | 50 ++++-------
arch/arm/mach-mx5/Kconfig | 18 +---
arch/arm/plat-mxc/Kconfig | 39 ++------
arch/arm/plat-mxc/include/mach/memory.h | 16 +---
9 files changed, 118 insertions(+), 330 deletions(-)
rename arch/arm/configs/{mx27_defconfig => imx_v4_v5_defconfig} (69%)
delete mode 100644 arch/arm/configs/mx1_defconfig
delete mode 100644 arch/arm/configs/mx21_defconfig
rename arch/arm/configs/{mx51_defconfig => mx5_defconfig} (81%)
^ permalink raw reply [flat|nested] 15+ messages in thread* [PATCH 1/4] ARM i.MX: allow to compile together ARMv4 and ARMv5 based SoCs 2011-08-24 8:03 i.MX multi SoC patches Sascha Hauer @ 2011-08-24 8:03 ` Sascha Hauer 2011-08-24 8:03 ` [PATCH 2/4] ARM i.MX: allow to compile together all i.MX5 " Sascha Hauer ` (4 subsequent siblings) 5 siblings, 0 replies; 15+ messages in thread From: Sascha Hauer @ 2011-08-24 8:03 UTC (permalink / raw) To: linux-arm-kernel For this we need CONFIG_AUTO_ZRELADDR and CONFIG_ARM_PATCH_PHYS_VIRT. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- arch/arm/Makefile | 4 +-- arch/arm/mach-imx/Kconfig | 50 ++++++++++-------------------- arch/arm/plat-mxc/Kconfig | 19 ++++-------- arch/arm/plat-mxc/include/mach/memory.h | 10 +----- 4 files changed, 25 insertions(+), 58 deletions(-) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 70c424e..9260c29 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -154,9 +154,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 diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 0519dd7..bdc6345 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -5,6 +5,18 @@ config IMX_HAVE_DMA_V1 # Some usages assume that having one of them implies not having (e.g.) ARCH_MX2. # To easily distinguish good and reviewed from unreviewed usages new (and IMHO # more sensible) names are used: SOC_IMX31 and SOC_IMX35 +config ARCH_MX1 + bool + +config MACH_MX21 + bool + +config ARCH_MX25 + bool + +config MACH_MX27 + bool + config ARCH_MX31 bool @@ -13,6 +25,7 @@ config ARCH_MX35 config SOC_IMX1 bool + select ARCH_MX1 select CPU_ARM920T select IMX_HAVE_DMA_V1 select IMX_HAVE_IOMUX_V1 @@ -20,6 +33,7 @@ config SOC_IMX1 config SOC_IMX21 bool + select MACH_MX21 select CPU_ARM926T select ARCH_MXC_AUDMUX_V1 select IMX_HAVE_DMA_V1 @@ -28,6 +42,7 @@ config SOC_IMX21 config SOC_IMX25 bool + select ARCH_MX25 select CPU_ARM926T select ARCH_MXC_AUDMUX_V2 select ARCH_MXC_IOMUX_V3 @@ -35,6 +50,7 @@ config SOC_IMX25 config SOC_IMX27 bool + select MACH_MX27 select CPU_ARM926T select ARCH_MXC_AUDMUX_V1 select IMX_HAVE_DMA_V1 @@ -59,7 +75,7 @@ config SOC_IMX35 select MXC_AVIC -if ARCH_MX1 +if ARCH_IMX_V4_V5 comment "MX1 platforms:" config MACH_MXLADS @@ -87,30 +103,6 @@ config MACH_APF9328 help Say Yes here if you are using the Armadeus APF9328 development board -endif - -if ARCH_MX2 - -choice - prompt "CPUs:" - default MACH_MX21 - -config MACH_MX21 - bool "i.MX21 support" - help - This enables support for Freescale's MX2 based i.MX21 processor. - -config MACH_MX27 - bool "i.MX27 support" - help - This enables support for Freescale's MX2 based i.MX27 processor. - -endchoice - -endif - -if MACH_MX21 - comment "MX21 platforms:" config MACH_MX21ADS @@ -124,10 +116,6 @@ config MACH_MX21ADS Include support for MX21ADS platform. This includes specific configurations for the board and its peripherals. -endif - -if ARCH_MX25 - comment "MX25 platforms:" config MACH_MX25_3DS @@ -174,10 +162,6 @@ config MACH_EUKREA_MBIMXSD25_BASEBOARD endchoice -endif - -if MACH_MX27 - comment "MX27 platforms:" config MACH_MX27ADS diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig index a5353fc..0665c1f 100644 --- a/arch/arm/plat-mxc/Kconfig +++ b/arch/arm/plat-mxc/Kconfig @@ -14,20 +14,13 @@ choice prompt "Freescale CPU family:" default ARCH_MX3 -config ARCH_MX1 - bool "MX1-based" +config ARCH_IMX_V4_V5 + bool "i.MX1, i.MX21, i.MX25, i.MX27" + select AUTO_ZRELADDR + select ARM_PATCH_PHYS_VIRT help - This enables support for systems based on the Freescale i.MX1 family - -config ARCH_MX2 - bool "MX2-based" - help - This enables support for systems based on the Freescale i.MX2 family - -config ARCH_MX25 - bool "MX25-based" - help - This enables support for systems based on the Freescale i.MX25 family + This enables support for systems based on the Freescale i.MX ARMv4 + and ARMv5 SoCs config ARCH_MX3 bool "MX3-based" diff --git a/arch/arm/plat-mxc/include/mach/memory.h b/arch/arm/plat-mxc/include/mach/memory.h index 11be5cd..cbe2e3d 100644 --- a/arch/arm/plat-mxc/include/mach/memory.h +++ b/arch/arm/plat-mxc/include/mach/memory.h @@ -21,15 +21,7 @@ #define MX53_PHYS_OFFSET UL(0x70000000) #if !defined(CONFIG_RUNTIME_PHYS_OFFSET) -# if defined CONFIG_ARCH_MX1 -# define PLAT_PHYS_OFFSET MX1_PHYS_OFFSET -# elif defined CONFIG_MACH_MX21 -# define PLAT_PHYS_OFFSET MX21_PHYS_OFFSET -# elif defined CONFIG_ARCH_MX25 -# define PLAT_PHYS_OFFSET MX25_PHYS_OFFSET -# elif defined CONFIG_MACH_MX27 -# define PLAT_PHYS_OFFSET MX27_PHYS_OFFSET -# elif defined CONFIG_ARCH_MX3 +# if defined CONFIG_ARCH_MX3 # define PLAT_PHYS_OFFSET MX3x_PHYS_OFFSET # elif defined CONFIG_ARCH_MX50 # define PLAT_PHYS_OFFSET MX50_PHYS_OFFSET -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 2/4] ARM i.MX: allow to compile together all i.MX5 based SoCs 2011-08-24 8:03 i.MX multi SoC patches Sascha Hauer 2011-08-24 8:03 ` [PATCH 1/4] ARM i.MX: allow to compile together ARMv4 and ARMv5 based SoCs Sascha Hauer @ 2011-08-24 8:03 ` Sascha Hauer 2011-08-24 8:03 ` [PATCH 3/4] ARM i.MX5: update defconfig Sascha Hauer ` (3 subsequent siblings) 5 siblings, 0 replies; 15+ messages in thread From: Sascha Hauer @ 2011-08-24 8:03 UTC (permalink / raw) To: linux-arm-kernel For this we need CONFIG_AUTO_ZRELADDR and CONFIG_ARM_PATCH_PHYS_VIRT. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- arch/arm/mach-mx5/Kconfig | 18 ++++-------------- arch/arm/plat-mxc/Kconfig | 20 ++++---------------- arch/arm/plat-mxc/include/mach/memory.h | 6 ------ 3 files changed, 8 insertions(+), 36 deletions(-) diff --git a/arch/arm/mach-mx5/Kconfig b/arch/arm/mach-mx5/Kconfig index b4e7c58..6880691 100644 --- a/arch/arm/mach-mx5/Kconfig +++ b/arch/arm/mach-mx5/Kconfig @@ -1,8 +1,9 @@ -if ARCH_MX503 || ARCH_MX51 +if ARCH_MX5 + # ARCH_MX5/50/53 are left to mark places where prevent multi-soc in single # image. So for most time, SOC_IMX50/51/53 should be used. -config ARCH_MX5 +config ARCH_MX51 bool config ARCH_MX50 @@ -19,7 +20,6 @@ config SOC_IMX50 select ARCH_MXC_IOMUX_V3 select ARCH_MXC_AUDMUX_V2 select ARCH_HAS_CPUFREQ - select ARCH_MX5 select ARCH_MX50 config SOC_IMX51 @@ -30,7 +30,7 @@ config SOC_IMX51 select ARCH_MXC_IOMUX_V3 select ARCH_MXC_AUDMUX_V2 select ARCH_HAS_CPUFREQ - select ARCH_MX5 + select ARCH_MX51 config SOC_IMX53 bool @@ -38,10 +38,8 @@ config SOC_IMX53 select ARM_L1_CACHE_SHIFT_6 select MXC_TZIC select ARCH_MXC_IOMUX_V3 - select ARCH_MX5 select ARCH_MX53 -if ARCH_MX50_SUPPORTED #comment "i.MX50 machines:" config MACH_MX50_RDP @@ -57,9 +55,6 @@ config MACH_MX50_RDP Include support for MX50 reference design platform (RDP) board. This includes specific configurations for the board and its peripherals. -endif # ARCH_MX50_SUPPORTED - -if ARCH_MX51 comment "i.MX51 machines:" config MACH_MX51_BABBAGE @@ -167,9 +162,6 @@ config MACH_MX51_EFIKASB Include support for Genesi Efika Smartbook. This includes specific configurations for the board and its peripherals. -endif # ARCH_MX51 - -if ARCH_MX53_SUPPORTED comment "i.MX53 machines:" config MACH_MX53_EVK @@ -221,6 +213,4 @@ config MACH_MX53_ARD Include support for MX53 ARD platform. This includes specific configurations for the board and its peripherals. -endif # ARCH_MX53_SUPPORTED - endif diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig index 0665c1f..502e45f 100644 --- a/arch/arm/plat-mxc/Kconfig +++ b/arch/arm/plat-mxc/Kconfig @@ -4,12 +4,6 @@ source "arch/arm/plat-mxc/devices/Kconfig" menu "Freescale MXC Implementations" -config ARCH_MX50_SUPPORTED - bool - -config ARCH_MX53_SUPPORTED - bool - choice prompt "Freescale CPU family:" default ARCH_MX3 @@ -27,20 +21,14 @@ config ARCH_MX3 help This enables support for systems based on the Freescale i.MX3 family -config ARCH_MX503 - bool "i.MX50 + i.MX53" - select ARCH_MX50_SUPPORTED - select ARCH_MX53_SUPPORTED +config ARCH_MX5 + bool "i.MX50, i.MX51, i.MX53" + select AUTO_ZRELADDR + select ARM_PATCH_PHYS_VIRT help This enables support for machines using Freescale's i.MX50 and i.MX51 processors. -config ARCH_MX51 - bool "i.MX51" - select ARCH_MX51_SUPPORTED - help - This enables support for systems based on the Freescale i.MX51 family - endchoice source "arch/arm/mach-imx/Kconfig" diff --git a/arch/arm/plat-mxc/include/mach/memory.h b/arch/arm/plat-mxc/include/mach/memory.h index cbe2e3d..35e6c7f 100644 --- a/arch/arm/plat-mxc/include/mach/memory.h +++ b/arch/arm/plat-mxc/include/mach/memory.h @@ -23,12 +23,6 @@ #if !defined(CONFIG_RUNTIME_PHYS_OFFSET) # if defined CONFIG_ARCH_MX3 # define PLAT_PHYS_OFFSET MX3x_PHYS_OFFSET -# elif defined CONFIG_ARCH_MX50 -# define PLAT_PHYS_OFFSET MX50_PHYS_OFFSET -# elif defined CONFIG_ARCH_MX51 -# define PLAT_PHYS_OFFSET MX51_PHYS_OFFSET -# elif defined CONFIG_ARCH_MX53 -# define PLAT_PHYS_OFFSET MX53_PHYS_OFFSET # endif #endif -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 3/4] ARM i.MX5: update defconfig 2011-08-24 8:03 i.MX multi SoC patches Sascha Hauer 2011-08-24 8:03 ` [PATCH 1/4] ARM i.MX: allow to compile together ARMv4 and ARMv5 based SoCs Sascha Hauer 2011-08-24 8:03 ` [PATCH 2/4] ARM i.MX: allow to compile together all i.MX5 " Sascha Hauer @ 2011-08-24 8:03 ` Sascha Hauer 2011-08-24 8:03 ` [PATCH 4/4] ARM i.MX defconfigs: use one defconfig for all ARMv4/v5 SoCs Sascha Hauer ` (2 subsequent siblings) 5 siblings, 0 replies; 15+ messages in thread From: Sascha Hauer @ 2011-08-24 8:03 UTC (permalink / raw) To: linux-arm-kernel Rename it from mx51_defconfig to mx5_defconfig since the i.MX53 is now supported aswell. Also, remove the DEBUG_LL and enable some more drivers. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- arch/arm/configs/mx51_defconfig | 170 --------------------------------------- arch/arm/configs/mx5_defconfig | 167 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 167 insertions(+), 170 deletions(-) delete mode 100644 arch/arm/configs/mx51_defconfig create mode 100644 arch/arm/configs/mx5_defconfig diff --git a/arch/arm/configs/mx51_defconfig b/arch/arm/configs/mx51_defconfig deleted file mode 100644 index 88c5802..0000000 --- a/arch/arm/configs/mx51_defconfig +++ /dev/null @@ -1,170 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=18 -CONFIG_RELAY=y -CONFIG_EXPERT=y -# CONFIG_SLUB_DEBUG is not set -# CONFIG_COMPAT_BRK is not set -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODVERSIONS=y -CONFIG_MODULE_SRCVERSION_ALL=y -# CONFIG_LBDAF is not set -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_MXC=y -CONFIG_ARCH_MX51=y -CONFIG_MACH_MX51_BABBAGE=y -CONFIG_MACH_MX51_3DS=y -CONFIG_MACH_EUKREA_CPUIMX51=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT_VOLUNTARY=y -CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set -CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 -CONFIG_CMDLINE="noinitrd console=ttymxc0,115200 root=/dev/nfs nfsroot=192.168.0.101:/shared/nfs ip=dhcp" -CONFIG_VFP=y -CONFIG_NEON=y -CONFIG_BINFMT_MISC=m -CONFIG_PM=y -CONFIG_PM_DEBUG=y -CONFIG_PM_TEST_SUSPEND=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_IPV6 is not set -# CONFIG_WIRELESS is not set -# CONFIG_STANDALONE is not set -CONFIG_CONNECTOR=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=65536 -# CONFIG_MISC_DEVICES is not set -CONFIG_SCSI=y -# CONFIG_SCSI_PROC_FS is not set -CONFIG_BLK_DEV_SD=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_LOGGING=y -CONFIG_SCSI_SCAN_ASYNC=y -# CONFIG_SCSI_LOWLEVEL is not set -CONFIG_ATA=m -CONFIG_NETDEVICES=y -CONFIG_MARVELL_PHY=y -CONFIG_DAVICOM_PHY=y -CONFIG_QSEMI_PHY=y -CONFIG_LXT_PHY=y -CONFIG_CICADA_PHY=y -CONFIG_VITESSE_PHY=y -CONFIG_SMSC_PHY=y -CONFIG_BROADCOM_PHY=y -CONFIG_ICPLUS_PHY=y -CONFIG_REALTEK_PHY=y -CONFIG_NATIONAL_PHY=y -CONFIG_STE10XP=y -CONFIG_LSI_ET1011C_PHY=y -CONFIG_MDIO_BITBANG=y -CONFIG_MDIO_GPIO=y -CONFIG_NET_ETHERNET=y -CONFIG_MII=m -CONFIG_FEC=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -# CONFIG_WLAN is not set -CONFIG_INPUT_FF_MEMLESS=m -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_EVDEV=y -CONFIG_KEYBOARD_GPIO=y -CONFIG_INPUT_EVBUG=m -CONFIG_MOUSE_PS2=m -CONFIG_MOUSE_PS2_ELANTECH=y -CONFIG_SERIO_SERPORT=m -CONFIG_VT_HW_CONSOLE_BINDING=y -# CONFIG_DEVKMEM is not set -CONFIG_SERIAL_IMX=y -CONFIG_SERIAL_IMX_CONSOLE=y -# CONFIG_LEGACY_PTYS is not set -CONFIG_HW_RANDOM=y -CONFIG_I2C=y -# CONFIG_I2C_COMPAT is not set -CONFIG_I2C_CHARDEV=m -# CONFIG_I2C_HELPER_AUTO is not set -CONFIG_I2C_ALGOBIT=m -CONFIG_I2C_ALGOPCF=m -CONFIG_I2C_ALGOPCA=m -CONFIG_GPIO_SYSFS=y -# CONFIG_HWMON is not set -# CONFIG_HID_SUPPORT is not set -CONFIG_USB=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_MXC=y -CONFIG_USB_STORAGE=y -CONFIG_MMC=y -CONFIG_MMC_BLOCK=m -CONFIG_MMC_SDHCI=m -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_INTF_DEV_UIE_EMUL=y -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT2_FS_SECURITY=y -CONFIG_EXT3_FS=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y -CONFIG_EXT4_FS=y -CONFIG_EXT4_FS_POSIX_ACL=y -CONFIG_EXT4_FS_SECURITY=y -CONFIG_QUOTA=y -CONFIG_QUOTA_NETLINK_INTERFACE=y -# CONFIG_PRINT_QUOTA_WARNING is not set -CONFIG_AUTOFS_FS=y -CONFIG_AUTOFS4_FS=y -CONFIG_FUSE_FS=y -CONFIG_ISO9660_FS=m -CONFIG_JOLIET=y -CONFIG_ZISOFS=y -CONFIG_UDF_FS=m -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_CONFIGFS_FS=m -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_NLS_DEFAULT="cp437" -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ASCII=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_15=m -CONFIG_NLS_UTF8=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_SCHED_DEBUG is not set -# CONFIG_DEBUG_BUGVERBOSE is not set -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -# CONFIG_FTRACE is not set -# CONFIG_ARM_UNWIND is not set -CONFIG_DEBUG_LL=y -CONFIG_EARLY_PRINTK=y -CONFIG_SECURITYFS=y -CONFIG_CRYPTO_DEFLATE=y -CONFIG_CRYPTO_LZO=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -# CONFIG_CRYPTO_HW is not set -CONFIG_CRC_CCITT=m -CONFIG_CRC_T10DIF=y -CONFIG_CRC7=m -CONFIG_LIBCRC32C=m diff --git a/arch/arm/configs/mx5_defconfig b/arch/arm/configs/mx5_defconfig new file mode 100644 index 0000000..ede3cc2 --- /dev/null +++ b/arch/arm/configs/mx5_defconfig @@ -0,0 +1,167 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_KERNEL_LZO=y +CONFIG_SYSVIPC=y +CONFIG_LOG_BUF_SHIFT=18 +CONFIG_RELAY=y +CONFIG_EXPERT=y +# CONFIG_SLUB_DEBUG is not set +# CONFIG_COMPAT_BRK is not set +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODVERSIONS=y +CONFIG_MODULE_SRCVERSION_ALL=y +# CONFIG_LBDAF is not set +# CONFIG_BLK_DEV_BSG is not set +CONFIG_ARCH_MXC=y +CONFIG_ARCH_MX5=y +CONFIG_MACH_MX51_BABBAGE=y +CONFIG_MACH_MX51_3DS=y +CONFIG_MACH_EUKREA_CPUIMX51=y +CONFIG_MACH_EUKREA_CPUIMX51SD=y +CONFIG_MACH_MX51_EFIKAMX=y +CONFIG_MACH_MX51_EFIKASB=y +CONFIG_MACH_MX53_EVK=y +CONFIG_MACH_MX53_SMD=y +CONFIG_MACH_MX53_LOCO=y +CONFIG_MACH_MX53_ARD=y +CONFIG_MXC_PWM=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_PREEMPT_VOLUNTARY=y +CONFIG_AEABI=y +# CONFIG_OABI_COMPAT is not set +CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 +CONFIG_CMDLINE="noinitrd console=ttymxc0,115200" +CONFIG_VFP=y +CONFIG_BINFMT_MISC=m +CONFIG_PM_DEBUG=y +CONFIG_PM_TEST_SUSPEND=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_IPV6 is not set +# CONFIG_WIRELESS is not set +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +# CONFIG_STANDALONE is not set +CONFIG_CONNECTOR=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=65536 +CONFIG_SCSI=y +# CONFIG_SCSI_PROC_FS is not set +CONFIG_BLK_DEV_SD=y +CONFIG_SCSI_MULTI_LUN=y +CONFIG_SCSI_CONSTANTS=y +CONFIG_SCSI_LOGGING=y +CONFIG_SCSI_SCAN_ASYNC=y +# CONFIG_SCSI_LOWLEVEL is not set +CONFIG_ATA=m +CONFIG_NETDEVICES=y +CONFIG_MII=m +CONFIG_NET_ETHERNET=y +# CONFIG_NETDEV_1000 is not set +# CONFIG_NETDEV_10000 is not set +# CONFIG_WLAN is not set +CONFIG_INPUT_FF_MEMLESS=m +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +CONFIG_INPUT_EVDEV=y +CONFIG_INPUT_EVBUG=m +CONFIG_KEYBOARD_GPIO=y +CONFIG_MOUSE_PS2=m +CONFIG_MOUSE_PS2_ELANTECH=y +CONFIG_SERIO_SERPORT=m +CONFIG_VT_HW_CONSOLE_BINDING=y +# CONFIG_LEGACY_PTYS is not set +# CONFIG_DEVKMEM is not set +CONFIG_SERIAL_IMX=y +CONFIG_SERIAL_IMX_CONSOLE=y +CONFIG_HW_RANDOM=y +CONFIG_I2C=y +# CONFIG_I2C_COMPAT is not set +CONFIG_I2C_CHARDEV=y +# CONFIG_I2C_HELPER_AUTO is not set +CONFIG_I2C_ALGOBIT=m +CONFIG_I2C_ALGOPCF=m +CONFIG_I2C_ALGOPCA=m +CONFIG_I2C_IMX=y +CONFIG_SPI=y +CONFIG_SPI_IMX=y +CONFIG_GPIO_SYSFS=y +# CONFIG_HWMON is not set +CONFIG_WATCHDOG=y +CONFIG_IMX2_WDT=y +CONFIG_MFD_MC13XXX=y +CONFIG_REGULATOR=y +CONFIG_REGULATOR_MC13892=y +CONFIG_USB=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_MXC=y +CONFIG_USB_STORAGE=y +CONFIG_MMC=y +CONFIG_MMC_BLOCK=m +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_PLTFM=y +CONFIG_MMC_SDHCI_ESDHC_IMX=y +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_INTF_DEV_UIE_EMUL=y +CONFIG_RTC_MXC=y +CONFIG_EXT2_FS=y +CONFIG_EXT2_FS_XATTR=y +CONFIG_EXT2_FS_POSIX_ACL=y +CONFIG_EXT2_FS_SECURITY=y +CONFIG_EXT3_FS=y +CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_SECURITY=y +CONFIG_EXT4_FS=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y +CONFIG_QUOTA=y +CONFIG_QUOTA_NETLINK_INTERFACE=y +# CONFIG_PRINT_QUOTA_WARNING is not set +CONFIG_AUTOFS4_FS=y +CONFIG_FUSE_FS=y +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=y +CONFIG_TMPFS=y +CONFIG_CONFIGFS_FS=m +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=y +CONFIG_ROOT_NFS=y +CONFIG_NLS_DEFAULT="cp437" +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_ASCII=y +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_UTF8=y +CONFIG_MAGIC_SYSRQ=y +CONFIG_DEBUG_FS=y +# CONFIG_SCHED_DEBUG is not set +# CONFIG_DEBUG_BUGVERBOSE is not set +# CONFIG_FTRACE is not set +# CONFIG_ARM_UNWIND is not set +CONFIG_SECURITYFS=y +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_LZO=m +# CONFIG_CRYPTO_ANSI_CPRNG is not set +# CONFIG_CRYPTO_HW is not set +CONFIG_CRC_CCITT=m +CONFIG_CRC_T10DIF=y +CONFIG_CRC7=m +CONFIG_LIBCRC32C=m -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 4/4] ARM i.MX defconfigs: use one defconfig for all ARMv4/v5 SoCs 2011-08-24 8:03 i.MX multi SoC patches Sascha Hauer ` (2 preceding siblings ...) 2011-08-24 8:03 ` [PATCH 3/4] ARM i.MX5: update defconfig Sascha Hauer @ 2011-08-24 8:03 ` Sascha Hauer 2011-08-24 23:03 ` i.MX multi SoC patches Hector Oron 2011-08-31 13:02 ` i.MX multi SoC patches Hector Oron 5 siblings, 0 replies; 15+ messages in thread From: Sascha Hauer @ 2011-08-24 8:03 UTC (permalink / raw) To: linux-arm-kernel Now that we can compile all ARMv4/v5 based i.MX SoCs into a single kernel, update the defconfigs accordingly Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- arch/arm/configs/imx_v4_v5_defconfig | 170 ++++++++++++++++++++++++++++++++++ arch/arm/configs/mx1_defconfig | 91 ------------------ arch/arm/configs/mx21_defconfig | 97 ------------------- arch/arm/configs/mx27_defconfig | 130 -------------------------- 4 files changed, 170 insertions(+), 318 deletions(-) create mode 100644 arch/arm/configs/imx_v4_v5_defconfig delete mode 100644 arch/arm/configs/mx1_defconfig delete mode 100644 arch/arm/configs/mx21_defconfig delete mode 100644 arch/arm/configs/mx27_defconfig diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig new file mode 100644 index 0000000..11a4192 --- /dev/null +++ b/arch/arm/configs/imx_v4_v5_defconfig @@ -0,0 +1,170 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_SWAP is not set +CONFIG_SYSVIPC=y +CONFIG_POSIX_MQUEUE=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_EXPERT=y +# CONFIG_COMPAT_BRK is not set +CONFIG_SLAB=y +CONFIG_PROFILING=y +CONFIG_OPROFILE=y +CONFIG_KPROBES=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_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 +CONFIG_MACH_EUKREA_CPUIMX27_USESDHC2=y +CONFIG_MACH_EUKREA_CPUIMX27_USEUART4=y +CONFIG_MACH_MX27_3DS=y +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 +CONFIG_HIGH_RES_TIMERS=y +CONFIG_PREEMPT=y +CONFIG_AEABI=y +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_FPE_NWFPE=y +CONFIG_FPE_NWFPE_XP=y +CONFIG_PM_DEBUG=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_MULTICAST=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_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_MTD=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_MAP_BANK_WIDTH_4 is not set +# CONFIG_MTD_CFI_I2 is not set +CONFIG_MTD_CFI_INTELEXT=y +CONFIG_MTD_PHYSMAP=y +CONFIG_MTD_NAND=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_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 +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +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_HW_RANDOM is not set +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_IMX=y +CONFIG_SPI=y +CONFIG_SPI_IMX=y +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_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 +CONFIG_JFFS2_FS=y +CONFIG_UBIFS_FS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +CONFIG_ROOT_NFS=y +CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_15=m +CONFIG_SYSCTL_SYSCALL_CHECK=y +# CONFIG_CRYPTO_ANSI_CPRNG is not set diff --git a/arch/arm/configs/mx1_defconfig b/arch/arm/configs/mx1_defconfig deleted file mode 100644 index c9436d0..0000000 --- a/arch/arm/configs/mx1_defconfig +++ /dev/null @@ -1,91 +0,0 @@ -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 diff --git a/arch/arm/configs/mx21_defconfig b/arch/arm/configs/mx21_defconfig deleted file mode 100644 index 411f88d..0000000 --- a/arch/arm/configs/mx21_defconfig +++ /dev/null @@ -1,97 +0,0 @@ -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 diff --git a/arch/arm/configs/mx27_defconfig b/arch/arm/configs/mx27_defconfig deleted file mode 100644 index 9ad4c656..0000000 --- a/arch/arm/configs/mx27_defconfig +++ /dev/null @@ -1,130 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_SWAP is not set -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 -CONFIG_OPROFILE=y -CONFIG_KPROBES=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_MX27=y -CONFIG_MACH_MX27ADS=y -CONFIG_MACH_PCM038=y -CONFIG_MACH_CPUIMX27=y -CONFIG_MACH_EUKREA_CPUIMX27_USESDHC2=y -CONFIG_MACH_EUKREA_CPUIMX27_USEUART4=y -CONFIG_MACH_MX27_3DS=y -CONFIG_MACH_IMX27_VISSTRIM_M10=y -CONFIG_MACH_IMX27LITE=y -CONFIG_MACH_PCA100=y -CONFIG_MACH_MXT_TD60=y -CONFIG_MXC_IRQ_PRIOR=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_FPE_NWFPE=y -CONFIG_FPE_NWFPE_XP=y -CONFIG_PM=y -CONFIG_PM_DEBUG=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=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_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_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_GEOMETRY=y -# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set -# CONFIG_MTD_CFI_I2 is not set -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_MXC=y -CONFIG_MTD_UBI=y -CONFIG_EEPROM_AT24=y -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_FEC=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_TOUCHSCREEN_ADS7846=m -# CONFIG_SERIO 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 -CONFIG_I2C_IMX=y -CONFIG_SPI=y -CONFIG_SPI_IMX=y -CONFIG_W1=y -CONFIG_W1_MASTER_MXC=y -CONFIG_W1_SLAVE_THERM=y -# CONFIG_HWMON is not set -CONFIG_FB=y -CONFIG_FB_IMX=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FONTS=y -CONFIG_FONT_8x8=y -# CONFIG_HID_SUPPORT is not set -CONFIG_USB=m -# CONFIG_USB_DEVICE_CLASS is not set -CONFIG_USB_ULPI=y -CONFIG_MMC=y -CONFIG_MMC_MXC=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_PCF8563=y -# CONFIG_DNOTIFY is not set -# CONFIG_PROC_PAGE_MONITOR is not set -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -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 -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* i.MX multi SoC patches 2011-08-24 8:03 i.MX multi SoC patches Sascha Hauer ` (3 preceding siblings ...) 2011-08-24 8:03 ` [PATCH 4/4] ARM i.MX defconfigs: use one defconfig for all ARMv4/v5 SoCs Sascha Hauer @ 2011-08-24 23:03 ` Hector Oron 2011-08-25 6:38 ` Sascha Hauer ` (2 more replies) 2011-08-31 13:02 ` i.MX multi SoC patches Hector Oron 5 siblings, 3 replies; 15+ messages in thread From: Hector Oron @ 2011-08-24 23:03 UTC (permalink / raw) To: linux-arm-kernel Hello Sascha, 2011/8/24 Sascha Hauer <s.hauer@pengutronix.de>: > This is hopefully the last iteration of the patches for compiling > all ARMv4/v5 based i.MXs together. CONFIG_ARM_PATCH_PHYS_VIRT > lost its experimental status and we can still build uImages > even with CONFIG_AUTO_ZRELADDR enabled. This series selects > these options and makes a multi SoC image the default. > Also, we can now build all i.MX5 SoCs into a single image. > This series also updates the defconfigs. Thanks very much for doing this work, it is very much appreciated. I have not yet been able to test this work at runtime, but I have attempted to compile your branch 'imx-features' which seems to keep all this work. I have noticed a name clashing producing the following compile time error: arch/arm/plat-mxc/devices/platform-pata_imx.c:33: error: ?MX51_INT_ATA? undeclared here (not in a function) Lurking a bit in the archive I noticed that Uwe patch <http://patchwork.ozlabs.org/patch/106633/> it is assumed, but not applied. Attached there is a refreshed patch which applies to your 'imx-features' branch. With kind regards, -- ?H?ctor Or?n ?-.. . -... .. .- -. ? -.. . ...- . .-.. --- .--. . .-. -------------- next part -------------- A non-text attachment was scrubbed... Name: ARM-mx5-fix-remaining-unconsistent-names-for-irqs-v2.patch Type: text/x-patch Size: 8976 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20110825/506838f5/attachment-0001.bin> ^ permalink raw reply [flat|nested] 15+ messages in thread
* i.MX multi SoC patches 2011-08-24 23:03 ` i.MX multi SoC patches Hector Oron @ 2011-08-25 6:38 ` Sascha Hauer 2011-08-25 11:44 ` hector.oron at gmail.com 2011-08-25 12:55 ` [PATCH] ARM: mx5: fix remaining unconsistent names for irqs hector.oron at gmail.com 2 siblings, 0 replies; 15+ messages in thread From: Sascha Hauer @ 2011-08-25 6:38 UTC (permalink / raw) To: linux-arm-kernel Hi H?ctor, On Thu, Aug 25, 2011 at 01:03:55AM +0200, Hector Oron wrote: > Hello Sascha, > > 2011/8/24 Sascha Hauer <s.hauer@pengutronix.de>: > > This is hopefully the last iteration of the patches for compiling > > all ARMv4/v5 based i.MXs together. CONFIG_ARM_PATCH_PHYS_VIRT > > lost its experimental status and we can still build uImages > > even with CONFIG_AUTO_ZRELADDR enabled. This series selects > > these options and makes a multi SoC image the default. > > Also, we can now build all i.MX5 SoCs into a single image. > > This series also updates the defconfigs. > > Thanks very much for doing this work, it is very much appreciated. Yeah, here too ;) I hope we can get more compile and test coverage with less effort now. > I have not yet been able to test this work at runtime, but I have > attempted to compile > your branch 'imx-features' which seems to keep all this work. I have > noticed a name > clashing producing the following compile time error: > > arch/arm/plat-mxc/devices/platform-pata_imx.c:33: error: > ?MX51_INT_ATA? undeclared here (not in a function) > > Lurking a bit in the archive I noticed that Uwe patch > <http://patchwork.ozlabs.org/patch/106633/> it is assumed, but not applied. > Attached there is a refreshed patch which applies to your 'imx-features' branch. > Looks good. Can you resend this with correct author information and your Signed-off-by please? Thanks Sascha > With kind regards, > -- > ?H?ctor Or?n ?-.. . -... .. .- -. ? -.. . ...- . .-.. --- .--. . .-. > diff --git a/arch/arm/mach-mx5/clock-mx51-mx53.c b/arch/arm/mach-mx5/clock-mx51-mx53.c > index afecd78ce..2b9bd1f 100644 > --- a/arch/arm/mach-mx5/clock-mx51-mx53.c > +++ b/arch/arm/mach-mx5/clock-mx51-mx53.c > @@ -1573,7 +1573,7 @@ int __init mx51_clocks_init(unsigned long ckil, unsigned long osc, > > /* System timer */ > mxc_timer_init(&gpt_clk, MX51_IO_ADDRESS(MX51_GPT1_BASE_ADDR), > - MX51_MXC_INT_GPT); > + MX51_INT_GPT); > return 0; > } > > diff --git a/arch/arm/mach-mx5/devices.c b/arch/arm/mach-mx5/devices.c > index 371ca8c..5fd8f0c 100644 > --- a/arch/arm/mach-mx5/devices.c > +++ b/arch/arm/mach-mx5/devices.c > @@ -23,8 +23,8 @@ static struct resource mxc_hsi2c_resources[] = { > .flags = IORESOURCE_MEM, > }, > { > - .start = MX51_MXC_INT_HS_I2C, > - .end = MX51_MXC_INT_HS_I2C, > + .start = MX51_INT_HS_I2C, > + .end = MX51_INT_HS_I2C, > .flags = IORESOURCE_IRQ, > }, > }; > @@ -45,7 +45,7 @@ static struct resource usbotg_resources[] = { > .flags = IORESOURCE_MEM, > }, > { > - .start = MX51_MXC_INT_USB_OTG, > + .start = MX51_INT_USB_OTG, > .flags = IORESOURCE_IRQ, > }, > }; > @@ -80,7 +80,7 @@ static struct resource usbh1_resources[] = { > .flags = IORESOURCE_MEM, > }, > { > - .start = MX51_MXC_INT_USB_H1, > + .start = MX51_INT_USB_H1, > .flags = IORESOURCE_IRQ, > }, > }; > @@ -103,7 +103,7 @@ static struct resource usbh2_resources[] = { > .flags = IORESOURCE_MEM, > }, > { > - .start = MX51_MXC_INT_USB_H2, > + .start = MX51_INT_USB_H2, > .flags = IORESOURCE_IRQ, > }, > }; > diff --git a/arch/arm/mach-mx5/mm.c b/arch/arm/mach-mx5/mm.c > index baea6e5..fcc5c4c 100644 > --- a/arch/arm/mach-mx5/mm.c > +++ b/arch/arm/mach-mx5/mm.c > @@ -141,10 +141,10 @@ static struct sdma_platform_data imx53_sdma_pdata __initdata = { > void __init imx51_soc_init(void) > { > /* i.mx51 has the i.mx31 type gpio */ > - mxc_register_gpio("imx31-gpio", 0, MX51_GPIO1_BASE_ADDR, SZ_16K, MX51_MXC_INT_GPIO1_LOW, MX51_MXC_INT_GPIO1_HIGH); > - mxc_register_gpio("imx31-gpio", 1, MX51_GPIO2_BASE_ADDR, SZ_16K, MX51_MXC_INT_GPIO2_LOW, MX51_MXC_INT_GPIO2_HIGH); > - mxc_register_gpio("imx31-gpio", 2, MX51_GPIO3_BASE_ADDR, SZ_16K, MX51_MXC_INT_GPIO3_LOW, MX51_MXC_INT_GPIO3_HIGH); > - mxc_register_gpio("imx31-gpio", 3, MX51_GPIO4_BASE_ADDR, SZ_16K, MX51_MXC_INT_GPIO4_LOW, MX51_MXC_INT_GPIO4_HIGH); > + mxc_register_gpio("imx31-gpio", 0, MX51_GPIO1_BASE_ADDR, SZ_16K, MX51_INT_GPIO1_LOW, MX51_INT_GPIO1_HIGH); > + mxc_register_gpio("imx31-gpio", 1, MX51_GPIO2_BASE_ADDR, SZ_16K, MX51_INT_GPIO2_LOW, MX51_INT_GPIO2_HIGH); > + mxc_register_gpio("imx31-gpio", 2, MX51_GPIO3_BASE_ADDR, SZ_16K, MX51_INT_GPIO3_LOW, MX51_INT_GPIO3_HIGH); > + mxc_register_gpio("imx31-gpio", 3, MX51_GPIO4_BASE_ADDR, SZ_16K, MX51_INT_GPIO4_LOW, MX51_INT_GPIO4_HIGH); > > /* i.mx51 has the i.mx35 type sdma */ > imx_add_imx_sdma("imx35-sdma", MX51_SDMA_BASE_ADDR, MX51_INT_SDMA, &imx51_sdma_pdata); > diff --git a/arch/arm/plat-mxc/include/mach/mx51.h b/arch/arm/plat-mxc/include/mach/mx51.h > index dede19a..d240b6f 100644 > --- a/arch/arm/plat-mxc/include/mach/mx51.h > +++ b/arch/arm/plat-mxc/include/mach/mx51.h > @@ -240,110 +240,110 @@ > /* > * Interrupt numbers > */ > -#define MX51_MXC_INT_BASE 0 > -#define MX51_MXC_INT_RESV0 0 > +#define MX51_INT_BASE 0 > +#define MX51_INT_RESV0 0 > #define MX51_INT_ESDHC1 1 > #define MX51_INT_ESDHC2 2 > #define MX51_INT_ESDHC3 3 > #define MX51_INT_ESDHC4 4 > -#define MX51_MXC_INT_RESV5 5 > +#define MX51_INT_RESV5 5 > #define MX51_INT_SDMA 6 > -#define MX51_MXC_INT_IOMUX 7 > +#define MX51_INT_IOMUX 7 > #define MX51_INT_NFC 8 > -#define MX51_MXC_INT_VPU 9 > +#define MX51_INT_VPU 9 > #define MX51_INT_IPU_ERR 10 > #define MX51_INT_IPU_SYN 11 > -#define MX51_MXC_INT_GPU 12 > -#define MX51_MXC_INT_RESV13 13 > -#define MX51_MXC_INT_USB_H1 14 > -#define MX51_MXC_INT_EMI 15 > -#define MX51_MXC_INT_USB_H2 16 > -#define MX51_MXC_INT_USB_H3 17 > -#define MX51_MXC_INT_USB_OTG 18 > -#define MX51_MXC_INT_SAHARA_H0 19 > -#define MX51_MXC_INT_SAHARA_H1 20 > -#define MX51_MXC_INT_SCC_SMN 21 > -#define MX51_MXC_INT_SCC_STZ 22 > -#define MX51_MXC_INT_SCC_SCM 23 > -#define MX51_MXC_INT_SRTC_NTZ 24 > -#define MX51_MXC_INT_SRTC_TZ 25 > -#define MX51_MXC_INT_RTIC 26 > -#define MX51_MXC_INT_CSU 27 > -#define MX51_MXC_INT_SLIM_B 28 > +#define MX51_INT_GPU 12 > +#define MX51_INT_RESV13 13 > +#define MX51_INT_USB_H1 14 > +#define MX51_INT_EMI 15 > +#define MX51_INT_USB_H2 16 > +#define MX51_INT_USB_H3 17 > +#define MX51_INT_USB_OTG 18 > +#define MX51_INT_SAHARA_H0 19 > +#define MX51_INT_SAHARA_H1 20 > +#define MX51_INT_SCC_SMN 21 > +#define MX51_INT_SCC_STZ 22 > +#define MX51_INT_SCC_SCM 23 > +#define MX51_INT_SRTC_NTZ 24 > +#define MX51_INT_SRTC_TZ 25 > +#define MX51_INT_RTIC 26 > +#define MX51_INT_CSU 27 > +#define MX51_INT_SLIM_B 28 > #define MX51_INT_SSI1 29 > #define MX51_INT_SSI2 30 > #define MX51_INT_UART1 31 > #define MX51_INT_UART2 32 > #define MX51_INT_UART3 33 > -#define MX51_MXC_INT_RESV34 34 > -#define MX51_MXC_INT_RESV35 35 > +#define MX51_INT_RESV34 34 > +#define MX51_INT_RESV35 35 > #define MX51_INT_ECSPI1 36 > #define MX51_INT_ECSPI2 37 > #define MX51_INT_CSPI 38 > -#define MX51_MXC_INT_GPT 39 > -#define MX51_MXC_INT_EPIT1 40 > -#define MX51_MXC_INT_EPIT2 41 > -#define MX51_MXC_INT_GPIO1_INT7 42 > -#define MX51_MXC_INT_GPIO1_INT6 43 > -#define MX51_MXC_INT_GPIO1_INT5 44 > -#define MX51_MXC_INT_GPIO1_INT4 45 > -#define MX51_MXC_INT_GPIO1_INT3 46 > -#define MX51_MXC_INT_GPIO1_INT2 47 > -#define MX51_MXC_INT_GPIO1_INT1 48 > -#define MX51_MXC_INT_GPIO1_INT0 49 > -#define MX51_MXC_INT_GPIO1_LOW 50 > -#define MX51_MXC_INT_GPIO1_HIGH 51 > -#define MX51_MXC_INT_GPIO2_LOW 52 > -#define MX51_MXC_INT_GPIO2_HIGH 53 > -#define MX51_MXC_INT_GPIO3_LOW 54 > -#define MX51_MXC_INT_GPIO3_HIGH 55 > -#define MX51_MXC_INT_GPIO4_LOW 56 > -#define MX51_MXC_INT_GPIO4_HIGH 57 > -#define MX51_MXC_INT_WDOG1 58 > -#define MX51_MXC_INT_WDOG2 59 > +#define MX51_INT_GPT 39 > +#define MX51_INT_EPIT1 40 > +#define MX51_INT_EPIT2 41 > +#define MX51_INT_GPIO1_INT7 42 > +#define MX51_INT_GPIO1_INT6 43 > +#define MX51_INT_GPIO1_INT5 44 > +#define MX51_INT_GPIO1_INT4 45 > +#define MX51_INT_GPIO1_INT3 46 > +#define MX51_INT_GPIO1_INT2 47 > +#define MX51_INT_GPIO1_INT1 48 > +#define MX51_INT_GPIO1_INT0 49 > +#define MX51_INT_GPIO1_LOW 50 > +#define MX51_INT_GPIO1_HIGH 51 > +#define MX51_INT_GPIO2_LOW 52 > +#define MX51_INT_GPIO2_HIGH 53 > +#define MX51_INT_GPIO3_LOW 54 > +#define MX51_INT_GPIO3_HIGH 55 > +#define MX51_INT_GPIO4_LOW 56 > +#define MX51_INT_GPIO4_HIGH 57 > +#define MX51_INT_WDOG1 58 > +#define MX51_INT_WDOG2 59 > #define MX51_INT_KPP 60 > #define MX51_INT_PWM1 61 > #define MX51_INT_I2C1 62 > #define MX51_INT_I2C2 63 > -#define MX51_MXC_INT_HS_I2C 64 > -#define MX51_MXC_INT_RESV65 65 > -#define MX51_MXC_INT_RESV66 66 > -#define MX51_MXC_INT_SIM_IPB 67 > -#define MX51_MXC_INT_SIM_DAT 68 > -#define MX51_MXC_INT_IIM 69 > -#define MX51_MXC_INT_ATA 70 > -#define MX51_MXC_INT_CCM1 71 > -#define MX51_MXC_INT_CCM2 72 > -#define MX51_MXC_INT_GPC1 73 > -#define MX51_MXC_INT_GPC2 74 > -#define MX51_MXC_INT_SRC 75 > -#define MX51_MXC_INT_NM 76 > -#define MX51_MXC_INT_PMU 77 > -#define MX51_MXC_INT_CTI_IRQ 78 > -#define MX51_MXC_INT_CTI1_TG0 79 > -#define MX51_MXC_INT_CTI1_TG1 80 > -#define MX51_MXC_INT_MCG_ERR 81 > -#define MX51_MXC_INT_MCG_TMR 82 > -#define MX51_MXC_INT_MCG_FUNC 83 > -#define MX51_MXC_INT_GPU2_IRQ 84 > -#define MX51_MXC_INT_GPU2_BUSY 85 > -#define MX51_MXC_INT_RESV86 86 > +#define MX51_INT_HS_I2C 64 > +#define MX51_INT_RESV65 65 > +#define MX51_INT_RESV66 66 > +#define MX51_INT_SIM_IPB 67 > +#define MX51_INT_SIM_DAT 68 > +#define MX51_INT_IIM 69 > +#define MX51_INT_ATA 70 > +#define MX51_INT_CCM1 71 > +#define MX51_INT_CCM2 72 > +#define MX51_INT_GPC1 73 > +#define MX51_INT_GPC2 74 > +#define MX51_INT_SRC 75 > +#define MX51_INT_NM 76 > +#define MX51_INT_PMU 77 > +#define MX51_INT_CTI_IRQ 78 > +#define MX51_INT_CTI1_TG0 79 > +#define MX51_INT_CTI1_TG1 80 > +#define MX51_INT_MCG_ERR 81 > +#define MX51_INT_MCG_TMR 82 > +#define MX51_INT_MCG_FUNC 83 > +#define MX51_INT_GPU2_IRQ 84 > +#define MX51_INT_GPU2_BUSY 85 > +#define MX51_INT_RESV86 86 > #define MX51_INT_FEC 87 > -#define MX51_MXC_INT_OWIRE 88 > -#define MX51_MXC_INT_CTI1_TG2 89 > -#define MX51_MXC_INT_SJC 90 > -#define MX51_MXC_INT_SPDIF 91 > -#define MX51_MXC_INT_TVE 92 > -#define MX51_MXC_INT_FIRI 93 > +#define MX51_INT_OWIRE 88 > +#define MX51_INT_CTI1_TG2 89 > +#define MX51_INT_SJC 90 > +#define MX51_INT_SPDIF 91 > +#define MX51_INT_TVE 92 > +#define MX51_INT_FIRI 93 > #define MX51_INT_PWM2 94 > -#define MX51_MXC_INT_SLIM_EXP 95 > +#define MX51_INT_SLIM_EXP 95 > #define MX51_INT_SSI3 96 > -#define MX51_MXC_INT_EMI_BOOT 97 > -#define MX51_MXC_INT_CTI1_TG3 98 > -#define MX51_MXC_INT_SMC_RX 99 > -#define MX51_MXC_INT_VPU_IDLE 100 > -#define MX51_MXC_INT_EMI_NFC 101 > -#define MX51_MXC_INT_GPU_IDLE 102 > +#define MX51_INT_EMI_BOOT 97 > +#define MX51_INT_CTI1_TG3 98 > +#define MX51_INT_SMC_RX 99 > +#define MX51_INT_VPU_IDLE 100 > +#define MX51_INT_EMI_NFC 101 > +#define MX51_INT_GPU_IDLE 102 > > #if !defined(__ASSEMBLY__) && !defined(__MXC_BOOT_UNCOMPRESS) > extern int mx51_revision(void); -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | ^ permalink raw reply [flat|nested] 15+ messages in thread
* i.MX multi SoC patches 2011-08-24 23:03 ` i.MX multi SoC patches Hector Oron 2011-08-25 6:38 ` Sascha Hauer @ 2011-08-25 11:44 ` hector.oron at gmail.com 2011-08-25 11:44 ` [PATCH] ARM: mx5: fix remaining unconsistent names for irqs hector.oron at gmail.com 2011-08-25 11:52 ` i.MX multi SoC patches Hector Oron 2011-08-25 12:55 ` [PATCH] ARM: mx5: fix remaining unconsistent names for irqs hector.oron at gmail.com 2 siblings, 2 replies; 15+ messages in thread From: hector.oron at gmail.com @ 2011-08-25 11:44 UTC (permalink / raw) To: linux-arm-kernel Hello, This is an attempt to follow Sascha suggestion on the i.MX multi SoC patches thread. Best regards ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH] ARM: mx5: fix remaining unconsistent names for irqs 2011-08-25 11:44 ` hector.oron at gmail.com @ 2011-08-25 11:44 ` hector.oron at gmail.com 2011-08-25 11:52 ` i.MX multi SoC patches Hector Oron 1 sibling, 0 replies; 15+ messages in thread From: hector.oron at gmail.com @ 2011-08-25 11:44 UTC (permalink / raw) To: linux-arm-kernel From: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de> Hello, This patch updates original patch sent by Uwe Kleine-K?nig < http://patchwork.ozlabs.org/patch/106633/ > Signed-off-by: Hector Oron <hector.oron@gmail.com> --- arch/arm/mach-mx5/clock-mx51-mx53.c | 2 +- arch/arm/mach-mx5/devices.c | 10 +- arch/arm/mach-mx5/mm.c | 8 +- arch/arm/plat-mxc/include/mach/mx51.h | 162 ++++++++++++++++---------------- 4 files changed, 91 insertions(+), 91 deletions(-) diff --git a/arch/arm/mach-mx5/clock-mx51-mx53.c b/arch/arm/mach-mx5/clock-mx51-mx53.c index afecd78ce..2b9bd1f 100644 --- a/arch/arm/mach-mx5/clock-mx51-mx53.c +++ b/arch/arm/mach-mx5/clock-mx51-mx53.c @@ -1573,7 +1573,7 @@ int __init mx51_clocks_init(unsigned long ckil, unsigned long osc, /* System timer */ mxc_timer_init(&gpt_clk, MX51_IO_ADDRESS(MX51_GPT1_BASE_ADDR), - MX51_MXC_INT_GPT); + MX51_INT_GPT); return 0; } diff --git a/arch/arm/mach-mx5/devices.c b/arch/arm/mach-mx5/devices.c index 371ca8c..5fd8f0c 100644 --- a/arch/arm/mach-mx5/devices.c +++ b/arch/arm/mach-mx5/devices.c @@ -23,8 +23,8 @@ static struct resource mxc_hsi2c_resources[] = { .flags = IORESOURCE_MEM, }, { - .start = MX51_MXC_INT_HS_I2C, - .end = MX51_MXC_INT_HS_I2C, + .start = MX51_INT_HS_I2C, + .end = MX51_INT_HS_I2C, .flags = IORESOURCE_IRQ, }, }; @@ -45,7 +45,7 @@ static struct resource usbotg_resources[] = { .flags = IORESOURCE_MEM, }, { - .start = MX51_MXC_INT_USB_OTG, + .start = MX51_INT_USB_OTG, .flags = IORESOURCE_IRQ, }, }; @@ -80,7 +80,7 @@ static struct resource usbh1_resources[] = { .flags = IORESOURCE_MEM, }, { - .start = MX51_MXC_INT_USB_H1, + .start = MX51_INT_USB_H1, .flags = IORESOURCE_IRQ, }, }; @@ -103,7 +103,7 @@ static struct resource usbh2_resources[] = { .flags = IORESOURCE_MEM, }, { - .start = MX51_MXC_INT_USB_H2, + .start = MX51_INT_USB_H2, .flags = IORESOURCE_IRQ, }, }; diff --git a/arch/arm/mach-mx5/mm.c b/arch/arm/mach-mx5/mm.c index baea6e5..fcc5c4c 100644 --- a/arch/arm/mach-mx5/mm.c +++ b/arch/arm/mach-mx5/mm.c @@ -141,10 +141,10 @@ static struct sdma_platform_data imx53_sdma_pdata __initdata = { void __init imx51_soc_init(void) { /* i.mx51 has the i.mx31 type gpio */ - mxc_register_gpio("imx31-gpio", 0, MX51_GPIO1_BASE_ADDR, SZ_16K, MX51_MXC_INT_GPIO1_LOW, MX51_MXC_INT_GPIO1_HIGH); - mxc_register_gpio("imx31-gpio", 1, MX51_GPIO2_BASE_ADDR, SZ_16K, MX51_MXC_INT_GPIO2_LOW, MX51_MXC_INT_GPIO2_HIGH); - mxc_register_gpio("imx31-gpio", 2, MX51_GPIO3_BASE_ADDR, SZ_16K, MX51_MXC_INT_GPIO3_LOW, MX51_MXC_INT_GPIO3_HIGH); - mxc_register_gpio("imx31-gpio", 3, MX51_GPIO4_BASE_ADDR, SZ_16K, MX51_MXC_INT_GPIO4_LOW, MX51_MXC_INT_GPIO4_HIGH); + mxc_register_gpio("imx31-gpio", 0, MX51_GPIO1_BASE_ADDR, SZ_16K, MX51_INT_GPIO1_LOW, MX51_INT_GPIO1_HIGH); + mxc_register_gpio("imx31-gpio", 1, MX51_GPIO2_BASE_ADDR, SZ_16K, MX51_INT_GPIO2_LOW, MX51_INT_GPIO2_HIGH); + mxc_register_gpio("imx31-gpio", 2, MX51_GPIO3_BASE_ADDR, SZ_16K, MX51_INT_GPIO3_LOW, MX51_INT_GPIO3_HIGH); + mxc_register_gpio("imx31-gpio", 3, MX51_GPIO4_BASE_ADDR, SZ_16K, MX51_INT_GPIO4_LOW, MX51_INT_GPIO4_HIGH); /* i.mx51 has the i.mx35 type sdma */ imx_add_imx_sdma("imx35-sdma", MX51_SDMA_BASE_ADDR, MX51_INT_SDMA, &imx51_sdma_pdata); diff --git a/arch/arm/plat-mxc/include/mach/mx51.h b/arch/arm/plat-mxc/include/mach/mx51.h index dede19a..d240b6f 100644 --- a/arch/arm/plat-mxc/include/mach/mx51.h +++ b/arch/arm/plat-mxc/include/mach/mx51.h @@ -240,110 +240,110 @@ /* * Interrupt numbers */ -#define MX51_MXC_INT_BASE 0 -#define MX51_MXC_INT_RESV0 0 +#define MX51_INT_BASE 0 +#define MX51_INT_RESV0 0 #define MX51_INT_ESDHC1 1 #define MX51_INT_ESDHC2 2 #define MX51_INT_ESDHC3 3 #define MX51_INT_ESDHC4 4 -#define MX51_MXC_INT_RESV5 5 +#define MX51_INT_RESV5 5 #define MX51_INT_SDMA 6 -#define MX51_MXC_INT_IOMUX 7 +#define MX51_INT_IOMUX 7 #define MX51_INT_NFC 8 -#define MX51_MXC_INT_VPU 9 +#define MX51_INT_VPU 9 #define MX51_INT_IPU_ERR 10 #define MX51_INT_IPU_SYN 11 -#define MX51_MXC_INT_GPU 12 -#define MX51_MXC_INT_RESV13 13 -#define MX51_MXC_INT_USB_H1 14 -#define MX51_MXC_INT_EMI 15 -#define MX51_MXC_INT_USB_H2 16 -#define MX51_MXC_INT_USB_H3 17 -#define MX51_MXC_INT_USB_OTG 18 -#define MX51_MXC_INT_SAHARA_H0 19 -#define MX51_MXC_INT_SAHARA_H1 20 -#define MX51_MXC_INT_SCC_SMN 21 -#define MX51_MXC_INT_SCC_STZ 22 -#define MX51_MXC_INT_SCC_SCM 23 -#define MX51_MXC_INT_SRTC_NTZ 24 -#define MX51_MXC_INT_SRTC_TZ 25 -#define MX51_MXC_INT_RTIC 26 -#define MX51_MXC_INT_CSU 27 -#define MX51_MXC_INT_SLIM_B 28 +#define MX51_INT_GPU 12 +#define MX51_INT_RESV13 13 +#define MX51_INT_USB_H1 14 +#define MX51_INT_EMI 15 +#define MX51_INT_USB_H2 16 +#define MX51_INT_USB_H3 17 +#define MX51_INT_USB_OTG 18 +#define MX51_INT_SAHARA_H0 19 +#define MX51_INT_SAHARA_H1 20 +#define MX51_INT_SCC_SMN 21 +#define MX51_INT_SCC_STZ 22 +#define MX51_INT_SCC_SCM 23 +#define MX51_INT_SRTC_NTZ 24 +#define MX51_INT_SRTC_TZ 25 +#define MX51_INT_RTIC 26 +#define MX51_INT_CSU 27 +#define MX51_INT_SLIM_B 28 #define MX51_INT_SSI1 29 #define MX51_INT_SSI2 30 #define MX51_INT_UART1 31 #define MX51_INT_UART2 32 #define MX51_INT_UART3 33 -#define MX51_MXC_INT_RESV34 34 -#define MX51_MXC_INT_RESV35 35 +#define MX51_INT_RESV34 34 +#define MX51_INT_RESV35 35 #define MX51_INT_ECSPI1 36 #define MX51_INT_ECSPI2 37 #define MX51_INT_CSPI 38 -#define MX51_MXC_INT_GPT 39 -#define MX51_MXC_INT_EPIT1 40 -#define MX51_MXC_INT_EPIT2 41 -#define MX51_MXC_INT_GPIO1_INT7 42 -#define MX51_MXC_INT_GPIO1_INT6 43 -#define MX51_MXC_INT_GPIO1_INT5 44 -#define MX51_MXC_INT_GPIO1_INT4 45 -#define MX51_MXC_INT_GPIO1_INT3 46 -#define MX51_MXC_INT_GPIO1_INT2 47 -#define MX51_MXC_INT_GPIO1_INT1 48 -#define MX51_MXC_INT_GPIO1_INT0 49 -#define MX51_MXC_INT_GPIO1_LOW 50 -#define MX51_MXC_INT_GPIO1_HIGH 51 -#define MX51_MXC_INT_GPIO2_LOW 52 -#define MX51_MXC_INT_GPIO2_HIGH 53 -#define MX51_MXC_INT_GPIO3_LOW 54 -#define MX51_MXC_INT_GPIO3_HIGH 55 -#define MX51_MXC_INT_GPIO4_LOW 56 -#define MX51_MXC_INT_GPIO4_HIGH 57 -#define MX51_MXC_INT_WDOG1 58 -#define MX51_MXC_INT_WDOG2 59 +#define MX51_INT_GPT 39 +#define MX51_INT_EPIT1 40 +#define MX51_INT_EPIT2 41 +#define MX51_INT_GPIO1_INT7 42 +#define MX51_INT_GPIO1_INT6 43 +#define MX51_INT_GPIO1_INT5 44 +#define MX51_INT_GPIO1_INT4 45 +#define MX51_INT_GPIO1_INT3 46 +#define MX51_INT_GPIO1_INT2 47 +#define MX51_INT_GPIO1_INT1 48 +#define MX51_INT_GPIO1_INT0 49 +#define MX51_INT_GPIO1_LOW 50 +#define MX51_INT_GPIO1_HIGH 51 +#define MX51_INT_GPIO2_LOW 52 +#define MX51_INT_GPIO2_HIGH 53 +#define MX51_INT_GPIO3_LOW 54 +#define MX51_INT_GPIO3_HIGH 55 +#define MX51_INT_GPIO4_LOW 56 +#define MX51_INT_GPIO4_HIGH 57 +#define MX51_INT_WDOG1 58 +#define MX51_INT_WDOG2 59 #define MX51_INT_KPP 60 #define MX51_INT_PWM1 61 #define MX51_INT_I2C1 62 #define MX51_INT_I2C2 63 -#define MX51_MXC_INT_HS_I2C 64 -#define MX51_MXC_INT_RESV65 65 -#define MX51_MXC_INT_RESV66 66 -#define MX51_MXC_INT_SIM_IPB 67 -#define MX51_MXC_INT_SIM_DAT 68 -#define MX51_MXC_INT_IIM 69 -#define MX51_MXC_INT_ATA 70 -#define MX51_MXC_INT_CCM1 71 -#define MX51_MXC_INT_CCM2 72 -#define MX51_MXC_INT_GPC1 73 -#define MX51_MXC_INT_GPC2 74 -#define MX51_MXC_INT_SRC 75 -#define MX51_MXC_INT_NM 76 -#define MX51_MXC_INT_PMU 77 -#define MX51_MXC_INT_CTI_IRQ 78 -#define MX51_MXC_INT_CTI1_TG0 79 -#define MX51_MXC_INT_CTI1_TG1 80 -#define MX51_MXC_INT_MCG_ERR 81 -#define MX51_MXC_INT_MCG_TMR 82 -#define MX51_MXC_INT_MCG_FUNC 83 -#define MX51_MXC_INT_GPU2_IRQ 84 -#define MX51_MXC_INT_GPU2_BUSY 85 -#define MX51_MXC_INT_RESV86 86 +#define MX51_INT_HS_I2C 64 +#define MX51_INT_RESV65 65 +#define MX51_INT_RESV66 66 +#define MX51_INT_SIM_IPB 67 +#define MX51_INT_SIM_DAT 68 +#define MX51_INT_IIM 69 +#define MX51_INT_ATA 70 +#define MX51_INT_CCM1 71 +#define MX51_INT_CCM2 72 +#define MX51_INT_GPC1 73 +#define MX51_INT_GPC2 74 +#define MX51_INT_SRC 75 +#define MX51_INT_NM 76 +#define MX51_INT_PMU 77 +#define MX51_INT_CTI_IRQ 78 +#define MX51_INT_CTI1_TG0 79 +#define MX51_INT_CTI1_TG1 80 +#define MX51_INT_MCG_ERR 81 +#define MX51_INT_MCG_TMR 82 +#define MX51_INT_MCG_FUNC 83 +#define MX51_INT_GPU2_IRQ 84 +#define MX51_INT_GPU2_BUSY 85 +#define MX51_INT_RESV86 86 #define MX51_INT_FEC 87 -#define MX51_MXC_INT_OWIRE 88 -#define MX51_MXC_INT_CTI1_TG2 89 -#define MX51_MXC_INT_SJC 90 -#define MX51_MXC_INT_SPDIF 91 -#define MX51_MXC_INT_TVE 92 -#define MX51_MXC_INT_FIRI 93 +#define MX51_INT_OWIRE 88 +#define MX51_INT_CTI1_TG2 89 +#define MX51_INT_SJC 90 +#define MX51_INT_SPDIF 91 +#define MX51_INT_TVE 92 +#define MX51_INT_FIRI 93 #define MX51_INT_PWM2 94 -#define MX51_MXC_INT_SLIM_EXP 95 +#define MX51_INT_SLIM_EXP 95 #define MX51_INT_SSI3 96 -#define MX51_MXC_INT_EMI_BOOT 97 -#define MX51_MXC_INT_CTI1_TG3 98 -#define MX51_MXC_INT_SMC_RX 99 -#define MX51_MXC_INT_VPU_IDLE 100 -#define MX51_MXC_INT_EMI_NFC 101 -#define MX51_MXC_INT_GPU_IDLE 102 +#define MX51_INT_EMI_BOOT 97 +#define MX51_INT_CTI1_TG3 98 +#define MX51_INT_SMC_RX 99 +#define MX51_INT_VPU_IDLE 100 +#define MX51_INT_EMI_NFC 101 +#define MX51_INT_GPU_IDLE 102 #if !defined(__ASSEMBLY__) && !defined(__MXC_BOOT_UNCOMPRESS) extern int mx51_revision(void); -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* i.MX multi SoC patches 2011-08-25 11:44 ` hector.oron at gmail.com 2011-08-25 11:44 ` [PATCH] ARM: mx5: fix remaining unconsistent names for irqs hector.oron at gmail.com @ 2011-08-25 11:52 ` Hector Oron 1 sibling, 0 replies; 15+ messages in thread From: Hector Oron @ 2011-08-25 11:52 UTC (permalink / raw) To: linux-arm-kernel Hello again, 2011/8/25 <hector.oron@gmail.com>: > Hello, > > ?This is an attempt to follow Sascha suggestion on the i.MX multi SoC patches thread. Attached patch. My git send-email foo is not good enough. Cheers, -- ?H?ctor Or?n ?-.. . -... .. .- -. ? -.. . ...- . .-.. --- .--. . .-. -------------- next part -------------- A non-text attachment was scrubbed... Name: 0001-ARM-mx5-fix-remaining-unconsistent-names-for-irqs.patch Type: text/x-patch Size: 9788 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20110825/2232f2fd/attachment-0001.bin> ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH] ARM: mx5: fix remaining unconsistent names for irqs 2011-08-24 23:03 ` i.MX multi SoC patches Hector Oron 2011-08-25 6:38 ` Sascha Hauer 2011-08-25 11:44 ` hector.oron at gmail.com @ 2011-08-25 12:55 ` hector.oron at gmail.com 2011-08-25 14:16 ` Arnaud Patard (Rtp) 2011-08-25 14:54 ` Sascha Hauer 2 siblings, 2 replies; 15+ messages in thread From: hector.oron at gmail.com @ 2011-08-25 12:55 UTC (permalink / raw) To: linux-arm-kernel From: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de> Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de> [hector: rebase on current Sascha's 'imx-features' branch] Signed-off-by: Hector Oron <hector.oron@gmail.com> --- arch/arm/mach-mx5/clock-mx51-mx53.c | 2 +- arch/arm/mach-mx5/devices.c | 10 +- arch/arm/mach-mx5/mm.c | 8 +- arch/arm/plat-mxc/include/mach/mx51.h | 162 ++++++++++++++++---------------- 4 files changed, 91 insertions(+), 91 deletions(-) diff --git a/arch/arm/mach-mx5/clock-mx51-mx53.c b/arch/arm/mach-mx5/clock-mx51-mx53.c index afecd78ce..2b9bd1f 100644 --- a/arch/arm/mach-mx5/clock-mx51-mx53.c +++ b/arch/arm/mach-mx5/clock-mx51-mx53.c @@ -1573,7 +1573,7 @@ int __init mx51_clocks_init(unsigned long ckil, unsigned long osc, /* System timer */ mxc_timer_init(&gpt_clk, MX51_IO_ADDRESS(MX51_GPT1_BASE_ADDR), - MX51_MXC_INT_GPT); + MX51_INT_GPT); return 0; } diff --git a/arch/arm/mach-mx5/devices.c b/arch/arm/mach-mx5/devices.c index 371ca8c..5fd8f0c 100644 --- a/arch/arm/mach-mx5/devices.c +++ b/arch/arm/mach-mx5/devices.c @@ -23,8 +23,8 @@ static struct resource mxc_hsi2c_resources[] = { .flags = IORESOURCE_MEM, }, { - .start = MX51_MXC_INT_HS_I2C, - .end = MX51_MXC_INT_HS_I2C, + .start = MX51_INT_HS_I2C, + .end = MX51_INT_HS_I2C, .flags = IORESOURCE_IRQ, }, }; @@ -45,7 +45,7 @@ static struct resource usbotg_resources[] = { .flags = IORESOURCE_MEM, }, { - .start = MX51_MXC_INT_USB_OTG, + .start = MX51_INT_USB_OTG, .flags = IORESOURCE_IRQ, }, }; @@ -80,7 +80,7 @@ static struct resource usbh1_resources[] = { .flags = IORESOURCE_MEM, }, { - .start = MX51_MXC_INT_USB_H1, + .start = MX51_INT_USB_H1, .flags = IORESOURCE_IRQ, }, }; @@ -103,7 +103,7 @@ static struct resource usbh2_resources[] = { .flags = IORESOURCE_MEM, }, { - .start = MX51_MXC_INT_USB_H2, + .start = MX51_INT_USB_H2, .flags = IORESOURCE_IRQ, }, }; diff --git a/arch/arm/mach-mx5/mm.c b/arch/arm/mach-mx5/mm.c index baea6e5..fcc5c4c 100644 --- a/arch/arm/mach-mx5/mm.c +++ b/arch/arm/mach-mx5/mm.c @@ -141,10 +141,10 @@ static struct sdma_platform_data imx53_sdma_pdata __initdata = { void __init imx51_soc_init(void) { /* i.mx51 has the i.mx31 type gpio */ - mxc_register_gpio("imx31-gpio", 0, MX51_GPIO1_BASE_ADDR, SZ_16K, MX51_MXC_INT_GPIO1_LOW, MX51_MXC_INT_GPIO1_HIGH); - mxc_register_gpio("imx31-gpio", 1, MX51_GPIO2_BASE_ADDR, SZ_16K, MX51_MXC_INT_GPIO2_LOW, MX51_MXC_INT_GPIO2_HIGH); - mxc_register_gpio("imx31-gpio", 2, MX51_GPIO3_BASE_ADDR, SZ_16K, MX51_MXC_INT_GPIO3_LOW, MX51_MXC_INT_GPIO3_HIGH); - mxc_register_gpio("imx31-gpio", 3, MX51_GPIO4_BASE_ADDR, SZ_16K, MX51_MXC_INT_GPIO4_LOW, MX51_MXC_INT_GPIO4_HIGH); + mxc_register_gpio("imx31-gpio", 0, MX51_GPIO1_BASE_ADDR, SZ_16K, MX51_INT_GPIO1_LOW, MX51_INT_GPIO1_HIGH); + mxc_register_gpio("imx31-gpio", 1, MX51_GPIO2_BASE_ADDR, SZ_16K, MX51_INT_GPIO2_LOW, MX51_INT_GPIO2_HIGH); + mxc_register_gpio("imx31-gpio", 2, MX51_GPIO3_BASE_ADDR, SZ_16K, MX51_INT_GPIO3_LOW, MX51_INT_GPIO3_HIGH); + mxc_register_gpio("imx31-gpio", 3, MX51_GPIO4_BASE_ADDR, SZ_16K, MX51_INT_GPIO4_LOW, MX51_INT_GPIO4_HIGH); /* i.mx51 has the i.mx35 type sdma */ imx_add_imx_sdma("imx35-sdma", MX51_SDMA_BASE_ADDR, MX51_INT_SDMA, &imx51_sdma_pdata); diff --git a/arch/arm/plat-mxc/include/mach/mx51.h b/arch/arm/plat-mxc/include/mach/mx51.h index dede19a..d240b6f 100644 --- a/arch/arm/plat-mxc/include/mach/mx51.h +++ b/arch/arm/plat-mxc/include/mach/mx51.h @@ -240,110 +240,110 @@ /* * Interrupt numbers */ -#define MX51_MXC_INT_BASE 0 -#define MX51_MXC_INT_RESV0 0 +#define MX51_INT_BASE 0 +#define MX51_INT_RESV0 0 #define MX51_INT_ESDHC1 1 #define MX51_INT_ESDHC2 2 #define MX51_INT_ESDHC3 3 #define MX51_INT_ESDHC4 4 -#define MX51_MXC_INT_RESV5 5 +#define MX51_INT_RESV5 5 #define MX51_INT_SDMA 6 -#define MX51_MXC_INT_IOMUX 7 +#define MX51_INT_IOMUX 7 #define MX51_INT_NFC 8 -#define MX51_MXC_INT_VPU 9 +#define MX51_INT_VPU 9 #define MX51_INT_IPU_ERR 10 #define MX51_INT_IPU_SYN 11 -#define MX51_MXC_INT_GPU 12 -#define MX51_MXC_INT_RESV13 13 -#define MX51_MXC_INT_USB_H1 14 -#define MX51_MXC_INT_EMI 15 -#define MX51_MXC_INT_USB_H2 16 -#define MX51_MXC_INT_USB_H3 17 -#define MX51_MXC_INT_USB_OTG 18 -#define MX51_MXC_INT_SAHARA_H0 19 -#define MX51_MXC_INT_SAHARA_H1 20 -#define MX51_MXC_INT_SCC_SMN 21 -#define MX51_MXC_INT_SCC_STZ 22 -#define MX51_MXC_INT_SCC_SCM 23 -#define MX51_MXC_INT_SRTC_NTZ 24 -#define MX51_MXC_INT_SRTC_TZ 25 -#define MX51_MXC_INT_RTIC 26 -#define MX51_MXC_INT_CSU 27 -#define MX51_MXC_INT_SLIM_B 28 +#define MX51_INT_GPU 12 +#define MX51_INT_RESV13 13 +#define MX51_INT_USB_H1 14 +#define MX51_INT_EMI 15 +#define MX51_INT_USB_H2 16 +#define MX51_INT_USB_H3 17 +#define MX51_INT_USB_OTG 18 +#define MX51_INT_SAHARA_H0 19 +#define MX51_INT_SAHARA_H1 20 +#define MX51_INT_SCC_SMN 21 +#define MX51_INT_SCC_STZ 22 +#define MX51_INT_SCC_SCM 23 +#define MX51_INT_SRTC_NTZ 24 +#define MX51_INT_SRTC_TZ 25 +#define MX51_INT_RTIC 26 +#define MX51_INT_CSU 27 +#define MX51_INT_SLIM_B 28 #define MX51_INT_SSI1 29 #define MX51_INT_SSI2 30 #define MX51_INT_UART1 31 #define MX51_INT_UART2 32 #define MX51_INT_UART3 33 -#define MX51_MXC_INT_RESV34 34 -#define MX51_MXC_INT_RESV35 35 +#define MX51_INT_RESV34 34 +#define MX51_INT_RESV35 35 #define MX51_INT_ECSPI1 36 #define MX51_INT_ECSPI2 37 #define MX51_INT_CSPI 38 -#define MX51_MXC_INT_GPT 39 -#define MX51_MXC_INT_EPIT1 40 -#define MX51_MXC_INT_EPIT2 41 -#define MX51_MXC_INT_GPIO1_INT7 42 -#define MX51_MXC_INT_GPIO1_INT6 43 -#define MX51_MXC_INT_GPIO1_INT5 44 -#define MX51_MXC_INT_GPIO1_INT4 45 -#define MX51_MXC_INT_GPIO1_INT3 46 -#define MX51_MXC_INT_GPIO1_INT2 47 -#define MX51_MXC_INT_GPIO1_INT1 48 -#define MX51_MXC_INT_GPIO1_INT0 49 -#define MX51_MXC_INT_GPIO1_LOW 50 -#define MX51_MXC_INT_GPIO1_HIGH 51 -#define MX51_MXC_INT_GPIO2_LOW 52 -#define MX51_MXC_INT_GPIO2_HIGH 53 -#define MX51_MXC_INT_GPIO3_LOW 54 -#define MX51_MXC_INT_GPIO3_HIGH 55 -#define MX51_MXC_INT_GPIO4_LOW 56 -#define MX51_MXC_INT_GPIO4_HIGH 57 -#define MX51_MXC_INT_WDOG1 58 -#define MX51_MXC_INT_WDOG2 59 +#define MX51_INT_GPT 39 +#define MX51_INT_EPIT1 40 +#define MX51_INT_EPIT2 41 +#define MX51_INT_GPIO1_INT7 42 +#define MX51_INT_GPIO1_INT6 43 +#define MX51_INT_GPIO1_INT5 44 +#define MX51_INT_GPIO1_INT4 45 +#define MX51_INT_GPIO1_INT3 46 +#define MX51_INT_GPIO1_INT2 47 +#define MX51_INT_GPIO1_INT1 48 +#define MX51_INT_GPIO1_INT0 49 +#define MX51_INT_GPIO1_LOW 50 +#define MX51_INT_GPIO1_HIGH 51 +#define MX51_INT_GPIO2_LOW 52 +#define MX51_INT_GPIO2_HIGH 53 +#define MX51_INT_GPIO3_LOW 54 +#define MX51_INT_GPIO3_HIGH 55 +#define MX51_INT_GPIO4_LOW 56 +#define MX51_INT_GPIO4_HIGH 57 +#define MX51_INT_WDOG1 58 +#define MX51_INT_WDOG2 59 #define MX51_INT_KPP 60 #define MX51_INT_PWM1 61 #define MX51_INT_I2C1 62 #define MX51_INT_I2C2 63 -#define MX51_MXC_INT_HS_I2C 64 -#define MX51_MXC_INT_RESV65 65 -#define MX51_MXC_INT_RESV66 66 -#define MX51_MXC_INT_SIM_IPB 67 -#define MX51_MXC_INT_SIM_DAT 68 -#define MX51_MXC_INT_IIM 69 -#define MX51_MXC_INT_ATA 70 -#define MX51_MXC_INT_CCM1 71 -#define MX51_MXC_INT_CCM2 72 -#define MX51_MXC_INT_GPC1 73 -#define MX51_MXC_INT_GPC2 74 -#define MX51_MXC_INT_SRC 75 -#define MX51_MXC_INT_NM 76 -#define MX51_MXC_INT_PMU 77 -#define MX51_MXC_INT_CTI_IRQ 78 -#define MX51_MXC_INT_CTI1_TG0 79 -#define MX51_MXC_INT_CTI1_TG1 80 -#define MX51_MXC_INT_MCG_ERR 81 -#define MX51_MXC_INT_MCG_TMR 82 -#define MX51_MXC_INT_MCG_FUNC 83 -#define MX51_MXC_INT_GPU2_IRQ 84 -#define MX51_MXC_INT_GPU2_BUSY 85 -#define MX51_MXC_INT_RESV86 86 +#define MX51_INT_HS_I2C 64 +#define MX51_INT_RESV65 65 +#define MX51_INT_RESV66 66 +#define MX51_INT_SIM_IPB 67 +#define MX51_INT_SIM_DAT 68 +#define MX51_INT_IIM 69 +#define MX51_INT_ATA 70 +#define MX51_INT_CCM1 71 +#define MX51_INT_CCM2 72 +#define MX51_INT_GPC1 73 +#define MX51_INT_GPC2 74 +#define MX51_INT_SRC 75 +#define MX51_INT_NM 76 +#define MX51_INT_PMU 77 +#define MX51_INT_CTI_IRQ 78 +#define MX51_INT_CTI1_TG0 79 +#define MX51_INT_CTI1_TG1 80 +#define MX51_INT_MCG_ERR 81 +#define MX51_INT_MCG_TMR 82 +#define MX51_INT_MCG_FUNC 83 +#define MX51_INT_GPU2_IRQ 84 +#define MX51_INT_GPU2_BUSY 85 +#define MX51_INT_RESV86 86 #define MX51_INT_FEC 87 -#define MX51_MXC_INT_OWIRE 88 -#define MX51_MXC_INT_CTI1_TG2 89 -#define MX51_MXC_INT_SJC 90 -#define MX51_MXC_INT_SPDIF 91 -#define MX51_MXC_INT_TVE 92 -#define MX51_MXC_INT_FIRI 93 +#define MX51_INT_OWIRE 88 +#define MX51_INT_CTI1_TG2 89 +#define MX51_INT_SJC 90 +#define MX51_INT_SPDIF 91 +#define MX51_INT_TVE 92 +#define MX51_INT_FIRI 93 #define MX51_INT_PWM2 94 -#define MX51_MXC_INT_SLIM_EXP 95 +#define MX51_INT_SLIM_EXP 95 #define MX51_INT_SSI3 96 -#define MX51_MXC_INT_EMI_BOOT 97 -#define MX51_MXC_INT_CTI1_TG3 98 -#define MX51_MXC_INT_SMC_RX 99 -#define MX51_MXC_INT_VPU_IDLE 100 -#define MX51_MXC_INT_EMI_NFC 101 -#define MX51_MXC_INT_GPU_IDLE 102 +#define MX51_INT_EMI_BOOT 97 +#define MX51_INT_CTI1_TG3 98 +#define MX51_INT_SMC_RX 99 +#define MX51_INT_VPU_IDLE 100 +#define MX51_INT_EMI_NFC 101 +#define MX51_INT_GPU_IDLE 102 #if !defined(__ASSEMBLY__) && !defined(__MXC_BOOT_UNCOMPRESS) extern int mx51_revision(void); -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH] ARM: mx5: fix remaining unconsistent names for irqs 2011-08-25 12:55 ` [PATCH] ARM: mx5: fix remaining unconsistent names for irqs hector.oron at gmail.com @ 2011-08-25 14:16 ` Arnaud Patard (Rtp) 2011-08-25 14:54 ` Sascha Hauer 1 sibling, 0 replies; 15+ messages in thread From: Arnaud Patard (Rtp) @ 2011-08-25 14:16 UTC (permalink / raw) To: linux-arm-kernel hector.oron at gmail.com writes: Hi, > From: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de> > > Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de> > [hector: rebase on current Sascha's 'imx-features' branch] > Signed-off-by: Hector Oron <hector.oron@gmail.com> It's fixing nicely the build of imx-features branch of Sascha's tree. Only build tested but I guess seeing that it's fixing the build already enough to make it a must have :) Tested-by: Arnaud Patard <arnaud.patard@rtp-net.org> Thanks, Arnaud ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH] ARM: mx5: fix remaining unconsistent names for irqs 2011-08-25 12:55 ` [PATCH] ARM: mx5: fix remaining unconsistent names for irqs hector.oron at gmail.com 2011-08-25 14:16 ` Arnaud Patard (Rtp) @ 2011-08-25 14:54 ` Sascha Hauer 1 sibling, 0 replies; 15+ messages in thread From: Sascha Hauer @ 2011-08-25 14:54 UTC (permalink / raw) To: linux-arm-kernel On Thu, Aug 25, 2011 at 01:55:49PM +0100, hector.oron at gmail.com wrote: > From: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de> > > Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de> > [hector: rebase on current Sascha's 'imx-features' branch] > Signed-off-by: Hector Oron <hector.oron@gmail.com> > --- > arch/arm/mach-mx5/clock-mx51-mx53.c | 2 +- > arch/arm/mach-mx5/devices.c | 10 +- > arch/arm/mach-mx5/mm.c | 8 +- > arch/arm/plat-mxc/include/mach/mx51.h | 162 ++++++++++++++++---------------- > 4 files changed, 91 insertions(+), 91 deletions(-) While merging together my feature branch with the cleanup branch I realized that I already have this patch in the original version from Uwe. Instead of adding this patch to the features branch I based the feature branch on the cleanup branch. Sorry for letting you repost this. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | ^ permalink raw reply [flat|nested] 15+ messages in thread
* i.MX multi SoC patches 2011-08-24 8:03 i.MX multi SoC patches Sascha Hauer ` (4 preceding siblings ...) 2011-08-24 23:03 ` i.MX multi SoC patches Hector Oron @ 2011-08-31 13:02 ` Hector Oron 2011-08-31 14:05 ` Shawn Guo 5 siblings, 1 reply; 15+ messages in thread From: Hector Oron @ 2011-08-31 13:02 UTC (permalink / raw) To: linux-arm-kernel Hello, 2011/8/24 Sascha Hauer <s.hauer@pengutronix.de>: > This is hopefully the last iteration of the patches for compiling > all ARMv4/v5 based i.MXs together. CONFIG_ARM_PATCH_PHYS_VIRT > lost its experimental status and we can still build uImages > even with CONFIG_AUTO_ZRELADDR enabled. This series selects > these options and makes a multi SoC image the default. > Also, we can now build all i.MX5 SoCs into a single image. > This series also updates the defconfigs. On a mx53 loco board I have rebased Richard's patchset for SATA and got it running, but I see this on mapping on iomem, board is more or less working but I was unsure if this is something significant or just some ugly cosmetic names for mx53 (i.e. imx21-uart.0, imx31-gpio, ..) root at build-arm01:~# cat /proc/iomem 10000000-10000fff : imx53-ahci.0 50004000-50007fff : sdhci-esdhc-imx53.0 50004000-50007fff : mmc0 50020000-50023fff : sdhci-esdhc-imx53.2 50020000-50023fff : mmc1 53f84000-53f87fff : imx31-gpio.0 53f84000-53f87fff : imx31-gpio 53f88000-53f8bfff : imx31-gpio.1 53f88000-53f8bfff : imx31-gpio 53f8c000-53f8ffff : imx31-gpio.2 53f8c000-53f8ffff : imx31-gpio 53f90000-53f93fff : imx31-gpio.3 53f90000-53f93fff : imx31-gpio 53f98000-53f9bfff : imx2-wdt.0 53f98000-53f9bfff : imx2-wdt.0 53fbc000-53fbcfff : imx21-uart.0 53fbc000-53fbcfff : imx-uart 53fdc000-53fdffff : imx31-gpio.4 53fdc000-53fdffff : imx31-gpio 53fe0000-53fe3fff : imx31-gpio.5 53fe0000-53fe3fff : imx31-gpio 53fe4000-53fe7fff : imx31-gpio.6 53fe4000-53fe7fff : imx31-gpio 63fb0000-63fb3fff : imx35-sdma 63fc4000-63fc4fff : imx-i2c.1 63fc4000-63fc4fff : imx-i2c 63fc8000-63fc8fff : imx-i2c.0 63fc8000-63fc8fff : imx-i2c 63fec000-63fecfff : imx25-fec.0 63fec000-63fecfff : imx25-fec 70000000-8fffffff : System RAM 70008000-70411fff : Kernel text 70438000-704b137f : Kernel data -- ?H?ctor Or?n ?-.. . -... .. .- -. ? -.. . ...- . .-.. --- .--. . .-. ^ permalink raw reply [flat|nested] 15+ messages in thread
* i.MX multi SoC patches 2011-08-31 13:02 ` i.MX multi SoC patches Hector Oron @ 2011-08-31 14:05 ` Shawn Guo 0 siblings, 0 replies; 15+ messages in thread From: Shawn Guo @ 2011-08-31 14:05 UTC (permalink / raw) To: linux-arm-kernel On Wed, Aug 31, 2011 at 02:02:58PM +0100, Hector Oron wrote: > Hello, > > > 2011/8/24 Sascha Hauer <s.hauer@pengutronix.de>: > > This is hopefully the last iteration of the patches for compiling > > all ARMv4/v5 based i.MXs together. CONFIG_ARM_PATCH_PHYS_VIRT > > lost its experimental status and we can still build uImages > > even with CONFIG_AUTO_ZRELADDR enabled. This series selects > > these options and makes a multi SoC image the default. > > Also, we can now build all i.MX5 SoCs into a single image. > > This series also updates the defconfigs. > > On a mx53 loco board I have rebased Richard's patchset for SATA and > got it running, but I see this on mapping on iomem, board is more or > less working but I was unsure if this is something significant or just > some ugly cosmetic names for mx53 (i.e. imx21-uart.0, imx31-gpio, ..) > This is expected. The platform_device_id had been used to kill cpu_is_mxXX() stuff from drivers. And we decided to use soc prefix to define IP block version in platform_device_id table, because hardware does not define revisions, and soc is stable enough to identify specific IP block version. -- Regards, Shawn ^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2011-08-31 14:05 UTC | newest] Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2011-08-24 8:03 i.MX multi SoC patches Sascha Hauer 2011-08-24 8:03 ` [PATCH 1/4] ARM i.MX: allow to compile together ARMv4 and ARMv5 based SoCs Sascha Hauer 2011-08-24 8:03 ` [PATCH 2/4] ARM i.MX: allow to compile together all i.MX5 " Sascha Hauer 2011-08-24 8:03 ` [PATCH 3/4] ARM i.MX5: update defconfig Sascha Hauer 2011-08-24 8:03 ` [PATCH 4/4] ARM i.MX defconfigs: use one defconfig for all ARMv4/v5 SoCs Sascha Hauer 2011-08-24 23:03 ` i.MX multi SoC patches Hector Oron 2011-08-25 6:38 ` Sascha Hauer 2011-08-25 11:44 ` hector.oron at gmail.com 2011-08-25 11:44 ` [PATCH] ARM: mx5: fix remaining unconsistent names for irqs hector.oron at gmail.com 2011-08-25 11:52 ` i.MX multi SoC patches Hector Oron 2011-08-25 12:55 ` [PATCH] ARM: mx5: fix remaining unconsistent names for irqs hector.oron at gmail.com 2011-08-25 14:16 ` Arnaud Patard (Rtp) 2011-08-25 14:54 ` Sascha Hauer 2011-08-31 13:02 ` i.MX multi SoC patches Hector Oron 2011-08-31 14:05 ` Shawn Guo
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.