I spent some time cleaning up omap1, which is one of the last
remaining ARM9 platforms that is not yet part of
CONFIG_ARCH_MULTIPLATFORM.
There are two main parts here:
1. Avoiding mach/*.h header file dependencies, in particular
mach/memory.h and mach/io.h. I managed to split out a
small set of headers that are moved to include/linux/soc/ti,
to avoid completely rewriting the platform interfaces,
while getting all drivers to be actually self-contained
aside from these headers.
2. Rewriting the clock driver to use common-clk
I've never written a clock driver before, and I tried to
stick to the original code without changing too much here,
so the result is not overly pretty, and likely contains
bugs, but I think I'm on the track here. I did not test
any of this on real hardware, so I need some help in
testing and fixing this.
I would hope to merge the entire series through the arm-soc
tree for the next merge window, along with other some of the
other platforms I worked on.
Arnd
Arnd Bergmann (22):
ARM: omap1: innovator: pass lcd control address as pdata
ARM: omap1: make omapfb standalone compilable
ARM: omap1: move omap15xx local bus handling to usb.c
ARM: omap1: move ohci phy power handling to board files
ARM: omap1: move mach/usb.h to include/linux/soc
ARM: omap1: move some headers to include/linux/soc
ARM: omap1: move perseus spi pinconf to board file
ARM: omap1: move CF chipselect setup to board file
fbdev: omap: avoid using mach/*.h files
usb: omap: avoid mach/*.h headers
clocksource: ti-dmtimer: avoid using mach/hardware.h
serial: 8250/omap1: include linux/soc/ti/omap1-soc.h
input: omap: void using mach/*.h headers
ARM: omap1: use pci_ioremap_io() for omap_cf
ARM: omap1: move mach/*.h into mach directory
ARM: omap1: move clk support into a single file
ARM: omap1: remove some dead clock code
ARM: omap1: clk: rework 'struct clk'
ARM: omap1: clk: use common_clk-like callbacks
ARM: omap1: clk: use clk_init_data
ARM: omap1: use common clk framework
ARM: omap1: enable multiplatform
arch/arm/Kconfig | 18 -
arch/arm/configs/omap1_defconfig | 3 +
arch/arm/mach-omap1/Kconfig | 20 +-
arch/arm/mach-omap1/Makefile | 10 +-
arch/arm/mach-omap1/ams-delta-fiq-handler.S | 3 +-
arch/arm/mach-omap1/ams-delta-fiq.c | 2 +
arch/arm/mach-omap1/ams-delta-fiq.h | 2 +-
arch/arm/mach-omap1/board-ams-delta.c | 7 +-
arch/arm/mach-omap1/board-fsample.c | 10 +-
arch/arm/mach-omap1/board-generic.c | 8 +-
arch/arm/mach-omap1/board-h2.c | 12 +-
arch/arm/mach-omap1/board-h3.c | 14 +-
arch/arm/mach-omap1/board-htcherald.c | 10 +-
arch/arm/mach-omap1/board-innovator.c | 34 +-
arch/arm/mach-omap1/board-nokia770.c | 9 +-
arch/arm/mach-omap1/board-osk.c | 68 +-
arch/arm/mach-omap1/board-palmte.c | 14 +-
arch/arm/mach-omap1/board-palmtt.c | 14 +-
arch/arm/mach-omap1/board-palmz71.c | 14 +-
arch/arm/mach-omap1/board-perseus2.c | 13 +-
arch/arm/mach-omap1/board-sx1-mmc.c | 3 +-
arch/arm/mach-omap1/board-sx1.c | 12 +-
arch/arm/mach-omap1/clock.c | 1515 ++++++++++++-----
arch/arm/mach-omap1/clock.h | 288 ----
arch/arm/mach-omap1/clock_data.c | 921 ----------
arch/arm/mach-omap1/common.h | 5 +-
arch/arm/mach-omap1/devices.c | 9 +-
arch/arm/mach-omap1/fb.c | 19 +-
arch/arm/mach-omap1/flash.c | 3 +-
arch/arm/mach-omap1/fpga.c | 3 +-
arch/arm/mach-omap1/gpio15xx.c | 3 +-
arch/arm/mach-omap1/gpio16xx.c | 5 +-
arch/arm/mach-omap1/gpio7xx.c | 3 +-
.../mach-omap1/{include/mach => }/hardware.h | 132 +-
arch/arm/mach-omap1/i2c.c | 3 +-
arch/arm/mach-omap1/id.c | 5 +-
arch/arm/mach-omap1/include/mach/io.h | 45 -
arch/arm/mach-omap1/include/mach/lcdc.h | 44 -
arch/arm/mach-omap1/include/mach/memory.h | 55 -
arch/arm/mach-omap1/include/mach/uncompress.h | 117 --
arch/arm/mach-omap1/io.c | 6 +-
arch/arm/mach-omap1/irq.c | 4 +-
arch/arm/mach-omap1/{include/mach => }/irqs.h | 2 -
arch/arm/mach-omap1/mcbsp.c | 9 +-
.../mach-omap1/{include/mach => }/mtd-xip.h | 3 +-
arch/arm/mach-omap1/mux.c | 6 +-
arch/arm/mach-omap1/mux.h | 144 ++
arch/arm/mach-omap1/ocpi.c | 4 +-
.../mach-omap1/{include/mach => }/omap1510.h | 1 -
.../mach-omap1/{include/mach => }/omap16xx.h | 0
.../mach-omap1/{include/mach => }/omap7xx.h | 0
arch/arm/mach-omap1/opp.h | 26 -
arch/arm/mach-omap1/opp_data.c | 51 -
arch/arm/mach-omap1/pm.c | 8 +-
arch/arm/mach-omap1/pm.h | 2 +
arch/arm/mach-omap1/reset.c | 3 +-
arch/arm/mach-omap1/serial.c | 4 +-
.../mach-omap1/{include/mach => }/serial.h | 0
arch/arm/mach-omap1/sleep.S | 2 +-
arch/arm/mach-omap1/soc.h | 6 +-
arch/arm/mach-omap1/sram.S | 4 +-
arch/arm/mach-omap1/time.c | 2 +-
arch/arm/mach-omap1/timer.c | 1 +
arch/arm/mach-omap1/timer32k.c | 3 +-
arch/arm/mach-omap1/usb.c | 87 +-
arch/arm/mach-omap1/usb.h | 25 +
arch/arm/plat-omap/Makefile | 1 +
arch/arm/plat-omap/dma.c | 4 +-
arch/arm/plat-omap/include/plat/cpu.h | 21 -
drivers/clocksource/timer-ti-dm.c | 2 +-
drivers/input/keyboard/Kconfig | 2 +-
drivers/input/keyboard/omap-keypad.c | 1 +
drivers/pcmcia/Kconfig | 3 +-
drivers/pcmcia/omap_cf.c | 47 +-
drivers/spi/Kconfig | 2 +-
drivers/spi/spi-omap-uwire.c | 15 +-
drivers/tty/serial/8250/8250.h | 1 +
drivers/usb/gadget/udc/Kconfig | 2 +-
drivers/usb/gadget/udc/omap_udc.c | 5 +-
drivers/usb/host/Kconfig | 2 +-
drivers/usb/host/ohci-omap.c | 111 +-
drivers/usb/phy/Kconfig | 3 +-
drivers/usb/phy/phy-isp1301-omap.c | 6 +-
drivers/video/backlight/Kconfig | 4 +-
drivers/video/backlight/omap1_bl.c | 4 +-
drivers/video/fbdev/Makefile | 2 +-
drivers/video/fbdev/omap/Kconfig | 4 +-
drivers/video/fbdev/omap/Makefile | 5 +
drivers/video/fbdev/omap/lcd_ams_delta.c | 2 +-
.../video/fbdev/omap}/lcd_dma.c | 7 +-
.../video/fbdev/omap}/lcd_dma.h | 2 -
drivers/video/fbdev/omap/lcd_inn1510.c | 9 +-
drivers/video/fbdev/omap/lcd_osk.c | 4 +-
drivers/video/fbdev/omap/lcdc.c | 10 +-
drivers/video/fbdev/omap/lcdc.h | 35 +
drivers/video/fbdev/omap/omapfb.h | 2 +
drivers/video/fbdev/omap/omapfb_main.c | 19 +-
drivers/video/fbdev/omap/sossi.c | 4 +-
include/linux/omap-dma.h | 7 +-
include/linux/platform_data/keypad-omap.h | 5 -
include/linux/platform_data/usb-omap1.h | 4 +
include/linux/soc/ti/omap1-io.h | 143 ++
.../mux.h => include/linux/soc/ti/omap1-mux.h | 142 +-
.../soc.h => include/linux/soc/ti/omap1-soc.h | 22 -
.../usb.h => include/linux/soc/ti/omap1-usb.h | 28 +-
105 files changed, 1856 insertions(+), 2714 deletions(-)
delete mode 100644 arch/arm/mach-omap1/clock.h
delete mode 100644 arch/arm/mach-omap1/clock_data.c
rename arch/arm/mach-omap1/{include/mach => }/hardware.h (59%)
delete mode 100644 arch/arm/mach-omap1/include/mach/io.h
delete mode 100644 arch/arm/mach-omap1/include/mach/lcdc.h
delete mode 100644 arch/arm/mach-omap1/include/mach/memory.h
delete mode 100644 arch/arm/mach-omap1/include/mach/uncompress.h
rename arch/arm/mach-omap1/{include/mach => }/irqs.h (99%)
rename arch/arm/mach-omap1/{include/mach => }/mtd-xip.h (97%)
create mode 100644 arch/arm/mach-omap1/mux.h
rename arch/arm/mach-omap1/{include/mach => }/omap1510.h (99%)
rename arch/arm/mach-omap1/{include/mach => }/omap16xx.h (100%)
rename arch/arm/mach-omap1/{include/mach => }/omap7xx.h (100%)
delete mode 100644 arch/arm/mach-omap1/opp.h
delete mode 100644 arch/arm/mach-omap1/opp_data.c
rename arch/arm/mach-omap1/{include/mach => }/serial.h (100%)
create mode 100644 arch/arm/mach-omap1/usb.h
delete mode 100644 arch/arm/plat-omap/include/plat/cpu.h
rename {arch/arm/mach-omap1 => drivers/video/fbdev/omap}/lcd_dma.c (98%)
rename {arch/arm/mach-omap1/include/mach => drivers/video/fbdev/omap}/lcd_dma.h (98%)
create mode 100644 include/linux/soc/ti/omap1-io.h
rename arch/arm/mach-omap1/include/mach/mux.h => include/linux/soc/ti/omap1-mux.h (53%)
rename arch/arm/mach-omap1/include/mach/soc.h => include/linux/soc/ti/omap1-soc.h (90%)
rename arch/arm/mach-omap1/include/mach/usb.h => include/linux/soc/ti/omap1-usb.h (86%)
--
2.20.0
