OMAP1 full multiplatform conversion
Subsystems (25)
cover OMAP1 full multiplatform conversion
From: Arnd Bergmann <[email protected]>
This is the full series for converting OMAP1 to multiplatform, rebased from my 2019 attempt to do the same thing. The soc tree contains simpler patches to do the same for iop32x, ixp4xx, ep93xx and s3c24xx, which means we are getting closer to completing this for all ARMv5 platforms (I have patches for PXA, which is the last one remaining).
Janusz already tested the branch separately and did the missing work for the common-clk conversion after my previous approach was broken.
The fbdev, mmc and ASoC portion of Janusz' work already went into the corresponding maintainer tree, but I include them here for reference. Unless there are any objections, I would add the entire series to the for-next branch of the soc tree, but only send the first 36 patches early in the merge window. After everything else has made it in, I would rebase the last two patches and send them separately, which may or may not make it in the merge window.
Arnd
Arnd Bergmann (30):
video: fbdev: omapfb: lcd_ams_delta: fix unused variable warning
ARM: omap1: innovator: pass lcd control address as pdata
ARM: omap1: move lcd_dma code into omapfb driver
ARM: omap1: declare a dummy omap_set_dma_priority
fbdev: omap: pass irqs as resource
ARM: omap1: ams-delta: remove camera leftovers
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: innovator: move ohci phy power handling to board file
ARM: omap1: move 32k counter from plat-omap to mach-omap1
ARM: omap: remove debug-leds driver
ARM: omap: dma: make usb support optional
dma: omap: hide legacy interface
ARM: omap1: dma: remove omap2 specific bits
ARM: omap1: move plat/dma.c to mach/omap-dma.c
ARM: omap: split up arch/arm/plat-omap/Kconfig
ARM: omap: un-merge plat/sram.c
ARM: omap: remove empty plat-omap directory
ARM: omap1: relocate static I/O mapping
ARM: omap1: use pci_remap_iospace() for omap_cf
ARM: omap1: move mach/*.h into mach directory
ARM: omap1: fix build with no SoC selected
[TO BE REBASED] ARM: omap1: enable multiplatform
Janusz Krzysztofik (11):
ARM: OMAP1: Prepare for conversion of OMAP1 clocks to CCF
ARM: OMAP1: clock: Fix early UART rate issues
ARM: OMAP1: clock: Fix UART rate reporting algorithm
ARM: OMAP1: clock: Remove unused code
ARM: OMAP1: clock: Remove noop code
usb: host: ohci-omap: Make it CCF clk API compatible
usb: gadget: omap_udc: Make it CCF clk API compatible [MERGED] video: fbdev: omap: Make it CCF clk API compatible [MERGED] mmc: omap: Make it CCF clk API compatible [MERGED] ASoC: ti: osk5912: Make it CCF clk API compatible [TO BE REBASED] ARM: OMAP1: clock: Convert to CCF
arch/arm/Kconfig | 16 -
arch/arm/Kconfig.debug | 6 +-
arch/arm/Makefile | 1 -
arch/arm/configs/omap1_defconfig | 3 +
arch/arm/mach-omap1/Kconfig | 72 ++
arch/arm/mach-omap1/Makefile | 6 +-
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 | 18 +-
arch/arm/mach-omap1/board-fsample.c | 10 +-
arch/arm/mach-omap1/board-generic.c | 8 +-
arch/arm/mach-omap1/board-h2.c | 14 +-
arch/arm/mach-omap1/board-h3.c | 16 +-
arch/arm/mach-omap1/board-htcherald.c | 10 +-
arch/arm/mach-omap1/board-innovator.c | 34 +-
arch/arm/mach-omap1/board-nokia770.c | 8 +-
arch/arm/mach-omap1/board-osk.c | 49 +-
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 | 15 +-
arch/arm/mach-omap1/board-sx1-mmc.c | 3 +-
arch/arm/mach-omap1/board-sx1.c | 12 +-
arch/arm/mach-omap1/clock.c | 797 +++++++-----------
arch/arm/mach-omap1/clock.h | 191 ++---
arch/arm/mach-omap1/clock_data.c | 508 +++++------
arch/arm/mach-omap1/common.h | 3 +-
arch/arm/mach-omap1/devices.c | 12 +-
arch/arm/mach-omap1/dma.c | 2 +-
arch/arm/mach-omap1/fb.c | 19 +-
arch/arm/mach-omap1/flash.c | 5 +-
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 | 136 +--
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 | 12 -
arch/arm/mach-omap1/include/mach/uncompress.h | 117 ---
arch/arm/mach-omap1/io.c | 12 +-
arch/arm/mach-omap1/irq.c | 4 +-
arch/arm/mach-omap1/{include/mach => }/irqs.h | 2 -
arch/arm/mach-omap1/mcbsp.c | 17 +-
.../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 | 8 +-
.../dma.c => mach-omap1/omap-dma.c} | 259 ++----
.../mach-omap1/{include/mach => }/omap1510.h | 0
.../mach-omap1/{include/mach => }/omap16xx.h | 0
.../mach-omap1/{include/mach => }/omap7xx.h | 0
arch/arm/mach-omap1/pm.c | 9 +-
arch/arm/mach-omap1/pm.h | 2 +
arch/arm/mach-omap1/reset.c | 3 +-
arch/arm/mach-omap1/serial.c | 10 +-
.../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-init.c | 91 +-
arch/arm/mach-omap1/sram.S | 4 +-
arch/arm/mach-omap1/sram.h | 4 +-
arch/arm/mach-omap1/{include/mach => }/tc.h | 2 -
arch/arm/mach-omap1/time.c | 7 +-
arch/arm/mach-omap1/timer.c | 1 +
arch/arm/mach-omap1/timer32k.c | 100 ++-
arch/arm/mach-omap1/usb.c | 8 +-
arch/arm/mach-omap1/usb.h | 25 +
arch/arm/mach-omap2/Kconfig | 49 ++
arch/arm/mach-omap2/sram.c | 91 +-
arch/arm/mach-omap2/sram.h | 5 +-
arch/arm/plat-omap/Kconfig | 119 ---
arch/arm/plat-omap/Makefile | 13 -
arch/arm/plat-omap/counter_32k.c | 114 ---
arch/arm/plat-omap/debug-leds.c | 171 ----
arch/arm/plat-omap/include/plat/counter-32k.h | 1 -
arch/arm/plat-omap/include/plat/cpu.h | 21 -
arch/arm/plat-omap/include/plat/sram.h | 8 -
arch/arm/plat-omap/sram.c | 129 ---
drivers/clocksource/timer-ti-dm.c | 2 +-
drivers/dma/ti/omap-dma.c | 19 +-
drivers/input/keyboard/omap-keypad.c | 1 +
drivers/mmc/host/omap.c | 23 +-
drivers/pcmcia/Kconfig | 3 +-
drivers/pcmcia/omap_cf.c | 48 +-
drivers/spi/Kconfig | 2 +-
drivers/spi/spi-omap-uwire.c | 15 +-
drivers/tty/serial/8250/8250.h | 1 +
drivers/usb/gadget/udc/omap_udc.c | 19 +-
drivers/usb/host/Kconfig | 2 +-
drivers/usb/host/ohci-omap.c | 60 +-
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/hwa742.c | 6 +-
drivers/video/fbdev/omap/lcd_ams_delta.c | 5 +-
.../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 | 16 +-
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 | 9 +-
include/linux/omap-dma.h | 28 +-
include/linux/platform_data/usb-omap1.h | 2 +
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 +-
sound/soc/ti/osk5912.c | 4 +-
119 files changed, 1809 insertions(+), 2610 deletions(-)
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/{plat-omap/dma.c => mach-omap1/omap-dma.c} (84%)
rename arch/arm/mach-omap1/{include/mach => }/omap1510.h (100%)
rename arch/arm/mach-omap1/{include/mach => }/omap16xx.h (100%)
rename arch/arm/mach-omap1/{include/mach => }/omap7xx.h (100%)
rename arch/arm/mach-omap1/{include/mach => }/serial.h (100%)
rename arch/arm/mach-omap1/{include/mach => }/tc.h (98%)
create mode 100644 arch/arm/mach-omap1/usb.h
delete mode 100644 arch/arm/plat-omap/Kconfig
delete mode 100644 arch/arm/plat-omap/Makefile
delete mode 100644 arch/arm/plat-omap/counter_32k.c
delete mode 100644 arch/arm/plat-omap/debug-leds.c
delete mode 100644 arch/arm/plat-omap/include/plat/counter-32k.h
delete mode 100644 arch/arm/plat-omap/include/plat/cpu.h
delete mode 100644 arch/arm/plat-omap/include/plat/sram.h
delete mode 100644 arch/arm/plat-omap/sram.c
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%)Signature · 34 lines
2.29.2 Cc: Russell King <[email protected]> Cc: Aaro Koskinen <[email protected]> Cc: Tony Lindgren <[email protected]> Cc: Paul Walmsley <[email protected]> Cc: Kevin Hilman <[email protected]> Cc: Peter Ujfalusi <[email protected]> Cc: Vinod Koul <[email protected]> Cc: Dmitry Torokhov <[email protected]> Cc: Ulf Hansson <[email protected]> Cc: Dominik Brodowski <[email protected]> Cc: Mark Brown <[email protected]> Cc: Felipe Balbi <[email protected]> Cc: Alan Stern <[email protected]> Cc: Lee Jones <[email protected]> Cc: Daniel Thompson <[email protected]> Cc: Jingoo Han <[email protected]> Cc: Helge Deller <[email protected]> Cc: Arnd Bergmann <[email protected]> Cc: Linus Walleij <[email protected]> Cc: Janusz Krzysztofik <[email protected]> Cc: Krzysztof Kozlowski <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected]
PATCH 1/41 video: fbdev: omapfb: lcd_ams_delta: fix unused variable warning
From: Arnd Bergmann <[email protected]>
A recent cleanup patch removed the only reference to a local variable in some configurations.
Move the variable into the one block it is still used in, inside of an #ifdef, to avoid this warning.
--- drivers/video/fbdev/omap/lcd_ams_delta.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/video/fbdev/omap/lcd_ams_delta.c +1 -2
@@ -128,7 +128,6 @@ static struct lcd_panel ams_delta_panel = {static int ams_delta_panel_probe (struct platform_device *pdev) {struct lcd_device *lcd_device =NULL ; -int ret; gpiod_vblen =devm_gpiod_get (&pdev->dev,"vblen" ,GPIOD_OUT_LOW );if (IS_ERR (gpiod_vblen))
@@ -145,7 +144,7 @@ static int ams_delta_panel_probe(struct platform_device *pdev) &ams_delta_lcd_ops);if (IS_ERR (lcd_device)) { - ret =PTR_ERR (lcd_device); +int ret =PTR_ERR (lcd_device);dev_err (&pdev->dev,"failed to register device\n" );return ret; }
Signature · 1 line
2.29.2
PATCH 2/41 ARM: omap1: innovator: pass lcd control address as pdata
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
To avoid using the mach/omap1510.h header file, pass the correct address as platform data.
--- arch/arm/mach-omap1/board-innovator.c | 3 +++ drivers/video/fbdev/omap/lcd_inn1510.c | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-)
arch/arm/mach-omap1/board-innovator.c +3 -0
@@ -194,6 +194,9 @@ static struct platform_device innovator1510_smc91x_device = {static struct platform_device innovator1510_lcd_device = { .name ="lcd_inn1510" , .id =-1 , + .dev = { + .platform_data = (void __force *)OMAP1510_FPGA_LCD_PANEL_CONTROL , + } };static struct platform_device innovator1510_spi_device = {
drivers/video/fbdev/omap/lcd_inn1510.c +5 -2
@@ -14,15 +14,17 @@#include "omapfb.h" +static void __iomem *omap1510_fpga_lcd_panel_control; +static int innovator1510_panel_enable (struct lcd_panel *panel) { -__raw_writeb (0x7 ,OMAP1510_FPGA_LCD_PANEL_CONTROL ); +__raw_writeb (0x7 , omap1510_fpga_lcd_panel_control);return 0 ; }static void innovator1510_panel_disable (struct lcd_panel *panel) { -__raw_writeb (0x0 ,OMAP1510_FPGA_LCD_PANEL_CONTROL ); +__raw_writeb (0x0 , omap1510_fpga_lcd_panel_control); }static struct lcd_panel innovator1510_panel = {
@@ -48,6 +50,7 @@ static struct lcd_panel innovator1510_panel = {static int innovator1510_panel_probe (struct platform_device *pdev) { + omap1510_fpga_lcd_panel_control = (void __iomem *)pdev->dev.platform_data;omapfb_register_panel (&innovator1510_panel);return 0 ; }
Signature · 1 line
2.29.2
PATCH 3/41 ARM: omap1: move lcd_dma code into omapfb driver
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The omapfb driver is split into platform specific code for omap1, and driver code that is also specific to omap1.
Moving both parts into the driver directory simplifies the structure and avoids the dependency on certain omap machine header files.
As mach/lcd_dma.h can not be included from include/linux/omap-dma.h any more now, move the omap_lcd_dma_running() declaration into the omap-dma header, which matches where it is defined.
---
arch/arm/mach-omap1/Makefile | 4 --
arch/arm/mach-omap1/include/mach/lcdc.h | 44 -------------------
drivers/video/fbdev/Makefile | 2 +-
drivers/video/fbdev/omap/Makefile | 5 +++
.../video/fbdev/omap}/lcd_dma.c | 4 +-
.../video/fbdev/omap}/lcd_dma.h | 2 -
drivers/video/fbdev/omap/lcdc.c | 2 +-
drivers/video/fbdev/omap/lcdc.h | 35 +++++++++++++++
drivers/video/fbdev/omap/sossi.c | 1 +
include/linux/omap-dma.h | 4 +-
10 files changed, 48 insertions(+), 55 deletions(-)
delete mode 100644 arch/arm/mach-omap1/include/mach/lcdc.h
rename {arch/arm/mach-omap1 => drivers/video/fbdev/omap}/lcd_dma.c (99%)
rename {arch/arm/mach-omap1/include/mach => drivers/video/fbdev/omap}/lcd_dma.h (98%)arch/arm/mach-omap1/Makefile +0 -4
@@ -57,7 +57,3 @@ obj-$(CONFIG_ARCH_OMAP730) += gpio7xx.o obj-$(CONFIG_ARCH_OMAP850) += gpio7xx.o obj-$(CONFIG_ARCH_OMAP15XX) += gpio15xx.o obj-$(CONFIG_ARCH_OMAP16XX) += gpio16xx.o - -ifneq ($(CONFIG_FB_OMAP),) -obj-y += lcd_dma.o -endif
arch/arm/mach-omap1/include/mach/lcdc.h deleted +0 -44
44 lines not on this page · raw message
drivers/video/fbdev/Makefile +1 -1
@@ -110,7 +110,7 @@ obj-$(CONFIG_FB_UDL) += udlfb.o obj-$(CONFIG_FB_SMSCUFX) += smscufx.o obj-$(CONFIG_FB_XILINX) += xilinxfb.o obj-$(CONFIG_FB_SH_MOBILE_LCDC) += sh_mobile_lcdcfb.o -obj-$(CONFIG_FB_OMAP) += omap/ +obj-y += omap/ obj-y += omap2/ obj-$(CONFIG_XEN_FBDEV_FRONTEND) += xen-fbfront.o obj-$(CONFIG_FB_CARMINE) += carminefb.o
drivers/video/fbdev/omap/Makefile +5 -0
@@ -5,6 +5,11 @@ obj-$(CONFIG_FB_OMAP) += omapfb.o +ifdef CONFIG_FB_OMAP +# must be built-in +obj-y += lcd_dma.o +endif + objs-yy := omapfb_main.o lcdc.o objs-y$(CONFIG_FB_OMAP_LCDC_EXTERNAL) += sossi.o
drivers/video/fbdev/omap/lcd_dma.c renamed from arch/arm/mach-omap1/lcd_dma.c +3 -1
@@ -26,7 +26,9 @@#include <linux/omap-dma.h> #include <mach/hardware.h> -#include <mach/lcdc.h> + +#include "lcdc.h" +#include "lcd_dma.h" int omap_lcd_dma_running (void ) {
drivers/video/fbdev/omap/lcd_dma.h renamed from arch/arm/mach-omap1/include/mach/lcd_dma.h +0 -2
@@ -60,6 +60,4 @@ extern void omap_set_lcd_dma_b1_vxres(unsigned long vxres);extern void omap_set_lcd_dma_b1_mirror (int mirror);extern void omap_set_lcd_dma_b1_scale (unsigned int xscale,unsigned int yscale); -extern int omap_lcd_dma_running (void ); -#endif /* __MACH_OMAP1_LCD_DMA_H__ */
drivers/video/fbdev/omap/lcdc.c +1 -1
@@ -17,7 +17,6 @@#include <linux/clk.h> #include <linux/gfp.h> -#include <mach/lcdc.h> #include <linux/omap-dma.h> #include <asm/mach-types.h>
@@ -25,6 +24,7 @@#include "omapfb.h" #include "lcdc.h" +#include "lcd_dma.h" #define MODULE_NAME "lcdc"
drivers/video/fbdev/omap/lcdc.h +35 -0
@@ -1,6 +1,41 @@/* SPDX-License-Identifier: GPL-2.0 */ #ifndef LCDC_H #define LCDC_H +/* +* Copyright (C) 2004 Nokia Corporation +* Author: Imre Deak <[email protected]> +*/ +#define OMAP_LCDC_BASE 0xfffec000 +#define OMAP_LCDC_SIZE 256 +#define OMAP_LCDC_IRQ INT_LCD_CTRL + +#define OMAP_LCDC_CONTROL (OMAP_LCDC_BASE + 0x00) +#define OMAP_LCDC_TIMING0 (OMAP_LCDC_BASE + 0x04) +#define OMAP_LCDC_TIMING1 (OMAP_LCDC_BASE + 0x08) +#define OMAP_LCDC_TIMING2 (OMAP_LCDC_BASE + 0x0c) +#define OMAP_LCDC_STATUS (OMAP_LCDC_BASE + 0x10) +#define OMAP_LCDC_SUBPANEL (OMAP_LCDC_BASE + 0x14) +#define OMAP_LCDC_LINE_INT (OMAP_LCDC_BASE + 0x18) +#define OMAP_LCDC_DISPLAY_STATUS (OMAP_LCDC_BASE + 0x1c) + +#define OMAP_LCDC_STAT_DONE (1 << 0) +#define OMAP_LCDC_STAT_VSYNC (1 << 1) +#define OMAP_LCDC_STAT_SYNC_LOST (1 << 2) +#define OMAP_LCDC_STAT_ABC (1 << 3) +#define OMAP_LCDC_STAT_LINE_INT (1 << 4) +#define OMAP_LCDC_STAT_FUF (1 << 5) +#define OMAP_LCDC_STAT_LOADED_PALETTE (1 << 6) + +#define OMAP_LCDC_CTRL_LCD_EN (1 << 0) +#define OMAP_LCDC_CTRL_LCD_TFT (1 << 7) +#define OMAP_LCDC_CTRL_LINE_IRQ_CLR_SEL (1 << 10) + +#define OMAP_LCDC_IRQ_VSYNC (1 << 2) +#define OMAP_LCDC_IRQ_DONE (1 << 3) +#define OMAP_LCDC_IRQ_LOADED_PALETTE (1 << 4) +#define OMAP_LCDC_IRQ_LINE_NIRQ (1 << 5) +#define OMAP_LCDC_IRQ_LINE (1 << 6) +#define OMAP_LCDC_IRQ_MASK (((1 << 5) - 1) << 2)int omap_lcdc_set_dma_callback (void (*callback)(void *data),void *data);void omap_lcdc_free_dma_callback (void );
drivers/video/fbdev/omap/sossi.c +1 -0
@@ -15,6 +15,7 @@#include <linux/omap-dma.h> #include "omapfb.h" +#include "lcd_dma.h" #include "lcdc.h" #define MODULE_NAME "omapfb-sossi"
include/linux/omap-dma.h +2 -2
@@ -328,8 +328,8 @@ extern dma_addr_t omap_get_dma_dst_pos(int lch);extern int omap_get_dma_active_status (int lch);extern int omap_dma_running (void ); -#if defined(CONFIG_ARCH_OMAP1 ) &&IS_ENABLED (CONFIG_FB_OMAP ) -#include <mach/lcd_dma.h> +#if IS_ENABLED (CONFIG_FB_OMAP ) +extern int omap_lcd_dma_running (void );#else static inline int omap_lcd_dma_running (void ) {
Signature · 1 line
2.29.2
PATCH 4/41 ARM: omap1: declare a dummy omap_set_dma_priority
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
omapfb calls directly into the omap_set_dma_priority() function in the DMA driver. This prevents compile-testing omapfb on other architectures. Add an inline function next to the other ones for non-omap configurations.
--- include/linux/omap-dma.h | 3 +++ 1 file changed, 3 insertions(+)
include/linux/omap-dma.h +3 -0
@@ -338,6 +338,9 @@ static inline int omap_lcd_dma_running(void)#endif #else /* CONFIG_ARCH_OMAP */ +static inline void omap_set_dma_priority (int lch,int dst_port,int priority) +{ +}static inline struct omap_system_dma_plat_info *omap_get_plat_info (void ) {
Signature · 1 line
2.29.2
PATCH 5/41 fbdev: omap: pass irqs as resource
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
To avoid relying on the mach/irqs.h header, stop using OMAP_LCDC_IRQ and INT_1610_SoSSI_MATCH directly in the driver code, but instead pass these as resources.
--- arch/arm/mach-omap1/fb.c | 19 ++++++++++++++++++- drivers/video/fbdev/omap/lcdc.c | 6 +++--- drivers/video/fbdev/omap/omapfb.h | 2 ++ drivers/video/fbdev/omap/omapfb_main.c | 16 +++++++++++++++- drivers/video/fbdev/omap/sossi.c | 2 +- 5 files changed, 39 insertions(+), 6 deletions(-)
arch/arm/mach-omap1/fb.c +18 -1
@@ -17,9 +17,12 @@#include <linux/io.h> #include <linux/omapfb.h> #include <linux/dma-mapping.h> +#include <linux/irq.h> #include <asm/mach/map.h> +#include <mach/irqs.h> +#if IS_ENABLED (CONFIG_FB_OMAP )static bool omapfb_lcd_configured;
@@ -27,6 +30,19 @@ static struct omapfb_platform_data omapfb_config;static u64 omap_fb_dma_mask = ~(u32 )0 ; +struct resource omap_fb_resources[] = { + { + .name ="irq" , + .start =INT_LCD_CTRL , + .flags =IORESOURCE_IRQ , + }, + { + .name ="irq" , + .start =INT_SOSSI_MATCH , + .flags =IORESOURCE_IRQ , + }, +}; +static struct platform_device omap_fb_device = { .name ="omapfb" , .id =-1 ,
@@ -35,7 +51,8 @@ static struct platform_device omap_fb_device = { .coherent_dma_mask = DMA_BIT_MASK(32), .platform_data = &omapfb_config, }, - .num_resources = 0, + .num_resources = ARRAY_SIZE(omap_fb_resources), + .resource = omap_fb_resources, };void __init omapfb_set_lcd_config (const struct omap_lcd_config *config)
drivers/video/fbdev/omap/lcdc.c +3 -3
@@ -713,7 +713,7 @@ static int omap_lcdc_init(struct omapfb_device *fbdev, int ext_mode, }clk_enable (lcdc.lcd_ck); - r =request_irq (OMAP_LCDC_IRQ , lcdc_irq_handler,0 ,MODULE_NAME , fbdev); + r =request_irq (fbdev->int_irq, lcdc_irq_handler,0 ,MODULE_NAME , fbdev);if (r) {dev_err (fbdev->dev,"unable to get IRQ\n" ); goto fail2;
@@ -744,7 +744,7 @@ static int omap_lcdc_init(struct omapfb_device *fbdev, int ext_mode, fail4:omap_free_lcd_dma (); fail3: -free_irq (OMAP_LCDC_IRQ , lcdc.fbdev); +free_irq (fbdev->int_irq, lcdc.fbdev); fail2:clk_disable (lcdc.lcd_ck); fail1:
@@ -759,7 +759,7 @@ static void omap_lcdc_cleanup(void)free_palette_ram ();free_fbmem ();omap_free_lcd_dma (); -free_irq (OMAP_LCDC_IRQ , lcdc.fbdev); +free_irq (lcdc.fbdev->int_irq, lcdc.fbdev);clk_disable (lcdc.lcd_ck);clk_put (lcdc.lcd_ck); }
drivers/video/fbdev/omap/omapfb.h +2 -0
@@ -204,6 +204,8 @@ struct omapfb_device {struct lcd_panel *panel;/* LCD panel */ const struct lcd_ctrl *ctrl;/* LCD controller */ const struct lcd_ctrl *int_ctrl;/* internal LCD ctrl */ +int ext_irq; +int int_irq;struct lcd_ctrl_extif *ext_if;/* LCD ctrl external interface */ struct device *dev;
drivers/video/fbdev/omap/omapfb_main.c +15 -1
@@ -1624,7 +1624,7 @@ static int omapfb_do_probe(struct platform_device *pdev, init_state =0 ; -if (pdev->num_resources !=0 ) { +if (pdev->num_resources !=2 ) {dev_err (&pdev->dev,"probed for an unknown device\n" ); r = -ENODEV ; goto cleanup;
@@ -1643,6 +1643,20 @@ static int omapfb_do_probe(struct platform_device *pdev, r = -ENOMEM ; goto cleanup; } + fbdev->int_irq =platform_get_irq (pdev,0 ); +if (!fbdev->int_irq) { +dev_err (&pdev->dev,"unable to get irq\n" ); + r =ENXIO ; + goto cleanup; + } + + fbdev->ext_irq =platform_get_irq (pdev,1 ); +if (!fbdev->ext_irq) { +dev_err (&pdev->dev,"unable to get irq\n" ); + r =ENXIO ; + goto cleanup; + } + init_state++; fbdev->dev = &pdev->dev;
drivers/video/fbdev/omap/sossi.c +1 -1
@@ -639,7 +639,7 @@ static int sossi_init(struct omapfb_device *fbdev) l &= ~(1 <<31 );/* REORDERING */ sossi_write_reg (SOSSI_INIT1_REG , l); -if ((r =request_irq (INT_1610_SoSSI_MATCH, sossi_match_irq, +if ((r =request_irq (fbdev->ext_irq, sossi_match_irq,IRQ_TYPE_EDGE_FALLING ,"sossi_match" , sossi.fbdev->dev)) <0 ) {dev_err (sossi.fbdev->dev,"can't get SoSSI match IRQ\n" );
Signature · 1 line
2.29.2
PATCH 6/41 ARM: omap1: ams-delta: remove camera leftovers
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The obsolete camera support was removed, but a few lines remain in this file and cause a warning:
arch/arm/mach-omap1/board-ams-delta.c:462:12: warning: 'ams_delta_camera_power' defined but not used [-Wunused-function]
462 | static int ams_delta_camera_power(struct device *dev, int power)
Remove this and all related lines as well.
--- arch/arm/mach-omap1/board-ams-delta.c | 11 ----------- 1 file changed, 11 deletions(-)
arch/arm/mach-omap1/board-ams-delta.c +0 -11
@@ -407,9 +407,6 @@ static struct gpio_led gpio_leds[] __initdata = { [LATCH1_PIN_LED_CAMERA] = { .name = "camera", .default_state = LEDS_GPIO_DEFSTATE_OFF, -#ifdef CONFIG_LEDS_TRIGGERS - .default_trigger = "ams_delta_camera", -#endif }, [LATCH1_PIN_LED_ADVERT] = { .name = "advert",
@@ -456,10 +453,6 @@ static struct gpiod_lookup_table leds_gpio_table = { }, }; -#ifdef CONFIG_LEDS_TRIGGERS -DEFINE_LED_TRIGGER (ams_delta_camera_led_trigger); -#endif -static struct platform_device ams_delta_audio_device = { .name ="ams-delta-audio" , .id =-1 ,
@@ -705,10 +698,6 @@ static void __init ams_delta_init(void)omap_register_i2c_bus (1 ,100 ,NULL ,0 );omap1_usb_init (&ams_delta_usb_config); -#ifdef CONFIG_LEDS_TRIGGERS -led_trigger_register_simple ("ams_delta_camera" , - &ams_delta_camera_led_trigger); -#endif platform_add_devices (ams_delta_devices,ARRAY_SIZE (ams_delta_devices));/*
Signature · 1 line
2.29.2
PATCH 7/41 ARM: omap1: move mach/usb.h to include/linux/soc
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The register definitions in this header are used in at least four different places, with little hope of completely cleaning that up.
Split up the file into a portion that becomes a linux-wide header under include/linux/soc/ti/, and the parts that are actually only needed by board files.
--- arch/arm/mach-omap1/board-ams-delta.c | 2 +- arch/arm/mach-omap1/board-generic.c | 2 +- arch/arm/mach-omap1/board-h2.c | 2 +- arch/arm/mach-omap1/board-h3.c | 2 +- arch/arm/mach-omap1/board-htcherald.c | 2 +- arch/arm/mach-omap1/board-innovator.c | 2 +- arch/arm/mach-omap1/board-nokia770.c | 2 +- arch/arm/mach-omap1/board-osk.c | 2 +- arch/arm/mach-omap1/board-palmte.c | 2 +- arch/arm/mach-omap1/board-palmtt.c | 2 +- arch/arm/mach-omap1/board-palmz71.c | 2 +- arch/arm/mach-omap1/board-sx1.c | 2 +- arch/arm/mach-omap1/clock_data.c | 2 +- arch/arm/mach-omap1/usb.c | 2 +- arch/arm/mach-omap1/usb.h | 25 +++++++++++++++++ drivers/usb/gadget/udc/omap_udc.c | 3 +- drivers/usb/host/ohci-omap.c | 4 +-- drivers/usb/phy/phy-isp1301-omap.c | 2 +- .../usb.h => include/linux/soc/ti/omap1-usb.h | 28 ++++++------------- 19 files changed, 52 insertions(+), 38 deletions(-) create mode 100644 arch/arm/mach-omap1/usb.h rename arch/arm/mach-omap1/include/mach/usb.h => include/linux/soc/ti/omap1-usb.h (86%)
arch/arm/mach-omap1/board-ams-delta.c +1 -1
@@ -38,7 +38,7 @@#include <mach/mux.h> #include <mach/hardware.h> -#include <mach/usb.h> +#include "usb.h" #include "ams-delta-fiq.h" #include "board-ams-delta.h"
arch/arm/mach-omap1/board-generic.c +1 -1
@@ -21,7 +21,7 @@#include <mach/mux.h> -#include <mach/usb.h> +#include "usb.h" #include "common.h"
arch/arm/mach-omap1/board-h2.c +1 -1
@@ -42,7 +42,7 @@#include "flash.h" #include <mach/hardware.h> -#include <mach/usb.h> +#include "usb.h" #include "common.h" #include "board-h2.h"
arch/arm/mach-omap1/board-h3.c +1 -1
@@ -45,7 +45,7 @@#include <mach/hardware.h> #include <mach/irqs.h> -#include <mach/usb.h> +#include "usb.h" #include "common.h" #include "board-h3.h"
arch/arm/mach-omap1/board-htcherald.c +1 -1
@@ -31,7 +31,7 @@#include "mmc.h" #include <mach/irqs.h> -#include <mach/usb.h> +#include "usb.h" #include "common.h"
arch/arm/mach-omap1/board-innovator.c +1 -1
@@ -34,7 +34,7 @@#include <linux/platform_data/keypad-omap.h> #include <mach/hardware.h> -#include <mach/usb.h> +#include "usb.h" #include "iomap.h" #include "common.h"
arch/arm/mach-omap1/board-nokia770.c +1 -1
@@ -31,7 +31,7 @@#include <mach/mux.h> #include <mach/hardware.h> -#include <mach/usb.h> +#include "usb.h" #include "common.h" #include "clock.h"
arch/arm/mach-omap1/board-osk.c +1 -1
@@ -52,7 +52,7 @@#include <mach/tc.h> #include <mach/hardware.h> -#include <mach/usb.h> +#include "usb.h" #include "common.h"
arch/arm/mach-omap1/board-palmte.c +1 -1
@@ -38,7 +38,7 @@#include <linux/platform_data/keypad-omap.h> #include <mach/hardware.h> -#include <mach/usb.h> +#include "usb.h" #include "mmc.h" #include "common.h"
arch/arm/mach-omap1/board-palmtt.c +1 -1
@@ -38,7 +38,7 @@#include <linux/platform_data/keypad-omap.h> #include <mach/hardware.h> -#include <mach/usb.h> +#include "usb.h" #include "common.h"
arch/arm/mach-omap1/board-palmz71.c +1 -1
@@ -40,7 +40,7 @@#include <linux/platform_data/keypad-omap.h> #include <mach/hardware.h> -#include <mach/usb.h> +#include "usb.h" #include "common.h"
arch/arm/mach-omap1/board-sx1.c +1 -1
@@ -38,7 +38,7 @@#include "board-sx1.h" #include <mach/hardware.h> -#include <mach/usb.h> +#include "usb.h" #include "common.h"
arch/arm/mach-omap1/clock_data.c +1 -1
@@ -22,7 +22,7 @@#include "soc.h" #include <mach/hardware.h> -#include <mach/usb.h> /* for OTG_BASE */ +#include "usb.h" /* for OTG_BASE */ #include "iomap.h" #include "clock.h"
arch/arm/mach-omap1/usb.c +1 -1
@@ -17,7 +17,7 @@#include <mach/mux.h> -#include <mach/usb.h> +#include "usb.h" #include "common.h"
arch/arm/mach-omap1/usb.h new file +25 -0
@@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* fixme correct answer depends on hmc_mode, +* as does (on omap1) any nonzero value for config->otg port number +*/ +#include <linux/platform_data/usb-omap1.h> +#include <linux/soc/ti/omap1-usb.h> + +#if IS_ENABLED (CONFIG_USB_OMAP ) +#define is_usb0_device (config) 1 +#else +#define is_usb0_device (config) 0 +#endif + +#if IS_ENABLED (CONFIG_USB_SUPPORT ) +void omap1_usb_init (struct omap_usb_config *pdata); +#else +static inline void omap1_usb_init (struct omap_usb_config *pdata) +{ +} +#endif + +#define OMAP1_OHCI_BASE 0xfffba000 +#define OMAP2_OHCI_BASE 0x4805e000 +#define OMAP_OHCI_BASE OMAP1_OHCI_BASE
drivers/usb/gadget/udc/omap_udc.c +2 -1
@@ -40,8 +40,9 @@#include <asm/mach-types.h> #include <linux/omap-dma.h> +#include <linux/platform_data/usb-omap1.h> -#include <mach/usb.h> +#include <linux/soc/ti/omap1-usb.h> #include "omap_udc.h"
drivers/usb/host/ohci-omap.c +2 -2
@@ -25,6 +25,8 @@#include <linux/module.h> #include <linux/usb/otg.h> #include <linux/platform_device.h> +#include <linux/platform_data/usb-omap1.h> +#include <linux/soc/ti/omap1-usb.h> #include <linux/signal.h> #include <linux/usb.h> #include <linux/usb/hcd.h>
@@ -37,8 +39,6 @@#include <mach/mux.h> #include <mach/hardware.h> -#include <mach/usb.h> -#define DRIVER_DESC "OHCI OMAP driver"
drivers/usb/phy/phy-isp1301-omap.c +1 -1
@@ -25,7 +25,7 @@#include <mach/mux.h> -#include <mach/usb.h> +#include <linux/soc/ti/omap1-usb.h> #undef VERBOSE
include/linux/soc/ti/omap1-usb.h renamed from arch/arm/mach-omap1/include/mach/usb.h +8 -20
@@ -1,34 +1,20 @@/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __SOC_TI_OMAP1_USB +#define __SOC_TI_OMAP1_USB/* -* FIXME correct answer depends on hmc_mode, -* as does (on omap1) any nonzero value for config->otg port number +* Constants in this file are used all over the place, in platform +* code, as well as the udc, phy and ohci drivers. +* This is not a great design, but unlikely to get fixed after +* such a long time. Don't do this elsewhere. */ -#if IS_ENABLED (CONFIG_USB_OMAP ) -#define is_usb0_device (config) 1 -#else -#define is_usb0_device (config) 0 -#endif - -#include <linux/platform_data/usb-omap1.h> - -#if IS_ENABLED (CONFIG_USB_SUPPORT ) -void omap1_usb_init (struct omap_usb_config *pdata); -#else -static inline void omap1_usb_init (struct omap_usb_config *pdata) -{ -} -#endif #define OMAP1_OTG_BASE 0xfffb0400#define OMAP1_UDC_BASE 0xfffb4000 -#define OMAP1_OHCI_BASE 0xfffba000 -#define OMAP2_OHCI_BASE 0x4805e000#define OMAP2_UDC_BASE 0x4805e200#define OMAP2_OTG_BASE 0x4805e300#define OTG_BASE OMAP1_OTG_BASE#define UDC_BASE OMAP1_UDC_BASE -#define OMAP_OHCI_BASE OMAP1_OHCI_BASE/* * OTG and transceiver registers, for OMAPs starting with ARM926
@@ -126,3 +112,5 @@ static inline void omap1_usb_init(struct omap_usb_config *pdata)# define CONF_USB0_ISOLATE_R (1 << 3)# define CONF_USB_PWRDN_DM_R (1 << 2)# define CONF_USB_PWRDN_DP_R (1 << 1) + +#endif
Signature · 1 line
2.29.2
PATCH 8/41 ARM: omap1: move some headers to include/linux/soc
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
There are three remaining header files that are used by omap1 specific device drivers:
- mach/soc.h provides cpu_is_omapXXX abstractions
- mach/hardware.h provides omap_read/omap_write functions and physical addresses
- mach/mux.h provides an omap specific pinctrl abstraction
This is generally not how we do platform abstractions today, and it would be good to completely get rid of these in favor of passing information through platform devices and the pinctrl subsystem.
However, given that nobody is working on that, just move it one step forward by splitting out the header files that are used by drivers today from the machine headers that are only used internally.
--- arch/arm/mach-omap1/board-ams-delta.c | 1 + arch/arm/mach-omap1/include/mach/hardware.h | 128 +------ arch/arm/mach-omap1/include/mach/memory.h | 2 +- arch/arm/mach-omap1/include/mach/mux.h | 299 +---------------- arch/arm/mach-omap1/soc.h | 6 +- arch/arm/plat-omap/dma.c | 4 +- include/linux/soc/ti/omap1-io.h | 143 ++++++++ include/linux/soc/ti/omap1-mux.h | 311 ++++++++++++++++++ .../soc.h => include/linux/soc/ti/omap1-soc.h | 22 -- 9 files changed, 467 insertions(+), 449 deletions(-) create mode 100644 include/linux/soc/ti/omap1-io.h create mode 100644 include/linux/soc/ti/omap1-mux.h rename arch/arm/mach-omap1/include/mach/soc.h => include/linux/soc/ti/omap1-soc.h (90%)
arch/arm/mach-omap1/board-ams-delta.c +1 -0
@@ -28,6 +28,7 @@#include <linux/omapfb.h> #include <linux/io.h> #include <linux/platform_data/gpio-omap.h> +#include <linux/soc/ti/omap1-mux.h> #include <asm/serial.h> #include <asm/mach-types.h>
arch/arm/mach-omap1/include/mach/hardware.h +2 -126
154 lines not on this page · raw message
arch/arm/mach-omap1/include/mach/memory.h +1 -1
@@ -7,6 +7,6 @@#define __ASM_ARCH_MEMORY_H/* REVISIT: omap1 legacy drivers still rely on this */ -#include <mach/soc.h> +#include <mach/hardware.h> #endif
arch/arm/mach-omap1/include/mach/mux.h +2 -297
320 lines not on this page · raw message
arch/arm/mach-omap1/soc.h +4 -2
@@ -1,4 +1,6 @@/* -* We can move mach/soc.h here once the drivers are fixed +* We can move linux/soc/ti/omap1-soc.h here once the drivers are fixed */ -#include <mach/soc.h> +#include <mach/hardware.h> +#include <mach/irqs.h> +#include <asm/irq.h>
arch/arm/plat-omap/dma.c +3 -1
@@ -35,7 +35,9 @@#include <linux/omap-dma.h> #ifdef CONFIG_ARCH_OMAP1 -#include <mach/soc.h> +#include <mach/hardware.h> +#include <linux/soc/ti/omap1-io.h> +#include <linux/soc/ti/omap1-soc.h> #endif /*
include/linux/soc/ti/omap1-io.h new file +143 -0
143 lines not on this page · raw message
include/linux/soc/ti/omap1-mux.h new file +311 -0
311 lines not on this page · raw message
include/linux/soc/ti/omap1-soc.h renamed from arch/arm/mach-omap1/include/mach/soc.h +0 -22
@@ -14,14 +14,6 @@#ifndef __ASM_ARCH_OMAP_CPU_H#define __ASM_ARCH_OMAP_CPU_H -#include <asm/irq.h> -#include <mach/hardware.h> -#include <mach/irqs.h> - -#ifndef __ASSEMBLY__ - -#include <linux/bitops.h> -/* * Test if multicore OMAP support is needed */
@@ -176,20 +168,7 @@ IS_OMAP_TYPE(1710, 0x1710)#define cpu_is_omap1621 () 0#define cpu_is_omap1710 () 0 -/* These are needed to compile common code */ -#ifdef CONFIG_ARCH_OMAP1 -#define cpu_is_omap242x () 0 -#define cpu_is_omap2430 () 0 -#define cpu_is_omap243x () 0 -#define cpu_is_omap24xx () 0 -#define cpu_is_omap34xx () 0 -#define cpu_is_omap44xx () 0 -#define soc_is_omap54xx () 0 -#define soc_is_dra7xx () 0 -#define soc_is_am33xx () 0#define cpu_class_is_omap1 () 1 -#define cpu_class_is_omap2 () 0 -#endif /* * Whether we have MULTI_OMAP1 or not, we still need to distinguish
@@ -216,5 +195,4 @@ IS_OMAP_TYPE(1710, 0x1710)# define cpu_is_omap1710 () is_omap1710()#endif -#endif /* __ASSEMBLY__ */ #endif
Signature · 1 line
2.29.2
PATCH 9/41 ARM: omap1: move perseus spi pinconf to board file
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The driver has always had a FIXME about this, and it seems like this trivial code move avoids a mach header inclusion, so just do it.
With that out of the way, and the header file inclusions changed to global files, the driver can also be compile-tested on other platforms.
--- arch/arm/mach-omap1/board-perseus2.c | 6 ++++++ drivers/spi/Kconfig | 2 +- drivers/spi/spi-omap-uwire.c | 15 +++------------ 3 files changed, 10 insertions(+), 13 deletions(-)
arch/arm/mach-omap1/board-perseus2.c +6 -0
@@ -289,6 +289,12 @@ static void __init omap_perseus2_init(void)omap_cfg_reg (F4_7XX_KBC3 );omap_cfg_reg (E3_7XX_KBC4 ); +if (IS_ENABLED (CONFIG_SPI_OMAP_UWIRE )) { +/* configure pins: MPU_UW_nSCS1, MPU_UW_SDO, MPU_UW_SCLK */ +int val =omap_readl (OMAP7XX_IO_CONF_9 ) & ~0x00EEE000 ; +omap_writel (val |0x00AAA000 ,OMAP7XX_IO_CONF_9 ); + } +platform_add_devices (devices,ARRAY_SIZE (devices));omap_serial_init ();
drivers/spi/Kconfig +1 -1
@@ -631,7 +631,7 @@ config SPI_OCTEON config SPI_OMAP_UWIRE tristate "OMAP1 MicroWire" - depends on ARCH_OMAP1 + depends on ARCH_OMAP1 || (ARM && COMPILE_TEST) select SPI_BITBANG help This hooks up to the MicroWire controller on OMAP1 chips.
drivers/spi/spi-omap-uwire.c +3 -12
@@ -44,13 +44,10 @@#include <linux/module.h> #include <linux/io.h> -#include <mach/hardware.h> #include <asm/mach-types.h> - -#include <mach/mux.h> - -#include <mach/omap7xx.h> /* OMAP7XX_IO_CONF registers */ - +#include <linux/soc/ti/omap1-io.h> +#include <linux/soc/ti/omap1-soc.h> +#include <linux/soc/ti/omap1-mux.h> /* FIXME address is now a platform device resource, * and irqs should show there too...
@@ -548,12 +545,6 @@ static int __init omap_uwire_init(void)omap_cfg_reg (N14_1610_UWIRE_CS0 );omap_cfg_reg (N15_1610_UWIRE_CS1 ); } -if (machine_is_omap_perseus2 ()) { -/* configure pins: MPU_UW_nSCS1, MPU_UW_SDO, MPU_UW_SCLK */ -int val =omap_readl (OMAP7XX_IO_CONF_9 ) & ~0x00EEE000 ; -omap_writel (val |0x00AAA000 ,OMAP7XX_IO_CONF_9 ); - } -return platform_driver_register (&uwire_driver); }
Signature · 1 line
2.29.2
PATCH 10/41 ARM: omap1: move CF chipselect setup to board file
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
There is only one board that uses the omap_cf driver, so moving the chipselect configuration there does not lead to code duplication but avoids the use of mach/tc.h in drivers.
--- arch/arm/mach-omap1/board-osk.c | 38 ++++++++++++++++++++++++++++----- drivers/pcmcia/Kconfig | 3 ++- drivers/pcmcia/omap_cf.c | 38 ++++++--------------------------- 3 files changed, 42 insertions(+), 37 deletions(-)
arch/arm/mach-omap1/board-osk.c +33 -5
@@ -153,14 +153,14 @@ static struct resource osk5912_cf_resources[] = { [0 ] = { .flags =IORESOURCE_IRQ , }, + [1 ] = { + .flags =IORESOURCE_MEM , + }, };static struct platform_device osk5912_cf_device = { .name ="omap_cf" , .id =-1 , - .dev = { - .platform_data = (void *)2 /* CS2 */ , - }, .num_resources =ARRAY_SIZE (osk5912_cf_resources), .resource = osk5912_cf_resources, };
@@ -275,13 +275,41 @@ static void __init osk_init_smc91x(void)omap_writel (l,EMIFS_CCS (1 )); } -static void __init osk_init_cf (void ) +static void __init osk_init_cf (int seg) { +struct resource *res = &osk5912_cf_resources[1 ]; +omap_cfg_reg (M7_1610_GPIO62 );if ((gpio_request (62 ,"cf_irq" )) <0 ) {printk ("Error requesting gpio 62 for CF irq\n" );return ; } + +switch (seg) { +/* NOTE: CS0 could be configured too ... */ +case 1 : + res->start =OMAP_CS1_PHYS ; +break ; +case 2 : + res->start =OMAP_CS2_PHYS ; +break ; +case 3 : + res->start =omap_cs3_phys (); +break ; + } + + res->end = res->start +SZ_8K -1 ; + osk5912_cf_device.dev.platform_data = (void *)(uintptr_t )seg; + +/* NOTE: better EMIFS setup might support more cards; but the +* TRM only shows how to affect regular flash signals, not their +* CF/PCMCIA variants... +*/ +pr_debug ("%s: cs%d, previous ccs %08x acs %08x\n" , __func__, + seg,omap_readl (EMIFS_CCS (seg)),omap_readl (EMIFS_ACS (seg))); +omap_writel (0x0004a1b3 ,EMIFS_CCS (seg));/* synch mode 4 etc */ +omap_writel (0x00000000 ,EMIFS_ACS (seg));/* OE hold/setup */ +/* the CF I/O IRQ is really active-low */ irq_set_irq_type (gpio_to_irq (62 ),IRQ_TYPE_EDGE_FALLING ); }
@@ -580,7 +608,7 @@ static void __init osk_init(void)u32 l;osk_init_smc91x (); -osk_init_cf (); +osk_init_cf (2 );/* CS2 */ /* Workaround for wrong CS3 (NOR flash) timing * There are some U-Boot versions out there which configure
drivers/pcmcia/Kconfig +2 -1
@@ -246,7 +246,8 @@ config PCMCIA_VRC4171 config OMAP_CF tristate "OMAP CompactFlash Controller" - depends on PCMCIA && ARCH_OMAP16XX + depends on PCMCIA + depends on ARCH_OMAP16XX || (ARM && COMPILE_TEST) help Say Y here to support the CompactFlash controller on OMAP. Note that this doesn't support "True IDE" mode.
drivers/pcmcia/omap_cf.c +7 -31
@@ -16,13 +16,12 @@#include <pcmcia/ss.h> -#include <mach/hardware.h> #include <asm/io.h> #include <linux/sizes.h> -#include <mach/mux.h> -#include <mach/tc.h> - +#include <linux/soc/ti/omap1-io.h> +#include <linux/soc/ti/omap1-soc.h> +#include <linux/soc/ti/omap1-mux.h> /* NOTE: don't expect this to support many I/O cards. The 16xx chips have * hard-wired timings to support Compact Flash memory cards; they won't work
@@ -205,6 +204,7 @@ static int __init omap_cf_probe(struct platform_device *pdev)struct omap_cf_socket *cf;int irq;int status; +struct resource *res; seg = (int ) pdev->dev.platform_data;if (seg ==0 || seg >3 )
@@ -215,6 +215,8 @@ static int __init omap_cf_probe(struct platform_device *pdev)if (irq <0 )return -EINVAL ; + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); + cf =kzalloc (sizeof *cf,GFP_KERNEL );if (!cf)return -ENOMEM ;
@@ -230,24 +232,7 @@ static int __init omap_cf_probe(struct platform_device *pdev) goto fail0; cf->irq = irq; cf->socket.pci_irq = irq; - -switch (seg) { -/* NOTE: CS0 could be configured too ... */ -case 1 : - cf->phys_cf =OMAP_CS1_PHYS ; -break ; -case 2 : - cf->phys_cf =OMAP_CS2_PHYS ; -break ; -case 3 : - cf->phys_cf =omap_cs3_phys (); -break ; -default : - goto fail1; - } - cf->iomem.start = cf->phys_cf; - cf->iomem.end = cf->iomem.end +SZ_8K -1 ; - cf->iomem.flags =IORESOURCE_MEM ; + cf->phys_cf = res->start;/* pcmcia layer only remaps "real" memory */ cf->socket.io_offset = (unsigned long)
@@ -273,15 +258,6 @@ static int __init omap_cf_probe(struct platform_device *pdev)pr_info ("%s: cs%d on irq %d\n" , driver_name, seg, irq); -/* NOTE: better EMIFS setup might support more cards; but the -* TRM only shows how to affect regular flash signals, not their -* CF/PCMCIA variants... -*/ -pr_debug ("%s: cs%d, previous ccs %08x acs %08x\n" , driver_name, - seg,omap_readl (EMIFS_CCS (seg)),omap_readl (EMIFS_ACS (seg))); -omap_writel (0x0004a1b3 ,EMIFS_CCS (seg));/* synch mode 4 etc */ -omap_writel (0x00000000 ,EMIFS_ACS (seg));/* OE hold/setup */ -/* CF uses armxor_ck, which is "always" available */ pr_debug("%s: sts %04x cfg %04x control %04x %s\n", driver_name,
Signature · 1 line
2.29.2
PATCH 11/41 fbdev: omap: avoid using mach/*.h files
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
All the headers we actually need are now in include/linux/soc, so use those versions instead and allow compile-testing on other architectures.
--- drivers/video/backlight/Kconfig | 4 ++-- drivers/video/backlight/omap1_bl.c | 4 ++-- drivers/video/fbdev/omap/Kconfig | 4 ++-- drivers/video/fbdev/omap/lcd_ams_delta.c | 2 +- drivers/video/fbdev/omap/lcd_dma.c | 3 ++- drivers/video/fbdev/omap/lcd_inn1510.c | 2 +- drivers/video/fbdev/omap/lcd_osk.c | 4 ++-- drivers/video/fbdev/omap/lcdc.c | 2 ++ drivers/video/fbdev/omap/omapfb_main.c | 3 +-- drivers/video/fbdev/omap/sossi.c | 1 + 10 files changed, 16 insertions(+), 13 deletions(-)
drivers/video/backlight/Kconfig +2 -2
@@ -211,8 +211,8 @@ config BACKLIGHT_LOCOMO config BACKLIGHT_OMAP1 tristate "OMAP1 PWL-based LCD Backlight" - depends on ARCH_OMAP1 - default y + depends on ARCH_OMAP1 || COMPILE_TEST + default ARCH_OMAP1 help This driver controls the LCD backlight level and power for the PWL module of OMAP1 processors. Say Y if your board
drivers/video/backlight/omap1_bl.c +2 -2
@@ -14,8 +14,8 @@#include <linux/slab.h> #include <linux/platform_data/omap1_bl.h> -#include <mach/hardware.h> -#include <mach/mux.h> +#include <linux/soc/ti/omap1-io.h> +#include <linux/soc/ti/omap1-mux.h> #define OMAPBL_MAX_INTENSITY 0xff
drivers/video/fbdev/omap/Kconfig +2 -2
@@ -2,7 +2,7 @@ config FB_OMAP tristate "OMAP frame buffer support" depends on FB - depends on ARCH_OMAP1 + depends on ARCH_OMAP1 || (ARM && COMPILE_TEST) select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT
@@ -42,7 +42,7 @@ config FB_OMAP_LCD_MIPID config FB_OMAP_LCD_H3 bool "TPS65010 LCD controller on OMAP-H3" - depends on MACH_OMAP_H3 + depends on MACH_OMAP_H3 || COMPILE_TEST depends on TPS65010=y default y help
drivers/video/fbdev/omap/lcd_ams_delta.c +1 -1
@@ -14,7 +14,7 @@#include <linux/gpio/consumer.h> #include <linux/lcd.h> -#include <mach/hardware.h> +#include <linux/soc/ti/omap1-io.h> #include "omapfb.h"
drivers/video/fbdev/omap/lcd_dma.c +2 -1
@@ -25,7 +25,8 @@#include <linux/omap-dma.h> -#include <mach/hardware.h> +#include <linux/soc/ti/omap1-soc.h> +#include <linux/soc/ti/omap1-io.h> #include "lcdc.h" #include "lcd_dma.h"
drivers/video/fbdev/omap/lcd_inn1510.c +1 -1
@@ -10,7 +10,7 @@#include <linux/platform_device.h> #include <linux/io.h> -#include <mach/hardware.h> +#include <linux/soc/ti/omap1-soc.h> #include "omapfb.h"
drivers/video/fbdev/omap/lcd_osk.c +2 -2
@@ -11,8 +11,8 @@#include <linux/platform_device.h> #include <linux/gpio.h> -#include <mach/hardware.h> -#include <mach/mux.h> +#include <linux/soc/ti/omap1-io.h> +#include <linux/soc/ti/omap1-mux.h> #include "omapfb.h"
drivers/video/fbdev/omap/lcdc.c +2 -0
@@ -17,6 +17,8 @@#include <linux/clk.h> #include <linux/gfp.h> +#include <linux/soc/ti/omap1-io.h> +#include <linux/soc/ti/omap1-soc.h> #include <linux/omap-dma.h> #include <asm/mach-types.h>
drivers/video/fbdev/omap/omapfb_main.c +1 -2
@@ -20,8 +20,7 @@#include <linux/omap-dma.h> -#include <mach/hardware.h> - +#include <linux/soc/ti/omap1-soc.h> #include "omapfb.h" #include "lcdc.h"
drivers/video/fbdev/omap/sossi.c +1 -0
@@ -13,6 +13,7 @@#include <linux/interrupt.h> #include <linux/omap-dma.h> +#include <linux/soc/ti/omap1-io.h> #include "omapfb.h" #include "lcd_dma.h"
Signature · 1 line
2.29.2
PATCH 12/41 usb: omap: avoid mach/*.h headers
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The omap usb drivers still rely on mach/*.h headers that are explicitly or implicitly included, but all the required definitions are now in include/linux/soc/ti/, so use those instead and allow compile-testing on other architectures.
--- drivers/usb/gadget/udc/Kconfig | 2 +- drivers/usb/gadget/udc/omap_udc.c | 2 ++ drivers/usb/host/Kconfig | 2 +- drivers/usb/host/ohci-omap.c | 7 +++---- drivers/usb/phy/Kconfig | 3 ++- drivers/usb/phy/phy-isp1301-omap.c | 4 ++-- 6 files changed, 11 insertions(+), 9 deletions(-)
drivers/usb/gadget/udc/Kconfig +1 -1
@@ -128,7 +128,7 @@ config USB_GR_UDC config USB_OMAP tristate "OMAP USB Device Controller" - depends on ARCH_OMAP1 + depends on ARCH_OMAP1 || (ARCH_OMAP && COMPILE_TEST) depends on ISP1301_OMAP || !(MACH_OMAP_H2 || MACH_OMAP_H3) help Many Texas Instruments OMAP processors have flexible full
drivers/usb/gadget/udc/omap_udc.c +2 -0
@@ -43,6 +43,8 @@#include <linux/platform_data/usb-omap1.h> #include <linux/soc/ti/omap1-usb.h> +#include <linux/soc/ti/omap1-soc.h> +#include <linux/soc/ti/omap1-io.h> #include "omap_udc.h"
drivers/usb/host/Kconfig +1 -1
@@ -214,7 +214,7 @@ config USB_EHCI_HCD_NPCM7XX config USB_EHCI_HCD_OMAP tristate "EHCI support for OMAP3 and later chips" - depends on ARCH_OMAP + depends on ARCH_OMAP || COMPILE_TEST depends on NOP_USB_XCEIV default y help
drivers/usb/host/ohci-omap.c +3 -4
@@ -27,6 +27,9 @@#include <linux/platform_device.h> #include <linux/platform_data/usb-omap1.h> #include <linux/soc/ti/omap1-usb.h> +#include <linux/soc/ti/omap1-mux.h> +#include <linux/soc/ti/omap1-soc.h> +#include <linux/soc/ti/omap1-io.h> #include <linux/signal.h> #include <linux/usb.h> #include <linux/usb/hcd.h>
@@ -36,10 +39,6 @@#include <asm/io.h> #include <asm/mach-types.h> -#include <mach/mux.h> - -#include <mach/hardware.h> -#define DRIVER_DESC "OHCI OMAP driver"struct ohci_omap_priv {
drivers/usb/phy/Kconfig +2 -1
@@ -30,7 +30,8 @@ config FSL_USB2_OTG config ISP1301_OMAP tristate "Philips ISP1301 with OMAP OTG" - depends on I2C && ARCH_OMAP_OTG + depends on I2C + depends on ARCH_OMAP_OTG || (ARM && COMPILE_TEST) depends on USB depends on USB_GADGET || !USB_GADGET # if USB_GADGET=m, this can't be 'y' select USB_PHY
drivers/usb/phy/phy-isp1301-omap.c +2 -2
@@ -23,9 +23,9 @@#include <asm/irq.h> #include <asm/mach-types.h> -#include <mach/mux.h> - +#include <linux/soc/ti/omap1-mux.h> #include <linux/soc/ti/omap1-usb.h> +#include <linux/soc/ti/omap1-io.h> #undef VERBOSE
Signature · 1 line
2.29.2
PATCH 13/41 clocksource: ti-dmtimer: avoid using mach/hardware.h
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
As a preparation for future omap1 multiplatform support, stop using mach/hardware.h and instead include the omap1-io.h for low-level register access to MOD_CONF_CTRL_1.
--- drivers/clocksource/timer-ti-dm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clocksource/timer-ti-dm.c +1 -1
@@ -433,7 +433,7 @@ int omap_dm_timer_get_irq(struct omap_dm_timer *timer) }#if defined(CONFIG_ARCH_OMAP1 ) -#include <mach/hardware.h> +#include <linux/soc/ti/omap1-io.h> static struct clk *omap_dm_timer_get_fclk (struct omap_dm_timer *timer) {
Signature · 1 line
2.29.2
PATCH 14/41 serial: 8250/omap1: include linux/soc/ti/omap1-soc.h
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
As a preparation for cleaning up the omap1 headers, start including linux/soc/ti/omap1-soc.h directly so we can keep calling cpu_is_omap1510().
--- drivers/tty/serial/8250/8250.h | 1 + 1 file changed, 1 insertion(+)
drivers/tty/serial/8250/8250.h +1 -0
@@ -259,6 +259,7 @@ static inline int fintek_8250_probe(struct uart_8250_port *uart) { return 0; }#endif #ifdef CONFIG_ARCH_OMAP1 +#include <linux/soc/ti/omap1-soc.h> static inline int is_omap1_8250 (struct uart_8250_port *pt) {int res;
Signature · 1 line
2.29.2
PATCH 15/41 input: omap: void using mach/*.h headers
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The omap-keypad driver currently relies on including mach/memory.h implicitly, but that won't happen once omap1 is converted to CONFIG_ARCH_MULTIPLATFORM. Include the required header explicitly.
--- drivers/input/keyboard/omap-keypad.c | 1 + 1 file changed, 1 insertion(+)
drivers/input/keyboard/omap-keypad.c +1 -0
@@ -24,6 +24,7 @@#include <linux/gpio.h> #include <linux/platform_data/gpio-omap.h> #include <linux/platform_data/keypad-omap.h> +#include <linux/soc/ti/omap1-io.h> #undef NEW_BOARD_LEARNING_MODE
Signature · 1 line
2.29.2
PATCH 16/41 ARM: omap1: innovator: move ohci phy power handling to board file
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The innovator board needs a special case for its phy control.
Move the corresponding code into the board file and out of the common code by adding another callback.
--- arch/arm/mach-omap1/board-innovator.c | 19 +++++++++++++++ drivers/usb/host/ohci-omap.c | 31 ++++--------------------- include/linux/platform_data/usb-omap1.h | 2 ++ 3 files changed, 26 insertions(+), 26 deletions(-)
arch/arm/mach-omap1/board-innovator.c +19 -0
@@ -290,6 +290,23 @@ static void __init innovator_init_smc91x(void) }#ifdef CONFIG_ARCH_OMAP15XX +/* +* Board specific gang-switched transceiver power on/off. +*/ +static int innovator_omap_ohci_transceiver_power (int on) +{ +if (on) +__raw_writeb (__raw_readb (INNOVATOR_FPGA_CAM_USB_CONTROL ) + | ((1 <<5 /*usb1*/ ) | (1 <<3 /*usb2*/ )), +INNOVATOR_FPGA_CAM_USB_CONTROL ); +else +__raw_writeb (__raw_readb (INNOVATOR_FPGA_CAM_USB_CONTROL ) + & ~((1 <<5 /*usb1*/ ) | (1 <<3 /*usb2*/ )), +INNOVATOR_FPGA_CAM_USB_CONTROL ); + +return 0 ; +} +static struct omap_usb_config innovator1510_usb_config__initdata = {/* for bundled non-standard host and peripheral cables */ .hmc_mode = 4,
@@ -300,6 +317,8 @@ static struct omap_usb_config innovator1510_usb_config __initdata = { .register_dev = 1, .pins[0] = 2, + + .transceiver_power = innovator_omap_ohci_transceiver_power, };static const struct omap_lcd_config innovator1510_lcd_config__initconst = {
drivers/usb/host/ohci-omap.c +5 -26
@@ -67,31 +67,6 @@ static void omap_ohci_clock_power(struct ohci_omap_priv *priv, int on) } } -/* -* Board specific gang-switched transceiver power on/off. -* NOTE: OSK supplies power from DC, not battery. -*/ -static int omap_ohci_transceiver_power (struct ohci_omap_priv *priv,int on) -{ -if (on) { -if (machine_is_omap_innovator () &&cpu_is_omap1510 ()) -__raw_writeb (__raw_readb (INNOVATOR_FPGA_CAM_USB_CONTROL ) - | ((1 <<5 /*usb1*/ ) | (1 <<3 /*usb2*/ )), -INNOVATOR_FPGA_CAM_USB_CONTROL ); -else if (priv->power) -gpiod_set_value_cansleep (priv->power,0 ); - }else { -if (machine_is_omap_innovator () &&cpu_is_omap1510 ()) -__raw_writeb (__raw_readb (INNOVATOR_FPGA_CAM_USB_CONTROL ) - & ~((1 <<5 /*usb1*/ ) | (1 <<3 /*usb2*/ )), -INNOVATOR_FPGA_CAM_USB_CONTROL ); -else if (priv->power) -gpiod_set_value_cansleep (priv->power,1 ); - } - -return 0 ; -} -#ifdef CONFIG_USB_OTG static void start_hnp (struct ohci_hcd *ohci)
@@ -202,7 +177,11 @@ static int ohci_omap_reset(struct usb_hcd *hcd) }/* FIXME hub_wq hub requests should manage power switching */ -omap_ohci_transceiver_power (priv,1 ); +if (config->transceiver_power) +return config->transceiver_power (1 ); + +if (priv->power) +gpiod_set_value_cansleep (priv->power,0 );/* board init will have already handled HMC and mux setup. * any external transceiver should already be initialized
include/linux/platform_data/usb-omap1.h +2 -0
@@ -50,6 +50,8 @@ struct omap_usb_config {int (*ocpi_enable)(void );void (*lb_reset)(void ); + + int (*transceiver_power)(int on); };#endif /* __LINUX_USB_OMAP1_H */
Signature · 1 line
2.29.2
PATCH 17/41 ARM: omap1: move 32k counter from plat-omap to mach-omap1
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
omap2 stopped using this code with commit 8d39ff3d1696 ("ARM: OMAP2+:
Remove unused legacy code for timer"), so just move it to mach-omap1 now, along with the other half of that driver.
--- arch/arm/mach-omap1/Kconfig | 16 +++ arch/arm/mach-omap1/timer32k.c | 96 ++++++++++++++- arch/arm/plat-omap/Kconfig | 17 --- arch/arm/plat-omap/Makefile | 2 +- arch/arm/plat-omap/counter_32k.c | 114 ------------------ arch/arm/plat-omap/include/plat/counter-32k.h | 1 - 6 files changed, 110 insertions(+), 136 deletions(-) delete mode 100644 arch/arm/plat-omap/counter_32k.c delete mode 100644 arch/arm/plat-omap/include/plat/counter-32k.h
arch/arm/mach-omap1/Kconfig +16 -0
@@ -53,6 +53,22 @@ config OMAP_MUX_WARNINGS to change the pin multiplexing setup. When there are no warnings printed, it's safe to deselect OMAP_MUX for your product. +config OMAP_32K_TIMER + bool "Use 32KHz timer" + depends on ARCH_OMAP16XX + default ARCH_OMAP16XX + help + Select this option if you want to enable the OMAP 32KHz timer. + This timer saves power compared to the OMAP_MPU_TIMER, and has + support for no tick during idle. The 32KHz timer provides less + intra-tick resolution than OMAP_MPU_TIMER. The 32KHz timer is + currently only available for OMAP16XX, 24XX, 34XX, OMAP4/5 and DRA7XX. + + On OMAP2PLUS this value is only used for CONFIG_HZ and + CLOCK_TICK_RATE compile time calculation. + The actual timer selection is done in the board file + through the (DT_)MACHINE_START structure. + comment "OMAP Board Type" config MACH_OMAP_INNOVATOR
arch/arm/mach-omap1/timer32k.c +93 -3
114 lines not on this page · raw message
arch/arm/plat-omap/Kconfig +0 -17
@@ -72,23 +72,6 @@ config OMAP_MPU_TIMER timer provides more intra-tick resolution than the 32KHz timer, but consumes more power. -config OMAP_32K_TIMER - bool "Use 32KHz timer" - depends on ARCH_OMAP16XX || ARCH_OMAP2PLUS - default y if (ARCH_OMAP16XX || ARCH_OMAP2PLUS) - help - Select this option if you want to enable the OMAP 32KHz timer. - This timer saves power compared to the OMAP_MPU_TIMER, and has - support for no tick during idle. The 32KHz timer provides less - intra-tick resolution than OMAP_MPU_TIMER. The 32KHz timer is - currently only available for OMAP16XX, 24XX, 34XX, OMAP4/5 and DRA7XX. - - On OMAP2PLUS this value is only used for CONFIG_HZ and - CLOCK_TICK_RATE compile time calculation. - The actual timer selection is done in the board file - through the (DT_)MACHINE_START structure. - - config OMAP3_L2_AUX_SECURE_SAVE_RESTORE bool "OMAP3 HS/EMU save and restore for L2 AUX control register" depends on ARCH_OMAP3 && PM
arch/arm/plat-omap/Makefile +1 -1
@@ -6,7 +6,7 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-omap/include # Common support -obj-y := sram.o dma.o counter_32k.o +obj-y := sram.o dma.o # omap_device support (OMAP2+ only at the moment)
arch/arm/plat-omap/counter_32k.c deleted +0 -114
114 lines not on this page · raw message
arch/arm/plat-omap/include/plat/counter-32k.h deleted +0 -1
@@ -1 +0,0 @@ -int omap_init_clocksource_32k (void __iomem *vbase);
Signature · 1 line
2.29.2
PATCH 18/41 ARM: omap: remove debug-leds driver
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
It has been impossible to select this driver for six years without anyone noticing, so just kill it completely.
--- arch/arm/plat-omap/Kconfig | 10 -- arch/arm/plat-omap/Makefile | 4 - arch/arm/plat-omap/debug-leds.c | 171 -------------------------------- 3 files changed, 185 deletions(-) delete mode 100644 arch/arm/plat-omap/debug-leds.c
arch/arm/plat-omap/Kconfig +0 -10
@@ -11,16 +11,6 @@ config ARCH_OMAP_OTG comment "OMAP Feature Selections" -config OMAP_DEBUG_DEVICES - bool - help - For debug cards on TI reference boards. - -config OMAP_DEBUG_LEDS - def_bool y if NEW_LEDS - depends on OMAP_DEBUG_DEVICES - select LEDS_CLASS - config POWER_AVS_OMAP bool "AVS(Adaptive Voltage Scaling) support for OMAP IP versions 1&2" depends on (ARCH_OMAP3 || ARCH_OMAP4) && PM
arch/arm/plat-omap/Makefile +0 -4
@@ -7,7 +7,3 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-omap/include # Common support obj-y := sram.o dma.o - -# omap_device support (OMAP2+ only at the moment) - -obj-$(CONFIG_OMAP_DEBUG_LEDS) += debug-leds.o
arch/arm/plat-omap/debug-leds.c deleted +0 -171
171 lines not on this page · raw message
Signature · 1 line
2.29.2
PATCH 19/41 ARM: omap: dma: make usb support optional
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
Most of the plat-omap/dma.c code is specific to the USB driver. Hide that code when it is not in use, to make it clearer which parts are actually still required.
--- arch/arm/plat-omap/dma.c | 45 +++++++++++++++++----------------- drivers/usb/gadget/udc/Kconfig | 2 +- include/linux/omap-dma.h | 5 +++- 3 files changed, 27 insertions(+), 25 deletions(-)
arch/arm/plat-omap/dma.c +22 -23
@@ -66,7 +66,6 @@ enum { DMA_CHAIN_STARTED, DMA_CHAIN_NOTSTARTED };static struct omap_system_dma_plat_info *p;static struct omap_dma_dev_attr *d; -static void omap_clear_dma (int lch);static int enable_1510_mode;static u32 errata;
@@ -90,19 +89,16 @@ static int omap_dma_reserve_channels;static DEFINE_SPINLOCK (dma_chan_lock);static struct omap_dma_lch *dma_chan; -static inline void disable_lnk (int lch); -static void omap_disable_channel_irq (int lch); -static inline void omap_enable_channel_irq (int lch); - -#ifdef CONFIG_ARCH_OMAP15XX -/* Returns 1 if the DMA module is in OMAP1510-compatible mode, 0 otherwise */ -static int omap_dma_in_1510_mode (void ) +static inline void omap_disable_channel_irq (int lch) { -return enable_1510_mode; +/* disable channel interrupts */ + p->dma_write (0 ,CICR , lch); +/* Clear CSR */ +if (dma_omap1 ()) + p->dma_read (CSR , lch); +else + p->dma_write (OMAP2_DMA_CSR_CLEAR_MASK ,CSR , lch); } -#else -#define omap_dma_in_1510_mode () 0 -#endif #ifdef CONFIG_ARCH_OMAP1 static inline void set_gdma_dev (int req,int dev)
@@ -169,6 +165,17 @@ void omap_set_dma_priority(int lch, int dst_port, int priority)#endif EXPORT_SYMBOL (omap_set_dma_priority); +#if IS_ENABLED (CONFIG_USB_OMAP ) +#ifdef CONFIG_ARCH_OMAP15XX +/* Returns 1 if the DMA module is in OMAP1510-compatible mode, 0 otherwise */ +static int omap_dma_in_1510_mode (void ) +{ +return enable_1510_mode; +} +#else +#define omap_dma_in_1510_mode () 0 +#endif +void omap_set_dma_transfer_params (int lch,int data_type,int elem_count,int frame_count,int sync_mode,int dma_trigger,int src_or_dst_synch)
@@ -418,17 +425,6 @@ static inline void omap_enable_channel_irq(int lch) p->dma_write (dma_chan[lch].enabled_irqs,CICR , lch); } -static inline void omap_disable_channel_irq (int lch) -{ -/* disable channel interrupts */ - p->dma_write (0 ,CICR , lch); -/* Clear CSR */ -if (dma_omap1 ()) - p->dma_read (CSR , lch); -else - p->dma_write (OMAP2_DMA_CSR_CLEAR_MASK ,CSR , lch); -} -void omap_disable_dma_irq (int lch,u16 bits) { dma_chan[lch].enabled_irqs &= ~bits;
@@ -473,6 +469,7 @@ static inline void disable_lnk(int lch) p->dma_write (l,CLNK_CTRL , lch); dma_chan[lch].flags &= ~OMAP_DMA_ACTIVE ; } +#endif int omap_request_dma(int dev_id, const char *dev_name, void (*callback)(int lch, u16 ch_status, void *data),
@@ -572,6 +569,7 @@ static void omap_clear_dma(int lch)local_irq_restore (flags); } +#if IS_ENABLED (CONFIG_USB_OMAP )void omap_start_dma (int lch) {u32 l;
@@ -792,6 +790,7 @@ int omap_get_dma_active_status(int lch) return (p->dma_read(CCR, lch) & OMAP_DMA_CCR_EN) != 0; }EXPORT_SYMBOL (omap_get_dma_active_status); +#endif int omap_dma_running (void ) {
drivers/usb/gadget/udc/Kconfig +1 -1
@@ -128,7 +128,7 @@ config USB_GR_UDC config USB_OMAP tristate "OMAP USB Device Controller" - depends on ARCH_OMAP1 || (ARCH_OMAP && COMPILE_TEST) + depends on ARCH_OMAP1 depends on ISP1301_OMAP || !(MACH_OMAP_H2 || MACH_OMAP_H3) help Many Texas Instruments OMAP processors have flexible full
include/linux/omap-dma.h +4 -1
@@ -299,8 +299,9 @@ extern void omap_set_dma_priority(int lch, int dst_port, int priority);extern int omap_request_dma (int dev_id,const char *dev_name,void (*callback)(int lch,u16 ch_status,void *data),void *data,int *dma_ch); -extern void omap_disable_dma_irq (int ch,u16 irq_bits);extern void omap_free_dma (int ch); +#if IS_ENABLED (CONFIG_USB_OMAP ) +extern void omap_disable_dma_irq (int ch,u16 irq_bits);extern void omap_start_dma (int lch);extern void omap_stop_dma (int lch); extern void omap_set_dma_transfer_params(int lch, int data_type,
@@ -326,6 +327,8 @@ extern void omap_set_dma_dest_burst_mode(int lch,extern dma_addr_t omap_get_dma_src_pos (int lch);extern dma_addr_t omap_get_dma_dst_pos (int lch);extern int omap_get_dma_active_status (int lch); +#endif +extern int omap_dma_running (void );#if IS_ENABLED (CONFIG_FB_OMAP )
Signature · 1 line
2.29.2
PATCH 20/41 dma: omap: hide legacy interface
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The legacy interface for omap-dma is only used on OMAP1, and the same is true for the non-DT case. Make both of these conditional on CONFIG_ARCH_OMAP1 being set to simplify the dependency.
The non-OMAP stub functions in include/linux/omap-dma.h are note needed any more either now, because they are only called on OMAP1.
--- drivers/dma/ti/omap-dma.c | 19 +++++++++++++------ include/linux/omap-dma.h | 22 ---------------------- 2 files changed, 13 insertions(+), 28 deletions(-)
drivers/dma/ti/omap-dma.c +13 -6
@@ -699,6 +699,11 @@ static void omap_dma_put_lch(struct omap_dmadev *od, int lch)mutex_unlock (&od->lch_lock); } +static inline bool omap_dma_legacy (struct omap_dmadev *od) +{ +return IS_ENABLED (CONFIG_ARCH_OMAP1 ) && od->legacy; +} +static int omap_dma_alloc_chan_resources (struct dma_chan *chan) {struct omap_dmadev *od =to_omap_dma_dev (chan->device);
@@ -706,7 +711,7 @@ static int omap_dma_alloc_chan_resources(struct dma_chan *chan)struct device *dev = od->ddev.dev;int ret; -if (od->legacy) { +if (omap_dma_legacy (od)) { ret =omap_request_dma (c->dma_sig,"DMA engine" , omap_dma_callback, c, &c->dma_ch); }else {
@@ -718,7 +723,7 @@ static int omap_dma_alloc_chan_resources(struct dma_chan *chan)if (ret >=0 ) {omap_dma_assign (od, c, c->dma_ch); -if (!od->legacy) { +if (!omap_dma_legacy (od)) {unsigned val;spin_lock_irq (&od->irq_lock);
@@ -757,7 +762,7 @@ static void omap_dma_free_chan_resources(struct dma_chan *chan)struct omap_dmadev *od =to_omap_dma_dev (chan->device);struct omap_chan *c =to_omap_dma_chan (chan); -if (!od->legacy) { +if (!omap_dma_legacy (od)) {spin_lock_irq (&od->irq_lock); od->irq_enable_mask &= ~BIT (c->dma_ch);omap_dma_glbl_write (od,IRQENABLE_L1 , od->irq_enable_mask);
@@ -768,7 +773,7 @@ static void omap_dma_free_chan_resources(struct dma_chan *chan) od->lch_map[c->dma_ch] =NULL ;vchan_free_chan_resources (&c->vc); -if (od->legacy) +if (omap_dma_legacy (od))omap_free_dma (c->dma_ch);else omap_dma_put_lch (od, c->dma_ch);
@@ -1674,12 +1679,14 @@ static int omap_dma_probe(struct platform_device *pdev)dev_err (&pdev->dev,"omap_system_dma_plat_info is missing" );return -ENODEV ; } - }else { + }else if (IS_ENABLED (CONFIG_ARCH_OMAP1 )) { od->cfg = &default_cfg; od->plat =omap_get_plat_info ();if (!od->plat)return -EPROBE_DEFER ; + }else { +return -ENODEV ; } od->reg_map = od->plat->reg_map;
@@ -1855,7 +1862,7 @@ static int omap_dma_remove(struct platform_device *pdev)dma_async_device_unregister (&od->ddev); -if (!od->legacy) { +if (!omap_dma_legacy (od)) {/* Disable all interrupts */ omap_dma_glbl_write (od,IRQENABLE_L0 ,0 ); }
include/linux/omap-dma.h +0 -22
@@ -292,7 +292,6 @@ struct omap_system_dma_plat_info {#define dma_omap15xx () __dma_omap15xx(d)#define dma_omap16xx () __dma_omap16xx(d) -#if defined(CONFIG_ARCH_OMAP )extern struct omap_system_dma_plat_info *omap_get_plat_info (void );extern void omap_set_dma_priority (int lch,int dst_port,int priority);
@@ -340,25 +339,4 @@ static inline int omap_lcd_dma_running(void) }#endif -#else /* CONFIG_ARCH_OMAP */ -static inline void omap_set_dma_priority (int lch,int dst_port,int priority) -{ -} - -static inline struct omap_system_dma_plat_info *omap_get_plat_info (void ) -{ -return NULL ; -} - -static inline int omap_request_dma (int dev_id,const char *dev_name, -void (*callback)(int lch,u16 ch_status,void *data), -void *data,int *dma_ch) -{ -return -ENODEV ; -} - -static inline void omap_free_dma (int ch) { } - -#endif /* CONFIG_ARCH_OMAP */ -#endif /* __LINUX_OMAP_DMA_H */
Signature · 1 line
2.29.2
PATCH 21/41 ARM: omap1: dma: remove omap2 specific bits
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
No part of plat-omap/dma.c is called on omap2 any more, so anything omap2 specific in here can simply be removed.
--- arch/arm/plat-omap/dma.c | 217 ++++++++++----------------------------- 1 file changed, 55 insertions(+), 162 deletions(-)
arch/arm/plat-omap/dma.c +55 -162
@@ -34,11 +34,9 @@#include <linux/omap-dma.h> -#ifdef CONFIG_ARCH_OMAP1 #include <mach/hardware.h> #include <linux/soc/ti/omap1-io.h> #include <linux/soc/ti/omap1-soc.h> -#endif /* * MAX_LOGICAL_DMA_CH_COUNT: the maximum number of logical DMA
@@ -51,16 +49,7 @@#undef DEBUG -#ifndef CONFIG_ARCH_OMAP1 -enum {DMA_CH_ALLOC_DONE ,DMA_CH_PARAMS_SET_DONE ,DMA_CH_STARTED , -DMA_CH_QUEUED ,DMA_CH_NOTSTARTED ,DMA_CH_PAUSED ,DMA_CH_LINK_ENABLED -}; - -enum {DMA_CHAIN_STARTED ,DMA_CHAIN_NOTSTARTED }; -#endif -#define OMAP_DMA_ACTIVE 0x01 -#define OMAP2_DMA_CSR_CLEAR_MASK 0xffffffff#define OMAP_FUNC_MUX_ARM_BASE (0xfffe1000 + 0xec)
@@ -94,13 +83,9 @@ static inline void omap_disable_channel_irq(int lch)/* disable channel interrupts */ p->dma_write (0 ,CICR , lch);/* Clear CSR */ -if (dma_omap1 ()) - p->dma_read (CSR , lch); -else - p->dma_write (OMAP2_DMA_CSR_CLEAR_MASK ,CSR , lch); + p->dma_read (CSR , lch); } -#ifdef CONFIG_ARCH_OMAP1 static inline void set_gdma_dev (int req,int dev) {u32 reg =OMAP_FUNC_MUX_ARM_BASE + ((req -1 ) /5 ) *4 ;
@@ -112,11 +97,6 @@ static inline void set_gdma_dev(int req, int dev) l |= (dev -1 ) << shift;omap_writel (l, reg); } -#else -#define set_gdma_dev (req, dev) do {} while (0) -#define omap_readl (reg) 0 -#define omap_writel (val, reg) do {} while (0) -#endif #ifdef CONFIG_ARCH_OMAP1 void omap_set_dma_priority (int lch,int dst_port,int priority)
@@ -181,59 +161,24 @@ void omap_set_dma_transfer_params(int lch, int data_type, int elem_count, int dma_trigger, int src_or_dst_synch) {u32 l; +u16 ccr; l = p->dma_read (CSDP , lch); l &= ~0x03 ; l |= data_type; p->dma_write (l,CSDP , lch); -if (dma_omap1 ()) { -u16 ccr; - - ccr = p->dma_read (CCR , lch); - ccr &= ~(1 <<5 ); -if (sync_mode ==OMAP_DMA_SYNC_FRAME ) - ccr |=1 <<5 ; - p->dma_write (ccr,CCR , lch); - - ccr = p->dma_read (CCR2 , lch); - ccr &= ~(1 <<2 ); -if (sync_mode ==OMAP_DMA_SYNC_BLOCK ) - ccr |=1 <<2 ; - p->dma_write (ccr,CCR2 , lch); - } - -if (dma_omap2plus () && dma_trigger) { -u32 val; - - val = p->dma_read (CCR , lch); - -/* DMA_SYNCHRO_CONTROL_UPPER depends on the channel number */ - val &= ~((1 <<23 ) | (3 <<19 ) |0x1f ); - val |= (dma_trigger & ~0x1f ) <<14 ; - val |= dma_trigger &0x1f ; - -if (sync_mode &OMAP_DMA_SYNC_FRAME ) - val |=1 <<5 ; -else - val &= ~(1 <<5 ); - -if (sync_mode &OMAP_DMA_SYNC_BLOCK ) - val |=1 <<18 ; -else - val &= ~(1 <<18 ); - -if (src_or_dst_synch ==OMAP_DMA_DST_SYNC_PREFETCH ) { - val &= ~(1 <<24 );/* dest synch */ - val |= (1 <<23 );/* Prefetch */ - }else if (src_or_dst_synch) { - val |=1 <<24 ;/* source synch */ - }else { - val &= ~(1 <<24 );/* dest synch */ - } - p->dma_write (val,CCR , lch); - } + ccr = p->dma_read (CCR , lch); + ccr &= ~(1 <<5 ); +if (sync_mode ==OMAP_DMA_SYNC_FRAME ) + ccr |=1 <<5 ; + p->dma_write (ccr,CCR , lch); + ccr = p->dma_read (CCR2 , lch); + ccr &= ~(1 <<2 ); +if (sync_mode ==OMAP_DMA_SYNC_BLOCK ) + ccr |=1 <<2 ; + p->dma_write (ccr,CCR2 , lch); p->dma_write (elem_count,CEN , lch); p->dma_write (frame_count,CFN , lch); }
@@ -241,7 +186,7 @@ EXPORT_SYMBOL(omap_set_dma_transfer_params);void omap_set_dma_channel_mode (int lch,enum omap_dma_channel_mode mode) { -if (dma_omap1 () && !dma_omap15xx ()) { +if (!dma_omap15xx ()) {u32 l; l = p->dma_read (LCH_CTRL , lch);
@@ -258,15 +203,12 @@ void omap_set_dma_src_params(int lch, int src_port, int src_amode, int src_ei, int src_fi) {u32 l; +u16 w; -if (dma_omap1 ()) { -u16 w; - - w = p->dma_read (CSDP , lch); - w &= ~(0x1f <<2 ); - w |= src_port <<2 ; - p->dma_write (w,CSDP , lch); - } + w = p->dma_read (CSDP , lch); + w &= ~(0x1f <<2 ); + w |= src_port <<2 ; + p->dma_write (w,CSDP , lch); l = p->dma_read (CCR , lch); l &= ~(0x03 <<12 );
@@ -304,26 +246,15 @@ void omap_set_dma_src_burst_mode(int lch, enum omap_dma_burst_mode burst_mode)case OMAP_DMA_DATA_BURST_DIS :break ;case OMAP_DMA_DATA_BURST_4 : -if (dma_omap2plus ()) - burst =0x1 ; -else - burst =0x2 ; + burst =0x2 ;break ;case OMAP_DMA_DATA_BURST_8 : -if (dma_omap2plus ()) { - burst =0x2 ; -break ; - }/* * not supported by current hardware on OMAP1 * w |= (0x03 << 7); */ fallthrough;case OMAP_DMA_DATA_BURST_16 : -if (dma_omap2plus ()) { - burst =0x3 ; -break ; - }/* OMAP1 don't support burst 16 */ fallthrough;default :
@@ -342,12 +273,10 @@ void omap_set_dma_dest_params(int lch, int dest_port, int dest_amode, {u32 l; -if (dma_omap1 ()) { - l = p->dma_read (CSDP , lch); - l &= ~(0x1f <<9 ); - l |= dest_port <<9 ; - p->dma_write (l,CSDP , lch); - } + l = p->dma_read (CSDP , lch); + l &= ~(0x1f <<9 ); + l |= dest_port <<9 ; + p->dma_write (l,CSDP , lch); l = p->dma_read (CCR , lch); l &= ~(0x03 <<14 );
@@ -385,22 +314,12 @@ void omap_set_dma_dest_burst_mode(int lch, enum omap_dma_burst_mode burst_mode)case OMAP_DMA_DATA_BURST_DIS :break ;case OMAP_DMA_DATA_BURST_4 : -if (dma_omap2plus ()) - burst =0x1 ; -else - burst =0x2 ; + burst =0x2 ;break ;case OMAP_DMA_DATA_BURST_8 : -if (dma_omap2plus ()) - burst =0x2 ; -else - burst =0x3 ; + burst =0x3 ;break ;case OMAP_DMA_DATA_BURST_16 : -if (dma_omap2plus ()) { - burst =0x3 ; -break ; - }/* OMAP1 don't support burst 16 */ fallthrough;default :
@@ -416,10 +335,7 @@ EXPORT_SYMBOL(omap_set_dma_dest_burst_mode);static inline void omap_enable_channel_irq (int lch) {/* Clear CSR */ -if (dma_omap1 ()) - p->dma_read (CSR , lch); -else - p->dma_write (OMAP2_DMA_CSR_CLEAR_MASK ,CSR , lch); + p->dma_read (CSR , lch);/* Enable some nice interrupts. */ p->dma_write (dma_chan[lch].enabled_irqs,CICR , lch);
@@ -437,8 +353,7 @@ static inline void enable_lnk(int lch) l = p->dma_read (CLNK_CTRL , lch); -if (dma_omap1 ()) - l &= ~(1 <<14 ); + l &= ~(1 <<14 );/* Set the ENABLE_LNK bits */ if (dma_chan[lch].next_lch !=-1 )
@@ -456,15 +371,8 @@ static inline void disable_lnk(int lch)/* Disable interrupts */ omap_disable_channel_irq (lch); -if (dma_omap1 ()) { -/* Set the STOP_LNK bit */ - l |=1 <<14 ; - } - -if (dma_omap2plus ()) { -/* Clear the ENABLE_LNK bit */ - l &= ~(1 <<15 ); - } +/* Set the STOP_LNK bit */ + l |=1 <<14 ; p->dma_write (l,CLNK_CTRL , lch); dma_chan[lch].flags &= ~OMAP_DMA_ACTIVE ;
@@ -508,8 +416,7 @@ int omap_request_dma(int dev_id, const char *dev_name, chan->enabled_irqs =OMAP_DMA_DROP_IRQ |OMAP_DMA_BLOCK_IRQ ; -if (dma_omap1 ()) - chan->enabled_irqs |=OMAP1_DMA_TOUT_IRQ ; + chan->enabled_irqs |=OMAP1_DMA_TOUT_IRQ ;if (dma_omap16xx ()) {/* If the sync device is set, configure it dynamically. */
@@ -522,7 +429,7 @@ int omap_request_dma(int dev_id, const char *dev_name,* id. */ p->dma_write (dev_id | (1 <<10 ),CCR , free_ch); - }else if (dma_omap1 ()) { + }else { p->dma_write (dev_id,CCR , free_ch); }
@@ -739,8 +646,7 @@ dma_addr_t omap_get_dma_src_pos(int lch) offset = p->dma_read (CSSA , lch); } -if (dma_omap1 ()) - offset |= (p->dma_read (CSSA , lch) &0xFFFF0000 ); + offset |= (p->dma_read (CSSA , lch) &0xFFFF0000 );return offset; }
@@ -778,8 +684,7 @@ dma_addr_t omap_get_dma_dst_pos(int lch) offset = p->dma_read (CDSA , lch); } -if (dma_omap1 ()) - offset |= (p->dma_read (CDSA , lch) &0xFFFF0000 ); + offset |= (p->dma_read (CDSA , lch) &0xFFFF0000 );return offset; }
@@ -796,9 +701,8 @@ int omap_dma_running(void) {int lch; -if (dma_omap1 ()) -if (omap_lcd_dma_running ()) -return 1 ; +if (omap_lcd_dma_running ()) +return 1 ;for (lch =0 ; lch < dma_chan_count; lch++)if (p->dma_read (CCR , lch) &OMAP_DMA_CCR_EN )
@@ -809,8 +713,6 @@ int omap_dma_running(void)/*----------------------------------------------------------------------------*/ -#ifdef CONFIG_ARCH_OMAP1 -static int omap1_dma_handle_ch (int ch) {u32 csr;
@@ -863,10 +765,6 @@ static irqreturn_t omap1_dma_irq_handler(int irq, void *dev_id)return handled ?IRQ_HANDLED :IRQ_NONE ; } -#else -#define omap1_dma_irq_handler NULL -#endif -struct omap_system_dma_plat_info *omap_get_plat_info (void ) {return p;
@@ -912,29 +810,27 @@ static int omap_system_dma_probe(struct platform_device *pdev)if (ch >=6 && enable_1510_mode)continue ; -if (dma_omap1 ()) { -/* -* request_irq() doesn't like dev_id (ie. ch) being -* zero, so we have to kludge around this. -*/ -sprintf (&irq_name[0 ],"%d" , ch); - dma_irq =platform_get_irq_byname (pdev, irq_name); - -if (dma_irq <0 ) { - ret = dma_irq; - goto exit_dma_irq_fail; - } - -/* INT_DMA_LCD is handled in lcd_dma.c */ -if (dma_irq ==INT_DMA_LCD ) -continue ; - - ret =request_irq (dma_irq, - omap1_dma_irq_handler,0 ,"DMA" , - (void *) (ch +1 )); -if (ret !=0 ) - goto exit_dma_irq_fail; +/* +* request_irq() doesn't like dev_id (ie. ch) being +* zero, so we have to kludge around this. +*/ +sprintf (&irq_name[0 ],"%d" , ch); + dma_irq =platform_get_irq_byname (pdev, irq_name); + +if (dma_irq <0 ) { + ret = dma_irq; + goto exit_dma_irq_fail; } + +/* INT_DMA_LCD is handled in lcd_dma.c */ +if (dma_irq ==INT_DMA_LCD ) +continue ; + + ret =request_irq (dma_irq, + omap1_dma_irq_handler,0 ,"DMA" , + (void *) (ch +1 )); +if (ret !=0 ) + goto exit_dma_irq_fail; }/* reserve dma channels 0 and 1 in high security devices on 34xx */
@@ -954,9 +850,6 @@ static int omap_system_dma_remove(struct platform_device *pdev) {int dma_irq, irq_rel =0 ; -if (dma_omap2plus ()) -return 0 ; -for ( ; irq_rel < dma_chan_count; irq_rel++) { dma_irq =platform_get_irq (pdev, irq_rel);free_irq (dma_irq, (void *)(irq_rel +1 ));
Signature · 1 line
2.29.2
PATCH 22/41 ARM: omap1: move plat/dma.c to mach/omap-dma.c
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
Most of the interface functions in plat/dma.c are only used from the USB driver, which is practically OMAP1 specific, except for compile testing.
The omap_get_plat_info(), omap_request_dma() and omap_free_dma() functions are never called on omap2 because of runtime checks.
---
arch/arm/mach-omap1/Makefile | 2 +-
arch/arm/{plat-omap/dma.c => mach-omap1/omap-dma.c} | 0
arch/arm/plat-omap/Makefile | 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
rename arch/arm/{plat-omap/dma.c => mach-omap1/omap-dma.c} (100%)arch/arm/mach-omap1/Makefile +1 -1
@@ -5,7 +5,7 @@ # Common support obj-y := io.o id.o sram-init.o sram.o time.o irq.o mux.o flash.o \ - serial.o devices.o dma.o fb.o + serial.o devices.o dma.o omap-dma.o fb.o obj-y += clock.o clock_data.o opp_data.o reset.o pm_bus.o timer.o ifneq ($(CONFIG_SND_SOC_OMAP_MCBSP),)
arch/arm/mach-omap1/omap-dma.c renamed from arch/arm/plat-omap/dma.c +0 -0
arch/arm/plat-omap/Makefile +1 -1
@@ -6,4 +6,4 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-omap/include # Common support -obj-y := sram.o dma.o +obj-y := sram.o
Signature · 1 line
2.29.2
PATCH 23/41 ARM: omap: split up arch/arm/plat-omap/Kconfig
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
All the remaining features in here are either omap1 or omap2plus specific, so move them into the respective Kconfig files.
--- arch/arm/Kconfig | 2 - arch/arm/mach-omap1/Kconfig | 37 +++++++++++++++ arch/arm/mach-omap2/Kconfig | 49 ++++++++++++++++++++ arch/arm/plat-omap/Kconfig | 92 ------------------------------------- 4 files changed, 86 insertions(+), 94 deletions(-) delete mode 100644 arch/arm/plat-omap/Kconfig
arch/arm/Kconfig +0 -2
@@ -656,8 +656,6 @@ source "arch/arm/mach-npcm/Kconfig" source "arch/arm/mach-nspire/Kconfig" -source "arch/arm/plat-omap/Kconfig" - source "arch/arm/mach-omap1/Kconfig" source "arch/arm/mach-omap2/Kconfig"
arch/arm/mach-omap1/Kconfig +37 -0
@@ -28,6 +28,11 @@ config ARCH_OMAP16XX select CPU_ARM926T select OMAP_DM_TIMER +config ARCH_OMAP + bool + +comment "OMAP Feature Selections" + config OMAP_MUX bool "OMAP multiplexing support" default y
@@ -69,6 +74,38 @@ config OMAP_32K_TIMER The actual timer selection is done in the board file through the (DT_)MACHINE_START structure. +config OMAP_MPU_TIMER + bool "Use mpu timer" + depends on ARCH_OMAP1 + help + Select this option if you want to use the OMAP mpu timer. This + timer provides more intra-tick resolution than the 32KHz timer, + but consumes more power. + +config OMAP_SERIAL_WAKE + bool "Enable wake-up events for serial ports" + depends on ARCH_OMAP1 && OMAP_MUX + default y + help + Select this option if you want to have your system wake up + to data on the serial RX line. This allows you to wake the + system from serial console. + +config OMAP_RESET_CLOCKS + bool "Reset unused clocks during boot" + depends on ARCH_OMAP + help + Say Y if you want to reset unused clocks during boot. + This option saves power, but assumes all drivers are + using the clock framework. Broken drivers that do not + yet use clock framework may not work with this option. + If you are booting from another operating system, you + probably do not want this option enabled until your + device drivers work properly. + +config ARCH_OMAP_OTG + bool + comment "OMAP Board Type" config MACH_OMAP_INNOVATOR
arch/arm/mach-omap2/Kconfig +49 -0
61 lines not on this page · raw message
arch/arm/plat-omap/Kconfig deleted +0 -92
92 lines not on this page · raw message
Signature · 1 line
2.29.2
PATCH 24/41 ARM: omap: un-merge plat/sram.c
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The sram initialization code is the only shared omap1/2 code that is not a standalone driver, but it is very short. Having two copies of this code means some duplication of the sources, but actually saves object code size as it can be inlined better.
--- arch/arm/mach-omap1/devices.c | 2 +- arch/arm/mach-omap1/sram-init.c | 91 +++++++++++++++-- arch/arm/mach-omap1/sram.h | 4 +- arch/arm/mach-omap2/sram.c | 91 ++++++++++++++++- arch/arm/mach-omap2/sram.h | 5 +- arch/arm/plat-omap/Makefile | 2 +- arch/arm/plat-omap/include/plat/sram.h | 8 -- arch/arm/plat-omap/sram.c | 129 ------------------------- 8 files changed, 182 insertions(+), 150 deletions(-) delete mode 100644 arch/arm/plat-omap/include/plat/sram.h delete mode 100644 arch/arm/plat-omap/sram.c
arch/arm/mach-omap1/devices.c +1 -1
@@ -356,7 +356,7 @@ static int __init omap1_init_devices(void)if (!cpu_class_is_omap1 ())return -ENODEV ; -omap_sram_init (); +omap1_sram_init ();omap1_clk_late_init ();/* please keep these calls, and their implementations above,
arch/arm/mach-omap1/sram-init.c +85 -6
124 lines not on this page · raw message
arch/arm/mach-omap1/sram.h +3 -1
@@ -1,8 +1,10 @@/* SPDX-License-Identifier: GPL-2.0 */ -#include <plat/sram.h> extern void omap_sram_reprogram_clock (u32 dpllctl,u32 ckctl); +int omap1_sram_init (void ); +void *omap_sram_push (void *funcp,unsigned long size); +/* Do not use these */ extern void omap1_sram_reprogram_clock (u32 ckctl,u32 dpllctl);extern unsigned long omap1_sram_reprogram_clock_sz;
arch/arm/mach-omap2/sram.c +88 -3
116 lines not on this page · raw message
arch/arm/mach-omap2/sram.h +4 -1
@@ -4,7 +4,6 @@*/ #ifndef __ASSEMBLY__ -#include <plat/sram.h> extern void omap2_sram_ddr_init (u32 *slow_dll_ctrl,u32 fast_dll_ctrl,u32 base_cs,u32 force_unlock);
@@ -14,6 +13,10 @@ extern u32 omap2_set_prcm(u32 dpll_ctrl_val, u32 sdrc_rfr_val, int bypass);extern void omap3_sram_restore_context (void ); +extern int __init omap_sram_init (void ); + +extern void *omap_sram_push (void *funcp,unsigned long size); +/* Do not use these */ extern void omap24xx_sram_reprogram_clock (u32 ckctl,u32 dpllctl);extern unsigned long omap24xx_sram_reprogram_clock_sz;
arch/arm/plat-omap/Makefile +1 -1
@@ -6,4 +6,4 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-omap/include # Common support -obj-y := sram.o +obj-y :=
arch/arm/plat-omap/include/plat/sram.h deleted +0 -8
@@ -1,8 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -int omap_sram_init (void ); - -void omap_map_sram (unsigned long start,unsigned long size, -unsigned long skip,int cached); -void omap_sram_reset (void ); - -extern void *omap_sram_push (void *funcp,unsigned long size);
arch/arm/plat-omap/sram.c deleted +0 -129
129 lines not on this page · raw message
Signature · 1 line
2.29.2
PATCH 25/41 ARM: omap: remove empty plat-omap directory
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The last file in this directory is gone, and it can be removed as well.
--- arch/arm/Makefile | 1 - arch/arm/plat-omap/Makefile | 9 --------- 2 files changed, 10 deletions(-) delete mode 100644 arch/arm/plat-omap/Makefile
arch/arm/Makefile +0 -1
@@ -228,7 +228,6 @@ machine-$(CONFIG_PLAT_SPEAR) += spear # Platform directory name. This list is sorted alphanumerically # by CONFIG_* macro name. -plat-$(CONFIG_ARCH_OMAP) += omap plat-$(CONFIG_PLAT_ORION) += orion plat-$(CONFIG_PLAT_PXA) += pxa plat-$(CONFIG_PLAT_VERSATILE) += versatile
arch/arm/plat-omap/Makefile deleted +0 -9
@@ -1,9 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -# -# Makefile for the linux kernel. -# - -ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-omap/include - -# Common support -obj-y :=
Signature · 1 line
2.29.2
PATCH 26/41 ARM: omap1: relocate static I/O mapping
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The address range 0xfee00000-0xfeffffff is used for PCI and PCMCIA I/O port mappings, but OMAP1 has its static mappings there as well.
Move the OMAP1 addresses a little higher to avoid crashing at boot.
--- arch/arm/Kconfig.debug | 6 +++--- arch/arm/mach-omap1/include/mach/hardware.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/Kconfig.debug +3 -3
@@ -1837,9 +1837,9 @@ config DEBUG_UART_VIRT default 0xfec00000 if ARCH_IXP4XX && !CPU_BIG_ENDIAN default 0xfec00003 if ARCH_IXP4XX && CPU_BIG_ENDIAN default 0xfef36000 if DEBUG_HIGHBANK_UART - default 0xfefb0000 if DEBUG_OMAP1UART1 || DEBUG_OMAP7XXUART1 - default 0xfefb0800 if DEBUG_OMAP1UART2 || DEBUG_OMAP7XXUART2 - default 0xfefb9800 if DEBUG_OMAP1UART3 || DEBUG_OMAP7XXUART3 + default 0xff000000 if DEBUG_OMAP1UART1 || DEBUG_OMAP7XXUART1 + default 0xff000800 if DEBUG_OMAP1UART2 || DEBUG_OMAP7XXUART2 + default 0xff009800 if DEBUG_OMAP1UART3 || DEBUG_OMAP7XXUART3 default 0xffd01000 if DEBUG_HIP01_UART default DEBUG_UART_PHYS if !MMU depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
arch/arm/mach-omap1/include/mach/hardware.h +1 -1
@@ -63,7 +63,7 @@ static inline u32 omap_cs3_phys(void)#endif /* ifndef __ASSEMBLER__ */ -#define OMAP1_IO_OFFSET 0x01000000/* Virtual IO = 0xfefb0000 */ +#define OMAP1_IO_OFFSET 0x00fb0000/* Virtual IO = 0xff000000 */ #define OMAP1_IO_ADDRESS (pa) IOMEM((pa) - OMAP1_IO_OFFSET)#include <mach/serial.h>
Signature · 1 line
2.29.2
PATCH 27/41 ARM: omap1: use pci_remap_iospace() for omap_cf
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The ISA I/O space handling in omap_cf is incompatible with PCI drivers in a multiplatform kernel, and requires a custom mach/io.h.
Change the driver to use pci_remap_iospace() like PCI drivers do, so the generic ioport access can work across platforms.
To actually use that code, we have to select CONFIG_PCI here.
--- arch/arm/Kconfig | 2 +- arch/arm/mach-omap1/include/mach/io.h | 45 --------------------------- drivers/pcmcia/omap_cf.c | 10 +++--- 3 files changed, 5 insertions(+), 52 deletions(-) delete mode 100644 arch/arm/mach-omap1/include/mach/io.h
arch/arm/Kconfig +1 -1
@@ -487,11 +487,11 @@ config ARCH_OMAP1 bool "TI OMAP1" select ARCH_OMAP select CLKSRC_MMIO + select FORCE_PCI if PCCARD select GENERIC_IRQ_CHIP select GPIOLIB select HAVE_LEGACY_CLK select IRQ_DOMAIN - select NEED_MACH_IO_H if PCCARD select NEED_MACH_MEMORY_H select SPARSE_IRQ help
arch/arm/mach-omap1/include/mach/io.h deleted +0 -45
45 lines not on this page · raw message
drivers/pcmcia/omap_cf.c +4 -6
@@ -205,6 +205,7 @@ static int __init omap_cf_probe(struct platform_device *pdev)int irq;int status;struct resource *res; +struct resource iospace =DEFINE_RES_IO (SZ_64 ,SZ_4K ); seg = (int ) pdev->dev.platform_data;if (seg ==0 || seg >3 )
@@ -235,9 +236,9 @@ static int __init omap_cf_probe(struct platform_device *pdev) cf->phys_cf = res->start;/* pcmcia layer only remaps "real" memory */ - cf->socket.io_offset = (unsigned long ) -ioremap (cf->phys_cf +SZ_4K ,SZ_2K ); -if (!cf->socket.io_offset) { + cf->socket.io_offset = iospace.start; + status =pci_remap_iospace (&iospace, cf->phys_cf +SZ_4K ); +if (status) { status = -ENOMEM ; goto fail1; }
@@ -285,8 +286,6 @@ static int __init omap_cf_probe(struct platform_device *pdev) fail2:release_mem_region (cf->phys_cf,SZ_8K ); fail1: -if (cf->socket.io_offset) -iounmap ((void __iomem *) cf->socket.io_offset);free_irq (irq, cf); fail0:kfree (cf);
@@ -300,7 +299,6 @@ static int __exit omap_cf_remove(struct platform_device *pdev) cf->active =0 ;pcmcia_unregister_socket (&cf->socket);del_timer_sync (&cf->timer); -iounmap ((void __iomem *) cf->socket.io_offset);release_mem_region (cf->phys_cf,SZ_8K );free_irq (cf->irq, cf);kfree (cf);
Signature · 1 line
2.29.2
PATCH 28/41 ARM: omap1: move mach/*.h into mach directory
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
Most of the header files are no longer referenced from outside arch/arm/mach-omap1, so move them all to that place directly and change their users to use the new location.
The exceptions are:
- mach/compress.h is used by the core architecture code
- mach/serial.h is used by mach/compress.h
The mach/memory.h is empty and gets removed in the process, avoiding the need for CONFIG_NEED_MACH_MEMORY_H.
---
arch/arm/Kconfig | 1 -
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 | 4 +---
arch/arm/mach-omap1/board-fsample.c | 10 ++++-----
arch/arm/mach-omap1/board-generic.c | 6 ++----
arch/arm/mach-omap1/board-h2.c | 12 +++++------
arch/arm/mach-omap1/board-h3.c | 14 ++++++-------
arch/arm/mach-omap1/board-htcherald.c | 8 +++----
arch/arm/mach-omap1/board-innovator.c | 10 ++++-----
arch/arm/mach-omap1/board-nokia770.c | 6 ++----
arch/arm/mach-omap1/board-osk.c | 9 ++++----
arch/arm/mach-omap1/board-palmte.c | 12 +++++------
arch/arm/mach-omap1/board-palmtt.c | 12 +++++------
arch/arm/mach-omap1/board-palmz71.c | 12 +++++------
arch/arm/mach-omap1/board-perseus2.c | 9 ++++----
arch/arm/mach-omap1/board-sx1-mmc.c | 3 +--
arch/arm/mach-omap1/board-sx1.c | 10 ++++-----
arch/arm/mach-omap1/clock.c | 4 ++--
arch/arm/mach-omap1/clock_data.c | 5 ++---
arch/arm/mach-omap1/common.h | 3 +--
arch/arm/mach-omap1/devices.c | 10 ++++-----
arch/arm/mach-omap1/dma.c | 2 +-
arch/arm/mach-omap1/fb.c | 2 +-
arch/arm/mach-omap1/flash.c | 5 +++--
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 | 4 +---
arch/arm/mach-omap1/i2c.c | 3 ++-
arch/arm/mach-omap1/id.c | 5 ++---
arch/arm/mach-omap1/include/mach/memory.h | 12 -----------
arch/arm/mach-omap1/io.c | 7 +++----
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/{include/mach => }/mux.h | 2 --
arch/arm/mach-omap1/ocpi.c | 4 ++--
arch/arm/mach-omap1/omap-dma.c | 3 ++-
.../mach-omap1/{include/mach => }/omap1510.h | 0
.../mach-omap1/{include/mach => }/omap16xx.h | 0
.../mach-omap1/{include/mach => }/omap7xx.h | 0
arch/arm/mach-omap1/pm.c | 9 ++++----
arch/arm/mach-omap1/pm.h | 2 ++
arch/arm/mach-omap1/reset.c | 3 +--
arch/arm/mach-omap1/serial.c | 3 ++-
arch/arm/mach-omap1/sleep.S | 2 +-
arch/arm/mach-omap1/soc.h | 4 ++--
arch/arm/mach-omap1/sram.S | 4 ++--
arch/arm/mach-omap1/{include/mach => }/tc.h | 2 --
arch/arm/mach-omap1/time.c | 2 +-
arch/arm/mach-omap1/timer.c | 1 +
arch/arm/mach-omap1/timer32k.c | 2 +-
arch/arm/mach-omap1/usb.c | 6 +++---
arch/arm/plat-omap/include/plat/cpu.h | 21 -------------------
59 files changed, 127 insertions(+), 188 deletions(-)
rename arch/arm/mach-omap1/{include/mach => }/hardware.h (98%)
delete mode 100644 arch/arm/mach-omap1/include/mach/memory.h
rename arch/arm/mach-omap1/{include/mach => }/irqs.h (99%)
rename arch/arm/mach-omap1/{include/mach => }/mtd-xip.h (97%)
rename arch/arm/mach-omap1/{include/mach => }/mux.h (98%)
rename arch/arm/mach-omap1/{include/mach => }/omap1510.h (100%)
rename arch/arm/mach-omap1/{include/mach => }/omap16xx.h (100%)
rename arch/arm/mach-omap1/{include/mach => }/omap7xx.h (100%)
rename arch/arm/mach-omap1/{include/mach => }/tc.h (98%)
delete mode 100644 arch/arm/plat-omap/include/plat/cpu.harch/arm/Kconfig +0 -1
@@ -492,7 +492,6 @@ config ARCH_OMAP1 select GPIOLIB select HAVE_LEGACY_CLK select IRQ_DOMAIN - select NEED_MACH_MEMORY_H select SPARSE_IRQ help Support for older TI OMAP1 (omap7xx, omap15xx or omap16xx)
arch/arm/mach-omap1/ams-delta-fiq-handler.S +2 -1
@@ -13,14 +13,15 @@ #include <linux/linkage.h> #include <linux/platform_data/ams-delta-fiq.h> #include <linux/platform_data/gpio-omap.h> +#include <linux/soc/ti/omap1-io.h> #include <asm/assembler.h> #include <asm/irq.h> +#include "hardware.h" #include "ams-delta-fiq.h" #include "board-ams-delta.h" #include "iomap.h" -#include "soc.h" /* * OMAP1510 GPIO related symbol copied from arch/arm/mach-omap1/gpio15xx.c.
arch/arm/mach-omap1/ams-delta-fiq.c +2 -0
@@ -21,7 +21,9 @@#include <linux/platform_device.h> #include <asm/fiq.h> +#include <linux/soc/ti/omap1-io.h> +#include "hardware.h" #include "ams-delta-fiq.h" #include "board-ams-delta.h"
arch/arm/mach-omap1/ams-delta-fiq.h +1 -1
@@ -16,7 +16,7 @@#ifndef __AMS_DELTA_FIQ_H#define __AMS_DELTA_FIQ_H -#include <mach/irqs.h> +#include "irqs.h" /* * Interrupt number used for passing control from FIQ to IRQ.
arch/arm/mach-omap1/board-ams-delta.c +1 -3
@@ -36,11 +36,9 @@#include <asm/mach/map.h> #include <linux/platform_data/keypad-omap.h> -#include <mach/mux.h> -#include <mach/hardware.h> +#include "hardware.h" #include "usb.h" -#include "ams-delta-fiq.h" #include "board-ams-delta.h" #include "iomap.h"
arch/arm/mach-omap1/board-fsample.c +5 -5
@@ -23,13 +23,13 @@#include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/tc.h> -#include <mach/mux.h> -#include "flash.h" +#include <linux/soc/ti/omap1-io.h> #include <linux/platform_data/keypad-omap.h> +#include "tc.h" -#include <mach/hardware.h> - +#include "mux.h" +#include "flash.h" +#include "hardware.h" #include "iomap.h" #include "common.h" #include "fpga.h"
arch/arm/mach-omap1/board-generic.c +2 -4
@@ -14,15 +14,13 @@#include <linux/init.h> #include <linux/platform_device.h> -#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/mux.h> - +#include "hardware.h" +#include "mux.h" #include "usb.h" -#include "common.h" /* assume no Mini-AB port */
arch/arm/mach-omap1/board-h2.c +5 -7
@@ -28,22 +28,20 @@#include <linux/mfd/tps65010.h> #include <linux/smc91x.h> #include <linux/omapfb.h> +#include <linux/omap-dma.h> #include <linux/platform_data/gpio-omap.h> +#include <linux/platform_data/keypad-omap.h> #include <linux/leds.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/mux.h> -#include <linux/omap-dma.h> -#include <mach/tc.h> -#include <linux/platform_data/keypad-omap.h> +#include "tc.h" +#include "mux.h" #include "flash.h" - -#include <mach/hardware.h> +#include "hardware.h" #include "usb.h" -#include "common.h" #include "board-h2.h"
arch/arm/mach-omap1/board-h3.c +6 -8
@@ -29,6 +29,8 @@#include <linux/smc91x.h> #include <linux/omapfb.h> #include <linux/platform_data/gpio-omap.h> +#include <linux/platform_data/keypad-omap.h> +#include <linux/omap-dma.h> #include <linux/leds.h> #include <asm/setup.h>
@@ -37,16 +39,12 @@#include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/mux.h> -#include <mach/tc.h> -#include <linux/platform_data/keypad-omap.h> -#include <linux/omap-dma.h> +#include "tc.h" +#include "mux.h" #include "flash.h" - -#include <mach/hardware.h> -#include <mach/irqs.h> +#include "hardware.h" +#include "irqs.h" #include "usb.h" -#include "common.h" #include "board-h3.h"
arch/arm/mach-omap1/board-htcherald.c +4 -4
@@ -23,16 +23,16 @@#include <linux/spi/ads7846.h> #include <linux/omapfb.h> #include <linux/platform_data/keypad-omap.h> +#include <linux/soc/ti/omap1-io.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <mach/omap7xx.h> +#include "hardware.h" +#include "omap7xx.h" #include "mmc.h" - -#include <mach/irqs.h> +#include "irqs.h" #include "usb.h" -#include "common.h" /* LCD register definition */
arch/arm/mach-omap1/board-innovator.c +4 -6
@@ -23,19 +23,17 @@#include <linux/input.h> #include <linux/smc91x.h> #include <linux/omapfb.h> +#include <linux/platform_data/keypad-omap.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/mux.h> +#include "tc.h" +#include "mux.h" #include "flash.h" -#include <mach/tc.h> -#include <linux/platform_data/keypad-omap.h> - -#include <mach/hardware.h> +#include "hardware.h" #include "usb.h" -#include "iomap.h" #include "common.h" #include "mmc.h"
arch/arm/mach-omap1/board-nokia770.c +2 -4
@@ -28,11 +28,9 @@#include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/mux.h> - -#include <mach/hardware.h> +#include "mux.h" +#include "hardware.h" #include "usb.h" -#include "common.h" #include "clock.h" #include "mmc.h"
arch/arm/mach-omap1/board-osk.c +4 -5
@@ -42,18 +42,17 @@#include <linux/mfd/tps65010.h> #include <linux/platform_data/gpio-omap.h> #include <linux/platform_data/omap1_bl.h> +#include <linux/soc/ti/omap1-io.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> +#include "tc.h" #include "flash.h" -#include <mach/mux.h> -#include <mach/tc.h> - -#include <mach/hardware.h> +#include "mux.h" +#include "hardware.h" #include "usb.h" -#include "common.h" /* Name of the GPIO chip used by the OMAP for GPIOs 0..15 */
arch/arm/mach-omap1/board-palmte.c +5 -7
@@ -25,21 +25,19 @@#include <linux/interrupt.h> #include <linux/apm-emulation.h> #include <linux/omapfb.h> +#include <linux/omap-dma.h> +#include <linux/platform_data/keypad-omap.h> #include <linux/platform_data/omap1_bl.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> +#include "tc.h" #include "flash.h" -#include <mach/mux.h> -#include <mach/tc.h> -#include <linux/omap-dma.h> -#include <linux/platform_data/keypad-omap.h> - -#include <mach/hardware.h> +#include "mux.h" +#include "hardware.h" #include "usb.h" -#include "mmc.h" #include "common.h"
arch/arm/mach-omap1/board-palmtt.c +5 -7
@@ -24,22 +24,20 @@#include <linux/omapfb.h> #include <linux/spi/spi.h> #include <linux/spi/ads7846.h> +#include <linux/omap-dma.h> #include <linux/platform_data/omap1_bl.h> #include <linux/platform_data/leds-omap.h> +#include <linux/platform_data/keypad-omap.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> +#include "tc.h" #include "flash.h" -#include <mach/mux.h> -#include <linux/omap-dma.h> -#include <mach/tc.h> -#include <linux/platform_data/keypad-omap.h> - -#include <mach/hardware.h> +#include "mux.h" +#include "hardware.h" #include "usb.h" -#include "common.h" #define PALMTT_USBDETECT_GPIO 0
arch/arm/mach-omap1/board-palmz71.c +5 -7
@@ -28,20 +28,18 @@#include <linux/spi/spi.h> #include <linux/spi/ads7846.h> #include <linux/platform_data/omap1_bl.h> +#include <linux/platform_data/keypad-omap.h> +#include <linux/omap-dma.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> +#include "tc.h" #include "flash.h" -#include <mach/mux.h> -#include <linux/omap-dma.h> -#include <mach/tc.h> -#include <linux/platform_data/keypad-omap.h> - -#include <mach/hardware.h> +#include "mux.h" +#include "hardware.h" #include "usb.h" -#include "common.h" #define PALMZ71_USBDETECT_GPIO 0
arch/arm/mach-omap1/board-perseus2.c +4 -5
@@ -19,17 +19,16 @@#include <linux/smc91x.h> #include <linux/omapfb.h> #include <linux/platform_data/keypad-omap.h> +#include <linux/soc/ti/omap1-io.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/tc.h> -#include <mach/mux.h> +#include "tc.h" +#include "mux.h" #include "flash.h" - -#include <mach/hardware.h> - +#include "hardware.h" #include "iomap.h" #include "common.h" #include "fpga.h"
arch/arm/mach-omap1/board-sx1-mmc.c +1 -2
@@ -12,9 +12,8 @@#include <linux/gpio.h> #include <linux/platform_device.h> -#include <mach/hardware.h> +#include "hardware.h" #include "board-sx1.h" -#include "mmc.h" #if IS_ENABLED (CONFIG_MMC_OMAP )
arch/arm/mach-omap1/board-sx1.c +4 -6
@@ -26,20 +26,18 @@#include <linux/export.h> #include <linux/omapfb.h> #include <linux/platform_data/keypad-omap.h> +#include <linux/omap-dma.h> +#include "tc.h" #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> #include "flash.h" -#include <mach/mux.h> -#include <linux/omap-dma.h> -#include <mach/tc.h> +#include "mux.h" #include "board-sx1.h" - -#include <mach/hardware.h> +#include "hardware.h" #include "usb.h" -#include "common.h" /* Write to I2C device */
arch/arm/mach-omap1/clock.c +2 -2
@@ -16,11 +16,11 @@#include <linux/io.h> #include <linux/clk.h> #include <linux/clkdev.h> +#include <linux/soc/ti/omap1-io.h> #include <asm/mach-types.h> -#include <mach/hardware.h> - +#include "hardware.h" #include "soc.h" #include "iomap.h" #include "clock.h"
arch/arm/mach-omap1/clock_data.c +2 -3
@@ -16,14 +16,13 @@#include <linux/clk.h> #include <linux/cpufreq.h> #include <linux/delay.h> +#include <linux/soc/ti/omap1-io.h> #include <asm/mach-types.h> /* for machine_is_* */ #include "soc.h" - -#include <mach/hardware.h> +#include "hardware.h" #include "usb.h" /* for OTG_BASE */ -#include "iomap.h" #include "clock.h" #include "sram.h"
arch/arm/mach-omap1/common.h +1 -2
@@ -31,8 +31,7 @@#include <asm/exception.h> -#include <mach/irqs.h> - +#include "irqs.h" #include "soc.h" #include "i2c.h"
arch/arm/mach-omap1/devices.c +5 -5
@@ -14,15 +14,15 @@#include <linux/spi/spi.h> #include <linux/platform_data/omap-wd-timer.h> +#include <linux/soc/ti/omap1-io.h> #include <asm/mach/map.h> -#include <mach/tc.h> -#include <mach/mux.h> - -#include <mach/omap7xx.h> -#include <mach/hardware.h> +#include "tc.h" +#include "mux.h" +#include "omap7xx.h" +#include "hardware.h" #include "common.h" #include "clock.h" #include "mmc.h"
arch/arm/mach-omap1/dma.c +1 -1
@@ -24,7 +24,7 @@#include <linux/dma-mapping.h> #include <linux/dmaengine.h> #include <linux/omap-dma.h> -#include <mach/tc.h> +#include "tc.h" #include "soc.h"
arch/arm/mach-omap1/fb.c +1 -1
@@ -21,7 +21,7 @@#include <asm/mach/map.h> -#include <mach/irqs.h> +#include "irqs.h" #if IS_ENABLED (CONFIG_FB_OMAP )
arch/arm/mach-omap1/flash.c +3 -2
@@ -6,11 +6,12 @@#include <linux/io.h> #include <linux/mtd/mtd.h> #include <linux/mtd/map.h> +#include <linux/soc/ti/omap1-io.h> + +#include "tc.h" -#include <mach/tc.h> #include "flash.h" -#include <mach/hardware.h> void omap1_set_vpp (struct platform_device *pdev,int enable) {
arch/arm/mach-omap1/fpga.c +1 -2
@@ -24,8 +24,7 @@#include <asm/irq.h> #include <asm/mach/irq.h> -#include <mach/hardware.h> - +#include "hardware.h" #include "iomap.h" #include "common.h" #include "fpga.h"
arch/arm/mach-omap1/gpio15xx.c +2 -1
@@ -18,8 +18,9 @@#include <linux/gpio.h> #include <linux/platform_data/gpio-omap.h> +#include <linux/soc/ti/omap1-soc.h> -#include <mach/irqs.h> +#include "irqs.h" #define OMAP1_MPUIO_VBASE OMAP1_MPUIO_BASE#define OMAP1510_GPIO_BASE 0xFFFCE000
arch/arm/mach-omap1/gpio16xx.c +3 -2
@@ -18,9 +18,10 @@#include <linux/gpio.h> #include <linux/platform_data/gpio-omap.h> +#include <linux/soc/ti/omap1-io.h> -#include <mach/irqs.h> - +#include "hardware.h" +#include "irqs.h" #include "soc.h" #define OMAP1610_GPIO1_BASE 0xfffbe400
arch/arm/mach-omap1/gpio7xx.c +1 -2
@@ -19,8 +19,7 @@#include <linux/gpio.h> #include <linux/platform_data/gpio-omap.h> -#include <mach/irqs.h> - +#include "irqs.h" #include "soc.h" #define OMAP7XX_GPIO1_BASE 0xfffbc000
arch/arm/mach-omap1/hardware.h renamed from arch/arm/mach-omap1/include/mach/hardware.h +1 -3
@@ -1,6 +1,4 @@/* -* arch/arm/mach-omap1/include/mach/hardware.h -* * Hardware definitions for TI OMAP processors and boards * * NOTE: Please put device driver specific defines into a separate header
@@ -42,7 +40,7 @@#include <asm/types.h> #include <linux/soc/ti/omap1-soc.h> -#include <mach/tc.h> +#include "tc.h" /* Almost all documentation for chip and board memory maps assumes * BM is clear. Most devel boards have a switch to control booting
arch/arm/mach-omap1/i2c.c +2 -1
@@ -7,7 +7,8 @@#include <linux/i2c.h> #include <linux/platform_data/i2c-omap.h> -#include <mach/mux.h> + +#include "mux.h" #include "soc.h" #define OMAP_I2C_SIZE 0x3f
arch/arm/mach-omap1/id.c +2 -3
@@ -12,12 +12,11 @@#include <linux/kernel.h> #include <linux/init.h> #include <linux/io.h> +#include <linux/soc/ti/omap1-io.h> #include <asm/system_info.h> #include "soc.h" - -#include <mach/hardware.h> - +#include "hardware.h" #include "common.h" #define OMAP_DIE_ID_0 0xfffe1800
arch/arm/mach-omap1/include/mach/memory.h deleted +0 -12
@@ -1,12 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* arch/arm/mach-omap1/include/mach/memory.h -*/ - -#ifndef __ASM_ARCH_MEMORY_H -#define __ASM_ARCH_MEMORY_H - -/* REVISIT: omap1 legacy drivers still rely on this */ -#include <mach/hardware.h> - -#endif
arch/arm/mach-omap1/io.c +3 -4
@@ -9,14 +9,13 @@#include <linux/kernel.h> #include <linux/init.h> #include <linux/io.h> +#include <linux/omap-dma.h> #include <asm/tlb.h> #include <asm/mach/map.h> -#include <mach/mux.h> -#include <mach/tc.h> -#include <linux/omap-dma.h> - +#include "tc.h" +#include "mux.h" #include "iomap.h" #include "common.h" #include "clock.h"
arch/arm/mach-omap1/irq.c +1 -3
@@ -47,9 +47,7 @@#include <asm/mach/irq.h> #include "soc.h" - -#include <mach/hardware.h> - +#include "hardware.h" #include "common.h" #define IRQ_BANK (irq) ((irq) >> 5)
arch/arm/mach-omap1/irqs.h renamed from arch/arm/mach-omap1/include/mach/irqs.h +0 -2
@@ -1,7 +1,5 @@/* SPDX-License-Identifier: GPL-2.0-or-later */ /* -* arch/arm/plat-omap/include/mach/irqs.h -* * Copyright (C) Greg Lonnon 2001 * Updated for OMAP-1610 by Tony Lindgren <[email protected]> *
arch/arm/mach-omap1/mcbsp.c +4 -5
@@ -15,14 +15,13 @@#include <linux/io.h> #include <linux/platform_device.h> #include <linux/slab.h> -#include <linux/omap-dma.h> -#include <mach/mux.h> -#include "soc.h" +#include <linux/soc/ti/omap1-io.h> #include <linux/platform_data/asoc-ti-mcbsp.h> -#include <mach/irqs.h> - +#include "mux.h" +#include "soc.h" +#include "irqs.h" #include "iomap.h" #define DPS_RSTCT2_PER_EN (1 << 0)
arch/arm/mach-omap1/mtd-xip.h renamed from arch/arm/mach-omap1/include/mach/mtd-xip.h +2 -1
@@ -14,7 +14,8 @@#ifndef __ARCH_OMAP_MTD_XIP_H__#define __ARCH_OMAP_MTD_XIP_H__ -#include <mach/hardware.h> +#include "hardware.h" +#include <linux/soc/ti/omap1-io.h> #define OMAP_MPU_TIMER_BASE (0xfffec500)#define OMAP_MPU_TIMER_OFFSET 0x100
arch/arm/mach-omap1/mux.c +3 -3
@@ -12,10 +12,10 @@#include <linux/init.h> #include <linux/io.h> #include <linux/spinlock.h> +#include <linux/soc/ti/omap1-io.h> -#include <mach/hardware.h> - -#include <mach/mux.h> +#include "hardware.h" +#include "mux.h" #ifdef CONFIG_OMAP_MUX
arch/arm/mach-omap1/mux.h renamed from arch/arm/mach-omap1/include/mach/mux.h +0 -2
@@ -1,7 +1,5 @@/* SPDX-License-Identifier: GPL-2.0-or-later */ /* -* arch/arm/plat-omap/include/mach/mux.h -* * Table of the Omap register configurations for the FUNC_MUX and * PULL_DWN combinations. *
arch/arm/mach-omap1/ocpi.c +2 -2
@@ -20,9 +20,9 @@#include <linux/err.h> #include <linux/clk.h> #include <linux/io.h> +#include <linux/soc/ti/omap1-io.h> -#include <mach/hardware.h> - +#include "hardware.h" #include "common.h" #define OCPI_BASE 0xfffec320
arch/arm/mach-omap1/omap-dma.c +2 -1
@@ -34,10 +34,11 @@#include <linux/omap-dma.h> -#include <mach/hardware.h> #include <linux/soc/ti/omap1-io.h> #include <linux/soc/ti/omap1-soc.h> +#include "tc.h" +/* * MAX_LOGICAL_DMA_CH_COUNT: the maximum number of logical DMA * channels that an instance of the SDMA IP block can support. Used
arch/arm/mach-omap1/omap1510.h renamed from arch/arm/mach-omap1/include/mach/omap1510.h +0 -0
arch/arm/mach-omap1/omap16xx.h renamed from arch/arm/mach-omap1/include/mach/omap16xx.h +0 -0
arch/arm/mach-omap1/omap7xx.h renamed from arch/arm/mach-omap1/include/mach/omap7xx.h +0 -0
arch/arm/mach-omap1/pm.c +5 -4
@@ -52,13 +52,14 @@#include <asm/mach/time.h> #include <asm/mach/irq.h> -#include <mach/tc.h> -#include <mach/mux.h> +#include <linux/soc/ti/omap1-io.h> +#include "tc.h" #include <linux/omap-dma.h> #include <clocksource/timer-ti-dm.h> -#include <mach/irqs.h> - +#include "hardware.h" +#include "mux.h" +#include "irqs.h" #include "iomap.h" #include "clock.h" #include "pm.h"
arch/arm/mach-omap1/pm.h +2 -0
@@ -34,6 +34,8 @@#ifndef __ARCH_ARM_MACH_OMAP1_PM_H#define __ARCH_ARM_MACH_OMAP1_PM_H +#include <linux/soc/ti/omap1-io.h> +/* * ---------------------------------------------------------------------------- * Register and offset definitions to be used in PM assembler code
arch/arm/mach-omap1/reset.c +1 -2
@@ -6,8 +6,7 @@#include <linux/io.h> #include <linux/reboot.h> -#include <mach/hardware.h> - +#include "hardware.h" #include "iomap.h" #include "common.h"
arch/arm/mach-omap1/serial.c +2 -1
@@ -19,8 +19,9 @@#include <asm/mach-types.h> -#include <mach/mux.h> +#include <mach/serial.h> +#include "mux.h" #include "pm.h" #include "soc.h"
arch/arm/mach-omap1/sleep.S +1 -1
@@ -36,7 +36,7 @@ #include <asm/assembler.h> -#include <mach/hardware.h> +#include "hardware.h" #include "iomap.h" #include "pm.h"
arch/arm/mach-omap1/soc.h +2 -2
@@ -1,6 +1,6 @@/* * We can move linux/soc/ti/omap1-soc.h here once the drivers are fixed */ -#include <mach/hardware.h> -#include <mach/irqs.h> +#include "hardware.h" +#include "irqs.h" #include <asm/irq.h>
arch/arm/mach-omap1/sram.S +2 -2
@@ -6,11 +6,11 @@ */ #include <linux/linkage.h> +#include <linux/soc/ti/omap1-io.h> #include <asm/assembler.h> -#include <mach/hardware.h> - +#include "hardware.h" #include "iomap.h" .text
arch/arm/mach-omap1/tc.h renamed from arch/arm/mach-omap1/include/mach/tc.h +0 -2
@@ -1,7 +1,5 @@/* SPDX-License-Identifier: GPL-2.0-or-later */ /* -* arch/arm/plat-omap/include/mach/tc.h -* * OMAP Traffic Controller * * Copyright (C) 2004 Nokia Corporation
arch/arm/mach-omap1/time.c +1 -1
@@ -47,10 +47,10 @@#include <asm/irq.h> -#include <mach/hardware.h> #include <asm/mach/irq.h> #include <asm/mach/time.h> +#include "hardware.h" #include "iomap.h" #include "common.h"
arch/arm/mach-omap1/timer.c +1 -0
@@ -26,6 +26,7 @@#include <linux/slab.h> #include <linux/platform_device.h> #include <linux/platform_data/dmtimer-omap.h> +#include <linux/soc/ti/omap1-io.h> #include <clocksource/timer-ti-dm.h>
arch/arm/mach-omap1/timer32k.c +1 -1
@@ -51,7 +51,7 @@#include <asm/mach/irq.h> #include <asm/mach/time.h> -#include <mach/hardware.h> +#include "hardware.h" #include "common.h" /*
arch/arm/mach-omap1/usb.c +3 -3
@@ -12,13 +12,13 @@#include <linux/dma-map-ops.h> #include <linux/io.h> #include <linux/delay.h> +#include <linux/soc/ti/omap1-io.h> #include <asm/irq.h> -#include <mach/mux.h> - +#include "hardware.h" +#include "mux.h" #include "usb.h" -#include "common.h" /* These routines should handle the standard chip-specific modes
arch/arm/plat-omap/include/plat/cpu.h deleted +0 -21
@@ -1,21 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* -* OMAP cpu type detection -* -* Copyright (C) 2004, 2008 Nokia Corporation -* -* Copyright (C) 2009-11 Texas Instruments. -* -* Written by Tony Lindgren <[email protected]> -* -* Added OMAP4/5 specific defines - Santosh Shilimkar<[email protected]> -*/ - -#ifndef __ASM_ARCH_OMAP_CPU_H -#define __ASM_ARCH_OMAP_CPU_H - -#ifdef CONFIG_ARCH_OMAP1 -#include <mach/soc.h> -#endif - -#endif
Signature · 1 line
2.29.2
PATCH 29/41 ARM: omap1: fix build with no SoC selected
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
In a multiplatform randconfig kernel, one can have CONFIG_ARCH_OMAP1 enabled, but none of the specific SoCs. This leads to some build issues as the code is not meant to deal with this configuration at the moment:
arch/arm/mach-omap1/io.c:86:20: error: unused function 'omap1_map_common_io' [-Werror,-Wunused-function] arch/arm/mach-omap1/pm.h:113:2: error: "Power management for this processor not implemented yet" [-Werror,-W#warnings]
Use the same trick as on OMAP2 and guard the actual compilation of platform code with another Makefile ifdef check based on an option that depends on having at least one SoC enabled.
The io.c file still needs to get compiled to allow building device drivers with a dependency on CONFIG_ARCH_OMAP1.
--- arch/arm/Kconfig | 1 - arch/arm/mach-omap1/Kconfig | 4 ++++ arch/arm/mach-omap1/Makefile | 4 ++++ include/linux/soc/ti/omap1-io.h | 4 ++-- 4 files changed, 10 insertions(+), 3 deletions(-)
arch/arm/Kconfig +0 -1
@@ -485,7 +485,6 @@ config ARCH_S3C24XX config ARCH_OMAP1 bool "TI OMAP1" - select ARCH_OMAP select CLKSRC_MMIO select FORCE_PCI if PCCARD select GENERIC_IRQ_CHIP
arch/arm/mach-omap1/Kconfig +4 -0
@@ -28,6 +28,10 @@ config ARCH_OMAP16XX select CPU_ARM926T select OMAP_DM_TIMER +config ARCH_OMAP1_ANY + select ARCH_OMAP + def_bool ARCH_OMAP730 || ARCH_OMAP850 || ARCH_OMAP15XX || ARCH_OMAP16XX + config ARCH_OMAP bool
arch/arm/mach-omap1/Makefile +4 -0
@@ -3,6 +3,8 @@ # Makefile for the linux kernel. # +ifdef CONFIG_ARCH_OMAP1_ANY + # Common support obj-y := io.o id.o sram-init.o sram.o time.o irq.o mux.o flash.o \ serial.o devices.o dma.o omap-dma.o fb.o
@@ -57,3 +59,5 @@ obj-$(CONFIG_ARCH_OMAP730) += gpio7xx.o obj-$(CONFIG_ARCH_OMAP850) += gpio7xx.o obj-$(CONFIG_ARCH_OMAP15XX) += gpio15xx.o obj-$(CONFIG_ARCH_OMAP16XX) += gpio16xx.o + +endif
include/linux/soc/ti/omap1-io.h +2 -2
@@ -5,7 +5,7 @@#ifndef __ASSEMBLER__#include <linux/types.h> -#if defined(CONFIG_ARCH_OMAP ) && defined(CONFIG_ARCH_OMAP1 ) +#ifdef CONFIG_ARCH_OMAP1_ANY /* * NOTE: Please use ioremap + __raw_read/write where possible instead of these */
@@ -15,7 +15,7 @@ extern u32 omap_readl(u32 pa);extern void omap_writeb (u8 v,u32 pa);extern void omap_writew (u16 v,u32 pa);extern void omap_writel (u32 v,u32 pa); -#elif defined(CONFIG_COMPILE_TEST ) +#else static inline u8 omap_readb (u32 pa) {return 0 ; }static inline u16 omap_readw (u32 pa) {return 0 ; }static inline u32 omap_readl (u32 pa) {return 0 ; }
Signature · 1 line
2.29.2
PATCH 30/41 ARM: OMAP1: Prepare for conversion of OMAP1 clocks to CCF
In reply to Arnd BergmannFrom: Janusz Krzysztofik <[email protected]>
In preparation for conversion of OMAP1 clocks to common clock framework, identify arch/arm/mach-omap1 local users of those clocks and update them to call clk_prepare_enable/clk_disable_unprepare() instead of just clk_enable/disable(), as required by CCF implementation of clock API.
--- arch/arm/mach-omap1/mcbsp.c | 8 ++++---- arch/arm/mach-omap1/ocpi.c | 4 ++-- arch/arm/mach-omap1/serial.c | 6 +++--- arch/arm/mach-omap1/timer32k.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-)
arch/arm/mach-omap1/mcbsp.c +4 -4
@@ -43,8 +43,8 @@ static void omap1_mcbsp_request(unsigned int id) api_clk =clk_get (NULL ,"api_ck" ); dsp_clk =clk_get (NULL ,"dsp_ck" );if (!IS_ERR (api_clk) && !IS_ERR (dsp_clk)) { -clk_enable (api_clk); -clk_enable (dsp_clk); +clk_prepare_enable (api_clk); +clk_prepare_enable (dsp_clk);/* * DSP external peripheral reset
@@ -62,11 +62,11 @@ static void omap1_mcbsp_free(unsigned int id)if (id ==0 || id ==2 ) {if (--dsp_use ==0 ) {if (!IS_ERR (api_clk)) { -clk_disable (api_clk); +clk_disable_unprepare (api_clk);clk_put (api_clk); }if (!IS_ERR (dsp_clk)) { -clk_disable (dsp_clk); +clk_disable_unprepare (dsp_clk);clk_put (dsp_clk); } }
arch/arm/mach-omap1/ocpi.c +2 -2
@@ -73,7 +73,7 @@ static int __init omap_ocpi_init(void)if (IS_ERR (ocpi_ck))return PTR_ERR (ocpi_ck); -clk_enable (ocpi_ck); +clk_prepare_enable (ocpi_ck);ocpi_enable ();pr_info ("OMAP OCPI interconnect driver loaded\n" );
@@ -87,7 +87,7 @@ static void __exit omap_ocpi_exit(void)if (!cpu_is_omap16xx ())return ; -clk_disable (ocpi_ck); +clk_disable_unprepare (ocpi_ck);clk_put (ocpi_ck); }
arch/arm/mach-omap1/serial.c +3 -3
@@ -142,7 +142,7 @@ void __init omap_serial_init(void)if (IS_ERR (uart1_ck))printk ("Could not get uart1_ck\n" );else { -clk_enable (uart1_ck); +clk_prepare_enable (uart1_ck);if (cpu_is_omap15xx ())clk_set_rate (uart1_ck,12000000 ); }
@@ -152,7 +152,7 @@ void __init omap_serial_init(void)if (IS_ERR (uart2_ck))printk ("Could not get uart2_ck\n" );else { -clk_enable (uart2_ck); +clk_prepare_enable (uart2_ck);if (cpu_is_omap15xx ())clk_set_rate (uart2_ck,12000000 );else
@@ -164,7 +164,7 @@ void __init omap_serial_init(void)if (IS_ERR (uart3_ck))printk ("Could not get uart3_ck\n" );else { -clk_enable (uart3_ck); +clk_prepare_enable (uart3_ck);if (cpu_is_omap15xx ())clk_set_rate (uart3_ck,12000000 ); }
arch/arm/mach-omap1/timer32k.c +1 -1
@@ -270,7 +270,7 @@ int __init omap_32k_timer_init(void) sync32k_ick =clk_get (NULL ,"omap_32ksync_ick" );if (!IS_ERR (sync32k_ick)) -clk_enable (sync32k_ick); +clk_prepare_enable (sync32k_ick); ret =omap_init_clocksource_32k (base); }
Signature · 1 line
2.29.2
PATCH 31/41 ARM: OMAP1: clock: Fix early UART rate issues
In reply to Arnd BergmannFrom: Janusz Krzysztofik <[email protected]>
Commit ef772f2ee31e ("ARM: OMAP: Fix CONFIG_DEBUG_LL") was supposed to fix low level debugging, most possibly by early enabling UART clocks. The fix actually introduced early reset of most bits of MOD_CONF_CTRL_0 register, with the exception of UART1 and UART2 clock related bits which were set high. However, UART1 clock bit can play different roles on different OMAP1 variants. On OMAP1610 it enables the clock as intended, but on OMAP1510 it switches the clock rate from 12 to 48 MHz. Even worth, for UART2 the bit changes its clock rate also on OMAP1610. As a result, UART rates set by a bootloader can be unintentionally changed early on kernel boot and low level debugging broken, not fixed. Besides, reset of all other bits was not justified.
Don't touch register bits not related to UART clocks. Also, don't touch the bit of UART2 clock. Make sure UART1 and UART3 are enabled early on relevant OMAP1610 machine types while preserving bootloader UART clock rates on others.
--- arch/arm/mach-omap1/clock_data.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
arch/arm/mach-omap1/clock_data.c +5 -5
@@ -766,11 +766,11 @@ int __init omap1_clk_init(void)u32 reg;#ifdef CONFIG_DEBUG_LL -/* -* Resets some clocks that may be left on from bootloader, -* but leaves serial clocks on. -*/ -omap_writel (0x3 <<29 ,MOD_CONF_CTRL_0 ); +/* Make sure UART clocks are enabled early */ +if (cpu_is_omap16xx ()) +omap_writel (omap_readl (MOD_CONF_CTRL_0 ) | +CONF_MOD_UART1_CLK_MODE_R | +CONF_MOD_UART3_CLK_MODE_R ,MOD_CONF_CTRL_0 );#endif /* USB_REQ_EN will be disabled later if necessary (usb_dc_ck) */
Signature · 1 line
2.29.2
PATCH 32/41 ARM: OMAP1: clock: Fix UART rate reporting algorithm
In reply to Arnd BergmannFrom: Janusz Krzysztofik <[email protected]>
Since its introduction to the mainline kernel, omap1_uart_recalc() helper makes incorrect use of clk->enable_bit as a ready to use bitmap mask while it only provides the bit number. Fix it.
--- arch/arm/mach-omap1/clock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap1/clock.c +1 -1
@@ -41,7 +41,7 @@ static DEFINE_SPINLOCK(clockfw_lock);unsigned long omap1_uart_recalc (struct clk *clk) {unsigned int val =__raw_readl (clk->enable_reg); -return val & clk->enable_bit ?48000000 :12000000 ; +return val &1 << clk->enable_bit ?48000000 :12000000 ; }unsigned long omap1_sossi_recalc (struct clk *clk)
Signature · 1 line
2.29.2
PATCH 33/41 ARM: OMAP1: clock: Remove unused code
In reply to Arnd BergmannFrom: Janusz Krzysztofik <[email protected]>
The code of OMAP1 clocks contains quite a few unused elements:
- functions and function like macros never called: clk_reparent(), recalculate_root_clocks(), clk_enable_init_clocks(), omap_clk_get_by_name(), omap_clk_disable_autoidle_all(), __clk_get_parent(clk), __clk_get_rate(),
- unused structure fields:
- clkops: .find_idlest(), .find_companion(), .deny_idle(),
- clk: .src_offset, as well as .clkdm -- no longer present but still mentioned in comments,
- definitions of unused flags: INVERT_ENABLE, CLOCK_CLKOUTX2,
- definitions of unused data types: struct clk_functions,
- prototypes of functions with no implementation: clk_init(), omap1_watchdog_recalc().
- declarations of never defined global variables: clkops_dummy. Drop them.
--- arch/arm/mach-omap1/clock.c | 81 ------------------------------------- arch/arm/mach-omap1/clock.h | 53 +----------------------- 2 files changed, 2 insertions(+), 132 deletions(-)
arch/arm/mach-omap1/clock.c +0 -81
@@ -734,17 +734,6 @@ unsigned long omap_fixed_divisor_recalc(struct clk *clk)return clk->parent->rate / clk->fixed_div; } -void clk_reparent (struct clk *child,struct clk *parent) -{ -list_del_init (&child->sibling); -if (parent) -list_add (&child->sibling, &parent->children); - child->parent = parent; - -/* now do the debugfs renaming to reattach the child -to the proper parent */ -} -/* Propagate rate to children */ void propagate_rate (struct clk *tclk) {
@@ -759,24 +748,6 @@ void propagate_rate(struct clk *tclk)static LIST_HEAD (root_clks); -/** -* recalculate_root_clocks - recalculate and propagate all root clocks -* -* Recalculates all root clocks (clocks with no parent), which if the -* clock's .recalc is set correctly, should also propagate their rates. -* Called at init. -*/ -void recalculate_root_clocks (void ) -{ -struct clk *clkp; - -list_for_each_entry (clkp, &root_clks, sibling) { -if (clkp->recalc) - clkp->rate = clkp->recalc (clkp); -propagate_rate (clkp); - } -} -/** * clk_preinit - initialize any fields in the struct clk before clk init * @clk: struct clk * to initialize
@@ -827,42 +798,6 @@ void clk_unregister(struct clk *clk) }EXPORT_SYMBOL (clk_unregister); -void clk_enable_init_clocks (void ) -{ -struct clk *clkp; - -list_for_each_entry (clkp, &clocks, node) -if (clkp->flags &ENABLE_ON_INIT ) -clk_enable (clkp); -} - -/** -* omap_clk_get_by_name - locate OMAP struct clk by its name -* @name: name of the struct clk to locate -* -* Locate an OMAP struct clk by its name. Assumes that struct clk -* names are unique. Returns NULL if not found or a pointer to the -* struct clk if found. -*/ -struct clk *omap_clk_get_by_name (const char *name) -{ -struct clk *c; -struct clk *ret =NULL ; - -mutex_lock (&clocks_mutex); - -list_for_each_entry (c, &clocks, node) { -if (!strcmp (c->name, name)) { - ret = c; -break ; - } - } - -mutex_unlock (&clocks_mutex); - -return ret; -} -int omap_clk_enable_autoidle_all (void ) {struct clk *c;
@@ -879,22 +814,6 @@ int omap_clk_enable_autoidle_all(void)return 0 ; } -int omap_clk_disable_autoidle_all (void ) -{ -struct clk *c; -unsigned long flags; - -spin_lock_irqsave (&clockfw_lock, flags); - -list_for_each_entry (c, &clocks, node) -if (c->ops->deny_idle) - c->ops->deny_idle (c); - -spin_unlock_irqrestore (&clockfw_lock, flags); - -return 0 ; -} -/* * Low level helpers */
arch/arm/mach-omap1/clock.h +2 -51
124 lines not on this page · raw message
Signature · 1 line
2.29.2
PATCH 34/41 ARM: OMAP1: clock: Remove noop code
In reply to Arnd BergmannFrom: Janusz Krzysztofik <[email protected]>
There are some OMAP1 clock code bits that have no effect:
- crystal_type variable is set to 0 but never changed, then crystal_type == 2 condition is never true and ck_ref.rate never set to 19200000,
- clk->ops->allow_idle() is called from omap_clk_enable_autoidle_all() but that op is not configured for any clock, then the function does nothing and the op field is not needed,
- ENABLE_ON_INIT flag is set for some clocks but is never checked by any code, then not needed.
Drop that code.
--- arch/arm/mach-omap1/clock.c | 17 ----------------- arch/arm/mach-omap1/clock.h | 3 --- arch/arm/mach-omap1/clock_data.c | 8 +------- 3 files changed, 1 insertion(+), 27 deletions(-)
arch/arm/mach-omap1/clock.c +0 -17
@@ -798,22 +798,6 @@ void clk_unregister(struct clk *clk) }EXPORT_SYMBOL (clk_unregister); -int omap_clk_enable_autoidle_all (void ) -{ -struct clk *c; -unsigned long flags; - -spin_lock_irqsave (&clockfw_lock, flags); - -list_for_each_entry (c, &clocks, node) -if (c->ops->allow_idle) - c->ops->allow_idle (c); - -spin_unlock_irqrestore (&clockfw_lock, flags); - -return 0 ; -} -/* * Low level helpers */
@@ -871,7 +855,6 @@ static int __init clk_disable_unused(void) return 0; }late_initcall (clk_disable_unused); -late_initcall (omap_clk_enable_autoidle_all);#endif #if defined(CONFIG_PM_DEBUG ) && defined(CONFIG_DEBUG_FS )
arch/arm/mach-omap1/clock.h +0 -3
@@ -53,7 +53,6 @@ struct omap_clk {struct clkops {int (*enable)(struct clk *);void (*disable)(struct clk *); -void (*allow_idle)(struct clk *); };/*
@@ -64,7 +63,6 @@ struct clkops {#define ENABLE_REG_32BIT (1 << 0)/* Use 32-bit access */ #define CLOCK_IDLE_CONTROL (1 << 1)#define CLOCK_NO_IDLE_PARENT (1 << 2) -#define ENABLE_ON_INIT (1 << 3)/* Enable upon framework init */ /** * struct clk - OMAP struct clk
@@ -135,7 +133,6 @@ extern void clk_unregister(struct clk *clk);extern void propagate_rate (struct clk *clk);extern unsigned long followparent_recalc (struct clk *clk);unsigned long omap_fixed_divisor_recalc (struct clk *clk); -extern int omap_clk_enable_autoidle_all (void );extern const struct clkops clkops_null;
arch/arm/mach-omap1/clock_data.c +1 -7
@@ -92,8 +92,7 @@ static struct arm_idlect1_clk ck_dpll1out = { .name = "ck_dpll1out", .ops = &clkops_generic, .parent = &ck_dpll1, - .flags =CLOCK_IDLE_CONTROL |ENABLE_REG_32BIT | - ENABLE_ON_INIT, + .flags = CLOCK_IDLE_CONTROL | ENABLE_REG_32BIT, .enable_reg = OMAP1_IO_ADDRESS(ARM_IDLECT2), .enable_bit = EN_CKOUT_ARM, .recalc = &followparent_recalc,
@@ -146,7 +145,6 @@ static struct clk arm_gpio_ck = { .name = "ick", .ops = &clkops_generic, .parent = &ck_dpll1, - .flags = ENABLE_ON_INIT, .enable_reg = OMAP1_IO_ADDRESS(ARM_IDLECT2), .enable_bit = EN_GPIOCK, .recalc = &followparent_recalc,
@@ -316,7 +314,6 @@ static struct clk tc2_ck = { .name = "tc2_ck", .ops = &clkops_generic, .parent = &tc_ck.clk, - .flags = ENABLE_ON_INIT, .enable_reg = OMAP1_IO_ADDRESS(ARM_IDLECT3), .enable_bit = EN_TC2_CK, .recalc = &followparent_recalc,
@@ -762,7 +759,6 @@ u32 cpu_mask;int __init omap1_clk_init (void ) {struct omap_clk *c; -int crystal_type =0 ;/* Default 12 MHz */ u32 reg;#ifdef CONFIG_DEBUG_LL
@@ -810,8 +806,6 @@ int __init omap1_clk_init(void)if (cpu_is_omap7xx ()) ck_ref.rate =13000000 ; -if (cpu_is_omap16xx () && crystal_type ==2 ) - ck_ref.rate =19200000 ; pr_info("Clocks: ARM_SYSST: 0x%04x DPLL_CTL: 0x%04x ARM_CKCTL: 0x%04x\n", omap_readw(ARM_SYSST), omap_readw(DPLL_CTL),
Signature · 1 line
2.29.2
PATCH 35/41 usb: host: ohci-omap: Make it CCF clk API compatible
In reply to Arnd BergmannFrom: Janusz Krzysztofik <[email protected]>
The driver, OMAP1 specific, now omits clk_prepare/unprepare() steps, not supported by OMAP1 custom implementation of clock API. However, non-CCF stubs of those functions exist for use on such platforms until converted to CCF.
Update the driver to be compatible with CCF implementation of clock API.
--- drivers/usb/host/ohci-omap.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
drivers/usb/host/ohci-omap.c +16 -2
@@ -259,6 +259,10 @@ static int ohci_hcd_omap_probe(struct platform_device *pdev) goto err_put_hcd; } + retval =clk_prepare (priv->usb_host_ck); +if (retval) + goto err_put_host_ck; +if (!cpu_is_omap15xx ()) priv->usb_dc_ck =clk_get (&pdev->dev,"usb_dc_ck" );else
@@ -266,13 +270,17 @@ static int ohci_hcd_omap_probe(struct platform_device *pdev)if (IS_ERR (priv->usb_dc_ck)) { retval =PTR_ERR (priv->usb_dc_ck); - goto err_put_host_ck; + goto err_unprepare_host_ck; } + retval =clk_prepare (priv->usb_dc_ck); +if (retval) + goto err_put_dc_ck; +if (!request_mem_region (hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {dev_dbg (&pdev->dev,"request_mem_region failed\n" ); retval = -EBUSY ; - goto err_put_dc_ck; + goto err_unprepare_dc_ck; } hcd->regs =ioremap (hcd->rsrc_start, hcd->rsrc_len);
@@ -297,8 +305,12 @@ static int ohci_hcd_omap_probe(struct platform_device *pdev)iounmap (hcd->regs); err2:release_mem_region (hcd->rsrc_start, hcd->rsrc_len); +err_unprepare_dc_ck: +clk_unprepare (priv->usb_dc_ck); err_put_dc_ck:clk_put (priv->usb_dc_ck); +err_unprepare_host_ck: +clk_unprepare (priv->usb_host_ck); err_put_host_ck:clk_put (priv->usb_host_ck); err_put_hcd:
@@ -333,7 +345,9 @@ static int ohci_hcd_omap_remove(struct platform_device *pdev) }iounmap (hcd->regs);release_mem_region (hcd->rsrc_start, hcd->rsrc_len); +clk_unprepare (priv->usb_dc_ck);clk_put (priv->usb_dc_ck); +clk_unprepare (priv->usb_host_ck);clk_put (priv->usb_host_ck);usb_put_hcd (hcd);return 0 ;
Signature · 1 line
2.29.2
PATCH 36/41 usb: gadget: omap_udc: Make it CCF clk API compatible
In reply to Arnd BergmannFrom: Janusz Krzysztofik <[email protected]>
The driver, OMAP1 specific, now omits clk_prepare/unprepare() steps, not supported by OMAP1 custom implementation of clock API. However, non-CCF stubs of those functions exist for use on such platforms until converted to CCF.
Update the driver to be compatible with CCF implementation of clock API.
--- drivers/usb/gadget/udc/omap_udc.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/usb/gadget/udc/omap_udc.c +8 -6
@@ -2609,6 +2609,8 @@ static void omap_udc_release(struct device *dev)if (udc->dc_clk) {if (udc->clk_requested)omap_udc_enable_clock (0 ); +clk_unprepare (udc->hhc_clk); +clk_unprepare (udc->dc_clk);clk_put (udc->hhc_clk);clk_put (udc->dc_clk); }
@@ -2773,8 +2775,8 @@ static int omap_udc_probe(struct platform_device *pdev) hhc_clk =clk_get (&pdev->dev,"usb_hhc_ck" );BUG_ON (IS_ERR (dc_clk) ||IS_ERR (hhc_clk));/* can't use omap_udc_enable_clock yet */ -clk_enable (dc_clk); -clk_enable (hhc_clk); +clk_prepare_enable (dc_clk); +clk_prepare_enable (hhc_clk);udelay (100 ); }
@@ -2783,8 +2785,8 @@ static int omap_udc_probe(struct platform_device *pdev) hhc_clk =clk_get (&pdev->dev,"l3_ocpi_ck" );BUG_ON (IS_ERR (dc_clk) ||IS_ERR (hhc_clk));/* can't use omap_udc_enable_clock yet */ -clk_enable (dc_clk); -clk_enable (hhc_clk); +clk_prepare_enable (dc_clk); +clk_prepare_enable (hhc_clk);udelay (100 ); }
@@ -2932,8 +2934,8 @@ static int omap_udc_probe(struct platform_device *pdev)usb_put_phy (xceiv);if (cpu_is_omap16xx () ||cpu_is_omap7xx ()) { -clk_disable (hhc_clk); -clk_disable (dc_clk); +clk_disable_unprepare (hhc_clk); +clk_disable_unprepare (dc_clk);clk_put (hhc_clk);clk_put (dc_clk); }
Signature · 1 line
2.29.2
PATCH 37/41 video: fbdev: omap: Make it CCF clk API compatible
In reply to Arnd BergmannFrom: Janusz Krzysztofik <[email protected]>
OMAP1 LCDC drivers now omit clk_prepare/unprepare() steps, not supported by OMAP1 custom implementation of clock API. However, non-CCF stubs of those functions exist for use on such platforms until converted to CCF.
Update the drivers to be compatible with CCF implementation of clock API.
--- drivers/video/fbdev/omap/hwa742.c | 6 +++--- drivers/video/fbdev/omap/lcdc.c | 6 +++--- drivers/video/fbdev/omap/sossi.c | 5 +++-- 3 files changed, 9 insertions(+), 8 deletions(-)
drivers/video/fbdev/omap/hwa742.c +3 -3
@@ -964,7 +964,7 @@ static int hwa742_init(struct omapfb_device *fbdev, int ext_mode,if ((r =calc_extif_timings (ext_clk, &extif_mem_div)) <0 ) goto err3; hwa742.extif->set_timings (&hwa742.reg_timings); -clk_enable (hwa742.sys_ck); +clk_prepare_enable (hwa742.sys_ck);calc_hwa742_clk_rates (ext_clk, &sys_clk, &pix_clk);if ((r =calc_extif_timings (sys_clk, &extif_mem_div)) <0 )
@@ -1023,7 +1023,7 @@ static int hwa742_init(struct omapfb_device *fbdev, int ext_mode,return 0 ; err4: -clk_disable (hwa742.sys_ck); +clk_disable_unprepare (hwa742.sys_ck); err3: hwa742.extif->cleanup (); err2:
@@ -1037,7 +1037,7 @@ static void hwa742_cleanup(void)hwa742_set_update_mode (OMAPFB_UPDATE_DISABLED ); hwa742.extif->cleanup (); hwa742.int_ctrl->cleanup (); -clk_disable (hwa742.sys_ck); +clk_disable_unprepare (hwa742.sys_ck); }struct lcd_ctrl hwa742_ctrl = {
drivers/video/fbdev/omap/lcdc.c +3 -3
@@ -713,7 +713,7 @@ static int omap_lcdc_init(struct omapfb_device *fbdev, int ext_mode,dev_err (fbdev->dev,"failed to adjust LCD rate\n" ); goto fail1; } -clk_enable (lcdc.lcd_ck); +clk_prepare_enable (lcdc.lcd_ck); r =request_irq (fbdev->int_irq, lcdc_irq_handler,0 ,MODULE_NAME , fbdev);if (r) {
@@ -748,7 +748,7 @@ static int omap_lcdc_init(struct omapfb_device *fbdev, int ext_mode, fail3:free_irq (fbdev->int_irq, lcdc.fbdev); fail2: -clk_disable (lcdc.lcd_ck); +clk_disable_unprepare (lcdc.lcd_ck); fail1:clk_put (lcdc.lcd_ck); fail0:
@@ -762,7 +762,7 @@ static void omap_lcdc_cleanup(void)free_fbmem ();omap_free_lcd_dma ();free_irq (lcdc.fbdev->int_irq, lcdc.fbdev); -clk_disable (lcdc.lcd_ck); +clk_disable_unprepare (lcdc.lcd_ck);clk_put (lcdc.lcd_ck); }
drivers/video/fbdev/omap/sossi.c +3 -2
@@ -600,7 +600,7 @@ static int sossi_init(struct omapfb_device *fbdev) l &= ~CONF_SOSSI_RESET_R ;omap_writel (l,MOD_CONF_CTRL_1 ); -clk_enable (sossi.fck); +clk_prepare_enable (sossi.fck); l =omap_readl (ARM_IDLECT2 ); l &= ~(1 <<8 );/* DMACK_REQ */ omap_writel (l,ARM_IDLECT2 );
@@ -651,7 +651,7 @@ static int sossi_init(struct omapfb_device *fbdev)return 0 ; err: -clk_disable (sossi.fck); +clk_disable_unprepare (sossi.fck);clk_put (sossi.fck);return r; }
@@ -659,6 +659,7 @@ static int sossi_init(struct omapfb_device *fbdev)static void sossi_cleanup (void ) {omap_lcdc_free_dma_callback (); +clk_unprepare (sossi.fck);clk_put (sossi.fck);iounmap (sossi.base); }
Signature · 1 line
2.29.2
PATCH 38/41 mmc: omap: Make it CCF clk API compatible
In reply to Arnd BergmannFrom: Janusz Krzysztofik <[email protected]>
The driver, OMAP specific, now omits clk_prepare/unprepare() steps, not supported by OMAP custom implementation of clock API. However, non-CCF stubs of those functions exist for use on such platforms until converted to CCF.
Update the driver to be compatible with CCF implementation of clock API.
--- drivers/mmc/host/omap.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-)
drivers/mmc/host/omap.c +14 -9
@@ -1374,7 +1374,7 @@ static int mmc_omap_probe(struct platform_device *pdev) host->iclk =clk_get (&pdev->dev,"ick" );if (IS_ERR (host->iclk))return PTR_ERR (host->iclk); -clk_enable (host->iclk); +clk_prepare_enable (host->iclk); host->fclk =clk_get (&pdev->dev,"fck" );if (IS_ERR (host->fclk)) {
@@ -1382,16 +1382,18 @@ static int mmc_omap_probe(struct platform_device *pdev) goto err_free_iclk; } + ret =clk_prepare (host->fclk); +if (ret) + goto err_put_fclk; + host->dma_tx_burst =-1 ; host->dma_rx_burst =-1 ; host->dma_tx =dma_request_chan (&pdev->dev,"tx" );if (IS_ERR (host->dma_tx)) { ret =PTR_ERR (host->dma_tx); -if (ret == -EPROBE_DEFER ) { -clk_put (host->fclk); - goto err_free_iclk; - } +if (ret == -EPROBE_DEFER ) + goto err_free_fclk; host->dma_tx =NULL ;dev_warn (host->dev,"TX DMA channel request failed\n" );
@@ -1403,8 +1405,7 @@ static int mmc_omap_probe(struct platform_device *pdev)if (ret == -EPROBE_DEFER ) {if (host->dma_tx)dma_release_channel (host->dma_tx); -clk_put (host->fclk); - goto err_free_iclk; + goto err_free_fclk; } host->dma_rx =NULL ;
@@ -1454,9 +1455,12 @@ static int mmc_omap_probe(struct platform_device *pdev)dma_release_channel (host->dma_tx);if (host->dma_rx)dma_release_channel (host->dma_rx); +err_free_fclk: +clk_unprepare (host->fclk); +err_put_fclk:clk_put (host->fclk); err_free_iclk: -clk_disable (host->iclk); +clk_disable_unprepare (host->iclk);clk_put (host->iclk);return ret; }
@@ -1476,8 +1480,9 @@ static int mmc_omap_remove(struct platform_device *pdev)mmc_omap_fclk_enable (host,0 );free_irq (host->irq, host); +clk_unprepare (host->fclk);clk_put (host->fclk); -clk_disable (host->iclk); +clk_disable_unprepare (host->iclk);clk_put (host->iclk);if (host->dma_tx)
Signature · 1 line
2.29.2
PATCH 39/41 ASoC: ti: osk5912: Make it CCF clk API compatible
In reply to Arnd BergmannFrom: Janusz Krzysztofik <[email protected]>
The driver, OMAP1 specific, now omits clk_prepare/unprepare() steps, not supported by OMAP1 custom implementation of clock API. However, non-CCF stubs of those functions exist for use on such platforms until converted to CCF.
Update the driver to be compatible with CCF implementation of clock API.
v2: use clk_prepare_enable/clk_disable_unprepare() (Peter)
--- sound/soc/ti/osk5912.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/ti/osk5912.c +2 -2
@@ -27,12 +27,12 @@ static struct clk *tlv320aic23_mclk;static int osk_startup (struct snd_pcm_substream *substream) { -return clk_enable (tlv320aic23_mclk); +return clk_prepare_enable (tlv320aic23_mclk); }static void osk_shutdown (struct snd_pcm_substream *substream) { -clk_disable (tlv320aic23_mclk); +clk_disable_unprepare (tlv320aic23_mclk); } static int osk_hw_params(struct snd_pcm_substream *substream,
Signature · 1 line
2.29.2
PATCH 40/41 ARM: OMAP1: clock: Convert to CCF
In reply to Arnd BergmannFrom: Janusz Krzysztofik <[email protected]>
OMAP1 still uses its own implementation of standard clock API defined in include/linux/clk.h. Internals of that implementation are not visible outside OMAP1 directory. As a consequence, device drivers are not able to register clocks potentially provided by peripheral devices.
Drop OMAP1 implementation of the clock API and enable common clock framework. Modify the remaining low level code to be compatible with clock provider API and register the clocks with CCF.
Move initialisation of clocks to omap1_timer_init() to avoid memory allocation issues at early setup phase from where omap1_init_early() is called. Register the clocks after initialization of clock I/O registers, local clock pointers used by OMAP1 clock ops, and local .rate fields of clocks with no local implementation of .recalc ops, so CCF structures are populated with correct data during clock registration. Instead of enabling some of the registered clocks, flag them for CCF as critical. Introduce .is_enabled op using code that verifies hardware status of clock enablement, split out from implementation of .disable_unused op, so the latter is actually called by CCF for not requested but hardware enabled clocks. Add .round_rate ops where missing so .set_rate ops are called by CCF as expected. Since CCF allows parallel execution of .enable/.disable and .set_rate ops, protect registers shared among those groups of ops from concurrent access with spinlocks. Drop local debugfs support in favor of that provided by CCF.
v2: flag tc2_ck as CLK_IS_CRITICAL (Aaro)
v3: rebase on top of soc/omap1-multiplatform-5.18,
- drop no longer needed includes from arch/arm/mach-omap1/io.c
--- arch/arm/mach-omap1/clock.c | 693 +++++++++++++------------------ arch/arm/mach-omap1/clock.h | 139 +++---- arch/arm/mach-omap1/clock_data.c | 483 ++++++++++----------- arch/arm/mach-omap1/io.c | 7 - arch/arm/mach-omap1/time.c | 5 + 5 files changed, 563 insertions(+), 764 deletions(-)
arch/arm/mach-omap1/clock.c +300 -393
@@ -16,7 +16,9 @@#include <linux/io.h> #include <linux/clk.h> #include <linux/clkdev.h> +#include <linux/clk-provider.h> #include <linux/soc/ti/omap1-io.h> +#include <linux/spinlock.h> #include <asm/mach-types.h>
@@ -28,33 +30,37 @@#include "sram.h" __u32 arm_idlect1_mask; -struct clk *api_ck_p, *ck_dpll1_p, *ck_ref_p; +/* provide direct internal access (not via clk API) to some clocks */ +struct omap1_clk *api_ck_p, *ck_dpll1_p, *ck_ref_p; -static LIST_HEAD (clocks); -static DEFINE_MUTEX (clocks_mutex); -static DEFINE_SPINLOCK (clockfw_lock); +/* protect registeres shared among clk_enable/disable() and clk_set_rate() operations */ +static DEFINE_SPINLOCK (arm_ckctl_lock); +static DEFINE_SPINLOCK (arm_idlect2_lock); +static DEFINE_SPINLOCK (mod_conf_ctrl_0_lock); +static DEFINE_SPINLOCK (mod_conf_ctrl_1_lock); +static DEFINE_SPINLOCK (swd_clk_div_ctrl_sel_lock);/* * Omap1 specific clock functions */ -unsigned long omap1_uart_recalc (struct clk *clk) +unsigned long omap1_uart_recalc (struct omap1_clk *clk,unsigned long p_rate) {unsigned int val =__raw_readl (clk->enable_reg);return val &1 << clk->enable_bit ?48000000 :12000000 ; } -unsigned long omap1_sossi_recalc (struct clk *clk) +unsigned long omap1_sossi_recalc (struct omap1_clk *clk,unsigned long p_rate) {u32 div =omap_readl (MOD_CONF_CTRL_1 ); div = (div >>17 ) &0x7 ; div++; -return clk->parent->rate / div; +return p_rate / div; } -static void omap1_clk_allow_idle (struct clk *clk) +static void omap1_clk_allow_idle (struct omap1_clk *clk) {struct arm_idlect1_clk * iclk = (struct arm_idlect1_clk *)clk;
@@ -65,7 +71,7 @@ static void omap1_clk_allow_idle(struct clk *clk) arm_idlect1_mask |=1 << iclk->idlect_shift; } -static void omap1_clk_deny_idle (struct clk *clk) +static void omap1_clk_deny_idle (struct omap1_clk *clk) {struct arm_idlect1_clk * iclk = (struct arm_idlect1_clk *)clk;
@@ -129,7 +135,7 @@ static __u16 verify_ckctl_value(__u16 newval)return newval; } -static int calc_dsor_exp (struct clk *clk,unsigned long rate) +static int calc_dsor_exp (unsigned long rate,unsigned long realrate) {/* Note: If target frequency is too low, this function will return 4, * which is invalid value. Caller must check for this value and act
@@ -142,15 +148,11 @@ static int calc_dsor_exp(struct clk *clk, unsigned long rate)* DSP_CK >= TC_CK * DSPMMU_CK >= TC_CK */ -unsigned long realrate; -struct clk * parent;unsigned dsor_exp; - parent = clk->parent; -if (unlikely (parent ==NULL )) +if (unlikely (realrate ==0 ))return -EIO ; - realrate = parent->rate;for (dsor_exp=0 ; dsor_exp<4 ; dsor_exp++) {if (realrate <= rate)break ;
@@ -161,16 +163,50 @@ static int calc_dsor_exp(struct clk *clk, unsigned long rate)return dsor_exp; } -unsigned long omap1_ckctl_recalc (struct clk *clk) +unsigned long omap1_ckctl_recalc (struct omap1_clk *clk,unsigned long p_rate) {/* Calculate divisor encoded as 2-bit exponent */ int dsor =1 << (3 & (omap_readw (ARM_CKCTL ) >> clk->rate_offset)); -return clk->parent->rate / dsor; +/* update locally maintained rate, required by arm_ck for omap1_show_rates() */ + clk->rate = p_rate / dsor; +return clk->rate; } -unsigned long omap1_ckctl_recalc_dsp_domain (struct clk *clk) +static int omap1_clk_is_enabled (struct clk_hw *hw) { +struct omap1_clk *clk =to_omap1_clk (hw); +bool api_ck_was_enabled = true; +__u32 regval32; +int ret; + +if (!clk->ops)/* no gate -- always enabled */ +return 1 ; + +if (clk->ops == &clkops_dspck) { + api_ck_was_enabled =omap1_clk_is_enabled (&api_ck_p->hw); +if (!api_ck_was_enabled) +if (api_ck_p->ops->enable (api_ck_p) <0 ) +return 0 ; + } + +if (clk->flags &ENABLE_REG_32BIT ) + regval32 =__raw_readl (clk->enable_reg); +else + regval32 =__raw_readw (clk->enable_reg); + + ret = regval32 & (1 << clk->enable_bit); + +if (!api_ck_was_enabled) + api_ck_p->ops->disable (api_ck_p); + +return ret; +} + + +unsigned long omap1_ckctl_recalc_dsp_domain (struct omap1_clk *clk,unsigned long p_rate) +{ +bool api_ck_was_enabled;int dsor;/* Calculate divisor encoded as 2-bit exponent
@@ -180,15 +216,18 @@ unsigned long omap1_ckctl_recalc_dsp_domain(struct clk *clk)* Note that DSP_CKCTL virt addr = phys addr, so * we must use __raw_readw() instead of omap_readw(). */ -omap1_clk_enable (api_ck_p); + api_ck_was_enabled =omap1_clk_is_enabled (&api_ck_p->hw); +if (!api_ck_was_enabled) + api_ck_p->ops->enable (api_ck_p); dsor =1 << (3 & (__raw_readw (DSP_CKCTL ) >> clk->rate_offset)); -omap1_clk_disable (api_ck_p); +if (!api_ck_was_enabled) + api_ck_p->ops->disable (api_ck_p); -return clk->parent->rate / dsor; +return p_rate / dsor; }/* MPU virtual clock functions */ -int omap1_select_table_rate (struct clk *clk,unsigned long rate) +int omap1_select_table_rate (struct omap1_clk *clk,unsigned long rate,unsigned long p_rate) {/* Find the highest supported frequency <= rate and switch to it */ struct mpu_rate * ptr;
@@ -223,12 +262,12 @@ int omap1_select_table_rate(struct clk *clk, unsigned long rate)return 0 ; } -int omap1_clk_set_rate_dsp_domain (struct clk *clk,unsigned long rate) +int omap1_clk_set_rate_dsp_domain (struct omap1_clk *clk,unsigned long rate,unsigned long p_rate) {int dsor_exp;u16 regval; - dsor_exp =calc_dsor_exp (clk, rate); + dsor_exp =calc_dsor_exp (rate, p_rate);if (dsor_exp >3 ) dsor_exp = -EINVAL ;if (dsor_exp <0 )
@@ -238,42 +277,51 @@ int omap1_clk_set_rate_dsp_domain(struct clk *clk, unsigned long rate) regval &= ~(3 << clk->rate_offset); regval |= dsor_exp << clk->rate_offset;__raw_writew (regval,DSP_CKCTL ); - clk->rate = clk->parent->rate / (1 << dsor_exp); + clk->rate = p_rate / (1 << dsor_exp);return 0 ; } -long omap1_clk_round_rate_ckctl_arm (struct clk *clk,unsigned long rate) +long omap1_clk_round_rate_ckctl_arm (struct omap1_clk *clk,unsigned long rate, +unsigned long *p_rate) { -int dsor_exp =calc_dsor_exp (clk, rate); +int dsor_exp =calc_dsor_exp (rate, *p_rate); +if (dsor_exp <0 )return dsor_exp;if (dsor_exp >3 ) dsor_exp =3 ; -return clk->parent->rate / (1 << dsor_exp); +return *p_rate / (1 << dsor_exp); } -int omap1_clk_set_rate_ckctl_arm (struct clk *clk,unsigned long rate) +int omap1_clk_set_rate_ckctl_arm (struct omap1_clk *clk,unsigned long rate,unsigned long p_rate) { +unsigned long flags;int dsor_exp;u16 regval; - dsor_exp =calc_dsor_exp (clk, rate); + dsor_exp =calc_dsor_exp (rate, p_rate);if (dsor_exp >3 ) dsor_exp = -EINVAL ;if (dsor_exp <0 )return dsor_exp; +/* protect ARM_CKCTL register from concurrent access via clk_enable/disable() */ +spin_lock_irqsave (&arm_ckctl_lock, flags); + regval =omap_readw (ARM_CKCTL ); regval &= ~(3 << clk->rate_offset); regval |= dsor_exp << clk->rate_offset; regval =verify_ckctl_value (regval);omap_writew (regval,ARM_CKCTL ); - clk->rate = clk->parent->rate / (1 << dsor_exp); + clk->rate = p_rate / (1 << dsor_exp); + +spin_unlock_irqrestore (&arm_ckctl_lock, flags); +return 0 ; } -long omap1_round_to_table_rate (struct clk *clk,unsigned long rate) +long omap1_round_to_table_rate (struct omap1_clk *clk,unsigned long rate,unsigned long *p_rate) {/* Find the highest supported frequency <= rate */ struct mpu_rate * ptr;
@@ -324,26 +372,40 @@ static unsigned calc_ext_dsor(unsigned long rate) }/* XXX Only needed on 1510 */ -int omap1_set_uart_rate (struct clk *clk,unsigned long rate) +long omap1_round_uart_rate (struct omap1_clk *clk,unsigned long rate,unsigned long *p_rate) { +return rate >24000000 ?48000000 :12000000 ; +} + +int omap1_set_uart_rate (struct omap1_clk *clk,unsigned long rate,unsigned long p_rate) +{ +unsigned long flags;unsigned int val; - val =__raw_readl (clk->enable_reg);if (rate ==12000000 ) - val &= ~(1 << clk->enable_bit); + val =0 ;else if (rate ==48000000 ) - val |= (1 << clk->enable_bit); + val =1 << clk->enable_bit;else return -EINVAL ; + +/* protect MOD_CONF_CTRL_0 register from concurrent access via clk_enable/disable() */ +spin_lock_irqsave (&mod_conf_ctrl_0_lock, flags); + + val |=__raw_readl (clk->enable_reg) & ~(1 << clk->enable_bit);__raw_writel (val, clk->enable_reg); + +spin_unlock_irqrestore (&mod_conf_ctrl_0_lock, flags); + clk->rate = rate;return 0 ; }/* External clock (MCLK & BCLK) functions */ -int omap1_set_ext_clk_rate (struct clk *clk,unsigned long rate) +int omap1_set_ext_clk_rate (struct omap1_clk *clk,unsigned long rate,unsigned long p_rate) { +unsigned long flags;unsigned dsor;__u16 ratio_bits;
@@ -354,25 +416,53 @@ int omap1_set_ext_clk_rate(struct clk *clk, unsigned long rate)else ratio_bits = (dsor -2 ) <<2 ; +/* protect SWD_CLK_DIV_CTRL_SEL register from concurrent access via clk_enable/disable() */ +spin_lock_irqsave (&swd_clk_div_ctrl_sel_lock, flags); + ratio_bits |=__raw_readw (clk->enable_reg) & ~0xfd ;__raw_writew (ratio_bits, clk->enable_reg); +spin_unlock_irqrestore (&swd_clk_div_ctrl_sel_lock, flags); +return 0 ; } -int omap1_set_sossi_rate (struct clk *clk,unsigned long rate) +static int calc_div_sossi (unsigned long rate,unsigned long p_rate) { -u32 l;int div; -unsigned long p_rate; - p_rate = clk->parent->rate;/* Round towards slower frequency */ div = (p_rate + rate -1 ) / rate; - div--; + +return --div; +} + +long omap1_round_sossi_rate (struct omap1_clk *clk,unsigned long rate,unsigned long *p_rate) +{ +int div; + + div =calc_div_sossi (rate, *p_rate); +if (div <0 ) + div =0 ; +else if (div >7 ) + div =7 ; + +return *p_rate / (div +1 ); +} + +int omap1_set_sossi_rate (struct omap1_clk *clk,unsigned long rate,unsigned long p_rate) +{ +unsigned long flags; +u32 l; +int div; + + div =calc_div_sossi (rate, p_rate);if (div <0 || div >7 )return -EINVAL ; +/* protect MOD_CONF_CTRL_1 register from concurrent access via clk_enable/disable() */ +spin_lock_irqsave (&mod_conf_ctrl_1_lock, flags); + l =omap_readl (MOD_CONF_CTRL_1 ); l &= ~(7 <<17 ); l |= div <<17 ;
@@ -380,15 +470,17 @@ int omap1_set_sossi_rate(struct clk *clk, unsigned long rate) clk->rate = p_rate / (div +1 ); +spin_unlock_irqrestore (&mod_conf_ctrl_1_lock, flags); +return 0 ; } -long omap1_round_ext_clk_rate (struct clk *clk,unsigned long rate) +long omap1_round_ext_clk_rate (struct omap1_clk *clk,unsigned long rate,unsigned long *p_rate) {return 96000000 /calc_ext_dsor (rate); } -void omap1_init_ext_clk (struct clk *clk) +int omap1_init_ext_clk (struct omap1_clk *clk) {unsigned dsor;__u16 ratio_bits;
@@ -404,59 +496,59 @@ void omap1_init_ext_clk(struct clk *clk) dsor = ratio_bits +2 ; clk-> rate =96000000 / dsor; + +return 0 ; } -int omap1_clk_enable (struct clk *clk) +static int omap1_clk_enable (struct clk_hw *hw) { +struct omap1_clk *clk =to_omap1_clk (hw), *parent =to_omap1_clk (clk_hw_get_parent (hw));int ret =0 ; -if (clk->usecount++ ==0 ) { -if (clk->parent) { - ret =omap1_clk_enable (clk->parent); -if (ret) - goto err; - -if (clk->flags &CLOCK_NO_IDLE_PARENT ) -omap1_clk_deny_idle (clk->parent); - } +if (parent && clk->flags &CLOCK_NO_IDLE_PARENT ) +omap1_clk_deny_idle (parent); +if (clk->ops && !(WARN_ON (!clk->ops->enable))) ret = clk->ops->enable (clk); -if (ret) { -if (clk->parent) -omap1_clk_disable (clk->parent); - goto err; - } - } -return ret; -err: - clk->usecount--;return ret; } -void omap1_clk_disable (struct clk *clk) +static void omap1_clk_disable (struct clk_hw *hw) { -if (clk->usecount >0 && !(--clk->usecount)) { +struct omap1_clk *clk =to_omap1_clk (hw), *parent =to_omap1_clk (clk_hw_get_parent (hw)); + +if (clk->ops && !(WARN_ON (!clk->ops->disable))) clk->ops->disable (clk); -if (likely (clk->parent)) { -omap1_clk_disable (clk->parent); -if (clk->flags &CLOCK_NO_IDLE_PARENT ) -omap1_clk_allow_idle (clk->parent); - } - } + +if (likely (parent) && clk->flags &CLOCK_NO_IDLE_PARENT ) +omap1_clk_allow_idle (parent); } -static int omap1_clk_enable_generic (struct clk *clk) +static int omap1_clk_enable_generic (struct omap1_clk *clk) { +unsigned long flags;__u16 regval16;__u32 regval32;if (unlikely (clk->enable_reg ==NULL )) {printk (KERN_ERR "clock.c: Enable for %s without enable code\n" , - clk->name); +clk_hw_get_name (&clk->hw));return -EINVAL ; } +/* protect clk->enable_reg from concurrent access via clk_set_rate() */ +if (clk->enable_reg ==OMAP1_IO_ADDRESS (ARM_CKCTL )) +spin_lock_irqsave (&arm_ckctl_lock, flags); +else if (clk->enable_reg ==OMAP1_IO_ADDRESS (ARM_IDLECT2 )) +spin_lock_irqsave (&arm_idlect2_lock, flags); +else if (clk->enable_reg ==OMAP1_IO_ADDRESS (MOD_CONF_CTRL_0 )) +spin_lock_irqsave (&mod_conf_ctrl_0_lock, flags); +else if (clk->enable_reg ==OMAP1_IO_ADDRESS (MOD_CONF_CTRL_1 )) +spin_lock_irqsave (&mod_conf_ctrl_1_lock, flags); +else if (clk->enable_reg ==OMAP1_IO_ADDRESS (SWD_CLK_DIV_CTRL_SEL )) +spin_lock_irqsave (&swd_clk_div_ctrl_sel_lock, flags); +if (clk->flags &ENABLE_REG_32BIT ) { regval32 =__raw_readl (clk->enable_reg); regval32 |= (1 << clk->enable_bit);
@@ -467,17 +559,41 @@ static int omap1_clk_enable_generic(struct clk *clk)__raw_writew (regval16, clk->enable_reg); } +if (clk->enable_reg ==OMAP1_IO_ADDRESS (ARM_CKCTL )) +spin_unlock_irqrestore (&arm_ckctl_lock, flags); +else if (clk->enable_reg ==OMAP1_IO_ADDRESS (ARM_IDLECT2 )) +spin_unlock_irqrestore (&arm_idlect2_lock, flags); +else if (clk->enable_reg ==OMAP1_IO_ADDRESS (MOD_CONF_CTRL_0 )) +spin_unlock_irqrestore (&mod_conf_ctrl_0_lock, flags); +else if (clk->enable_reg ==OMAP1_IO_ADDRESS (MOD_CONF_CTRL_1 )) +spin_unlock_irqrestore (&mod_conf_ctrl_1_lock, flags); +else if (clk->enable_reg ==OMAP1_IO_ADDRESS (SWD_CLK_DIV_CTRL_SEL )) +spin_unlock_irqrestore (&swd_clk_div_ctrl_sel_lock, flags); +return 0 ; } -static void omap1_clk_disable_generic (struct clk *clk) +static void omap1_clk_disable_generic (struct omap1_clk *clk) { +unsigned long flags;__u16 regval16;__u32 regval32;if (clk->enable_reg ==NULL )return ; +/* protect clk->enable_reg from concurrent access via clk_set_rate() */ +if (clk->enable_reg ==OMAP1_IO_ADDRESS (ARM_CKCTL )) +spin_lock_irqsave (&arm_ckctl_lock, flags); +else if (clk->enable_reg ==OMAP1_IO_ADDRESS (ARM_IDLECT2 )) +spin_lock_irqsave (&arm_idlect2_lock, flags); +else if (clk->enable_reg ==OMAP1_IO_ADDRESS (MOD_CONF_CTRL_0 )) +spin_lock_irqsave (&mod_conf_ctrl_0_lock, flags); +else if (clk->enable_reg ==OMAP1_IO_ADDRESS (MOD_CONF_CTRL_1 )) +spin_lock_irqsave (&mod_conf_ctrl_1_lock, flags); +else if (clk->enable_reg ==OMAP1_IO_ADDRESS (SWD_CLK_DIV_CTRL_SEL )) +spin_lock_irqsave (&swd_clk_div_ctrl_sel_lock, flags); +if (clk->flags &ENABLE_REG_32BIT ) { regval32 =__raw_readl (clk->enable_reg); regval32 &= ~(1 << clk->enable_bit);
@@ -487,6 +603,17 @@ static void omap1_clk_disable_generic(struct clk *clk) regval16 &= ~(1 << clk->enable_bit);__raw_writew (regval16, clk->enable_reg); } + +if (clk->enable_reg ==OMAP1_IO_ADDRESS (ARM_CKCTL )) +spin_unlock_irqrestore (&arm_ckctl_lock, flags); +else if (clk->enable_reg ==OMAP1_IO_ADDRESS (ARM_IDLECT2 )) +spin_unlock_irqrestore (&arm_idlect2_lock, flags); +else if (clk->enable_reg ==OMAP1_IO_ADDRESS (MOD_CONF_CTRL_0 )) +spin_unlock_irqrestore (&mod_conf_ctrl_0_lock, flags); +else if (clk->enable_reg ==OMAP1_IO_ADDRESS (MOD_CONF_CTRL_1 )) +spin_unlock_irqrestore (&mod_conf_ctrl_1_lock, flags); +else if (clk->enable_reg ==OMAP1_IO_ADDRESS (SWD_CLK_DIV_CTRL_SEL )) +spin_unlock_irqrestore (&swd_clk_div_ctrl_sel_lock, flags); }const struct clkops clkops_generic = {
@@ -494,25 +621,38 @@ const struct clkops clkops_generic = { .disable = omap1_clk_disable_generic, }; -static int omap1_clk_enable_dsp_domain (struct clk *clk) +static int omap1_clk_enable_dsp_domain (struct omap1_clk *clk) { -int retval; +bool api_ck_was_enabled; +int retval =0 ; + + api_ck_was_enabled =omap1_clk_is_enabled (&api_ck_p->hw); +if (!api_ck_was_enabled) + retval = api_ck_p->ops->enable (api_ck_p); - retval =omap1_clk_enable (api_ck_p);if (!retval) { retval =omap1_clk_enable_generic (clk); -omap1_clk_disable (api_ck_p); + +if (!api_ck_was_enabled) + api_ck_p->ops->disable (api_ck_p); }return retval; } -static void omap1_clk_disable_dsp_domain (struct clk *clk) +static void omap1_clk_disable_dsp_domain (struct omap1_clk *clk) { -if (omap1_clk_enable (api_ck_p) ==0 ) { -omap1_clk_disable_generic (clk); -omap1_clk_disable (api_ck_p); - } +bool api_ck_was_enabled; + + api_ck_was_enabled =omap1_clk_is_enabled (&api_ck_p->hw); +if (!api_ck_was_enabled) +if (api_ck_p->ops->enable (api_ck_p) <0 ) +return ; + +omap1_clk_disable_generic (clk); + +if (!api_ck_was_enabled) + api_ck_p->ops->disable (api_ck_p); }const struct clkops clkops_dspck = {
@@ -521,7 +661,7 @@ const struct clkops clkops_dspck = { };/* XXX SYSC register handling does not belong in the clock framework */ -static int omap1_clk_enable_uart_functional_16xx (struct clk *clk) +static int omap1_clk_enable_uart_functional_16xx (struct omap1_clk *clk) {int ret;struct uart_clk *uclk;
@@ -538,7 +678,7 @@ static int omap1_clk_enable_uart_functional_16xx(struct clk *clk) }/* XXX SYSC register handling does not belong in the clock framework */ -static void omap1_clk_disable_uart_functional_16xx (struct clk *clk) +static void omap1_clk_disable_uart_functional_16xx (struct omap1_clk *clk) {struct uart_clk *uclk;
@@ -555,20 +695,33 @@ const struct clkops clkops_uart_16xx = { .disable = omap1_clk_disable_uart_functional_16xx, }; -long omap1_clk_round_rate (struct clk *clk,unsigned long rate) +static unsigned long omap1_clk_recalc_rate (struct clk_hw *hw,unsigned long p_rate) { -if (clk->round_rate !=NULL ) -return clk->round_rate (clk, rate); +struct omap1_clk *clk =to_omap1_clk (hw); + +if (clk->recalc) +return clk->recalc (clk, p_rate);return clk->rate; } -int omap1_clk_set_rate (struct clk *clk,unsigned long rate) +static long omap1_clk_round_rate (struct clk_hw *hw,unsigned long rate,unsigned long *p_rate) +{ +struct omap1_clk *clk =to_omap1_clk (hw); + +if (clk->round_rate !=NULL ) +return clk->round_rate (clk, rate, p_rate); + +return omap1_clk_recalc_rate (hw, *p_rate); +} + +static int omap1_clk_set_rate (struct clk_hw *hw,unsigned long rate,unsigned long p_rate) { +struct omap1_clk *clk =to_omap1_clk (hw);int ret = -EINVAL ;if (clk->set_rate) - ret = clk->set_rate (clk, rate); + ret = clk->set_rate (clk, rate, p_rate);return ret; }
@@ -576,243 +729,105 @@ int omap1_clk_set_rate(struct clk *clk, unsigned long rate)* Omap1 clock reset and init functions */ +static int omap1_clk_init_op (struct clk_hw *hw) +{ +struct omap1_clk *clk =to_omap1_clk (hw); + +if (clk->init) +return clk->init (clk); + +return 0 ; +} +#ifdef CONFIG_OMAP_RESET_CLOCKS -void omap1_clk_disable_unused (struct clk *clk) +static void omap1_clk_disable_unused (struct clk_hw *hw) { -__u32 regval32; +struct omap1_clk *clk =to_omap1_clk (hw); +const char *name =clk_hw_get_name (hw);/* Clocks in the DSP domain need api_ck. Just assume bootloader * has not enabled any DSP clocks */ if (clk->enable_reg ==DSP_IDLECT2 ) { -pr_info ("Skipping reset check for DSP domain clock \"%s\"\n" , - clk->name); +pr_info ("Skipping reset check for DSP domain clock \"%s\"\n" , name);return ; } -/* Is the clock already disabled? */ -if (clk->flags &ENABLE_REG_32BIT ) - regval32 =__raw_readl (clk->enable_reg); -else - regval32 =__raw_readw (clk->enable_reg); - -if ((regval32 & (1 << clk->enable_bit)) ==0 ) -return ; - -printk (KERN_INFO "Disabling unused clock \"%s\"... " , clk->name); - clk->ops->disable (clk); +pr_info ("Disabling unused clock \"%s\"... " , name); +omap1_clk_disable (hw);printk (" done\n" ); }#endif +const struct clk_ops omap1_clk_gate_ops = { + .enable = omap1_clk_enable, + .disable = omap1_clk_disable, + .is_enabled = omap1_clk_is_enabled, +#ifdef CONFIG_OMAP_RESET_CLOCKS + .disable_unused = omap1_clk_disable_unused, +#endif +}; -int clk_enable (struct clk *clk) -{ -unsigned long flags; -int ret; - -if (IS_ERR_OR_NULL (clk)) -return -EINVAL ; - -spin_lock_irqsave (&clockfw_lock, flags); - ret =omap1_clk_enable (clk); -spin_unlock_irqrestore (&clockfw_lock, flags); - -return ret; -} -EXPORT_SYMBOL (clk_enable); - -void clk_disable (struct clk *clk) -{ -unsigned long flags; - -if (IS_ERR_OR_NULL (clk)) -return ; - -spin_lock_irqsave (&clockfw_lock, flags); -if (clk->usecount ==0 ) { -pr_err ("Trying disable clock %s with 0 usecount\n" , - clk->name); -WARN_ON (1 ); - goto out; - } - -omap1_clk_disable (clk); - -out: -spin_unlock_irqrestore (&clockfw_lock, flags); -} -EXPORT_SYMBOL (clk_disable); - -unsigned long clk_get_rate (struct clk *clk) -{ -unsigned long flags; -unsigned long ret; - -if (IS_ERR_OR_NULL (clk)) -return 0 ; - -spin_lock_irqsave (&clockfw_lock, flags); - ret = clk->rate; -spin_unlock_irqrestore (&clockfw_lock, flags); - -return ret; -} -EXPORT_SYMBOL (clk_get_rate); - -/* -* Optional clock functions defined in include/linux/clk.h -*/ - -long clk_round_rate (struct clk *clk,unsigned long rate) -{ -unsigned long flags; -long ret; - -if (IS_ERR_OR_NULL (clk)) -return 0 ; - -spin_lock_irqsave (&clockfw_lock, flags); - ret =omap1_clk_round_rate (clk, rate); -spin_unlock_irqrestore (&clockfw_lock, flags); - -return ret; -} -EXPORT_SYMBOL (clk_round_rate); - -int clk_set_rate (struct clk *clk,unsigned long rate) -{ -unsigned long flags; -int ret = -EINVAL ; - -if (IS_ERR_OR_NULL (clk)) -return ret; - -spin_lock_irqsave (&clockfw_lock, flags); - ret =omap1_clk_set_rate (clk, rate); -if (ret ==0 ) -propagate_rate (clk); -spin_unlock_irqrestore (&clockfw_lock, flags); - -return ret; -} -EXPORT_SYMBOL (clk_set_rate); - -int clk_set_parent (struct clk *clk,struct clk *parent) -{ -WARN_ONCE (1 ,"clk_set_parent() not implemented for OMAP1\n" ); - -return -EINVAL ; -} -EXPORT_SYMBOL (clk_set_parent); +const struct clk_ops omap1_clk_rate_ops = { + .recalc_rate = omap1_clk_recalc_rate, + .round_rate = omap1_clk_round_rate, + .set_rate = omap1_clk_set_rate, + .init = omap1_clk_init_op, +}; -struct clk *clk_get_parent (struct clk *clk) -{ -return clk->parent; -} -EXPORT_SYMBOL (clk_get_parent); +const struct clk_ops omap1_clk_full_ops = { + .enable = omap1_clk_enable, + .disable = omap1_clk_disable, + .is_enabled = omap1_clk_is_enabled, +#ifdef CONFIG_OMAP_RESET_CLOCKS + .disable_unused = omap1_clk_disable_unused, +#endif + .recalc_rate = omap1_clk_recalc_rate, + .round_rate = omap1_clk_round_rate, + .set_rate = omap1_clk_set_rate, + .init = omap1_clk_init_op, +};/* * OMAP specific clock functions shared between omap1 and omap2 */ /* Used for clocks that always have same value as the parent clock */ -unsigned long followparent_recalc (struct clk *clk) +unsigned long followparent_recalc (struct omap1_clk *clk,unsigned long p_rate) { -return clk->parent->rate; +return p_rate; }/* * Used for clocks that have the same value as the parent clock, * divided by some factor */ -unsigned long omap_fixed_divisor_recalc (struct clk *clk) +unsigned long omap_fixed_divisor_recalc (struct omap1_clk *clk,unsigned long p_rate) {WARN_ON (!clk->fixed_div); -return clk->parent->rate / clk->fixed_div; +return p_rate / clk->fixed_div; }/* Propagate rate to children */ -void propagate_rate (struct clk *tclk) +void propagate_rate (struct omap1_clk *tclk) {struct clk *clkp; -list_for_each_entry (clkp, &tclk->children, sibling) { -if (clkp->recalc) - clkp->rate = clkp->recalc (clkp); -propagate_rate (clkp); - } -} - -static LIST_HEAD (root_clks); - -/** -* clk_preinit - initialize any fields in the struct clk before clk init -* @clk: struct clk * to initialize -* -* Initialize any struct clk fields needed before normal clk initialization -* can run. No return value. -*/ -void clk_preinit (struct clk *clk) -{ -INIT_LIST_HEAD (&clk->children); -} - -int clk_register (struct clk *clk) -{ -if (IS_ERR_OR_NULL (clk)) -return -EINVAL ; - -/* -* trap out already registered clocks -*/ -if (clk->node.next || clk->node.prev) -return 0 ; - -mutex_lock (&clocks_mutex); -if (clk->parent) -list_add (&clk->sibling, &clk->parent->children); -else -list_add (&clk->sibling, &root_clks); - -list_add (&clk->node, &clocks); -if (clk->init) - clk->init (clk); -mutex_unlock (&clocks_mutex); - -return 0 ; -} -EXPORT_SYMBOL (clk_register); - -void clk_unregister (struct clk *clk) -{ -if (IS_ERR_OR_NULL (clk)) +/* depend on CCF ability to recalculate new rates across whole clock subtree */ +if (WARN_ON (!(clk_hw_get_flags (&tclk->hw) &CLK_GET_RATE_NOCACHE )))return ; -mutex_lock (&clocks_mutex); -list_del (&clk->sibling); -list_del (&clk->node); -mutex_unlock (&clocks_mutex); -} -EXPORT_SYMBOL (clk_unregister); - -/* -* Low level helpers -*/ -static int clkll_enable_null (struct clk *clk) -{ -return 0 ; -} + clkp =clk_get_sys (NULL ,clk_hw_get_name (&tclk->hw)); +if (WARN_ON (!clkp)) +return ; -static void clkll_disable_null (struct clk *clk) -{ +clk_get_rate (clkp); +clk_put (clkp); } -const struct clkops clkops_null = { - .enable = clkll_enable_null, - .disable = clkll_disable_null, +const struct clk_ops omap1_clk_null_ops = { };/*
@@ -820,114 +835,6 @@ const struct clkops clkops_null = {* * Used for clock aliases that are needed on some OMAPs, but not others */ -struct clk dummy_ck = { - .name ="dummy" , - .ops = &clkops_null, +struct omap1_clk dummy_ck__refdata = { + .hw.init =CLK_HW_INIT_NO_PARENT ("dummy" , &omap1_clk_null_ops,0 ), }; - -/* -* -*/ - -#ifdef CONFIG_OMAP_RESET_CLOCKS -/* -* Disable any unused clocks left on by the bootloader -*/ -static int __init clk_disable_unused (void ) -{ -struct clk *ck; -unsigned long flags; - -pr_info ("clock: disabling unused clocks to save power\n" ); - -spin_lock_irqsave (&clockfw_lock, flags); -list_for_each_entry (ck, &clocks, node) { -if (ck->ops == &clkops_null) -continue ; - -if (ck->usecount >0 || !ck->enable_reg) -continue ; - -omap1_clk_disable_unused (ck); - } -spin_unlock_irqrestore (&clockfw_lock, flags); - -return 0 ; -} -late_initcall (clk_disable_unused); -#endif - -#if defined(CONFIG_PM_DEBUG ) && defined(CONFIG_DEBUG_FS ) -/* -* debugfs support to trace clock tree hierarchy and attributes -*/ - -#include <linux/debugfs.h> -#include <linux/seq_file.h> - -static struct dentry *clk_debugfs_root; - -static int debug_clock_show (struct seq_file *s,void *unused) -{ -struct clk *c; -struct clk *pa; - -mutex_lock (&clocks_mutex); -seq_printf (s,"%-30s %-30s %-10s %s\n" , -"clock-name" ,"parent-name" ,"rate" ,"use-count" ); - -list_for_each_entry (c, &clocks, node) { - pa = c->parent; -seq_printf (s,"%-30s %-30s %-10lu %d\n" , - c->name, pa ? pa->name :"none" , c->rate, - c->usecount); - } -mutex_unlock (&clocks_mutex); - -return 0 ; -} - -DEFINE_SHOW_ATTRIBUTE (debug_clock); - -static void clk_debugfs_register_one (struct clk *c) -{ -struct dentry *d; -struct clk *pa = c->parent; - - d =debugfs_create_dir (c->name, pa ? pa->dent : clk_debugfs_root); - c->dent = d; - -debugfs_create_u8 ("usecount" ,S_IRUGO , c->dent, &c->usecount); -debugfs_create_ulong ("rate" ,S_IRUGO , c->dent, &c->rate); -debugfs_create_x8 ("flags" ,S_IRUGO , c->dent, &c->flags); -} - -static void clk_debugfs_register (struct clk *c) -{ -struct clk *pa = c->parent; - -if (pa && !pa->dent) -clk_debugfs_register (pa); - -if (!c->dent) -clk_debugfs_register_one (c); -} - -static int __init clk_debugfs_init (void ) -{ -struct clk *c; -struct dentry *d; - - d =debugfs_create_dir ("clock" ,NULL ); - clk_debugfs_root = d; - -list_for_each_entry (c, &clocks, node) -clk_debugfs_register (c); - -debugfs_create_file ("summary" ,S_IRUGO , d,NULL , &debug_clock_fops); - -return 0 ; -} -late_initcall (clk_debugfs_init); - -#endif /* defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS) */
arch/arm/mach-omap1/clock.h +49 -90
212 lines not on this page · raw message
arch/arm/mach-omap1/clock_data.c +209 -274
899 lines not on this page · raw message
arch/arm/mach-omap1/io.c +0 -7
@@ -15,10 +15,8 @@#include <asm/mach/map.h> #include "tc.h" -#include "mux.h" #include "iomap.h" #include "common.h" -#include "clock.h" /* * The machine specific code may provide the extra mapping besides the
@@ -125,11 +123,6 @@ void __init omap1_init_early(void)*/ omap_writew (0x0 ,MPU_PUBLIC_TIPB_CNTL );omap_writew (0x0 ,MPU_PRIVATE_TIPB_CNTL ); - -/* Must init clocks early to assure that timer interrupt works -*/ -omap1_clk_init (); -omap1_mux_init (); }void __init omap1_init_late (void )
arch/arm/mach-omap1/time.c +5 -0
@@ -51,8 +51,10 @@#include <asm/mach/time.h> #include "hardware.h" +#include "mux.h" #include "iomap.h" #include "common.h" +#include "clock.h" #ifdef CONFIG_OMAP_MPU_TIMER
@@ -224,6 +226,9 @@ static inline void omap_mpu_timer_init(void)*/ void __init omap1_timer_init (void ) { +omap1_clk_init (); +omap1_mux_init (); +if (omap_32k_timer_init () !=0 )omap_mpu_timer_init (); }
Signature · 1 line
2.29.2
PATCH 41/41 ARM: omap1: enable multiplatform
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
With all the header files out of the way, and the clock driver converted to the common framework, nothing stops us from building OMAP together with the other platforms.
As usual, the decompressor support is a victim here, and is only available when CONFIG_DEBUG_LL is configured for the particular board.
---
arch/arm/Kconfig | 12 --
arch/arm/configs/omap1_defconfig | 3 +
arch/arm/mach-omap1/Kconfig | 15 +++
arch/arm/mach-omap1/hardware.h | 2 +-
arch/arm/mach-omap1/include/mach/uncompress.h | 117 ------------------
arch/arm/mach-omap1/serial.c | 3 +-
.../mach-omap1/{include/mach => }/serial.h | 0
7 files changed, 20 insertions(+), 132 deletions(-)
delete mode 100644 arch/arm/mach-omap1/include/mach/uncompress.h
rename arch/arm/mach-omap1/{include/mach => }/serial.h (100%)arch/arm/Kconfig +0 -12
@@ -483,18 +483,6 @@ config ARCH_S3C24XX (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or the Samsung SMDK2410 development board (and derivatives). -config ARCH_OMAP1 - bool "TI OMAP1" - select CLKSRC_MMIO - select FORCE_PCI if PCCARD - select GENERIC_IRQ_CHIP - select GPIOLIB - select HAVE_LEGACY_CLK - select IRQ_DOMAIN - select SPARSE_IRQ - help - Support for older TI OMAP1 (omap7xx, omap15xx or omap16xx) - endchoice menu "Multiple platform selection"
arch/arm/configs/omap1_defconfig +3 -0
@@ -17,6 +17,9 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y # CONFIG_BLK_DEV_BSG is not set +CONFIG_ARCH_MULTI_V4T=y +CONFIG_ARCH_MULTI_V5=y +# CONFIG_ARCH_MULTI_V7 is not set CONFIG_ARCH_OMAP=y CONFIG_ARCH_OMAP1=y CONFIG_OMAP_RESET_CLOCKS=y
arch/arm/mach-omap1/Kconfig +15 -0
@@ -1,4 +1,15 @@ # SPDX-License-Identifier: GPL-2.0-only +menuconfig ARCH_OMAP1 + bool "TI OMAP1" + depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 + select ARCH_HAS_HOLES_MEMORYMODEL + select ARCH_OMAP + select CLKSRC_MMIO + select FORCE_PCI if PCCARD + select GPIOLIB + help + Support for older TI OMAP1 (omap7xx, omap15xx or omap16xx) + if ARCH_OMAP1 menu "TI OMAP1 specific features"
@@ -6,23 +17,27 @@ menu "TI OMAP1 specific features" comment "OMAP Core Type" config ARCH_OMAP730 + depends on ARCH_MULTI_V5 bool "OMAP730 Based System" select ARCH_OMAP_OTG select CPU_ARM926T select OMAP_MPU_TIMER config ARCH_OMAP850 + depends on ARCH_MULTI_V5 bool "OMAP850 Based System" select ARCH_OMAP_OTG select CPU_ARM926T config ARCH_OMAP15XX + depends on ARCH_MULTI_V4T default y bool "OMAP15xx Based System" select CPU_ARM925T select OMAP_MPU_TIMER config ARCH_OMAP16XX + depends on ARCH_MULTI_V5 bool "OMAP16xx Based System" select ARCH_OMAP_OTG select CPU_ARM926T
arch/arm/mach-omap1/hardware.h +1 -1
@@ -64,7 +64,7 @@ static inline u32 omap_cs3_phys(void)#define OMAP1_IO_OFFSET 0x00fb0000/* Virtual IO = 0xff000000 */ #define OMAP1_IO_ADDRESS (pa) IOMEM((pa) - OMAP1_IO_OFFSET) -#include <mach/serial.h> +#include "serial.h" /* * ---------------------------------------------------------------------------
arch/arm/mach-omap1/include/mach/uncompress.h deleted +0 -117
117 lines not on this page · raw message
arch/arm/mach-omap1/serial.c +1 -2
@@ -19,8 +19,7 @@#include <asm/mach-types.h> -#include <mach/serial.h> - +#include "serial.h" #include "mux.h" #include "pm.h" #include "soc.h"
arch/arm/mach-omap1/serial.h renamed from arch/arm/mach-omap1/include/mach/serial.h +0 -0
Signature · 1 line
2.29.2
Quoted 12 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
This is the full series for converting OMAP1 to multiplatform, rebased from my 2019 attempt to do the same thing. The soc tree contains simpler patches to do the same for iop32x, ixp4xx, ep93xx and s3c24xx, which means we are getting closer to completing this for all ARMv5 platforms (I have patches for PXA, which is the last one remaining).
Janusz already tested the branch separately and did the missing work for the common-clk conversion after my previous approach was broken.
Quoted 7 lines
The fbdev, mmc and ASoC portion of Janusz' work already went into the corresponding maintainer tree, but I include them here for reference. Unless there are any objections, I would add the entire series to the for-next branch of the soc tree, but only send the first 36 patches early in the merge window. After everything else has made it in, I would rebase the last two patches and send them separately, which may or may not make it in the merge window.
Sounds like a good plan to me. I usually send the MMC pull-request on Mondays, the first day of the merge window.
[...]
Kind regards
Uffe
Re: [PATCH 01/41] video: fbdev: omapfb: lcd_ams_delta: fix unused variable warning
In reply to Arnd BergmannHello!
Quoted 18 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
A recent cleanup patch removed the only reference to a local variable in some configurations.
Move the variable into the one block it is still used in, inside of an #ifdef, to avoid this warning.
Fixes 9d773f103b89 ("video: fbdev: omapfb: lcd_ams_delta: Make use of the helper function dev_err_probe()")Signed-off-by Arnd Bergmann <[email protected]>--- drivers/video/fbdev/omap/lcd_ams_delta.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/video/fbdev/omap/lcd_ams_delta.c +0
-0
[...]
drivers/video/fbdev/omap/lcd_ams_delta.c static int ams_delta_panel_probe(struct platform_device *pdev) · line 147
Quoted 6 lines
drivers/video/fbdev/omap/lcd_ams_delta.c +1
-1@@ -145,7 +144,7 @@ static int ams_delta_panel_probe(struct platform_device *pdev) &ams_delta_lcd_ops);if (IS_ERR (lcd_device)) { - ret =PTR_ERR (lcd_device); +int ret =PTR_ERR (lcd_device);
How about inserting an empty line after declaration?
drivers/video/fbdev/omap/lcd_ams_delta.c static int ams_delta_panel_probe(struct platform_device *pdev) · line 150
Quoted 3 lines
drivers/video/fbdev/omap/lcd_ams_delta.c +0
-0dev_err (&pdev->dev,"failed to register device\n" );return ret; }
MBR, Sergey
Re: [PATCH 01/41] video: fbdev: omapfb: lcd_ams_delta: fix unused variable warning
Quoted 21 lines · Sergei Shtylyov
Quoted 18 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
A recent cleanup patch removed the only reference to a local variable in some configurations.
Move the variable into the one block it is still used in, inside of an #ifdef, to avoid this warning.
Fixes 9d773f103b89 ("video: fbdev: omapfb: lcd_ams_delta: Make use of the helper function dev_err_probe()")Signed-off-by Arnd Bergmann <[email protected]>--- drivers/video/fbdev/omap/lcd_ams_delta.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/video/fbdev/omap/lcd_ams_delta.c +0
-0[...]
Quoted 8 lines
drivers/video/fbdev/omap/lcd_ams_delta.c static int ams_delta_panel_probe(struct platform_device *pdev) · line 147
Quoted 6 lines
drivers/video/fbdev/omap/lcd_ams_delta.c +1
-1@@ -145,7 +144,7 @@ static int ams_delta_panel_probe(struct platform_device *pdev) &ams_delta_lcd_ops);if (IS_ERR (lcd_device)) { - ret =PTR_ERR (lcd_device); +int ret =PTR_ERR (lcd_device);How about inserting an empty line after declaration?
Ok, done.
Arnd
Aaro Koskinen
maintainerRe: [PATCH 26/41] ARM: omap1: relocate static I/O mapping
In reply to Arnd BergmannHi,
Quoted 8 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The address range 0xfee00000-0xfeffffff is used for PCI and PCMCIA I/O port mappings, but OMAP1 has its static mappings there as well.
Move the OMAP1 addresses a little higher to avoid crashing at boot.
This has the same problem I reported in 2019, with earlyprintk the system no longer boots:
https://marc.info/?t=156530014200005&r=1&w=2
Tested on OSK and SX1/qemu.
A.
Quoted 39 lines
Signed-off-by Arnd Bergmann <[email protected]>--- arch/arm/Kconfig.debug | 6 +++--- arch/arm/mach-omap1/include/mach/hardware.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)arch/arm/Kconfig.debug +3
-3@@ -1837,9 +1837,9 @@ config DEBUG_UART_VIRT default 0xfec00000 if ARCH_IXP4XX && !CPU_BIG_ENDIAN default 0xfec00003 if ARCH_IXP4XX && CPU_BIG_ENDIAN default 0xfef36000 if DEBUG_HIGHBANK_UART - default 0xfefb0000 if DEBUG_OMAP1UART1 || DEBUG_OMAP7XXUART1 - default 0xfefb0800 if DEBUG_OMAP1UART2 || DEBUG_OMAP7XXUART2 - default 0xfefb9800 if DEBUG_OMAP1UART3 || DEBUG_OMAP7XXUART3 + default 0xff000000 if DEBUG_OMAP1UART1 || DEBUG_OMAP7XXUART1 + default 0xff000800 if DEBUG_OMAP1UART2 || DEBUG_OMAP7XXUART2 + default 0xff009800 if DEBUG_OMAP1UART3 || DEBUG_OMAP7XXUART3 default 0xffd01000 if DEBUG_HIP01_UART default DEBUG_UART_PHYS if !MMU depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \arch/arm/mach-omap1/include/mach/hardware.h +1
-1@@ -63,7 +63,7 @@ static inline u32 omap_cs3_phys(void)#endif /* ifndef __ASSEMBLER__ */ -#define OMAP1_IO_OFFSET 0x01000000/* Virtual IO = 0xfefb0000 */ +#define OMAP1_IO_OFFSET 0x00fb0000/* Virtual IO = 0xff000000 */ #define OMAP1_IO_ADDRESS (pa) IOMEM((pa) - OMAP1_IO_OFFSET)#include <mach/serial.h> Signature · 1 line
2.29.2
Re: [PATCH 14/41] serial: 8250/omap1: include linux/soc/ti/omap1-soc.h
In reply to Arnd BergmannQuoted 7 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
As a preparation for cleaning up the omap1 headers, start including
linux/soc/ti/omap1-soc.hdirectly so we can keep callingcpu_is_omap1510().Signed-off-by Arnd Bergmann <[email protected]>
Aaro Koskinen
maintainerHi,
Quoted 10 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
This is the full series for converting OMAP1 to multiplatform, rebased from my 2019 attempt to do the same thing. The soc tree contains simpler patches to do the same for iop32x, ixp4xx, ep93xx and s3c24xx, which means we are getting closer to completing this for all ARMv5 platforms (I have patches for PXA, which is the last one remaining).
Janusz already tested the branch separately and did the missing work for the common-clk conversion after my previous approach was broken.
I tested the full series on the following OMAP1 boards: ams-delta, nokia770, osk, palmte and sx1 (QEMU only).
Apart from the earlyprintk breakage, everything seemed to work OK.
A minor note, zImage grows about 50 KB with a minimal kernel config. This is not yet critical, there's still about 7% headroom on 770 to the 2 MB bootloader limit on my setup. Also the decompression time is approaching the hardcoded watchdog timeout...
A.
Re: [PATCH 26/41] ARM: omap1: relocate static I/O mapping
In reply to Aaro KoskinenQuoted 13 lines · Aaro Koskinen
Hi,
Quoted 8 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The address range 0xfee00000-0xfeffffff is used for PCI and PCMCIA I/O port mappings, but OMAP1 has its static mappings there as well.
Move the OMAP1 addresses a little higher to avoid crashing at boot.
Quoted 6 lines
This has the same problem I reported in 2019, with earlyprintk the system no longer boots:
https://marc.info/?t=156530014200005&r=1&w=2Tested on OSK and SX1/qemu.
Thanks a lot for testing!
I managed to get to the bottom of this after just a few hours, and it turned out to be a simple math error on my end, as I got the alignment wrong, the offset has to be 0x00f00000 instead of 0x00fb0000 be section aligned. I made sure the kernel boots up (to the point of missing a rootfs) and uploaded the fixed branch.
Arnd
Quoted 9 lines · Aaro Koskinen
Quoted 8 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
This is the full series for converting OMAP1 to multiplatform, rebased from my 2019 attempt to do the same thing. The soc tree contains simpler patches to do the same for iop32x, ixp4xx, ep93xx and s3c24xx, which means we are getting closer to completing this for all ARMv5 platforms (I have patches for PXA, which is the last one remaining).
Quoted 7 lines
Quoted 2 lines
Janusz already tested the branch separately and did the missing work for the common-clk conversion after my previous approach was broken.
I tested the full series on the following OMAP1 boards: ams-delta, nokia770, osk, palmte and sx1 (QEMU only).
Apart from the earlyprintk breakage, everything seemed to work OK.
Nice, thanks a lot for testing!
Quoted 4 lines
A minor note, zImage grows about 50 KB with a minimal kernel config. This is not yet critical, there's still about 7% headroom on 770 to the 2 MB bootloader limit on my setup. Also the decompression time is approaching the hardcoded watchdog timeout...
I suspect that most of this is for the added devicetree code, and some more for the common-clk layer. For the omap1_defconfig, there is some hope to get part of the overhead back eventually by replacing board files with dts descriptions that are not part of the zImage itself, but it's unlikely to ever get smaller than it was.
Arnd
Re: [PATCH 15/41] input: omap: void using mach/*.h headers
In reply to Arnd BergmannQuoted 8 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The omap-keypad driver currently relies on including
mach/memory.himplicitly, but that won't happen once omap1 is converted toCONFIG_ARCH_MULTIPLATFORM. Include the required header explicitly.Signed-off-by Arnd Bergmann <[email protected]>
Quoted 19 lines
--- drivers/input/keyboard/omap-keypad.c | 1 + 1 file changed, 1 insertion(+)drivers/input/keyboard/omap-keypad.c +1
-0@@ -24,6 +24,7 @@#include <linux/gpio.h> #include <linux/platform_data/gpio-omap.h> #include <linux/platform_data/keypad-omap.h> +#include <linux/soc/ti/omap1-io.h> #undef NEW_BOARD_LEARNING_MODESignature · 1 line
2.29.2
Signature · 1 line
Dmitry
Tony Lindgren
maintainerRe: [PATCH 26/41] ARM: omap1: relocate static I/O mapping
In reply to Arnd BergmannQuoted 21 lines · Arnd Bergmann
Quoted 13 lines · Aaro Koskinen
Hi,
Quoted 8 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The address range 0xfee00000-0xfeffffff is used for PCI and PCMCIA I/O port mappings, but OMAP1 has its static mappings there as well.
Move the OMAP1 addresses a little higher to avoid crashing at boot.
Quoted 6 lines
This has the same problem I reported in 2019, with earlyprintk the system no longer boots:
https://marc.info/?t=156530014200005&r=1&w=2Tested on OSK and SX1/qemu.
Quoted 8 lines
Thanks a lot for testing!
I managed to get to the bottom of this after just a few hours, and it turned out to be a simple math error on my end, as I got the alignment wrong, the offset has to be
0x00f00000instead of0x00fb0000be section aligned. I made sure the kernel boots up (to the point of missing a rootfs) and uploaded the fixed branch.
Good to hear this got sorted out :)
Regards,
Tony
Tony Lindgren
maintainerRe: [PATCH 17/41] ARM: omap1: move 32k counter from plat-omap to mach-omap1
In reply to Arnd BergmannQuoted 5 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
omap2 stopped using this code with commit
8d39ff3d1696("ARM: OMAP2+:
Remove unused legacy code for timer"), so just move it to mach-omap1 now, along with the other half of that driver.
BTW, if omap1 gains devicetree support, chances are that the drivers/clocksource/timer-ti-32k.c will be usable with minor modifications.
Regards,
Tony
Tony Lindgren
maintainerRe: [PATCH 40/41] [TO BE REBASED] ARM: OMAP1: clock: Convert to CCF
In reply to Arnd Bergmannarch/arm/mach-omap1/clock.c void omap1_init_ext_clk(struct clk *clk) · line 551
Quoted 13 lines · Arnd Bergmann
From: Janusz Krzysztofik <[email protected]>
arch/arm/mach-omap1/clock.c +12
-0+/* protect clk->enable_reg from concurrent access via clk_set_rate() */ +if (clk->enable_reg ==OMAP1_IO_ADDRESS (ARM_CKCTL )) +spin_lock_irqsave (&arm_ckctl_lock, flags); +else if (clk->enable_reg ==OMAP1_IO_ADDRESS (ARM_IDLECT2 )) +spin_lock_irqsave (&arm_idlect2_lock, flags); +else if (clk->enable_reg ==OMAP1_IO_ADDRESS (MOD_CONF_CTRL_0 )) +spin_lock_irqsave (&mod_conf_ctrl_0_lock, flags); +else if (clk->enable_reg ==OMAP1_IO_ADDRESS (MOD_CONF_CTRL_1 )) +spin_lock_irqsave (&mod_conf_ctrl_1_lock, flags); +else if (clk->enable_reg ==OMAP1_IO_ADDRESS (SWD_CLK_DIV_CTRL_SEL )) +spin_lock_irqsave (&swd_clk_div_ctrl_sel_lock, flags); +
Eventually there should be just separate clock controller instances for the clock registers banks, and then this should all disappear as the lock is instance specific. Anyways, that's probably best done as a separate changes later on.
Regards,
Tony
Quoted 21 lines · Ulf Hansson
Quoted 12 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
This is the full series for converting OMAP1 to multiplatform, rebased from my 2019 attempt to do the same thing. The soc tree contains simpler patches to do the same for iop32x, ixp4xx, ep93xx and s3c24xx, which means we are getting closer to completing this for all ARMv5 platforms (I have patches for PXA, which is the last one remaining).
Janusz already tested the branch separately and did the missing work for the common-clk conversion after my previous approach was broken.
Quoted 7 lines
The fbdev, mmc and ASoC portion of Janusz' work already went into the corresponding maintainer tree, but I include them here for reference. Unless there are any objections, I would add the entire series to the for-next branch of the soc tree, but only send the first 36 patches early in the merge window. After everything else has made it in, I would rebase the last two patches and send them separately, which may or may not make it in the merge window.
Quoted 2 lines
Sounds like a good plan to me. I usually send the MMC pull-request on Mondays, the first day of the merge window.
Sounds good to me. I tested the current omap1-multiplatform-5.18 branch from mach-omap2 point of view, and things seem to work just fine for me. I don't currently have any omap1 hardware online to test with.
For the patches, please feel free to add:
Tony Lindgren
maintainerRe: [PATCH 24/41] ARM: omap: un-merge plat/sram.c
In reply to Arnd BergmannQuoted 6 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The sram initialization code is the only shared omap1/2 code that is not a standalone driver, but it is very short. Having two copies of this code means some duplication of the sources, but actually saves object code size as it can be inlined better.
FYI, the sram code should eventually be updated to use drivers/misc/sram.c, I recall there being some issues to deal with for PM related code though. Probably the PM related save and restore could be now handled with cpu_pm.
Regards,
Tony
Hi,
Quoted 13 lines · Arnd Bergmann
Quoted 12 lines · Aaro Koskinen
Quoted 10 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
This is the full series for converting OMAP1 to multiplatform, rebased from my 2019 attempt to do the same thing. The soc tree contains simpler patches to do the same for iop32x, ixp4xx, ep93xx and s3c24xx, which means we are getting closer to completing this for all ARMv5 platforms (I have patches for PXA, which is the last one remaining).
Janusz already tested the branch separately and did the missing work for the common-clk conversion after my previous approach was broken.
Quoted 6 lines
Quoted 4 lines
I tested the full series on the following OMAP1 boards: ams-delta, nokia770, osk, palmte and sx1 (QEMU only).
Apart from the earlyprintk breakage, everything seemed to work OK.
Nice, thanks a lot for testing!
With the updated patch 26 also earlyprintk now works, so if you still update the patches, feel free to add for the whole series:
Thanks,
A.
Quoted 20 lines · Aaro Koskinen
Hi,
Quoted 16 lines · Arnd Bergmann
Quoted 15 lines · Aaro Koskinen
Quoted 10 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
This is the full series for converting OMAP1 to multiplatform, rebased from my 2019 attempt to do the same thing. The soc tree contains simpler patches to do the same for iop32x, ixp4xx, ep93xx and s3c24xx, which means we are getting closer to completing this for all ARMv5 platforms (I have patches for PXA, which is the last one remaining).
Janusz already tested the branch separately and did the missing work for the common-clk conversion after my previous approach was broken.
I tested the full series on the following OMAP1 boards: ams-delta, nokia770, osk, palmte and sx1 (QEMU only).
Quoted 8 lines
Quoted 3 lines
Quoted 1 line
Apart from the earlyprintk breakage, everything seemed to work OK.
Nice, thanks a lot for testing!
With the updated patch 26 also earlyprintk now works, so if you still update the patches, feel free to add for the whole series:
Tested-by Aaro Koskinen <[email protected]>
I was just doing the merge, so I added the tag to the commit now.
There is now an "omap1/multiplatform-prep" branch that is part of arm/multiplatform, and I hope to not have to rebase that. I also have an arm/multiplatform-late branch with the remaining contents.
Arnd
Re: [PATCH 20/41] dma: omap: hide legacy interface
In reply to Arnd BergmannQuoted 5 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The legacy interface for omap-dma is only used on OMAP1, and the same is true for the non-DT case. Make both of these conditional on
CONFIG_ARCH_OMAP1being set to simplify the dependency.
Signature · 1 line
~Vinod
Re: [PATCH 19/41] ARM: omap: dma: make usb support optional
In reply to Arnd BergmannQuoted 4 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Most of the
plat-omap/dma.ccode is specific to the USB driver.
The reason is simple: the omap_udc is the only driver which has not been ported to DMAengine.
I had a patch if I recall to convert it, but I don't have a way to test it and the omap_udc sets some funky bits for DMA which we can not figure out on how to handle.
Quoted 2 lines
Hide that code when it is not in use, to make it
clearer which parts are actually still required.
Quoted 144 lines
Signed-off-by Arnd Bergmann <[email protected]>--- arch/arm/plat-omap/dma.c | 45 +++++++++++++++++----------------- drivers/usb/gadget/udc/Kconfig | 2 +- include/linux/omap-dma.h | 5 +++- 3 files changed, 27 insertions(+), 25 deletions(-)arch/arm/plat-omap/dma.c +22
-23@@ -66,7 +66,6 @@ enum { DMA_CHAIN_STARTED, DMA_CHAIN_NOTSTARTED };static struct omap_system_dma_plat_info *p;static struct omap_dma_dev_attr *d; -static void omap_clear_dma (int lch);static int enable_1510_mode;static u32 errata;@@ -90,19 +89,16 @@ static int omap_dma_reserve_channels;static DEFINE_SPINLOCK (dma_chan_lock);static struct omap_dma_lch *dma_chan; -static inline void disable_lnk (int lch); -static void omap_disable_channel_irq (int lch); -static inline void omap_enable_channel_irq (int lch); - -#ifdef CONFIG_ARCH_OMAP15XX -/* Returns 1 if the DMA module is in OMAP1510-compatible mode, 0 otherwise */ -static int omap_dma_in_1510_mode (void ) +static inline void omap_disable_channel_irq (int lch) { -return enable_1510_mode; +/* disable channel interrupts */ + p->dma_write (0 ,CICR , lch); +/* Clear CSR */ +if (dma_omap1 ()) + p->dma_read (CSR , lch); +else + p->dma_write (OMAP2_DMA_CSR_CLEAR_MASK ,CSR , lch); } -#else -#define omap_dma_in_1510_mode () 0 -#endif #ifdef CONFIG_ARCH_OMAP1 static inline void set_gdma_dev (int req,int dev)@@ -169,6 +165,17 @@ void omap_set_dma_priority(int lch, int dst_port, int priority)#endif EXPORT_SYMBOL (omap_set_dma_priority); +#if IS_ENABLED (CONFIG_USB_OMAP ) +#ifdef CONFIG_ARCH_OMAP15XX +/* Returns 1 if the DMA module is in OMAP1510-compatible mode, 0 otherwise */ +static int omap_dma_in_1510_mode (void ) +{ +return enable_1510_mode; +} +#else +#define omap_dma_in_1510_mode () 0 +#endif +void omap_set_dma_transfer_params (int lch,int data_type,int elem_count,int frame_count,int sync_mode,int dma_trigger,int src_or_dst_synch)@@ -418,17 +425,6 @@ static inline void omap_enable_channel_irq(int lch) p->dma_write (dma_chan[lch].enabled_irqs,CICR , lch); } -static inline void omap_disable_channel_irq (int lch) -{ -/* disable channel interrupts */ - p->dma_write (0 ,CICR , lch); -/* Clear CSR */ -if (dma_omap1 ()) - p->dma_read (CSR , lch); -else - p->dma_write (OMAP2_DMA_CSR_CLEAR_MASK ,CSR , lch); -} -void omap_disable_dma_irq (int lch,u16 bits) { dma_chan[lch].enabled_irqs &= ~bits;@@ -473,6 +469,7 @@ static inline void disable_lnk(int lch) p->dma_write (l,CLNK_CTRL , lch); dma_chan[lch].flags &= ~OMAP_DMA_ACTIVE ; } +#endif int omap_request_dma(int dev_id, const char *dev_name, void (*callback)(int lch, u16 ch_status, void *data),@@ -572,6 +569,7 @@ static void omap_clear_dma(int lch)local_irq_restore (flags); } +#if IS_ENABLED (CONFIG_USB_OMAP )void omap_start_dma (int lch) {u32 l;@@ -792,6 +790,7 @@ int omap_get_dma_active_status(int lch) return (p->dma_read(CCR, lch) & OMAP_DMA_CCR_EN) != 0; }EXPORT_SYMBOL (omap_get_dma_active_status); +#endif int omap_dma_running (void ) {drivers/usb/gadget/udc/Kconfig +1
-1@@ -128,7 +128,7 @@ config USB_GR_UDC config USB_OMAP tristate "OMAP USB Device Controller" - depends on ARCH_OMAP1 || (ARCH_OMAP && COMPILE_TEST) + depends on ARCH_OMAP1 depends on ISP1301_OMAP || !(MACH_OMAP_H2 || MACH_OMAP_H3) help Many Texas Instruments OMAP processors have flexible fullinclude/linux/omap-dma.h +4
-1@@ -299,8 +299,9 @@ extern void omap_set_dma_priority(int lch, int dst_port, int priority);extern int omap_request_dma (int dev_id,const char *dev_name,void (*callback)(int lch,u16 ch_status,void *data),void *data,int *dma_ch); -extern void omap_disable_dma_irq (int ch,u16 irq_bits);extern void omap_free_dma (int ch); +#if IS_ENABLED (CONFIG_USB_OMAP ) +extern void omap_disable_dma_irq (int ch,u16 irq_bits);extern void omap_start_dma (int lch);extern void omap_stop_dma (int lch); extern void omap_set_dma_transfer_params(int lch, int data_type,@@ -326,6 +327,8 @@ extern void omap_set_dma_dest_burst_mode(int lch,extern dma_addr_t omap_get_dma_src_pos (int lch);extern dma_addr_t omap_get_dma_dst_pos (int lch);extern int omap_get_dma_active_status (int lch); +#endif +extern int omap_dma_running (void );#if IS_ENABLED (CONFIG_FB_OMAP )
Signature · 1 line
Péter
Re: [PATCH 21/41] ARM: omap1: dma: remove omap2 specific bits
In reply to Arnd BergmannQuoted 4 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
No part of
plat-omap/dma.cis called on omap2 any more, so anything omap2 specific in here can simply be removed.
Quoted 407 lines
Signed-off-by Arnd Bergmann <[email protected]>--- arch/arm/plat-omap/dma.c | 217 ++++++++++----------------------------- 1 file changed, 55 insertions(+), 162 deletions(-)arch/arm/plat-omap/dma.c +55
-162@@ -34,11 +34,9 @@#include <linux/omap-dma.h> -#ifdef CONFIG_ARCH_OMAP1 #include <mach/hardware.h> #include <linux/soc/ti/omap1-io.h> #include <linux/soc/ti/omap1-soc.h> -#endif /* * MAX_LOGICAL_DMA_CH_COUNT: the maximum number of logical DMA @@ -51,16 +49,7 @@#undef DEBUG -#ifndef CONFIG_ARCH_OMAP1 -enum {DMA_CH_ALLOC_DONE ,DMA_CH_PARAMS_SET_DONE ,DMA_CH_STARTED , -DMA_CH_QUEUED ,DMA_CH_NOTSTARTED ,DMA_CH_PAUSED ,DMA_CH_LINK_ENABLED -}; - -enum {DMA_CHAIN_STARTED ,DMA_CHAIN_NOTSTARTED }; -#endif -#define OMAP_DMA_ACTIVE 0x01 -#define OMAP2_DMA_CSR_CLEAR_MASK 0xffffffff#define OMAP_FUNC_MUX_ARM_BASE (0xfffe1000 + 0xec)@@ -94,13 +83,9 @@ static inline void omap_disable_channel_irq(int lch)/* disable channel interrupts */ p->dma_write (0 ,CICR , lch);/* Clear CSR */ -if (dma_omap1 ()) - p->dma_read (CSR , lch); -else - p->dma_write (OMAP2_DMA_CSR_CLEAR_MASK ,CSR , lch); + p->dma_read (CSR , lch); } -#ifdef CONFIG_ARCH_OMAP1 static inline void set_gdma_dev (int req,int dev) {u32 reg =OMAP_FUNC_MUX_ARM_BASE + ((req -1 ) /5 ) *4 ;@@ -112,11 +97,6 @@ static inline void set_gdma_dev(int req, int dev) l |= (dev -1 ) << shift;omap_writel (l, reg); } -#else -#define set_gdma_dev (req, dev) do {} while (0) -#define omap_readl (reg) 0 -#define omap_writel (val, reg) do {} while (0) -#endif #ifdef CONFIG_ARCH_OMAP1 void omap_set_dma_priority (int lch,int dst_port,int priority)@@ -181,59 +161,24 @@ void omap_set_dma_transfer_params(int lch, int data_type, int elem_count, int dma_trigger, int src_or_dst_synch) {u32 l; +u16 ccr; l = p->dma_read (CSDP , lch); l &= ~0x03 ; l |= data_type; p->dma_write (l,CSDP , lch); -if (dma_omap1 ()) { -u16 ccr; - - ccr = p->dma_read (CCR , lch); - ccr &= ~(1 <<5 ); -if (sync_mode ==OMAP_DMA_SYNC_FRAME ) - ccr |=1 <<5 ; - p->dma_write (ccr,CCR , lch); - - ccr = p->dma_read (CCR2 , lch); - ccr &= ~(1 <<2 ); -if (sync_mode ==OMAP_DMA_SYNC_BLOCK ) - ccr |=1 <<2 ; - p->dma_write (ccr,CCR2 , lch); - } - -if (dma_omap2plus () && dma_trigger) { -u32 val; - - val = p->dma_read (CCR , lch); - -/* DMA_SYNCHRO_CONTROL_UPPER depends on the channel number */ - val &= ~((1 <<23 ) | (3 <<19 ) |0x1f ); - val |= (dma_trigger & ~0x1f ) <<14 ; - val |= dma_trigger &0x1f ; - -if (sync_mode &OMAP_DMA_SYNC_FRAME ) - val |=1 <<5 ; -else - val &= ~(1 <<5 ); - -if (sync_mode &OMAP_DMA_SYNC_BLOCK ) - val |=1 <<18 ; -else - val &= ~(1 <<18 ); - -if (src_or_dst_synch ==OMAP_DMA_DST_SYNC_PREFETCH ) { - val &= ~(1 <<24 );/* dest synch */ - val |= (1 <<23 );/* Prefetch */ - }else if (src_or_dst_synch) { - val |=1 <<24 ;/* source synch */ - }else { - val &= ~(1 <<24 );/* dest synch */ - } - p->dma_write (val,CCR , lch); - } + ccr = p->dma_read (CCR , lch); + ccr &= ~(1 <<5 ); +if (sync_mode ==OMAP_DMA_SYNC_FRAME ) + ccr |=1 <<5 ; + p->dma_write (ccr,CCR , lch); + ccr = p->dma_read (CCR2 , lch); + ccr &= ~(1 <<2 ); +if (sync_mode ==OMAP_DMA_SYNC_BLOCK ) + ccr |=1 <<2 ; + p->dma_write (ccr,CCR2 , lch); p->dma_write (elem_count,CEN , lch); p->dma_write (frame_count,CFN , lch); }@@ -241,7 +186,7 @@ EXPORT_SYMBOL(omap_set_dma_transfer_params);void omap_set_dma_channel_mode (int lch,enum omap_dma_channel_mode mode) { -if (dma_omap1 () && !dma_omap15xx ()) { +if (!dma_omap15xx ()) {u32 l; l = p->dma_read (LCH_CTRL , lch);@@ -258,15 +203,12 @@ void omap_set_dma_src_params(int lch, int src_port, int src_amode, int src_ei, int src_fi) {u32 l; +u16 w; -if (dma_omap1 ()) { -u16 w; - - w = p->dma_read (CSDP , lch); - w &= ~(0x1f <<2 ); - w |= src_port <<2 ; - p->dma_write (w,CSDP , lch); - } + w = p->dma_read (CSDP , lch); + w &= ~(0x1f <<2 ); + w |= src_port <<2 ; + p->dma_write (w,CSDP , lch); l = p->dma_read (CCR , lch); l &= ~(0x03 <<12 );@@ -304,26 +246,15 @@ void omap_set_dma_src_burst_mode(int lch, enum omap_dma_burst_mode burst_mode)case OMAP_DMA_DATA_BURST_DIS :break ;case OMAP_DMA_DATA_BURST_4 : -if (dma_omap2plus ()) - burst =0x1 ; -else - burst =0x2 ; + burst =0x2 ;break ;case OMAP_DMA_DATA_BURST_8 : -if (dma_omap2plus ()) { - burst =0x2 ; -break ; - }/* * not supported by current hardware on OMAP1 * w |= (0x03 << 7); */ fallthrough;case OMAP_DMA_DATA_BURST_16 : -if (dma_omap2plus ()) { - burst =0x3 ; -break ; - }/* OMAP1 don't support burst 16 */ fallthrough;default :@@ -342,12 +273,10 @@ void omap_set_dma_dest_params(int lch, int dest_port, int dest_amode, {u32 l; -if (dma_omap1 ()) { - l = p->dma_read (CSDP , lch); - l &= ~(0x1f <<9 ); - l |= dest_port <<9 ; - p->dma_write (l,CSDP , lch); - } + l = p->dma_read (CSDP , lch); + l &= ~(0x1f <<9 ); + l |= dest_port <<9 ; + p->dma_write (l,CSDP , lch); l = p->dma_read (CCR , lch); l &= ~(0x03 <<14 );@@ -385,22 +314,12 @@ void omap_set_dma_dest_burst_mode(int lch, enum omap_dma_burst_mode burst_mode)case OMAP_DMA_DATA_BURST_DIS :break ;case OMAP_DMA_DATA_BURST_4 : -if (dma_omap2plus ()) - burst =0x1 ; -else - burst =0x2 ; + burst =0x2 ;break ;case OMAP_DMA_DATA_BURST_8 : -if (dma_omap2plus ()) - burst =0x2 ; -else - burst =0x3 ; + burst =0x3 ;break ;case OMAP_DMA_DATA_BURST_16 : -if (dma_omap2plus ()) { - burst =0x3 ; -break ; - }/* OMAP1 don't support burst 16 */ fallthrough;default :@@ -416,10 +335,7 @@ EXPORT_SYMBOL(omap_set_dma_dest_burst_mode);static inline void omap_enable_channel_irq (int lch) {/* Clear CSR */ -if (dma_omap1 ()) - p->dma_read (CSR , lch); -else - p->dma_write (OMAP2_DMA_CSR_CLEAR_MASK ,CSR , lch); + p->dma_read (CSR , lch);/* Enable some nice interrupts. */ p->dma_write (dma_chan[lch].enabled_irqs,CICR , lch);@@ -437,8 +353,7 @@ static inline void enable_lnk(int lch) l = p->dma_read (CLNK_CTRL , lch); -if (dma_omap1 ()) - l &= ~(1 <<14 ); + l &= ~(1 <<14 );/* Set the ENABLE_LNK bits */ if (dma_chan[lch].next_lch !=-1 )@@ -456,15 +371,8 @@ static inline void disable_lnk(int lch)/* Disable interrupts */ omap_disable_channel_irq (lch); -if (dma_omap1 ()) { -/* Set the STOP_LNK bit */ - l |=1 <<14 ; - } - -if (dma_omap2plus ()) { -/* Clear the ENABLE_LNK bit */ - l &= ~(1 <<15 ); - } +/* Set the STOP_LNK bit */ + l |=1 <<14 ; p->dma_write (l,CLNK_CTRL , lch); dma_chan[lch].flags &= ~OMAP_DMA_ACTIVE ;@@ -508,8 +416,7 @@ int omap_request_dma(int dev_id, const char *dev_name, chan->enabled_irqs =OMAP_DMA_DROP_IRQ |OMAP_DMA_BLOCK_IRQ ; -if (dma_omap1 ()) - chan->enabled_irqs |=OMAP1_DMA_TOUT_IRQ ; + chan->enabled_irqs |=OMAP1_DMA_TOUT_IRQ ;if (dma_omap16xx ()) {/* If the sync device is set, configure it dynamically. */ @@ -522,7 +429,7 @@ int omap_request_dma(int dev_id, const char *dev_name,* id. */ p->dma_write (dev_id | (1 <<10 ),CCR , free_ch); - }else if (dma_omap1 ()) { + }else { p->dma_write (dev_id,CCR , free_ch); }@@ -739,8 +646,7 @@ dma_addr_t omap_get_dma_src_pos(int lch) offset = p->dma_read (CSSA , lch); } -if (dma_omap1 ()) - offset |= (p->dma_read (CSSA , lch) &0xFFFF0000 ); + offset |= (p->dma_read (CSSA , lch) &0xFFFF0000 );return offset; }@@ -778,8 +684,7 @@ dma_addr_t omap_get_dma_dst_pos(int lch) offset = p->dma_read (CDSA , lch); } -if (dma_omap1 ()) - offset |= (p->dma_read (CDSA , lch) &0xFFFF0000 ); + offset |= (p->dma_read (CDSA , lch) &0xFFFF0000 );return offset; }@@ -796,9 +701,8 @@ int omap_dma_running(void) {int lch; -if (dma_omap1 ()) -if (omap_lcd_dma_running ()) -return 1 ; +if (omap_lcd_dma_running ()) +return 1 ;for (lch =0 ; lch < dma_chan_count; lch++)if (p->dma_read (CCR , lch) &OMAP_DMA_CCR_EN )@@ -809,8 +713,6 @@ int omap_dma_running(void)/*----------------------------------------------------------------------------*/ -#ifdef CONFIG_ARCH_OMAP1 -static int omap1_dma_handle_ch (int ch) {u32 csr;@@ -863,10 +765,6 @@ static irqreturn_t omap1_dma_irq_handler(int irq, void *dev_id)return handled ?IRQ_HANDLED :IRQ_NONE ; } -#else -#define omap1_dma_irq_handler NULL -#endif -struct omap_system_dma_plat_info *omap_get_plat_info (void ) {return p;@@ -912,29 +810,27 @@ static int omap_system_dma_probe(struct platform_device *pdev)if (ch >=6 && enable_1510_mode)continue ; -if (dma_omap1 ()) { -/* -* request_irq() doesn't like dev_id (ie. ch) being -* zero, so we have to kludge around this. -*/ -sprintf (&irq_name[0 ],"%d" , ch); - dma_irq =platform_get_irq_byname (pdev, irq_name); - -if (dma_irq <0 ) { - ret = dma_irq; - goto exit_dma_irq_fail; - } - -/* INT_DMA_LCD is handled in lcd_dma.c */ -if (dma_irq ==INT_DMA_LCD ) -continue ; - - ret =request_irq (dma_irq, - omap1_dma_irq_handler,0 ,"DMA" , - (void *) (ch +1 )); -if (ret !=0 ) - goto exit_dma_irq_fail; +/* +* request_irq() doesn't like dev_id (ie. ch) being +* zero, so we have to kludge around this. +*/ +sprintf (&irq_name[0 ],"%d" , ch); + dma_irq =platform_get_irq_byname (pdev, irq_name); + +if (dma_irq <0 ) { + ret = dma_irq; + goto exit_dma_irq_fail; } + +/* INT_DMA_LCD is handled in lcd_dma.c */ +if (dma_irq ==INT_DMA_LCD ) +continue ; + + ret =request_irq (dma_irq, + omap1_dma_irq_handler,0 ,"DMA" , + (void *) (ch +1 )); +if (ret !=0 ) + goto exit_dma_irq_fail; }/* reserve dma channels 0 and 1 in high security devices on 34xx */ @@ -954,9 +850,6 @@ static int omap_system_dma_remove(struct platform_device *pdev) {int dma_irq, irq_rel =0 ; -if (dma_omap2plus ()) -return 0 ; -for ( ; irq_rel < dma_chan_count; irq_rel++) { dma_irq =platform_get_irq (pdev, irq_rel);free_irq (dma_irq, (void *)(irq_rel +1 ));
Signature · 1 line
Péter
Re: [PATCH 22/41] ARM: omap1: move plat/dma.c to mach/omap-dma.c
In reply to Arnd BergmannQuoted 8 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Most of the interface functions in
plat/dma.care only used from the USB driver, which is practically OMAP1 specific, except for compile testing.The
omap_get_plat_info(),omap_request_dma()andomap_free_dma()functions are never called on omap2 because of runtime checks.
Quoted 35 lines
Signed-off-by Arnd Bergmann <[email protected]>--- arch/arm/mach-omap1/Makefile | 2 +- arch/arm/{plat-omap/dma.c => mach-omap1/omap-dma.c} | 0 arch/arm/plat-omap/Makefile | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename arch/arm/{plat-omap/dma.c => mach-omap1/omap-dma.c} (100%)arch/arm/mach-omap1/Makefile +1
-1@@ -5,7 +5,7 @@ # Common support obj-y := io.o id.o sram-init.o sram.o time.o irq.o mux.o flash.o \ - serial.o devices.o dma.o fb.o + serial.o devices.o dma.o omap-dma.o fb.o obj-y += clock.o clock_data.o opp_data.o reset.o pm_bus.o timer.o ifneq ($(CONFIG_SND_SOC_OMAP_MCBSP),)arch/arm/mach-omap1/omap-dma.c renamed from arch/arm/plat-omap/dma.c +0
-0arch/arm/plat-omap/Makefile +1
-1@@ -6,4 +6,4 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-omap/include # Common support -obj-y := sram.o dma.o +obj-y := sram.o
Signature · 1 line
Péter