convert stmp into mxs and delete the obsolete platform

I tried a smaller scaled cleanup before, but now that there are talks about ARM consolidation everywhere, I'll be more brave :)

What we have here is consolidation of two platforms. The older one, plat-stmp, has never seen much love after the initial commit and has poor design as stated in the patch descriptions. The recently added mach-mxs can be used for a (friendly) takeover. Adding 130 lines there could save 9500+ lines in arch/arm!

The drawback sofar is getting an ack from the old submitters of the code. I tried contacting Dmitry and a generic address at EmbeddedAlley and they were all bounced. However, while EmbeddedAlley was bought by Mentor, also Sigmatel was bought by Freescale. I guess Freescale does have more interest in the code than Mentor, so I'll try adding Shawn Guo to CC and hope for his ack.

Looking forward for comments. I'd really love seeing this go in, in one form or another. Yet, this is an RFC for now as I want to see if people like the idea.

Regards,

Wolfram

Wolfram Sang (4):
arm: mach-mxs: add stmp378x-devb
arm: mach-stmp37xx: remove mach
arm: mach-stmp378x: remove mach
arm: plat-stmp: remove plat

 arch/arm/Kconfig                                   |   12 -
 arch/arm/Makefile                                  |    3 -
 arch/arm/mach-mxs/Kconfig                          |   10 +
 arch/arm/mach-mxs/Makefile                         |    1 +
 arch/arm/mach-mxs/mach-stmp378x_devb.c             |  120 ++
 arch/arm/mach-stmp378x/Makefile                    |    2 -
 arch/arm/mach-stmp378x/Makefile.boot               |    3 -
 arch/arm/mach-stmp378x/include/mach/entry-macro.S  |   35 -
 arch/arm/mach-stmp378x/include/mach/irqs.h         |   95 --
 arch/arm/mach-stmp378x/include/mach/pins.h         |  151 ---
 arch/arm/mach-stmp378x/include/mach/regs-apbh.h    |  101 --
 arch/arm/mach-stmp378x/include/mach/regs-apbx.h    |  119 --
 arch/arm/mach-stmp378x/include/mach/regs-audioin.h |   63 --
 .../arm/mach-stmp378x/include/mach/regs-audioout.h |  104 --
 arch/arm/mach-stmp378x/include/mach/regs-bch.h     |   56 -
 arch/arm/mach-stmp378x/include/mach/regs-clkctrl.h |   88 --
 arch/arm/mach-stmp378x/include/mach/regs-dcp.h     |   87 --
 arch/arm/mach-stmp378x/include/mach/regs-digctl.h  |   38 -
 arch/arm/mach-stmp378x/include/mach/regs-dram.h    |   27 -
 arch/arm/mach-stmp378x/include/mach/regs-dri.h     |   45 -
 arch/arm/mach-stmp378x/include/mach/regs-ecc8.h    |   39 -
 arch/arm/mach-stmp378x/include/mach/regs-emi.h     |   25 -
 arch/arm/mach-stmp378x/include/mach/regs-gpmi.h    |   78 --
 arch/arm/mach-stmp378x/include/mach/regs-i2c.h     |   55 -
 arch/arm/mach-stmp378x/include/mach/regs-icoll.h   |   45 -
 arch/arm/mach-stmp378x/include/mach/regs-ir.h      |   23 -
 arch/arm/mach-stmp378x/include/mach/regs-lcdif.h   |  195 ----
 arch/arm/mach-stmp378x/include/mach/regs-lradc.h   |   99 --
 arch/arm/mach-stmp378x/include/mach/regs-ocotp.h   |   40 -
 arch/arm/mach-stmp378x/include/mach/regs-pinctrl.h |   90 --
 arch/arm/mach-stmp378x/include/mach/regs-power.h   |   63 --
 arch/arm/mach-stmp378x/include/mach/regs-pwm.h     |   53 -
 arch/arm/mach-stmp378x/include/mach/regs-pxp.h     |  140 ---
 arch/arm/mach-stmp378x/include/mach/regs-rtc.h     |   59 -
 arch/arm/mach-stmp378x/include/mach/regs-saif.h    |   21 -
 arch/arm/mach-stmp378x/include/mach/regs-spdif.h   |   49 -
 arch/arm/mach-stmp378x/include/mach/regs-ssp.h     |  102 --
 arch/arm/mach-stmp378x/include/mach/regs-sydma.h   |   23 -
 arch/arm/mach-stmp378x/include/mach/regs-timrot.h  |   68 --
 arch/arm/mach-stmp378x/include/mach/regs-tvenc.h   |   67 --
 arch/arm/mach-stmp378x/include/mach/regs-uartapp.h |   87 --
 arch/arm/mach-stmp378x/include/mach/regs-uartdbg.h |  268 -----
 arch/arm/mach-stmp378x/include/mach/regs-usbctrl.h |   40 -
 arch/arm/mach-stmp378x/include/mach/regs-usbphy.h  |   37 -
 arch/arm/mach-stmp378x/stmp378x.c                  |  299 -----
 arch/arm/mach-stmp378x/stmp378x.h                  |   25 -
 arch/arm/mach-stmp378x/stmp378x_devb.c             |  332 ------
 arch/arm/mach-stmp37xx/Makefile                    |    2 -
 arch/arm/mach-stmp37xx/Makefile.boot               |    3 -
 arch/arm/mach-stmp37xx/include/mach/entry-macro.S  |   37 -
 arch/arm/mach-stmp37xx/include/mach/irqs.h         |   99 --
 arch/arm/mach-stmp37xx/include/mach/pins.h         |  147 ---
 arch/arm/mach-stmp37xx/include/mach/regs-apbh.h    |   97 --
 arch/arm/mach-stmp37xx/include/mach/regs-apbx.h    |  113 --
 arch/arm/mach-stmp37xx/include/mach/regs-audioin.h |   61 --
 .../arm/mach-stmp37xx/include/mach/regs-audioout.h |  111 --
 arch/arm/mach-stmp37xx/include/mach/regs-clkctrl.h |   72 --
 arch/arm/mach-stmp37xx/include/mach/regs-digctl.h  |   24 -
 arch/arm/mach-stmp37xx/include/mach/regs-ecc8.h    |   37 -
 arch/arm/mach-stmp37xx/include/mach/regs-gpmi.h    |   63 --
 arch/arm/mach-stmp37xx/include/mach/regs-i2c.h     |   55 -
 arch/arm/mach-stmp37xx/include/mach/regs-icoll.h   |   43 -
 arch/arm/mach-stmp37xx/include/mach/regs-lcdif.h   |   89 --
 arch/arm/mach-stmp37xx/include/mach/regs-lradc.h   |   97 --
 arch/arm/mach-stmp37xx/include/mach/regs-pinctrl.h |   88 --
 arch/arm/mach-stmp37xx/include/mach/regs-power.h   |   56 -
 arch/arm/mach-stmp37xx/include/mach/regs-pwm.h     |   51 -
 arch/arm/mach-stmp37xx/include/mach/regs-rtc.h     |   57 -
 arch/arm/mach-stmp37xx/include/mach/regs-ssp.h     |  101 --
 arch/arm/mach-stmp37xx/include/mach/regs-timrot.h  |   49 -
 arch/arm/mach-stmp37xx/include/mach/regs-uartapp.h |   85 --
 arch/arm/mach-stmp37xx/include/mach/regs-uartdbg.h |  268 -----
 arch/arm/mach-stmp37xx/include/mach/regs-usbctl.h  |   22 -
 arch/arm/mach-stmp37xx/include/mach/regs-usbctrl.h |   22 -
 arch/arm/mach-stmp37xx/include/mach/regs-usbphy.h  |   37 -
 arch/arm/mach-stmp37xx/stmp37xx.c                  |  219 ----
 arch/arm/mach-stmp37xx/stmp37xx.h                  |   24 -
 arch/arm/mach-stmp37xx/stmp37xx_devb.c             |   99 --
 arch/arm/plat-stmp3xxx/Kconfig                     |   37 -
 arch/arm/plat-stmp3xxx/Makefile                    |    5 -
 arch/arm/plat-stmp3xxx/clock.c                     | 1134 --------------------
 arch/arm/plat-stmp3xxx/clock.h                     |   61 --
 arch/arm/plat-stmp3xxx/core.c                      |  128 ---
 arch/arm/plat-stmp3xxx/devices.c                   |  389 -------
 arch/arm/plat-stmp3xxx/dma.c                       |  464 --------
 arch/arm/plat-stmp3xxx/include/mach/clkdev.h       |   18 -
 arch/arm/plat-stmp3xxx/include/mach/cputype.h      |   33 -
 arch/arm/plat-stmp3xxx/include/mach/debug-macro.S  |   39 -
 arch/arm/plat-stmp3xxx/include/mach/dma.h          |  153 ---
 arch/arm/plat-stmp3xxx/include/mach/gpio.h         |   28 -
 arch/arm/plat-stmp3xxx/include/mach/gpmi.h         |   12 -
 arch/arm/plat-stmp3xxx/include/mach/hardware.h     |   32 -
 arch/arm/plat-stmp3xxx/include/mach/io.h           |   25 -
 arch/arm/plat-stmp3xxx/include/mach/memory.h       |   22 -
 arch/arm/plat-stmp3xxx/include/mach/mmc.h          |   14 -
 arch/arm/plat-stmp3xxx/include/mach/pinmux.h       |  157 ---
 arch/arm/plat-stmp3xxx/include/mach/pins.h         |   30 -
 arch/arm/plat-stmp3xxx/include/mach/platform.h     |   68 --
 arch/arm/plat-stmp3xxx/include/mach/stmp3xxx.h     |   54 -
 arch/arm/plat-stmp3xxx/include/mach/system.h       |   49 -
 arch/arm/plat-stmp3xxx/include/mach/timex.h        |   20 -
 arch/arm/plat-stmp3xxx/include/mach/uncompress.h   |   53 -
 arch/arm/plat-stmp3xxx/include/mach/vmalloc.h      |   12 -
 arch/arm/plat-stmp3xxx/irq.c                       |   50 -
 arch/arm/plat-stmp3xxx/pinmux.c                    |  550 ----------
 arch/arm/plat-stmp3xxx/timer.c                     |  186 ----
 106 files changed, 131 insertions(+), 9602 deletions(-)
 create mode 100644 arch/arm/mach-mxs/mach-stmp378x_devb.c
 delete mode 100644 arch/arm/mach-stmp378x/Makefile
 delete mode 100644 arch/arm/mach-stmp378x/Makefile.boot
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/entry-macro.S
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/irqs.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/pins.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-apbh.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-apbx.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-audioin.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-audioout.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-bch.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-clkctrl.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-dcp.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-digctl.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-dram.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-dri.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-ecc8.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-emi.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-gpmi.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-i2c.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-icoll.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-ir.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-lcdif.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-lradc.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-ocotp.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-pinctrl.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-power.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-pwm.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-pxp.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-rtc.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-saif.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-spdif.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-ssp.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-sydma.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-timrot.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-tvenc.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-uartapp.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-uartdbg.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-usbctrl.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-usbphy.h
 delete mode 100644 arch/arm/mach-stmp378x/stmp378x.c
 delete mode 100644 arch/arm/mach-stmp378x/stmp378x.h
 delete mode 100644 arch/arm/mach-stmp378x/stmp378x_devb.c
 delete mode 100644 arch/arm/mach-stmp37xx/Makefile
 delete mode 100644 arch/arm/mach-stmp37xx/Makefile.boot
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/entry-macro.S
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/irqs.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/pins.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-apbh.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-apbx.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-audioin.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-audioout.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-clkctrl.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-digctl.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-ecc8.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-gpmi.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-i2c.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-icoll.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-lcdif.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-lradc.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-pinctrl.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-power.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-pwm.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-rtc.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-ssp.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-timrot.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-uartapp.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-uartdbg.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-usbctl.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-usbctrl.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-usbphy.h
 delete mode 100644 arch/arm/mach-stmp37xx/stmp37xx.c
 delete mode 100644 arch/arm/mach-stmp37xx/stmp37xx.h
 delete mode 100644 arch/arm/mach-stmp37xx/stmp37xx_devb.c
 delete mode 100644 arch/arm/plat-stmp3xxx/Kconfig
 delete mode 100644 arch/arm/plat-stmp3xxx/Makefile
 delete mode 100644 arch/arm/plat-stmp3xxx/clock.c
 delete mode 100644 arch/arm/plat-stmp3xxx/clock.h
 delete mode 100644 arch/arm/plat-stmp3xxx/core.c
 delete mode 100644 arch/arm/plat-stmp3xxx/devices.c
 delete mode 100644 arch/arm/plat-stmp3xxx/dma.c
 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/clkdev.h
 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/cputype.h
 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/debug-macro.S
 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/dma.h
 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/gpio.h
 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/gpmi.h
 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/hardware.h
 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/io.h
 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/memory.h
 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/mmc.h
 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/pinmux.h
 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/pins.h
 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/platform.h
 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/stmp3xxx.h
 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/system.h
 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/timex.h
 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/uncompress.h
 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/vmalloc.h
 delete mode 100644 arch/arm/plat-stmp3xxx/irq.c
 delete mode 100644 arch/arm/plat-stmp3xxx/pinmux.c
 delete mode 100644 arch/arm/plat-stmp3xxx/timer.c

1.7.2.5

STMP378x and MX23 are the same. There is a mach-stmp378x, however, it has a lot of reinvented interfaces, leaking all sorts of mach-specific functions into the drivers. One example is the dmaengine which does not use the linux dmaengine-API but some privately exported symbols. This makes generic use of the drivers impossible. mach-mxs does it better, so convert the board to mach-mxs. After that, it is possible to delete all stmp-specific code which should ease further ARM-consolidation.

Compile tested only due to no hardware (seems not available anymore).

---

As a bonus, the UARTs and MMC will work now, which they haven't before.

Note that I kept the SPI boardinfo for completeness, although it could not have worked in the original setup. Due to a copy/paste-bug, the pins for SSP2 are the same as for SSP1.

The yet missing drivers for RTC & watchdog are also scheduled for 2.6.40.

 arch/arm/mach-mxs/Kconfig              |   10 +++
 arch/arm/mach-mxs/Makefile             |    1 +
 arch/arm/mach-mxs/mach-stmp378x_devb.c |  120 ++++++++++++++++++++++++++++++++
 3 files changed, 131 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/mach-mxs/mach-stmp378x_devb.c

index 4522fbb..edacefa 100644
@@ -17,6 +17,16 @@ config SOC_IMX28
 
 comment "MXS platforms:"
 
+config MACH_STMP378X_DEVB
+	bool "Support STMP378x_devb Platform"
+	select SOC_IMX23
+	select MXS_HAVE_AMBA_DUART
+	select MXS_HAVE_PLATFORM_AUART
+	select MXS_HAVE_PLATFORM_MXS_MMC
+	help
+	  Include support for STMP378x-devb platform. This includes specific
+	  configurations for the board and its peripherals.
+
 config MACH_MX23EVK
 	bool "Support MX23EVK Platform"
 	select SOC_IMX23

index 2f1f614..58e8923 100644
@@ -7,6 +7,7 @@ obj-$(CONFIG_PM) += pm.o
 obj-$(CONFIG_SOC_IMX23) += clock-mx23.o mm-mx23.o
 obj-$(CONFIG_SOC_IMX28) += clock-mx28.o mm-mx28.o
 
+obj-$(CONFIG_MACH_STMP378X_DEVB) += mach-stmp378x_devb.o
 obj-$(CONFIG_MACH_MX23EVK) += mach-mx23evk.o
 obj-$(CONFIG_MACH_MX28EVK) += mach-mx28evk.o
 obj-$(CONFIG_MODULE_TX28) += module-tx28.o

1.7.2.5

This mach has not seen any updates since the initial inclusion besides generic cleanup. Furthermore:

- It has a lot of reinvented interfaces, leaking all sorts of mach-related includes into the drivers. One example is the dmaengine which does not use the linux dmaengine-API but some privately exported symbols. So, drivers cannot be reused. mach-mxs is very similar and does it better.

- It can be doubted that this worked at all. Check the DMA routines in stmp37xx.c for copy/paste bugs. A lot of APBX-related stuff is actually writing into registers for APBH.

- There is only one board defined (which I couldn't find any trace of despite being a development board). In this board, only two devices have resources, the debug uart and the application uart. Neither of those have the needed custom drivers merged (and never will). debug uart is an amba-pl011 which should be used by the in-kernel driver without the mach-specific-stuff. appuart has a driver which was introduced for mach-mxs, and this one is reusable for a properly done mach.

So, this single board registers only unsupported devices and the generic code looks suspicious and has poor design. Delete this stuff. If there is interest, it is wiser to restart using mach-mxs.

---
 arch/arm/Makefile                                  |    1 -
 arch/arm/mach-stmp37xx/Makefile                    |    2 -
 arch/arm/mach-stmp37xx/Makefile.boot               |    3 -
 arch/arm/mach-stmp37xx/include/mach/entry-macro.S  |   37 ---
 arch/arm/mach-stmp37xx/include/mach/irqs.h         |   99 -------
 arch/arm/mach-stmp37xx/include/mach/pins.h         |  147 -----------
 arch/arm/mach-stmp37xx/include/mach/regs-apbh.h    |   97 -------
 arch/arm/mach-stmp37xx/include/mach/regs-apbx.h    |  113 --------
 arch/arm/mach-stmp37xx/include/mach/regs-audioin.h |   61 -----
 .../arm/mach-stmp37xx/include/mach/regs-audioout.h |  111 --------
 arch/arm/mach-stmp37xx/include/mach/regs-clkctrl.h |   72 ------
 arch/arm/mach-stmp37xx/include/mach/regs-digctl.h  |   24 --
 arch/arm/mach-stmp37xx/include/mach/regs-ecc8.h    |   37 ---
 arch/arm/mach-stmp37xx/include/mach/regs-gpmi.h    |   63 -----
 arch/arm/mach-stmp37xx/include/mach/regs-i2c.h     |   55 ----
 arch/arm/mach-stmp37xx/include/mach/regs-icoll.h   |   43 ---
 arch/arm/mach-stmp37xx/include/mach/regs-lcdif.h   |   89 -------
 arch/arm/mach-stmp37xx/include/mach/regs-lradc.h   |   97 -------
 arch/arm/mach-stmp37xx/include/mach/regs-pinctrl.h |   88 -------
 arch/arm/mach-stmp37xx/include/mach/regs-power.h   |   56 ----
 arch/arm/mach-stmp37xx/include/mach/regs-pwm.h     |   51 ----
 arch/arm/mach-stmp37xx/include/mach/regs-rtc.h     |   57 ----
 arch/arm/mach-stmp37xx/include/mach/regs-ssp.h     |  101 --------
 arch/arm/mach-stmp37xx/include/mach/regs-timrot.h  |   49 ----
 arch/arm/mach-stmp37xx/include/mach/regs-uartapp.h |   85 ------
 arch/arm/mach-stmp37xx/include/mach/regs-uartdbg.h |  268 --------------------
 arch/arm/mach-stmp37xx/include/mach/regs-usbctl.h  |   22 --
 arch/arm/mach-stmp37xx/include/mach/regs-usbctrl.h |   22 --
 arch/arm/mach-stmp37xx/include/mach/regs-usbphy.h  |   37 ---
 arch/arm/mach-stmp37xx/stmp37xx.c                  |  219 ----------------
 arch/arm/mach-stmp37xx/stmp37xx.h                  |   24 --
 arch/arm/mach-stmp37xx/stmp37xx_devb.c             |   99 -------
 arch/arm/plat-stmp3xxx/Kconfig                     |   10 -
 33 files changed, 0 insertions(+), 2339 deletions(-)
 delete mode 100644 arch/arm/mach-stmp37xx/Makefile
 delete mode 100644 arch/arm/mach-stmp37xx/Makefile.boot
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/entry-macro.S
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/irqs.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/pins.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-apbh.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-apbx.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-audioin.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-audioout.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-clkctrl.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-digctl.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-ecc8.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-gpmi.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-i2c.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-icoll.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-lcdif.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-lradc.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-pinctrl.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-power.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-pwm.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-rtc.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-ssp.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-timrot.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-uartapp.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-uartdbg.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-usbctl.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-usbctrl.h
 delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-usbphy.h
 delete mode 100644 arch/arm/mach-stmp37xx/stmp37xx.c
 delete mode 100644 arch/arm/mach-stmp37xx/stmp37xx.h
 delete mode 100644 arch/arm/mach-stmp37xx/stmp37xx_devb.c

index c7d321a..23ecbda 100644
@@ -186,7 +186,6 @@ machine-$(CONFIG_ARCH_SA1100)		:= sa1100
 machine-$(CONFIG_ARCH_SHARK)		:= shark
 machine-$(CONFIG_ARCH_SHMOBILE) 	:= shmobile
 machine-$(CONFIG_ARCH_STMP378X)		:= stmp378x
-machine-$(CONFIG_ARCH_STMP37XX)		:= stmp37xx
 machine-$(CONFIG_ARCH_TCC8K)		:= tcc8k
 machine-$(CONFIG_ARCH_TEGRA)		:= tegra
 machine-$(CONFIG_ARCH_U300)		:= u300

deleted file mode 100644
index 57deffd..0000000
@@ -1,2 +0,0 @@
-obj-$(CONFIG_ARCH_STMP37XX) += stmp37xx.o
-obj-$(CONFIG_MACH_STMP37XX) += stmp37xx_devb.o

deleted file mode 100644
index 1568ad4..0000000
@@ -1,3 +0,0 @@
-   zreladdr-y	:= 0x40008000
-params_phys-y	:= 0x40000100
-initrd_phys-y	:= 0x40800000

deleted file mode 100644
index fed2787..0000000
@@ -1,37 +0,0 @@
-/*
- * Low-level IRQ helper macros for Freescale STMP37XX
- *
- * Embedded Alley Solutions, Inc <[email protected]>
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-		.macro	disable_fiq
-		.endm
-
-		.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp
-
-	        mov	\base, #0xf0000000	@ vm address of IRQ controller
-		ldr	\irqnr, [\base, #0x30]	@ HW_ICOLL_STAT
-		cmp	\irqnr, #0x3f
-		movne	\irqstat, #0		@ Ack this IRQ
-		strne	\irqstat, [\base, #0x00]@ HW_ICOLL_VECTOR
-		moveqs	\irqnr, #0		@ Zero flag set for no IRQ
-
-		.endm
-
-                .macro  get_irqnr_preamble, base, tmp
-                .endm
-
-                .macro  arch_ret_to_user, tmp1, tmp2
-                .endm

deleted file mode 100644
index ba1bbe2..0000000
@@ -1,24 +0,0 @@
-/*
- * stmp37xx: DIGCTL register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- */
-#define REGS_DIGCTL_BASE	(STMP3XXX_REGS_BASE + 0x1C000)
-
-#define HW_DIGCTL_CTRL		0x0
-#define BM_DIGCTL_CTRL_USB_CLKGATE	0x00000004

deleted file mode 100644
index 3b6d990..0000000
@@ -1,37 +0,0 @@
-/*
- * stmp37xx: ECC8 register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- */
-#define REGS_ECC8_BASE	(STMP3XXX_REGS_BASE + 0x8000)
-
-#define HW_ECC8_CTRL		0x0
-#define BM_ECC8_CTRL_COMPLETE_IRQ	0x00000001
-#define BP_ECC8_CTRL_COMPLETE_IRQ	0
-#define BM_ECC8_CTRL_COMPLETE_IRQ_EN	0x00000100
-#define BM_ECC8_CTRL_AHBM_SFTRST	0x20000000
-
-#define HW_ECC8_STATUS0		0x10
-#define BM_ECC8_STATUS0_UNCORRECTABLE	0x00000004
-#define BM_ECC8_STATUS0_CORRECTED	0x00000008
-#define BM_ECC8_STATUS0_STATUS_AUX	0x00000F00
-#define BP_ECC8_STATUS0_STATUS_AUX	8
-#define BM_ECC8_STATUS0_COMPLETED_CE	0x000F0000
-#define BP_ECC8_STATUS0_COMPLETED_CE	16
-
-#define HW_ECC8_STATUS1		0x20

deleted file mode 100644
index 9145e22..0000000
@@ -1,22 +0,0 @@
-/*
- * stmp37xx: USBCTL register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- */
-#define REGS_USBCTL_BASE	(STMP3XXX_REGS_BASE + 0x80000)
-#define REGS_USBCTL_PHYS	0x80000

deleted file mode 100644
index 1a2ae9c..0000000
@@ -1,22 +0,0 @@
-/*
- * stmp37xx: USBCTRL register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- */
-#define REGS_USBCTRL_BASE	(STMP3XXX_REGS_BASE + 0x80000)
-#define REGS_USBCTRL_PHYS	0x80080000

deleted file mode 100644
index b7fce0f..0000000
@@ -1,37 +0,0 @@
-/*
- * stmp37xx: USBPHY register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- */
-#define REGS_USBPHY_BASE	(STMP3XXX_REGS_BASE + 0x7C000)
-
-#define HW_USBPHY_PWD		0x0
-
-#define HW_USBPHY_CTRL		0x30
-#define BM_USBPHY_CTRL_ENHSPRECHARGEXMIT	0x00000001
-#define BP_USBPHY_CTRL_ENHSPRECHARGEXMIT	0
-#define BM_USBPHY_CTRL_ENHOSTDISCONDETECT	0x00000002
-#define BM_USBPHY_CTRL_ENDEVPLUGINDETECT	0x00000010
-#define BM_USBPHY_CTRL_ENOTGIDDETECT	0x00000080
-#define BM_USBPHY_CTRL_ENIRQDEVPLUGIN	0x00000800
-#define BM_USBPHY_CTRL_CLKGATE	0x40000000
-#define BM_USBPHY_CTRL_SFTRST	0x80000000
-
-#define HW_USBPHY_STATUS	0x40
-#define BM_USBPHY_STATUS_DEVPLUGIN_STATUS	0x00000040
-#define BM_USBPHY_STATUS_OTGID_STATUS	0x00000100

deleted file mode 100644
index 0b75fb7..0000000
@@ -1,24 +0,0 @@
-/*
- * Freescale STMP37XX/STMP378X internal functions and data declarations
- *
- * Embedded Alley Solutions, Inc <[email protected]>
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#ifndef __MACH_STMP37XX_H
-#define __MACH_STMP37XX_H
-
-void stmp37xx_map_io(void);
-void stmp37xx_init_irq(void);
-
-#endif /* __MACH_STMP37XX_H */

index 2cf37c3..dcdbe32 100644
@@ -5,12 +5,6 @@ menu "Freescale STMP3xxx implementations"
 choice
 	prompt "Select STMP3xxx chip family"
 
-config ARCH_STMP37XX
-	bool "Freescale SMTP37xx"
-	select CPU_ARM926T
-	---help---
-	 STMP37xx refers to 3700 through 3769 chips
-
 config ARCH_STMP378X
 	bool "Freescale STMP378x"
 	select CPU_ARM926T

@@ -22,10 +16,6 @@ endchoice
 choice
 	prompt "Select STMP3xxx board type"
 
-config MACH_STMP37XX
-	depends on ARCH_STMP37XX
-	bool "Freescale STMP37xx development board"
-
 config MACH_STMP378X
 	depends on ARCH_STMP378X
 	bool "Freescale STMP378x development board"

1.7.2.5

This mach has not seen any updates since the initial inclusion besides generic cleanup. Furthermore:

- The i.MX23 covered in mach-mxs is just a renamed version of the STMP378x.

- mach-stmp378x has a lot of reinvented interfaces, leaking all sorts of mach-related includes into the drivers. One example is the dmaengine which does not use the linux dmaengine-API but some privately exported symbols. So drivers cannot be reused. mach-mxs does it better.

- There is only one board defined (which I couldn't find any trace of despite being a development board). It has been converted to mach-mxs in a previous patch.

Since the only user of this mach was converted, it means that mach-stmp378x can go.

---
 arch/arm/Makefile                                  |    1 -
 arch/arm/mach-stmp378x/Makefile                    |    2 -
 arch/arm/mach-stmp378x/Makefile.boot               |    3 -
 arch/arm/mach-stmp378x/include/mach/entry-macro.S  |   35 --
 arch/arm/mach-stmp378x/include/mach/irqs.h         |   95 ------
 arch/arm/mach-stmp378x/include/mach/pins.h         |  151 ---------
 arch/arm/mach-stmp378x/include/mach/regs-apbh.h    |  101 ------
 arch/arm/mach-stmp378x/include/mach/regs-apbx.h    |  119 -------
 arch/arm/mach-stmp378x/include/mach/regs-audioin.h |   63 ----
 .../arm/mach-stmp378x/include/mach/regs-audioout.h |  104 ------
 arch/arm/mach-stmp378x/include/mach/regs-bch.h     |   56 ----
 arch/arm/mach-stmp378x/include/mach/regs-clkctrl.h |   88 -----
 arch/arm/mach-stmp378x/include/mach/regs-dcp.h     |   87 -----
 arch/arm/mach-stmp378x/include/mach/regs-digctl.h  |   38 ---
 arch/arm/mach-stmp378x/include/mach/regs-dram.h    |   27 --
 arch/arm/mach-stmp378x/include/mach/regs-dri.h     |   45 ---
 arch/arm/mach-stmp378x/include/mach/regs-ecc8.h    |   39 ---
 arch/arm/mach-stmp378x/include/mach/regs-emi.h     |   25 --
 arch/arm/mach-stmp378x/include/mach/regs-gpmi.h    |   78 -----
 arch/arm/mach-stmp378x/include/mach/regs-i2c.h     |   55 ----
 arch/arm/mach-stmp378x/include/mach/regs-icoll.h   |   45 ---
 arch/arm/mach-stmp378x/include/mach/regs-ir.h      |   23 --
 arch/arm/mach-stmp378x/include/mach/regs-lcdif.h   |  195 ------------
 arch/arm/mach-stmp378x/include/mach/regs-lradc.h   |   99 ------
 arch/arm/mach-stmp378x/include/mach/regs-ocotp.h   |   40 ---
 arch/arm/mach-stmp378x/include/mach/regs-pinctrl.h |   90 ------
 arch/arm/mach-stmp378x/include/mach/regs-power.h   |   63 ----
 arch/arm/mach-stmp378x/include/mach/regs-pwm.h     |   53 ---
 arch/arm/mach-stmp378x/include/mach/regs-pxp.h     |  140 --------
 arch/arm/mach-stmp378x/include/mach/regs-rtc.h     |   59 ----
 arch/arm/mach-stmp378x/include/mach/regs-saif.h    |   21 --
 arch/arm/mach-stmp378x/include/mach/regs-spdif.h   |   49 ---
 arch/arm/mach-stmp378x/include/mach/regs-ssp.h     |  102 ------
 arch/arm/mach-stmp378x/include/mach/regs-sydma.h   |   23 --
 arch/arm/mach-stmp378x/include/mach/regs-timrot.h  |   68 ----
 arch/arm/mach-stmp378x/include/mach/regs-tvenc.h   |   67 ----
 arch/arm/mach-stmp378x/include/mach/regs-uartapp.h |   87 -----
 arch/arm/mach-stmp378x/include/mach/regs-uartdbg.h |  268 ----------------
 arch/arm/mach-stmp378x/include/mach/regs-usbctrl.h |   40 ---
 arch/arm/mach-stmp378x/include/mach/regs-usbphy.h  |   37 ---
 arch/arm/mach-stmp378x/stmp378x.c                  |  299 ------------------
 arch/arm/mach-stmp378x/stmp378x.h                  |   25 --
 arch/arm/mach-stmp378x/stmp378x_devb.c             |  332 --------------------
 arch/arm/plat-stmp3xxx/Kconfig                     |   20 --
 44 files changed, 0 insertions(+), 3457 deletions(-)
 delete mode 100644 arch/arm/mach-stmp378x/Makefile
 delete mode 100644 arch/arm/mach-stmp378x/Makefile.boot
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/entry-macro.S
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/irqs.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/pins.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-apbh.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-apbx.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-audioin.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-audioout.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-bch.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-clkctrl.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-dcp.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-digctl.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-dram.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-dri.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-ecc8.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-emi.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-gpmi.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-i2c.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-icoll.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-ir.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-lcdif.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-lradc.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-ocotp.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-pinctrl.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-power.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-pwm.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-pxp.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-rtc.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-saif.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-spdif.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-ssp.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-sydma.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-timrot.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-tvenc.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-uartapp.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-uartdbg.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-usbctrl.h
 delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-usbphy.h
 delete mode 100644 arch/arm/mach-stmp378x/stmp378x.c
 delete mode 100644 arch/arm/mach-stmp378x/stmp378x.h
 delete mode 100644 arch/arm/mach-stmp378x/stmp378x_devb.c

index 23ecbda..ca473b1 100644
@@ -185,7 +185,6 @@ machine-$(CONFIG_ARCH_EXYNOS4)		:= exynos4
 machine-$(CONFIG_ARCH_SA1100)		:= sa1100
 machine-$(CONFIG_ARCH_SHARK)		:= shark
 machine-$(CONFIG_ARCH_SHMOBILE) 	:= shmobile
-machine-$(CONFIG_ARCH_STMP378X)		:= stmp378x
 machine-$(CONFIG_ARCH_TCC8K)		:= tcc8k
 machine-$(CONFIG_ARCH_TEGRA)		:= tegra
 machine-$(CONFIG_ARCH_U300)		:= u300

deleted file mode 100644
index d156f76..0000000
@@ -1,2 +0,0 @@
-obj-$(CONFIG_ARCH_STMP378X) += stmp378x.o
-obj-$(CONFIG_MACH_STMP378X) += stmp378x_devb.o

deleted file mode 100644
index 1568ad4..0000000
@@ -1,3 +0,0 @@
-   zreladdr-y	:= 0x40008000
-params_phys-y	:= 0x40000100
-initrd_phys-y	:= 0x40800000

deleted file mode 100644
index 731a922..0000000
@@ -1,35 +0,0 @@
-/*
- * Low-level IRQ helper macros for Freescale STMP378X
- *
- * Embedded Alley Solutions, Inc <[email protected]>
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-		.macro	disable_fiq
-		.endm
-
-		.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp
-
-	        mov	\base, #0xf0000000	@ vm address of IRQ controller
-		ldr	\irqnr, [\base, #0x70]	@ HW_ICOLL_STAT
-		cmp	\irqnr, #0x7f
-		moveqs	\irqnr, #0		@ Zero flag set for no IRQ
-
-		.endm
-
-                .macro  get_irqnr_preamble, base, tmp
-                .endm
-
-                .macro  arch_ret_to_user, tmp1, tmp2
-                .endm

deleted file mode 100644
index 5293005..0000000
@@ -1,38 +0,0 @@
-/*
- * stmp378x: DIGCTL register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- */
-#define REGS_DIGCTL_BASE	(STMP3XXX_REGS_BASE + 0x1C000)
-#define REGS_DIGCTL_PHYS	0x8001C000
-#define REGS_DIGCTL_SIZE	0x2000
-
-#define HW_DIGCTL_CTRL		0x0
-#define BM_DIGCTL_CTRL_USB_CLKGATE	0x00000004
-
-#define HW_DIGCTL_ARMCACHE	0x2B0
-#define BM_DIGCTL_ARMCACHE_ITAG_SS	0x00000003
-#define BP_DIGCTL_ARMCACHE_ITAG_SS	0
-#define BM_DIGCTL_ARMCACHE_DTAG_SS	0x00000030
-#define BP_DIGCTL_ARMCACHE_DTAG_SS	4
-#define BM_DIGCTL_ARMCACHE_CACHE_SS	0x00000300
-#define BP_DIGCTL_ARMCACHE_CACHE_SS	8
-#define BM_DIGCTL_ARMCACHE_DRTY_SS	0x00003000
-#define BP_DIGCTL_ARMCACHE_DRTY_SS	12
-#define BM_DIGCTL_ARMCACHE_VALID_SS	0x00030000
-#define BP_DIGCTL_ARMCACHE_VALID_SS	16

deleted file mode 100644
index 0285143..0000000
@@ -1,27 +0,0 @@
-/*
- * stmp378x: DRAM register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- */
-#define REGS_DRAM_BASE	(STMP3XXX_REGS_BASE + 0xE0000)
-#define REGS_DRAM_PHYS	0x800E0000
-#define REGS_DRAM_SIZE	0x2000
-
-#define HW_DRAM_CTL06		0x18
-
-#define HW_DRAM_CTL08		0x20

deleted file mode 100644
index cc353be..0000000
@@ -1,39 +0,0 @@
-/*
- * stmp378x: ECC8 register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- */
-#define REGS_ECC8_BASE	(STMP3XXX_REGS_BASE + 0x8000)
-#define REGS_ECC8_PHYS	0x80008000
-#define REGS_ECC8_SIZE	0x2000
-
-#define HW_ECC8_CTRL		0x0
-#define BM_ECC8_CTRL_COMPLETE_IRQ	0x00000001
-#define BP_ECC8_CTRL_COMPLETE_IRQ	0
-#define BM_ECC8_CTRL_COMPLETE_IRQ_EN	0x00000100
-#define BM_ECC8_CTRL_AHBM_SFTRST	0x20000000
-
-#define HW_ECC8_STATUS0		0x10
-#define BM_ECC8_STATUS0_UNCORRECTABLE	0x00000004
-#define BM_ECC8_STATUS0_CORRECTED	0x00000008
-#define BM_ECC8_STATUS0_STATUS_AUX	0x00000F00
-#define BP_ECC8_STATUS0_STATUS_AUX	8
-#define BM_ECC8_STATUS0_COMPLETED_CE	0x000F0000
-#define BP_ECC8_STATUS0_COMPLETED_CE	16
-
-#define HW_ECC8_STATUS1		0x20

deleted file mode 100644
index 98773fc..0000000
@@ -1,25 +0,0 @@
-/*
- * stmp378x: EMI register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- */
-#define REGS_EMI_BASE	(STMP3XXX_REGS_BASE + 0x20000)
-#define REGS_EMI_PHYS	0x80020000
-#define REGS_EMI_SIZE	0x2000
-
-#define HW_EMI_STAT		0x10

deleted file mode 100644
index a5b4ef1..0000000
@@ -1,23 +0,0 @@
-/*
- * stmp378x: IR register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- */
-#define REGS_IR_BASE	(STMP3XXX_REGS_BASE + 0x78000)
-#define REGS_IR_PHYS	0x80078000
-#define REGS_IR_SIZE	0x2000

deleted file mode 100644
index f0af64d..0000000
@@ -1,40 +0,0 @@
-/*
- * stmp378x: OCOTP register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- */
-#define REGS_OCOTP_BASE	(STMP3XXX_REGS_BASE + 0x2C000)
-#define REGS_OCOTP_PHYS	0x8002C000
-#define REGS_OCOTP_SIZE	0x2000
-
-#define HW_OCOTP_CTRL		0x0
-#define BM_OCOTP_CTRL_BUSY	0x00000100
-#define BM_OCOTP_CTRL_ERROR	0x00000200
-#define BM_OCOTP_CTRL_RD_BANK_OPEN	0x00001000
-#define BM_OCOTP_CTRL_RELOAD_SHADOWS	0x00002000
-#define BM_OCOTP_CTRL_WR_UNLOCK	0xFFFF0000
-#define BP_OCOTP_CTRL_WR_UNLOCK	16
-
-#define HW_OCOTP_DATA		0x10
-
-#define HW_OCOTP_CUST0		(0x20 + 0 * 0x10)
-#define HW_OCOTP_CUST1		(0x20 + 1 * 0x10)
-#define HW_OCOTP_CUST2		(0x20 + 2 * 0x10)
-#define HW_OCOTP_CUST3		(0x20 + 3 * 0x10)
-
-#define HW_OCOTP_CUSTn		0x20

deleted file mode 100644
index 6df4176..0000000
@@ -1,21 +0,0 @@
-/*
- * stmp378x: SAIF register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- */
-#define REGS_SAIF_SIZE	0x2000

deleted file mode 100644
index 08343a8..0000000
@@ -1,23 +0,0 @@
-/*
- * stmp378x: SYDMA register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- */
-#define REGS_SYDMA_BASE	(STMP3XXX_REGS_BASE + 0x26000)
-#define REGS_SYDMA_PHYS	0x80026000
-#define REGS_SYDMA_SIZE	0x2000

deleted file mode 100644
index 25112c1..0000000
@@ -1,40 +0,0 @@
-/*
- * stmp378x: USBCTRL register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- */
-#define REGS_USBCTRL_BASE	(STMP3XXX_REGS_BASE + 0x80000)
-#define REGS_USBCTRL_PHYS	0x80080000
-#define REGS_USBCTRL_SIZE	0x2000
-
-#define HW_USBCTRL_USBCMD	0x140
-#define BM_USBCTRL_USBCMD_RS	0x00000001
-#define BP_USBCTRL_USBCMD_RS	0
-#define BM_USBCTRL_USBCMD_RST	0x00000002
-
-#define HW_USBCTRL_USBINTR	0x148
-#define BM_USBCTRL_USBINTR_UE	0x00000001
-#define BP_USBCTRL_USBINTR_UE	0
-
-#define HW_USBCTRL_PORTSC1	0x184
-#define BM_USBCTRL_PORTSC1_PHCD	0x00800000
-
-#define HW_USBCTRL_OTGSC	0x1A4
-#define BM_USBCTRL_OTGSC_ID	0x00000100
-#define BM_USBCTRL_OTGSC_IDIS	0x00010000
-#define BM_USBCTRL_OTGSC_IDIE	0x01000000

deleted file mode 100644
index 11f3b73..0000000
@@ -1,37 +0,0 @@
-/*
- * stmp378x: USBPHY register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- */
-#define REGS_USBPHY_BASE	(STMP3XXX_REGS_BASE + 0x7C000)
-#define REGS_USBPHY_PHYS	0x8007C000
-#define REGS_USBPHY_SIZE	0x2000
-
-#define HW_USBPHY_PWD		0x0
-
-#define HW_USBPHY_CTRL		0x30
-#define BM_USBPHY_CTRL_ENHOSTDISCONDETECT	0x00000002
-#define BM_USBPHY_CTRL_ENDEVPLUGINDETECT	0x00000010
-#define BM_USBPHY_CTRL_ENOTGIDDETECT	0x00000080
-#define BM_USBPHY_CTRL_ENIRQDEVPLUGIN	0x00000800
-#define BM_USBPHY_CTRL_CLKGATE	0x40000000
-#define BM_USBPHY_CTRL_SFTRST	0x80000000
-
-#define HW_USBPHY_STATUS	0x40
-#define BM_USBPHY_STATUS_DEVPLUGIN_STATUS	0x00000040
-#define BM_USBPHY_STATUS_OTGID_STATUS	0x00000100

deleted file mode 100644
index 0dc15b3..0000000

index dcdbe32..e6e312b 100644

1.7.2.5

Part of the diff is not shown here. View the raw message.

Now that both users of plat-stmp have been deleted in previous patches, delete the platform, too.

---
 arch/arm/Kconfig                                  |   12 -
 arch/arm/Makefile                                 |    1 -
 arch/arm/plat-stmp3xxx/Kconfig                    |    7 -
 arch/arm/plat-stmp3xxx/Makefile                   |    5 -
 arch/arm/plat-stmp3xxx/clock.c                    | 1134 ---------------------
 arch/arm/plat-stmp3xxx/clock.h                    |   61 --
 arch/arm/plat-stmp3xxx/core.c                     |  128 ---
 arch/arm/plat-stmp3xxx/devices.c                  |  389 -------
 arch/arm/plat-stmp3xxx/dma.c                      |  464 ---------
 arch/arm/plat-stmp3xxx/include/mach/clkdev.h      |   18 -
 arch/arm/plat-stmp3xxx/include/mach/cputype.h     |   33 -
 arch/arm/plat-stmp3xxx/include/mach/debug-macro.S |   39 -
 arch/arm/plat-stmp3xxx/include/mach/dma.h         |  153 ---
 arch/arm/plat-stmp3xxx/include/mach/gpio.h        |   28 -
 arch/arm/plat-stmp3xxx/include/mach/gpmi.h        |   12 -
 arch/arm/plat-stmp3xxx/include/mach/hardware.h    |   32 -
 arch/arm/plat-stmp3xxx/include/mach/io.h          |   25 -
 arch/arm/plat-stmp3xxx/include/mach/memory.h      |   22 -
 arch/arm/plat-stmp3xxx/include/mach/mmc.h         |   14 -
 arch/arm/plat-stmp3xxx/include/mach/pinmux.h      |  157 ---
 arch/arm/plat-stmp3xxx/include/mach/pins.h        |   30 -
 arch/arm/plat-stmp3xxx/include/mach/platform.h    |   68 --
 arch/arm/plat-stmp3xxx/include/mach/stmp3xxx.h    |   54 -
 arch/arm/plat-stmp3xxx/include/mach/system.h      |   49 -
 arch/arm/plat-stmp3xxx/include/mach/timex.h       |   20 -
 arch/arm/plat-stmp3xxx/include/mach/uncompress.h  |   53 -
 arch/arm/plat-stmp3xxx/include/mach/vmalloc.h     |   12 -
 arch/arm/plat-stmp3xxx/irq.c                      |   50 -
 arch/arm/plat-stmp3xxx/pinmux.c                   |  550 ----------
 arch/arm/plat-stmp3xxx/timer.c                    |  186 ----
 30 files changed, 0 insertions(+), 3806 deletions(-)
 delete mode 100644 arch/arm/plat-stmp3xxx/Kconfig
 delete mode 100644 arch/arm/plat-stmp3xxx/Makefile
 delete mode 100644 arch/arm/plat-stmp3xxx/clock.c
 delete mode 100644 arch/arm/plat-stmp3xxx/clock.h
 delete mode 100644 arch/arm/plat-stmp3xxx/core.c
 delete mode 100644 arch/arm/plat-stmp3xxx/devices.c
 delete mode 100644 arch/arm/plat-stmp3xxx/dma.c
 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/clkdev.h
 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/cputype.h
 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/debug-macro.S
 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/dma.h
 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/gpio.h
 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/gpmi.h
 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/hardware.h
 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/io.h
 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/memory.h
 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/mmc.h
 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/pinmux.h
 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/pins.h
 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/platform.h
 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/stmp3xxx.h
 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/system.h
 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/timex.h
 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/uncompress.h
 delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/vmalloc.h
 delete mode 100644 arch/arm/plat-stmp3xxx/irq.c
 delete mode 100644 arch/arm/plat-stmp3xxx/pinmux.c
 delete mode 100644 arch/arm/plat-stmp3xxx/timer.c

index fdc9d4d..18613ee 100644
@@ -378,16 +378,6 @@ config ARCH_MXS
 	help
 	  Support for Freescale MXS-based family of processors
 
-config ARCH_STMP3XXX
-	bool "Freescale STMP3xxx"
-	select CPU_ARM926T
-	select CLKDEV_LOOKUP
-	select ARCH_REQUIRE_GPIOLIB
-	select GENERIC_CLOCKEVENTS
-	select USB_ARCH_HAS_EHCI
-	help
-	  Support for systems based on the Freescale 3xxx CPUs.
-
 config ARCH_NETX
 	bool "Hilscher NetX based"
 	select CPU_ARM926T

@@ -1005,8 +995,6 @@ source "arch/arm/mach-exynos4/Kconfig"
 
 source "arch/arm/mach-shmobile/Kconfig"
 
-source "arch/arm/plat-stmp3xxx/Kconfig"
-
 source "arch/arm/mach-tegra/Kconfig"
 
 source "arch/arm/mach-u300/Kconfig"

index ca473b1..692c481 100644
@@ -205,7 +205,6 @@ machine-$(CONFIG_MACH_SPEAR600)		:= spear6xx
 plat-$(CONFIG_ARCH_MXC)		:= mxc
 plat-$(CONFIG_ARCH_OMAP)	:= omap
 plat-$(CONFIG_ARCH_S3C64XX)	:= samsung
-plat-$(CONFIG_ARCH_STMP3XXX)	:= stmp3xxx
 plat-$(CONFIG_ARCH_TCC_926)	:= tcc
 plat-$(CONFIG_PLAT_IOP)		:= iop
 plat-$(CONFIG_PLAT_NOMADIK)	:= nomadik

deleted file mode 100644
index e6e312b..0000000
@@ -1,7 +0,0 @@
-if ARCH_STMP3XXX
-
-menu "Freescale STMP3xxx implementations"
-
-endmenu
-
-endif

deleted file mode 100644
index 31dd518..0000000
@@ -1,5 +0,0 @@
-#
-# Makefile for the linux kernel.
-#
-# Object file lists.
-obj-y += core.o timer.o irq.o dma.o clock.o pinmux.o devices.o

deleted file mode 100644
index f9c3977..0000000
@@ -1,18 +0,0 @@
-/*
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#ifndef __ASM_MACH_CLKDEV_H
-#define __ASM_MACH_CLKDEV_H
-
-#define __clk_get(clk) ({ 1; })
-#define __clk_put(clk) do { } while (0)
-
-#endif

deleted file mode 100644
index b4e205b..0000000
@@ -1,33 +0,0 @@
-/*
- * Freescale STMP37XX/STMP378X CPU type detection
- *
- * Embedded Alley Solutions, Inc <[email protected]>
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#ifndef __ASM_PLAT_CPU_H
-#define __ASM_PLAT_CPU_H
-
-#ifdef CONFIG_ARCH_STMP37XX
-#define cpu_is_stmp37xx()	(1)
-#else
-#define cpu_is_stmp37xx()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_STMP378X
-#define cpu_is_stmp378x()	(1)
-#else
-#define cpu_is_stmp378x()	(0)
-#endif
-
-#endif /* __ASM_PLAT_CPU_H */

deleted file mode 100644
index d3a0985..0000000
@@ -1,39 +0,0 @@
-/*
- * Debugging macro include header
- *
- * Embedded Alley Solutions, Inc <[email protected]>
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-		.macro	addruart, rp, rv
-		mov	\rp,      #0x00070000
-		add	\rv, \rp, #0xf0000000	@ virtual base
-		add	\rp, \rp, #0x80000000	@ physical base
-		.endm
-
-		.macro	senduart,rd,rx
-		strb	\rd, [\rx, #0]		@ data register at 0
-		.endm
-
-		.macro	waituart,rd,rx
-1001:		ldr	\rd, [\rx, #0x18]	@ UARTFLG
-		tst	\rd, #1 << 5		@ UARTFLGUTXFF - 1 when full
-		bne	1001b
-		.endm
-
-		.macro	busyuart,rd,rx
-1001:		ldr	\rd, [\rx, #0x18]	@ UARTFLG
-		tst	\rd, #1 << 3		@ UARTFLGUBUSY - 1 when busy
-		bne	1001b
-		.endm

deleted file mode 100644
index a8b5792..0000000
@@ -1,28 +0,0 @@
-/*
- * Freescale STMP37XX/STMP378X GPIO interface
- *
- * Embedded Alley Solutions, Inc <[email protected]>
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#ifndef __ASM_PLAT_GPIO_H
-#define __ASM_PLAT_GPIO_H
-
-#define ARCH_NR_GPIOS	(32 * 3)
-#define gpio_to_irq(gpio) __gpio_to_irq(gpio)
-#define gpio_get_value(gpio) __gpio_get_value(gpio)
-#define gpio_set_value(gpio, value) __gpio_set_value(gpio, value)
-
-#include <asm-generic/gpio.h>
-
-#endif /* __ASM_PLAT_GPIO_H */

deleted file mode 100644
index e166432..0000000
@@ -1,12 +0,0 @@
-#ifndef __MACH_GPMI_H
-
-#include <linux/mtd/partitions.h>
-#include <mach/regs-gpmi.h>
-
-struct gpmi_platform_data {
-	void *pins;
-	int nr_parts;
-	struct mtd_partition *parts;
-	const char *part_types[];
-};
-#endif

deleted file mode 100644
index 47b8978..0000000
@@ -1,32 +0,0 @@
-/*
- * This file contains the hardware definitions of the Freescale STMP3XXX
- *
- * Copyright (C) 2005 Sigmatel Inc
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#ifndef __ASM_ARCH_HARDWARE_H
-#define __ASM_ARCH_HARDWARE_H
-
-/*
- * Where in virtual memory the IO devices (timers, system controllers
- * and so on)
- */
-#define IO_BASE			0xF0000000                 /* VA of IO  */
-#define IO_SIZE			0x00100000                 /* How much? */
-#define IO_START		0x80000000                 /* PA of IO  */
-
-/* macro to get at IO space when running virtually */
-#define IO_ADDRESS(x) (((x) & 0x000fffff) | IO_BASE)
-
-#endif

deleted file mode 100644
index d08b1b7..0000000
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2005 Sigmatel Inc
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#ifndef __ASM_ARM_ARCH_IO_H
-#define __ASM_ARM_ARCH_IO_H
-
-#define IO_SPACE_LIMIT 0xffffffff
-
-#define __io(a) 	__typesafe_io(a)
-#define __mem_pci(a)	(a)
-#define __mem_isa(a)	(a)
-
-#endif

deleted file mode 100644
index 61fa548..0000000
@@ -1,22 +0,0 @@
-/*
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#ifndef __ASM_ARCH_MEMORY_H
-#define __ASM_ARCH_MEMORY_H
-
-/*
- * Physical DRAM offset.
- */
-#define PLAT_PHYS_OFFSET	UL(0x40000000)
-
-#endif

deleted file mode 100644
index ba81e15..0000000
@@ -1,14 +0,0 @@
-#ifndef _MACH_MMC_H
-#define _MACH_MMC_H
-
-#include <mach/regs-ssp.h>
-
-struct stmp3xxxmmc_platform_data {
-	int (*get_wp)(void);
-	unsigned long (*setclock)(void __iomem *base, unsigned long);
-	void (*cmd_pullup)(int);
-	int  (*hw_init)(void);
-	void (*hw_release)(void);
-};
-
-#endif

deleted file mode 100644
index c573318..0000000
@@ -1,30 +0,0 @@
-/*
- * Freescale STMP37XX/STMP378X Pin multiplexing interface definitions
- *
- * Author: Vladislav Buzov <[email protected]>
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#ifndef __ASM_PLAT_PINS_H
-#define __ASM_PLAT_PINS_H
-
-#define STMP3XXX_PINID(bank, pin)	(bank * 32 + pin)
-#define STMP3XXX_PINID_TO_BANK(pinid)	(pinid / 32)
-#define STMP3XXX_PINID_TO_PINNUM(pinid)	(pinid % 32)
-
-/*
- * Special invalid pin identificator to show a pin doesn't exist
- */
-#define PINID_NO_PIN	STMP3XXX_PINID(0xFF, 0xFF)
-
-#endif /* __ASM_PLAT_PINS_H */

deleted file mode 100644
index 3373985..0000000
@@ -1,20 +0,0 @@
-/*
- * Copyright (C) 1999 ARM Limited
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-/*
- * System time clock is sourced from the 32k clock
- */
-#define CLOCK_TICK_RATE		(32768)

deleted file mode 100644
index 943c1a2..0000000

1.7.2.5

Part of the diff is not shown here. View the raw message.

Hi Wolfram,

You are doing something that I have been intending to do for some while. I think you are doing the right thing at the right time ;) Let me know if you need any help.

Regards,
Shawn

\o/ Thanks a ton!

Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20110418/2659078c/attachment.sig>

Seems I was very hungry; forgot to push out the branch which is now here:

git://git.pengutronix.de/git/wsa/linux-2.6.git remove_stmp

This should help until the patches are moderated.

Kind regards,

Wolfram

Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20110418/b8c39767/attachment.sig>

Great stuff!

It seems that the patches did not make it to the mailing list, possibly because of the size.

Could you repost the first patch in the series? I suppose the other three are entirely uncontroversial.

Arnd

Huh, the small patch also didn't get through? OK, I'll try sending it directly.

===

From: Wolfram Sang <[email protected]>
Date: Sun, 17 Apr 2011 19:49:28 +0200
Subject: [RFC 1/4] arm: mach-mxs: add stmp378x-devb

STMP378x and MX23 are the same. There is a mach-stmp378x, however, it has a lot of reinvented interfaces, leaking all sorts of mach-specific functions into the drivers. One example is the dmaengine which does not use the linux dmaengine-API but some privately exported symbols. This makes generic use of the drivers impossible. mach-mxs does it better, so convert the board to mach-mxs. After that, it is possible to delete all stmp-specific code which should ease further ARM-consolidation.

Compile tested only due to no hardware (seems not available anymore).

---

As a bonus, the UARTs and MMC will work now, which they haven't before.

Note that I kept the SPI boardinfo for completeness, although it could not have worked in the original setup. Due to a copy/paste-bug, the pins for SSP2 are the same as for SSP1.

The yet missing drivers for RTC & watchdog are also scheduled for 2.6.40.

 arch/arm/mach-mxs/Kconfig              |   10 +++
 arch/arm/mach-mxs/Makefile             |    1 +
 arch/arm/mach-mxs/mach-stmp378x_devb.c |  120 ++++++++++++++++++++++++++++++++
 3 files changed, 131 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/mach-mxs/mach-stmp378x_devb.c

index 4522fbb..edacefa 100644
@@ -17,6 +17,16 @@ config SOC_IMX28
 
 comment "MXS platforms:"
 
+config MACH_STMP378X_DEVB
+	bool "Support STMP378x_devb Platform"
+	select SOC_IMX23
+	select MXS_HAVE_AMBA_DUART
+	select MXS_HAVE_PLATFORM_AUART
+	select MXS_HAVE_PLATFORM_MXS_MMC
+	help
+	  Include support for STMP378x-devb platform. This includes specific
+	  configurations for the board and its peripherals.
+
 config MACH_MX23EVK
 	bool "Support MX23EVK Platform"
 	select SOC_IMX23

index 2f1f614..58e8923 100644
@@ -7,6 +7,7 @@ obj-$(CONFIG_PM) += pm.o
 obj-$(CONFIG_SOC_IMX23) += clock-mx23.o mm-mx23.o
 obj-$(CONFIG_SOC_IMX28) += clock-mx28.o mm-mx28.o
 
+obj-$(CONFIG_MACH_STMP378X_DEVB) += mach-stmp378x_devb.o
 obj-$(CONFIG_MACH_MX23EVK) += mach-mx23evk.o
 obj-$(CONFIG_MACH_MX28EVK) += mach-mx28evk.o
 obj-$(CONFIG_MODULE_TX28) += module-tx28.o

1.7.2.5

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20110418/72aa2a6a/attachment.sig>

Ok, I guess there is not much that anyone can really complain about here. What about the arch/arm/mach-stmp37xx/stmp37xx_devb.c file? You don't seem to have a replacement for that machine.

Also, I noticed that the same series that added support for the platform also added a few device drivers:
* drivers/rtc/rtc-stmp3xxx.c
* drivers/spi/spi_stmp.c
* drivers/watchdog/stmp3xxx_wdt.c

Are these still used by the new code, and shared with the other i.MX23 code, or is there more duplication?

Finally, there are defconfig files:
* arch/arm/configs/stmp378x_defconfig
* arch/arm/configs/stmp37xx_defconfig

I would guess that these need to be updated.

Arnd

Hmm, maybe we should skip the discussion until the patches arrived. I explained a few things in the patch descriptions to explain the removals. For those interested, besides the branch I mentioned before

git://git.pengutronix.de/git/wsa/linux-2.6.git remove_stmp

there is also the web-interface for it

http://git.pengutronix.de/?p=wsa/linux-2.6.git;a=shortlog;h=refs/heads/remove_stmp

As mentioned, mach-mxs replacements are scheduled for 2.6.40. When those are in place, the old ones can be removed, too.

Yup! Will do.

Regards,

Wolfram

Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20110418/9b215124/attachment.sig>

Hi Wolfram,

may we FIRST see how you are going to fit it into mach-mxc? NAK from me before I see that.

BTW, I understand that you are taking steps in the right direction but having worked with stmp3xxx and multiple i.MXs, I see it as a great pity that a low-end but stable and convenient platform has been effectively killed by a semiconductor giant to avoid competition with unstable and painful to work with lower end i.MXs, and is also being killed virtually -- by you guys.

Thanks,
Vitaly

I don't understand that nak. mach-mxs doesn't have to do anything with plat-mxc codewise. (There are some similarities, e.g. both types of machines are called i.MXYZ (which I consider to have marketing reasons).)

This shouldn't be in the way when doing software consolidation. Note that the functionality isn't removed, so you should still be able to add machines based on the original Sigmatel SoCs.

Best regards
Uwe

Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

Hi Uwe,

2011/4/18 Uwe Kleine-K?nig <[email protected]>:

well, looks like I've missed the actual patch so I might be wrong. I'll try to run the code even.

Thanks,
Vitaly

Hi Vitaly,

Do you have more comments now that the patches are available?

Thanks,

Wolfram

Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20110426/9ce1357c/attachment.sig>

Hi Vitaly,

mach-mxs, not mach-mxc :) As said to Arnd, you can check the patches here

http://git.pengutronix.de/?p=wsa/linux-2.6.git;a=shortlog;h=refs/heads/remove_stmp

until they are moderated (or pull the branch). Looking forward to input from you and you even seem to have boards.

STMP378x is not killed. STMP37xx is, but I have doubts the mainline linux support ever worked. See my patch descriptions.

Regards,

Wolfram

Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20110418/c551fc7e/attachment.sig>

This looks really good. Once there's concensus on this, I'd like to pull it into a local consolidation branch so that we have one central place where we can gauge our progress.

Only issue is to do with wrapping - please wrap at or before column 72. Two reasons - when folk reply to your messages, they don't wrap as a result of the '> ' prefix. Secondly, for git commits it allows a tab to be inserted before the description without the possibility of losing words off the right side of the screen (see the git log output).

Thanks.