imx patches for 2.6.37
Subsystems (4)
Hello,
here is my patch stack of imx patches for 2.6.37. I rebased Sascha's current imx-for-2.6.37 branch on 2.6.36-rc4 to fix some conflicts in my patches as imx-for-2.6.37 didn't contain some imx patches already in mainline. The series contains five patches to drivers/spi, they were acked by Grant Likely and he's OK with them going via Sascha's tree.
I send all patches that are not in Sascha's for-2.6.37 branch as reply to this mail even if some of them might already have been seen here, to have them all in place.
The following changes since commit 3efee47db7a191443b529740b35240d63ae1ad20:
ARM: mx5/mx51_babbage: Add FEC support (2010-09-27 12:53:00 +0200)
are available in the git repository at:
git://git.pengutronix.de/git/ukl/linux-2.6.git imx/for-2.6.37
Jason Wang (4):
ARM: mx5/clock-mx51: add spi clocks
ARM: mx5/iomux-mx51: add iomux definitions for eCSPI2 on the imx51_3ds board
ARM: mx5/mx51_3ds: add eCSPI2 support on the imx51_3ds board
ARM: mx5/mx51_3ds: add SPI NOR flash in the board init stage
Sascha Hauer (9):
ARM: mx5/mx51_babbage: fix compiler warnings
ARM: mx5/iomux-mx51: Add SPI controller pads
ARM: mx5/iomux-mx51: Add aud3 primary function defines
ARM: mx5/iomux-mx51: Fix input path of some pins in gpio mode
ARM: mx5: Add Nand clock support
ARM: mx51: add imx-ssi devices
ARM: mx51: Add audmux support
ARM: mx5: dynamically register mxc-nand device
ARM: mx5: clock-imx51: make *ipg clocks secondary clocks of their corresponding peripheral clocks
Uwe Kleine-K?nig (27):
ARM: imx: remove #ifdefery for unmerged flexcan driver
ARM: imx: ehci: use void __iomem * to hold i/o addresses
ARM: mx5/mx51_babbage: don't use PHYS_OFFSET
ARM: mx27_defconfig: enable switches used in mx27 code
ARM: mx3_defconfig: add new machine MACH_EUKREA_CPUIMX35
ARM: remove mx31pdk_defconfig
ARM: mx51_defconfig: add new boards MACH_MX51_3DS and MACH_EUKREA_CPUIMX51
ARM: mx51: clean up mx51 header
ARM: mx51: fix naming of spi related defines
ARM: mx51: use IMX_IO_ADDRESS to define MX51_IO_ADDRESS
ARM: imx: change the way spi-imx devices are registered
ARM: imx: change the way imx-uarts are registered
ARM: imx: dynamically allocate imx-ssi devices
ARM: imx: reorganize imx-i2c device registration to use a struct per SoC
ARM: mx5: dynamically register imx-i2c devices
ARM: imx: fix name of macros to add imx-i2c devices
spi/imx: default to m on platforms that have such devices spi/imx: convert driver to use platform ids
spi/imx: get rid of more ifs depending on the used cpu spi/imx: save the spi chip select in config struct, not the gpio to use spi/imx: add support for imx51's eCSPI and CSPI
ARM: imx: use platform ids for spi_imx devices
ARM: mx5: add spi_imx device registration
ARM: mx5/clock-mx51: refactor ccgr callbacks to use common code
ARM: mx5/clock-mx51: new macro that defines a clk with all members
ARM: mx51: dynamically register imx-uart devices
ARM: imx: reorganize nand registration to use a struct
arch/arm/configs/mx27_defconfig | 15 +- arch/arm/configs/mx31pdk_defconfig | 44 -- arch/arm/configs/mx3_defconfig | 2 +- arch/arm/configs/mx51_defconfig | 9 +- arch/arm/mach-imx/Kconfig | 5 +- arch/arm/mach-imx/clock-imx1.c | 2 +- arch/arm/mach-imx/clock-imx21.c | 6 +- arch/arm/mach-imx/clock-imx27.c | 6 +- arch/arm/mach-imx/devices-imx1.h | 14 +- arch/arm/mach-imx/devices-imx21.h | 36 +- arch/arm/mach-imx/devices-imx27.h | 47 +- arch/arm/mach-imx/devices.c | 35 -- arch/arm/mach-imx/devices.h | 2 - arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 6 +- arch/arm/mach-imx/mach-cpuimx27.c | 2 +- arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 4 +- arch/arm/mach-imx/mach-mx1ads.c | 2 +- arch/arm/mach-imx/mach-mx27ads.c | 2 +- arch/arm/mach-imx/mach-mxt_td60.c | 4 +- arch/arm/mach-imx/mach-pca100.c | 7 +- arch/arm/mach-imx/mach-pcm038.c | 2 +- arch/arm/mach-mx25/Kconfig | 4 +- arch/arm/mach-mx25/clock.c | 6 +- arch/arm/mach-mx25/devices-imx25.h | 49 +- arch/arm/mach-mx25/devices.c | 38 -- arch/arm/mach-mx25/devices.h | 2 - arch/arm/mach-mx25/eukrea_mbimxsd-baseboard.c | 6 +- arch/arm/mach-mx3/Kconfig | 6 +- arch/arm/mach-mx3/clock-imx31.c | 6 +- arch/arm/mach-mx3/clock-imx35.c | 4 +- arch/arm/mach-mx3/devices-imx31.h | 49 +- arch/arm/mach-mx3/devices-imx35.h | 40 +- arch/arm/mach-mx3/devices.c | 42 -- arch/arm/mach-mx3/devices.h | 3 - arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c | 6 +- arch/arm/mach-mx3/mach-mx31ads.c | 2 +- arch/arm/mach-mx3/mach-pcm043.c | 5 +- arch/arm/mach-mx5/Kconfig | 7 + arch/arm/mach-mx5/board-cpuimx51.c | 12 +- arch/arm/mach-mx5/board-mx51_3ds.c | 42 ++- arch/arm/mach-mx5/board-mx51_babbage.c | 16 +- arch/arm/mach-mx5/clock-mx51.c | 226 +++++++- arch/arm/mach-mx5/devices-imx51.h | 34 ++ arch/arm/mach-mx5/devices.c | 95 ---- arch/arm/mach-mx5/devices.h | 5 - arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c | 7 +- arch/arm/plat-mxc/audmux-v2.c | 8 +- arch/arm/plat-mxc/devices/Kconfig | 3 + arch/arm/plat-mxc/devices/Makefile | 6 +- arch/arm/plat-mxc/devices/platform-imx-i2c.c | 84 +++- arch/arm/plat-mxc/devices/platform-imx-ssi.c | 107 ++++ arch/arm/plat-mxc/devices/platform-imx-uart.c | 137 ++++- arch/arm/plat-mxc/devices/platform-mxc_nand.c | 85 +++- arch/arm/plat-mxc/devices/platform-spi_imx.c | 89 +++- arch/arm/plat-mxc/ehci.c | 4 +- arch/arm/plat-mxc/include/mach/devices-common.h | 93 +++- arch/arm/plat-mxc/include/mach/iomux-mx51.h | 33 +- arch/arm/plat-mxc/include/mach/mx21.h | 2 +- arch/arm/plat-mxc/include/mach/mx25.h | 11 +- arch/arm/plat-mxc/include/mach/mx27.h | 2 +- arch/arm/plat-mxc/include/mach/mx31.h | 11 +- arch/arm/plat-mxc/include/mach/mx35.h | 11 +- arch/arm/plat-mxc/include/mach/mx51.h | 657 +++++++++++------------ drivers/spi/Kconfig | 16 + drivers/spi/spi_imx.c | 394 +++++++++++--- 65 files changed, 1716 insertions(+), 1001 deletions(-) delete mode 100644 arch/arm/configs/mx31pdk_defconfig create mode 100644 arch/arm/mach-mx5/devices-imx51.h create mode 100644 arch/arm/plat-mxc/devices/platform-imx-ssi.c
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
PATCH 1/40 ARM: imx: remove #ifdefery for unmerged flexcan driver
The flexcan driver was merged as e955cead.
--- arch/arm/plat-mxc/devices/Makefile | 5 +---- arch/arm/plat-mxc/include/mach/devices-common.h | 12 ------------ 2 files changed, 1 insertions(+), 16 deletions(-)
arch/arm/plat-mxc/devices/Makefile +1 -4
@@ -1,7 +1,4 @@ -ifdef CONFIG_CAN_FLEXCAN -# the ifdef can be removed once the flexcan driver has been merged -obj-$(CONFIG_IMX_HAVE_PLATFORM_FLEXCAN) += platform-flexcan.o -endif +obj-$(CONFIG_IMX_HAVE_PLATFORM_FLEXCAN) += platform-flexcan.o obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_I2C) += platform-imx-i2c.o obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_UART) += platform-imx-uart.o obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_NAND) += platform-mxc_nand.o
arch/arm/plat-mxc/include/mach/devices-common.h +0 -12
@@ -14,23 +14,11 @@ struct platform_device *imx_add_platform_device(const char *name, int id, const struct resource *res, unsigned int num_resources, const void *data, size_t size_data); -#if defined (CONFIG_CAN_FLEXCAN ) || defined (CONFIG_CAN_FLEXCAN_MODULE )#include <linux/can/platform/flexcan.h> struct platform_device *__init imx_add_flexcan (int id,resource_size_t iobase,resource_size_t iosize,resource_size_t irq,const struct flexcan_platform_data *pdata); -#else -/* the ifdef can be removed once the flexcan driver has been merged */ -struct flexcan_platform_data ; -static inline struct platform_device *__init imx_add_flexcan (int id, -resource_size_t iobase,resource_size_t iosize, -resource_size_t irq, -const struct flexcan_platform_data *pdata) -{ -return NULL ; -} -#endif #include <mach/i2c.h> struct platform_device *__init imx_add_imx_i2c(int id,
Signature · 1 line
1.7.2.3
PATCH 2/40 ARM: imx: ehci: use void __iomem * to hold i/o addresses
In reply to Uwe Kleine-KönigThis fixes:
arch/arm/plat-mxc/ehci.c: In function 'mxc_initialize_usb_hw':
arch/arm/plat-mxc/ehci.c:260: warning: assignment makes integer from pointer without a cast arch/arm/plat-mxc/ehci.c:263: warning: assignment makes integer from pointer without a cast arch/arm/plat-mxc/ehci.c:270: warning: assignment makes integer from pointer without a cast
--- arch/arm/plat-mxc/ehci.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/plat-mxc/ehci.c +2 -2
@@ -249,8 +249,8 @@ int mxc_initialize_usb_hw(int port, unsigned int flags)#ifdef CONFIG_ARCH_MX51 if (cpu_is_mx51 ()) {void __iomem *usb_base; -u32 usbotg_base; -u32 usbother_base; +void __iomem *usbotg_base; +void __iomem *usbother_base;int ret =0 ; usb_base =ioremap (MX51_OTG_BASE_ADDR ,SZ_4K );
Signature · 1 line
1.7.2.3
PATCH 3/40 ARM: mx5/mx51_babbage: fix compiler warnings
In reply to Uwe Kleine-KönigFrom: Sascha Hauer <[email protected]>
--- arch/arm/mach-mx5/board-mx51_babbage.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-mx5/board-mx51_babbage.c +2 -2
@@ -218,7 +218,7 @@ static int initialize_otg_port(struct platform_device *pdev) {u32 v;void __iomem *usb_base; -u32 usbother_base; +void __iomem *usbother_base; usb_base =ioremap (MX51_OTG_BASE_ADDR ,SZ_4K ); usbother_base = usb_base +MX5_USBOTHER_REGS_OFFSET ;
@@ -236,7 +236,7 @@ static int initialize_usbh1_port(struct platform_device *pdev) {u32 v;void __iomem *usb_base; -u32 usbother_base; +void __iomem *usbother_base; usb_base =ioremap (MX51_OTG_BASE_ADDR ,SZ_4K ); usbother_base = usb_base +MX5_USBOTHER_REGS_OFFSET ;
Signature · 1 line
1.7.2.3
PATCH 4/40 ARM: mx5/mx51_babbage: don't use PHYS_OFFSET
In reply to Uwe Kleine-König--- arch/arm/mach-mx5/board-mx51_babbage.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-mx5/board-mx51_babbage.c +1 -1
@@ -324,7 +324,7 @@ MACHINE_START(MX51_BABBAGE, "Freescale MX51 Babbage Board")/* Maintainer: Amit Kucheria <[email protected]> */ .phys_io = MX51_AIPS1_BASE_ADDR, .io_pg_offst = ((MX51_AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc, - .boot_params = PHYS_OFFSET + 0x100, + .boot_params = MX51_PHYS_OFFSET + 0x100, .map_io = mx51_map_io, .init_irq = mx51_init_irq, .init_machine = mxc_board_init,
Signature · 1 line
1.7.2.3
PATCH 5/40 ARM: mx27_defconfig: enable switches used in mx27 code
In reply to Uwe Kleine-König- enable all mx27 machines (MACH_CPUIMX27, MACH_IMX27_VISSTRIM_M10, MACH_PCA100, MACH_MXT_TD60) including optional features for CPUIMX27
- eukrea_mbimx27-baseboard.c uses TOUCHSCREEN_ADS7846
- mach-cpuimx27.c uses SERIAL_8250
- several machines make use of SPI_IMX (selects SPI_BITBANG)
- drop VGA_CONSOLE as this isn't selectable anymore since fb78b51cb11e
- several machines make use of USB_ULPI (depends on USB, but don't enable USB_DEVICE_CLASS as it's deprecated)
--- arch/arm/configs/mx27_defconfig | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-)
arch/arm/configs/mx27_defconfig +12 -3
@@ -21,8 +21,14 @@ 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
@@ -76,7 +82,9 @@ 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
@@ -85,19 +93,20 @@ CONFIG_I2C=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_IMX=y CONFIG_SPI=y -CONFIG_SPI_BITBANG=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_VGA_CONSOLE is not set CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FONTS=y CONFIG_FONT_8x8=y # CONFIG_HID_SUPPORT is not set -# CONFIG_USB_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
Signature · 1 line
1.7.2.3
PATCH 6/40 ARM: mx3_defconfig: add new machine MACH_EUKREA_CPUIMX35
In reply to Uwe Kleine-KönigFurthermore INOTIFY is gone since
2dfc1ca (inotify: remove inotify in kernel interface)
--- arch/arm/configs/mx3_defconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/configs/mx3_defconfig +1 -1
@@ -24,6 +24,7 @@ CONFIG_MACH_PCM043=y CONFIG_MACH_ARMADILLO5X0=y CONFIG_MACH_MX35_3DS=y CONFIG_MACH_KZM_ARM11_01=y +CONFIG_MACH_EUKREA_CPUIMX35=y CONFIG_MXC_IRQ_PRIOR=y CONFIG_MXC_PWM=y CONFIG_NO_HZ=y
@@ -108,7 +109,6 @@ CONFIG_MMC=y CONFIG_MMC_MXC=y CONFIG_DMADEVICES=y # CONFIG_DNOTIFY is not set -CONFIG_INOTIFY=y CONFIG_TMPFS=y CONFIG_JFFS2_FS=y CONFIG_UBIFS_FS=y
Signature · 1 line
1.7.2.3
PATCH 7/40 ARM: remove mx31pdk_defconfig
In reply to Uwe Kleine-KönigThis machine is enabled in mx3_defconfig and so mx31pdk_defconfig isn't really useful.
--- arch/arm/configs/mx31pdk_defconfig | 44 ------------------------------------ 1 files changed, 0 insertions(+), 44 deletions(-) delete mode 100644 arch/arm/configs/mx31pdk_defconfig
arch/arm/configs/mx31pdk_defconfig deleted +0 -44
@@ -1,44 +0,0 @@ -# CONFIG_LOCALVERSION_AUTO is not set -# CONFIG_SWAP is not set -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -# CONFIG_COMPAT_BRK is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_MXC=y -# CONFIG_MACH_MX31ADS is not set -CONFIG_MACH_MX31_3DS=y -CONFIG_AEABI=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_NET_KEY=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_LRO is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_PREVENT_FIRMWARE_BUILD is not set -# CONFIG_FIRMWARE_IN_KERNEL is not set -# CONFIG_BLK_DEV is not set -# CONFIG_MISC_DEVICES is not set -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -# CONFIG_DEVKMEM 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_HWMON is not set -# CONFIG_VGA_CONSOLE is not set -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -# CONFIG_DNOTIFY is not set -# CONFIG_ENABLE_WARN_DEPRECATED is not set -# CONFIG_ENABLE_MUST_CHECK is not set -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -# CONFIG_CRYPTO_ANSI_CPRNG is not set -# CONFIG_CRC32 is not set
Signature · 1 line
1.7.2.3
PATCH 8/40 ARM: mx51_defconfig: add new boards MACH_MX51_3DS and MACH_EUKREA_CPUIMX51
In reply to Uwe Kleine-KönigFurther remove FIXED_PHY as it breaks the ethernet. VGA_CONSOLE isn't selectable anymore since fb78b51cb11e. EXT3_DEFAULTS_TO_ORDERED defaults to y since aa32a796389b. INOTIFY is gone since 2dfc1cae4c42. CONFIG_DETECT_SOFTLOCKUP is gone since e16bb1d7fe07. Enable TMPFS for udev.
KEYS is selected by NFS_USE_KERNEL_DNS
--- arch/arm/configs/mx51_defconfig | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-)
arch/arm/configs/mx51_defconfig +3 -6
@@ -15,6 +15,8 @@ CONFIG_MODULE_SRCVERSION_ALL=y CONFIG_ARCH_MXC=y CONFIG_ARCH_MX5=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
@@ -69,7 +71,6 @@ CONFIG_REALTEK_PHY=y CONFIG_NATIONAL_PHY=y CONFIG_STE10XP=y CONFIG_LSI_ET1011C_PHY=y -CONFIG_FIXED_PHY=y CONFIG_MDIO_BITBANG=y CONFIG_MDIO_GPIO=y CONFIG_NET_ETHERNET=y
@@ -100,7 +101,6 @@ CONFIG_I2C_ALGOPCF=m CONFIG_I2C_ALGOPCA=m CONFIG_GPIO_SYSFS=y # CONFIG_HWMON is not set -# CONFIG_VGA_CONSOLE is not set # CONFIG_HID_SUPPORT is not set CONFIG_USB=y CONFIG_USB_EHCI_HCD=y
@@ -117,13 +117,11 @@ CONFIG_EXT2_FS_XATTR=y CONFIG_EXT2_FS_POSIX_ACL=y CONFIG_EXT2_FS_SECURITY=y CONFIG_EXT3_FS=y -CONFIG_EXT3_DEFAULTS_TO_ORDERED=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_INOTIFY=y CONFIG_QUOTA=y CONFIG_QUOTA_NETLINK_INTERFACE=y # CONFIG_PRINT_QUOTA_WARNING is not set
@@ -136,6 +134,7 @@ 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
@@ -151,7 +150,6 @@ CONFIG_NLS_UTF8=y CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_FS=y CONFIG_DEBUG_KERNEL=y -# CONFIG_DETECT_SOFTLOCKUP is not set # CONFIG_SCHED_DEBUG is not set # CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -159,7 +157,6 @@ CONFIG_DEBUG_KERNEL=y # CONFIG_ARM_UNWIND is not set CONFIG_DEBUG_LL=y CONFIG_EARLY_PRINTK=y -CONFIG_KEYS=y CONFIG_SECURITYFS=y CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_LZO=y
Signature · 1 line
1.7.2.3
PATCH 9/40 ARM: mx51: clean up mx51 header
In reply to Uwe Kleine-KönigThis makes the header more look like the other ones, i.e.
- sort #defines by value
- use lowercase hex constants
- use a consistently named header guard
--- arch/arm/plat-mxc/include/mach/mx51.h | 608 ++++++++++++++++----------------- 1 files changed, 300 insertions(+), 308 deletions(-)
arch/arm/plat-mxc/include/mach/mx51.h +300 -308
@@ -1,5 +1,5 @@ -#ifndef __ASM_ARCH_MXC_MX51_H__ -#define __ASM_ARCH_MXC_MX51_H__ +#ifndef __MACH_MX51_H__ +#define __MACH_MX51_H__/* * MX51 memory map:
@@ -7,24 +7,23 @@* * Virt Phys Size What * --------------------------------------------------------------------------- -* FA3E0000 1FFE0000 128K IRAM (SCCv2 RAM) +* fa3e0000 1ffe0000 128K IRAM (SCCv2 RAM) * 30000000 256M GPU * 40000000 512M IPU -* FA200000 60000000 1M DEBUG -* FB100000 70000000 1M SPBA 0 -* FB000000 73F00000 1M AIPS 1 -* FB200000 83F00000 1M AIPS 2 -* 8FFFC000 16K TZIC (interrupt controller) +* fa200000 60000000 1M DEBUG +* fb100000 70000000 1M SPBA 0 +* fb000000 73f00000 1M AIPS 1 +* fb200000 83f00000 1M AIPS 2 +* 8fffc000 16K TZIC (interrupt controller) * 90000000 256M CSD0 SDRAM/DDR -* A0000000 256M CSD1 SDRAM/DDR -* B0000000 128M CS0 Flash -* B8000000 128M CS1 Flash -* C0000000 128M CS2 Flash -* C8000000 64M CS3 Flash -* CC000000 32M CS4 SRAM -* CE000000 32M CS5 SRAM -* CFFF0000 64K NFC (NAND Flash AXI) -* +* a0000000 256M CSD1 SDRAM/DDR +* b0000000 128M CS0 Flash +* b8000000 128M CS1 Flash +* c0000000 128M CS2 Flash +* c8000000 64M CS3 Flash +* cc000000 32M CS4 SRAM +* ce000000 32M CS5 SRAM +* cfff0000 64K NFC (NAND Flash AXI) */ /*
@@ -36,65 +35,140 @@/* * IRAM */ -#define MX51_IRAM_BASE_ADDR 0x1FFE0000/* internal ram */ -#define MX51_IRAM_BASE_ADDR_VIRT 0xFA3E0000 +#define MX51_IRAM_BASE_ADDR 0x1ffe0000/* internal ram */ +#define MX51_IRAM_BASE_ADDR_VIRT 0xfa3e0000#define MX51_IRAM_PARTITIONS 16 -#define MX51_IRAM_PARTITIONS_TO1 12#define MX51_IRAM_SIZE (MX51_IRAM_PARTITIONS * SZ_8K)/* 128KB */ +#define MX51_GPU_BASE_ADDR 0x20000000 +#define MX51_GPU_CTRL_BASE_ADDR 0x30000000 +#define MX51_IPU_CTRL_BASE_ADDR 0x40000000 + +#define MX51_DEBUG_BASE_ADDR 0x60000000 +#define MX51_DEBUG_BASE_ADDR_VIRT 0xfa200000 +#define MX51_DEBUG_SIZE SZ_1M + +#define MX51_ETB_BASE_ADDR (MX51_DEBUG_BASE_ADDR + 0x01000) +#define MX51_ETM_BASE_ADDR (MX51_DEBUG_BASE_ADDR + 0x02000) +#define MX51_TPIU_BASE_ADDR (MX51_DEBUG_BASE_ADDR + 0x03000) +#define MX51_CTI0_BASE_ADDR (MX51_DEBUG_BASE_ADDR + 0x04000) +#define MX51_CTI1_BASE_ADDR (MX51_DEBUG_BASE_ADDR + 0x05000) +#define MX51_CTI2_BASE_ADDR (MX51_DEBUG_BASE_ADDR + 0x06000) +#define MX51_CTI3_BASE_ADDR (MX51_DEBUG_BASE_ADDR + 0x07000) +#define MX51_CORTEX_DBG_BASE_ADDR (MX51_DEBUG_BASE_ADDR + 0x08000) +/* -* NFC +* SPBA global module enabled #0 */ -#define MX51_NFC_AXI_BASE_ADDR 0xCFFF0000/* NAND flash AXI */ -#define MX51_NFC_AXI_SIZE SZ_64K +#define MX51_SPBA0_BASE_ADDR 0x70000000 +#define MX51_SPBA0_BASE_ADDR_VIRT 0xfb100000 +#define MX51_SPBA0_SIZE SZ_1M + +#define MX51_MMC_SDHC1_BASE_ADDR (MX51_SPBA0_BASE_ADDR + 0x04000) +#define MX51_MMC_SDHC2_BASE_ADDR (MX51_SPBA0_BASE_ADDR + 0x08000) +#define MX51_UART3_BASE_ADDR (MX51_SPBA0_BASE_ADDR + 0x0c000) +#define MX51_CSPI1_BASE_ADDR (MX51_SPBA0_BASE_ADDR + 0x10000) +#define MX51_SSI2_BASE_ADDR (MX51_SPBA0_BASE_ADDR + 0x14000) +#define MX51_MMC_SDHC3_BASE_ADDR (MX51_SPBA0_BASE_ADDR + 0x20000) +#define MX51_MMC_SDHC4_BASE_ADDR (MX51_SPBA0_BASE_ADDR + 0x24000) +#define MX51_SPDIF_BASE_ADDR (MX51_SPBA0_BASE_ADDR + 0x28000) +#define MX51_ATA_DMA_BASE_ADDR (MX51_SPBA0_BASE_ADDR + 0x30000) +#define MX51_SLIM_DMA_BASE_ADDR (MX51_SPBA0_BASE_ADDR + 0x34000) +#define MX51_HSI2C_DMA_BASE_ADDR (MX51_SPBA0_BASE_ADDR + 0x38000) +#define MX51_SPBA_CTRL_BASE_ADDR (MX51_SPBA0_BASE_ADDR + 0x3c000)/* -* Graphics Memory of GPU +* AIPS 1 */ -#define MX51_GPU_BASE_ADDR 0x20000000 -#define MX51_GPU2D_BASE_ADDR 0xD0000000 +#define MX51_AIPS1_BASE_ADDR 0x73f00000 +#define MX51_AIPS1_BASE_ADDR_VIRT 0xfb000000 +#define MX51_AIPS1_SIZE SZ_1M + +#define MX51_OTG_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0x80000) +#define MX51_GPIO1_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0x84000) +#define MX51_GPIO2_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0x88000) +#define MX51_GPIO3_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0x8c000) +#define MX51_GPIO4_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0x90000) +#define MX51_KPP_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0x94000) +#define MX51_WDOG_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0x98000) +#define MX51_WDOG2_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0x9c000) +#define MX51_GPT1_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0xa0000) +#define MX51_SRTC_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0xa4000) +#define MX51_IOMUXC_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0xa8000) +#define MX51_EPIT1_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0xac000) +#define MX51_EPIT2_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0xb0000) +#define MX51_PWM1_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0xb4000) +#define MX51_PWM2_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0xb8000) +#define MX51_UART1_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0xbc000) +#define MX51_UART2_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0xc0000) +#define MX51_SRC_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0xd0000) +#define MX51_CCM_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0xd4000) +#define MX51_GPC_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0xd8000) -#define MX51_TZIC_BASE_ADDR_TO1 0x8FFFC000 -#define MX51_TZIC_BASE_ADDR 0xE0000000 +/* +* AIPS 2 +*/ +#define MX51_AIPS2_BASE_ADDR 0x83f00000 +#define MX51_AIPS2_BASE_ADDR_VIRT 0xfb200000 +#define MX51_AIPS2_SIZE SZ_1M -#define MX51_DEBUG_BASE_ADDR 0x60000000 -#define MX51_DEBUG_BASE_ADDR_VIRT 0xFA200000 -#define MX51_DEBUG_SIZE SZ_1M -#define MX51_ETB_BASE_ADDR (MX51_DEBUG_BASE_ADDR + 0x00001000) -#define MX51_ETM_BASE_ADDR (MX51_DEBUG_BASE_ADDR + 0x00002000) -#define MX51_TPIU_BASE_ADDR (MX51_DEBUG_BASE_ADDR + 0x00003000) -#define MX51_CTI0_BASE_ADDR (MX51_DEBUG_BASE_ADDR + 0x00004000) -#define MX51_CTI1_BASE_ADDR (MX51_DEBUG_BASE_ADDR + 0x00005000) -#define MX51_CTI2_BASE_ADDR (MX51_DEBUG_BASE_ADDR + 0x00006000) -#define MX51_CTI3_BASE_ADDR (MX51_DEBUG_BASE_ADDR + 0x00007000) -#define MX51_CORTEX_DBG_BASE_ADDR (MX51_DEBUG_BASE_ADDR + 0x00008000) +#define MX51_PLL1_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0x80000) +#define MX51_PLL2_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0x84000) +#define MX51_PLL3_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0x88000) +#define MX51_AHBMAX_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0x94000) +#define MX51_IIM_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0x98000) +#define MX51_CSU_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0x9c000) +#define MX51_ARM_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xa0000) +#define MX51_OWIRE_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xa4000) +#define MX51_FIRI_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xa8000) +#define MX51_CSPI2_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xac000) +#define MX51_SDMA_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xb0000) +#define MX51_SCC_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xb4000) +#define MX51_ROMCP_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xb8000) +#define MX51_RTIC_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xbc000) +#define MX51_CSPI3_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xc0000) +#define MX51_I2C2_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xc4000) +#define MX51_I2C1_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xc8000) +#define MX51_SSI1_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xcc000) +#define MX51_AUDMUX_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xd0000) +#define MX51_M4IF_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xd8000) +#define MX51_ESDCTL_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xd9000) +#define MX51_WEIM_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xda000) +#define MX51_NFC_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xdb000) +#define MX51_EMI_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xdbf00) +#define MX51_MIPI_HSC_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xdc000) +#define MX51_ATA_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xe0000) +#define MX51_SIM_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xe4000) +#define MX51_SSI3BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xe8000) +#define MX51_MXC_FEC_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xec000) +#define MX51_TVE_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xf0000) +#define MX51_VPU_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xf4000) +#define MX51_SAHARA_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xf8000) + +#define MX51_CSD0_BASE_ADDR 0x90000000 +#define MX51_CSD1_BASE_ADDR 0xa0000000 +#define MX51_CS0_BASE_ADDR 0xb0000000 +#define MX51_CS1_BASE_ADDR 0xb8000000 +#define MX51_CS2_BASE_ADDR 0xc0000000 +#define MX51_CS3_BASE_ADDR 0xc8000000 +#define MX51_CS4_BASE_ADDR 0xcc000000 +#define MX51_CS5_BASE_ADDR 0xce000000/* -* SPBA global module enabled #0 +* NFC */ -#define MX51_SPBA0_BASE_ADDR 0x70000000 -#define MX51_SPBA0_BASE_ADDR_VIRT 0xFB100000 -#define MX51_SPBA0_SIZE SZ_1M +#define MX51_NFC_AXI_BASE_ADDR 0xcfff0000/* NAND flash AXI */ +#define MX51_NFC_AXI_SIZE SZ_64K -#define MX51_MMC_SDHC1_BASE_ADDR (MX51_SPBA0_BASE_ADDR + 0x00004000) -#define MX51_MMC_SDHC2_BASE_ADDR (MX51_SPBA0_BASE_ADDR + 0x00008000) -#define MX51_UART3_BASE_ADDR (MX51_SPBA0_BASE_ADDR + 0x0000C000) -#define MX51_CSPI1_BASE_ADDR (MX51_SPBA0_BASE_ADDR + 0x00010000) -#define MX51_SSI2_BASE_ADDR (MX51_SPBA0_BASE_ADDR + 0x00014000) -#define MX51_MMC_SDHC3_BASE_ADDR (MX51_SPBA0_BASE_ADDR + 0x00020000) -#define MX51_MMC_SDHC4_BASE_ADDR (MX51_SPBA0_BASE_ADDR + 0x00024000) -#define MX51_SPDIF_BASE_ADDR (MX51_SPBA0_BASE_ADDR + 0x00028000) -#define MX51_ATA_DMA_BASE_ADDR (MX51_SPBA0_BASE_ADDR + 0x00030000) -#define MX51_SLIM_DMA_BASE_ADDR (MX51_SPBA0_BASE_ADDR + 0x00034000) -#define MX51_HSI2C_DMA_BASE_ADDR (MX51_SPBA0_BASE_ADDR + 0x00038000) -#define MX51_SPBA_CTRL_BASE_ADDR (MX51_SPBA0_BASE_ADDR + 0x0003C000) +#define MX51_GPU2D_BASE_ADDR 0xd0000000 +#define MX51_TZIC_BASE_ADDR 0xe0000000/* * defines for SPBA modules */ #define MX51_SPBA_SDHC1 0x04#define MX51_SPBA_SDHC2 0x08 -#define MX51_SPBA_UART3 0x0C +#define MX51_SPBA_UART3 0x0c#define MX51_SPBA_CSPI1 0x10#define MX51_SPBA_SSI2 0x14#define MX51_SPBA_SDHC3 0x20
@@ -103,35 +177,7 @@#define MX51_SPBA_ATA 0x30#define MX51_SPBA_SLIM 0x34#define MX51_SPBA_HSI2C 0x38 -#define MX51_SPBA_CTRL 0x3C - -/* -* AIPS 1 -*/ -#define MX51_AIPS1_BASE_ADDR 0x73F00000 -#define MX51_AIPS1_BASE_ADDR_VIRT 0xFB000000 -#define MX51_AIPS1_SIZE SZ_1M - -#define MX51_OTG_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0x00080000) -#define MX51_GPIO1_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0x00084000) -#define MX51_GPIO2_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0x00088000) -#define MX51_GPIO3_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0x0008C000) -#define MX51_GPIO4_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0x00090000) -#define MX51_KPP_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0x00094000) -#define MX51_WDOG_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0x00098000) -#define MX51_WDOG2_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0x0009C000) -#define MX51_GPT1_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0x000A0000) -#define MX51_SRTC_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0x000A4000) -#define MX51_IOMUXC_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0x000A8000) -#define MX51_EPIT1_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0x000AC000) -#define MX51_EPIT2_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0x000B0000) -#define MX51_PWM1_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0x000B4000) -#define MX51_PWM2_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0x000B8000) -#define MX51_UART1_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0x000BC000) -#define MX51_UART2_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0x000C0000) -#define MX51_SRC_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0x000D0000) -#define MX51_CCM_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0x000D4000) -#define MX51_GPC_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0x000D8000) +#define MX51_SPBA_CTRL 0x3c/* * Defines for modules using static and dynamic DMA channels
@@ -164,60 +210,6 @@#define MX51_MXC_DMA_CHANNEL_ATA_TX MXC_DMA_DYNAMIC_CHANNEL#define MX51_MXC_DMA_CHANNEL_MEMORY MXC_DMA_DYNAMIC_CHANNEL -/* -* AIPS 2 -*/ -#define MX51_AIPS2_BASE_ADDR 0x83F00000 -#define MX51_AIPS2_BASE_ADDR_VIRT 0xFB200000 -#define MX51_AIPS2_SIZE SZ_1M - -#define MX51_PLL1_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0x00080000) -#define MX51_PLL2_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0x00084000) -#define MX51_PLL3_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0x00088000) -#define MX51_AHBMAX_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0x00094000) -#define MX51_IIM_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0x00098000) -#define MX51_CSU_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0x0009C000) -#define MX51_ARM_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0x000A0000) -#define MX51_OWIRE_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0x000A4000) -#define MX51_FIRI_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0x000A8000) -#define MX51_CSPI2_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0x000AC000) -#define MX51_SDMA_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0x000B0000) -#define MX51_SCC_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0x000B4000) -#define MX51_ROMCP_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0x000B8000) -#define MX51_RTIC_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0x000BC000) -#define MX51_CSPI3_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0x000C0000) -#define MX51_I2C2_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0x000C4000) -#define MX51_I2C1_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0x000C8000) -#define MX51_SSI1_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0x000CC000) -#define MX51_AUDMUX_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0x000D0000) -#define MX51_M4IF_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0x000D8000) -#define MX51_ESDCTL_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0x000D9000) -#define MX51_WEIM_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0x000DA000) -#define MX51_NFC_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0x000DB000) -#define MX51_EMI_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0x000DBF00) -#define MX51_MIPI_HSC_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0x000DC000) -#define MX51_ATA_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0x000E0000) -#define MX51_SIM_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0x000E4000) -#define MX51_SSI3BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0x000E8000) -#define MX51_MXC_FEC_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0x000EC000) -#define MX51_TVE_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0x000F0000) -#define MX51_VPU_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0x000F4000) -#define MX51_SAHARA_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0x000F8000) - -/* -* Memory regions and CS -*/ -#define MX51_GPU_CTRL_BASE_ADDR 0x30000000 -#define MX51_IPU_CTRL_BASE_ADDR 0x40000000 -#define MX51_CSD0_BASE_ADDR 0x90000000 -#define MX51_CSD1_BASE_ADDR 0xA0000000 -#define MX51_CS0_BASE_ADDR 0xB0000000 -#define MX51_CS1_BASE_ADDR 0xB8000000 -#define MX51_CS2_BASE_ADDR 0xC0000000 -#define MX51_CS3_BASE_ADDR 0xC8000000 -#define MX51_CS4_BASE_ADDR 0xCC000000 -#define MX51_CS5_BASE_ADDR 0xCE000000 -/* Does given address belongs to the specified memory region? */ #define ADDRESS_IN_REGION (addr, start, size) \ (((addr) >= (start)) && ((addr) < (start)+(size)))
@@ -230,7 +222,7 @@* This macro defines the physical to virtual address mapping for all the * peripheral modules. It is used by passing in the physical address as x * and returning the virtual address. If the physical address is not mapped, -* it returns 0xDEADBEEF +* it returns 0xdeadbeef */ #define MX51_IO_ADDRESS (x) \
@@ -240,7 +232,7 @@MX51_IS_MODULE (x,SPBA0 ) ?MX51_SPBA0_IO_ADDRESS (x) : \MX51_IS_MODULE (x,AIPS1 ) ?MX51_AIPS1_IO_ADDRESS (x) : \MX51_IS_MODULE (x,AIPS2 ) ?MX51_AIPS2_IO_ADDRESS (x) : \ - 0xDEADBEEF) + 0xdeadbeef)/* * define the address mapping macros: in physical address order
@@ -265,181 +257,181 @@/* * DMA request assignments */ -#define MX51_DMA_REQ_SSI3_TX1 47 -#define MX51_DMA_REQ_SSI3_RX1 46 -#define MX51_DMA_REQ_SPDIF 45 -#define MX51_DMA_REQ_UART3_TX 44 -#define MX51_DMA_REQ_UART3_RX 43 -#define MX51_DMA_REQ_SLIM_B_TX 42 -#define MX51_DMA_REQ_SDHC4 41 -#define MX51_DMA_REQ_SDHC3 40 -#define MX51_DMA_REQ_CSPI_TX 39 -#define MX51_DMA_REQ_CSPI_RX 38 -#define MX51_DMA_REQ_SSI3_TX2 37 -#define MX51_DMA_REQ_IPU 36 -#define MX51_DMA_REQ_SSI3_RX2 35 -#define MX51_DMA_REQ_EPIT2 34 -#define MX51_DMA_REQ_CTI2_1 33 -#define MX51_DMA_REQ_EMI_WR 32 -#define MX51_DMA_REQ_CTI2_0 31 -#define MX51_DMA_REQ_EMI_RD 30 -#define MX51_DMA_REQ_SSI1_TX1 29 -#define MX51_DMA_REQ_SSI1_RX1 28 -#define MX51_DMA_REQ_SSI1_TX2 27 -#define MX51_DMA_REQ_SSI1_RX2 26 -#define MX51_DMA_REQ_SSI2_TX1 25 -#define MX51_DMA_REQ_SSI2_RX1 24 -#define MX51_DMA_REQ_SSI2_TX2 23 -#define MX51_DMA_REQ_SSI2_RX2 22 -#define MX51_DMA_REQ_SDHC2 21 -#define MX51_DMA_REQ_SDHC1 20 -#define MX51_DMA_REQ_UART1_TX 19 -#define MX51_DMA_REQ_UART1_RX 18 -#define MX51_DMA_REQ_UART2_TX 17 -#define MX51_DMA_REQ_UART2_RX 16 -#define MX51_DMA_REQ_GPU 15 -#define MX51_DMA_REQ_EXTREQ1 14 -#define MX51_DMA_REQ_FIRI_TX 13 -#define MX51_DMA_REQ_FIRI_RX 12 -#define MX51_DMA_REQ_HS_I2C_RX 11 -#define MX51_DMA_REQ_HS_I2C_TX 10 -#define MX51_DMA_REQ_CSPI2_TX 9 -#define MX51_DMA_REQ_CSPI2_RX 8 -#define MX51_DMA_REQ_CSPI1_TX 7 -#define MX51_DMA_REQ_CSPI1_RX 6 -#define MX51_DMA_REQ_SLIM_B 5 -#define MX51_DMA_REQ_ATA_TX_END 4 -#define MX51_DMA_REQ_ATA_TX 3 -#define MX51_DMA_REQ_ATA_RX 2 -#define MX51_DMA_REQ_GPC 1 -#define MX51_DMA_REQ_VPU 0 +#define MX51_DMA_REQ_VPU 0 +#define MX51_DMA_REQ_GPC 1 +#define MX51_DMA_REQ_ATA_RX 2 +#define MX51_DMA_REQ_ATA_TX 3 +#define MX51_DMA_REQ_ATA_TX_END 4 +#define MX51_DMA_REQ_SLIM_B 5 +#define MX51_DMA_REQ_CSPI1_RX 6 +#define MX51_DMA_REQ_CSPI1_TX 7 +#define MX51_DMA_REQ_CSPI2_RX 8 +#define MX51_DMA_REQ_CSPI2_TX 9 +#define MX51_DMA_REQ_HS_I2C_TX 10 +#define MX51_DMA_REQ_HS_I2C_RX 11 +#define MX51_DMA_REQ_FIRI_RX 12 +#define MX51_DMA_REQ_FIRI_TX 13 +#define MX51_DMA_REQ_EXTREQ1 14 +#define MX51_DMA_REQ_GPU 15 +#define MX51_DMA_REQ_UART2_RX 16 +#define MX51_DMA_REQ_UART2_TX 17 +#define MX51_DMA_REQ_UART1_RX 18 +#define MX51_DMA_REQ_UART1_TX 19 +#define MX51_DMA_REQ_SDHC1 20 +#define MX51_DMA_REQ_SDHC2 21 +#define MX51_DMA_REQ_SSI2_RX2 22 +#define MX51_DMA_REQ_SSI2_TX2 23 +#define MX51_DMA_REQ_SSI2_RX1 24 +#define MX51_DMA_REQ_SSI2_TX1 25 +#define MX51_DMA_REQ_SSI1_RX2 26 +#define MX51_DMA_REQ_SSI1_TX2 27 +#define MX51_DMA_REQ_SSI1_RX1 28 +#define MX51_DMA_REQ_SSI1_TX1 29 +#define MX51_DMA_REQ_EMI_RD 30 +#define MX51_DMA_REQ_CTI2_0 31 +#define MX51_DMA_REQ_EMI_WR 32 +#define MX51_DMA_REQ_CTI2_1 33 +#define MX51_DMA_REQ_EPIT2 34 +#define MX51_DMA_REQ_SSI3_RX2 35 +#define MX51_DMA_REQ_IPU 36 +#define MX51_DMA_REQ_SSI3_TX2 37 +#define MX51_DMA_REQ_CSPI_RX 38 +#define MX51_DMA_REQ_CSPI_TX 39 +#define MX51_DMA_REQ_SDHC3 40 +#define MX51_DMA_REQ_SDHC4 41 +#define MX51_DMA_REQ_SLIM_B_TX 42 +#define MX51_DMA_REQ_UART3_RX 43 +#define MX51_DMA_REQ_UART3_TX 44 +#define MX51_DMA_REQ_SPDIF 45 +#define MX51_DMA_REQ_SSI3_RX1 46 +#define MX51_DMA_REQ_SSI3_TX1 47/* * Interrupt numbers */ -#define MX51_MXC_INT_BASE 0 -#define MX51_MXC_INT_RESV0 0 -#define MX51_MXC_INT_MMC_SDHC1 1 -#define MX51_MXC_INT_MMC_SDHC2 2 -#define MX51_MXC_INT_MMC_SDHC3 3 -#define MX51_MXC_INT_MMC_SDHC4 4 -#define MX51_MXC_INT_RESV5 5 -#define MX51_MXC_INT_SDMA 6 -#define MX51_MXC_INT_IOMUX 7 -#define MX51_MXC_INT_NFC 8 -#define MX51_MXC_INT_VPU 9 -#define MX51_MXC_INT_IPU_ERR 10 -#define MX51_MXC_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_MXC_INT_SSI1 29 -#define MX51_MXC_INT_SSI2 30 -#define MX51_MXC_INT_UART1 31 -#define MX51_MXC_INT_UART2 32 -#define MX51_MXC_INT_UART3 33 -#define MX51_MXC_INT_RESV34 34 -#define MX51_MXC_INT_RESV35 35 -#define MX51_MXC_INT_CSPI1 36 -#define MX51_MXC_INT_CSPI2 37 -#define MX51_MXC_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_MXC_INT_KPP 60 -#define MX51_MXC_INT_PWM1 61 -#define MX51_MXC_INT_I2C1 62 -#define MX51_MXC_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_MXC_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_MXC_INT_PWM2 94 -#define MX51_MXC_INT_SLIM_EXP 95 -#define MX51_MXC_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_MXC_INT_BASE 0 +#define MX51_MXC_INT_RESV0 0 +#define MX51_MXC_INT_MMC_SDHC1 1 +#define MX51_MXC_INT_MMC_SDHC2 2 +#define MX51_MXC_INT_MMC_SDHC3 3 +#define MX51_MXC_INT_MMC_SDHC4 4 +#define MX51_MXC_INT_RESV5 5 +#define MX51_MXC_INT_SDMA 6 +#define MX51_MXC_INT_IOMUX 7 +#define MX51_MXC_INT_NFC 8 +#define MX51_MXC_INT_VPU 9 +#define MX51_MXC_INT_IPU_ERR 10 +#define MX51_MXC_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_MXC_INT_SSI1 29 +#define MX51_MXC_INT_SSI2 30 +#define MX51_MXC_INT_UART1 31 +#define MX51_MXC_INT_UART2 32 +#define MX51_MXC_INT_UART3 33 +#define MX51_MXC_INT_RESV34 34 +#define MX51_MXC_INT_RESV35 35 +#define MX51_MXC_INT_CSPI1 36 +#define MX51_MXC_INT_CSPI2 37 +#define MX51_MXC_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_MXC_INT_KPP 60 +#define MX51_MXC_INT_PWM1 61 +#define MX51_MXC_INT_I2C1 62 +#define MX51_MXC_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_MXC_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_MXC_INT_PWM2 94 +#define MX51_MXC_INT_SLIM_EXP 95 +#define MX51_MXC_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/* silicon revisions specific to i.MX51 */ -#define MX51_CHIP_REV_1_0 0x10 -#define MX51_CHIP_REV_1_1 0x11 -#define MX51_CHIP_REV_1_2 0x12 -#define MX51_CHIP_REV_1_3 0x13 -#define MX51_CHIP_REV_2_0 0x20 -#define MX51_CHIP_REV_2_1 0x21 -#define MX51_CHIP_REV_2_2 0x22 -#define MX51_CHIP_REV_2_3 0x23 -#define MX51_CHIP_REV_3_0 0x30 -#define MX51_CHIP_REV_3_1 0x31 -#define MX51_CHIP_REV_3_2 0x32 - -/* Mandatory defines used globally */ +#define MX51_CHIP_REV_1_0 0x10 +#define MX51_CHIP_REV_1_1 0x11 +#define MX51_CHIP_REV_1_2 0x12 +#define MX51_CHIP_REV_1_3 0x13 +#define MX51_CHIP_REV_2_0 0x20 +#define MX51_CHIP_REV_2_1 0x21 +#define MX51_CHIP_REV_2_2 0x22 +#define MX51_CHIP_REV_2_3 0x23 +#define MX51_CHIP_REV_3_0 0x30 +#define MX51_CHIP_REV_3_1 0x31 +#define MX51_CHIP_REV_3_2 0x32#if !defined(__ASSEMBLY__) && !defined(__MXC_BOOT_UNCOMPRESS) -extern int mx51_revision (void );#endif -#endif /* __ASM_ARCH_MXC_MX51_H__ */ +/* tape-out 1 defines */ +#define MX51_TZIC_BASE_ADDR_TO1 0x8fffc000 + +#endif /* ifndef __MACH_MX51_H__ */
Signature · 1 line
1.7.2.3
PATCH 10/40 ARM: mx51: fix naming of spi related defines
In reply to Uwe Kleine-KönigThe names used now match the processor's reference manual. Also remove MXC from the interrupt defines to match the other imx platforms.
--- arch/arm/plat-mxc/include/mach/mx51.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/plat-mxc/include/mach/mx51.h +6 -6
@@ -67,7 +67,7 @@#define MX51_MMC_SDHC1_BASE_ADDR (MX51_SPBA0_BASE_ADDR + 0x04000)#define MX51_MMC_SDHC2_BASE_ADDR (MX51_SPBA0_BASE_ADDR + 0x08000)#define MX51_UART3_BASE_ADDR (MX51_SPBA0_BASE_ADDR + 0x0c000) -#define MX51_CSPI1_BASE_ADDR (MX51_SPBA0_BASE_ADDR + 0x10000) +#define MX51_ECSPI1_BASE_ADDR (MX51_SPBA0_BASE_ADDR + 0x10000)#define MX51_SSI2_BASE_ADDR (MX51_SPBA0_BASE_ADDR + 0x14000)#define MX51_MMC_SDHC3_BASE_ADDR (MX51_SPBA0_BASE_ADDR + 0x20000)#define MX51_MMC_SDHC4_BASE_ADDR (MX51_SPBA0_BASE_ADDR + 0x24000)
@@ -121,12 +121,12 @@#define MX51_ARM_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xa0000)#define MX51_OWIRE_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xa4000)#define MX51_FIRI_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xa8000) -#define MX51_CSPI2_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xac000) +#define MX51_ECSPI2_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xac000)#define MX51_SDMA_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xb0000)#define MX51_SCC_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xb4000)#define MX51_ROMCP_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xb8000)#define MX51_RTIC_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xbc000) -#define MX51_CSPI3_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xc0000) +#define MX51_CSPI_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xc0000)#define MX51_I2C2_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xc4000)#define MX51_I2C1_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xc8000)#define MX51_SSI1_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xcc000)
@@ -346,9 +346,9 @@#define MX51_MXC_INT_UART3 33#define MX51_MXC_INT_RESV34 34#define MX51_MXC_INT_RESV35 35 -#define MX51_MXC_INT_CSPI1 36 -#define MX51_MXC_INT_CSPI2 37 -#define MX51_MXC_INT_CSPI 38 +#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
Signature · 1 line
1.7.2.3
PATCH 11/40 ARM: mx51: use IMX_IO_ADDRESS to define MX51_IO_ADDRESS
In reply to Uwe Kleine-König--- arch/arm/plat-mxc/include/mach/mx51.h | 53 +++++++-------------------------- 1 files changed, 11 insertions(+), 42 deletions(-)
arch/arm/plat-mxc/include/mach/mx51.h +11 -42
@@ -163,6 +163,17 @@#define MX51_GPU2D_BASE_ADDR 0xd0000000#define MX51_TZIC_BASE_ADDR 0xe0000000 +#define MX51_IO_ADDRESS (x) ( \ + IMX_IO_ADDRESS(x, MX51_IRAM) ?: \ + IMX_IO_ADDRESS(x, MX51_DEBUG) ?: \ + IMX_IO_ADDRESS(x, MX51_SPBA0) ?: \ + IMX_IO_ADDRESS(x, MX51_AIPS1) ?: \ + IMX_IO_ADDRESS(x, MX51_AIPS2)) + +/* This is currently used in <mach/debug-macro.S>, but should go away */ +#define MX51_AIPS1_IO_ADDRESS (x) \ + (((x) - MX51_AIPS1_BASE_ADDR) + MX51_AIPS1_BASE_ADDR_VIRT) +/* * defines for SPBA modules */
@@ -210,48 +221,6 @@#define MX51_MXC_DMA_CHANNEL_ATA_TX MXC_DMA_DYNAMIC_CHANNEL#define MX51_MXC_DMA_CHANNEL_MEMORY MXC_DMA_DYNAMIC_CHANNEL -/* Does given address belongs to the specified memory region? */ -#define ADDRESS_IN_REGION (addr, start, size) \ - (((addr) >= (start)) && ((addr) < (start)+(size))) - -/* Does given address belongs to the specified named `module'? */ -#define MX51_IS_MODULE (addr, module) \ - ADDRESS_IN_REGION(addr, MX51_ ## module ## _BASE_ADDR, \ - MX51_ ## module ## _SIZE) -/* -* This macro defines the physical to virtual address mapping for all the -* peripheral modules. It is used by passing in the physical address as x -* and returning the virtual address. If the physical address is not mapped, -* it returns 0xdeadbeef -*/ - -#define MX51_IO_ADDRESS (x) \ - (void __iomem *) \ - (MX51_IS_MODULE(x, IRAM) ? MX51_IRAM_IO_ADDRESS(x) : \ - MX51_IS_MODULE(x, DEBUG) ? MX51_DEBUG_IO_ADDRESS(x) : \ - MX51_IS_MODULE(x, SPBA0) ? MX51_SPBA0_IO_ADDRESS(x) : \ - MX51_IS_MODULE(x, AIPS1) ? MX51_AIPS1_IO_ADDRESS(x) : \ - MX51_IS_MODULE(x, AIPS2) ? MX51_AIPS2_IO_ADDRESS(x) : \ - 0xdeadbeef) - -/* -* define the address mapping macros: in physical address order -*/ -#define MX51_IRAM_IO_ADDRESS (x) \ - (((x) - MX51_IRAM_BASE_ADDR) + MX51_IRAM_BASE_ADDR_VIRT) - -#define MX51_DEBUG_IO_ADDRESS (x) \ - (((x) - MX51_DEBUG_BASE_ADDR) + MX51_DEBUG_BASE_ADDR_VIRT) - -#define MX51_SPBA0_IO_ADDRESS (x) \ - (((x) - MX51_SPBA0_BASE_ADDR) + MX51_SPBA0_BASE_ADDR_VIRT) - -#define MX51_AIPS1_IO_ADDRESS (x) \ - (((x) - MX51_AIPS1_BASE_ADDR) + MX51_AIPS1_BASE_ADDR_VIRT) - -#define MX51_AIPS2_IO_ADDRESS (x) \ - (((x) - MX51_AIPS2_BASE_ADDR) + MX51_AIPS2_BASE_ADDR_VIRT) -#define MX51_IS_MEM_DEVICE_NONSHARED (x) 0/*
Signature · 1 line
1.7.2.3
PATCH 12/40 ARM: imx: change the way spi-imx devices are registered
In reply to Uwe Kleine-KönigGroup soc specific data in a global struct instead of repeating it for each call to imxXX_add_spi_imxX. The structs holding the actual data are placed in .init.constdata and so don't do much harm. Compared to the previous approach this reduces code size to call imx_add_spi_imx.
--- arch/arm/mach-imx/devices-imx21.h | 9 ++- arch/arm/mach-imx/devices-imx27.h | 12 ++-- arch/arm/mach-mx25/devices-imx25.h | 12 ++-- arch/arm/mach-mx3/devices-imx31.h | 12 ++-- arch/arm/mach-mx3/devices-imx35.h | 9 ++- arch/arm/plat-mxc/devices/platform-spi_imx.c | 76 ++++++++++++++++++++--- arch/arm/plat-mxc/include/mach/devices-common.h | 10 +++- 7 files changed, 103 insertions(+), 37 deletions(-)
arch/arm/mach-imx/devices-imx21.h +5 -4
@@ -24,7 +24,8 @@#define imx21_add_mxc_nand (pdata) \ imx_add_mxc_nand_v1(MX21_NFC_BASE_ADDR, MX21_INT_NANDFC, pdata) -#define imx21_add_spi_imx0 (pdata) \ - imx_add_spi_imx(0, MX21_CSPI1_BASE_ADDR, SZ_4K, MX21_INT_CSPI1, pdata) -#define imx21_add_spi_imx1 (pdata) \ - imx_add_spi_imx(1, MX21_CSPI2_BASE_ADDR, SZ_4K, MX21_INT_CSPI2, pdata) +extern const struct imx_spi_imx_data imx21_cspi_data[]__initconst ; +#define imx21_add_cspi (id, pdata) \ + imx_add_spi_imx(&imx21_cspi_data[id], pdata) +#define imx21_add_spi_imx0 (pdata) imx21_add_cspi(0, pdata) +#define imx21_add_spi_imx1 (pdata) imx21_add_cspi(1, pdata)
arch/arm/mach-imx/devices-imx27.h +6 -6
@@ -30,9 +30,9 @@#define imx27_add_mxc_nand (pdata) \ imx_add_mxc_nand_v1(MX27_NFC_BASE_ADDR, MX27_INT_NANDFC, pdata) -#define imx27_add_spi_imx0 (pdata) \ - imx_add_spi_imx(0, MX27_CSPI1_BASE_ADDR, SZ_4K, MX27_INT_CSPI1, pdata) -#define imx27_add_spi_imx1 (pdata) \ - imx_add_spi_imx(1, MX27_CSPI2_BASE_ADDR, SZ_4K, MX27_INT_CSPI2, pdata) -#define imx27_add_spi_imx2 (pdata) \ - imx_add_spi_imx(2, MX27_CSPI3_BASE_ADDR, SZ_4K, MX27_INT_CSPI3, pdata) +extern const struct imx_spi_imx_data imx27_cspi_data[]__initconst ; +#define imx27_add_cspi (id, pdata) \ + imx_add_spi_imx(&imx27_cspi_data[id], pdata) +#define imx27_add_spi_imx0 (pdata) imx27_add_cspi(0, pdata) +#define imx27_add_spi_imx1 (pdata) imx27_add_cspi(1, pdata) +#define imx27_add_spi_imx2 (pdata) imx27_add_cspi(2, pdata)
arch/arm/mach-mx25/devices-imx25.h +6 -6
@@ -35,9 +35,9 @@#define imx25_add_mxc_nand (pdata) \ imx_add_mxc_nand_v21(MX25_NFC_BASE_ADDR, MX25_INT_NANDFC, pdata) -#define imx25_add_spi_imx0 (pdata) \ - imx_add_spi_imx(0, MX25_CSPI1_BASE_ADDR, SZ_16K, MX25_INT_CSPI1, pdata) -#define imx25_add_spi_imx1 (pdata) \ - imx_add_spi_imx(1, MX25_CSPI2_BASE_ADDR, SZ_16K, MX25_INT_CSPI2, pdata) -#define imx25_add_spi_imx2 (pdata) \ - imx_add_spi_imx(2, MX25_CSPI3_BASE_ADDR, SZ_16K, MX25_INT_CSPI3, pdata) +extern const struct imx_spi_imx_data imx25_spi_imx_data[]__initconst ; +#define imx25_add_spi_imx (id, pdata) \ + imx_add_spi_imx(&imx25_spi_imx_data[id], pdata) +#define imx25_add_spi_imx0 (pdata) imx25_add_spi_imx(0, pdata) +#define imx25_add_spi_imx1 (pdata) imx25_add_spi_imx(1, pdata) +#define imx25_add_spi_imx2 (pdata) imx25_add_spi_imx(2, pdata)
arch/arm/mach-mx3/devices-imx31.h +6 -6
@@ -30,9 +30,9 @@#define imx31_add_mxc_nand (pdata) \ imx_add_mxc_nand_v1(MX31_NFC_BASE_ADDR, MX31_INT_NANDFC, pdata) -#define imx31_add_spi_imx0 (pdata) \ - imx_add_spi_imx(0, MX31_CSPI1_BASE_ADDR, SZ_4K, MX31_INT_CSPI1, pdata) -#define imx31_add_spi_imx1 (pdata) \ - imx_add_spi_imx(1, MX31_CSPI2_BASE_ADDR, SZ_4K, MX31_INT_CSPI2, pdata) -#define imx31_add_spi_imx2 (pdata) \ - imx_add_spi_imx(2, MX31_CSPI3_BASE_ADDR, SZ_4K, MX31_INT_CSPI3, pdata) +extern const struct imx_spi_imx_data imx31_cspi_data[]__initconst ; +#define imx31_add_cspi (id, pdata) \ + imx_add_spi_imx(&imx31_cspi_data[id], pdata) +#define imx31_add_spi_imx0 (pdata) imx31_add_cspi(0, pdata) +#define imx31_add_spi_imx1 (pdata) imx31_add_cspi(1, pdata) +#define imx31_add_spi_imx2 (pdata) imx31_add_cspi(2, pdata)
arch/arm/mach-mx3/devices-imx35.h +5 -4
@@ -31,7 +31,8 @@#define imx35_add_mxc_nand (pdata) \ imx_add_mxc_nand_v21(MX35_NFC_BASE_ADDR, MX35_INT_NANDFC, pdata) -#define imx35_add_spi_imx0 (pdata) \ - imx_add_spi_imx(0, MX35_CSPI1_BASE_ADDR, SZ_4K, MX35_INT_CSPI1, pdata) -#define imx35_add_spi_imx1 (pdata) \ - imx_add_spi_imx(1, MX35_CSPI2_BASE_ADDR, SZ_4K, MX35_INT_CSPI2, pdata) +extern const struct imx_spi_imx_data imx35_cspi_data[]__initconst ; +#define imx35_add_cspi (id, pdata) \ + imx_add_spi_imx(&imx35_cspi_data[id], pdata) +#define imx35_add_spi_imx0 (pdata) imx35_add_cspi(0, pdata) +#define imx35_add_spi_imx1 (pdata) imx35_add_cspi(1, pdata)
arch/arm/plat-mxc/devices/platform-spi_imx.c +67 -9
92 lines not on this page · raw message
arch/arm/plat-mxc/include/mach/devices-common.h +8 -2
@@ -43,6 +43,12 @@ struct platform_device *__init imx_add_mxc_nand_v21(resource_size_t iobase, int irq, const struct mxc_nand_platform_data *pdata);#include <mach/spi.h> -struct platform_device *__init imx_add_spi_imx (int id, -resource_size_t iobase,resource_size_t iosize,int irq, +struct imx_spi_imx_data { +int id; +resource_size_t iobase; +resource_size_t iosize; +int irq; +}; +struct platform_device *__init imx_add_spi_imx ( +const struct imx_spi_imx_data *data,const struct spi_imx_master *pdata);
Signature · 1 line
1.7.2.3
PATCH 13/40 ARM: imx: change the way imx-uarts are registered
In reply to Uwe Kleine-KönigFor mx1_defconfig this yields:
add/remove: 1/0 grow/shrink: 1/4 up/down: 49/-108 (-59)
function old new delta
imx1_imx_uart_data - 48 +48
kernel_config_data 7277 7278 +1
imx_add_imx_uart_1irq 132 128 -4
imx_add_imx_uart_3irq 164 156 -8
scb9328_init 96 64 -32
mx1ads_init 220 156 -64
for mx21_defconfig this yields:
add/remove: 1/0 grow/shrink: 0/3 up/down: 64/-52 (12)
function old new delta
imx21_imx_uart_data - 64 +64
imx_add_imx_uart_3irq 160 156 -4
imx_add_imx_uart_1irq 140 136 -4
mx21ads_board_init 220 176 -44
for a random mx25 config this yields:
add/remove: 1/0 grow/shrink: 0/5 up/down: 80/-56 (24)
function old new delta
imx25_imx_uart_data - 80 +80
imx_add_imx_uart_3irq 160 156 -4
imx_add_imx_uart_1irq 140 136 -4
mx25pdk_init 288 272 -16
eukrea_mbimxsd_baseboard_init 272 256 -16
eukrea_cpuimx25_init 252 236 -16
for mx27_defconfig this yields:
add/remove: 1/0 grow/shrink: 0/10 up/down: 96/-280 (-184)
function old new delta
imx27_imx_uart_data - 96 +96
imx_add_imx_uart_3irq 160 156 -4
imx_add_imx_uart_1irq 140 136 -4
pca100_init 560 544 -16
mx27pdk_init 112 96 -16
mx27lite_init 92 76 -16
eukrea_cpuimx27_init 332 316 -16
pcm038_init 388 348 -40
mxt_td60_board_init 320 280 -40
eukrea_mbimx27_baseboard_init 476 436 -40
mx27ads_board_init 368 280 -88
and finally for mx3_defconfig:
add/remove: 2/0 grow/shrink: 0/9 up/down: 128/-344 (-216)
function old new delta
imx31_imx_uart_data - 80 +80
imx35_imx_uart_data - 48 +48
imx_add_imx_uart_1irq 132 128 -4
imx_add_imx_uart_3irq 164 152 -12
mx31moboard_devboard_init 360 344 -16
mx31lite_db_init 176 160 -16
mx31moboard_smartbot_init 384 360 -24
kzm_board_init 232 208 -24
armadillo5x0_init 392 364 -28
mx31lilly_db_init 248 208 -40
mxc_board_init 3760 3580 -180
--- arch/arm/mach-imx/devices-imx1.h | 9 +- arch/arm/mach-imx/devices-imx21.h | 15 ++-- arch/arm/mach-imx/devices-imx27.h | 21 ++-- arch/arm/mach-mx25/devices-imx25.h | 18 ++-- arch/arm/mach-mx3/devices-imx31.h | 18 ++-- arch/arm/mach-mx3/devices-imx35.h | 12 +- arch/arm/plat-mxc/devices/platform-imx-uart.c | 127 +++++++++++++++++++---- arch/arm/plat-mxc/include/mach/devices-common.h | 26 ++++-- 8 files changed, 167 insertions(+), 79 deletions(-)
arch/arm/mach-imx/devices-imx1.h +5 -4
@@ -12,7 +12,8 @@#define imx1_add_i2c_imx (pdata) \ imx_add_imx_i2c(0, MX1_I2C_BASE_ADDR, SZ_4K, MX1_INT_I2C, pdata) -#define imx1_add_imx_uart0 (pdata) \ - imx_add_imx_uart_3irq(0, MX1_UART1_BASE_ADDR, 0xd0, MX1_INT_UART1RX, MX1_INT_UART1TX, MX1_INT_UART1RTS, pdata) -#define imx1_add_imx_uart1 (pdata) \ - imx_add_imx_uart_3irq(0, MX1_UART2_BASE_ADDR, 0xd0, MX1_INT_UART2RX, MX1_INT_UART2TX, MX1_INT_UART2RTS, pdata) +extern const struct imx_imx_uart_3irq_data imx1_imx_uart_data[]__initconst ; +#define imx1_add_imx_uart (id, pdata) \ + imx_add_imx_uart_3irq(&imx1_imx_uart_data[id], pdata) +#define imx1_add_imx_uart0 (pdata) imx1_add_imx_uart(0, pdata) +#define imx1_add_imx_uart1 (pdata) imx1_add_imx_uart(1, pdata)
arch/arm/mach-imx/devices-imx21.h +7 -8
@@ -12,14 +12,13 @@#define imx21_add_i2c_imx (pdata) \ imx_add_imx_i2c(0, MX2x_I2C_BASE_ADDR, SZ_4K, MX2x_INT_I2C, pdata) -#define imx21_add_imx_uart0 (pdata) \ - imx_add_imx_uart_1irq(0, MX21_UART1_BASE_ADDR, SZ_4K, MX21_INT_UART1, pdata) -#define imx21_add_imx_uart1 (pdata) \ - imx_add_imx_uart_1irq(1, MX21_UART2_BASE_ADDR, SZ_4K, MX21_INT_UART2, pdata) -#define imx21_add_imx_uart2 (pdata) \ - imx_add_imx_uart_1irq(2, MX21_UART3_BASE_ADDR, SZ_4K, MX21_INT_UART3, pdata) -#define imx21_add_imx_uart3 (pdata) \ - imx_add_imx_uart_1irq(3, MX21_UART4_BASE_ADDR, SZ_4K, MX21_INT_UART4, pdata) +extern const struct imx_imx_uart_1irq_data imx21_imx_uart_data[]__initconst ; +#define imx21_add_imx_uart (id, pdata) \ + imx_add_imx_uart_1irq(&imx21_imx_uart_data[id], pdata) +#define imx21_add_imx_uart0 (pdata) imx21_add_imx_uart(0, pdata) +#define imx21_add_imx_uart1 (pdata) imx21_add_imx_uart(1, pdata) +#define imx21_add_imx_uart2 (pdata) imx21_add_imx_uart(2, pdata) +#define imx21_add_imx_uart3 (pdata) imx21_add_imx_uart(3, pdata)#define imx21_add_mxc_nand (pdata) \ imx_add_mxc_nand_v1(MX21_NFC_BASE_ADDR, MX21_INT_NANDFC, pdata)
arch/arm/mach-imx/devices-imx27.h +9 -12
@@ -14,18 +14,15 @@#define imx27_add_i2c_imx1 (pdata) \ imx_add_imx_i2c(1, MX27_I2C2_BASE_ADDR, SZ_4K, MX27_INT_I2C2, pdata) -#define imx27_add_imx_uart0 (pdata) \ - imx_add_imx_uart_1irq(0, MX27_UART1_BASE_ADDR, SZ_4K, MX27_INT_UART1, pdata) -#define imx27_add_imx_uart1 (pdata) \ - imx_add_imx_uart_1irq(1, MX27_UART2_BASE_ADDR, SZ_4K, MX27_INT_UART2, pdata) -#define imx27_add_imx_uart2 (pdata) \ - imx_add_imx_uart_1irq(2, MX27_UART3_BASE_ADDR, SZ_4K, MX27_INT_UART3, pdata) -#define imx27_add_imx_uart3 (pdata) \ - imx_add_imx_uart_1irq(3, MX27_UART4_BASE_ADDR, SZ_4K, MX27_INT_UART4, pdata) -#define imx27_add_imx_uart4 (pdata) \ - imx_add_imx_uart_1irq(4, MX27_UART5_BASE_ADDR, SZ_4K, MX27_INT_UART5, pdata) -#define imx27_add_imx_uart5 (pdata) \ - imx_add_imx_uart_1irq(5, MX27_UART6_BASE_ADDR, SZ_4K, MX27_INT_UART6, pdata) +extern const struct imx_imx_uart_1irq_data imx27_imx_uart_data[]__initconst ; +#define imx27_add_imx_uart (id, pdata) \ + imx_add_imx_uart_1irq(&imx27_imx_uart_data[id], pdata) +#define imx27_add_imx_uart0 (pdata) imx27_add_imx_uart(0, pdata) +#define imx27_add_imx_uart1 (pdata) imx27_add_imx_uart(1, pdata) +#define imx27_add_imx_uart2 (pdata) imx27_add_imx_uart(2, pdata) +#define imx27_add_imx_uart3 (pdata) imx27_add_imx_uart(3, pdata) +#define imx27_add_imx_uart4 (pdata) imx27_add_imx_uart(4, pdata) +#define imx27_add_imx_uart5 (pdata) imx27_add_imx_uart(5, pdata)#define imx27_add_mxc_nand (pdata) \ imx_add_mxc_nand_v1(MX27_NFC_BASE_ADDR, MX27_INT_NANDFC, pdata)
arch/arm/mach-mx25/devices-imx25.h +8 -10
@@ -21,16 +21,14 @@#define imx25_add_imx_i2c2 (pdata) \ imx_add_imx_i2c(2, MX25_I2C3_BASE_ADDR, SZ_16K, MX25_INT_I2C3, pdata) -#define imx25_add_imx_uart0 (pdata) \ - imx_add_imx_uart_1irq(0, MX25_UART1_BASE_ADDR, SZ_16K, MX25_INT_UART1, pdata) -#define imx25_add_imx_uart1 (pdata) \ - imx_add_imx_uart_1irq(1, MX25_UART2_BASE_ADDR, SZ_16K, MX25_INT_UART2, pdata) -#define imx25_add_imx_uart2 (pdata) \ - imx_add_imx_uart_1irq(2, MX25_UART3_BASE_ADDR, SZ_16K, MX25_INT_UART3, pdata) -#define imx25_add_imx_uart3 (pdata) \ - imx_add_imx_uart_1irq(3, MX25_UART4_BASE_ADDR, SZ_16K, MX25_INT_UART4, pdata) -#define imx25_add_imx_uart4 (pdata) \ - imx_add_imx_uart_1irq(4, MX25_UART5_BASE_ADDR, SZ_16K, MX25_INT_UART5, pdata) +extern const struct imx_imx_uart_1irq_data imx25_imx_uart_data[]__initconst ; +#define imx25_add_imx_uart (id, pdata) \ + imx_add_imx_uart_1irq(&imx25_imx_uart_data[id], pdata) +#define imx25_add_imx_uart0 (pdata) imx25_add_imx_uart(0, pdata) +#define imx25_add_imx_uart1 (pdata) imx25_add_imx_uart(1, pdata) +#define imx25_add_imx_uart2 (pdata) imx25_add_imx_uart(2, pdata) +#define imx25_add_imx_uart3 (pdata) imx25_add_imx_uart(3, pdata) +#define imx25_add_imx_uart4 (pdata) imx25_add_imx_uart(4, pdata)#define imx25_add_mxc_nand (pdata) \ imx_add_mxc_nand_v21(MX25_NFC_BASE_ADDR, MX25_INT_NANDFC, pdata)
arch/arm/mach-mx3/devices-imx31.h +8 -10
@@ -16,16 +16,14 @@#define imx31_add_imx_i2c2 (pdata) \ imx_add_imx_i2c(2, MX31_I2C3_BASE_ADDR, SZ_4K, MX31_INT_I2C3, pdata) -#define imx31_add_imx_uart0 (pdata) \ - imx_add_imx_uart_1irq(0, MX31_UART1_BASE_ADDR, SZ_16K, MX31_INT_UART1, pdata) -#define imx31_add_imx_uart1 (pdata) \ - imx_add_imx_uart_1irq(1, MX31_UART2_BASE_ADDR, SZ_16K, MX31_INT_UART2, pdata) -#define imx31_add_imx_uart2 (pdata) \ - imx_add_imx_uart_1irq(2, MX31_UART3_BASE_ADDR, SZ_16K, MX31_INT_UART3, pdata) -#define imx31_add_imx_uart3 (pdata) \ - imx_add_imx_uart_1irq(3, MX31_UART4_BASE_ADDR, SZ_16K, MX31_INT_UART4, pdata) -#define imx31_add_imx_uart4 (pdata) \ - imx_add_imx_uart_1irq(4, MX31_UART5_BASE_ADDR, SZ_16K, MX31_INT_UART5, pdata) +extern const struct imx_imx_uart_1irq_data imx31_imx_uart_data[]__initconst ; +#define imx31_add_imx_uart (id, pdata) \ + imx_add_imx_uart_1irq(&imx31_imx_uart_data[id], pdata) +#define imx31_add_imx_uart0 (pdata) imx31_add_imx_uart(0, pdata) +#define imx31_add_imx_uart1 (pdata) imx31_add_imx_uart(1, pdata) +#define imx31_add_imx_uart2 (pdata) imx31_add_imx_uart(2, pdata) +#define imx31_add_imx_uart3 (pdata) imx31_add_imx_uart(3, pdata) +#define imx31_add_imx_uart4 (pdata) imx31_add_imx_uart(4, pdata)#define imx31_add_mxc_nand (pdata) \ imx_add_mxc_nand_v1(MX31_NFC_BASE_ADDR, MX31_INT_NANDFC, pdata)
arch/arm/mach-mx3/devices-imx35.h +6 -6
@@ -21,12 +21,12 @@#define imx35_add_imx_i2c2 (pdata) \ imx_add_imx_i2c(2, MX35_I2C3_BASE_ADDR, SZ_4K, MX35_INT_I2C3, pdata) -#define imx35_add_imx_uart0 (pdata) \ - imx_add_imx_uart_1irq(0, MX35_UART1_BASE_ADDR, SZ_16K, MX35_INT_UART1, pdata) -#define imx35_add_imx_uart1 (pdata) \ - imx_add_imx_uart_1irq(1, MX35_UART2_BASE_ADDR, SZ_16K, MX35_INT_UART2, pdata) -#define imx35_add_imx_uart2 (pdata) \ - imx_add_imx_uart_1irq(2, MX35_UART3_BASE_ADDR, SZ_16K, MX35_INT_UART3, pdata) +extern const struct imx_imx_uart_1irq_data imx35_imx_uart_data[]__initconst ; +#define imx35_add_imx_uart (id, pdata) \ + imx_add_imx_uart_1irq(&imx35_imx_uart_data[id], pdata) +#define imx35_add_imx_uart0 (pdata) imx35_add_imx_uart(0, pdata) +#define imx35_add_imx_uart1 (pdata) imx35_add_imx_uart(1, pdata) +#define imx35_add_imx_uart2 (pdata) imx35_add_imx_uart(2, pdata)#define imx35_add_mxc_nand (pdata) \ imx_add_mxc_nand_v21(MX35_NFC_BASE_ADDR, MX35_INT_NANDFC, pdata)
arch/arm/plat-mxc/devices/platform-imx-uart.c +105 -22
160 lines not on this page · raw message
arch/arm/plat-mxc/include/mach/devices-common.h +19 -7
@@ -26,14 +26,26 @@ struct platform_device *__init imx_add_imx_i2c(int id, const struct imxi2c_platform_data *pdata);#include <mach/imx-uart.h> -struct platform_device *__init imx_add_imx_uart_3irq (int id, -resource_size_t iobase,resource_size_t iosize, -resource_size_t irqrx,resource_size_t irqtx, -resource_size_t irqrts, +struct imx_imx_uart_3irq_data { +int id; +resource_size_t iobase; +resource_size_t iosize; +resource_size_t irqrx; +resource_size_t irqtx; +resource_size_t irqrts; +}; +struct platform_device *__init imx_add_imx_uart_3irq ( +const struct imx_imx_uart_3irq_data *data,const struct imxuart_platform_data *pdata); -struct platform_device *__init imx_add_imx_uart_1irq (int id, -resource_size_t iobase,resource_size_t iosize, -resource_size_t irq, + +struct imx_imx_uart_1irq_data { +int id; +resource_size_t iobase; +resource_size_t iosize; +resource_size_t irq; +}; +struct platform_device *__init imx_add_imx_uart_1irq ( +const struct imx_imx_uart_1irq_data *data,const struct imxuart_platform_data *pdata);#include <mach/mxc_nand.h>
Signature · 1 line
1.7.2.3
PATCH 14/40 ARM: imx: dynamically allocate imx-ssi devices
In reply to Uwe Kleine-König--- arch/arm/mach-imx/Kconfig | 5 +- arch/arm/mach-imx/devices-imx21.h | 4 + arch/arm/mach-imx/devices-imx27.h | 4 + arch/arm/mach-imx/devices.c | 35 -------- arch/arm/mach-imx/devices.h | 2 - arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 6 +- arch/arm/mach-imx/mach-pca100.c | 5 +- arch/arm/mach-mx25/Kconfig | 4 +- arch/arm/mach-mx25/devices-imx25.h | 4 + arch/arm/mach-mx25/devices.c | 38 --------- arch/arm/mach-mx25/devices.h | 2 - arch/arm/mach-mx25/eukrea_mbimxsd-baseboard.c | 6 +- arch/arm/mach-mx3/Kconfig | 6 +- arch/arm/mach-mx3/devices-imx31.h | 4 + arch/arm/mach-mx3/devices-imx35.h | 4 + arch/arm/mach-mx3/devices.c | 42 ---------- arch/arm/mach-mx3/devices.h | 3 - arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c | 6 +- arch/arm/mach-mx3/mach-mx31ads.c | 2 +- arch/arm/mach-mx3/mach-pcm043.c | 5 +- arch/arm/plat-mxc/devices/Kconfig | 3 + arch/arm/plat-mxc/devices/Makefile | 1 + arch/arm/plat-mxc/devices/platform-imx-ssi.c | 98 +++++++++++++++++++++++ arch/arm/plat-mxc/include/mach/devices-common.h | 15 ++++ arch/arm/plat-mxc/include/mach/mx25.h | 9 ++ arch/arm/plat-mxc/include/mach/mx31.h | 9 ++ arch/arm/plat-mxc/include/mach/mx35.h | 9 ++ 27 files changed, 187 insertions(+), 144 deletions(-) create mode 100644 arch/arm/plat-mxc/devices/platform-imx-ssi.c
arch/arm/mach-imx/Kconfig +3 -2
@@ -146,8 +146,8 @@ choice default MACH_EUKREA_MBIMX27_BASEBOARD config MACH_EUKREA_MBIMX27_BASEBOARD - prompt "Eukrea MBIMX27 development board" - bool + bool "Eukrea MBIMX27 development board" + select IMX_HAVE_PLATFORM_IMX_SSI select IMX_HAVE_PLATFORM_IMX_UART select IMX_HAVE_PLATFORM_SPI_IMX help
@@ -182,6 +182,7 @@ config MACH_IMX27LITE config MACH_PCA100 bool "Phytec phyCARD-s (pca100)" select IMX_HAVE_PLATFORM_IMX_I2C + select IMX_HAVE_PLATFORM_IMX_SSI select IMX_HAVE_PLATFORM_IMX_UART select IMX_HAVE_PLATFORM_MXC_NAND select IMX_HAVE_PLATFORM_SPI_IMX
arch/arm/mach-imx/devices-imx21.h +4 -0
@@ -12,6 +12,10 @@#define imx21_add_i2c_imx (pdata) \ imx_add_imx_i2c(0, MX2x_I2C_BASE_ADDR, SZ_4K, MX2x_INT_I2C, pdata) +extern const struct imx_imx_ssi_data imx21_imx_ssi_data[]__initconst ; +#define imx21_add_imx_ssi (id, pdata) \ + imx_add_imx_ssi(&imx21_imx_ssi_data[id], pdata) +extern const struct imx_imx_uart_1irq_data imx21_imx_uart_data[]__initconst ;#define imx21_add_imx_uart (id, pdata) \ imx_add_imx_uart_1irq(&imx21_imx_uart_data[id], pdata)
arch/arm/mach-imx/devices-imx27.h +4 -0
@@ -14,6 +14,10 @@#define imx27_add_i2c_imx1 (pdata) \ imx_add_imx_i2c(1, MX27_I2C2_BASE_ADDR, SZ_4K, MX27_INT_I2C2, pdata) +extern const struct imx_imx_ssi_data imx27_imx_ssi_data[]__initconst ; +#define imx27_add_imx_ssi (id, pdata) \ + imx_add_imx_ssi(&imx27_imx_ssi_data[id], pdata) +extern const struct imx_imx_uart_1irq_data imx27_imx_uart_data[]__initconst ;#define imx27_add_imx_uart (id, pdata) \ imx_add_imx_uart_1irq(&imx27_imx_uart_data[id], pdata)
arch/arm/mach-imx/devices.c +0 -35
@@ -480,41 +480,6 @@ struct platform_device mxc_usbh2 = { };#endif -#define DEFINE_IMX_SSI_DMARES (_name, ssin, suffix) \ - { \ - .name = _name, \ - .start = MX2x_DMA_REQ_SSI ## ssin ## _ ## suffix, \ - .end = MX2x_DMA_REQ_SSI ## ssin ## _ ## suffix, \ - .flags = IORESOURCE_DMA, \ - } - -#define DEFINE_IMX_SSI_DEVICE (n, ssin, baseaddr, irq) \ - static struct resource imx_ssi_resources ## n[] = { \ - { \ - .start = MX2x_SSI ## ssin ## _BASE_ADDR, \ - .end = MX2x_SSI ## ssin ## _BASE_ADDR + 0x6f, \ - .flags = IORESOURCE_MEM, \ - }, { \ - .start = MX2x_INT_SSI1, \ - .end = MX2x_INT_SSI1, \ - .flags = IORESOURCE_IRQ, \ - }, \ - DEFINE_IMX_SSI_DMARES("tx0", ssin, TX0), \ - DEFINE_IMX_SSI_DMARES("rx0", ssin, RX0), \ - DEFINE_IMX_SSI_DMARES("tx1", ssin, TX1), \ - DEFINE_IMX_SSI_DMARES("rx1", ssin, RX1), \ - }; \ - \ - struct platform_device imx_ssi_device ## n = { \ - .name = "imx-ssi", \ - .id = n, \ - .num_resources = ARRAY_SIZE(imx_ssi_resources ## n), \ - .resource = imx_ssi_resources ## n, \ - } - -DEFINE_IMX_SSI_DEVICE (0 ,1 , MX2x_SSI1_BASE_ADDR, MX2x_INT_SSI1); -DEFINE_IMX_SSI_DEVICE (1 ,2 , MX2x_SSI1_BASE_ADDR, MX2x_INT_SSI1); -/* GPIO port description */ #define DEFINE_MXC_GPIO_PORT_IRQ (SOC , n, _irq) \ { \
arch/arm/mach-imx/devices.h +0 -2
@@ -26,7 +26,5 @@ extern struct platform_device mxc_otg_host;extern struct platform_device mxc_usbh1;extern struct platform_device mxc_usbh2;extern struct platform_device mx21_usbhc_device; -extern struct platform_device imx_ssi_device0; -extern struct platform_device imx_ssi_device1;extern struct platform_device imx_kpp_device;#endif
arch/arm/mach-imx/eukrea_mbimx27-baseboard.c +3 -3
@@ -36,7 +36,6 @@#include <mach/hardware.h> #include <mach/mmc.h> #include <mach/spi.h> -#include <mach/ssi.h> #include <mach/audmux.h> #include "devices-imx27.h"
@@ -311,7 +310,8 @@ static struct imxmmc_platform_data sdhc_pdata = { .dat3_card_detect = 1, }; -struct imx_ssi_platform_data eukrea_mbimx27_ssi_pdata = { +static const +struct imx_ssi_platform_data eukrea_mbimx27_ssi_pdata__initconst = { .flags =IMX_SSI_DMA |IMX_SSI_USE_I2S_SLAVE , };
@@ -357,7 +357,7 @@ void __init eukrea_mbimx27_baseboard_init(void)i2c_register_board_info (0 , eukrea_mbimx27_i2c_devices,ARRAY_SIZE (eukrea_mbimx27_i2c_devices)); -mxc_register_device (&imx_ssi_device0, &eukrea_mbimx27_ssi_pdata); +imx27_add_imx_ssi (0 , &eukrea_mbimx27_ssi_pdata);#if defined(CONFIG_TOUCHSCREEN_ADS7846 ) \ || defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE )
arch/arm/mach-imx/mach-pca100.c +2 -3
@@ -38,7 +38,6 @@#include <mach/iomux-mx27.h> #include <asm/mach/time.h> #include <mach/audmux.h> -#include <mach/ssi.h> #include <mach/mxc_nand.h> #include <mach/irqs.h> #include <mach/mmc.h>
@@ -252,7 +251,7 @@ static void pca100_ac97_cold_reset(struct snd_ac97 *ac97)msleep (2 ); } -static struct imx_ssi_platform_data pca100_ssi_pdata = { +static const struct imx_ssi_platform_data pca100_ssi_pdata__initconst = { .ac97_reset = pca100_ac97_cold_reset, .ac97_warm_reset = pca100_ac97_warm_reset, .flags =IMX_SSI_USE_AC97 ,
@@ -389,7 +388,7 @@ static void __init pca100_init(void)if (ret)printk (KERN_ERR "pca100: Failed to setup pins (%d)\n" , ret); -mxc_register_device (&imx_ssi_device0, &pca100_ssi_pdata); +imx27_add_imx_ssi (0 , &pca100_ssi_pdata);imx27_add_imx_uart0 (&uart_pdata);
arch/arm/mach-mx25/Kconfig +2 -2
@@ -20,8 +20,8 @@ choice default MACH_EUKREA_MBIMXSD25_BASEBOARD config MACH_EUKREA_MBIMXSD25_BASEBOARD - prompt "Eukrea MBIMXSD development board" - bool + bool "Eukrea MBIMXSD development board" + select IMX_HAVE_PLATFORM_IMX_SSI help This adds board specific devices that can be found on Eukrea's MBIMXSD evaluation board.
arch/arm/mach-mx25/devices-imx25.h +4 -0
@@ -21,6 +21,10 @@#define imx25_add_imx_i2c2 (pdata) \ imx_add_imx_i2c(2, MX25_I2C3_BASE_ADDR, SZ_16K, MX25_INT_I2C3, pdata) +extern const struct imx_imx_ssi_data imx25_imx_ssi_data[]__initconst ; +#define imx25_add_imx_ssi (id, pdata) \ + imx_add_imx_ssi(&imx25_imx_ssi_data[id], pdata) +extern const struct imx_imx_uart_1irq_data imx25_imx_uart_data[]__initconst ;#define imx25_add_imx_uart (id, pdata) \ imx_add_imx_uart_1irq(&imx25_imx_uart_data[id], pdata)
arch/arm/mach-mx25/devices.c +0 -38
@@ -305,44 +305,6 @@ struct platform_device mx25_kpp_device = { .resource = mx25_kpp_resources, }; -static struct resource imx_ssi_resources0[] = { - { - .start =MX25_SSI1_BASE_ADDR , - .end =MX25_SSI1_BASE_ADDR +0x3fff , - .flags =IORESOURCE_MEM , - }, { - .start =MX25_INT_SSI1 , - .end =MX25_INT_SSI1 , - .flags =IORESOURCE_IRQ , - }, -}; - -static struct resource imx_ssi_resources1[] = { - { - .start =MX25_SSI2_BASE_ADDR , - .end =MX25_SSI2_BASE_ADDR +0x3fff , - .flags =IORESOURCE_MEM - }, { - .start =MX25_INT_SSI2 , - .end =MX25_INT_SSI2 , - .flags =IORESOURCE_IRQ , - }, -}; - -struct platform_device imx_ssi_device0 = { - .name ="imx-ssi" , - .id =0 , - .num_resources =ARRAY_SIZE (imx_ssi_resources0), - .resource = imx_ssi_resources0, -}; - -struct platform_device imx_ssi_device1 = { - .name ="imx-ssi" , - .id =1 , - .num_resources =ARRAY_SIZE (imx_ssi_resources1), - .resource = imx_ssi_resources1, -}; -static struct resource mx25_csi_resources[] = { { .start =MX25_CSI_BASE_ADDR ,
arch/arm/mach-mx25/devices.h +0 -2
@@ -11,6 +11,4 @@ extern struct platform_device mx25_rtc_device;extern struct platform_device mx25_fb_device;extern struct platform_device mxc_wdt;extern struct platform_device mx25_kpp_device; -extern struct platform_device imx_ssi_device0; -extern struct platform_device imx_ssi_device1;extern struct platform_device mx25_csi_device;
arch/arm/mach-mx25/eukrea_mbimxsd-baseboard.c +3 -3
@@ -34,7 +34,6 @@#include <mach/mx25.h> #include <mach/imx-uart.h> #include <mach/imxfb.h> -#include <mach/ssi.h> #include <mach/audmux.h> #include "devices-imx25.h"
@@ -205,7 +204,8 @@ static struct i2c_board_info eukrea_mbimxsd_i2c_devices[] = { }, }; -struct imx_ssi_platform_data eukrea_mbimxsd_ssi_pdata = { +static const +struct imx_ssi_platform_data eukrea_mbimxsd_ssi_pdata__initconst = { .flags =IMX_SSI_SYN |IMX_SSI_NET |IMX_SSI_USE_I2S_SLAVE , };
@@ -239,7 +239,7 @@ void __init eukrea_mbimxsd25_baseboard_init(void)imx25_add_imx_uart1 (&uart_pdata);mxc_register_device (&mx25_fb_device, &eukrea_mximxsd_fb_pdata); -mxc_register_device (&imx_ssi_device0, &eukrea_mbimxsd_ssi_pdata); +imx25_add_imx_ssi (0 , &eukrea_mbimxsd_ssi_pdata);gpio_request (GPIO_LED1 ,"LED1" );gpio_direction_output (GPIO_LED1 ,1 );
arch/arm/mach-mx3/Kconfig +4 -2
@@ -17,6 +17,7 @@ config MACH_MX31ADS bool "Support MX31ADS platforms" select ARCH_MX31 select IMX_HAVE_PLATFORM_IMX_I2C + select IMX_HAVE_PLATFORM_IMX_SSI select IMX_HAVE_PLATFORM_IMX_UART default y help
@@ -118,6 +119,7 @@ config MACH_PCM043 bool "Support Phytec pcm043 (i.MX35) platforms" select ARCH_MX35 select IMX_HAVE_PLATFORM_IMX_I2C + select IMX_HAVE_PLATFORM_IMX_SSI select IMX_HAVE_PLATFORM_IMX_UART select IMX_HAVE_PLATFORM_MXC_NAND select IMX_HAVE_PLATFORM_FLEXCAN
@@ -172,8 +174,8 @@ choice default MACH_EUKREA_MBIMXSD35_BASEBOARD config MACH_EUKREA_MBIMXSD35_BASEBOARD - prompt "Eukrea MBIMXSD development board" - bool + bool "Eukrea MBIMXSD development board" + select IMX_HAVE_PLATFORM_IMX_SSI help This adds board specific devices that can be found on Eukrea's MBIMXSD evaluation board.
arch/arm/mach-mx3/devices-imx31.h +4 -0
@@ -16,6 +16,10 @@#define imx31_add_imx_i2c2 (pdata) \ imx_add_imx_i2c(2, MX31_I2C3_BASE_ADDR, SZ_4K, MX31_INT_I2C3, pdata) +extern const struct imx_imx_ssi_data imx31_imx_ssi_data[]__initconst ; +#define imx31_add_imx_ssi (id, pdata) \ + imx_add_imx_ssi(&imx31_imx_ssi_data[id], pdata) +extern const struct imx_imx_uart_1irq_data imx31_imx_uart_data[]__initconst ;#define imx31_add_imx_uart (id, pdata) \ imx_add_imx_uart_1irq(&imx31_imx_uart_data[id], pdata)
arch/arm/mach-mx3/devices-imx35.h +4 -0
@@ -21,6 +21,10 @@#define imx35_add_imx_i2c2 (pdata) \ imx_add_imx_i2c(2, MX35_I2C3_BASE_ADDR, SZ_4K, MX35_INT_I2C3, pdata) +extern const struct imx_imx_ssi_data imx35_imx_ssi_data[]__initconst ; +#define imx35_add_imx_ssi (id, pdata) \ + imx_add_imx_ssi(&imx35_imx_ssi_data[id], pdata) +extern const struct imx_imx_uart_1irq_data imx35_imx_uart_data[]__initconst ;#define imx35_add_imx_uart (id, pdata) \ imx_add_imx_uart_1irq(&imx35_imx_uart_data[id], pdata)
arch/arm/mach-mx3/devices.c +0 -42
54 lines not on this page · raw message
arch/arm/mach-mx3/devices.h +0 -3
@@ -10,9 +10,6 @@ extern struct platform_device mxc_otg_host;extern struct platform_device mxc_usbh1;extern struct platform_device mxc_usbh2;extern struct platform_device mxc_rnga_device; -extern struct platform_device imx_ssi_device0; -extern struct platform_device imx_ssi_device1; -extern struct platform_device imx_ssi_device1;extern struct platform_device imx_wdt_device0;extern struct platform_device imx_rtc_device0;extern struct platform_device imx_kpp_device;
arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c +3 -3
@@ -43,7 +43,6 @@#include <mach/ipu.h> #include <mach/mx3fb.h> #include <mach/audmux.h> -#include <mach/ssi.h> #include "devices-imx35.h" #include "devices.h"
@@ -206,7 +205,8 @@ static struct i2c_board_info eukrea_mbimxsd_i2c_devices[] = { }, }; -struct imx_ssi_platform_data eukrea_mbimxsd_ssi_pdata = { +static const +struct imx_ssi_platform_data eukrea_mbimxsd_ssi_pdata__initconst = { .flags =IMX_SSI_SYN |IMX_SSI_NET |IMX_SSI_USE_I2S_SLAVE , };
@@ -242,7 +242,7 @@ void __init eukrea_mbimxsd35_baseboard_init(void)mxc_register_device (&mx3_ipu, &mx3_ipu_data);mxc_register_device (&mx3_fb, &mx3fb_pdata); -mxc_register_device (&imx_ssi_device0, &eukrea_mbimxsd_ssi_pdata); +imx35_add_imx_ssi (0 , &eukrea_mbimxsd_ssi_pdata);gpio_request (GPIO_LED1 ,"LED1" );gpio_direction_output (GPIO_LED1 ,1 );
arch/arm/mach-mx3/mach-mx31ads.c +1 -1
@@ -517,7 +517,7 @@ static unsigned int ssi_pins[] = {static void mxc_init_audio (void ) { -mxc_register_device (&imx_ssi_device0,NULL ); +imx31_add_imx_ssi (0 ,NULL );mxc_iomux_setup_multiple_pins (ssi_pins,ARRAY_SIZE (ssi_pins),"ssi" ); }
arch/arm/mach-mx3/mach-pcm043.c +2 -3
@@ -42,7 +42,6 @@#include <mach/mxc_ehci.h> #include <mach/ulpi.h> #include <mach/audmux.h> -#include <mach/ssi.h> #include "devices-imx35.h" #include "devices.h"
@@ -293,7 +292,7 @@ err1:mdelay (1 ); } -static struct imx_ssi_platform_data pcm043_ssi_pdata = { +static const struct imx_ssi_platform_data pcm043_ssi_pdata__initconst = { .ac97_reset = pcm043_ac97_cold_reset, .ac97_warm_reset = pcm043_ac97_warm_reset, .flags =IMX_SSI_USE_AC97 ,
@@ -361,7 +360,7 @@ static void __init mxc_board_init(void)imx35_add_imx_uart0 (&uart_pdata);imx35_add_mxc_nand (&pcm037_nand_board_info); -mxc_register_device (&imx_ssi_device0, &pcm043_ssi_pdata); +imx35_add_imx_ssi (0 , &pcm043_ssi_pdata);imx35_add_imx_uart1 (&uart_pdata);
arch/arm/plat-mxc/devices/Kconfig +3 -0
@@ -5,6 +5,9 @@ config IMX_HAVE_PLATFORM_FLEXCAN config IMX_HAVE_PLATFORM_IMX_I2C bool +config IMX_HAVE_PLATFORM_IMX_SSI + bool + config IMX_HAVE_PLATFORM_IMX_UART bool
arch/arm/plat-mxc/devices/Makefile +1 -0
@@ -1,5 +1,6 @@ obj-$(CONFIG_IMX_HAVE_PLATFORM_FLEXCAN) += platform-flexcan.o obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_I2C) += platform-imx-i2c.o +obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_SSI) += platform-imx-ssi.o obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_UART) += platform-imx-uart.o obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_NAND) += platform-mxc_nand.o obj-$(CONFIG_IMX_HAVE_PLATFORM_SPI_IMX) += platform-spi_imx.o
arch/arm/plat-mxc/devices/platform-imx-ssi.c new file +98 -0
98 lines not on this page · raw message
arch/arm/plat-mxc/include/mach/devices-common.h +15 -0
@@ -25,6 +25,21 @@ struct platform_device *__init imx_add_imx_i2c(int id, resource_size_t iobase, resource_size_t iosize, int irq, const struct imxi2c_platform_data *pdata); +#include <mach/ssi.h> +struct imx_imx_ssi_data { +int id; +resource_size_t iobase; +resource_size_t iosize; +resource_size_t irq; +resource_size_t dmatx0; +resource_size_t dmarx0; +resource_size_t dmatx1; +resource_size_t dmarx1; +}; +struct platform_device *__init imx_add_imx_ssi ( +const struct imx_imx_ssi_data *data, +const struct imx_ssi_platform_data *pdata); +#include <mach/imx-uart.h> struct imx_imx_uart_3irq_data {int id;
arch/arm/plat-mxc/include/mach/mx25.h +9 -0
@@ -77,4 +77,13 @@#define MX25_INT_UART1 45#define MX25_INT_FEC 57 +#define MX25_DMA_REQ_SSI2_RX1 22 +#define MX25_DMA_REQ_SSI2_TX1 23 +#define MX25_DMA_REQ_SSI2_RX0 24 +#define MX25_DMA_REQ_SSI2_TX0 25 +#define MX25_DMA_REQ_SSI1_RX1 26 +#define MX25_DMA_REQ_SSI1_TX1 27 +#define MX25_DMA_REQ_SSI1_RX0 28 +#define MX25_DMA_REQ_SSI1_TX0 29 +#endif /* ifndef __MACH_MX25_H__ */
arch/arm/plat-mxc/include/mach/mx31.h +9 -0
@@ -197,6 +197,15 @@ static inline void mx31_setup_weimcs(size_t cs,#define MX31_INT_EXT_WDOG 62#define MX31_INT_EXT_TV 63 +#define MX31_DMA_REQ_SSI2_RX1 22 +#define MX31_DMA_REQ_SSI2_TX1 23 +#define MX31_DMA_REQ_SSI2_RX0 24 +#define MX31_DMA_REQ_SSI2_TX0 25 +#define MX31_DMA_REQ_SSI1_RX1 26 +#define MX31_DMA_REQ_SSI1_TX1 27 +#define MX31_DMA_REQ_SSI1_RX0 28 +#define MX31_DMA_REQ_SSI1_TX0 29 +#define MX31_PROD_SIGNATURE 0x1/* For MX31 */ /* silicon revisions specific to i.MX31 */
arch/arm/plat-mxc/include/mach/mx35.h +9 -0
@@ -173,6 +173,15 @@#define MX35_INT_EXT_WDOG 62#define MX35_INT_EXT_TV 63 +#define MX35_DMA_REQ_SSI2_RX1 22 +#define MX35_DMA_REQ_SSI2_TX1 23 +#define MX35_DMA_REQ_SSI2_RX0 24 +#define MX35_DMA_REQ_SSI2_TX0 25 +#define MX35_DMA_REQ_SSI1_RX1 26 +#define MX35_DMA_REQ_SSI1_TX1 27 +#define MX35_DMA_REQ_SSI1_RX0 28 +#define MX35_DMA_REQ_SSI1_TX0 29 +#define MX35_PROD_SIGNATURE 0x1/* For MX31 */ /* silicon revisions specific to i.MX31 */
Signature · 1 line
1.7.2.3
PATCH 15/40 ARM: imx: reorganize imx-i2c device registration to use a struct per SoC
In reply to Uwe Kleine-König--- arch/arm/mach-imx/devices-imx1.h | 3 +- arch/arm/mach-imx/devices-imx21.h | 3 +- arch/arm/mach-imx/devices-imx27.h | 9 ++- arch/arm/mach-mx25/devices-imx25.h | 12 ++-- arch/arm/mach-mx3/devices-imx31.h | 12 ++-- arch/arm/mach-mx3/devices-imx35.h | 12 ++-- arch/arm/plat-mxc/devices/platform-imx-i2c.c | 75 ++++++++++++++++++++-- arch/arm/plat-mxc/include/mach/devices-common.h | 10 +++- arch/arm/plat-mxc/include/mach/mx51.h | 4 +- 9 files changed, 105 insertions(+), 35 deletions(-)
arch/arm/mach-imx/devices-imx1.h +2 -1
@@ -9,8 +9,9 @@#include <mach/mx1.h> #include <mach/devices-common.h> +extern const struct imx_imx_i2c_data imx1_imx_i2c_data__initconst ;#define imx1_add_i2c_imx (pdata) \ - imx_add_imx_i2c(0, MX1_I2C_BASE_ADDR, SZ_4K, MX1_INT_I2C, pdata) + imx_add_imx_i2c(&imx1_imx_i2c_data, pdata)extern const struct imx_imx_uart_3irq_data imx1_imx_uart_data[]__initconst ;#define imx1_add_imx_uart (id, pdata) \
arch/arm/mach-imx/devices-imx21.h +2 -1
@@ -9,8 +9,9 @@#include <mach/mx21.h> #include <mach/devices-common.h> +extern const struct imx_imx_i2c_data imx21_imx_i2c_data__initconst ;#define imx21_add_i2c_imx (pdata) \ - imx_add_imx_i2c(0, MX2x_I2C_BASE_ADDR, SZ_4K, MX2x_INT_I2C, pdata) + imx_add_imx_i2c(&imx21_imx_i2c_data, pdata)extern const struct imx_imx_ssi_data imx21_imx_ssi_data[]__initconst ;#define imx21_add_imx_ssi (id, pdata) \
arch/arm/mach-imx/devices-imx27.h +5 -4
@@ -9,10 +9,11 @@#include <mach/mx27.h> #include <mach/devices-common.h> -#define imx27_add_i2c_imx0 (pdata) \ - imx_add_imx_i2c(0, MX27_I2C1_BASE_ADDR, SZ_4K, MX27_INT_I2C1, pdata) -#define imx27_add_i2c_imx1 (pdata) \ - imx_add_imx_i2c(1, MX27_I2C2_BASE_ADDR, SZ_4K, MX27_INT_I2C2, pdata) +extern const struct imx_imx_i2c_data imx27_imx_i2c_data[]__initconst ; +#define imx27_add_imx_i2c (id, pdata) \ + imx_add_imx_i2c(&imx27_imx_i2c_data[id], pdata) +#define imx27_add_i2c_imx0 (pdata) imx27_add_imx_i2c(0, pdata) +#define imx27_add_i2c_imx1 (pdata) imx27_add_imx_i2c(1, pdata)extern const struct imx_imx_ssi_data imx27_imx_ssi_data[]__initconst ;#define imx27_add_imx_ssi (id, pdata) \
arch/arm/mach-mx25/devices-imx25.h +6 -6
@@ -14,12 +14,12 @@#define imx25_add_flexcan1 (pdata) \ imx_add_flexcan(1, MX25_CAN2_BASE_ADDR, SZ_16K, MX25_INT_CAN2, pdata) -#define imx25_add_imx_i2c0 (pdata) \ - imx_add_imx_i2c(0, MX25_I2C1_BASE_ADDR, SZ_16K, MX25_INT_I2C1, pdata) -#define imx25_add_imx_i2c1 (pdata) \ - imx_add_imx_i2c(1, MX25_I2C2_BASE_ADDR, SZ_16K, MX25_INT_I2C2, pdata) -#define imx25_add_imx_i2c2 (pdata) \ - imx_add_imx_i2c(2, MX25_I2C3_BASE_ADDR, SZ_16K, MX25_INT_I2C3, pdata) +extern const struct imx_imx_i2c_data imx25_imx_i2c_data[]__initconst ; +#define imx25_add_imx_i2c (id, pdata) \ + imx_add_imx_i2c(&imx25_imx_i2c_data[id], pdata) +#define imx25_add_imx_i2c0 (pdata) imx25_add_imx_i2c(0, pdata) +#define imx25_add_imx_i2c1 (pdata) imx25_add_imx_i2c(1, pdata) +#define imx25_add_imx_i2c2 (pdata) imx25_add_imx_i2c(2, pdata)extern const struct imx_imx_ssi_data imx25_imx_ssi_data[]__initconst ;#define imx25_add_imx_ssi (id, pdata) \
arch/arm/mach-mx3/devices-imx31.h +6 -6
@@ -9,12 +9,12 @@#include <mach/mx31.h> #include <mach/devices-common.h> -#define imx31_add_imx_i2c0 (pdata) \ - imx_add_imx_i2c(0, MX31_I2C1_BASE_ADDR, SZ_4K, MX31_INT_I2C1, pdata) -#define imx31_add_imx_i2c1 (pdata) \ - imx_add_imx_i2c(1, MX31_I2C2_BASE_ADDR, SZ_4K, MX31_INT_I2C2, pdata) -#define imx31_add_imx_i2c2 (pdata) \ - imx_add_imx_i2c(2, MX31_I2C3_BASE_ADDR, SZ_4K, MX31_INT_I2C3, pdata) +extern const struct imx_imx_i2c_data imx31_imx_i2c_data[]__initconst ; +#define imx31_add_imx_i2c (id, pdata) \ + imx_add_imx_i2c(&imx31_imx_i2c_data[id], pdata) +#define imx31_add_imx_i2c0 (pdata) imx31_add_imx_i2c(0, pdata) +#define imx31_add_imx_i2c1 (pdata) imx31_add_imx_i2c(1, pdata) +#define imx31_add_imx_i2c2 (pdata) imx31_add_imx_i2c(2, pdata)extern const struct imx_imx_ssi_data imx31_imx_ssi_data[]__initconst ;#define imx31_add_imx_ssi (id, pdata) \
arch/arm/mach-mx3/devices-imx35.h +6 -6
@@ -14,12 +14,12 @@#define imx35_add_flexcan1 (pdata) \ imx_add_flexcan(1, MX35_CAN2_BASE_ADDR, SZ_16K, MX35_INT_CAN2, pdata) -#define imx35_add_imx_i2c0 (pdata) \ - imx_add_imx_i2c(0, MX35_I2C1_BASE_ADDR, SZ_4K, MX35_INT_I2C1, pdata) -#define imx35_add_imx_i2c1 (pdata) \ - imx_add_imx_i2c(1, MX35_I2C2_BASE_ADDR, SZ_4K, MX35_INT_I2C2, pdata) -#define imx35_add_imx_i2c2 (pdata) \ - imx_add_imx_i2c(2, MX35_I2C3_BASE_ADDR, SZ_4K, MX35_INT_I2C3, pdata) +extern const struct imx_imx_i2c_data imx35_imx_i2c_data[]__initconst ; +#define imx35_add_imx_i2c (id, pdata) \ + imx_add_imx_i2c(&imx35_imx_i2c_data[id], pdata) +#define imx35_add_imx_i2c0 (pdata) imx35_add_imx_i2c(0, pdata) +#define imx35_add_imx_i2c1 (pdata) imx35_add_imx_i2c(1, pdata) +#define imx35_add_imx_i2c2 (pdata) imx35_add_imx_i2c(2, pdata)extern const struct imx_imx_ssi_data imx35_imx_ssi_data[]__initconst ;#define imx35_add_imx_ssi (id, pdata) \
arch/arm/plat-mxc/devices/platform-imx-i2c.c +68 -7
92 lines not on this page · raw message
arch/arm/plat-mxc/include/mach/devices-common.h +8 -2
@@ -21,8 +21,14 @@ struct platform_device *__init imx_add_flexcan(int id, const struct flexcan_platform_data *pdata);#include <mach/i2c.h> -struct platform_device *__init imx_add_imx_i2c (int id, -resource_size_t iobase,resource_size_t iosize,int irq, +struct imx_imx_i2c_data { +int id; +resource_size_t iobase; +resource_size_t iosize; +resource_size_t irq; +}; +struct platform_device *__init imx_add_imx_i2c ( +const struct imx_imx_i2c_data *data,const struct imxi2c_platform_data *pdata);#include <mach/ssi.h>
arch/arm/plat-mxc/include/mach/mx51.h +2 -2
@@ -341,8 +341,8 @@#define MX51_MXC_INT_WDOG2 59#define MX51_MXC_INT_KPP 60#define MX51_MXC_INT_PWM1 61 -#define MX51_MXC_INT_I2C1 62 -#define MX51_MXC_INT_I2C2 63 +#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
Signature · 1 line
1.7.2.3
PATCH 16/40 ARM: mx5: dynamically register imx-i2c devices
In reply to Uwe Kleine-König--- arch/arm/mach-mx5/Kconfig | 1 + arch/arm/mach-mx5/board-cpuimx51.c | 6 ++-- arch/arm/mach-mx5/devices-imx51.h | 14 +++++++++ arch/arm/mach-mx5/devices.c | 38 -------------------------- arch/arm/mach-mx5/devices.h | 2 - arch/arm/plat-mxc/devices/platform-imx-i2c.c | 9 ++++++ 6 files changed, 27 insertions(+), 43 deletions(-) create mode 100644 arch/arm/mach-mx5/devices-imx51.h
arch/arm/mach-mx5/Kconfig +1 -0
@@ -24,6 +24,7 @@ config MACH_MX51_3DS config MACH_EUKREA_CPUIMX51 bool "Support Eukrea CPUIMX51 module" + select IMX_HAVE_PLATFORM_IMX_I2C help Include support for Eukrea CPUIMX51 platform. This includes specific configurations for the module and its peripherals.
arch/arm/mach-mx5/board-cpuimx51.c +3 -3
@@ -30,7 +30,6 @@#include <mach/hardware.h> #include <mach/imx-uart.h> #include <mach/iomux-mx51.h> -#include <mach/i2c.h> #include <mach/mxc_ehci.h> #include <asm/irq.h>
@@ -152,7 +151,8 @@ static struct imxuart_platform_data uart_pdata = { .flags = IMXUART_HAVE_RTSCTS, }; -static struct imxi2c_platform_data eukrea_cpuimx51_i2c_data = { +static const +struct imxi2c_platform_data eukrea_cpuimx51_i2c_data__initconst = { .bitrate =100000 , };
@@ -255,7 +255,7 @@ static void __init eukrea_cpuimx51_init(void)platform_add_devices (devices,ARRAY_SIZE (devices)); -mxc_register_device (&mxc_i2c_device1, &eukrea_cpuimx51_i2c_data); +imx51_add_imx_i2c (1 , &eukrea_cpuimx51_i2c_data);i2c_register_board_info (1 , eukrea_cpuimx51_i2c_devices,ARRAY_SIZE (eukrea_cpuimx51_i2c_devices));
arch/arm/mach-mx5/devices-imx51.h new file +14 -0
@@ -0,0 +1,14 @@ +/* +* Copyright (C) 2010 Pengutronix +* Uwe Kleine-Koenig <[email protected]> +* +* This program is free software; you can redistribute it and/or modify it under +* the terms of the GNU General Public License version 2 as published by the +* Free Software Foundation. +*/ +#include <mach/mx51.h> +#include <mach/devices-common.h> + +extern const struct imx_imx_i2c_data imx51_imx_i2c_data[]__initconst ; +#define imx51_add_imx_i2c (id, pdata) \ + imx_add_imx_i2c(&imx51_imx_i2c_data[id], pdata)
arch/arm/mach-mx5/devices.c +0 -38
@@ -93,44 +93,6 @@ struct platform_device mxc_fec_device = { .resource = mxc_fec_resources, }; -static struct resource mxc_i2c0_resources[] = { - { - .start =MX51_I2C1_BASE_ADDR , - .end =MX51_I2C1_BASE_ADDR +SZ_4K -1 , - .flags =IORESOURCE_MEM , - }, { - .start =MX51_MXC_INT_I2C1 , - .end =MX51_MXC_INT_I2C1 , - .flags =IORESOURCE_IRQ , - }, -}; - -struct platform_device mxc_i2c_device0 = { - .name ="imx-i2c" , - .id =0 , - .num_resources =ARRAY_SIZE (mxc_i2c0_resources), - .resource = mxc_i2c0_resources, -}; - -static struct resource mxc_i2c1_resources[] = { - { - .start =MX51_I2C2_BASE_ADDR , - .end =MX51_I2C2_BASE_ADDR +SZ_4K -1 , - .flags =IORESOURCE_MEM , - }, { - .start =MX51_MXC_INT_I2C2 , - .end =MX51_MXC_INT_I2C2 , - .flags =IORESOURCE_IRQ , - }, -}; - -struct platform_device mxc_i2c_device1 = { - .name ="imx-i2c" , - .id =1 , - .num_resources =ARRAY_SIZE (mxc_i2c1_resources), - .resource = mxc_i2c1_resources, -}; -static struct resource mxc_hsi2c_resources[] = { { .start =MX51_HSI2C_DMA_BASE_ADDR ,
arch/arm/mach-mx5/devices.h +0 -2
@@ -6,7 +6,5 @@ extern struct platform_device mxc_usbdr_host_device;extern struct platform_device mxc_usbh1_device;extern struct platform_device mxc_usbdr_udc_device;extern struct platform_device mxc_wdt; -extern struct platform_device mxc_i2c_device0; -extern struct platform_device mxc_i2c_device1;extern struct platform_device mxc_hsi2c_device;extern struct platform_device mxc_keypad_device;
arch/arm/plat-mxc/devices/platform-imx-i2c.c +9 -0
@@ -68,6 +68,15 @@ const struct imx_imx_i2c_data imx35_imx_i2c_data[] __initconst = { };#endif /* ifdef CONFIG_ARCH_MX35 */ +#ifdef CONFIG_ARCH_MX51 +const struct imx_imx_i2c_data imx51_imx_i2c_data[]__initconst = { +#define imx51_imx_i2c_data_entry(_id, _hwid) \ + imx_imx_i2c_data_entry(MX51, _id, _hwid, SZ_4K) +imx51_imx_i2c_data_entry (0 ,1 ), +imx51_imx_i2c_data_entry (1 ,2 ), +}; +#endif /* ifdef CONFIG_ARCH_MX51 */ +struct platform_device *__init imx_add_imx_i2c (const struct imx_imx_i2c_data *data,const struct imxi2c_platform_data *pdata)
Signature · 1 line
1.7.2.3
PATCH v2 16/40 ARM: mx5: dynamically register imx-i2c devices
---
Hello,
I just noticed that I missed to adapt board-mx51_babbage in the first attempt.
I just updated my repository with this new patch.
Best regards
Uwe
arch/arm/mach-mx5/Kconfig | 2 + arch/arm/mach-mx5/board-cpuimx51.c | 6 ++-- arch/arm/mach-mx5/board-mx51_babbage.c | 7 ++--- arch/arm/mach-mx5/devices-imx51.h | 14 +++++++++ arch/arm/mach-mx5/devices.c | 38 -------------------------- arch/arm/mach-mx5/devices.h | 2 - arch/arm/plat-mxc/devices/platform-imx-i2c.c | 9 ++++++ 7 files changed, 31 insertions(+), 47 deletions(-) create mode 100644 arch/arm/mach-mx5/devices-imx51.h
arch/arm/mach-mx5/Kconfig +2 -0
@@ -10,6 +10,7 @@ comment "MX5 platforms:" config MACH_MX51_BABBAGE bool "Support MX51 BABBAGE platforms" + select IMX_HAVE_PLATFORM_IMX_I2C help Include support for MX51 Babbage platform, also known as MX51EVK in u-boot. This includes specific configurations for the board and its
@@ -24,6 +25,7 @@ config MACH_MX51_3DS config MACH_EUKREA_CPUIMX51 bool "Support Eukrea CPUIMX51 module" + select IMX_HAVE_PLATFORM_IMX_I2C help Include support for Eukrea CPUIMX51 platform. This includes specific configurations for the module and its peripherals.
arch/arm/mach-mx5/board-cpuimx51.c +3 -3
@@ -30,7 +30,6 @@#include <mach/hardware.h> #include <mach/imx-uart.h> #include <mach/iomux-mx51.h> -#include <mach/i2c.h> #include <mach/mxc_ehci.h> #include <asm/irq.h>
@@ -152,7 +151,8 @@ static struct imxuart_platform_data uart_pdata = { .flags = IMXUART_HAVE_RTSCTS, }; -static struct imxi2c_platform_data eukrea_cpuimx51_i2c_data = { +static const +struct imxi2c_platform_data eukrea_cpuimx51_i2c_data__initconst = { .bitrate =100000 , };
@@ -255,7 +255,7 @@ static void __init eukrea_cpuimx51_init(void)platform_add_devices (devices,ARRAY_SIZE (devices)); -mxc_register_device (&mxc_i2c_device1, &eukrea_cpuimx51_i2c_data); +imx51_add_imx_i2c (1 , &eukrea_cpuimx51_i2c_data);i2c_register_board_info (1 , eukrea_cpuimx51_i2c_devices,ARRAY_SIZE (eukrea_cpuimx51_i2c_devices));
arch/arm/mach-mx5/board-mx51_babbage.c +3 -4
@@ -23,7 +23,6 @@#include <mach/hardware.h> #include <mach/imx-uart.h> #include <mach/iomux-mx51.h> -#include <mach/i2c.h> #include <mach/mxc_ehci.h> #include <asm/irq.h>
@@ -137,7 +136,7 @@ static inline void mxc_init_imx_uart(void) }#endif /* SERIAL_IMX */ -static struct imxi2c_platform_data babbage_i2c_data = { +static const struct imxi2c_platform_data babbage_i2c_data__initconst = { .bitrate =100000 , };
@@ -293,8 +292,8 @@ static void __init mxc_board_init(void)babbage_fec_reset ();platform_add_devices (devices,ARRAY_SIZE (devices)); -mxc_register_device (&mxc_i2c_device0, &babbage_i2c_data); -mxc_register_device (&mxc_i2c_device1, &babbage_i2c_data); +imx51_add_imx_i2c (0 , &babbage_i2c_data); +imx51_add_imx_i2c (1 , &babbage_i2c_data);mxc_register_device (&mxc_hsi2c_device, &babbage_hsi2c_data);if (otg_mode_host)
arch/arm/mach-mx5/devices-imx51.h new file +14 -0
@@ -0,0 +1,14 @@ +/* +* Copyright (C) 2010 Pengutronix +* Uwe Kleine-Koenig <[email protected]> +* +* This program is free software; you can redistribute it and/or modify it under +* the terms of the GNU General Public License version 2 as published by the +* Free Software Foundation. +*/ +#include <mach/mx51.h> +#include <mach/devices-common.h> + +extern const struct imx_imx_i2c_data imx51_imx_i2c_data[]__initconst ; +#define imx51_add_imx_i2c (id, pdata) \ + imx_add_imx_i2c(&imx51_imx_i2c_data[id], pdata)
arch/arm/mach-mx5/devices.c +0 -38
@@ -93,44 +93,6 @@ struct platform_device mxc_fec_device = { .resource = mxc_fec_resources, }; -static struct resource mxc_i2c0_resources[] = { - { - .start =MX51_I2C1_BASE_ADDR , - .end =MX51_I2C1_BASE_ADDR +SZ_4K -1 , - .flags =IORESOURCE_MEM , - }, { - .start =MX51_MXC_INT_I2C1 , - .end =MX51_MXC_INT_I2C1 , - .flags =IORESOURCE_IRQ , - }, -}; - -struct platform_device mxc_i2c_device0 = { - .name ="imx-i2c" , - .id =0 , - .num_resources =ARRAY_SIZE (mxc_i2c0_resources), - .resource = mxc_i2c0_resources, -}; - -static struct resource mxc_i2c1_resources[] = { - { - .start =MX51_I2C2_BASE_ADDR , - .end =MX51_I2C2_BASE_ADDR +SZ_4K -1 , - .flags =IORESOURCE_MEM , - }, { - .start =MX51_MXC_INT_I2C2 , - .end =MX51_MXC_INT_I2C2 , - .flags =IORESOURCE_IRQ , - }, -}; - -struct platform_device mxc_i2c_device1 = { - .name ="imx-i2c" , - .id =1 , - .num_resources =ARRAY_SIZE (mxc_i2c1_resources), - .resource = mxc_i2c1_resources, -}; -static struct resource mxc_hsi2c_resources[] = { { .start =MX51_HSI2C_DMA_BASE_ADDR ,
arch/arm/mach-mx5/devices.h +0 -2
@@ -6,7 +6,5 @@ extern struct platform_device mxc_usbdr_host_device;extern struct platform_device mxc_usbh1_device;extern struct platform_device mxc_usbdr_udc_device;extern struct platform_device mxc_wdt; -extern struct platform_device mxc_i2c_device0; -extern struct platform_device mxc_i2c_device1;extern struct platform_device mxc_hsi2c_device;extern struct platform_device mxc_keypad_device;
arch/arm/plat-mxc/devices/platform-imx-i2c.c +9 -0
@@ -68,6 +68,15 @@ const struct imx_imx_i2c_data imx35_imx_i2c_data[] __initconst = { };#endif /* ifdef CONFIG_ARCH_MX35 */ +#ifdef CONFIG_ARCH_MX51 +const struct imx_imx_i2c_data imx51_imx_i2c_data[]__initconst = { +#define imx51_imx_i2c_data_entry(_id, _hwid) \ + imx_imx_i2c_data_entry(MX51, _id, _hwid, SZ_4K) +imx51_imx_i2c_data_entry (0 ,1 ), +imx51_imx_i2c_data_entry (1 ,2 ), +}; +#endif /* ifdef CONFIG_ARCH_MX51 */ +struct platform_device *__init imx_add_imx_i2c (const struct imx_imx_i2c_data *data,const struct imxi2c_platform_data *pdata)
Signature · 1 line
1.7.2.3
PATCH 17/40 ARM: imx: fix name of macros to add imx-i2c devices
In reply to Uwe Kleine-KönigThis is a follow up to
c698715 (ARM: imx: dynamically register imx-i2c devices (imx27)) 2b92084 (ARM: imx: dynamically register imx-i2c devices (imx21)) 6348e6b (ARM: imx: dynamically register imx-i2c devices (imx1))
--- arch/arm/mach-imx/devices-imx1.h | 2 +- arch/arm/mach-imx/devices-imx21.h | 2 +- arch/arm/mach-imx/devices-imx27.h | 2 -- arch/arm/mach-imx/mach-cpuimx27.c | 2 +- arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 4 ++-- arch/arm/mach-imx/mach-mx1ads.c | 2 +- arch/arm/mach-imx/mach-mx27ads.c | 2 +- arch/arm/mach-imx/mach-mxt_td60.c | 4 ++-- arch/arm/mach-imx/mach-pca100.c | 2 +- arch/arm/mach-imx/mach-pcm038.c | 2 +- 10 files changed, 11 insertions(+), 13 deletions(-)
arch/arm/mach-imx/devices-imx1.h +1 -1
@@ -10,7 +10,7 @@#include <mach/devices-common.h> extern const struct imx_imx_i2c_data imx1_imx_i2c_data__initconst ; -#define imx1_add_i2c_imx (pdata) \ +#define imx1_add_imx_i2c (pdata) \ imx_add_imx_i2c(&imx1_imx_i2c_data, pdata)extern const struct imx_imx_uart_3irq_data imx1_imx_uart_data[]__initconst ;
arch/arm/mach-imx/devices-imx21.h +1 -1
@@ -10,7 +10,7 @@#include <mach/devices-common.h> extern const struct imx_imx_i2c_data imx21_imx_i2c_data__initconst ; -#define imx21_add_i2c_imx (pdata) \ +#define imx21_add_imx_i2c (pdata) \ imx_add_imx_i2c(&imx21_imx_i2c_data, pdata)extern const struct imx_imx_ssi_data imx21_imx_ssi_data[]__initconst ;
arch/arm/mach-imx/devices-imx27.h +0 -2
@@ -12,8 +12,6 @@extern const struct imx_imx_i2c_data imx27_imx_i2c_data[]__initconst ;#define imx27_add_imx_i2c (id, pdata) \ imx_add_imx_i2c(&imx27_imx_i2c_data[id], pdata) -#define imx27_add_i2c_imx0 (pdata) imx27_add_imx_i2c(0, pdata) -#define imx27_add_i2c_imx1 (pdata) imx27_add_imx_i2c(1, pdata)extern const struct imx_imx_ssi_data imx27_imx_ssi_data[]__initconst ;#define imx27_add_imx_ssi (id, pdata) \
arch/arm/mach-imx/mach-cpuimx27.c +1 -1
@@ -259,7 +259,7 @@ static void __init eukrea_cpuimx27_init(void)i2c_register_board_info (0 , eukrea_cpuimx27_i2c_devices,ARRAY_SIZE (eukrea_cpuimx27_i2c_devices)); -imx27_add_i2c_imx1 (&cpuimx27_i2c1_data); +imx27_add_imx_i2c (1 , &cpuimx27_i2c1_data);platform_add_devices (platform_devices,ARRAY_SIZE (platform_devices));
arch/arm/mach-imx/mach-imx27_visstrim_m10.c +2 -2
@@ -236,8 +236,8 @@ static void __init visstrim_m10_board_init(void)i2c_register_board_info (0 , visstrim_m10_i2c_devices,ARRAY_SIZE (visstrim_m10_i2c_devices)); -imx27_add_i2c_imx0 (&visstrim_m10_i2c_data); -imx27_add_i2c_imx1 (&visstrim_m10_i2c_data); +imx27_add_imx_i2c (0 , &visstrim_m10_i2c_data); +imx27_add_imx_i2c (1 , &visstrim_m10_i2c_data);mxc_register_device (&mxc_sdhc_device0, &visstrim_m10_sdhc_pdata);mxc_register_device (&mxc_otg_host, &visstrim_m10_usbotg_pdata);platform_add_devices (platform_devices,ARRAY_SIZE (platform_devices));
arch/arm/mach-imx/mach-mx1ads.c +1 -1
@@ -131,7 +131,7 @@ static void __init mx1ads_init(void)i2c_register_board_info (0 , mx1ads_i2c_devices,ARRAY_SIZE (mx1ads_i2c_devices)); -imx1_add_i2c_imx (&mx1ads_i2c_data); +imx1_add_imx_i2c (&mx1ads_i2c_data); }static void __init mx1ads_timer_init (void )
arch/arm/mach-imx/mach-mx27ads.c +1 -1
@@ -308,7 +308,7 @@ static void __init mx27ads_board_init(void)/* only the i2c master 1 is used on this CPU card */ i2c_register_board_info (1 , mx27ads_i2c_devices,ARRAY_SIZE (mx27ads_i2c_devices)); -imx27_add_i2c_imx1 (&mx27ads_i2c1_data); +imx27_add_imx_i2c (1 , &mx27ads_i2c1_data);mxc_register_device (&mxc_fb_device, &mx27ads_fb_data);mxc_register_device (&mxc_sdhc_device0, &sdhc1_pdata);mxc_register_device (&mxc_sdhc_device1, &sdhc2_pdata);
arch/arm/mach-imx/mach-mxt_td60.c +2 -2
@@ -255,8 +255,8 @@ static void __init mxt_td60_board_init(void)i2c_register_board_info (1 , mxt_td60_i2c2_devices,ARRAY_SIZE (mxt_td60_i2c2_devices)); -imx27_add_i2c_imx0 (&mxt_td60_i2c0_data); -imx27_add_i2c_imx1 (&mxt_td60_i2c1_data); +imx27_add_imx_i2c (0 , &mxt_td60_i2c0_data); +imx27_add_imx_i2c (1 , &mxt_td60_i2c1_data);mxc_register_device (&mxc_fb_device, &mxt_td60_fb_data);mxc_register_device (&mxc_sdhc_device0, &sdhc1_pdata);
arch/arm/mach-imx/mach-pca100.c +1 -1
@@ -400,7 +400,7 @@ static void __init pca100_init(void)i2c_register_board_info (1 , pca100_i2c_devices,ARRAY_SIZE (pca100_i2c_devices)); -imx27_add_i2c_imx1 (&pca100_i2c1_data); +imx27_add_imx_i2c (1 , &pca100_i2c1_data);#if defined(CONFIG_SPI_IMX ) || defined(CONFIG_SPI_IMX_MODULE )mxc_gpio_mode (GPIO_PORTD |28 |GPIO_GPIO |GPIO_IN );
arch/arm/mach-imx/mach-pcm038.c +1 -1
@@ -309,7 +309,7 @@ static void __init pcm038_init(void)i2c_register_board_info (1 , pcm038_i2c_devices,ARRAY_SIZE (pcm038_i2c_devices)); -imx27_add_i2c_imx1 (&pcm038_i2c1_data); +imx27_add_imx_i2c (1 , &pcm038_i2c1_data);/* PE18 for user-LED D40 */ mxc_gpio_mode (GPIO_PORTE |18 |GPIO_GPIO |GPIO_OUT );
Signature · 1 line
1.7.2.3
PATCH 18/40 spi/imx: default to m on platforms that have such devices
In reply to Uwe Kleine-König--- drivers/spi/Kconfig | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/spi/Kconfig +1 -0
@@ -147,6 +147,7 @@ config SPI_IMX tristate "Freescale i.MX SPI controllers" depends on ARCH_MXC select SPI_BITBANG + default m if IMX_HAVE_PLATFORM_SPI_IMX help This enables using the Freescale i.MX SPI controllers in master mode.
Signature · 1 line
1.7.2.3
PATCH 19/40 spi/imx: convert driver to use platform ids
In reply to Uwe Kleine-KönigThis has the advantage not to need to much cpu_is_... macros. Still more when imx51 support is added which has two different spi interfaces which would introduce additional checks on the device id.
With this setup it's not possible for the compiler anymore to detect the unused functions, so four additional kconfig symbols are introduced to ifdef out the unneeded functions in the callback array and all these functions are marked with __maybe_unused to suppress the corresponding gcc warnings.
Comparing the driver footprint with and without the patch for a mx27 kernel yields:
add/remove: 2/0 grow/shrink: 2/0 up/down: 280/0 (280)
function old new deltaspi_imx_devtype - 192 +192spi_imx_probe 980 1032 +52spi_imx_devtype_data - 32 +32spi_imx_setupxfer 276 280 +4
Later when the platform code is updated to use the platform ids, the autodetection can be removed which will make the driver a bit smaller again. (~60 Bytes in my test.)
--- drivers/spi/Kconfig | 12 ++++ drivers/spi/spi_imx.c | 173 +++++++++++++++++++++++++++++++++++++------------ 2 files changed, 143 insertions(+), 42 deletions(-)
drivers/spi/Kconfig +12 -0
@@ -143,6 +143,18 @@ config SPI_GPIO GPIO operations, you should be able to leverage that for better speed with a custom version of this driver; see the source code. +config SPI_IMX_VER_IMX1 + def_bool y if SOC_IMX1 + +config SPI_IMX_VER_0_0 + def_bool y if SOC_IMX21 || SOC_IMX27 + +config SPI_IMX_VER_0_4 + def_bool y if ARCH_MX31 + +config SPI_IMX_VER_0_7 + def_bool y if ARCH_MX25 || ARCH_MX35 + config SPI_IMX tristate "Freescale i.MX SPI controllers" depends on ARCH_MXC
drivers/spi/spi_imx.c +131 -42
324 lines not on this page · raw message
Signature · 1 line
1.7.2.3
PATCH 20/40 spi/imx: get rid of more ifs depending on the used cpu
In reply to Uwe Kleine-KönigNearly everything that is needed is provided by the version of the SPI IP. Now the only checks left using cpu_is_... are clk divider tuning on mx21/mx27 and autodetection (which will die soon).
--- drivers/spi/spi_imx.c | 73 +++++++++++++++++++++++++++++++++++------------- 1 files changed, 53 insertions(+), 20 deletions(-)
drivers/spi/spi_imx.c +53 -20
@@ -75,6 +75,7 @@ struct spi_imx_devtype_data {int (*config)(struct spi_imx_data *,struct spi_imx_config *);void (*trigger)(struct spi_imx_data *);int (*rx_available)(struct spi_imx_data *); +void (*reset)(struct spi_imx_data *); };struct spi_imx_data {
@@ -213,7 +214,7 @@ static void __maybe_unused mx31_trigger(struct spi_imx_data *spi_imx)writel (reg, spi_imx->base +MXC_CSPICTRL ); } -static int __maybe_unused mx31_config (struct spi_imx_data *spi_imx, +static int __maybe_unused spi_imx0_4_config (struct spi_imx_data *spi_imx,struct spi_imx_config *config) {unsigned int reg =MX31_CSPICTRL_ENABLE |MX31_CSPICTRL_MASTER ;
@@ -221,12 +222,7 @@ static int __maybe_unused mx31_config(struct spi_imx_data *spi_imx, reg |=spi_imx_clkdiv_2 (spi_imx->spi_clk, config->speed_hz) <<MX31_CSPICTRL_DR_SHIFT ; -if (cpu_is_mx31 ()) - reg |= (config->bpw -1 ) <<MX31_CSPICTRL_BC_SHIFT ; -else if (cpu_is_mx25 () ||cpu_is_mx35 ()) { - reg |= (config->bpw -1 ) <<MX35_CSPICTRL_BL_SHIFT ; - reg |=MX31_CSPICTRL_SSCTL ; - } + reg |= (config->bpw -1 ) <<MX31_CSPICTRL_BC_SHIFT ;if (config->mode &SPI_CPHA ) reg |=MX31_CSPICTRL_PHA ;
@@ -235,10 +231,7 @@ static int __maybe_unused mx31_config(struct spi_imx_data *spi_imx,if (config->mode &SPI_CS_HIGH ) reg |=MX31_CSPICTRL_SSPOL ;if (config->cs <0 ) { -if (cpu_is_mx31 ()) - reg |= (config->cs +32 ) <<MX31_CSPICTRL_CS_SHIFT ; -else if (cpu_is_mx25 () ||cpu_is_mx35 ()) - reg |= (config->cs +32 ) <<MX35_CSPICTRL_CS_SHIFT ; + reg |= (config->cs +32 ) <<MX31_CSPICTRL_CS_SHIFT ; }writel (reg, spi_imx->base +MXC_CSPICTRL );
@@ -246,11 +239,43 @@ static int __maybe_unused mx31_config(struct spi_imx_data *spi_imx,return 0 ; } +static int __maybe_unused spi_imx0_7_config (struct spi_imx_data *spi_imx, +struct spi_imx_config *config) +{ +unsigned int reg =MX31_CSPICTRL_ENABLE |MX31_CSPICTRL_MASTER ; + + reg |=spi_imx_clkdiv_2 (spi_imx->spi_clk, config->speed_hz) << +MX31_CSPICTRL_DR_SHIFT ; + + reg |= (config->bpw -1 ) <<MX35_CSPICTRL_BL_SHIFT ; + reg |=MX31_CSPICTRL_SSCTL ; + +if (config->mode &SPI_CPHA ) + reg |=MX31_CSPICTRL_PHA ; +if (config->mode &SPI_CPOL ) + reg |=MX31_CSPICTRL_POL ; +if (config->mode &SPI_CS_HIGH ) + reg |=MX31_CSPICTRL_SSPOL ; +if (config->cs <0 ) + reg |= (config->cs +32 ) <<MX35_CSPICTRL_CS_SHIFT ; + +writel (reg, spi_imx->base +MXC_CSPICTRL ); + +return 0 ; +} +static int __maybe_unused mx31_rx_available (struct spi_imx_data *spi_imx) {return readl (spi_imx->base +MX31_CSPISTATUS ) &MX31_STATUS_RR ; } +static void __maybe_unused spi_imx0_4_reset (struct spi_imx_data *spi_imx) +{ +/* drain receive buffer */ +while (readl (spi_imx->base +MX3_CSPISTAT ) &MX3_CSPISTAT_RR ) +readl (spi_imx->base +MXC_CSPIRXDATA ); +} +#define MX27_INTREG_RR (1 << 4)#define MX27_INTREG_TEEN (1 << 9)#define MX27_INTREG_RREN (1 << 13)
@@ -313,6 +338,11 @@ static int __maybe_unused mx27_rx_available(struct spi_imx_data *spi_imx)return readl (spi_imx->base +MXC_CSPIINT ) &MX27_INTREG_RR ; } +static void __maybe_unused spi_imx0_0_reset (struct spi_imx_data *spi_imx) +{ +writel (1 , spi_imx->base +MXC_RESET ); +} +#define MX1_INTREG_RR (1 << 3)#define MX1_INTREG_TEEN (1 << 8)#define MX1_INTREG_RREN (1 << 11)
@@ -369,6 +399,11 @@ static int __maybe_unused mx1_rx_available(struct spi_imx_data *spi_imx)return readl (spi_imx->base +MXC_CSPIINT ) &MX1_INTREG_RR ; } +static void __maybe_unused mx1_reset (struct spi_imx_data *spi_imx) +{ +writel (1 , spi_imx->base +MXC_RESET ); +} +/* * These version numbers are taken from the Freescale driver. Unfortunately it * doesn't support i.MX1, so this entry doesn't match the scheme. :-(
@@ -380,6 +415,7 @@ static struct spi_imx_devtype_data spi_imx_devtype_data[] __devinitdata = { .config = mx1_config, .trigger = mx1_trigger, .rx_available = mx1_rx_available, + .reset = mx1_reset, },#endif #ifdef CONFIG_SPI_IMX_VER_0_0
@@ -388,22 +424,25 @@ static struct spi_imx_devtype_data spi_imx_devtype_data[] __devinitdata = { .config = mx27_config, .trigger = mx27_trigger, .rx_available = mx27_rx_available, + .reset = spi_imx0_0_reset, },#endif #ifdef CONFIG_SPI_IMX_VER_0_4 [SPI_IMX_VER_0_4] = { .intctrl = mx31_intctrl, - .config = mx31_config, + .config = spi_imx0_4_config, .trigger = mx31_trigger, .rx_available = mx31_rx_available, + .reset = spi_imx0_4_reset, }, #endif #ifdef CONFIG_SPI_IMX_VER_0_7 [SPI_IMX_VER_0_7] = { .intctrl = mx31_intctrl, - .config = mx31_config, + .config = spi_imx0_7_config, .trigger = mx31_trigger, .rx_available = mx31_rx_available, + .reset = spi_imx0_4_reset, }, #endif };
@@ -683,13 +722,7 @@ static int __devinit spi_imx_probe(struct platform_device *pdev)clk_enable (spi_imx->clk); spi_imx->spi_clk =clk_get_rate (spi_imx->clk); -if (cpu_is_mx1 () ||cpu_is_mx21 () ||cpu_is_mx27 ()) -writel (1 , spi_imx->base +MXC_RESET ); - -/* drain receive buffer */ -if (cpu_is_mx25 () ||cpu_is_mx31 () ||cpu_is_mx35 ()) -while (readl (spi_imx->base +MX3_CSPISTAT ) &MX3_CSPISTAT_RR ) -readl (spi_imx->base +MXC_CSPIRXDATA ); + spi_imx->devtype_data.reset (spi_imx); spi_imx->devtype_data.intctrl (spi_imx,0 );
Signature · 1 line
1.7.2.3
PATCH 21/40 spi/imx: save the spi chip select in config struct, not the gpio to use
In reply to Uwe Kleine-KönigThis prepares adding support for imx51's eCSPI. This IP has seperate control and config bits for all four supported chip selects, so the config routine needs to know which chip select is being used even if the chipselect is realized by a gpio.
--- drivers/spi/spi_imx.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-)
drivers/spi/spi_imx.c +11 -9
@@ -56,7 +56,7 @@ struct spi_imx_config {unsigned int speed_hz;unsigned int bpw;unsigned int mode; -int cs; +u8 cs; };enum spi_imx_devtype {
@@ -218,6 +218,7 @@ static int __maybe_unused spi_imx0_4_config(struct spi_imx_data *spi_imx, struct spi_imx_config *config) {unsigned int reg =MX31_CSPICTRL_ENABLE |MX31_CSPICTRL_MASTER ; +int cs = spi_imx->chipselect[config->cs]; reg |=spi_imx_clkdiv_2 (spi_imx->spi_clk, config->speed_hz) <<MX31_CSPICTRL_DR_SHIFT ;
@@ -230,9 +231,8 @@ static int __maybe_unused spi_imx0_4_config(struct spi_imx_data *spi_imx, reg |=MX31_CSPICTRL_POL ;if (config->mode &SPI_CS_HIGH ) reg |=MX31_CSPICTRL_SSPOL ; -if (config->cs <0 ) { - reg |= (config->cs +32 ) <<MX31_CSPICTRL_CS_SHIFT ; - } +if (cs <0 ) + reg |= (cs +32 ) <<MX31_CSPICTRL_CS_SHIFT ;writel (reg, spi_imx->base +MXC_CSPICTRL );
@@ -243,6 +243,7 @@ static int __maybe_unused spi_imx0_7_config(struct spi_imx_data *spi_imx, struct spi_imx_config *config) {unsigned int reg =MX31_CSPICTRL_ENABLE |MX31_CSPICTRL_MASTER ; +int cs = spi_imx->chipselect[config->cs]; reg |=spi_imx_clkdiv_2 (spi_imx->spi_clk, config->speed_hz) <<MX31_CSPICTRL_DR_SHIFT ;
@@ -256,8 +257,8 @@ static int __maybe_unused spi_imx0_7_config(struct spi_imx_data *spi_imx, reg |=MX31_CSPICTRL_POL ;if (config->mode &SPI_CS_HIGH ) reg |=MX31_CSPICTRL_SSPOL ; -if (config->cs <0 ) - reg |= (config->cs +32 ) <<MX35_CSPICTRL_CS_SHIFT ; +if (cs <0 ) + reg |= (cs +32 ) <<MX35_CSPICTRL_CS_SHIFT ;writel (reg, spi_imx->base +MXC_CSPICTRL );
@@ -314,6 +315,7 @@ static int __maybe_unused mx27_config(struct spi_imx_data *spi_imx, struct spi_imx_config *config) {unsigned int reg =MX27_CSPICTRL_ENABLE |MX27_CSPICTRL_MASTER ; +int cs = spi_imx->chipselect[config->cs]; reg |=spi_imx_clkdiv_1 (spi_imx->spi_clk, config->speed_hz) <<MX27_CSPICTRL_DR_SHIFT ;
@@ -325,8 +327,8 @@ static int __maybe_unused mx27_config(struct spi_imx_data *spi_imx, reg |=MX27_CSPICTRL_POL ;if (config->mode &SPI_CS_HIGH ) reg |=MX27_CSPICTRL_SSPOL ; -if (config->cs <0 ) - reg |= (config->cs +32 ) <<MX27_CSPICTRL_CS_SHIFT ; +if (cs <0 ) + reg |= (cs +32 ) <<MX27_CSPICTRL_CS_SHIFT ;writel (reg, spi_imx->base +MXC_CSPICTRL );
@@ -510,7 +512,7 @@ static int spi_imx_setupxfer(struct spi_device *spi, config.bpw = t ? t->bits_per_word : spi->bits_per_word; config.speed_hz = t ? t->speed_hz : spi->max_speed_hz; config.mode = spi->mode; - config.cs = spi_imx->chipselect[spi->chip_select]; + config.cs = spi->chip_select;if (!config.speed_hz) config.speed_hz = spi->max_speed_hz;
Signature · 1 line
1.7.2.3
PATCH 22/40 spi/imx: add support for imx51's eCSPI and CSPI
In reply to Uwe Kleine-Königi.MX51 comes with two eCSPI interfaces (that are quite different from what was known before---the tried and tested Freescale way) and a CSPI interface that is identical to the devices found on i.MX25 and i.MX35.
This patch is a merge of two very similar patches (by Jason Wang and Sascha Hauer resp.) plus a (now hopefully correct) reimplementation of the clock calculation.
--- drivers/spi/Kconfig | 5 ++- drivers/spi/spi_imx.c | 140 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 143 insertions(+), 2 deletions(-)
drivers/spi/Kconfig +4 -1
@@ -153,7 +153,10 @@ config SPI_IMX_VER_0_4 def_bool y if ARCH_MX31 config SPI_IMX_VER_0_7 - def_bool y if ARCH_MX25 || ARCH_MX35 + def_bool y if ARCH_MX25 || ARCH_MX35 || ARCH_MX51 + +config SPI_IMX_VER_2_3 + def_bool y if ARCH_MX51 config SPI_IMX tristate "Freescale i.MX SPI controllers"
drivers/spi/spi_imx.c +139 -1
170 lines not on this page · raw message
Signature · 1 line
1.7.2.3
PATCH 23/40 ARM: imx: use platform ids for spi_imx devices
In reply to Uwe Kleine-KönigThe driver recently learned to handle platform ids. Make use of this new feature. The up side is that the driver needs less knowledge about the spi interfaces used on different SoCs.
--- arch/arm/mach-imx/clock-imx1.c | 2 +- arch/arm/mach-imx/clock-imx21.c | 6 +++--- arch/arm/mach-imx/clock-imx27.c | 6 +++--- arch/arm/mach-mx25/clock.c | 6 +++--- arch/arm/mach-mx3/clock-imx31.c | 6 +++--- arch/arm/mach-mx3/clock-imx35.c | 4 ++-- arch/arm/plat-mxc/devices/platform-spi_imx.c | 3 ++- arch/arm/plat-mxc/include/mach/devices-common.h | 1 + 8 files changed, 18 insertions(+), 16 deletions(-)
arch/arm/mach-imx/clock-imx1.c +1 -1
@@ -592,7 +592,7 @@ static struct clk_lookup lookups[] __initdata = { _REGISTER_CLOCK("imx-uart.1", NULL, uart_clk) _REGISTER_CLOCK("imx-uart.2", NULL, uart_clk) _REGISTER_CLOCK("imx-i2c.0", NULL, i2c_clk) - _REGISTER_CLOCK("spi_imx.0", NULL, spi_clk) + _REGISTER_CLOCK("imx1-cspi.0", NULL, spi_clk) _REGISTER_CLOCK("imx-mmc.0", NULL, sdhc_clk) _REGISTER_CLOCK("imx-fb.0", NULL, lcdc_clk)_REGISTER_CLOCK (NULL ,"mshc" , mshc_clk)
arch/arm/mach-imx/clock-imx21.c +3 -3
@@ -1172,9 +1172,9 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK(NULL, "pwm", pwm_clk[0]) _REGISTER_CLOCK(NULL, "sdhc1", sdhc_clk[0]) _REGISTER_CLOCK(NULL, "sdhc2", sdhc_clk[1]) - _REGISTER_CLOCK(NULL, "cspi1", cspi_clk[0]) - _REGISTER_CLOCK(NULL, "cspi2", cspi_clk[1]) - _REGISTER_CLOCK(NULL, "cspi3", cspi_clk[2]) + _REGISTER_CLOCK("imx21-cspi.0", NULL, cspi_clk[0]) + _REGISTER_CLOCK("imx21-cspi.1", NULL, cspi_clk[1]) + _REGISTER_CLOCK("imx21-cspi.2", NULL, cspi_clk[2]) _REGISTER_CLOCK("imx-fb.0", NULL, lcdc_clk[0]) _REGISTER_CLOCK(NULL, "csi", csi_clk[0])_REGISTER_CLOCK ("imx21-hcd.0" ,NULL , usb_clk[0 ])
arch/arm/mach-imx/clock-imx27.c +3 -3
@@ -640,9 +640,9 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK("mxc-mmc.0", NULL, sdhc1_clk) _REGISTER_CLOCK("mxc-mmc.1", NULL, sdhc2_clk) _REGISTER_CLOCK("mxc-mmc.2", NULL, sdhc3_clk) - _REGISTER_CLOCK("spi_imx.0", NULL, cspi1_clk) - _REGISTER_CLOCK("spi_imx.1", NULL, cspi2_clk) - _REGISTER_CLOCK("spi_imx.2", NULL, cspi3_clk) + _REGISTER_CLOCK("imx27-cspi.0", NULL, cspi1_clk) + _REGISTER_CLOCK("imx27-cspi.1", NULL, cspi2_clk) + _REGISTER_CLOCK("imx27-cspi.2", NULL, cspi3_clk) _REGISTER_CLOCK("imx-fb.0", NULL, lcdc_clk) _REGISTER_CLOCK("mx2-camera.0", NULL, csi_clk)_REGISTER_CLOCK ("fsl-usb2-udc" ,"usb" , usb_clk)
arch/arm/mach-mx25/clock.c +3 -3
@@ -261,9 +261,9 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK("mxc-ehci.2", "usb", usbotg_clk) _REGISTER_CLOCK("fsl-usb2-udc", "usb", usbotg_clk) _REGISTER_CLOCK("mxc_nand.0", NULL, nfc_clk) - _REGISTER_CLOCK("spi_imx.0", NULL, cspi1_clk) - _REGISTER_CLOCK("spi_imx.1", NULL, cspi2_clk) - _REGISTER_CLOCK("spi_imx.2", NULL, cspi3_clk) + _REGISTER_CLOCK("imx25-cspi.0", NULL, cspi1_clk) + _REGISTER_CLOCK("imx25-cspi.1", NULL, cspi2_clk) + _REGISTER_CLOCK("imx25-cspi.2", NULL, cspi3_clk) _REGISTER_CLOCK("mxc_pwm.0", NULL, pwm1_clk) _REGISTER_CLOCK("mxc_pwm.1", NULL, pwm2_clk)_REGISTER_CLOCK ("mxc_pwm.2" ,NULL , pwm3_clk)
arch/arm/mach-mx3/clock-imx31.c +3 -3
@@ -525,9 +525,9 @@ DEFINE_CLOCK(ipg_clk, 0, NULL, 0, ipg_get_rate, NULL, &ahb_clk);static struct clk_lookup lookups[] = { _REGISTER_CLOCK(NULL, "emi", emi_clk) - _REGISTER_CLOCK("spi_imx.0", NULL, cspi1_clk) - _REGISTER_CLOCK("spi_imx.1", NULL, cspi2_clk) - _REGISTER_CLOCK("spi_imx.2", NULL, cspi3_clk) + _REGISTER_CLOCK("imx31-cspi.0", NULL, cspi1_clk) + _REGISTER_CLOCK("imx31-cspi.1", NULL, cspi2_clk) + _REGISTER_CLOCK("imx31-cspi.2", NULL, cspi3_clk) _REGISTER_CLOCK(NULL, "gpt", gpt_clk) _REGISTER_CLOCK(NULL, "pwm", pwm_clk)_REGISTER_CLOCK ("imx-wdt.0" ,NULL , wdog_clk)
arch/arm/mach-mx3/clock-imx35.c +2 -2
@@ -451,8 +451,8 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK(NULL, "ata", ata_clk) _REGISTER_CLOCK("flexcan.0", NULL, can1_clk) _REGISTER_CLOCK("flexcan.1", NULL, can2_clk) - _REGISTER_CLOCK("spi_imx.0", NULL, cspi1_clk) - _REGISTER_CLOCK("spi_imx.1", NULL, cspi2_clk) + _REGISTER_CLOCK("imx35-cspi.0", NULL, cspi1_clk) + _REGISTER_CLOCK("imx35-cspi.1", NULL, cspi2_clk) _REGISTER_CLOCK(NULL, "ect", ect_clk) _REGISTER_CLOCK(NULL, "edio", edio_clk)_REGISTER_CLOCK (NULL ,"emi" , emi_clk)
arch/arm/plat-mxc/devices/platform-spi_imx.c +2 -1
@@ -11,6 +11,7 @@#define imx_spi_imx_data_entry_single (soc, type, _devid, _id, hwid, _size) \ { \ + .devid = _devid, \ .id = _id, \ .iobase = soc ## _ ## type ## hwid ## _BASE_ADDR, \ .iosize = _size, \
@@ -83,6 +84,6 @@ struct platform_device *__init imx_add_spi_imx( }, }; -return imx_add_platform_device ("spi_imx" , data->id, +return imx_add_platform_device (data->devid, data->id, res,ARRAY_SIZE (res), pdata,sizeof (*pdata)); }
arch/arm/plat-mxc/include/mach/devices-common.h +1 -0
@@ -77,6 +77,7 @@ struct platform_device *__init imx_add_mxc_nand_v21(resource_size_t iobase,#include <mach/spi.h> struct imx_spi_imx_data { +const char *devid;int id;resource_size_t iobase;resource_size_t iosize;
Signature · 1 line
1.7.2.3
PATCH 24/40 ARM: mx5: add spi_imx device registration
In reply to Uwe Kleine-König--- arch/arm/mach-mx5/devices-imx51.h | 8 ++++++++ arch/arm/plat-mxc/devices/platform-spi_imx.c | 12 ++++++++++++ 2 files changed, 20 insertions(+), 0 deletions(-)
arch/arm/mach-mx5/devices-imx51.h +8 -0
@@ -12,3 +12,11 @@extern const struct imx_imx_i2c_data imx51_imx_i2c_data[]__initconst ;#define imx51_add_imx_i2c (id, pdata) \ imx_add_imx_i2c(&imx51_imx_i2c_data[id], pdata) + +extern const struct imx_spi_imx_data imx51_cspi_data__initconst ; +#define imx51_add_cspi (pdata) \ + imx_add_spi_imx(&imx51_cspi_data, pdata) + +extern const struct imx_spi_imx_data imx51_ecspi_data[]__initconst ; +#define imx51_add_ecspi (id, pdata) \ + imx_add_spi_imx(&imx51_ecspi_data[id], pdata)
arch/arm/plat-mxc/devices/platform-spi_imx.c +12 -0
@@ -68,6 +68,18 @@ const struct imx_spi_imx_data imx35_cspi_data[] __initconst = { };#endif /* ifdef CONFIG_ARCH_MX35 */ +#ifdef CONFIG_ARCH_MX51 +const struct imx_spi_imx_data imx51_cspi_data__initconst = + imx_spi_imx_data_entry_single(MX51, CSPI, "imx51-cspi", 0, , SZ_4K); + +const struct imx_spi_imx_data imx51_ecspi_data[]__initconst = { +#define imx51_ecspi_data_entry(_id, _hwid) \ + imx_spi_imx_data_entry(MX51, ECSPI, "imx51-ecspi", _id, _hwid, SZ_4K) +imx51_ecspi_data_entry (0 ,1 ), +imx51_ecspi_data_entry (1 ,2 ), +}; +#endif /* ifdef CONFIG_ARCH_MX51 */ +struct platform_device *__init imx_add_spi_imx (const struct imx_spi_imx_data *data,const struct spi_imx_master *pdata)
Signature · 1 line
1.7.2.3
PATCH 25/40 ARM: mx5/clock-mx51: refactor ccgr callbacks to use common code
In reply to Uwe Kleine-König--- arch/arm/mach-mx5/clock-mx51.c | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-)
arch/arm/mach-mx5/clock-mx51.c +16 -14
@@ -41,34 +41,36 @@ static struct clk usboh3_clk;#define MAX_DPLL_WAIT_TRIES 1000/* 1000 * udelay(1) = 1ms */ -static int _clk_ccgr_enable (struct clk *clk) +static void _clk_ccgr_setclk (struct clk *clk,unsigned mode) { -u32 reg; +u32 reg =__raw_readl (clk->enable_reg); + + reg &= ~(MXC_CCM_CCGRx_CG_MASK << clk->enable_shift); + reg |= mode << clk->enable_shift; - reg =__raw_readl (clk->enable_reg); - reg |= MXC_CCM_CCGRx_MOD_ON << clk->enable_shift;__raw_writel (reg, clk->enable_reg); +} +static int _clk_ccgr_enable (struct clk *clk) +{ +_clk_ccgr_setclk (clk, MXC_CCM_CCGRx_MOD_ON);return 0 ; }static void _clk_ccgr_disable (struct clk *clk) { -u32 reg; - reg =__raw_readl (clk->enable_reg); - reg &= ~(MXC_CCM_CCGRx_CG_MASK << clk->enable_shift); -__raw_writel (reg, clk->enable_reg); +_clk_ccgr_setclk (clk, MXC_CCM_CCGRx_MOD_OFF); +} +static int _clk_ccgr_enable_inrun (struct clk *clk) +{ +_clk_ccgr_setclk (clk, MXC_CCM_CCGRx_MOD_IDLE); +return 0 ; }static void _clk_ccgr_disable_inwait (struct clk *clk) { -u32 reg; - - reg =__raw_readl (clk->enable_reg); - reg &= ~(MXC_CCM_CCGRx_CG_MASK << clk->enable_shift); - reg |= MXC_CCM_CCGRx_MOD_IDLE << clk->enable_shift; -__raw_writel (reg, clk->enable_reg); +_clk_ccgr_setclk (clk, MXC_CCM_CCGRx_MOD_IDLE); }/*
Signature · 1 line
1.7.2.3
PATCH 26/40 ARM: mx5/clock-mx51: new macro that defines a clk with all members
In reply to Uwe Kleine-König--- arch/arm/mach-mx5/clock-mx51.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-)
arch/arm/mach-mx5/clock-mx51.c +13 -13
@@ -764,21 +764,21 @@ static struct clk kpp_clk = { .id = 0, }; -#define DEFINE_CLOCK (name, i, er, es, gr, sr, p, s) \ - static struct clk name = { \ - .id = i, \ - .enable_reg = er, \ - .enable_shift = es, \ - .get_rate = gr, \ - .set_rate = sr, \ - .enable = _clk_ccgr_enable, \ - .disable = _clk_ccgr_disable, \ - .parent = p, \ - .secondary = s, \ +#define DEFINE_CLOCK_FULL (name, i, er, es, gr, sr, e, d, p, s) \ + static struct clk name = { \ + .id = i, \ + .enable_reg = er, \ + .enable_shift = es, \ + .get_rate = gr, \ + .set_rate = sr, \ + .enable = e, \ + .disable = d, \ + .parent = p, \ + .secondary = s, \ } -/* DEFINE_CLOCK(name, id, enable_reg, enable_shift, -get_rate, set_rate, parent, secondary); */ +#define DEFINE_CLOCK (name, i, er, es, gr, sr, p, s) \ + DEFINE_CLOCK_FULL(name, i, er, es, gr, sr, _clk_ccgr_enable, _clk_ccgr_disable, p, s)/* Shared peripheral bus arbiter */ DEFINE_CLOCK(spba_clk, 0, MXC_CCM_CCGR5, MXC_CCM_CCGRx_CG0_OFFSET,
Signature · 1 line
1.7.2.3
PATCH 27/40 ARM: mx5/clock-mx51: add spi clocks
In reply to Uwe Kleine-KönigFrom: Jason Wang <[email protected]>
--- arch/arm/mach-mx5/clock-mx51.c | 57 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-)
arch/arm/mach-mx5/clock-mx51.c +57 -0
@@ -764,6 +764,42 @@ static struct clk kpp_clk = { .id = 0, }; +/* eCSPI */ +static unsigned long clk_ecspi_get_rate (struct clk *clk) +{ +u32 reg, pred, podf; + + reg =__raw_readl (MXC_CCM_CSCDR2 ); + + pred = (reg &MXC_CCM_CSCDR2_CSPI_CLK_PRED_MASK ) >> +MXC_CCM_CSCDR2_CSPI_CLK_PRED_OFFSET ; + podf = (reg &MXC_CCM_CSCDR2_CSPI_CLK_PODF_MASK ) >> +MXC_CCM_CSCDR2_CSPI_CLK_PODF_OFFSET ; + +return DIV_ROUND_CLOSEST (clk_get_rate (clk->parent), + (pred +1 ) * (podf +1 )); +} + +static int clk_ecspi_set_parent (struct clk *clk,struct clk *parent) +{ +u32 reg, mux; + + mux =_get_mux (parent, &pll1_sw_clk, &pll2_sw_clk, &pll3_sw_clk, + &lp_apm_clk); + + reg =__raw_readl (MXC_CCM_CSCMR1 ) & ~MXC_CCM_CSCMR1_CSPI_CLK_SEL_MASK ; + reg |= mux <<MXC_CCM_CSCMR1_CSPI_CLK_SEL_OFFSET ; +__raw_writel (reg,MXC_CCM_CSCMR1 ); + +return 0 ; +} + +static struct clk ecspi_main_clk = { + .parent = &pll3_sw_clk, + .get_rate = clk_ecspi_get_rate, + .set_parent = clk_ecspi_set_parent, +}; +#define DEFINE_CLOCK_FULL (name, i, er, es, gr, sr, e, d, p, s) \ static struct clk name = { \ .id = i, \
@@ -816,6 +852,24 @@ DEFINE_CLOCK(hsi2c_clk, 0, MXC_CCM_CCGR1, MXC_CCM_CCGRx_CG11_OFFSET,DEFINE_CLOCK (fec_clk,0 ,MXC_CCM_CCGR2 , MXC_CCM_CCGRx_CG12_OFFSET,NULL ,NULL , &ipg_clk,NULL ); +/* eCSPI */ +DEFINE_CLOCK_FULL (ecspi1_ipg_clk,0 ,MXC_CCM_CCGR4 , MXC_CCM_CCGRx_CG9_OFFSET, +NULL ,NULL , _clk_ccgr_enable_inrun, _clk_ccgr_disable, + &ipg_clk, &spba_clk); +DEFINE_CLOCK (ecspi1_clk,0 ,MXC_CCM_CCGR4 , MXC_CCM_CCGRx_CG10_OFFSET, +NULL ,NULL , &ecspi_main_clk, &ecspi1_ipg_clk); +DEFINE_CLOCK_FULL (ecspi2_ipg_clk,0 ,MXC_CCM_CCGR4 , MXC_CCM_CCGRx_CG11_OFFSET, +NULL ,NULL , _clk_ccgr_enable_inrun, _clk_ccgr_disable, + &ipg_clk, &aips_tz2_clk); +DEFINE_CLOCK (ecspi2_clk,0 ,MXC_CCM_CCGR4 , MXC_CCM_CCGRx_CG12_OFFSET, +NULL ,NULL , &ecspi_main_clk, &ecspi2_ipg_clk); + +/* CSPI */ +DEFINE_CLOCK (cspi_ipg_clk,0 ,MXC_CCM_CCGR4 , MXC_CCM_CCGRx_CG9_OFFSET, +NULL ,NULL , &ipg_clk, &aips_tz2_clk); +DEFINE_CLOCK (cspi_clk,0 ,MXC_CCM_CCGR4 , MXC_CCM_CCGRx_CG13_OFFSET, +NULL ,NULL , &ipg_clk, &cspi_ipg_clk); +#define _REGISTER_CLOCK (d, n, c) \ { \ .dev_id = d, \
@@ -839,6 +893,9 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK("fsl-usb2-udc", "usb", usboh3_clk) _REGISTER_CLOCK("fsl-usb2-udc", "usb_ahb", ahb_clk) _REGISTER_CLOCK("imx-keypad.0", NULL, kpp_clk) + _REGISTER_CLOCK("imx51-ecspi.0", NULL, ecspi1_clk) + _REGISTER_CLOCK("imx51-ecspi.1", NULL, ecspi2_clk) + _REGISTER_CLOCK("imx51-cspi.0", NULL, cspi_clk) };static void clk_tree_init (void )
Signature · 1 line
1.7.2.3
PATCH 28/40 ARM: mx5/iomux-mx51: add iomux definitions for eCSPI2 on the imx51_3ds board
In reply to Uwe Kleine-KönigFrom: Jason Wang <[email protected]>
On the imx51_3ds board, eCSPI2 is connected to a SPI NOR flash, now add iomux definitions for those used pins.
--- arch/arm/plat-mxc/include/mach/iomux-mx51.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
arch/arm/plat-mxc/include/mach/iomux-mx51.h +5 -0
@@ -45,6 +45,8 @@ typedef enum iomux_config { PAD_CTL_PKE | PAD_CTL_HYS)#define MX51_GPIO_PAD_CTRL (PAD_CTL_DSE_HIGH | PAD_CTL_PKE | \ PAD_CTL_SRE_FAST) +#define MX51_ECSPI_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_PKE | PAD_CTL_DSE_HIGH | \ + PAD_CTL_SRE_FAST)#define MX51_PAD_CTRL_1 (PAD_CTL_SRE_FAST | PAD_CTL_DSE_HIGH | \ PAD_CTL_PUE | PAD_CTL_PKE | PAD_CTL_HYS)
@@ -139,8 +141,10 @@ typedef enum iomux_config {#define MX51_PAD_NANDF_RB0__GPIO_3_8 IOMUX_PAD(0x4F8, 0x11C, 3, 0x0, 0, NO_PAD_CTRL)#define MX51_PAD_NANDF_RB1__GPIO_3_9 IOMUX_PAD(0x4FC, 0x120, 3, 0x0, 0, NO_PAD_CTRL)#define MX51_PAD_NANDF_RB2__GPIO_3_10 IOMUX_PAD(0x500, 0x124, 3, 0x0, 0, NO_PAD_CTRL) +#define MX51_PAD_NANDF_RB2__ECSPI2_SCLK IOMUX_PAD(0x500, 0x124, 2, 0x0, 0, MX51_ECSPI_PAD_CTRL)#define MX51_PAD_NANDF_RB2__FEC_COL IOMUX_PAD(0x500, 0x124, 1, 0x0, 0, MX51_PAD_CTRL_2)#define MX51_PAD_NANDF_RB3__GPIO_3_11 IOMUX_PAD(0x504, 0x128, 3, 0x0, 0, NO_PAD_CTRL) +#define MX51_PAD_NANDF_RB3__ECSPI2_MISO IOMUX_PAD(0x504, 0x128, 2, 0x0, 0, MX51_ECSPI_PAD_CTRL)#define MX51_PAD_NANDF_RB3__FEC_RXCLK IOMUX_PAD(0x504, 0x128, 1, 0x0, 0, MX51_PAD_CTRL_2)#define MX51_PAD_NANDF_RB6__FEC_RDAT0 IOMUX_PAD(0x5DC, 0x134, 1, 0x0, 0, MX51_PAD_CTRL_4)#define MX51_PAD_NANDF_RB7__FEC_TDAT0 IOMUX_PAD(0x5E0, 0x138, 1, 0x0, 0, MX51_PAD_CTRL_5)
@@ -162,6 +166,7 @@ typedef enum iomux_config {#define MX51_PAD_NANDF_RDY_INT__GPIO_3_24 IOMUX_PAD(0x538, 0x150, 3, 0x0, 0, NO_PAD_CTRL)#define MX51_PAD_NANDF_RDY_INT__FEC_TX_CLK IOMUX_PAD(0x538, 0x150, 1, 0x0, 0, MX51_PAD_CTRL_4)#define MX51_PAD_NANDF_D15__GPIO_3_25 IOMUX_PAD(0x53C, 0x154, 3, 0x0, 0, NO_PAD_CTRL) +#define MX51_PAD_NANDF_D15__ECSPI2_MOSI IOMUX_PAD(0x53C, 0x154, 2, 0x0, 0, MX51_ECSPI_PAD_CTRL)#define MX51_PAD_NANDF_D14__GPIO_3_26 IOMUX_PAD(0x540, 0x158, 3, 0x0, 0, NO_PAD_CTRL)#define MX51_PAD_NANDF_D13__GPIO_3_27 IOMUX_PAD(0x544, 0x15C, 3, 0x0, 0, NO_PAD_CTRL)#define MX51_PAD_NANDF_D12__GPIO_3_28 IOMUX_PAD(0x548, 0x160, 3, 0x0, 0, NO_PAD_CTRL)
Signature · 1 line
1.7.2.3
PATCH 29/40 ARM: mx5/mx51_3ds: add eCSPI2 support on the imx51_3ds board
In reply to Uwe Kleine-KönigFrom: Jason Wang <[email protected]>
--- arch/arm/mach-mx5/Kconfig | 1 + arch/arm/mach-mx5/board-mx51_3ds.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-)
arch/arm/mach-mx5/Kconfig +1 -0
@@ -17,6 +17,7 @@ config MACH_MX51_BABBAGE config MACH_MX51_3DS bool "Support MX51PDK (3DS)" + select IMX_HAVE_PLATFORM_SPI_IMX select MXC_DEBUG_BOARD help Include support for MX51PDK (3DS) platform. This includes specific
arch/arm/mach-mx5/board-mx51_3ds.c +20 -0
@@ -24,9 +24,11 @@#include <mach/imx-uart.h> #include <mach/3ds_debugboard.h> +#include "devices-imx51.h" #include "devices.h" #define EXPIO_PARENT_INT (MXC_INTERNAL_IRQS + GPIO_PORTA + 6) +#define MX51_3DS_ECSPI2_CS (GPIO_PORTC + 28)static struct pad_desc mx51_3ds_pads[] = {/* UART1 */
@@ -61,6 +63,12 @@ static struct pad_desc mx51_3ds_pads[] = {MX51_PAD_KEY_COL3__KEY_COL3 ,MX51_PAD_KEY_COL4__KEY_COL4 ,MX51_PAD_KEY_COL5__KEY_COL5 , + +/* eCSPI2 */ +MX51_PAD_NANDF_RB2__ECSPI2_SCLK , +MX51_PAD_NANDF_RB3__ECSPI2_MISO , +MX51_PAD_NANDF_D15__ECSPI2_MOSI , + MX51_PAD_NANDF_D12__GPIO_3_28, };/* Serial ports */
@@ -127,6 +135,16 @@ static inline void mxc_init_keypad(void) }#endif +static int mx51_3ds_spi2_cs[] = { +MXC_SPI_CS (0 ), +MX51_3DS_ECSPI2_CS , +}; + +static const struct spi_imx_master mx51_3ds_ecspi2_pdata__initconst = { + .chipselect = mx51_3ds_spi2_cs, + .num_chipselect =ARRAY_SIZE (mx51_3ds_spi2_cs), +}; +/* * Board specific initialization. */
@@ -136,6 +154,8 @@ static void __init mxc_board_init(void) ARRAY_SIZE(mx51_3ds_pads));mxc_init_imx_uart (); +imx51_add_ecspi (1 , &mx51_3ds_ecspi2_pdata); +if (mxc_expio_init (MX51_CS5_BASE_ADDR ,EXPIO_PARENT_INT ))printk (KERN_WARNING "Init of the debugboard failed, all " "devices on the board are unusable.\n" );
Signature · 1 line
1.7.2.3
PATCH 30/40 ARM: mx5/mx51_3ds: add SPI NOR flash in the board init stage
In reply to Uwe Kleine-KönigFrom: Jason Wang <[email protected]>
A 2M bytes SPI NOR flash(sst25vf016b) is soldered on the mx51_3ds board. So add the corresponding device for it.
--- arch/arm/mach-mx5/board-mx51_3ds.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-)
arch/arm/mach-mx5/board-mx51_3ds.c +13 -0
@@ -13,6 +13,7 @@#include <linux/irq.h> #include <linux/platform_device.h> #include <linux/input/matrix_keypad.h> +#include <linux/spi/spi.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
@@ -145,6 +146,16 @@ static const struct spi_imx_master mx51_3ds_ecspi2_pdata __initconst = { .num_chipselect = ARRAY_SIZE(mx51_3ds_spi2_cs), }; +static struct spi_board_info mx51_3ds_spi_nor_device[] = { + { + .modalias ="m25p80" , + .max_speed_hz =25000000 ,/* max spi clock (SCK) speed in HZ */ + .bus_num =1 , + .chip_select =1 , + .mode =SPI_MODE_0 , + .platform_data =NULL ,}, +}; +/* * Board specific initialization. */
@@ -155,6 +166,8 @@ static void __init mxc_board_init(void)mxc_init_imx_uart ();imx51_add_ecspi (1 , &mx51_3ds_ecspi2_pdata); +spi_register_board_info (mx51_3ds_spi_nor_device, +ARRAY_SIZE (mx51_3ds_spi_nor_device));if (mxc_expio_init (MX51_CS5_BASE_ADDR ,EXPIO_PARENT_INT )) printk(KERN_WARNING "Init of the debugboard failed, all "
Signature · 1 line
1.7.2.3
PATCH 31/40 ARM: mx5/iomux-mx51: Add SPI controller pads
In reply to Uwe Kleine-KönigFrom: Sascha Hauer <[email protected]>
--- arch/arm/plat-mxc/include/mach/iomux-mx51.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
arch/arm/plat-mxc/include/mach/iomux-mx51.h +6 -0
@@ -218,11 +218,17 @@ typedef enum iomux_config {#define MX51_PAD_AUD3_BB_RXD__GPIO_4_19 IOMUX_PAD(0x5F4, 0x204, 3, 0x0, 0, NO_PAD_CTRL)#define MX51_PAD_AUD3_BB_CK__GPIO_4_20 IOMUX_PAD(0x5F8, 0x208, 3, 0x0, 0, NO_PAD_CTRL)#define MX51_PAD_AUD3_BB_FS__GPIO_4_21 IOMUX_PAD(0x5FC, 0x20C, 3, 0x0, 0, NO_PAD_CTRL) +#define MX51_PAD_CSPI1_MOSI__CSPI1_MOSI IOMUX_PAD(0x600, 0x210, 0, 0x0, 0, NO_PAD_CTRL)#define MX51_PAD_CSPI1_MOSI__GPIO_4_22 IOMUX_PAD(0x600, 0x210, 3, 0x0, 0, NO_PAD_CTRL) +#define MX51_PAD_CSPI1_MISO__CSPI1_MISO IOMUX_PAD(0x604, 0x214, 0, 0x0, 0, NO_PAD_CTRL)#define MX51_PAD_CSPI1_MISO__GPIO_4_23 IOMUX_PAD(0x604, 0x214, 3, 0x0, 0, NO_PAD_CTRL) +#define MX51_PAD_CSPI1_SS0__CSPI1_SS0 IOMUX_PAD(0x608, 0x218, 0, 0x0, 0, NO_PAD_CTRL)#define MX51_PAD_CSPI1_SS0__GPIO_4_24 IOMUX_PAD(0x608, 0x218, 3, 0x0, 0, NO_PAD_CTRL) +#define MX51_PAD_CSPI1_SS1__CSPI1_SS1 IOMUX_PAD(0x60C, 0x21C, 0, 0x0, 0, NO_PAD_CTRL)#define MX51_PAD_CSPI1_SS1__GPIO_4_25 IOMUX_PAD(0x60C, 0x21C, 3, 0x0, 0, NO_PAD_CTRL) +#define MX51_PAD_CSPI1_RDY__CSPI1_RDY IOMUX_PAD(0x610, 0x220, 0, 0x0, 0, NO_PAD_CTRL)#define MX51_PAD_CSPI1_RDY__GPIO_4_26 IOMUX_PAD(0x610, 0x220, 3, 0x0, 0, NO_PAD_CTRL) +#define MX51_PAD_CSPI1_SCLK__CSPI1_SCLK IOMUX_PAD(0x614, 0x224, 0, 0x0, 0, NO_PAD_CTRL)#define MX51_PAD_CSPI1_SCLK__GPIO_4_27 IOMUX_PAD(0x614, 0x224, 3, 0x0, 0, NO_PAD_CTRL)#define MX51_PAD_UART1_RXD__UART1_RXD IOMUX_PAD(0x618, 0x228, 0, 0x9e4, 0, MX51_UART1_PAD_CTRL | PAD_CTL_SRE_FAST)#define MX51_PAD_UART1_TXD__UART1_TXD IOMUX_PAD(0x61C, 0x22C, 0, 0x0, 0, MX51_UART1_PAD_CTRL | PAD_CTL_SRE_FAST)
Signature · 1 line
1.7.2.3
PATCH 31/40 ARM: mx5/iomux-mx51: Add SPI controller pads
Hello,
Quoted 20 lines · Uwe Kleine-K?nig
From: Sascha Hauer <[email protected]>
Signed-off-by Sascha Hauer <[email protected]>Signed-off-by Uwe Kleine-K?nig <[email protected]>--- arch/arm/plat-mxc/include/mach/iomux-mx51.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)arch/arm/plat-mxc/include/mach/iomux-mx51.h +2
-0@@ -218,11 +218,17 @@ typedef enum iomux_config {#define MX51_PAD_AUD3_BB_RXD__GPIO_4_19 IOMUX_PAD(0x5F4, 0x204, 3, 0x0, 0, NO_PAD_CTRL)#define MX51_PAD_AUD3_BB_CK__GPIO_4_20 IOMUX_PAD(0x5F8, 0x208, 3, 0x0, 0, NO_PAD_CTRL)#define MX51_PAD_AUD3_BB_FS__GPIO_4_21 IOMUX_PAD(0x5FC, 0x20C, 3, 0x0, 0, NO_PAD_CTRL) +#define MX51_PAD_CSPI1_MOSI__CSPI1_MOSI IOMUX_PAD(0x600, 0x210, 0, 0x0, 0, NO_PAD_CTRL)#define MX51_PAD_CSPI1_MOSI__GPIO_4_22 IOMUX_PAD(0x600, 0x210, 3, 0x0, 0, NO_PAD_CTRL) +#define MX51_PAD_CSPI1_MISO__CSPI1_MISO IOMUX_PAD(0x604, 0x214, 0, 0x0, 0, NO_PAD_CTRL)#define MX51_PAD_CSPI1_MISO__GPIO_4_23 IOMUX_PAD(0x604, 0x214, 3, 0x0, 0, NO_PAD_CTRL)
arch/arm/plat-mxc/include/mach/iomux-mx51.h typedef enum iomux_config { · line 234
Quoted 10 lines
arch/arm/plat-mxc/include/mach/iomux-mx51.h +4
-0+#define MX51_PAD_CSPI1_SS0__CSPI1_SS0 IOMUX_PAD(0x608, 0x218, 0, 0x0, 0, NO_PAD_CTRL)#define MX51_PAD_CSPI1_SS0__GPIO_4_24 IOMUX_PAD(0x608, 0x218, 3, 0x0, 0, NO_PAD_CTRL) +#define MX51_PAD_CSPI1_SS1__CSPI1_SS1 IOMUX_PAD(0x60C, 0x21C, 0, 0x0, 0, NO_PAD_CTRL)#define MX51_PAD_CSPI1_SS1__GPIO_4_25 IOMUX_PAD(0x60C, 0x21C, 3, 0x0, 0, NO_PAD_CTRL) +#define MX51_PAD_CSPI1_RDY__CSPI1_RDY IOMUX_PAD(0x610, 0x220, 0, 0x0, 0, NO_PAD_CTRL)#define MX51_PAD_CSPI1_RDY__GPIO_4_26 IOMUX_PAD(0x610, 0x220, 3, 0x0, 0, NO_PAD_CTRL) +#define MX51_PAD_CSPI1_SCLK__CSPI1_SCLK IOMUX_PAD(0x614, 0x224, 0, 0x0, 0, NO_PAD_CTRL)#define MX51_PAD_CSPI1_SCLK__GPIO_4_27 IOMUX_PAD(0x614, 0x224, 3, 0x0, 0, NO_PAD_CTRL)#define MX51_PAD_UART1_RXD__UART1_RXD IOMUX_PAD(0x618, 0x228, 0, 0x9e4, 0, MX51_UART1_PAD_CTRL | PAD_CTL_SRE_FAST)#define MX51_PAD_UART1_TXD__UART1_TXD IOMUX_PAD(0x61C, 0x22C, 0, 0x0, 0, MX51_UART1_PAD_CTRL | PAD_CTL_SRE_FAST)
This patch doesn't match the naming scheme of patch 28 (ARM:
mx5/iomux-mx51: add iomux definitions for eCSPI2 on the imx51_3ds board). I fixed my tree using s/__CSPI/__ECSPI/. Moreover I did s/NO_PAD_CTRL/MX51_ECSPI_PAD_CTRL/ as is done in patch 28, too.
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
PATCH 32/40 ARM: mx5/iomux-mx51: Add aud3 primary function defines
In reply to Uwe Kleine-KönigFrom: Sascha Hauer <[email protected]>
--- arch/arm/plat-mxc/include/mach/iomux-mx51.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
arch/arm/plat-mxc/include/mach/iomux-mx51.h +4 -0
@@ -214,9 +214,13 @@ typedef enum iomux_config {#define MX51_PAD_I2C1_CLK__HSI2C_CLK IOMUX_PAD(0x5E8, 0x1F8, 0, 0x0, 0, NO_PAD_CTRL)#define MX51_PAD_I2C1_DAT__GPIO_4_17 IOMUX_PAD(0x5EC, 0x1FC, 3, 0x0, 0, NO_PAD_CTRL)#define MX51_PAD_I2C1_DAT__HSI2C_DAT IOMUX_PAD(0x5EC, 0x1FC, 0, 0x0, 0, NO_PAD_CTRL) +#define MX51_PAD_AUD3_BB_TXD__AUD3_BB_TXD IOMUX_PAD(0x5F0, 0x200, IOMUX_CONFIG_SION, 0x0, 0, NO_PAD_CTRL)#define MX51_PAD_AUD3_BB_TXD__GPIO_4_18 IOMUX_PAD(0x5F0, 0x200, 3, 0x0, 0, NO_PAD_CTRL) +#define MX51_PAD_AUD3_BB_RXD__AUD3_BB_RXD IOMUX_PAD(0x5F4, 0x204, IOMUX_CONFIG_SION, 0x0, 0, NO_PAD_CTRL)#define MX51_PAD_AUD3_BB_RXD__GPIO_4_19 IOMUX_PAD(0x5F4, 0x204, 3, 0x0, 0, NO_PAD_CTRL) +#define MX51_PAD_AUD3_BB_CK__AUD3_BB_CK IOMUX_PAD(0x5F8, 0x208, IOMUX_CONFIG_SION, 0x0, 0, NO_PAD_CTRL)#define MX51_PAD_AUD3_BB_CK__GPIO_4_20 IOMUX_PAD(0x5F8, 0x208, 3, 0x0, 0, NO_PAD_CTRL) +#define MX51_PAD_AUD3_BB_FS__AUD3_BB_FS IOMUX_PAD(0x5FC, 0x20C, IOMUX_CONFIG_SION, 0x0, 0, NO_PAD_CTRL)#define MX51_PAD_AUD3_BB_FS__GPIO_4_21 IOMUX_PAD(0x5FC, 0x20C, 3, 0x0, 0, NO_PAD_CTRL)#define MX51_PAD_CSPI1_MOSI__CSPI1_MOSI IOMUX_PAD(0x600, 0x210, 0, 0x0, 0, NO_PAD_CTRL)#define MX51_PAD_CSPI1_MOSI__GPIO_4_22 IOMUX_PAD(0x600, 0x210, 3, 0x0, 0, NO_PAD_CTRL)
Signature · 1 line
1.7.2.3
PATCH 33/40 ARM: mx5/iomux-mx51: Fix input path of some pins in gpio mode
In reply to Uwe Kleine-KönigFrom: Sascha Hauer <[email protected]>
--- arch/arm/plat-mxc/include/mach/iomux-mx51.h | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-)
arch/arm/plat-mxc/include/mach/iomux-mx51.h +9 -9
@@ -274,15 +274,15 @@ typedef enum iomux_config {#define MX51_PAD_USBH1_DATA5__USBH1_DATA5 IOMUX_PAD(0x69C, 0x29C, 0, 0x0, 0, MX51_USBH1_PAD_CTRL)#define MX51_PAD_USBH1_DATA6__USBH1_DATA6 IOMUX_PAD(0x6A0, 0x2A0, 0, 0x0, 0, MX51_USBH1_PAD_CTRL)#define MX51_PAD_USBH1_DATA7__USBH1_DATA7 IOMUX_PAD(0x6A4, 0x2A4, 0, 0x0, 0, MX51_USBH1_PAD_CTRL) -#define MX51_PAD_DI1_PIN11__GPIO_3_0 IOMUX_PAD(0x6A8, 0x2A8, 4, 0x0, 0, NO_PAD_CTRL) -#define MX51_PAD_DI1_PIN12__GPIO_3_1 IOMUX_PAD(0x6AC, 0x2AC, 4, 0x0, 0, NO_PAD_CTRL) -#define MX51_PAD_DI1_PIN13__GPIO_3_2 IOMUX_PAD(0x6B0, 0x2B0, 4, 0x0, 0, NO_PAD_CTRL) -#define MX51_PAD_DI1_D0_CS__GPIO_3_3 IOMUX_PAD(0x6B4, 0x2B4, 4, 0x0, 0, NO_PAD_CTRL) -#define MX51_PAD_DI1_D1_CS__GPIO_3_4 IOMUX_PAD(0x6B8, 0x2B8, 4, 0x0, 0, NO_PAD_CTRL) -#define MX51_PAD_DISPB2_SER_DIN__GPIO_3_5 IOMUX_PAD(0x6BC, 0x2BC, 4, 0x0, 0, NO_PAD_CTRL) -#define MX51_PAD_DISPB2_SER_DIO__GPIO_3_6 IOMUX_PAD(0x6C0, 0x2C0, 4, 0x0, 0, NO_PAD_CTRL) -#define MX51_PAD_DISPB2_SER_CLK__GPIO_3_7 IOMUX_PAD(0x6C4, 0x2C4, 4, 0x0, 0, NO_PAD_CTRL) -#define MX51_PAD_DISPB2_SER_RS__GPIO_3_8 IOMUX_PAD(0x6C8, 0x2C8, 4, 0x0, 0, NO_PAD_CTRL) +#define MX51_PAD_DI1_PIN11__GPIO_3_0 IOMUX_PAD(0x6A8, 0x2A8, 4, 0x974, 1, NO_PAD_CTRL) +#define MX51_PAD_DI1_PIN12__GPIO_3_1 IOMUX_PAD(0x6AC, 0x2AC, 4, 0x978, 1, NO_PAD_CTRL) +#define MX51_PAD_DI1_PIN13__GPIO_3_2 IOMUX_PAD(0x6B0, 0x2B0, 4, 0x97c, 1, NO_PAD_CTRL) +#define MX51_PAD_DI1_D0_CS__GPIO_3_3 IOMUX_PAD(0x6B4, 0x2B4, 4, 0x980, 1, NO_PAD_CTRL) +#define MX51_PAD_DI1_D1_CS__GPIO_3_4 IOMUX_PAD(0x6B8, 0x2B8, 4, 0x984, 1, NO_PAD_CTRL) +#define MX51_PAD_DISPB2_SER_DIN__GPIO_3_5 IOMUX_PAD(0x6BC, 0x2BC, 4, 0x988, 1, NO_PAD_CTRL) +#define MX51_PAD_DISPB2_SER_DIO__GPIO_3_6 IOMUX_PAD(0x6C0, 0x2C0, 4, 0x98c, 1, NO_PAD_CTRL) +#define MX51_PAD_DISPB2_SER_CLK__GPIO_3_7 IOMUX_PAD(0x6C4, 0x2C4, 4, 0x990, 1, NO_PAD_CTRL) +#define MX51_PAD_DISPB2_SER_RS__GPIO_3_8 IOMUX_PAD(0x6C8, 0x2C8, 4, 0x994, 1, NO_PAD_CTRL)#define MX51_PAD_DISP1_DAT0__DISP1_DAT0 IOMUX_PAD(0x6CC, 0x2CC, 0, 0x0, 0, NO_PAD_CTRL)#define MX51_PAD_DISP1_DAT1__DISP1_DAT1 IOMUX_PAD(0x6D0, 0x2D0, 0, 0x0, 0, NO_PAD_CTRL)#define MX51_PAD_DISP1_DAT2__DISP1_DAT2 IOMUX_PAD(0x6D4, 0x2D4, 0, 0x0, 0, NO_PAD_CTRL)
Signature · 1 line
1.7.2.3
PATCH 33/40 ARM: mx5/iomux-mx51: Fix input path of some pins in gpio mode
Hi,
Quoted 8 lines
arch/arm/plat-mxc/include/mach/iomux-mx51.h +0
-0@@ -274,15 +274,15 @@ typedef enum iomux_config {#define MX51_PAD_USBH1_DATA5__USBH1_DATA5 IOMUX_PAD(0x69C, 0x29C, 0, 0x0, 0, MX51_USBH1_PAD_CTRL)#define MX51_PAD_USBH1_DATA6__USBH1_DATA6 IOMUX_PAD(0x6A0, 0x2A0, 0, 0x0, 0, MX51_USBH1_PAD_CTRL)#define MX51_PAD_USBH1_DATA7__USBH1_DATA7 IOMUX_PAD(0x6A4, 0x2A4, 0, 0x0, 0, MX51_USBH1_PAD_CTRL)
arch/arm/plat-mxc/include/mach/iomux-mx51.h typedef enum iomux_config { · line 277
Quoted 10 lines
arch/arm/plat-mxc/include/mach/iomux-mx51.h +1
-9-#define MX51_PAD_DI1_PIN11__GPIO_3_0 IOMUX_PAD(0x6A8, 0x2A8, 4, 0x0, 0, NO_PAD_CTRL) -#define MX51_PAD_DI1_PIN12__GPIO_3_1 IOMUX_PAD(0x6AC, 0x2AC, 4, 0x0, 0, NO_PAD_CTRL) -#define MX51_PAD_DI1_PIN13__GPIO_3_2 IOMUX_PAD(0x6B0, 0x2B0, 4, 0x0, 0, NO_PAD_CTRL) -#define MX51_PAD_DI1_D0_CS__GPIO_3_3 IOMUX_PAD(0x6B4, 0x2B4, 4, 0x0, 0, NO_PAD_CTRL) -#define MX51_PAD_DI1_D1_CS__GPIO_3_4 IOMUX_PAD(0x6B8, 0x2B8, 4, 0x0, 0, NO_PAD_CTRL) -#define MX51_PAD_DISPB2_SER_DIN__GPIO_3_5 IOMUX_PAD(0x6BC, 0x2BC, 4, 0x0, 0, NO_PAD_CTRL) -#define MX51_PAD_DISPB2_SER_DIO__GPIO_3_6 IOMUX_PAD(0x6C0, 0x2C0, 4, 0x0, 0, NO_PAD_CTRL) -#define MX51_PAD_DISPB2_SER_CLK__GPIO_3_7 IOMUX_PAD(0x6C4, 0x2C4, 4, 0x0, 0, NO_PAD_CTRL) -#define MX51_PAD_DISPB2_SER_RS__GPIO_3_8 IOMUX_PAD(0x6C8, 0x2C8, 4, 0x0, 0, NO_PAD_CTRL) +#define MX51_PAD_DI1_PIN11__GPIO_3_0 IOMUX_PAD(0x6A8, 0x2A8, 4, 0x974, 1, NO_PAD_CTRL)
^^^^^
Where did you get this from?
According to my copy of the i.MX51 Reference Manual (MCIMX51RM Rev. 0 11/2009) the register at 0x974 is IOMUXC_FEC_FEC_TX_CLK_SELECT_INPUT which controls the pads:
|0: Selecting BGA contact: NANDF_RDY_INT for Mode: ALT1.
|1: Selecting BGA contact: DISP2_DAT13 for Mode: ALT2.
but not DI1_PIN11. DI1_PIN11 does not have any input mux.
The other values seem to be ok.
Lothar Wa?mann
Signature · 9 lines
___________________________________________________________ Ka-Ro electronics GmbH | Pascalstra?e 22 | D - 52076 Aachen Phone: +49 2408 1402-0 | Fax: +49 2408 1402-10 Gesch?ftsf?hrer: Matthias Kaussen Handelsregistereintrag: Amtsgericht Aachen, HRB 4996 www.karo-electronics.de | info at karo-electronics.de ___________________________________________________________
Sascha Hauer
maintainerPATCH 33/40 ARM: mx5/iomux-mx51: Fix input path of some pins in gpio mode
Quoted 21 lines · Lothar Wa?mann
Hi,
Quoted 8 lines
arch/arm/plat-mxc/include/mach/iomux-mx51.h +0
-0@@ -274,15 +274,15 @@ typedef enum iomux_config {#define MX51_PAD_USBH1_DATA5__USBH1_DATA5 IOMUX_PAD(0x69C, 0x29C, 0, 0x0, 0, MX51_USBH1_PAD_CTRL)#define MX51_PAD_USBH1_DATA6__USBH1_DATA6 IOMUX_PAD(0x6A0, 0x2A0, 0, 0x0, 0, MX51_USBH1_PAD_CTRL)#define MX51_PAD_USBH1_DATA7__USBH1_DATA7 IOMUX_PAD(0x6A4, 0x2A4, 0, 0x0, 0, MX51_USBH1_PAD_CTRL)arch/arm/plat-mxc/include/mach/iomux-mx51.h typedef enum iomux_config { · line 277
Quoted 10 lines
arch/arm/plat-mxc/include/mach/iomux-mx51.h +1
-9-#define MX51_PAD_DI1_PIN11__GPIO_3_0 IOMUX_PAD(0x6A8, 0x2A8, 4, 0x0, 0, NO_PAD_CTRL) -#define MX51_PAD_DI1_PIN12__GPIO_3_1 IOMUX_PAD(0x6AC, 0x2AC, 4, 0x0, 0, NO_PAD_CTRL) -#define MX51_PAD_DI1_PIN13__GPIO_3_2 IOMUX_PAD(0x6B0, 0x2B0, 4, 0x0, 0, NO_PAD_CTRL) -#define MX51_PAD_DI1_D0_CS__GPIO_3_3 IOMUX_PAD(0x6B4, 0x2B4, 4, 0x0, 0, NO_PAD_CTRL) -#define MX51_PAD_DI1_D1_CS__GPIO_3_4 IOMUX_PAD(0x6B8, 0x2B8, 4, 0x0, 0, NO_PAD_CTRL) -#define MX51_PAD_DISPB2_SER_DIN__GPIO_3_5 IOMUX_PAD(0x6BC, 0x2BC, 4, 0x0, 0, NO_PAD_CTRL) -#define MX51_PAD_DISPB2_SER_DIO__GPIO_3_6 IOMUX_PAD(0x6C0, 0x2C0, 4, 0x0, 0, NO_PAD_CTRL) -#define MX51_PAD_DISPB2_SER_CLK__GPIO_3_7 IOMUX_PAD(0x6C4, 0x2C4, 4, 0x0, 0, NO_PAD_CTRL) -#define MX51_PAD_DISPB2_SER_RS__GPIO_3_8 IOMUX_PAD(0x6C8, 0x2C8, 4, 0x0, 0, NO_PAD_CTRL) +#define MX51_PAD_DI1_PIN11__GPIO_3_0 IOMUX_PAD(0x6A8, 0x2A8, 4, 0x974, 1, NO_PAD_CTRL)^^^^^
Quoted 7 lines
Where did you get this from?
According to my copy of the i.MX51 Reference Manual (MCIMX51RM Rev. 0 11/2009) the register at0x974isIOMUXC_FEC_FEC_TX_CLK_SELECT_INPUTwhich controls the pads:
|0: Selecting BGA contact:NANDF_RDY_INTfor Mode: ALT1.
|1: Selecting BGA contact:DISP2_DAT13for Mode: ALT2.
but notDI1_PIN11.DI1_PIN11does not have any input mux.
Indeed, checked in the newer rev1 Manual from 2/2010 aswell.
Sascha
Signature · 4 lines
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 |
PATCH 33/40 ARM: mx5/iomux-mx51: Fix input path of some pins in gpio mode
Hi Lothar,
Quoted 30 lines · Sascha Hauer
Quoted 21 lines · Lothar Wa?mann
Hi,
Quoted 8 lines
arch/arm/plat-mxc/include/mach/iomux-mx51.h +0
-0@@ -274,15 +274,15 @@ typedef enum iomux_config {#define MX51_PAD_USBH1_DATA5__USBH1_DATA5 IOMUX_PAD(0x69C, 0x29C, 0, 0x0, 0, MX51_USBH1_PAD_CTRL)#define MX51_PAD_USBH1_DATA6__USBH1_DATA6 IOMUX_PAD(0x6A0, 0x2A0, 0, 0x0, 0, MX51_USBH1_PAD_CTRL)#define MX51_PAD_USBH1_DATA7__USBH1_DATA7 IOMUX_PAD(0x6A4, 0x2A4, 0, 0x0, 0, MX51_USBH1_PAD_CTRL)arch/arm/plat-mxc/include/mach/iomux-mx51.h typedef enum iomux_config { · line 277
Quoted 10 lines
arch/arm/plat-mxc/include/mach/iomux-mx51.h +1
-9-#define MX51_PAD_DI1_PIN11__GPIO_3_0 IOMUX_PAD(0x6A8, 0x2A8, 4, 0x0, 0, NO_PAD_CTRL) -#define MX51_PAD_DI1_PIN12__GPIO_3_1 IOMUX_PAD(0x6AC, 0x2AC, 4, 0x0, 0, NO_PAD_CTRL) -#define MX51_PAD_DI1_PIN13__GPIO_3_2 IOMUX_PAD(0x6B0, 0x2B0, 4, 0x0, 0, NO_PAD_CTRL) -#define MX51_PAD_DI1_D0_CS__GPIO_3_3 IOMUX_PAD(0x6B4, 0x2B4, 4, 0x0, 0, NO_PAD_CTRL) -#define MX51_PAD_DI1_D1_CS__GPIO_3_4 IOMUX_PAD(0x6B8, 0x2B8, 4, 0x0, 0, NO_PAD_CTRL) -#define MX51_PAD_DISPB2_SER_DIN__GPIO_3_5 IOMUX_PAD(0x6BC, 0x2BC, 4, 0x0, 0, NO_PAD_CTRL) -#define MX51_PAD_DISPB2_SER_DIO__GPIO_3_6 IOMUX_PAD(0x6C0, 0x2C0, 4, 0x0, 0, NO_PAD_CTRL) -#define MX51_PAD_DISPB2_SER_CLK__GPIO_3_7 IOMUX_PAD(0x6C4, 0x2C4, 4, 0x0, 0, NO_PAD_CTRL) -#define MX51_PAD_DISPB2_SER_RS__GPIO_3_8 IOMUX_PAD(0x6C8, 0x2C8, 4, 0x0, 0, NO_PAD_CTRL) +#define MX51_PAD_DI1_PIN11__GPIO_3_0 IOMUX_PAD(0x6A8, 0x2A8, 4, 0x974, 1, NO_PAD_CTRL)^^^^^Quoted 7 lines
Where did you get this from?
According to my copy of the i.MX51 Reference Manual (MCIMX51RM Rev. 0 11/2009) the register at0x974isIOMUXC_FEC_FEC_TX_CLK_SELECT_INPUTwhich controls the pads:
|0: Selecting BGA contact:NANDF_RDY_INTfor Mode: ALT1.
|1: Selecting BGA contact:DISP2_DAT13for Mode: ALT2.
but notDI1_PIN11.DI1_PIN11does not have any input mux.
Quoted 1 line
Indeed, checked in the newer rev1 Manual from 2/2010 aswell.
So I assume the definition for MX51_PAD_DI1_PIN11__GPIO_3_0 has to stay as it was, i.e.
#define MX51_PAD_DI1_PIN11__GPIO_3_0 IOMUX_PAD(0x6A8, 0x2A8, 4, 0x0, 0, NO_PAD_CTRL)
Will fix up accordingly.
@Lothar: good catch, I'm glad you're that attentive.
Thanks
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
PATCH 34/40 ARM: mx5: Add Nand clock support
In reply to Uwe Kleine-KönigFrom: Sascha Hauer <[email protected]>
--- arch/arm/mach-mx5/clock-mx51.c | 98 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 98 insertions(+), 0 deletions(-)
arch/arm/mach-mx5/clock-mx51.c +98 -0
@@ -573,6 +573,64 @@ static int _clk_uart_set_parent(struct clk *clk, struct clk *parent)return 0 ; } +#define clk_nfc_set_parent NULL + +static unsigned long clk_nfc_get_rate (struct clk *clk) +{ +unsigned long rate; +u32 reg, div; + + reg =__raw_readl (MXC_CCM_CBCDR ); + div = ((reg &MXC_CCM_CBCDR_NFC_PODF_MASK ) >> +MXC_CCM_CBCDR_NFC_PODF_OFFSET ) +1 ; + rate =clk_get_rate (clk->parent) / div; +WARN_ON (rate ==0 ); +return rate; +} + +static unsigned long clk_nfc_round_rate (struct clk *clk, +unsigned long rate) +{ +u32 div; +unsigned long parent_rate =clk_get_rate (clk->parent); + +if (!rate) +return -EINVAL ; + + div = parent_rate / rate; + +if (parent_rate % rate) + div++; + +if (div >8 ) +return -EINVAL ; + +return parent_rate / div; + +} + +static int clk_nfc_set_rate (struct clk *clk,unsigned long rate) +{ +u32 reg, div; + + div =clk_get_rate (clk->parent) / rate; +if (div ==0 ) + div++; +if (((clk_get_rate (clk->parent) / div) != rate) || (div >8 )) +return -EINVAL ; + + reg =__raw_readl (MXC_CCM_CBCDR ); + reg &= ~MXC_CCM_CBCDR_NFC_PODF_MASK ; + reg |= (div -1 ) <<MXC_CCM_CBCDR_NFC_PODF_OFFSET ; +__raw_writel (reg,MXC_CCM_CBCDR ); + +while (__raw_readl (MXC_CCM_CDHIPR ) & +MXC_CCM_CDHIPR_NFC_IPG_INT_MEM_PODF_BUSY ){ + } + +return 0 ; +} +static unsigned long clk_usboh3_get_rate (struct clk *clk) {u32 reg, prediv, podf;
@@ -622,6 +680,17 @@ static unsigned long get_ckih2_reference_clock_rate(struct clk *clk)return ckih2_reference; } +static unsigned long clk_emi_slow_get_rate (struct clk *clk) +{ +u32 reg, div; + + reg =__raw_readl (MXC_CCM_CBCDR ); + div = ((reg &MXC_CCM_CBCDR_EMI_PODF_MASK ) >> +MXC_CCM_CBCDR_EMI_PODF_OFFSET ) +1 ; + +return clk_get_rate (clk->parent) / div; +} +/* External high frequency clock */ static struct clk ckih_clk = { .get_rate = get_high_reference_clock_rate,
@@ -764,6 +833,30 @@ static struct clk kpp_clk = { .id = 0, }; +static struct clk emi_slow_clk = { + .parent = &pll2_sw_clk, + .enable_reg =MXC_CCM_CCGR5 , + .enable_shift = MXC_CCM_CCGRx_CG8_OFFSET, + .enable = _clk_ccgr_enable, + .disable = _clk_ccgr_disable_inwait, + .get_rate = clk_emi_slow_get_rate, +}; + +#define DEFINE_CLOCK1 (name, i, er, es, pfx, p, s) \ + static struct clk name = { \ + .id = i, \ + .enable_reg = er, \ + .enable_shift = es, \ + .get_rate = pfx##_get_rate, \ + .set_rate = pfx##_set_rate, \ + .round_rate = pfx##_round_rate, \ + .set_parent = pfx##_set_parent, \ + .enable = _clk_ccgr_enable, \ + .disable = _clk_ccgr_disable, \ + .parent = p, \ + .secondary = s, \ + } +/* eCSPI */ static unsigned long clk_ecspi_get_rate (struct clk *clk) {
@@ -852,6 +945,10 @@ DEFINE_CLOCK(hsi2c_clk, 0, MXC_CCM_CCGR1, MXC_CCM_CCGRx_CG11_OFFSET,DEFINE_CLOCK (fec_clk,0 ,MXC_CCM_CCGR2 , MXC_CCM_CCGRx_CG12_OFFSET,NULL ,NULL , &ipg_clk,NULL ); +/* NFC */ +DEFINE_CLOCK1 (nfc_clk,0 ,MXC_CCM_CCGR5 , MXC_CCM_CCGRx_CG10_OFFSET, + clk_nfc, &emi_slow_clk,NULL ); +/* eCSPI */ DEFINE_CLOCK_FULL(ecspi1_ipg_clk, 0, MXC_CCM_CCGR4, MXC_CCM_CCGRx_CG9_OFFSET, NULL, NULL, _clk_ccgr_enable_inrun, _clk_ccgr_disable,
@@ -893,6 +990,7 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK("fsl-usb2-udc", "usb", usboh3_clk) _REGISTER_CLOCK("fsl-usb2-udc", "usb_ahb", ahb_clk) _REGISTER_CLOCK("imx-keypad.0", NULL, kpp_clk) + _REGISTER_CLOCK("mxc_nand", NULL, nfc_clk) _REGISTER_CLOCK("imx51-ecspi.0", NULL, ecspi1_clk) _REGISTER_CLOCK("imx51-ecspi.1", NULL, ecspi2_clk)_REGISTER_CLOCK ("imx51-cspi.0" ,NULL , cspi_clk)
Signature · 1 line
1.7.2.3
PATCH 35/40 ARM: mx51: dynamically register imx-uart devices
In reply to Uwe Kleine-König--- arch/arm/mach-mx5/Kconfig | 3 + arch/arm/mach-mx5/board-cpuimx51.c | 6 +- arch/arm/mach-mx5/board-mx51_3ds.c | 9 ++-- arch/arm/mach-mx5/board-mx51_babbage.c | 10 ++-- arch/arm/mach-mx5/devices-imx51.h | 4 ++ arch/arm/mach-mx5/devices.c | 57 ------------------------- arch/arm/mach-mx5/devices.h | 3 - arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c | 7 ++- arch/arm/plat-mxc/devices/platform-imx-uart.c | 10 ++++ arch/arm/plat-mxc/include/mach/mx51.h | 6 +- 10 files changed, 36 insertions(+), 79 deletions(-)
arch/arm/mach-mx5/Kconfig +3 -0
@@ -10,6 +10,7 @@ comment "MX5 platforms:" config MACH_MX51_BABBAGE bool "Support MX51 BABBAGE platforms" + select IMX_HAVE_PLATFORM_IMX_UART help Include support for MX51 Babbage platform, also known as MX51EVK in u-boot. This includes specific configurations for the board and its
@@ -17,6 +18,7 @@ config MACH_MX51_BABBAGE config MACH_MX51_3DS bool "Support MX51PDK (3DS)" + select IMX_HAVE_PLATFORM_IMX_UART select IMX_HAVE_PLATFORM_SPI_IMX select MXC_DEBUG_BOARD help
@@ -26,6 +28,7 @@ config MACH_MX51_3DS config MACH_EUKREA_CPUIMX51 bool "Support Eukrea CPUIMX51 module" select IMX_HAVE_PLATFORM_IMX_I2C + select IMX_HAVE_PLATFORM_IMX_UART help Include support for Eukrea CPUIMX51 platform. This includes specific configurations for the module and its peripherals.
arch/arm/mach-mx5/board-cpuimx51.c +3 -3
@@ -28,7 +28,6 @@#include <mach/eukrea-baseboards.h> #include <mach/common.h> #include <mach/hardware.h> -#include <mach/imx-uart.h> #include <mach/iomux-mx51.h> #include <mach/mxc_ehci.h>
@@ -38,6 +37,7 @@#include <asm/mach/arch.h> #include <asm/mach/time.h> +#include "devices-imx51.h" #include "devices.h" #define CPUIMX51_USBH1_STP (0*32 + 27)
@@ -147,7 +147,7 @@ static struct pad_desc eukrea_cpuimx51_pads[] = { MX51_PAD_USBH1_STP__USBH1_STP, }; -static struct imxuart_platform_data uart_pdata = { +static const struct imxuart_platform_data uart_pdata__initconst = { .flags =IMXUART_HAVE_RTSCTS , };
@@ -239,7 +239,7 @@ static void __init eukrea_cpuimx51_init(void)mxc_iomux_v3_setup_multiple_pads (eukrea_cpuimx51_pads,ARRAY_SIZE (eukrea_cpuimx51_pads)); -mxc_register_device (&mxc_uart_device0, &uart_pdata); +imx51_add_imx_uart (0 , &uart_pdata);gpio_request (CPUIMX51_QUARTA_GPIO ,"quarta_irq" );gpio_direction_input (CPUIMX51_QUARTA_GPIO );gpio_free (CPUIMX51_QUARTA_GPIO );
arch/arm/mach-mx5/board-mx51_3ds.c +4 -5
@@ -22,7 +22,6 @@#include <mach/hardware.h> #include <mach/common.h> #include <mach/iomux-mx51.h> -#include <mach/imx-uart.h> #include <mach/3ds_debugboard.h> #include "devices-imx51.h"
@@ -74,15 +73,15 @@ static struct pad_desc mx51_3ds_pads[] = {/* Serial ports */ #if defined(CONFIG_SERIAL_IMX ) || defined(CONFIG_SERIAL_IMX_MODULE ) -static struct imxuart_platform_data uart_pdata = { +static const struct imxuart_platform_data uart_pdata__initconst = { .flags =IMXUART_HAVE_RTSCTS , };static inline void mxc_init_imx_uart (void ) { -mxc_register_device (&mxc_uart_device0, &uart_pdata); -mxc_register_device (&mxc_uart_device1, &uart_pdata); -mxc_register_device (&mxc_uart_device2, &uart_pdata); +imx51_add_imx_uart (0 , &uart_pdata); +imx51_add_imx_uart (1 , &uart_pdata); +imx51_add_imx_uart (2 , &uart_pdata); }#else /* !SERIAL_IMX */ static inline void mxc_init_imx_uart (void )
arch/arm/mach-mx5/board-mx51_babbage.c +5 -5
@@ -21,7 +21,6 @@#include <mach/common.h> #include <mach/hardware.h> -#include <mach/imx-uart.h> #include <mach/iomux-mx51.h> #include <mach/i2c.h> #include <mach/mxc_ehci.h>
@@ -32,6 +31,7 @@#include <asm/mach/arch.h> #include <asm/mach/time.h> +#include "devices-imx51.h" #include "devices.h" #define BABBAGE_USB_HUB_RESET (0*32 + 7)/* GPIO_1_7 */
@@ -121,15 +121,15 @@ static struct pad_desc mx51babbage_pads[] = {/* Serial ports */ #if defined(CONFIG_SERIAL_IMX ) || defined(CONFIG_SERIAL_IMX_MODULE ) -static struct imxuart_platform_data uart_pdata = { +static const struct imxuart_platform_data uart_pdata__initconst = { .flags =IMXUART_HAVE_RTSCTS , };static inline void mxc_init_imx_uart (void ) { -mxc_register_device (&mxc_uart_device0, &uart_pdata); -mxc_register_device (&mxc_uart_device1, &uart_pdata); -mxc_register_device (&mxc_uart_device2, &uart_pdata); +imx51_add_imx_uart (0 , &uart_pdata); +imx51_add_imx_uart (1 , &uart_pdata); +imx51_add_imx_uart (2 , &uart_pdata); }#else /* !SERIAL_IMX */ static inline void mxc_init_imx_uart (void )
arch/arm/mach-mx5/devices-imx51.h +4 -0
@@ -13,6 +13,10 @@ extern const struct imx_imx_i2c_data imx51_imx_i2c_data[] __initconst;#define imx51_add_imx_i2c (id, pdata) \ imx_add_imx_i2c(&imx51_imx_i2c_data[id], pdata) +extern const struct imx_imx_uart_1irq_data imx51_imx_uart_data[]__initconst ; +#define imx51_add_imx_uart (id, pdata) \ + imx_add_imx_uart_1irq(&imx51_imx_uart_data[id], pdata) +extern const struct imx_spi_imx_data imx51_cspi_data__initconst ;#define imx51_add_cspi (pdata) \ imx_add_spi_imx(&imx51_cspi_data, pdata)
arch/arm/mach-mx5/devices.c +0 -57
63 lines not on this page · raw message
arch/arm/mach-mx5/devices.h +0 -3
@@ -1,6 +1,3 @@ -extern struct platform_device mxc_uart_device0; -extern struct platform_device mxc_uart_device1; -extern struct platform_device mxc_uart_device2;extern struct platform_device mxc_fec_device;extern struct platform_device mxc_usbdr_host_device;extern struct platform_device mxc_usbh1_device;
arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c +4 -3
@@ -30,6 +30,7 @@#include <asm/mach/arch.h> +#include "devices-imx51.h" #include "devices.h" #define MBIMX51_TSC2007_GPIO (2*32 + 30)
@@ -114,7 +115,7 @@ static struct pad_desc mbimx51_pads[] = { MX51_PAD_KEY_COL3__KEY_COL3, }; -static struct imxuart_platform_data uart_pdata = { +static const struct imxuart_platform_data uart_pdata__initconst = { .flags =IMXUART_HAVE_RTSCTS , };
@@ -172,8 +173,8 @@ void __init eukrea_mbimx51_baseboard_init(void)mxc_iomux_v3_setup_multiple_pads (mbimx51_pads,ARRAY_SIZE (mbimx51_pads)); -mxc_register_device (&mxc_uart_device1,NULL ); -mxc_register_device (&mxc_uart_device2, &uart_pdata); +imx51_add_imx_uart (1 ,NULL ); +imx51_add_imx_uart (2 , &uart_pdata);gpio_request (MBIMX51_LED0 ,"LED0" );gpio_direction_output (MBIMX51_LED0 ,1 );
arch/arm/plat-mxc/devices/platform-imx-uart.c +10 -0
@@ -94,6 +94,16 @@ const struct imx_imx_uart_1irq_data imx35_imx_uart_data[] __initconst = { };#endif /* ifdef CONFIG_ARCH_MX35 */ +#ifdef CONFIG_ARCH_MX51 +const struct imx_imx_uart_1irq_data imx51_imx_uart_data[]__initconst = { +#define imx51_imx_uart_data_entry(_id, _hwid) \ + imx_imx_uart_1irq_data_entry(MX51, _id, _hwid, SZ_4K) +imx51_imx_uart_data_entry (0 ,1 ), +imx51_imx_uart_data_entry (1 ,2 ), +imx51_imx_uart_data_entry (2 ,3 ), +}; +#endif /* ifdef CONFIG_ARCH_MX51 */ +struct platform_device *__init imx_add_imx_uart_3irq (const struct imx_imx_uart_3irq_data *data,const struct imxuart_platform_data *pdata)
arch/arm/plat-mxc/include/mach/mx51.h +3 -3
@@ -310,9 +310,9 @@#define MX51_MXC_INT_SLIM_B 28#define MX51_MXC_INT_SSI1 29#define MX51_MXC_INT_SSI2 30 -#define MX51_MXC_INT_UART1 31 -#define MX51_MXC_INT_UART2 32 -#define MX51_MXC_INT_UART3 33 +#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_ECSPI1 36
Signature · 1 line
1.7.2.3
PATCH 36/40 ARM: mx51: add imx-ssi devices
In reply to Uwe Kleine-KönigFrom: Sascha Hauer <[email protected]>
--- arch/arm/mach-mx5/Kconfig | 1 + arch/arm/mach-mx5/clock-mx51.c | 12 ++++++++++++ arch/arm/mach-mx5/devices-imx51.h | 4 ++++ arch/arm/plat-mxc/devices/platform-imx-ssi.c | 9 +++++++++ arch/arm/plat-mxc/include/mach/mx51.h | 20 ++++++++++---------- 5 files changed, 36 insertions(+), 10 deletions(-)
arch/arm/mach-mx5/Kconfig +1 -0
@@ -10,6 +10,7 @@ comment "MX5 platforms:" config MACH_MX51_BABBAGE bool "Support MX51 BABBAGE platforms" + select IMX_HAVE_PLATFORM_IMX_I2C select IMX_HAVE_PLATFORM_IMX_UART help Include support for MX51 Babbage platform, also known as MX51EVK in
arch/arm/mach-mx5/clock-mx51.c +12 -0
@@ -949,6 +949,16 @@ DEFINE_CLOCK(fec_clk, 0, MXC_CCM_CCGR2, MXC_CCM_CCGRx_CG12_OFFSET,DEFINE_CLOCK1 (nfc_clk,0 ,MXC_CCM_CCGR5 , MXC_CCM_CCGRx_CG10_OFFSET, clk_nfc, &emi_slow_clk,NULL ); +/* SSI */ +DEFINE_CLOCK (ssi1_ipg_clk,0 ,MXC_CCM_CCGR3 , MXC_CCM_CCGRx_CG8_OFFSET, +NULL ,NULL , &ipg_clk,NULL ); +DEFINE_CLOCK (ssi1_clk,0 ,MXC_CCM_CCGR3 , MXC_CCM_CCGRx_CG9_OFFSET, +NULL ,NULL , &pll3_sw_clk, &ssi1_ipg_clk); +DEFINE_CLOCK (ssi2_ipg_clk,1 ,MXC_CCM_CCGR3 , MXC_CCM_CCGRx_CG10_OFFSET, +NULL ,NULL , &ipg_clk,NULL ); +DEFINE_CLOCK (ssi2_clk,1 ,MXC_CCM_CCGR3 , MXC_CCM_CCGRx_CG11_OFFSET, +NULL ,NULL , &pll3_sw_clk, &ssi2_ipg_clk); +/* eCSPI */ DEFINE_CLOCK_FULL(ecspi1_ipg_clk, 0, MXC_CCM_CCGR4, MXC_CCM_CCGRx_CG9_OFFSET, NULL, NULL, _clk_ccgr_enable_inrun, _clk_ccgr_disable,
@@ -991,6 +1001,8 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK("fsl-usb2-udc", "usb_ahb", ahb_clk) _REGISTER_CLOCK("imx-keypad.0", NULL, kpp_clk) _REGISTER_CLOCK("mxc_nand", NULL, nfc_clk) + _REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk) + _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk) _REGISTER_CLOCK("imx51-ecspi.0", NULL, ecspi1_clk) _REGISTER_CLOCK("imx51-ecspi.1", NULL, ecspi2_clk)_REGISTER_CLOCK ("imx51-cspi.0" ,NULL , cspi_clk)
arch/arm/mach-mx5/devices-imx51.h +4 -0
@@ -13,6 +13,10 @@ extern const struct imx_imx_i2c_data imx51_imx_i2c_data[] __initconst;#define imx51_add_imx_i2c (id, pdata) \ imx_add_imx_i2c(&imx51_imx_i2c_data[id], pdata) +extern const struct imx_imx_ssi_data imx51_imx_ssi_data[]__initconst ; +#define imx51_add_imx_ssi (id, pdata) \ + imx_add_imx_ssi(&imx51_imx_ssi_data[id], pdata) +extern const struct imx_imx_uart_1irq_data imx51_imx_uart_data[]__initconst ;#define imx51_add_imx_uart (id, pdata) \ imx_add_imx_uart_1irq(&imx51_imx_uart_data[id], pdata)
arch/arm/plat-mxc/devices/platform-imx-ssi.c +9 -0
@@ -66,6 +66,15 @@ const struct imx_imx_ssi_data imx35_imx_ssi_data[] __initconst = { };#endif /* ifdef CONFIG_ARCH_MX35 */ +#ifdef CONFIG_ARCH_MX51 +const struct imx_imx_ssi_data imx51_imx_ssi_data[]__initconst = { +#define imx51_imx_ssi_data_entry(_id, _hwid) \ + imx_imx_ssi_data_entry(MX51, _id, _hwid, SZ_4K) +imx51_imx_ssi_data_entry (0 ,1 ), +imx51_imx_ssi_data_entry (1 ,2 ), +}; +#endif /* ifdef CONFIG_ARCH_MX51 */ +struct platform_device *__init imx_add_imx_ssi (const struct imx_imx_ssi_data *data,const struct imx_ssi_platform_data *pdata)
arch/arm/plat-mxc/include/mach/mx51.h +10 -10
@@ -248,14 +248,14 @@#define MX51_DMA_REQ_UART1_TX 19#define MX51_DMA_REQ_SDHC1 20#define MX51_DMA_REQ_SDHC2 21 -#define MX51_DMA_REQ_SSI2_RX2 22 -#define MX51_DMA_REQ_SSI2_TX2 23 -#define MX51_DMA_REQ_SSI2_RX1 24 -#define MX51_DMA_REQ_SSI2_TX1 25 -#define MX51_DMA_REQ_SSI1_RX2 26 -#define MX51_DMA_REQ_SSI1_TX2 27 -#define MX51_DMA_REQ_SSI1_RX1 28 -#define MX51_DMA_REQ_SSI1_TX1 29 +#define MX51_DMA_REQ_SSI2_RX1 22 +#define MX51_DMA_REQ_SSI2_TX1 23 +#define MX51_DMA_REQ_SSI2_RX0 24 +#define MX51_DMA_REQ_SSI2_TX0 25 +#define MX51_DMA_REQ_SSI1_RX1 26 +#define MX51_DMA_REQ_SSI1_TX1 27 +#define MX51_DMA_REQ_SSI1_RX0 28 +#define MX51_DMA_REQ_SSI1_TX0 29#define MX51_DMA_REQ_EMI_RD 30#define MX51_DMA_REQ_CTI2_0 31#define MX51_DMA_REQ_EMI_WR 32
@@ -308,8 +308,8 @@#define MX51_MXC_INT_RTIC 26#define MX51_MXC_INT_CSU 27#define MX51_MXC_INT_SLIM_B 28 -#define MX51_MXC_INT_SSI1 29 -#define MX51_MXC_INT_SSI2 30 +#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
Signature · 1 line
1.7.2.3
PATCH 37/40 ARM: mx51: Add audmux support
In reply to Uwe Kleine-KönigFrom: Sascha Hauer <[email protected]>
--- arch/arm/mach-mx5/Kconfig | 1 + arch/arm/plat-mxc/audmux-v2.c | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletions(-)
arch/arm/mach-mx5/Kconfig +1 -0
@@ -5,6 +5,7 @@ config ARCH_MX51 default y select MXC_TZIC select ARCH_MXC_IOMUX_V3 + select ARCH_MXC_AUDMUX_V2 comment "MX5 platforms:"
arch/arm/plat-mxc/audmux-v2.c +7 -1
@@ -186,7 +186,13 @@ EXPORT_SYMBOL_GPL(mxc_audmux_v2_configure_port);static int mxc_audmux_v2_init (void ) {int ret; - +#if defined(CONFIG_ARCH_MX5 ) +if (cpu_is_mx51 ()) { + audmux_base =MX51_IO_ADDRESS (MX51_AUDMUX_BASE_ADDR ); + ret =0 ; +return ret; + } +#endif #if defined(CONFIG_ARCH_MX3 )if (cpu_is_mx31 ()) audmux_base =MX31_IO_ADDRESS (MX31_AUDMUX_BASE_ADDR );
Signature · 1 line
1.7.2.3
PATCH 38/40 ARM: imx: reorganize nand registration to use a struct
In reply to Uwe Kleine-KönigAddiontionally make the interrupt #defines match the base address defines MX.._NFC_BASE_ADDR.
--- arch/arm/mach-imx/devices-imx21.h | 3 +- arch/arm/mach-imx/devices-imx27.h | 3 +- arch/arm/mach-mx25/devices-imx25.h | 3 +- arch/arm/mach-mx3/devices-imx31.h | 3 +- arch/arm/mach-mx3/devices-imx35.h | 3 +- arch/arm/plat-mxc/devices/platform-mxc_nand.c | 64 ++++++++++++++-------- arch/arm/plat-mxc/include/mach/devices-common.h | 12 +++-- arch/arm/plat-mxc/include/mach/mx21.h | 2 +- arch/arm/plat-mxc/include/mach/mx25.h | 2 +- arch/arm/plat-mxc/include/mach/mx27.h | 2 +- arch/arm/plat-mxc/include/mach/mx31.h | 2 +- arch/arm/plat-mxc/include/mach/mx35.h | 2 +- 12 files changed, 64 insertions(+), 37 deletions(-)
arch/arm/mach-imx/devices-imx21.h +2 -1
@@ -25,8 +25,9 @@ extern const struct imx_imx_uart_1irq_data imx21_imx_uart_data[] __initconst;#define imx21_add_imx_uart2 (pdata) imx21_add_imx_uart(2, pdata)#define imx21_add_imx_uart3 (pdata) imx21_add_imx_uart(3, pdata) +extern const struct imx_mxc_nand_data imx21_mxc_nand_data__initconst ;#define imx21_add_mxc_nand (pdata) \ - imx_add_mxc_nand_v1(MX21_NFC_BASE_ADDR, MX21_INT_NANDFC, pdata) + imx_add_mxc_nand(&imx21_mxc_nand_data, pdata)extern const struct imx_spi_imx_data imx21_cspi_data[]__initconst ;#define imx21_add_cspi (id, pdata) \
arch/arm/mach-imx/devices-imx27.h +2 -1
@@ -27,8 +27,9 @@ extern const struct imx_imx_uart_1irq_data imx27_imx_uart_data[] __initconst;#define imx27_add_imx_uart4 (pdata) imx27_add_imx_uart(4, pdata)#define imx27_add_imx_uart5 (pdata) imx27_add_imx_uart(5, pdata) +extern const struct imx_mxc_nand_data imx27_mxc_nand_data__initconst ;#define imx27_add_mxc_nand (pdata) \ - imx_add_mxc_nand_v1(MX27_NFC_BASE_ADDR, MX27_INT_NANDFC, pdata) + imx_add_mxc_nand(&imx27_mxc_nand_data, pdata)extern const struct imx_spi_imx_data imx27_cspi_data[]__initconst ;#define imx27_add_cspi (id, pdata) \
arch/arm/mach-mx25/devices-imx25.h +2 -1
@@ -34,8 +34,9 @@ extern const struct imx_imx_uart_1irq_data imx25_imx_uart_data[] __initconst;#define imx25_add_imx_uart3 (pdata) imx25_add_imx_uart(3, pdata)#define imx25_add_imx_uart4 (pdata) imx25_add_imx_uart(4, pdata) +extern const struct imx_mxc_nand_data imx25_mxc_nand_data__initconst ;#define imx25_add_mxc_nand (pdata) \ - imx_add_mxc_nand_v21(MX25_NFC_BASE_ADDR, MX25_INT_NANDFC, pdata) + imx_add_mxc_nand(&imx25_mxc_nand_data, pdata)extern const struct imx_spi_imx_data imx25_spi_imx_data[]__initconst ;#define imx25_add_spi_imx (id, pdata) \
arch/arm/mach-mx3/devices-imx31.h +2 -1
@@ -29,8 +29,9 @@ extern const struct imx_imx_uart_1irq_data imx31_imx_uart_data[] __initconst;#define imx31_add_imx_uart3 (pdata) imx31_add_imx_uart(3, pdata)#define imx31_add_imx_uart4 (pdata) imx31_add_imx_uart(4, pdata) +extern const struct imx_mxc_nand_data imx31_mxc_nand_data__initconst ;#define imx31_add_mxc_nand (pdata) \ - imx_add_mxc_nand_v1(MX31_NFC_BASE_ADDR, MX31_INT_NANDFC, pdata) + imx_add_mxc_nand(&imx31_mxc_nand_data, pdata)extern const struct imx_spi_imx_data imx31_cspi_data[]__initconst ;#define imx31_add_cspi (id, pdata) \
arch/arm/mach-mx3/devices-imx35.h +2 -1
@@ -32,8 +32,9 @@ extern const struct imx_imx_uart_1irq_data imx35_imx_uart_data[] __initconst;#define imx35_add_imx_uart1 (pdata) imx35_add_imx_uart(1, pdata)#define imx35_add_imx_uart2 (pdata) imx35_add_imx_uart(2, pdata) +extern const struct imx_mxc_nand_data imx35_mxc_nand_data__initconst ;#define imx35_add_mxc_nand (pdata) \ - imx_add_mxc_nand_v21(MX35_NFC_BASE_ADDR, MX35_INT_NANDFC, pdata) + imx_add_mxc_nand(&imx35_mxc_nand_data, pdata)extern const struct imx_spi_imx_data imx35_cspi_data[]__initconst ;#define imx35_add_cspi (id, pdata) \
arch/arm/plat-mxc/devices/platform-mxc_nand.c +41 -23
79 lines not on this page · raw message
arch/arm/plat-mxc/include/mach/devices-common.h +8 -4
@@ -70,10 +70,14 @@ struct platform_device *__init imx_add_imx_uart_1irq( const struct imxuart_platform_data *pdata);#include <mach/mxc_nand.h> -struct platform_device *__init imx_add_mxc_nand_v1 (resource_size_t iobase, -int irq,const struct mxc_nand_platform_data *pdata); -struct platform_device *__init imx_add_mxc_nand_v21 (resource_size_t iobase, -int irq,const struct mxc_nand_platform_data *pdata); +struct imx_mxc_nand_data { +resource_size_t iobase; +resource_size_t iosize; +resource_size_t irq; +}; +struct platform_device *__init imx_add_mxc_nand ( +const struct imx_mxc_nand_data *data, +const struct mxc_nand_platform_data *pdata);#include <mach/spi.h> struct imx_spi_imx_data {
arch/arm/plat-mxc/include/mach/mx21.h +1 -1
@@ -120,7 +120,7 @@#define MX21_INT_GPT1 26#define MX21_INT_WDOG 27#define MX21_INT_PCMCIA 28 -#define MX21_INT_NANDFC 29 +#define MX21_INT_NFC 29#define MX21_INT_BMI 30#define MX21_INT_CSI 31#define MX21_INT_DMACH0 32
arch/arm/plat-mxc/include/mach/mx25.h +1 -1
@@ -69,7 +69,7 @@#define MX25_INT_KPP 24#define MX25_INT_DRYICE 25#define MX25_INT_UART2 32 -#define MX25_INT_NANDFC 33 +#define MX25_INT_NFC 33#define MX25_INT_LCDC 39#define MX25_INT_UART5 40#define MX25_INT_CAN1 43
arch/arm/plat-mxc/include/mach/mx27.h +1 -1
@@ -167,7 +167,7 @@ static inline void mx27_setup_weimcs(size_t cs,#define MX27_INT_GPT1 26#define MX27_INT_WDOG 27#define MX27_INT_PCMCIA 28 -#define MX27_INT_NANDFC 29 +#define MX27_INT_NFC 29#define MX27_INT_ATA 30#define MX27_INT_CSI 31#define MX27_INT_DMACH0 32
arch/arm/plat-mxc/include/mach/mx31.h +1 -1
@@ -168,7 +168,7 @@ static inline void mx31_setup_weimcs(size_t cs,#define MX31_INT_POWER_FAIL 30#define MX31_INT_CCM_DVFS 31#define MX31_INT_UART2 32 -#define MX31_INT_NANDFC 33 +#define MX31_INT_NFC 33#define MX31_INT_SDMA 34#define MX31_INT_USB1 35#define MX31_INT_USB2 36
arch/arm/plat-mxc/include/mach/mx35.h +1 -1
@@ -145,7 +145,7 @@#define MX35_INT_GPT 29#define MX35_INT_POWER_FAIL 30#define MX35_INT_UART2 32 -#define MX35_INT_NANDFC 33 +#define MX35_INT_NFC 33#define MX35_INT_SDMA 34#define MX35_INT_USBHS 35#define MX35_INT_USBOTG 37
Signature · 1 line
1.7.2.3
PATCH 39/40 ARM: mx5: dynamically register mxc-nand device
In reply to Uwe Kleine-KönigFrom: Sascha Hauer <[email protected]>
--- arch/arm/mach-mx5/devices-imx51.h | 4 ++++ arch/arm/plat-mxc/devices/platform-mxc_nand.c | 23 ++++++++++++++++++++++- arch/arm/plat-mxc/include/mach/devices-common.h | 7 +++++++ arch/arm/plat-mxc/include/mach/mx51.h | 2 +- 4 files changed, 34 insertions(+), 2 deletions(-)
arch/arm/mach-mx5/devices-imx51.h +4 -0
@@ -21,6 +21,10 @@ extern const struct imx_imx_uart_1irq_data imx51_imx_uart_data[] __initconst;#define imx51_add_imx_uart (id, pdata) \ imx_add_imx_uart_1irq(&imx51_imx_uart_data[id], pdata) +extern const struct imx_mxc_nand_data imx51_mxc_nand_data__initconst ; +#define imx51_add_mxc_nand (pdata) \ + imx_add_mxc_nand(&imx51_mxc_nand_data, pdata) +extern const struct imx_spi_imx_data imx51_cspi_data__initconst ;#define imx51_add_cspi (pdata) \ imx_add_spi_imx(&imx51_cspi_data, pdata)
arch/arm/plat-mxc/devices/platform-mxc_nand.c +22 -1
@@ -17,6 +17,15 @@ .irq = soc ## _INT_NFC \ } +#define imx_mxc_nandv3_data_entry_single (soc, _size) \ + { \ + .id = -1, \ + .iobase = soc ## _NFC_BASE_ADDR, \ + .iosize = _size, \ + .axibase = soc ## _NFC_AXI_BASE_ADDR, \ + .irq = soc ## _INT_NFC \ + } +#ifdef CONFIG_SOC_IMX21 const struct imx_mxc_nand_data imx21_mxc_nand_data__initconst =imx_mxc_nand_data_entry_single (MX21 ,SZ_4K );
@@ -42,12 +51,22 @@ const struct imx_mxc_nand_data imx35_mxc_nand_data __initconst =imx_mxc_nand_data_entry_single (MX35 ,SZ_8K );#endif +#ifdef CONFIG_ARCH_MX51 +const struct imx_mxc_nand_data imx51_mxc_nand_data__initconst = +imx_mxc_nandv3_data_entry_single (MX51 ,SZ_16K ); +#endif +struct platform_device *__init imx_add_mxc_nand (const struct imx_mxc_nand_data *data,const struct mxc_nand_platform_data *pdata) { +/* AXI has to come first, that's how the mxc_nand driver expect it */ struct resource res[] = { { + .start = data->axibase, + .end = data->axibase +SZ_16K -1 , + .flags =IORESOURCE_MEM , + }, { .start = data->iobase, .end = data->iobase + data->iosize -1 , .flags =IORESOURCE_MEM ,
@@ -57,6 +76,8 @@ struct platform_device *__init imx_add_mxc_nand( .flags = IORESOURCE_IRQ, }, }; -return imx_add_platform_device ("mxc_nand" ,0 , res,ARRAY_SIZE (res), +return imx_add_platform_device ("mxc_nand" , data->id, + res + !data->axibase, +ARRAY_SIZE (res) - !data->axibase, pdata,sizeof (*pdata)); }
arch/arm/plat-mxc/include/mach/devices-common.h +7 -0
@@ -71,8 +71,15 @@ struct platform_device *__init imx_add_imx_uart_1irq(#include <mach/mxc_nand.h> struct imx_mxc_nand_data { +/* +* id is traditionally 0, but -1 is more appropriate. We use -1 for new +* machines but don't change existing devices as the nand device usually +* appears in the kernel command line to pass its partitioning. +*/ +int id;resource_size_t iobase;resource_size_t iosize; +resource_size_t axibase;resource_size_t irq; }; struct platform_device *__init imx_add_mxc_nand(
arch/arm/plat-mxc/include/mach/mx51.h +1 -1
@@ -287,7 +287,7 @@#define MX51_MXC_INT_RESV5 5#define MX51_MXC_INT_SDMA 6#define MX51_MXC_INT_IOMUX 7 -#define MX51_MXC_INT_NFC 8 +#define MX51_INT_NFC 8#define MX51_MXC_INT_VPU 9#define MX51_MXC_INT_IPU_ERR 10#define MX51_MXC_INT_IPU_SYN 11
Signature · 1 line
1.7.2.3
PATCH 40/40 ARM: mx5: clock-imx51: make *ipg clocks secondary clocks of their corresponding peripheral clocks
In reply to Uwe Kleine-KönigFrom: Sascha Hauer <[email protected]>
Currently the uarts and timer only work because they are turned on by reset default. Make them secondary clocks of their corresponding peripheral clocks to make sure they are turned on when necessary. Also, register some clocks to get rid of compiler warnings
--- arch/arm/mach-mx5/clock-mx51.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-)
arch/arm/mach-mx5/clock-mx51.c +11 -8
@@ -914,24 +914,24 @@ DEFINE_CLOCK(spba_clk, 0, MXC_CCM_CCGR5, MXC_CCM_CCGRx_CG0_OFFSET, NULL, NULL, &ipg_clk, NULL);/* UART */ -DEFINE_CLOCK (uart1_clk,0 ,MXC_CCM_CCGR1 , MXC_CCM_CCGRx_CG4_OFFSET, -NULL ,NULL , &uart_root_clk,NULL ); -DEFINE_CLOCK (uart2_clk,1 ,MXC_CCM_CCGR1 , MXC_CCM_CCGRx_CG6_OFFSET, -NULL ,NULL , &uart_root_clk,NULL ); -DEFINE_CLOCK (uart3_clk,2 ,MXC_CCM_CCGR1 , MXC_CCM_CCGRx_CG8_OFFSET, -NULL ,NULL , &uart_root_clk,NULL );DEFINE_CLOCK (uart1_ipg_clk,0 ,MXC_CCM_CCGR1 , MXC_CCM_CCGRx_CG3_OFFSET,NULL ,NULL , &ipg_clk, &aips_tz1_clk);DEFINE_CLOCK (uart2_ipg_clk,1 ,MXC_CCM_CCGR1 , MXC_CCM_CCGRx_CG5_OFFSET,NULL ,NULL , &ipg_clk, &aips_tz1_clk);DEFINE_CLOCK (uart3_ipg_clk,2 ,MXC_CCM_CCGR1 , MXC_CCM_CCGRx_CG7_OFFSET,NULL ,NULL , &ipg_clk, &spba_clk); +DEFINE_CLOCK (uart1_clk,0 ,MXC_CCM_CCGR1 , MXC_CCM_CCGRx_CG4_OFFSET, +NULL ,NULL , &uart_root_clk, &uart1_ipg_clk); +DEFINE_CLOCK (uart2_clk,1 ,MXC_CCM_CCGR1 , MXC_CCM_CCGRx_CG6_OFFSET, +NULL ,NULL , &uart_root_clk, &uart2_ipg_clk); +DEFINE_CLOCK (uart3_clk,2 ,MXC_CCM_CCGR1 , MXC_CCM_CCGRx_CG8_OFFSET, +NULL ,NULL , &uart_root_clk, &uart3_ipg_clk);/* GPT */ -DEFINE_CLOCK (gpt_clk,0 ,MXC_CCM_CCGR2 , MXC_CCM_CCGRx_CG9_OFFSET, -NULL ,NULL , &ipg_clk,NULL );DEFINE_CLOCK (gpt_ipg_clk,0 ,MXC_CCM_CCGR2 , MXC_CCM_CCGRx_CG10_OFFSET,NULL ,NULL , &ipg_clk,NULL ); +DEFINE_CLOCK (gpt_clk,0 ,MXC_CCM_CCGR2 , MXC_CCM_CCGRx_CG9_OFFSET, +NULL ,NULL , &ipg_clk, &gpt_ipg_clk);/* I2C */ DEFINE_CLOCK(i2c1_clk, 0, MXC_CCM_CCGR1, MXC_CCM_CCGRx_CG9_OFFSET,
@@ -1003,6 +1003,9 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK("mxc_nand", NULL, nfc_clk) _REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk) _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk) + _REGISTER_CLOCK(NULL, "ckih", ckih_clk) + _REGISTER_CLOCK(NULL, "ckih2", ckih2_clk) + _REGISTER_CLOCK(NULL, "gpt_32k", gpt_32k_clk) _REGISTER_CLOCK("imx51-ecspi.0", NULL, ecspi1_clk) _REGISTER_CLOCK("imx51-ecspi.1", NULL, ecspi2_clk)_REGISTER_CLOCK ("imx51-cspi.0" ,NULL , cspi_clk)
Signature · 1 line
1.7.2.3
Hi
Are the sdma patches in the pipeline too ? Or it will be for .38 ?
Thanks,
Philippe
Hello Philippe,
Quoted 1 line · Philippe R?tornaz
Are the sdma patches in the pipeline too ? Or it will be for .38 ?
SDMA is not my line of country but Sascha's. AFAIK he waits for comments from Dan.
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
2010/9/27 Uwe Kleine-K?nig <[email protected]>:
Quoted 7 lines
Hello Philippe,
Quoted 1 line · Philippe R?tornaz
Are the sdma patches in the pipeline too ? Or it will be for .38 ?
SDMA is not my line of country but Sascha's. ?AFAIK he waits for comments from Dan.
Fyi. I supplied comments to Sascha and am just waiting for the respun patches.
--
Dan
Sascha Hauer
maintainerHi Dan,
Quoted 10 lines · Dan Williams
2010/9/27 Uwe Kleine-K?nig <[email protected]>:
Quoted 7 lines
Hello Philippe,
Quoted 1 line · Philippe R?tornaz
Are the sdma patches in the pipeline too ? Or it will be for .38 ?
SDMA is not my line of country but Sascha's. ?AFAIK he waits for comments from Dan.
Fyi. I supplied comments to Sascha and am just waiting for the respun patches.
I just posted the respun series. I'm looking forward for comments to the sdma driver and now also a dmaengine driver for the older i.MX SoCs.
Sascha
Signature · 4 lines
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 |
Hello,
here come five more patches
The following changes since commit 24bc0ba6ebf7b615fdc67f3c09c467e0d5752168:
ARM: mx5: clock-imx51: make *ipg clocks secondary clocks of their corresponding peripheral clocks (2010-09-27 17:00:58 +0200)
(which was the last patch of the previous series) are available in the git repository at:
git://git.pengutronix.de/git/ukl/linux-2.6.git imx/for-2.6.36
Uwe Kleine-K?nig (5):
ARM: imx/clock-imx27: Pass NULL as function callback, not 0
ARM: imx/pcm038: make regulator platform data static
ARM: imx: make all pin lists const and signed, move to .init where possible
ARM: imx/pcm970: make platform_data static
ARM: imx/pca100: only specify i2c device type once
arch/arm/mach-imx/clock-imx27.c | 42 +++++++++++++------------- arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 2 +- arch/arm/mach-imx/mach-cpuimx27.c | 2 +- arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 2 +- arch/arm/mach-imx/mach-imx27lite.c | 2 +- arch/arm/mach-imx/mach-mx1ads.c | 2 +- arch/arm/mach-imx/mach-mx21ads.c | 2 +- arch/arm/mach-imx/mach-mx27_3ds.c | 2 +- arch/arm/mach-imx/mach-mx27ads.c | 2 +- arch/arm/mach-imx/mach-mxt_td60.c | 2 +- arch/arm/mach-imx/mach-pca100.c | 6 +-- arch/arm/mach-imx/mach-pcm038.c | 4 +- arch/arm/mach-imx/mach-scb9328.c | 2 +- arch/arm/mach-imx/pcm970-baseboard.c | 4 +- 14 files changed, 37 insertions(+), 39 deletions(-)
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
PATCH 1/5 ARM: imx/clock-imx27: Pass NULL as function callback, not 0
This fixes many sparse warnings like:
arch/arm/mach-imx/clock-imx27.c:597:1: warning: Using plain integer as NULL pointer
--- arch/arm/mach-imx/clock-imx27.c | 42 +++++++++++++++++++------------------- 1 files changed, 21 insertions(+), 21 deletions(-)
arch/arm/mach-imx/clock-imx27.c +21 -21
@@ -594,27 +594,27 @@ DEFINE_CLOCK(uart2_clk1, 0, PCCR1, 30, NULL, NULL, &ipg_clk);DEFINE_CLOCK (uart1_clk1,0 ,PCCR1 ,31 ,NULL ,NULL , &ipg_clk);/* Clocks we cannot directly gate, but drivers need their rates */ -DEFINE_CLOCK (cspi1_clk,0 ,0 ,0 ,NULL , &cspi1_clk1, &per2_clk); -DEFINE_CLOCK (cspi2_clk,1 ,0 ,0 ,NULL , &cspi2_clk1, &per2_clk); -DEFINE_CLOCK (cspi3_clk,2 ,0 ,0 ,NULL , &cspi13_clk1, &per2_clk); -DEFINE_CLOCK (sdhc1_clk,0 ,0 ,0 ,NULL , &sdhc1_clk1, &per2_clk); -DEFINE_CLOCK (sdhc2_clk,1 ,0 ,0 ,NULL , &sdhc2_clk1, &per2_clk); -DEFINE_CLOCK (sdhc3_clk,2 ,0 ,0 ,NULL , &sdhc3_clk1, &per2_clk); -DEFINE_CLOCK (pwm_clk,0 ,0 ,0 ,NULL , &pwm_clk1, &per1_clk); -DEFINE_CLOCK (gpt1_clk,0 ,0 ,0 ,NULL , &gpt1_clk1, &per1_clk); -DEFINE_CLOCK (gpt2_clk,1 ,0 ,0 ,NULL , &gpt2_clk1, &per1_clk); -DEFINE_CLOCK (gpt3_clk,2 ,0 ,0 ,NULL , &gpt3_clk1, &per1_clk); -DEFINE_CLOCK (gpt4_clk,3 ,0 ,0 ,NULL , &gpt4_clk1, &per1_clk); -DEFINE_CLOCK (gpt5_clk,4 ,0 ,0 ,NULL , &gpt5_clk1, &per1_clk); -DEFINE_CLOCK (gpt6_clk,5 ,0 ,0 ,NULL , &gpt6_clk1, &per1_clk); -DEFINE_CLOCK (uart1_clk,0 ,0 ,0 ,NULL , &uart1_clk1, &per1_clk); -DEFINE_CLOCK (uart2_clk,1 ,0 ,0 ,NULL , &uart2_clk1, &per1_clk); -DEFINE_CLOCK (uart3_clk,2 ,0 ,0 ,NULL , &uart3_clk1, &per1_clk); -DEFINE_CLOCK (uart4_clk,3 ,0 ,0 ,NULL , &uart4_clk1, &per1_clk); -DEFINE_CLOCK (uart5_clk,4 ,0 ,0 ,NULL , &uart5_clk1, &per1_clk); -DEFINE_CLOCK (uart6_clk,5 ,0 ,0 ,NULL , &uart6_clk1, &per1_clk); -DEFINE_CLOCK1 (lcdc_clk,0 ,0 ,0 , parent, &lcdc_clk1, &per3_clk); -DEFINE_CLOCK1 (csi_clk,0 ,0 ,0 , parent, &csi_clk1, &per4_clk); +DEFINE_CLOCK (cspi1_clk,0 ,NULL ,0 ,NULL , &cspi1_clk1, &per2_clk); +DEFINE_CLOCK (cspi2_clk,1 ,NULL ,0 ,NULL , &cspi2_clk1, &per2_clk); +DEFINE_CLOCK (cspi3_clk,2 ,NULL ,0 ,NULL , &cspi13_clk1, &per2_clk); +DEFINE_CLOCK (sdhc1_clk,0 ,NULL ,0 ,NULL , &sdhc1_clk1, &per2_clk); +DEFINE_CLOCK (sdhc2_clk,1 ,NULL ,0 ,NULL , &sdhc2_clk1, &per2_clk); +DEFINE_CLOCK (sdhc3_clk,2 ,NULL ,0 ,NULL , &sdhc3_clk1, &per2_clk); +DEFINE_CLOCK (pwm_clk,0 ,NULL ,0 ,NULL , &pwm_clk1, &per1_clk); +DEFINE_CLOCK (gpt1_clk,0 ,NULL ,0 ,NULL , &gpt1_clk1, &per1_clk); +DEFINE_CLOCK (gpt2_clk,1 ,NULL ,0 ,NULL , &gpt2_clk1, &per1_clk); +DEFINE_CLOCK (gpt3_clk,2 ,NULL ,0 ,NULL , &gpt3_clk1, &per1_clk); +DEFINE_CLOCK (gpt4_clk,3 ,NULL ,0 ,NULL , &gpt4_clk1, &per1_clk); +DEFINE_CLOCK (gpt5_clk,4 ,NULL ,0 ,NULL , &gpt5_clk1, &per1_clk); +DEFINE_CLOCK (gpt6_clk,5 ,NULL ,0 ,NULL , &gpt6_clk1, &per1_clk); +DEFINE_CLOCK (uart1_clk,0 ,NULL ,0 ,NULL , &uart1_clk1, &per1_clk); +DEFINE_CLOCK (uart2_clk,1 ,NULL ,0 ,NULL , &uart2_clk1, &per1_clk); +DEFINE_CLOCK (uart3_clk,2 ,NULL ,0 ,NULL , &uart3_clk1, &per1_clk); +DEFINE_CLOCK (uart4_clk,3 ,NULL ,0 ,NULL , &uart4_clk1, &per1_clk); +DEFINE_CLOCK (uart5_clk,4 ,NULL ,0 ,NULL , &uart5_clk1, &per1_clk); +DEFINE_CLOCK (uart6_clk,5 ,NULL ,0 ,NULL , &uart6_clk1, &per1_clk); +DEFINE_CLOCK1 (lcdc_clk,0 ,NULL ,0 , parent, &lcdc_clk1, &per3_clk); +DEFINE_CLOCK1 (csi_clk,0 ,NULL ,0 , parent, &csi_clk1, &per4_clk);#define _REGISTER_CLOCK (d, n, c) \ { \
Signature · 1 line
1.7.2.3
PATCH 2/5 ARM: imx/pcm038: make regulator platform data static
In reply to Uwe Kleine-KönigThis fixes the following sparse warning:
arch/arm/mach-imx/pcm970-baseboard.c:203:30: warning: symbol 'pcm970_sja1000_platform_data' was not declared. Should it be static?
--- arch/arm/mach-imx/mach-pcm038.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-imx/mach-pcm038.c +1 -1
@@ -257,7 +257,7 @@ static struct regulator_init_data cam_data = { .consumer_supplies = cam_consumers, }; -struct mc13783_regulator_init_data pcm038_regulators[] = { +static struct mc13783_regulator_init_data pcm038_regulators[] = { { .id =MC13783_REGU_VCAM , .init_data = &cam_data,
Signature · 1 line
1.7.2.3
PATCH 3/5 ARM: imx: make all pin lists const and signed, move to .init where possible
In reply to Uwe Kleine-KönigMaking the lists signed fixes sparse warnings like:
arch/arm/mach-imx/mach-mx27_3ds.c:94:31: warning: incorrect type in argument 1 (different signedness)
arch/arm/mach-imx/mach-mx27_3ds.c:94:31: expected int const *pin_list
arch/arm/mach-imx/mach-mx27_3ds.c:94:31: got unsigned int static [toplevel] *<noident>
--- arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 2 +- arch/arm/mach-imx/mach-cpuimx27.c | 2 +- arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 2 +- arch/arm/mach-imx/mach-imx27lite.c | 2 +- arch/arm/mach-imx/mach-mx1ads.c | 2 +- arch/arm/mach-imx/mach-mx21ads.c | 2 +- arch/arm/mach-imx/mach-mx27_3ds.c | 2 +- arch/arm/mach-imx/mach-mx27ads.c | 2 +- arch/arm/mach-imx/mach-mxt_td60.c | 2 +- arch/arm/mach-imx/mach-pca100.c | 2 +- arch/arm/mach-imx/mach-pcm038.c | 2 +- arch/arm/mach-imx/mach-scb9328.c | 2 +- arch/arm/mach-imx/pcm970-baseboard.c | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-)
arch/arm/mach-imx/eukrea_mbimx27-baseboard.c +1 -1
@@ -41,7 +41,7 @@#include "devices-imx27.h" #include "devices.h" -static int eukrea_mbimx27_pins[] = { +static const int eukrea_mbimx27_pins[]__initconst = {/* UART2 */ PE3_PF_UART2_CTS ,PE4_PF_UART2_RTS ,
arch/arm/mach-imx/mach-cpuimx27.c +1 -1
@@ -46,7 +46,7 @@#include "devices-imx27.h" #include "devices.h" -static int eukrea_cpuimx27_pins[] = { +static const int eukrea_cpuimx27_pins[]__initconst = {/* UART1 */ PE12_PF_UART1_TXD ,PE13_PF_UART1_RXD ,
arch/arm/mach-imx/mach-imx27_visstrim_m10.c +1 -1
@@ -44,7 +44,7 @@#define OTG_PHY_CS_GPIO (GPIO_PORTF + 17)#define SDHC1_IRQ IRQ_GPIOB(25) -static int visstrim_m10_pins[] = { +static const int visstrim_m10_pins[]__initconst = {/* UART1 (console) */ PE12_PF_UART1_TXD ,PE13_PF_UART1_RXD ,
arch/arm/mach-imx/mach-imx27lite.c +1 -1
@@ -27,7 +27,7 @@#include "devices-imx27.h" #include "devices.h" -static unsigned int mx27lite_pins[] = { +static const int mx27lite_pins[]__initconst = {/* UART1 */ PE12_PF_UART1_TXD ,PE13_PF_UART1_RXD ,
arch/arm/mach-imx/mach-mx1ads.c +1 -1
@@ -32,7 +32,7 @@#include "devices-imx1.h" #include "devices.h" -static int mx1ads_pins[] = { +static const int mx1ads_pins[]__initconst = {/* UART1 */ PC9_PF_UART1_CTS ,PC10_PF_UART1_RTS ,
arch/arm/mach-imx/mach-mx21ads.c +1 -1
@@ -67,7 +67,7 @@#define MX21ADS_IO_LED4_ON 0x4000#define MX21ADS_IO_LED3_ON 0x8000 -static unsigned int mx21ads_pins[] = { +static const int mx21ads_pins[]__initconst = {/* CS8900A */ (GPIO_PORTE |GPIO_GPIO |GPIO_IN |11 ),
arch/arm/mach-imx/mach-mx27_3ds.c +1 -1
@@ -33,7 +33,7 @@#include "devices-imx27.h" #include "devices.h" -static unsigned int mx27pdk_pins[] = { +static const int mx27pdk_pins[]__initconst = {/* UART1 */ PE12_PF_UART1_TXD ,PE13_PF_UART1_RXD ,
arch/arm/mach-imx/mach-mx27ads.c +1 -1
@@ -66,7 +66,7 @@/* to determine the correct external crystal reference */ #define CKIH_27MHZ_BIT_SET (1 << 3) -static unsigned int mx27ads_pins[] = { +static const int mx27ads_pins[]__initconst = {/* UART0 */ PE12_PF_UART1_TXD ,PE13_PF_UART1_RXD ,
arch/arm/mach-imx/mach-mxt_td60.c +1 -1
@@ -37,7 +37,7 @@#include "devices-imx27.h" #include "devices.h" -static unsigned int mxt_td60_pins[]__initdata = { +static const int mxt_td60_pins[]__initconst = {/* UART0 */ PE12_PF_UART1_TXD ,PE13_PF_UART1_RXD ,
arch/arm/mach-imx/mach-pca100.c +1 -1
@@ -54,7 +54,7 @@#define SPI1_SS1 (GPIO_PORTD + 27)#define SD2_CD (GPIO_PORTC + 29) -static int pca100_pins[] = { +static const int pca100_pins[]__initconst = {/* UART1 */ PE12_PF_UART1_TXD ,PE13_PF_UART1_RXD ,
arch/arm/mach-imx/mach-pcm038.c +1 -1
@@ -43,7 +43,7 @@#include "devices-imx27.h" #include "devices.h" -static int pcm038_pins[] = { +static const int pcm038_pins[]__initconst = {/* UART1 */ PE12_PF_UART1_TXD ,PE13_PF_UART1_RXD ,
arch/arm/mach-imx/mach-scb9328.c +1 -1
@@ -95,7 +95,7 @@ static struct platform_device dm9000x_device = { } }; -static int mxc_uart1_pins[] = { +static const int mxc_uart1_pins[] = {PC9_PF_UART1_CTS ,PC10_PF_UART1_RTS ,PC11_PF_UART1_TXD ,
arch/arm/mach-imx/pcm970-baseboard.c +1 -1
@@ -31,7 +31,7 @@#include "devices.h" -static int pcm970_pins[] = { +static const int pcm970_pins[]__initconst = {/* SDHC */ PB4_PF_SD2_D0 ,PB5_PF_SD2_D1 ,
Signature · 1 line
1.7.2.3
PATCH 4/5 ARM: imx/pcm970: make platform_data static
In reply to Uwe Kleine-KönigThis fixes the following sparse warning:
arch/arm/mach-imx/pcm970-baseboard.c:224:13: warning: symbol 'pcm970_baseboard_init' was not declared. Should it be static?
--- arch/arm/mach-imx/pcm970-baseboard.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-imx/pcm970-baseboard.c +1 -1
@@ -200,7 +200,7 @@ static struct resource pcm970_sja1000_resources[] = { }, }; -struct sja1000_platform_data pcm970_sja1000_platform_data = { +static struct sja1000_platform_data pcm970_sja1000_platform_data = { .osc_freq =16000000 , .ocr =OCR_TX1_PULLDOWN |OCR_TX0_PUSHPULL , .cdr =CDR_CBP ,
Signature · 1 line
1.7.2.3
PATCH 5/5 ARM: imx/pca100: only specify i2c device type once
In reply to Uwe Kleine-KönigThe first argument to I2C_BOARD_INFO is used to assign .type, so it should not be specified a second time.
For the rtc-pcf8563/pcf8563 entry gcc preferred pcf8563, so did I.
--- arch/arm/mach-imx/mach-pca100.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)
arch/arm/mach-imx/mach-pca100.c +1 -3
@@ -192,11 +192,9 @@ static struct i2c_board_info pca100_i2c_devices[] = { I2C_BOARD_INFO("at24", 0x52), /* E0=0, E1=1, E2=0 */ .platform_data = &board_eeprom, }, { -I2C_BOARD_INFO ("rtc-pcf8563" ,0x51 ), - .type = "pcf8563" +I2C_BOARD_INFO ("pcf8563" ,0x51 ), }, { I2C_BOARD_INFO("lm75", 0x4a), - .type = "lm75" } };
Signature · 1 line
1.7.2.3
Quoted 11 lines · Uwe Kleine-K?nig
Hello,
here come five more patches
The following changes since commit
24bc0ba6ebf7b615fdc67f3c09c467e0d5752168:ARM: mx5: clock-imx51: make *ipg clocks secondary clocks of their corresponding peripheral clocks (2010-09-27 17:00:58 +0200)
(which was the last patch of the previous series) are available in the git repository at:
git://git.pengutronix.de/git/ukl/linux-2.6.gitimx/for-2.6.36
This should have read:
git://git.pengutronix.de/git/ukl/linux-2.6.git imx/for-2.6.37
of course.
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |