[PATCH 00/20] imx cleanup series
Uwe Kleine-König
u.kleine-koenig at pengutronix.de
Fri Jan 8 11:15:51 EST 2010
Hi,
I updated most patches based on feed-back here and further work. Some
patches are completely new.
> The patch by Wolfgang Denk is included because otherwise it would
> conflict with the series.
I rebased onto Sascha's last pull request which included Wolfgang's
patch, so this isn't true any more.
As usual you can find diffstat and shortlog below.
Best regards
Uwe
The following changes since commit f9ffaa9ca9889f17ef30b82bc0bf954d141280f8:
Uwe Kleine-König (1):
imx/mx3: depend on USB_ULPI for otg_ulpi_create
are available in the git repository at:
git://git.pengutronix.de/git/ukl/linux-2.6.git imx
Uwe Kleine-König (25):
imx/mx2: fold crm_regs.h into its only consumer
imx/clock-imx21: use a macro to define registers
imx/clock-imx27: use a macro to define registers
imx/mach-mx2: use constants namespaced by the corresponding SOC (easy part)
imx/mach-mx3: use constants namespaced by the corresponding SOC (easy part)
imx/mx3: rename clock.c and iomux.c to {clock,iomux}-imx31.c
imx/mx1: add newline at end of Makefile
imx/mx1: rename files defining a machine to mach-$mach.c
imx: rename Kconfig symbol for "Eukrea CPUIMX27 module"
imx: rename Kconfig symbol for "LogicPD MX27 LITEKIT platform"
imx/mx2: rename files defining a machine to mach-$mach.c
imx/mx3: rename files defining a machine to mach-$mach.c
imx: provide helper macro to define IO_ADDRESS
imx21: define and use MX21_IO_ADDRESS
imx27: define and use MX27_IO_ADDRESS
imx31: define and use MX31_IO_ADDRESS
imx25: redefine MX25_IO_ADDRESS using IMX_IO_ADDRESS
imx35: define and use MX35_IO_ADDRESS
mx3/kzm_arm11_01: define and use board specific IO_ADDRESS macro
imx: mangle addresses after adding the offset
imx: only define deprecated symbols conditionally
imx: remove mx1ads defconfig
imx: remove unneeded include of mach/hardware.h
imx: properly protect mach/mx{1,[25][157x]}.h from multiple inclusion
imx: define functions to configure chip selects in the WEIM
arch/arm/configs/mx1ads_defconfig | 742 --------------------
arch/arm/configs/mx27_defconfig | 2 +-
arch/arm/mach-mx1/Makefile | 4 +-
arch/arm/mach-mx1/{mx1ads.c => mach-mx1ads.c} | 2 +-
arch/arm/mach-mx1/{scb9328.c => mach-scb9328.c} | 2 +-
arch/arm/mach-mx2/Kconfig | 8 +-
arch/arm/mach-mx2/Makefile | 20 +-
arch/arm/mach-mx2/clock_imx21.c | 236 ++++++-
arch/arm/mach-mx2/clock_imx27.c | 33 +-
arch/arm/mach-mx2/cpu_imx27.c | 3 +-
arch/arm/mach-mx2/crm_regs.h | 258 -------
.../{eukrea_cpuimx27.c => mach-cpuimx27.c} | 12 +-
arch/arm/mach-mx2/{mx27lite.c => mach-imx27lite.c} | 4 +-
arch/arm/mach-mx2/{mx21ads.c => mach-mx21ads.c} | 10 +-
arch/arm/mach-mx2/{mx27pdk.c => mach-mx27_3ds.c} | 4 +-
arch/arm/mach-mx2/{mx27ads.c => mach-mx27ads.c} | 6 +-
arch/arm/mach-mx2/{mxt_td60.c => mach-mxt_td60.c} | 4 +-
arch/arm/mach-mx2/{pca100.c => mach-pca100.c} | 4 +-
arch/arm/mach-mx2/{pcm038.c => mach-pcm038.c} | 12 +-
arch/arm/mach-mx2/pcm970-baseboard.c | 4 +-
arch/arm/mach-mx3/Makefile | 30 +-
arch/arm/mach-mx3/{clock.c => clock-imx31.c} | 5 +-
arch/arm/mach-mx3/clock-imx35.c | 5 +-
arch/arm/mach-mx3/cpu.c | 2 +-
arch/arm/mach-mx3/crm_regs.h | 2 +-
arch/arm/mach-mx3/{iomux.c => iomux-imx31.c} | 2 +-
.../{armadillo5x0.c => mach-armadillo5x0.c} | 12 +-
.../mach-mx3/{kzmarm11.c => mach-kzm_arm11_01.c} | 31 +-
arch/arm/mach-mx3/{mx31pdk.c => mach-mx31_3ds.c} | 10 +-
arch/arm/mach-mx3/{mx31ads.c => mach-mx31ads.c} | 14 +-
.../arm/mach-mx3/{mx31lilly.c => mach-mx31lilly.c} | 8 +-
arch/arm/mach-mx3/{mx31lite.c => mach-mx31lite.c} | 14 +-
.../mach-mx3/{mx31moboard.c => mach-mx31moboard.c} | 4 +-
arch/arm/mach-mx3/{mx35pdk.c => mach-mx35pdk.c} | 4 +-
arch/arm/mach-mx3/{pcm037.c => mach-pcm037.c} | 16 +-
.../mach-mx3/{pcm037_eet.c => mach-pcm037_eet.c} | 0
arch/arm/mach-mx3/{pcm043.c => mach-pcm043.c} | 4 +-
arch/arm/mach-mx3/{qong.c => mach-qong.c} | 18 +-
arch/arm/plat-mxc/Makefile | 4 +
arch/arm/plat-mxc/ehci.c | 4 +-
arch/arm/plat-mxc/include/mach/board-kzmarm11.h | 18 +-
arch/arm/plat-mxc/include/mach/board-mx31ads.h | 2 +-
arch/arm/plat-mxc/include/mach/hardware.h | 5 +
arch/arm/plat-mxc/include/mach/mx1.h | 6 +-
arch/arm/plat-mxc/include/mach/mx21.h | 13 +-
arch/arm/plat-mxc/include/mach/mx25.h | 21 +-
arch/arm/plat-mxc/include/mach/mx27.h | 32 +-
arch/arm/plat-mxc/include/mach/mx2x.h | 8 +-
arch/arm/plat-mxc/include/mach/mx31.h | 33 +
arch/arm/plat-mxc/include/mach/mx35.h | 13 +
arch/arm/plat-mxc/include/mach/mx3x.h | 8 +-
arch/arm/plat-mxc/include/mach/mxc.h | 7 +-
arch/arm/plat-mxc/include/mach/uncompress.h | 3 -
53 files changed, 526 insertions(+), 1202 deletions(-)
delete mode 100644 arch/arm/configs/mx1ads_defconfig
rename arch/arm/mach-mx1/{mx1ads.c => mach-mx1ads.c} (98%)
rename arch/arm/mach-mx1/{scb9328.c => mach-scb9328.c} (98%)
delete mode 100644 arch/arm/mach-mx2/crm_regs.h
rename arch/arm/mach-mx2/{eukrea_cpuimx27.c => mach-cpuimx27.c} (94%)
rename arch/arm/mach-mx2/{mx27lite.c => mach-imx27lite.c} (96%)
rename arch/arm/mach-mx2/{mx21ads.c => mach-mx21ads.c} (96%)
rename arch/arm/mach-mx2/{mx27pdk.c => mach-mx27_3ds.c} (96%)
rename arch/arm/mach-mx2/{mx27ads.c => mach-mx27ads.c} (98%)
rename arch/arm/mach-mx2/{mxt_td60.c => mach-mxt_td60.c} (98%)
rename arch/arm/mach-mx2/{pca100.c => mach-pca100.c} (98%)
rename arch/arm/mach-mx2/{pcm038.c => mach-pcm038.c} (96%)
rename arch/arm/mach-mx3/{clock.c => clock-imx31.c} (99%)
rename arch/arm/mach-mx3/{iomux.c => iomux-imx31.c} (98%)
rename arch/arm/mach-mx3/{armadillo5x0.c => mach-armadillo5x0.c} (97%)
rename arch/arm/mach-mx3/{kzmarm11.c => mach-kzm_arm11_01.c} (89%)
rename arch/arm/mach-mx3/{mx31pdk.c => mach-mx31_3ds.c} (97%)
rename arch/arm/mach-mx3/{mx31ads.c => mach-mx31ads.c} (97%)
rename arch/arm/mach-mx3/{mx31lilly.c => mach-mx31lilly.c} (97%)
rename arch/arm/mach-mx3/{mx31lite.c => mach-mx31lite.c} (96%)
rename arch/arm/mach-mx3/{mx31moboard.c => mach-mx31moboard.c} (99%)
rename arch/arm/mach-mx3/{mx35pdk.c => mach-mx35pdk.c} (97%)
rename arch/arm/mach-mx3/{pcm037.c => mach-pcm037.c} (97%)
rename arch/arm/mach-mx3/{pcm037_eet.c => mach-pcm037_eet.c} (100%)
rename arch/arm/mach-mx3/{pcm043.c => mach-pcm043.c} (98%)
rename arch/arm/mach-mx3/{qong.c => mach-qong.c} (94%)
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
More information about the linux-arm-kernel
mailing list