More omap plat header cleanup for v3.8 merge window
Subsystems (22)
Tony Lindgren
maintainercover More omap plat header cleanup for v3.8 merge window
Hi all,
Here are some more patches for early merging after -rc1 for v3.8 merge window to remove more plat includes for the ARM common zImage support. These are based on top of current linux next + kevin's cpufreq fixes.
More patches to follow, I'll start looking into plat/cpu.h next.
Regards,
Tony
---
Tony Lindgren (16):
ARM: OMAP2+: Make board-zoom.h local
ARM: OMAP: Split plat-omap/i2c.c into mach-omap1 and mach-omap2
ARM: OMAP: Make plat/common.h local to mach-omap1 and mach-omap2
ARM: OMAP: Make plat/fpga.h local to arch/arm/plat-omap
ARM: OMAP1: Move plat/tc.h to mach/tc.h for omap1
ARM: OMAP: Move plat/led.h to include/linux/platform_data
ARM: OMAP: Make plat/sram.h local to plat-omap
ARM: OMAP2: Move plat/menelaus.h to linux/mfd/menelaus.h
ARM: OMAP: Split plat/mmc.h into local headers and platform_data
ARM: OMAP: Make omap_device local to mach-omap2
ARM: OMAP: Make plat/omap_hwmod.h local to mach-omap2
ARM: OMAP: Merge plat/multi.h into plat/cpu.h
ARM: OMAP: Split uncompress.h to mach-omap1 and mach-omap2
ARM: OMAP: Split plat/serial.h for omap1 and omap2+
ARM: OMAP: Move plat/omap-serial.h to linux/platform_data/serial-omap.h
ARM: OMAP: Make plat/omap-pm.h local to mach-omap2
arch/arm/mach-omap1/board-fsample.c | 8 -
arch/arm/mach-omap1/board-h2-mmc.c | 5
arch/arm/mach-omap1/board-h2.c | 2
arch/arm/mach-omap1/board-h3-mmc.c | 3
arch/arm/mach-omap1/board-h3.c | 2
arch/arm/mach-omap1/board-htcherald.c | 2
arch/arm/mach-omap1/board-innovator.c | 30 ++-
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 | 4
arch/arm/mach-omap1/board-palmz71.c | 2
arch/arm/mach-omap1/board-perseus2.c | 8 -
arch/arm/mach-omap1/board-sx1-mmc.c | 3
arch/arm/mach-omap1/board-sx1.c | 2
arch/arm/mach-omap1/board-voiceblue.c | 2
arch/arm/mach-omap1/clock.c | 3
arch/arm/mach-omap1/clock_data.c | 3
arch/arm/mach-omap1/common.h | 6 -
arch/arm/mach-omap1/devices.c | 6 -
arch/arm/mach-omap1/dma.c | 2
arch/arm/mach-omap1/flash.c | 2
arch/arm/mach-omap1/fpga.c | 2
arch/arm/mach-omap1/i2c.c | 59 ++++++
arch/arm/mach-omap1/include/mach/debug-macro.S | 2
arch/arm/mach-omap1/include/mach/hardware.h | 4
arch/arm/mach-omap1/include/mach/omap1510.h | 113 +++++++++++
arch/arm/mach-omap1/include/mach/serial.h | 53 +++++
arch/arm/mach-omap1/include/mach/tc.h | 0
arch/arm/mach-omap1/include/mach/uncompress.h | 121 ++++++++++++
arch/arm/mach-omap1/io.c | 2
arch/arm/mach-omap1/mmc.h | 18 ++
arch/arm/mach-omap1/pm.c | 5
arch/arm/mach-omap1/pm_bus.c | 3
arch/arm/mach-omap1/serial.c | 1
arch/arm/mach-omap2/Makefile | 3
arch/arm/mach-omap2/am35xx-emac.c | 2
arch/arm/mach-omap2/board-3630sdp.c | 2
arch/arm/mach-omap2/board-4430sdp.c | 2
arch/arm/mach-omap2/board-apollon.c | 2
arch/arm/mach-omap2/board-flash.c | 1
arch/arm/mach-omap2/board-h4.c | 2
arch/arm/mach-omap2/board-ldp.c | 2
arch/arm/mach-omap2/board-n8x0.c | 4
arch/arm/mach-omap2/board-omap3beagle.c | 2
arch/arm/mach-omap2/board-omap4panda.c | 2
arch/arm/mach-omap2/board-rm680.c | 4
arch/arm/mach-omap2/board-rx51-peripherals.c | 2
arch/arm/mach-omap2/board-zoom-debugboard.c | 2
arch/arm/mach-omap2/board-zoom-display.c | 2
arch/arm/mach-omap2/board-zoom-peripherals.c | 2
arch/arm/mach-omap2/board-zoom.c | 2
arch/arm/mach-omap2/board-zoom.h | 0
arch/arm/mach-omap2/clkt2xxx_dpllcore.c | 3
arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 3
arch/arm/mach-omap2/clkt34xx_dpll3m2.c | 3
arch/arm/mach-omap2/clockdomain.h | 2
arch/arm/mach-omap2/cm33xx.c | 2
arch/arm/mach-omap2/common.h | 8 +
arch/arm/mach-omap2/devices.c | 4
arch/arm/mach-omap2/display.c | 6 -
arch/arm/mach-omap2/dma.c | 4
arch/arm/mach-omap2/drm.c | 4
arch/arm/mach-omap2/dsp.c | 2
arch/arm/mach-omap2/gpio.c | 6 -
arch/arm/mach-omap2/gpmc.c | 2
arch/arm/mach-omap2/hdq1w.c | 4
arch/arm/mach-omap2/hdq1w.h | 2
arch/arm/mach-omap2/hsmmc.c | 6 -
arch/arm/mach-omap2/hwspinlock.c | 4
arch/arm/mach-omap2/i2c.c | 74 +++++++
arch/arm/mach-omap2/i2c.h | 25 --
arch/arm/mach-omap2/include/mach/debug-macro.S | 2
arch/arm/mach-omap2/include/mach/uncompress.h | 175 +++++++++++++++++
arch/arm/mach-omap2/io.c | 10 -
arch/arm/mach-omap2/mcbsp.c | 2
arch/arm/mach-omap2/mmc.h | 23 ++
arch/arm/mach-omap2/msdi.c | 6 -
arch/arm/mach-omap2/mux.c | 2
arch/arm/mach-omap2/omap-pm.h | 0
arch/arm/mach-omap2/omap4-common.c | 6 -
arch/arm/mach-omap2/omap_device.c | 4
arch/arm/mach-omap2/omap_device.h | 2
arch/arm/mach-omap2/omap_hwmod.c | 2
arch/arm/mach-omap2/omap_hwmod.h | 0
arch/arm/mach-omap2/omap_hwmod_2420_data.c | 9 -
arch/arm/mach-omap2/omap_hwmod_2430_data.c | 9 -
.../omap_hwmod_2xxx_3xxx_interconnect_data.c | 3
.../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 5
.../mach-omap2/omap_hwmod_2xxx_interconnect_data.c | 4
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 3
arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 8 -
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 10 +
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 9 -
arch/arm/mach-omap2/omap_hwmod_common_data.c | 2
arch/arm/mach-omap2/omap_hwmod_common_data.h | 2
arch/arm/mach-omap2/omap_opp_data.h | 2
arch/arm/mach-omap2/opp.c | 2
arch/arm/mach-omap2/pm-debug.c | 2
arch/arm/mach-omap2/pm.c | 4
arch/arm/mach-omap2/pm24xx.c | 3
arch/arm/mach-omap2/pm34xx.c | 3
arch/arm/mach-omap2/pmu.c | 4
arch/arm/mach-omap2/prm33xx.c | 2
arch/arm/mach-omap2/prm_common.c | 2
arch/arm/mach-omap2/sdrc.c | 2
arch/arm/mach-omap2/sdrc2xxx.c | 2
arch/arm/mach-omap2/serial.c | 13 +
arch/arm/mach-omap2/serial.h | 11 -
arch/arm/mach-omap2/sleep34xx.S | 2
arch/arm/mach-omap2/sr_device.c | 2
arch/arm/mach-omap2/timer.c | 6 -
arch/arm/mach-omap2/twl-common.c | 1
arch/arm/mach-omap2/usb-host.c | 2
arch/arm/mach-omap2/usb-musb.c | 2
arch/arm/mach-omap2/wd_timer.c | 2
arch/arm/mach-omap2/wd_timer.h | 2
arch/arm/plat-omap/Makefile | 1
arch/arm/plat-omap/common.c | 2
arch/arm/plat-omap/common.h | 10 -
arch/arm/plat-omap/counter_32k.c | 2
arch/arm/plat-omap/debug-leds.c | 2
arch/arm/plat-omap/dma.c | 24 +-
arch/arm/plat-omap/dmtimer.c | 3
arch/arm/plat-omap/fpga.h | 74 +++++++
arch/arm/plat-omap/i2c.c | 152 ---------------
arch/arm/plat-omap/i2c.h | 46 +++++
arch/arm/plat-omap/include/plat/cpu.h | 96 +++++++++
arch/arm/plat-omap/include/plat/fpga.h | 193 -------------------
arch/arm/plat-omap/include/plat/multi.h | 120 ------------
arch/arm/plat-omap/include/plat/sram.h | 105 ----------
arch/arm/plat-omap/include/plat/uncompress.h | 204 --------------------
arch/arm/plat-omap/omap-pm-noop.c | 5
arch/arm/plat-omap/sram.c | 1
arch/arm/plat-omap/sram.h | 109 ++++++++++-
drivers/media/platform/omap3isp/ispvideo.c | 1
drivers/media/rc/ir-rx51.c | 1
drivers/mfd/menelaus.c | 2
drivers/mmc/host/omap.c | 3
drivers/mmc/host/omap_hsmmc.c | 2
drivers/pcmcia/omap_cf.c | 2
drivers/tty/serial/omap-serial.c | 35 +++
drivers/usb/host/ohci-omap.c | 5
drivers/video/omap/lcd_inn1510.c | 7 -
include/linux/mfd/menelaus.h | 2
include/linux/platform_data/leds-omap.h | 2
include/linux/platform_data/mmc-omap.h | 45 ----
include/linux/platform_data/serial-omap.h | 40 ----
148 files changed, 1224 insertions(+), 1127 deletions(-)
create mode 100644 arch/arm/mach-omap1/include/mach/serial.h
rename arch/arm/{plat-omap/include/plat/tc.h => mach-omap1/include/mach/tc.h} (100%)
create mode 100644 arch/arm/mach-omap1/mmc.h
rename arch/arm/mach-omap2/{include/mach/board-zoom.h => board-zoom.h} (100%)
rename arch/arm/{plat-omap/include/plat/i2c.h => mach-omap2/i2c.h} (66%)
create mode 100644 arch/arm/mach-omap2/mmc.h
rename arch/arm/{plat-omap/include/plat/omap-pm.h => mach-omap2/omap-pm.h} (100%)
rename arch/arm/{plat-omap/omap_device.c => mach-omap2/omap_device.c} (99%)
rename arch/arm/{plat-omap/include/plat/omap_device.h => mach-omap2/omap_device.h} (99%)
rename arch/arm/{plat-omap/include/plat/omap_hwmod.h => mach-omap2/omap_hwmod.h} (100%)
rename arch/arm/{plat-omap/include/plat/serial.h => mach-omap2/serial.h} (91%)
rename arch/arm/plat-omap/{include/plat/common.h => common.h} (89%)
create mode 100644 arch/arm/plat-omap/fpga.h
create mode 100644 arch/arm/plat-omap/i2c.h
delete mode 100644 arch/arm/plat-omap/include/plat/fpga.h
delete mode 100644 arch/arm/plat-omap/include/plat/multi.h
delete mode 100644 arch/arm/plat-omap/include/plat/sram.h
delete mode 100644 arch/arm/plat-omap/include/plat/uncompress.h
rename arch/arm/plat-omap/include/plat/menelaus.h => include/linux/mfd/menelaus.h (96%)
rename arch/arm/plat-omap/include/plat/led.h => include/linux/platform_data/leds-omap.h (91%)
rename arch/arm/plat-omap/include/plat/mmc.h => include/linux/platform_data/mmc-omap.h (80%)
rename arch/arm/plat-omap/include/plat/omap-serial.h => include/linux/platform_data/serial-omap.h (67%)Signature · 1 line
Signature
Tony Lindgren
maintainerPATCH 1/16 ARM: OMAP2+: Make board-zoom.h local
This can be local to mach-omap2.
Signed-off-by Tony Lindgren <[email protected]>
---
arch/arm/mach-omap2/board-3630sdp.c | 2 +-
arch/arm/mach-omap2/board-ldp.c | 2 +-
arch/arm/mach-omap2/board-zoom-debugboard.c | 2 +-
arch/arm/mach-omap2/board-zoom-display.c | 2 +-
arch/arm/mach-omap2/board-zoom-peripherals.c | 2 +-
arch/arm/mach-omap2/board-zoom.c | 2 +-
arch/arm/mach-omap2/board-zoom.h | 0
7 files changed, 6 insertions(+), 6 deletions(-)
rename arch/arm/mach-omap2/{include/mach/board-zoom.h => board-zoom.h} (100%)arch/arm/mach-omap2/board-3630sdp.c +1 -1
@@ -20,7 +20,7 @@#include "gpmc-smc91x.h" #include <plat/usb.h> -#include <mach/board-zoom.h> +#include "board-zoom.h" #include "board-flash.h" #include "mux.h"
arch/arm/mach-omap2/board-ldp.c +1 -1
@@ -36,7 +36,7 @@#include "common.h" #include <plat/gpmc.h> -#include <mach/board-zoom.h> +#include "board-zoom.h" #include <plat/usb.h> #include "gpmc-smsc911x.h"
arch/arm/mach-omap2/board-zoom-debugboard.c +1 -1
@@ -20,7 +20,7 @@#include <plat/gpmc.h> #include "gpmc-smsc911x.h" -#include <mach/board-zoom.h> +#include "board-zoom.h" #include "soc.h" #include "common.h"
arch/arm/mach-omap2/board-zoom-display.c +1 -1
@@ -16,7 +16,7 @@#include <linux/spi/spi.h> #include <linux/platform_data/spi-omap2-mcspi.h> #include <video/omapdss.h> -#include <mach/board-zoom.h> +#include "board-zoom.h" #include "common.h"
arch/arm/mach-omap2/board-zoom-peripherals.c +1 -1
@@ -28,7 +28,7 @@#include "common.h" #include <plat/usb.h> -#include <mach/board-zoom.h> +#include "board-zoom.h" #include "mux.h" #include "hsmmc.h"
arch/arm/mach-omap2/board-zoom.c +1 -1
@@ -24,7 +24,7 @@#include "common.h" #include <plat/usb.h> -#include <mach/board-zoom.h> +#include "board-zoom.h" #include "board-flash.h" #include "mux.h"
arch/arm/mach-omap2/board-zoom.h renamed from arch/arm/mach-omap2/include/mach/board-zoom.h +0 -0
Tony Lindgren
maintainerPATCH 2/16 ARM: OMAP: Split plat-omap/i2c.c into mach-omap1 and mach-omap2
In reply to Tony LindgrenThere's no need to keep the device related things in the common i2c.c as omap2+ is using hwmod. Split the code to mach-omap1 and mach-omap2 parts and only leave common code to plat-omap/i2c.c.
Note that as omap1 only has one i2c controller, we can now remove the old device related macros.
Signed-off-by Tony Lindgren <[email protected]>
---
arch/arm/mach-omap1/common.h | 3 +
arch/arm/mach-omap1/i2c.c | 59 +++++++++++
arch/arm/mach-omap2/board-rm680.c | 1
arch/arm/mach-omap2/common.h | 4 +
arch/arm/mach-omap2/i2c.c | 72 +++++++++++++
arch/arm/mach-omap2/i2c.h | 25 +----
arch/arm/mach-omap2/omap_hwmod_2420_data.c | 4 +
arch/arm/mach-omap2/omap_hwmod_2430_data.c | 4 +
arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 4 +
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 4 +
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 3 -
arch/arm/mach-omap2/twl-common.c | 1
arch/arm/plat-omap/i2c.c | 152 +---------------------------
arch/arm/plat-omap/i2c.h | 46 ++++++++
arch/arm/plat-omap/include/plat/common.h | 1
15 files changed, 202 insertions(+), 181 deletions(-)
rename arch/arm/{plat-omap/include/plat/i2c.h => mach-omap2/i2c.h} (66%)
create mode 100644 arch/arm/plat-omap/i2c.harch/arm/mach-omap1/common.h +3 -0
@@ -28,6 +28,9 @@#include <plat/common.h> #include <linux/mtd/mtd.h> +#include <linux/i2c-omap.h> + +#include "../plat-omap/i2c.h" #if defined(CONFIG_ARCH_OMAP730 ) || defined(CONFIG_ARCH_OMAP850 )void omap7xx_map_io (void );
arch/arm/mach-omap1/i2c.c +57 -2
71 lines not on this page · raw message
arch/arm/mach-omap2/board-rm680.c +0 -1
@@ -22,7 +22,6 @@#include <asm/mach/arch.h> #include <asm/mach-types.h> -#include <plat/i2c.h> #include <plat/mmc.h> #include <plat/usb.h> #include <plat/gpmc.h>
arch/arm/mach-omap2/common.h +4 -0
@@ -28,7 +28,9 @@#include <linux/irq.h> #include <linux/delay.h> +#include <linux/i2c.h> #include <linux/i2c/twl.h> +#include <linux/i2c-omap.h> #include <asm/proc-fns.h>
@@ -36,6 +38,8 @@#include <plat/serial.h> #include <plat/common.h> +#include "i2c.h" +#define OMAP_INTC_START NR_IRQS#ifdef CONFIG_SOC_OMAP2420
arch/arm/mach-omap2/i2c.c +70 -2
91 lines not on this page · raw message
arch/arm/mach-omap2/i2c.h renamed from arch/arm/plat-omap/include/plat/i2c.h +4 -21
@@ -18,24 +18,11 @@* 02110-1301 USA * */ -#ifndef __ASM__ARCH_OMAP_I2C_H -#define __ASM__ARCH_OMAP_I2C_H -#include <linux/i2c.h> -#include <linux/i2c-omap.h> +#include "../plat-omap/i2c.h" -#if defined(CONFIG_I2C_OMAP ) || defined(CONFIG_I2C_OMAP_MODULE ) -extern int omap_register_i2c_bus (int bus_id,u32 clkrate, -struct i2c_board_info const *info, -unsigned len); -#else -static inline int omap_register_i2c_bus (int bus_id,u32 clkrate, -struct i2c_board_info const *info, -unsigned len) -{ -return 0 ; -} -#endif +#ifndef __MACH_OMAP2_I2C_H +#define __MACH_OMAP2_I2C_H/** * i2c_dev_attr - OMAP I2C controller device attributes for omap_hwmod
@@ -50,10 +37,6 @@ struct omap_i2c_dev_attr { u32 flags; }; -void __init omap1_i2c_mux_pins (int bus_id); -void __init omap2_i2c_mux_pins (int bus_id); - -struct omap_hwmod ;int omap_i2c_reset (struct omap_hwmod *oh); -#endif /* __ASM__ARCH_OMAP_I2C_H */ +#endif /* __MACH_OMAP2_I2C_H */
arch/arm/mach-omap2/omap_hwmod_2420_data.c +3 -1
@@ -12,12 +12,13 @@* XXX handle crossbar/shared link difference for L3? * XXX these should be marked initdata for multi-OMAP kernels */ + +#include <linux/i2c-omap.h> #include <linux/platform_data/spi-omap2-mcspi.h> #include <plat/omap_hwmod.h> #include <plat/dma.h> #include <plat/serial.h> -#include <plat/i2c.h> #include <plat/dmtimer.h> #include "l3_2xxx.h" #include "l4_2xxx.h"
@@ -27,6 +28,7 @@#include "cm-regbits-24xx.h" #include "prm-regbits-24xx.h" +#include "i2c.h" #include "wd_timer.h" /*
arch/arm/mach-omap2/omap_hwmod_2430_data.c +3 -1
@@ -12,13 +12,14 @@* XXX handle crossbar/shared link difference for L3? * XXX these should be marked initdata for multi-OMAP kernels */ + +#include <linux/i2c-omap.h> #include <linux/platform_data/asoc-ti-mcbsp.h> #include <linux/platform_data/spi-omap2-mcspi.h> #include <plat/omap_hwmod.h> #include <plat/dma.h> #include <plat/serial.h> -#include <plat/i2c.h> #include <plat/dmtimer.h> #include <plat/mmc.h> #include "l3_2xxx.h"
@@ -27,6 +28,7 @@#include "omap_hwmod_common_data.h" #include "prm-regbits-24xx.h" #include "cm-regbits-24xx.h" +#include "i2c.h" #include "wd_timer.h" /*
arch/arm/mach-omap2/omap_hwmod_33xx_data.c +3 -1
@@ -14,13 +14,14 @@* GNU General Public License for more details. */ +#include <linux/i2c-omap.h> +#include <plat/omap_hwmod.h> #include <plat/cpu.h> #include <linux/platform_data/gpio-omap.h> #include <linux/platform_data/spi-omap2-mcspi.h> #include <plat/dma.h> #include <plat/mmc.h> -#include <plat/i2c.h> #include "omap_hwmod_common_data.h"
@@ -28,6 +29,7 @@#include "cm33xx.h" #include "prm33xx.h" #include "prm-regbits-33xx.h" +#include "i2c.h" /* * IP blocks
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +3 -1
@@ -14,6 +14,8 @@* * XXX these should be marked initdata for multi-OMAP kernels */ + +#include <linux/i2c-omap.h> #include <linux/power/smartreflex.h> #include <linux/platform_data/gpio-omap.h>
@@ -22,7 +24,6 @@#include <plat/serial.h> #include "l3_3xxx.h" #include "l4_3xxx.h" -#include <plat/i2c.h> #include <plat/mmc.h> #include <linux/platform_data/asoc-ti-mcbsp.h> #include <linux/platform_data/spi-omap2-mcspi.h>
@@ -35,6 +36,7 @@#include "omap_hwmod_common_data.h" #include "prm-regbits-34xx.h" #include "cm-regbits-34xx.h" +#include "i2c.h" #include "wd_timer.h" /*
arch/arm/mach-omap2/omap_hwmod_44xx_data.c +2 -1
@@ -21,9 +21,9 @@#include <linux/io.h> #include <linux/platform_data/gpio-omap.h> #include <linux/power/smartreflex.h> +#include <linux/i2c-omap.h> #include <plat/omap_hwmod.h> -#include <plat/i2c.h> #include <plat/dma.h> #include <linux/platform_data/spi-omap2-mcspi.h> #include <linux/platform_data/asoc-ti-mcbsp.h>
@@ -37,6 +37,7 @@#include "cm2_44xx.h" #include "prm44xx.h" #include "prm-regbits-44xx.h" +#include "i2c.h" #include "wd_timer.h" /* Base offset for all OMAP4 interrupts external to MPUSS */
arch/arm/mach-omap2/twl-common.c +0 -1
@@ -26,7 +26,6 @@#include <linux/regulator/machine.h> #include <linux/regulator/fixed.h> -#include <plat/i2c.h> #include <plat/usb.h> #include "soc.h"
arch/arm/plat-omap/i2c.c +4 -148
178 lines not on this page · raw message
arch/arm/plat-omap/i2c.h new file +46 -0
46 lines not on this page · raw message
arch/arm/plat-omap/include/plat/common.h +0 -1
@@ -27,7 +27,6 @@#ifndef __ARCH_ARM_MACH_OMAP_COMMON_H#define __ARCH_ARM_MACH_OMAP_COMMON_H -#include <plat/i2c.h> #include <plat/omap_hwmod.h> extern int __init omap_init_clocksource_32k (void __iomem *vbase);
PATCH 2/16 ARM: OMAP: Split plat-omap/i2c.c into mach-omap1 and mach-omap2
Quoted 7 lines · Tony Lindgren
There's no need to keep the device related things in the common
i2c.cas omap2+ is using hwmod. Split the code to mach-omap1 and mach-omap2 parts and only leave common code toplat-omap/i2c.c.Note that as omap1 only has one i2c controller, we can now remove the old device related macros.
Reviewed-by Shubhrajyoti D <[email protected]>
Quoted 227 lines
Signed-off-by Tony Lindgren <[email protected]>--- arch/arm/mach-omap1/common.h | 3 + arch/arm/mach-omap1/i2c.c | 59 +++++++++++ arch/arm/mach-omap2/board-rm680.c | 1 arch/arm/mach-omap2/common.h | 4 + arch/arm/mach-omap2/i2c.c | 72 +++++++++++++ arch/arm/mach-omap2/i2c.h | 25 +---- arch/arm/mach-omap2/omap_hwmod_2420_data.c | 4 + arch/arm/mach-omap2/omap_hwmod_2430_data.c | 4 + arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 4 + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 4 + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 3 - arch/arm/mach-omap2/twl-common.c | 1 arch/arm/plat-omap/i2c.c | 152 +--------------------------- arch/arm/plat-omap/i2c.h | 46 ++++++++ arch/arm/plat-omap/include/plat/common.h | 1 15 files changed, 202 insertions(+), 181 deletions(-) rename arch/arm/{plat-omap/include/plat/i2c.h => mach-omap2/i2c.h} (66%) create mode 100644 arch/arm/plat-omap/i2c.harch/arm/mach-omap1/common.h +3
-0@@ -28,6 +28,9 @@#include <plat/common.h> #include <linux/mtd/mtd.h> +#include <linux/i2c-omap.h> + +#include "../plat-omap/i2c.h" #if defined(CONFIG_ARCH_OMAP730 ) || defined(CONFIG_ARCH_OMAP850 )void omap7xx_map_io (void );arch/arm/mach-omap1/i2c.c +57
-2@@ -19,11 +19,25 @@* */ -#include <plat/i2c.h> +#include <linux/i2c-omap.h> #include <mach/mux.h> #include <plat/cpu.h> -void __init omap1_i2c_mux_pins (int bus_id) +#include "../plat-omap/i2c.h" + +#define OMAP_I2C_SIZE 0x3f +#define OMAP1_I2C_BASE 0xfffb3800 +#define OMAP1_INT_I2C (32 + 4) + +static const char name[] ="omap_i2c" ; + +static struct resource i2c_resources[2 ] = { +}; + +static struct platform_device omap_i2c_devices[1 ] = { +}; + +static void __init omap1_i2c_mux_pins (int bus_id) {if (cpu_is_omap7xx ()) {omap_cfg_reg (I2C_7XX_SDA );@@ -33,3 +47,44 @@ void __init omap1_i2c_mux_pins(int bus_id)omap_cfg_reg (I2C_SCL ); } } + +int __init omap_i2c_add_bus (struct omap_i2c_bus_platform_data *pdata, +int bus_id) +{ +struct platform_device *pdev; +struct resource *res; + +omap1_i2c_mux_pins (bus_id); + + pdev = &omap_i2c_devices[bus_id -1 ]; + pdev->id = bus_id; + pdev->name = name; + pdev->num_resources =ARRAY_SIZE (i2c_resources); + res = i2c_resources; + res[0 ].start =OMAP1_I2C_BASE ; + res[0 ].end = res[0 ].start +OMAP_I2C_SIZE ; + res[0 ].flags =IORESOURCE_MEM ; + res[1 ].start =OMAP1_INT_I2C ; + res[1 ].flags =IORESOURCE_IRQ ; + pdev->resource = res; + +/* all OMAP1 have IP version 1 register set */ + pdata->rev =OMAP_I2C_IP_VERSION_1 ; + +/* all OMAP1 I2C are implemented like this */ + pdata->flags =OMAP_I2C_FLAG_NO_FIFO | +OMAP_I2C_FLAG_SIMPLE_CLOCK | +OMAP_I2C_FLAG_16BIT_DATA_REG | +OMAP_I2C_FLAG_ALWAYS_ARMXOR_CLK ; + +/* how the cpu bus is wired up differs for 7xx only */ + +if (cpu_is_omap7xx ()) + pdata->flags |=OMAP_I2C_FLAG_BUS_SHIFT_1 ; +else + pdata->flags |=OMAP_I2C_FLAG_BUS_SHIFT_2 ; + + pdev->dev.platform_data = pdata; + +return platform_device_register (pdev); +}arch/arm/mach-omap2/board-rm680.c +0
-1@@ -22,7 +22,6 @@#include <asm/mach/arch.h> #include <asm/mach-types.h> -#include <plat/i2c.h> #include <plat/mmc.h> #include <plat/usb.h> #include <plat/gpmc.h> arch/arm/mach-omap2/common.h +4
-0@@ -28,7 +28,9 @@#include <linux/irq.h> #include <linux/delay.h> +#include <linux/i2c.h> #include <linux/i2c/twl.h> +#include <linux/i2c-omap.h> #include <asm/proc-fns.h> @@ -36,6 +38,8 @@#include <plat/serial.h> #include <plat/common.h> +#include "i2c.h" +#define OMAP_INTC_START NR_IRQS#ifdef CONFIG_SOC_OMAP2420 arch/arm/mach-omap2/i2c.c +52
-2@@ -19,11 +19,15 @@* */ -#include <plat/i2c.h> +#include <linux/i2c-omap.h> +#include "common.h" #include <plat/omap_hwmod.h> +#include <plat/omap_device.h> +#include <plat/omap-pm.h> #include "mux.h" +#include "i2c.h" /* In register I2C_CON, Bit 15 is the I2C enable bit */ #define I2C_EN BIT(15)@@ -33,7 +37,9 @@/* Maximum microseconds to wait for OMAP module to softreset */ #define MAX_MODULE_SOFTRESET_WAIT 10000 -void __init omap2_i2c_mux_pins (int bus_id) +#define MAX_OMAP_I2C_HWMOD_NAME_LEN 16 + +static void __init omap2_i2c_mux_pins (int bus_id) {char mux_name[sizeof ("i2c2_scl.i2c2_scl" )];@@ -104,3 +110,65 @@ int omap_i2c_reset(struct omap_hwmod *oh)return 0 ; } + +/* +* XXX This function is a temporary compatibility wrapper - only +* needed until the I2C driver can be converted to call +* omap_pm_set_max_dev_wakeup_lat() and handle a return code. +*/ +static void omap_pm_set_max_mpu_wakeup_lat_compat (struct device *dev,long t) +{ +omap_pm_set_max_mpu_wakeup_lat (dev, t); +} + +static const char name[] ="omap_i2c" ; + +int __init omap_i2c_add_bus (struct omap_i2c_bus_platform_data *i2c_pdata, +int bus_id) +{ +int l; +struct omap_hwmod *oh; +struct platform_device *pdev; +char oh_name[MAX_OMAP_I2C_HWMOD_NAME_LEN ]; +struct omap_i2c_bus_platform_data *pdata; +struct omap_i2c_dev_attr *dev_attr; + +omap2_i2c_mux_pins (bus_id); + + l =snprintf (oh_name,MAX_OMAP_I2C_HWMOD_NAME_LEN ,"i2c%d" , bus_id); +WARN (l >=MAX_OMAP_I2C_HWMOD_NAME_LEN , +"String buffer overflow in I2C%d device setup\n" , bus_id); + oh =omap_hwmod_lookup (oh_name); +if (!oh) { +pr_err ("Could not look up %s\n" , oh_name); +return -EEXIST ; + } + + pdata = i2c_pdata; +/* +* pass the hwmod class's CPU-specific knowledge of I2C IP revision in +* use, and functionality implementation flags, up to the OMAP I2C +* driver via platform data +*/ + pdata->rev = oh->class->rev; + + dev_attr = (struct omap_i2c_dev_attr *)oh->dev_attr; + pdata->flags = dev_attr->flags;
arch/arm/mach-omap2/i2c.c int omap_i2c_reset(struct omap_hwmod *oh) · line 166
Quoted 10 lines
arch/arm/mach-omap2/i2c.c +10
-0+ +/* +* When waiting for completion of a i2c transfer, we need to +* set a wake up latency constraint for the MPU. This is to +* ensure quick enough wakeup from idle, when transfer +* completes. +* Only omap3 has support for constraints +*/ +if (cpu_is_omap34xx ()) + pdata->set_mpu_wkup_lat = omap_pm_set_max_mpu_wakeup_lat_compat;
this part is touched by Jean also so maybe one of the patch has to be rebased.
Quoted 2 lines
arch/arm/mach-omap2/i2c.c +1
-0+ pdev = omap_device_build(name, bus_id, oh, pdata,
Tony Lindgren
maintainerPATCH 3/16 ARM: OMAP: Make plat/common.h local to mach-omap1 and mach-omap2
In reply to Tony LindgrenWe cannot keep this in plat/common.h for common zImage support.
Signed-off-by Tony Lindgren <[email protected]>
---
arch/arm/mach-omap1/common.h | 2 +-
arch/arm/mach-omap2/cm33xx.c | 2 +-
arch/arm/mach-omap2/common.h | 2 +-
.../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 +-
arch/arm/mach-omap2/prm33xx.c | 2 +-
arch/arm/mach-omap2/prm_common.c | 2 +-
arch/arm/plat-omap/common.c | 2 +-
arch/arm/plat-omap/common.h | 7 ++-----
arch/arm/plat-omap/counter_32k.c | 2 +-
10 files changed, 11 insertions(+), 14 deletions(-)
rename arch/arm/plat-omap/{include/plat/common.h => common.h} (92%)arch/arm/mach-omap1/common.h +1 -1
@@ -26,7 +26,7 @@#ifndef __ARCH_ARM_MACH_OMAP1_COMMON_H#define __ARCH_ARM_MACH_OMAP1_COMMON_H -#include <plat/common.h> +#include "../plat-omap/common.h" #include <linux/mtd/mtd.h> #include <linux/i2c-omap.h>
arch/arm/mach-omap2/cm33xx.c +1 -1
@@ -22,7 +22,7 @@#include <linux/err.h> #include <linux/io.h> -#include <plat/common.h> +#include "../plat-omap/common.h" #include "cm.h" #include "cm33xx.h"
arch/arm/mach-omap2/common.h +1 -1
@@ -36,7 +36,7 @@#include <plat/cpu.h> #include <plat/serial.h> -#include <plat/common.h> +#include "../plat-omap/common.h" #include "i2c.h"
arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c +1 -1
@@ -12,7 +12,7 @@#include <plat/omap_hwmod.h> #include <plat/serial.h> #include <plat/dma.h> -#include <plat/common.h> +#include "../plat-omap/common.h" #include "hdq1w.h" #include "omap_hwmod_common_data.h"
arch/arm/mach-omap2/omap_hwmod_44xx_data.c +1 -1
@@ -29,8 +29,8 @@#include <linux/platform_data/asoc-ti-mcbsp.h> #include <plat/mmc.h> #include <plat/dmtimer.h> -#include <plat/common.h> #include <plat/iommu.h> +#include "../plat-omap/common.h" #include "omap_hwmod_common_data.h" #include "cm1_44xx.h"
arch/arm/mach-omap2/prm33xx.c +1 -1
@@ -19,7 +19,7 @@#include <linux/err.h> #include <linux/io.h> -#include <plat/common.h> +#include "../plat-omap/common.h" #include "common.h" #include "prm33xx.h"
arch/arm/mach-omap2/prm_common.c +1 -1
@@ -24,7 +24,7 @@#include <linux/interrupt.h> #include <linux/slab.h> -#include <plat/common.h> +#include "../plat-omap/common.h" #include <plat/prcm.h> #include "prm2xxx_3xxx.h"
arch/arm/plat-omap/common.c +1 -1
@@ -16,7 +16,7 @@#include <linux/io.h> #include <linux/dma-mapping.h> -#include <plat/common.h> +#include "common.h" #include <plat/vram.h> #include <linux/platform_data/dsp-omap.h> #include <plat/dma.h>
arch/arm/plat-omap/common.h renamed from arch/arm/plat-omap/include/plat/common.h +2 -5
@@ -1,7 +1,5 @@/* -* arch/arm/plat-omap/include/mach/common.h -* -* Header for code common to all OMAP machines. +* Header for shared OMAP code in plat-omap. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the
@@ -27,13 +25,12 @@#ifndef __ARCH_ARM_MACH_OMAP_COMMON_H#define __ARCH_ARM_MACH_OMAP_COMMON_H -#include <plat/omap_hwmod.h> -extern int __init omap_init_clocksource_32k (void __iomem *vbase);extern void __init omap_check_revision (void );extern void omap_reserve (void ); +struct omap_hwmod ;extern int omap_dss_reset (struct omap_hwmod *);void omap_sram_init (void );
arch/arm/plat-omap/counter_32k.c +1 -1
@@ -22,7 +22,7 @@#include <asm/mach/time.h> #include <asm/sched_clock.h> -#include <plat/common.h> +#include "common.h" #include <plat/clock.h> /* OMAP2_32KSYNCNT_CR_OFF: offset of 32ksync counter register */
Tony Lindgren
maintainerPATCH 4/16 ARM: OMAP: Make plat/fpga.h local to arch/arm/plat-omap
In reply to Tony LindgrenThere's no need to have this file in plat/fpga.h. We can make it local to plat-omap replacing fpga_read/write functions directly with readb/writeb as that's how they are already defined in fpga.h.
Note that 2420 based H4 is also using the fpga, so let's keep the led support around in plat-omap until we flip over mach-omap2 to device tree.
Cc Tomi Valkeinen <[email protected]>
Cc Florian Tobias Schandinat <[email protected]>
Cc linux-fbdev at vger.kernel.org
Cc Felipe Balbi <[email protected]>
Cc linux-usb at vger.kernel.org
Signed-off-by Tony Lindgren <[email protected]>
--- arch/arm/mach-omap1/board-fsample.c | 6 - arch/arm/mach-omap1/board-innovator.c | 26 ++-- arch/arm/mach-omap1/board-perseus2.c | 6 - arch/arm/mach-omap1/common.h | 1 arch/arm/mach-omap1/fpga.c | 2 arch/arm/mach-omap1/include/mach/omap1510.h | 113 ++++++++++++++++ arch/arm/mach-omap1/serial.c | 1 arch/arm/plat-omap/debug-leds.c | 2 arch/arm/plat-omap/fpga.h | 74 ++++++++++ arch/arm/plat-omap/include/plat/fpga.h | 193 --------------------------- drivers/usb/host/ohci-omap.c | 5 - drivers/video/omap/lcd_inn1510.c | 7 + 12 files changed, 216 insertions(+), 220 deletions(-) create mode 100644 arch/arm/plat-omap/fpga.h delete mode 100644 arch/arm/plat-omap/include/plat/fpga.h
arch/arm/mach-omap1/board-fsample.c +3 -3
@@ -30,7 +30,7 @@#include <plat/tc.h> #include <mach/mux.h> #include <mach/flash.h> -#include <plat/fpga.h> +#include <../plat-omap/fpga.h> #include <linux/platform_data/keypad-omap.h> #include <mach/hardware.h>
@@ -123,9 +123,9 @@ static struct resource smc91x_resources[] = {static void __init fsample_init_smc91x (void ) { -fpga_write (1 ,H2P2_DBG_FPGA_LAN_RESET ); +__raw_writeb (1 ,H2P2_DBG_FPGA_LAN_RESET );mdelay (50 ); -fpga_write (fpga_read (H2P2_DBG_FPGA_LAN_RESET ) & ~1 , +__raw_writeb (__raw_readb (H2P2_DBG_FPGA_LAN_RESET ) & ~1 ,H2P2_DBG_FPGA_LAN_RESET );mdelay (50 ); }
arch/arm/mach-omap1/board-innovator.c +14 -12
@@ -33,7 +33,7 @@#include <mach/mux.h> #include <mach/flash.h> -#include <plat/fpga.h> +#include <../plat-omap/fpga.h> #include <plat/tc.h> #include <linux/platform_data/keypad-omap.h> #include <plat/mmc.h>
@@ -215,7 +215,7 @@ static struct platform_device *innovator1510_devices[] __initdata = {static int innovator_get_pendown_state (void ) { -return !(fpga_read (OMAP1510_FPGA_TOUCHSCREEN ) & (1 <<5 )); +return !(__raw_readb (OMAP1510_FPGA_TOUCHSCREEN ) & (1 <<5 )); }static const struct ads7846_platform_data innovator1510_ts_info = {
@@ -279,7 +279,7 @@ static struct platform_device *innovator1610_devices[] __initdata = {static void __init innovator_init_smc91x (void ) {if (cpu_is_omap1510 ()) { -fpga_write (fpga_read (OMAP1510_FPGA_RST ) & ~1 , +__raw_writeb (__raw_readb (OMAP1510_FPGA_RST ) & ~1 ,OMAP1510_FPGA_RST );udelay (750 ); }else {
@@ -335,10 +335,10 @@ static int mmc_set_power(struct device *dev, int slot, int power_on, int vdd) {if (power_on) -fpga_write (fpga_read (OMAP1510_FPGA_POWER ) | (1 <<3 ), +__raw_writeb (__raw_readb (OMAP1510_FPGA_POWER ) | (1 <<3 ),OMAP1510_FPGA_POWER );else -fpga_write (fpga_read (OMAP1510_FPGA_POWER ) & ~(1 <<3 ), +__raw_writeb (__raw_readb (OMAP1510_FPGA_POWER ) & ~(1 <<3 ),OMAP1510_FPGA_POWER );return 0 ;
@@ -390,14 +390,14 @@ static void __init innovator_init(void)omap_cfg_reg (UART3_TX );omap_cfg_reg (UART3_RX ); - reg =fpga_read (OMAP1510_FPGA_POWER ); + reg =__raw_readb (OMAP1510_FPGA_POWER ); reg |=OMAP1510_FPGA_PCR_COM1_EN ; -fpga_write (reg,OMAP1510_FPGA_POWER ); +__raw_writeb (reg,OMAP1510_FPGA_POWER );udelay (10 ); - reg =fpga_read (OMAP1510_FPGA_POWER ); + reg =__raw_readb (OMAP1510_FPGA_POWER ); reg |=OMAP1510_FPGA_PCR_COM2_EN ; -fpga_write (reg,OMAP1510_FPGA_POWER ); +__raw_writeb (reg,OMAP1510_FPGA_POWER );udelay (10 );platform_add_devices (innovator1510_devices,ARRAY_SIZE (innovator1510_devices));
@@ -437,6 +437,7 @@ static void __init innovator_init(void)*/ static void __init innovator_map_io (void ) { +#ifdef CONFIG_ARCH_OMAP15XX omap15xx_map_io ();iotable_init (innovator1510_io_desc,ARRAY_SIZE (innovator1510_io_desc));
@@ -444,9 +445,10 @@ static void __init innovator_map_io(void)/* Dump the Innovator FPGA rev early - useful info for support. */ pr_debug ("Innovator FPGA Rev %d.%d Board Rev %d\n" , -fpga_read (OMAP1510_FPGA_REV_HIGH ), -fpga_read (OMAP1510_FPGA_REV_LOW ), -fpga_read (OMAP1510_FPGA_BOARD_REV )); +__raw_readb (OMAP1510_FPGA_REV_HIGH ), +__raw_readb (OMAP1510_FPGA_REV_LOW ), +__raw_readb (OMAP1510_FPGA_BOARD_REV )); +#endif }MACHINE_START (OMAP_INNOVATOR ,"TI-Innovator" )
arch/arm/mach-omap1/board-perseus2.c +3 -3
@@ -30,7 +30,7 @@#include <plat/tc.h> #include <mach/mux.h> -#include <plat/fpga.h> +#include <../plat-omap/fpga.h> #include <mach/flash.h> #include <mach/hardware.h>
@@ -231,9 +231,9 @@ static struct omap_lcd_config perseus2_lcd_config __initdata = {static void __init perseus2_init_smc91x (void ) { -fpga_write (1 ,H2P2_DBG_FPGA_LAN_RESET ); +__raw_writeb (1 ,H2P2_DBG_FPGA_LAN_RESET );mdelay (50 ); -fpga_write (fpga_read (H2P2_DBG_FPGA_LAN_RESET ) & ~1 , +__raw_writeb (__raw_readb (H2P2_DBG_FPGA_LAN_RESET ) & ~1 ,H2P2_DBG_FPGA_LAN_RESET );mdelay (50 ); }
arch/arm/mach-omap1/common.h +1 -0
@@ -41,6 +41,7 @@ static inline void omap7xx_map_io(void)#endif #ifdef CONFIG_ARCH_OMAP15XX +void omap1510_fpga_init_irq (void );void omap15xx_map_io (void );#else static inline void omap15xx_map_io (void )
arch/arm/mach-omap1/fpga.c +1 -1
@@ -27,7 +27,7 @@#include <asm/irq.h> #include <asm/mach/irq.h> -#include <plat/fpga.h> +#include <../plat-omap/fpga.h> #include <mach/hardware.h>
arch/arm/mach-omap1/include/mach/omap1510.h +113 -0
118 lines not on this page · raw message
arch/arm/mach-omap1/serial.c +0 -1
@@ -23,7 +23,6 @@#include <asm/mach-types.h> #include <mach/mux.h> -#include <plat/fpga.h> #include "pm.h"
arch/arm/plat-omap/debug-leds.c +1 -1
@@ -20,7 +20,7 @@#include <mach/hardware.h> #include <asm/mach-types.h> -#include <plat/fpga.h> +#include "fpga.h" /* Many OMAP development platforms reuse the same "debug board"; these * platforms include H2, H3, H4, and Perseus2. There are 16 LEDs on the
arch/arm/plat-omap/fpga.h new file +74 -0
74 lines not on this page · raw message
arch/arm/plat-omap/include/plat/fpga.h deleted +0 -193
193 lines not on this page · raw message
drivers/usb/host/ohci-omap.c +2 -3
@@ -25,7 +25,6 @@#include <asm/mach-types.h> #include <mach/mux.h> -#include <plat/fpga.h> #include <mach/hardware.h> #include <mach/irqs.h>
@@ -93,14 +92,14 @@ static int omap_ohci_transceiver_power(int on) {if (on) {if (machine_is_omap_innovator () &&cpu_is_omap1510 ()) -fpga_write (fpga_read (INNOVATOR_FPGA_CAM_USB_CONTROL ) +__raw_writeb (__raw_readb (INNOVATOR_FPGA_CAM_USB_CONTROL ) | ((1 <<5 /*usb1*/ ) | (1 <<3 /*usb2*/ )),INNOVATOR_FPGA_CAM_USB_CONTROL );else if (machine_is_omap_osk ())tps65010_set_gpio_out_value (GPIO1 ,LOW ); }else {if (machine_is_omap_innovator () &&cpu_is_omap1510 ()) -fpga_write (fpga_read (INNOVATOR_FPGA_CAM_USB_CONTROL ) +__raw_writeb (__raw_readb (INNOVATOR_FPGA_CAM_USB_CONTROL ) & ~((1 <<5 /*usb1*/ ) | (1 <<3 /*usb2*/ )),INNOVATOR_FPGA_CAM_USB_CONTROL );else if (machine_is_omap_osk ())
drivers/video/omap/lcd_inn1510.c +4 -3
@@ -23,7 +23,8 @@#include <linux/platform_device.h> #include <linux/io.h> -#include <plat/fpga.h> +#include <mach/hardware.h> +#include "omapfb.h" static int innovator1510_panel_init(struct lcd_panel *panel,
@@ -38,13 +39,13 @@ static void innovator1510_panel_cleanup(struct lcd_panel *panel)static int innovator1510_panel_enable (struct lcd_panel *panel) { -fpga_write (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) { -fpga_write (0x0 ,OMAP1510_FPGA_LCD_PANEL_CONTROL ); +__raw_writeb (0x0 ,OMAP1510_FPGA_LCD_PANEL_CONTROL ); }static unsigned long innovator1510_panel_get_caps (struct lcd_panel *panel)
Tony Lindgren
maintainerPATCH 5/16 ARM: OMAP1: Move plat/tc.h to mach/tc.h for omap1
In reply to Tony LindgrenWe cannot keep this in plat as it causes problems with the ARM single zImage support.
Cc Felipe Balbi <[email protected]>
Cc linux-pcmcia at lists.infradead.org
Signed-off-by Tony Lindgren <[email protected]>
---
arch/arm/mach-omap1/board-fsample.c | 2 +-
arch/arm/mach-omap1/board-h2.c | 2 +-
arch/arm/mach-omap1/board-h3.c | 2 +-
arch/arm/mach-omap1/board-innovator.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-perseus2.c | 2 +-
arch/arm/mach-omap1/board-sx1.c | 2 +-
arch/arm/mach-omap1/board-voiceblue.c | 2 +-
arch/arm/mach-omap1/devices.c | 2 +-
arch/arm/mach-omap1/dma.c | 2 +-
arch/arm/mach-omap1/flash.c | 2 +-
arch/arm/mach-omap1/include/mach/hardware.h | 2 +-
arch/arm/mach-omap1/include/mach/tc.h | 0
arch/arm/mach-omap1/io.c | 2 +-
arch/arm/mach-omap1/pm.c | 2 +-
arch/arm/mach-omap2/board-flash.c | 1 -
arch/arm/plat-omap/dma.c | 24 ++++++++++++++----------
drivers/pcmcia/omap_cf.c | 2 +-
21 files changed, 32 insertions(+), 29 deletions(-)
rename arch/arm/{plat-omap/include/plat/tc.h => mach-omap1/include/mach/tc.h} (100%)arch/arm/mach-omap1/board-fsample.c +1 -1
@@ -27,7 +27,7 @@#include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <plat/tc.h> +#include <mach/tc.h> #include <mach/mux.h> #include <mach/flash.h> #include <../plat-omap/fpga.h>
arch/arm/mach-omap1/board-h2.c +1 -1
@@ -40,7 +40,7 @@#include <mach/mux.h> #include <plat/dma.h> -#include <plat/tc.h> +#include <mach/tc.h> #include <mach/irda.h> #include <linux/platform_data/keypad-omap.h> #include <mach/flash.h>
arch/arm/mach-omap1/board-h3.c +1 -1
@@ -41,7 +41,7 @@#include <asm/mach/map.h> #include <mach/mux.h> -#include <plat/tc.h> +#include <mach/tc.h> #include <linux/platform_data/keypad-omap.h> #include <plat/dma.h> #include <mach/flash.h>
arch/arm/mach-omap1/board-innovator.c +1 -1
@@ -34,7 +34,7 @@#include <mach/mux.h> #include <mach/flash.h> #include <../plat-omap/fpga.h> -#include <plat/tc.h> +#include <mach/tc.h> #include <linux/platform_data/keypad-omap.h> #include <plat/mmc.h>
arch/arm/mach-omap1/board-osk.c +1 -1
@@ -48,7 +48,7 @@#include <mach/flash.h> #include <mach/mux.h> -#include <plat/tc.h> +#include <mach/tc.h> #include <mach/hardware.h> #include <mach/usb.h>
arch/arm/mach-omap1/board-palmte.c +1 -1
@@ -36,7 +36,7 @@#include <mach/flash.h> #include <mach/mux.h> -#include <plat/tc.h> +#include <mach/tc.h> #include <plat/dma.h> #include <mach/irda.h> #include <linux/platform_data/keypad-omap.h>
arch/arm/mach-omap1/board-palmtt.c +1 -1
@@ -37,7 +37,7 @@#include <mach/flash.h> #include <mach/mux.h> #include <plat/dma.h> -#include <plat/tc.h> +#include <mach/tc.h> #include <mach/irda.h> #include <linux/platform_data/keypad-omap.h>
arch/arm/mach-omap1/board-palmz71.c +1 -1
@@ -39,7 +39,7 @@#include <mach/flash.h> #include <mach/mux.h> #include <plat/dma.h> -#include <plat/tc.h> +#include <mach/tc.h> #include <mach/irda.h> #include <linux/platform_data/keypad-omap.h>
arch/arm/mach-omap1/board-perseus2.c +1 -1
@@ -28,7 +28,7 @@#include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <plat/tc.h> +#include <mach/tc.h> #include <mach/mux.h> #include <../plat-omap/fpga.h> #include <mach/flash.h>
arch/arm/mach-omap1/board-sx1.c +1 -1
@@ -38,7 +38,7 @@#include <mach/mux.h> #include <plat/dma.h> #include <mach/irda.h> -#include <plat/tc.h> +#include <mach/tc.h> #include <mach/board-sx1.h> #include <mach/hardware.h>
arch/arm/mach-omap1/board-voiceblue.c +1 -1
@@ -34,7 +34,7 @@#include <mach/board-voiceblue.h> #include <mach/flash.h> #include <mach/mux.h> -#include <plat/tc.h> +#include <mach/tc.h> #include <mach/hardware.h> #include <mach/usb.h>
arch/arm/mach-omap1/devices.c +1 -1
@@ -19,7 +19,7 @@#include <asm/mach/map.h> -#include <plat/tc.h> +#include <mach/tc.h> #include <mach/mux.h> #include <plat/dma.h> #include <plat/mmc.h>
arch/arm/mach-omap1/dma.c +1 -1
@@ -26,7 +26,7 @@#include <linux/io.h> #include <plat/dma.h> -#include <plat/tc.h> +#include <mach/tc.h> #include <mach/irqs.h>
arch/arm/mach-omap1/flash.c +1 -1
@@ -10,7 +10,7 @@#include <linux/mtd/mtd.h> #include <linux/mtd/map.h> -#include <plat/tc.h> +#include <mach/tc.h> #include <mach/flash.h> #include <mach/hardware.h>
arch/arm/mach-omap1/include/mach/hardware.h +1 -1
@@ -51,7 +51,7 @@ extern void omap_writeb(u8 v, u32 pa);extern void omap_writew (u16 v,u32 pa);extern void omap_writel (u32 v,u32 pa); -#include <plat/tc.h> +#include <mach/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/include/mach/tc.h renamed from arch/arm/plat-omap/include/plat/tc.h +0 -0
arch/arm/mach-omap1/io.c +1 -1
@@ -17,7 +17,7 @@#include <asm/mach/map.h> #include <mach/mux.h> -#include <plat/tc.h> +#include <mach/tc.h> #include <plat/dma.h> #include "iomap.h"
arch/arm/mach-omap1/pm.c +1 -1
@@ -52,7 +52,7 @@#include <plat/cpu.h> #include <plat/clock.h> #include <plat/sram.h> -#include <plat/tc.h> +#include <mach/tc.h> #include <mach/mux.h> #include <plat/dma.h> #include <plat/dmtimer.h>
arch/arm/mach-omap2/board-flash.c +0 -1
@@ -21,7 +21,6 @@#include <plat/gpmc.h> #include <linux/platform_data/mtd-nand-omap2.h> #include <linux/platform_data/mtd-onenand-omap2.h> -#include <plat/tc.h> #include "common.h" #include "board-flash.h"
arch/arm/plat-omap/dma.c +14 -10
@@ -38,7 +38,6 @@#include <plat/cpu.h> #include <plat/dma.h> -#include <plat/tc.h> /* * MAX_LOGICAL_DMA_CH_COUNT: the maximum number of logical DMA
@@ -175,6 +174,7 @@ static inline void set_gdma_dev(int req, int dev)#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) {unsigned long reg;
@@ -203,18 +203,22 @@ void omap_set_dma_priority(int lch, int dst_port, int priority) l |= (priority &0xf ) <<8 ; omap_writel(l, reg); } +} +#endif -if (cpu_class_is_omap2 ()) { -u32 ccr; +#ifdef CONFIG_ARCH_OMAP2PLUS +void omap_set_dma_priority (int lch,int dst_port,int priority) +{ +u32 ccr; - ccr = p->dma_read (CCR , lch); -if (priority) - ccr |= (1 <<6 ); -else - ccr &= ~(1 <<6 ); - p->dma_write (ccr,CCR , lch); - } + ccr = p->dma_read (CCR , lch); +if (priority) + ccr |= (1 <<6 ); +else + ccr &= ~(1 <<6 ); + p->dma_write (ccr,CCR , lch); } +#endif EXPORT_SYMBOL (omap_set_dma_priority); void omap_set_dma_transfer_params(int lch, int data_type, int elem_count,
drivers/pcmcia/omap_cf.c +1 -1
@@ -25,7 +25,7 @@#include <asm/sizes.h> #include <mach/mux.h> -#include <plat/tc.h> +#include <mach/tc.h> /* NOTE: don't expect this to support many I/O cards. The 16xx chips have
Tony Lindgren
maintainerPATCH 6/16 ARM: OMAP: Move plat/led.h to include/linux/platform_data
In reply to Tony LindgrenWe need to move this away from plat for ARM common zImage support.
Signed-off-by Tony Lindgren <[email protected]>
--- arch/arm/mach-omap1/board-palmtt.c | 2 +- arch/arm/mach-omap2/board-apollon.c | 2 +- include/linux/platform_data/leds-omap.h | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) rename arch/arm/plat-omap/include/plat/led.h => include/linux/platform_data/leds-omap.h (91%)
arch/arm/mach-omap1/board-palmtt.c +1 -1
@@ -28,12 +28,12 @@#include <linux/spi/spi.h> #include <linux/spi/ads7846.h> #include <linux/platform_data/omap1_bl.h> +#include <linux/platform_data/leds-omap.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <plat/led.h> #include <mach/flash.h> #include <mach/mux.h> #include <plat/dma.h>
arch/arm/mach-omap2/board-apollon.c +1 -1
@@ -28,12 +28,12 @@#include <linux/clk.h> #include <linux/smc91x.h> #include <linux/gpio.h> +#include <linux/platform_data/leds-omap.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/flash.h> -#include <plat/led.h> #include "common.h" #include <plat/gpmc.h>
include/linux/platform_data/leds-omap.h renamed from arch/arm/plat-omap/include/plat/led.h +0 -2
@@ -1,6 +1,4 @@/* -* arch/arm/plat-omap/include/mach/led.h -* * Copyright (C) 2006 Samsung Electronics * Kyungmin Park <[email protected]> *
Tony Lindgren
maintainerPATCH 7/16 ARM: OMAP: Make plat/sram.h local to plat-omap
In reply to Tony LindgrenWe can move this from plat to be local to plat-omap for common ARM zImage support.
Signed-off-by Tony Lindgren <[email protected]>
--- arch/arm/mach-omap1/clock.c | 3 - arch/arm/mach-omap1/clock_data.c | 3 - arch/arm/mach-omap1/devices.c | 2 arch/arm/mach-omap1/pm.c | 3 - arch/arm/mach-omap2/clkt2xxx_dpllcore.c | 3 - arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 3 - arch/arm/mach-omap2/clkt34xx_dpll3m2.c | 3 - arch/arm/mach-omap2/io.c | 3 - arch/arm/mach-omap2/omap4-common.c | 4 - arch/arm/mach-omap2/pm24xx.c | 3 - arch/arm/mach-omap2/pm34xx.c | 3 - arch/arm/mach-omap2/sdrc.c | 2 arch/arm/mach-omap2/sdrc2xxx.c | 2 arch/arm/mach-omap2/sleep34xx.S | 2 arch/arm/plat-omap/common.h | 2 arch/arm/plat-omap/include/plat/sram.h | 105 ------------------------- arch/arm/plat-omap/sram.c | 1 arch/arm/plat-omap/sram.h | 109 +++++++++++++++++++++++++- 18 files changed, 130 insertions(+), 126 deletions(-) delete mode 100644 arch/arm/plat-omap/include/plat/sram.h
arch/arm/mach-omap1/clock.c +2 -1
@@ -24,11 +24,12 @@#include <plat/cpu.h> #include <plat/usb.h> #include <plat/clock.h> -#include <plat/sram.h> #include <plat/clkdev_omap.h> #include <mach/hardware.h> +#include "../plat-omap/sram.h" +#include "iomap.h" #include "clock.h" #include "opp.h"
arch/arm/mach-omap1/clock_data.c +2 -1
@@ -25,11 +25,12 @@#include <plat/clock.h> #include <plat/cpu.h> #include <plat/clkdev_omap.h> -#include <plat/sram.h> /* for omap_sram_reprogram_clock() */ #include <mach/hardware.h> #include <mach/usb.h> /* for OTG_BASE */ +#include "../plat-omap/sram.h" +#include "iomap.h" #include "clock.h"
arch/arm/mach-omap1/devices.c +2 -0
@@ -28,6 +28,8 @@#include <mach/camera.h> #include <mach/hardware.h> +#include "../plat-omap/sram.h" +#include "common.h" #include "clock.h"
arch/arm/mach-omap1/pm.c +2 -1
@@ -51,7 +51,6 @@#include <plat/cpu.h> #include <plat/clock.h> -#include <plat/sram.h> #include <mach/tc.h> #include <mach/mux.h> #include <plat/dma.h>
@@ -59,6 +58,8 @@#include <mach/irqs.h> +#include "../plat-omap/sram.h" +#include "iomap.h" #include "pm.h"
arch/arm/mach-omap2/clkt2xxx_dpllcore.c +2 -1
@@ -26,9 +26,10 @@#include <linux/io.h> #include <plat/clock.h> -#include <plat/sram.h> #include <plat/sdrc.h> +#include "../plat-omap/sram.h" +#include "clock.h" #include "clock2xxx.h" #include "opp2xxx.h"
arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c +2 -1
@@ -34,9 +34,10 @@#include <linux/slab.h> #include <plat/clock.h> -#include <plat/sram.h> #include <plat/sdrc.h> +#include "../plat-omap/sram.h" +#include "soc.h" #include "clock.h" #include "clock2xxx.h"
arch/arm/mach-omap2/clkt34xx_dpll3m2.c +2 -1
@@ -22,9 +22,10 @@#include <linux/io.h> #include <plat/clock.h> -#include <plat/sram.h> #include <plat/sdrc.h> +#include "../plat-omap/sram.h" +#include "clock.h" #include "clock3xxx.h" #include "clock34xx.h"
arch/arm/mach-omap2/io.c +2 -1
@@ -25,7 +25,6 @@#include <asm/tlb.h> #include <asm/mach/map.h> -#include <plat/sram.h> #include <plat/sdrc.h> #include <plat/serial.h> #include <plat/omap-pm.h>
@@ -33,6 +32,8 @@#include <plat/multi.h> #include <plat/dma.h> +#include "../plat-omap/sram.h" +#include "soc.h" #include "iomap.h" #include "voltage.h"
arch/arm/mach-omap2/omap4-common.c +2 -2
@@ -25,12 +25,12 @@#include <asm/mach/map.h> #include <asm/memblock.h> -#include <plat/sram.h> #include <plat/omap-secure.h> #include <plat/mmc.h> -#include "omap-wakeupgen.h" +#include "../plat-omap/sram.h" +#include "omap-wakeupgen.h" #include "soc.h" #include "common.h" #include "hsmmc.h"
arch/arm/mach-omap2/pm24xx.c +2 -1
@@ -37,9 +37,10 @@#include <asm/system_misc.h> #include <plat/clock.h> -#include <plat/sram.h> #include <plat/dma.h> +#include "../plat-omap/sram.h" +#include "common.h" #include "prm2xxx_3xxx.h" #include "prm-regbits-24xx.h"
arch/arm/mach-omap2/pm34xx.c +2 -1
@@ -35,7 +35,6 @@#include <asm/suspend.h> #include <asm/system_misc.h> -#include <plat/sram.h> #include "clockdomain.h" #include "powerdomain.h" #include <plat/sdrc.h>
@@ -43,6 +42,8 @@#include <plat/gpmc.h> #include <plat/dma.h> +#include "../plat-omap/sram.h" +#include "common.h" #include "cm2xxx_3xxx.h" #include "cm-regbits-34xx.h"
arch/arm/mach-omap2/sdrc.c +1 -1
@@ -25,7 +25,7 @@#include "common.h" #include <plat/clock.h> -#include <plat/sram.h> +#include "../plat-omap/sram.h" #include <plat/sdrc.h> #include "sdrc.h"
arch/arm/mach-omap2/sdrc2xxx.c +1 -1
@@ -25,7 +25,7 @@#include <linux/io.h> #include <plat/clock.h> -#include <plat/sram.h> +#include "../plat-omap/sram.h" #include <plat/sdrc.h> #include "soc.h"
arch/arm/mach-omap2/sleep34xx.S +1 -1
@@ -26,7 +26,7 @@ #include <asm/assembler.h> -#include <plat/sram.h> +#include "../plat-omap/sram.h" #include "omap34xx.h" #include "iomap.h"
arch/arm/plat-omap/common.h +0 -2
@@ -33,6 +33,4 @@ extern void omap_reserve(void);struct omap_hwmod ;extern int omap_dss_reset (struct omap_hwmod *); -void omap_sram_init (void ); -#endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */
arch/arm/plat-omap/include/plat/sram.h deleted +0 -105
105 lines not on this page · raw message
arch/arm/plat-omap/sram.c +0 -1
@@ -25,7 +25,6 @@#include <asm/mach/map.h> -#include <plat/sram.h> #include <plat/cpu.h> #include "sram.h"
arch/arm/plat-omap/sram.h +105 -4
111 lines not on this page · raw message
PATCH 7/16 ARM: OMAP: Make plat/sram.h local to plat-omap
Hi Tony,
Quoted 31 lines · Tony Lindgren
We can move this from plat to be local to plat-omap for common ARM zImage support.
Signed-off-by Tony Lindgren <[email protected]>--- arch/arm/mach-omap1/clock.c | 3 - arch/arm/mach-omap1/clock_data.c | 3 - arch/arm/mach-omap1/devices.c | 2 arch/arm/mach-omap1/pm.c | 3 - arch/arm/mach-omap2/clkt2xxx_dpllcore.c | 3 - arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 3 - arch/arm/mach-omap2/clkt34xx_dpll3m2.c | 3 - arch/arm/mach-omap2/io.c | 3 - arch/arm/mach-omap2/omap4-common.c | 4 - arch/arm/mach-omap2/pm24xx.c | 3 - arch/arm/mach-omap2/pm34xx.c | 3 - arch/arm/mach-omap2/sdrc.c | 2 arch/arm/mach-omap2/sdrc2xxx.c | 2 arch/arm/mach-omap2/sleep34xx.S | 2 arch/arm/plat-omap/common.h | 2 arch/arm/plat-omap/include/plat/sram.h | 105 ------------------------- arch/arm/plat-omap/sram.c | 1 arch/arm/plat-omap/sram.h | 109 +++++++++++++++++++++++++- 18 files changed, 130 insertions(+), 126 deletions(-) delete mode 100644 arch/arm/plat-omap/include/plat/sram.harch/arm/mach-omap1/clock.c +0
-0
arch/arm/mach-omap1/clock.c line 31
Quoted 9 lines
arch/arm/mach-omap1/clock.c +1
-1@@ -24,11 +24,12 @@#include <plat/cpu.h> #include <plat/usb.h> #include <plat/clock.h> -#include <plat/sram.h> #include <plat/clkdev_omap.h> #include <mach/hardware.h> +#include "../plat-omap/sram.h"
Any reason why you did not put this in arch/arm/plat-omap/include/plat-omap/ like we were discussing for dma and dmtimers headers? Then it can be just "#include <plat-omap/sram.h>". Just curious ...
Cheers
Jon
Tony Lindgren
maintainerPATCH 7/16 ARM: OMAP: Make plat/sram.h local to plat-omap
Quoted 40 lines · Jon Hunter
Hi Tony,
Quoted 37 lines · Tony Lindgren
We can move this from plat to be local to plat-omap for common ARM zImage support.
Signed-off-by Tony Lindgren <[email protected]>--- arch/arm/mach-omap1/clock.c | 3 - arch/arm/mach-omap1/clock_data.c | 3 - arch/arm/mach-omap1/devices.c | 2 arch/arm/mach-omap1/pm.c | 3 - arch/arm/mach-omap2/clkt2xxx_dpllcore.c | 3 - arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 3 - arch/arm/mach-omap2/clkt34xx_dpll3m2.c | 3 - arch/arm/mach-omap2/io.c | 3 - arch/arm/mach-omap2/omap4-common.c | 4 - arch/arm/mach-omap2/pm24xx.c | 3 - arch/arm/mach-omap2/pm34xx.c | 3 - arch/arm/mach-omap2/sdrc.c | 2 arch/arm/mach-omap2/sdrc2xxx.c | 2 arch/arm/mach-omap2/sleep34xx.S | 2 arch/arm/plat-omap/common.h | 2 arch/arm/plat-omap/include/plat/sram.h | 105 ------------------------- arch/arm/plat-omap/sram.c | 1 arch/arm/plat-omap/sram.h | 109 +++++++++++++++++++++++++- 18 files changed, 130 insertions(+), 126 deletions(-) delete mode 100644 arch/arm/plat-omap/include/plat/sram.harch/arm/mach-omap1/clock.c +0
-1@@ -24,11 +24,12 @@#include <plat/cpu.h> #include <plat/usb.h> #include <plat/clock.h> -#include <plat/sram.h> #include <plat/clkdev_omap.h>
Quoted 8 lines
arch/arm/mach-omap1/clock.c line 31
Quoted 3 lines
arch/arm/mach-omap1/clock.c +1
-0#include <mach/hardware.h> +#include "../plat-omap/sram.h" Any reason why you did not put this in
arch/arm/plat-omap/include/plat-omap/like we were discussing for dma and dmtimers headers? Then it can be just "#include <plat-omap/sram.h>". Just curious ...
Because plat-omap/sram.h is still available for (mis)use by drivers and there's no need to expose it.
Eventually our plat-omap/sram.c will be converted to be just a device driver using the common sram driver. Then it will need a local sram.h and include/platform_data/sram-omap.h for the legacy non-dt boot.
Regards,
Tony
Tony Lindgren
maintainerPATCH 8/16 ARM: OMAP2: Move plat/menelaus.h to linux/mfd/menelaus.h
In reply to Tony LindgrenWe can move menelaus.h to live with other mfd headers to get it out of plat for ARM common zImage support.
Cc Samuel Ortiz <[email protected]>
Signed-off-by Tony Lindgren <[email protected]>
--- arch/arm/mach-omap2/board-h4.c | 2 +- arch/arm/mach-omap2/board-n8x0.c | 2 +- drivers/mfd/menelaus.c | 2 +- include/linux/mfd/menelaus.h | 2 -- 4 files changed, 3 insertions(+), 5 deletions(-) rename arch/arm/plat-omap/include/plat/menelaus.h => include/linux/mfd/menelaus.h (96%)
arch/arm/mach-omap2/board-h4.c +1 -1
@@ -26,12 +26,12 @@#include <linux/clk.h> #include <linux/io.h> #include <linux/input/matrix_keypad.h> +#include <linux/mfd/menelaus.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <plat/menelaus.h> #include <plat/dma.h> #include <plat/gpmc.h> #include "debug-devices.h"
arch/arm/mach-omap2/board-n8x0.c +1 -1
@@ -22,13 +22,13 @@#include <linux/usb/musb.h> #include <linux/platform_data/spi-omap2-mcspi.h> #include <linux/platform_data/mtd-onenand-omap2.h> +#include <linux/mfd/menelaus.h> #include <sound/tlv320aic3x.h> #include <asm/mach/arch.h> #include <asm/mach-types.h> #include "common.h" -#include <plat/menelaus.h> #include <plat/mmc.h> #include "mux.h"
drivers/mfd/menelaus.c +1 -1
@@ -41,11 +41,11 @@#include <linux/rtc.h> #include <linux/bcd.h> #include <linux/slab.h> +#include <linux/mfd/menelaus.h> #include <asm/mach/irq.h> #include <asm/gpio.h> -#include <plat/menelaus.h> #define DRIVER_NAME "menelaus"
include/linux/mfd/menelaus.h renamed from arch/arm/plat-omap/include/plat/menelaus.h +0 -2
@@ -1,6 +1,4 @@/* -* arch/arm/plat-omap/include/mach/menelaus.h -* * Functions to access Menelaus power management chip */
Tony Lindgren
maintainerPATCH 8/16 ARM: OMAP2: Move plat/menelaus.h to linux/mfd/menelaus.h
Quoted 5 lines · Tony Lindgren
We can move
menelaus.hto live with other mfd headers to get it out of plat for ARM common zImage support.Cc Samuel Ortiz <[email protected]>Signed-off-by Tony Lindgren <[email protected]>
Samuel, want to ack this one if this looks OK to you?
I'm planning apply this into omap-for-v3.8/cleanup-headers-menelaus branch that you can pull in too if needed.
Regards,
Tony
Quoted 81 lines
--- arch/arm/mach-omap2/board-h4.c | 2 +- arch/arm/mach-omap2/board-n8x0.c | 2 +- drivers/mfd/menelaus.c | 2 +- include/linux/mfd/menelaus.h | 2 -- 4 files changed, 3 insertions(+), 5 deletions(-) rename arch/arm/plat-omap/include/plat/menelaus.h => include/linux/mfd/menelaus.h (96%)arch/arm/mach-omap2/board-h4.c +1
-1@@ -26,12 +26,12 @@#include <linux/clk.h> #include <linux/io.h> #include <linux/input/matrix_keypad.h> +#include <linux/mfd/menelaus.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <plat/menelaus.h> #include <plat/dma.h> #include <plat/gpmc.h> #include "debug-devices.h" arch/arm/mach-omap2/board-n8x0.c +1
-1@@ -22,13 +22,13 @@#include <linux/usb/musb.h> #include <linux/platform_data/spi-omap2-mcspi.h> #include <linux/platform_data/mtd-onenand-omap2.h> +#include <linux/mfd/menelaus.h> #include <sound/tlv320aic3x.h> #include <asm/mach/arch.h> #include <asm/mach-types.h> #include "common.h" -#include <plat/menelaus.h> #include <plat/mmc.h> #include "mux.h" drivers/mfd/menelaus.c +1
-1@@ -41,11 +41,11 @@#include <linux/rtc.h> #include <linux/bcd.h> #include <linux/slab.h> +#include <linux/mfd/menelaus.h> #include <asm/mach/irq.h> #include <asm/gpio.h> -#include <plat/menelaus.h> #define DRIVER_NAME "menelaus"include/linux/mfd/menelaus.h renamed from arch/arm/plat-omap/include/plat/menelaus.h +0
-3@@ -1,6 +1,4 @@/* -* arch/arm/plat-omap/include/mach/menelaus.h -* * Functions to access Menelaus power management chip */ --To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 8/16 ARM: OMAP2: Move plat/menelaus.h to linux/mfd/menelaus.h
In reply to Tony LindgrenHi Tony,
Quoted 5 lines · Tony Lindgren
We can move
menelaus.hto live with other mfd headers to get it out of plat for ARM common zImage support.Cc Samuel Ortiz <[email protected]>Signed-off-by Tony Lindgren <[email protected]>
Acked-by Samuel Ortiz <[email protected]>
Cheers,
Samuel.
Signature · 2 lines
Intel Open Source Technology Centre http://oss.intel.com/
Tony Lindgren
maintainerPATCH 8/16 ARM: OMAP2: Move plat/menelaus.h to linux/mfd/menelaus.h
Quoted 9 lines · Samuel Ortiz
Hi Tony,
Quoted 5 lines · Tony Lindgren
We can move
menelaus.hto live with other mfd headers to get it out of plat for ARM common zImage support.Cc Samuel Ortiz <[email protected]>Signed-off-by Tony Lindgren <[email protected]>Acked-by Samuel Ortiz <[email protected]>
Thanks, I've now pushed a branch with this patch only to omap-for-v3.8/cleanup-headers-menelaus branch in case you need to merge it in too.
Regards,
Tony
Tony Lindgren
maintainerPATCH 9/16 ARM: OMAP: Split plat/mmc.h into local headers and platform_data
In reply to Tony LindgrenWe need to remove this from plat for ARM common zImage support.
Cc Chris Ball <[email protected]>
Cc Venkatraman S <[email protected]>
Cc linux-mmc at vger.kernel.org
Signed-off-by Tony Lindgren <[email protected]>
--- arch/arm/mach-omap1/board-h2-mmc.c | 5 +-- arch/arm/mach-omap1/board-h3-mmc.c | 3 +- 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-sx1-mmc.c | 3 +- arch/arm/mach-omap1/devices.c | 2 + arch/arm/mach-omap1/mmc.h | 18 +++++++++++ arch/arm/mach-omap2/board-4430sdp.c | 2 + arch/arm/mach-omap2/board-n8x0.c | 2 + arch/arm/mach-omap2/board-omap4panda.c | 2 + arch/arm/mach-omap2/board-rm680.c | 2 + arch/arm/mach-omap2/hsmmc.c | 2 + arch/arm/mach-omap2/mmc.h | 23 ++++++++++++++ arch/arm/mach-omap2/msdi.c | 2 + arch/arm/mach-omap2/omap4-common.c | 2 + arch/arm/mach-omap2/omap_hwmod_2420_data.c | 2 + arch/arm/mach-omap2/omap_hwmod_2430_data.c | 2 + arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 2 + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 2 + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 + drivers/mmc/host/omap.c | 3 +- drivers/mmc/host/omap_hsmmc.c | 2 + include/linux/platform_data/mmc-omap.h | 45 +--------------------------- 24 files changed, 67 insertions(+), 67 deletions(-) create mode 100644 arch/arm/mach-omap1/mmc.h create mode 100644 arch/arm/mach-omap2/mmc.h rename arch/arm/plat-omap/include/plat/mmc.h => include/linux/platform_data/mmc-omap.h (80%)
arch/arm/mach-omap1/board-h2-mmc.c +2 -3
@@ -13,12 +13,11 @@*/ #include <linux/gpio.h> #include <linux/platform_device.h> - +#include <linux/platform_data/gpio-omap.h> #include <linux/i2c/tps65010.h> -#include <plat/mmc.h> -#include "board-h2.h" +#include "mmc.h" #if defined(CONFIG_MMC_OMAP ) || defined(CONFIG_MMC_OMAP_MODULE )
arch/arm/mach-omap1/board-h3-mmc.c +1 -2
@@ -16,9 +16,8 @@#include <linux/i2c/tps65010.h> -#include <plat/mmc.h> -#include "board-h3.h" +#include "mmc.h" #if defined(CONFIG_MMC_OMAP ) || defined(CONFIG_MMC_OMAP_MODULE )
arch/arm/mach-omap1/board-htcherald.c +1 -1
@@ -43,7 +43,7 @@#include <asm/mach/arch.h> #include <mach/omap7xx.h> -#include <plat/mmc.h> +#include "mmc.h" #include <mach/irqs.h> #include <mach/usb.h>
arch/arm/mach-omap1/board-innovator.c +1 -1
@@ -36,13 +36,13 @@#include <../plat-omap/fpga.h> #include <mach/tc.h> #include <linux/platform_data/keypad-omap.h> -#include <plat/mmc.h> #include <mach/hardware.h> #include <mach/usb.h> #include "iomap.h" #include "common.h" +#include "mmc.h" /* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */ #define INNOVATOR1610_ETHR_START 0x04000300
arch/arm/mach-omap1/board-nokia770.c +1 -1
@@ -29,13 +29,13 @@#include <asm/mach/map.h> #include <mach/mux.h> -#include <plat/mmc.h> #include <plat/clock.h> #include <mach/hardware.h> #include <mach/usb.h> #include "common.h" +#include "mmc.h" #define ADS7846_PENDOWN_GPIO 15
arch/arm/mach-omap1/board-sx1-mmc.c +2 -1
@@ -16,9 +16,10 @@#include <linux/platform_device.h> #include <mach/hardware.h> -#include <plat/mmc.h> #include <mach/board-sx1.h> +#include "mmc.h" +#if defined(CONFIG_MMC_OMAP ) || defined(CONFIG_MMC_OMAP_MODULE ) static int mmc_set_power(struct device *dev, int slot, int power_on,
arch/arm/mach-omap1/devices.c +1 -1
@@ -22,7 +22,6 @@#include <mach/tc.h> #include <mach/mux.h> #include <plat/dma.h> -#include <plat/mmc.h> #include <mach/omap7xx.h> #include <mach/camera.h>
@@ -32,6 +31,7 @@#include "common.h" #include "clock.h" +#include "mmc.h" #if defined(CONFIG_SND_SOC ) || defined(CONFIG_SND_SOC_MODULE )
arch/arm/mach-omap1/mmc.h new file +18 -0
@@ -0,0 +1,18 @@ +#include <linux/mmc/host.h> +#include <linux/platform_data/mmc-omap.h> + +#define OMAP15XX_NR_MMC 1 +#define OMAP16XX_NR_MMC 2 +#define OMAP1_MMC_SIZE 0x080 +#define OMAP1_MMC1_BASE 0xfffb7800 +#define OMAP1_MMC2_BASE 0xfffb7c00/* omap16xx only */ + +#if defined(CONFIG_MMC_OMAP ) || defined(CONFIG_MMC_OMAP_MODULE ) +void omap1_init_mmc (struct omap_mmc_platform_data **mmc_data, +int nr_controllers); +#else +static inline void omap1_init_mmc (struct omap_mmc_platform_data **mmc_data, +int nr_controllers) +{ +} +#endif
arch/arm/mach-omap2/board-4430sdp.c +1 -1
@@ -35,7 +35,7 @@#include "common.h" #include <plat/usb.h> -#include <plat/mmc.h> +#include "mmc.h" #include "omap4-keypad.h" #include <video/omapdss.h> #include <video/omap-panel-nokia-dsi.h>
arch/arm/mach-omap2/board-n8x0.c +1 -1
@@ -29,7 +29,7 @@#include <asm/mach-types.h> #include "common.h" -#include <plat/mmc.h> +#include "mmc.h" #include "mux.h"
arch/arm/mach-omap2/board-omap4panda.c +1 -1
@@ -40,7 +40,7 @@#include "common.h" #include <plat/usb.h> -#include <plat/mmc.h> +#include "mmc.h" #include <video/omap-panel-tfp410.h> #include "soc.h"
arch/arm/mach-omap2/board-rm680.c +1 -1
@@ -22,7 +22,7 @@#include <asm/mach/arch.h> #include <asm/mach-types.h> -#include <plat/mmc.h> +#include "mmc.h" #include <plat/usb.h> #include <plat/gpmc.h> #include "common.h"
arch/arm/mach-omap2/hsmmc.c +1 -1
@@ -17,7 +17,7 @@#include <mach/hardware.h> #include <linux/platform_data/gpio-omap.h> -#include <plat/mmc.h> +#include "mmc.h" #include <plat/omap-pm.h> #include <plat/omap_device.h>
arch/arm/mach-omap2/mmc.h new file +23 -0
@@ -0,0 +1,23 @@ +#include <linux/mmc/host.h> +#include <linux/platform_data/mmc-omap.h> + +#define OMAP24XX_NR_MMC 2 +#define OMAP2420_MMC_SIZE OMAP1_MMC_SIZE +#define OMAP2_MMC1_BASE 0x4809c000 + +#define OMAP4_MMC_REG_OFFSET 0x100 + +#if defined(CONFIG_MMC_OMAP ) || defined(CONFIG_MMC_OMAP_MODULE ) +void omap242x_init_mmc (struct omap_mmc_platform_data **mmc_data); +#else +static inline void omap242x_init_mmc (struct omap_mmc_platform_data **mmc_data) +{ +} +#endif + +struct omap_hwmod ; +int omap_msdi_reset (struct omap_hwmod *oh); + +/* called from board-specific card detection service routine */ +extern void omap_mmc_notify_cover_event (struct device *dev,int slot, +int is_closed);
arch/arm/mach-omap2/msdi.c +1 -1
@@ -27,7 +27,7 @@#include <plat/omap_hwmod.h> #include <plat/omap_device.h> -#include <plat/mmc.h> +#include "mmc.h" #include "common.h" #include "control.h"
arch/arm/mach-omap2/omap4-common.c +1 -1
@@ -26,7 +26,7 @@#include <asm/memblock.h> #include <plat/omap-secure.h> -#include <plat/mmc.h> +#include "mmc.h" #include "../plat-omap/sram.h"
arch/arm/mach-omap2/omap_hwmod_2420_data.c +1 -1
@@ -22,7 +22,7 @@#include <plat/dmtimer.h> #include "l3_2xxx.h" #include "l4_2xxx.h" -#include <plat/mmc.h> +#include "mmc.h" #include "omap_hwmod_common_data.h"
arch/arm/mach-omap2/omap_hwmod_2430_data.c +1 -1
@@ -21,7 +21,7 @@#include <plat/dma.h> #include <plat/serial.h> #include <plat/dmtimer.h> -#include <plat/mmc.h> +#include "mmc.h" #include "l3_2xxx.h" #include "soc.h"
arch/arm/mach-omap2/omap_hwmod_33xx_data.c +1 -1
@@ -21,7 +21,7 @@#include <linux/platform_data/gpio-omap.h> #include <linux/platform_data/spi-omap2-mcspi.h> #include <plat/dma.h> -#include <plat/mmc.h> +#include "mmc.h" #include "omap_hwmod_common_data.h"
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +1 -1
@@ -24,7 +24,7 @@#include <plat/serial.h> #include "l3_3xxx.h" #include "l4_3xxx.h" -#include <plat/mmc.h> +#include "mmc.h" #include <linux/platform_data/asoc-ti-mcbsp.h> #include <linux/platform_data/spi-omap2-mcspi.h> #include <plat/dmtimer.h>
arch/arm/mach-omap2/omap_hwmod_44xx_data.c +1 -1
@@ -27,7 +27,7 @@#include <plat/dma.h> #include <linux/platform_data/spi-omap2-mcspi.h> #include <linux/platform_data/asoc-ti-mcbsp.h> -#include <plat/mmc.h> +#include "mmc.h" #include <plat/dmtimer.h> #include <plat/iommu.h> #include "../plat-omap/common.h"
drivers/mmc/host/omap.c +2 -1
@@ -28,8 +28,9 @@#include <linux/clk.h> #include <linux/scatterlist.h> #include <linux/slab.h> +#include <linux/platform_data/mmc-omap.h> -#include <plat/mmc.h> +#include <plat/cpu.h> #include <plat/dma.h> #define OMAP_MMC_REG_CMD 0x00
drivers/mmc/host/omap_hsmmc.c +1 -1
@@ -38,8 +38,8 @@#include <linux/gpio.h> #include <linux/regulator/consumer.h> #include <linux/pm_runtime.h> +#include <linux/platform_data/mmc-omap.h> #include <mach/hardware.h> -#include <plat/mmc.h> #include <plat/cpu.h> /* OMAP HSMMC Host Controller Registers */
include/linux/platform_data/mmc-omap.h renamed from arch/arm/plat-omap/include/plat/mmc.h +2 -43
60 lines not on this page · raw message
PATCH 9/16 ARM: OMAP: Split plat/mmc.h into local headers and platform_data
Quoted 7 lines · Tony Lindgren
We need to remove this from plat for ARM common zImage support.
Cc Chris Ball <[email protected]>Cc Venkatraman S <[email protected]>Cc linux-mmc at vger.kernel.orgSigned-off-by Tony Lindgren <[email protected]>
Thanks Tony. I suppose this should go into your tree..
Acked-by Venkatraman S <[email protected]>
Quoted 28 lines
--- arch/arm/mach-omap1/board-h2-mmc.c | 5 +-- arch/arm/mach-omap1/board-h3-mmc.c | 3 +- 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-sx1-mmc.c | 3 +- arch/arm/mach-omap1/devices.c | 2 + arch/arm/mach-omap1/mmc.h | 18 +++++++++++ arch/arm/mach-omap2/board-4430sdp.c | 2 + arch/arm/mach-omap2/board-n8x0.c | 2 + arch/arm/mach-omap2/board-omap4panda.c | 2 + arch/arm/mach-omap2/board-rm680.c | 2 + arch/arm/mach-omap2/hsmmc.c | 2 + arch/arm/mach-omap2/mmc.h | 23 ++++++++++++++ arch/arm/mach-omap2/msdi.c | 2 + arch/arm/mach-omap2/omap4-common.c | 2 + arch/arm/mach-omap2/omap_hwmod_2420_data.c | 2 + arch/arm/mach-omap2/omap_hwmod_2430_data.c | 2 + arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 2 + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 2 + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 + drivers/mmc/host/omap.c | 3 +- drivers/mmc/host/omap_hsmmc.c | 2 + include/linux/platform_data/mmc-omap.h | 45 +--------------------------- 24 files changed, 67 insertions(+), 67 deletions(-) create mode 100644 arch/arm/mach-omap1/mmc.h create mode 100644 arch/arm/mach-omap2/mmc.h
Tony Lindgren
maintainerPATCH 9/16 ARM: OMAP: Split plat/mmc.h into local headers and platform_data
Quoted 11 lines · Venkatraman S
Quoted 7 lines · Tony Lindgren
We need to remove this from plat for ARM common zImage support.
Cc Chris Ball <[email protected]>Cc Venkatraman S <[email protected]>Cc linux-mmc at vger.kernel.orgSigned-off-by Tony Lindgren <[email protected]>Thanks Tony. I suppose this should go into your tree..
Acked-by Venkatraman S <[email protected]>
Thanks yeah it's probably best that I set up some
minimal immutable branch that Chris can also pull
in assuming these two MMC patches look OK.
Regards,
Tony
Tony Lindgren
maintainerPATCH 1/1 mmc: omap: Remove cpu_is_omap usage from the driver
In reply to Tony LindgrenThis is needed for the ARM common zImage support.
We can use the existing slot features to pass omap1 specific options to the driver. For omap2 we don't want to pass anything new as that will be eventually moved to use device tree based init.
Note that this patch depends on earlier patch that moves plat/mmc.h into include/linux/platform_data.
Cc Chris Ball <[email protected]>
Cc Venkatraman S <[email protected]>
Cc linux-mmc at vger.kernel.org
Signed-off-by Tony Lindgren <[email protected]>
---
Chris, I can set up a minimal immutable branch with omap header changes that you can also pull into MMC tree if these two MMC patches look ackable to you.
arch/arm/mach-omap1/devices.c +7 -0
@@ -177,6 +177,13 @@ static int __init omap_mmc_add(const char *name, int id, unsigned long base, res[3 ].name ="tx" ; res[3 ].flags =IORESOURCE_DMA ; +if (cpu_is_omap7xx ()) + data->slots[0 ].features =MMC_OMAP7XX ; +if (cpu_is_omap15xx ()) + data->slots[0 ].features =MMC_OMAP15XX ; +if (cpu_is_omap16xx ()) + data->slots[0 ].features =MMC_OMAP16XX ; + ret =platform_device_add_resources (pdev, res,ARRAY_SIZE (res));if (ret ==0 ) ret =platform_device_add_data (pdev, data,sizeof (*data));
drivers/mmc/host/omap.c +15 -8
@@ -30,7 +30,6 @@#include <linux/slab.h> #include <linux/platform_data/mmc-omap.h> -#include <plat/cpu.h> #include <plat/dma.h> #define OMAP_MMC_REG_CMD 0x00
@@ -73,6 +72,13 @@#define OMAP_MMC_STAT_CARD_BUSY (1 << 2)#define OMAP_MMC_STAT_END_OF_CMD (1 << 0) +#define mmc_omap7xx () (host->features & MMC_OMAP7XX) +#define mmc_omap15xx () (host->features & MMC_OMAP15XX) +#define mmc_omap16xx () (host->features & MMC_OMAP16XX) +#define MMC_OMAP1_MASK (MMC_OMAP7XXX | MMC_OMAP15XX | MMC_OMAP16XX) +#define mmc_omap1 () (host->features & MMC_OMAP1_MASK) +#define mmc_omap2 () (!mmc_omap1) +#define OMAP_MMC_REG (host, reg) (OMAP_MMC_REG_##reg << (host)->reg_shift)#define OMAP_MMC_READ (host, reg) __raw_readw((host)->virt_base + OMAP_MMC_REG(host, reg))#define OMAP_MMC_WRITE (host, reg, val) __raw_writew((val), (host)->virt_base + OMAP_MMC_REG(host, reg))
@@ -148,6 +154,7 @@ struct mmc_omap_host {u32 buffer_bytes_left;u32 total_bytes_left; +unsigned features; unsigned use_dma:1; unsigned brs_received:1, dma_done:1; unsigned dma_in_use:1;
@@ -989,7 +996,7 @@ mmc_omap_prepare_data(struct mmc_omap_host *host, struct mmc_request *req)* blocksize is at least that large. Blocksize is * usually 512 bytes; but not for some SD reads. */ - burst =cpu_is_omap15xx () ?32 :64 ; + burst =mmc_omap15xx () ?32 :64 ;if (burst > data->blksz) burst = data->blksz;
@@ -1105,8 +1112,7 @@ static void mmc_omap_set_power(struct mmc_omap_slot *slot, int power_on,if (slot->pdata->set_power !=NULL ) slot->pdata->set_power (mmc_dev (slot->mmc), slot->id, power_on, vdd); - -if (cpu_is_omap24xx ()) { +if (mmc_omap2 ()) {u16 w;if (power_on) {
@@ -1240,7 +1246,7 @@ static int __devinit mmc_omap_new_slot(struct mmc_omap_host *host, int id) mmc->ops = &mmc_omap_ops; mmc->f_min =400000 ; -if (cpu_class_is_omap2 ()) +if (mmc_omap2 ()) mmc->f_max =48000000 ;else mmc->f_max =24000000 ;
@@ -1360,6 +1366,7 @@ static int __devinit mmc_omap_probe(struct platform_device *pdev)init_waitqueue_head (&host->slot_wq); host->pdata = pdata; + host->features = host->pdata->slots[0 ].features; host->dev = &pdev->dev;platform_set_drvdata (pdev, host);
@@ -1392,7 +1399,7 @@ static int __devinit mmc_omap_probe(struct platform_device *pdev) host->dma_tx_burst =-1 ; host->dma_rx_burst =-1 ; -if (cpu_is_omap24xx ()) +if (mmc_omap2 ()) sig = host->id ==0 ?OMAP24XX_DMA_MMC1_TX :OMAP24XX_DMA_MMC2_TX ;else sig = host->id ==0 ?OMAP_DMA_MMC_TX :OMAP_DMA_MMC2_TX ;
@@ -1408,7 +1415,7 @@ static int __devinit mmc_omap_probe(struct platform_device *pdev)dev_warn (host->dev,"unable to obtain TX DMA engine channel %u\n" , sig);#endif -if (cpu_is_omap24xx ()) +if (mmc_omap2 ()) sig = host->id ==0 ?OMAP24XX_DMA_MMC1_RX :OMAP24XX_DMA_MMC2_RX ;else sig = host->id ==0 ?OMAP_DMA_MMC_RX :OMAP_DMA_MMC2_RX ;
@@ -1436,7 +1443,7 @@ static int __devinit mmc_omap_probe(struct platform_device *pdev) } host->nr_slots = pdata->nr_slots; - host->reg_shift = (cpu_is_omap7xx () ?1 :2 ); + host->reg_shift = (mmc_omap7xx () ?1 :2 ); host->mmc_omap_wq =alloc_workqueue ("mmc_omap" ,0 ,0 );if (!host->mmc_omap_wq)
include/linux/platform_data/mmc-omap.h +3 -0
@@ -107,6 +107,9 @@ struct omap_mmc_platform_data {/* we can put the features above into this variable */ #define HSMMC_HAS_PBIAS (1 << 0)#define HSMMC_HAS_UPDATED_RESET (1 << 1) +#define MMC_OMAP7XX (1 << 2) +#define MMC_OMAP15XX (1 << 3) +#define MMC_OMAP16XX (1 << 4)unsigned features;int switch_pin;/* gpio (card detect) */
PATCH 1/1 mmc: omap: Remove cpu_is_omap usage from the driver
Hi Tony,
Quoted 15 lines · Tony Lindgren
This is needed for the ARM common zImage support.
We can use the existing slot features to pass omap1 specific options to the driver. For omap2 we don't want to pass anything new as that will be eventually moved to use device tree based init.
Note that this patch depends on earlier patch that moves
plat/mmc.hintoinclude/linux/platform_data.Cc Chris Ball <[email protected]>Cc Venkatraman S <[email protected]>Cc linux-mmc at vger.kernel.orgSigned-off-by Tony Lindgren <[email protected]>
Quoted 5 lines
---
Chris, I can set up a minimal immutable branch with omap header changes that you can also pull into MMC tree if these two MMC patches look ackable to you.
Thanks, sounds good.
Acked-by Chris Ball <[email protected]>
- Chris.
Signature · 2 lines
Chris Ball <[email protected]> <http://printf.net/> One Laptop Per Child
Tony Lindgren
maintainerPATCH 1/1 mmc: omap: Remove cpu_is_omap usage from the driver
Quoted 20 lines · Chris Ball
Hi Tony,
Quoted 17 lines · Tony Lindgren
This is needed for the ARM common zImage support.
We can use the existing slot features to pass omap1 specific options to the driver. For omap2 we don't want to pass anything new as that will be eventually moved to use device tree based init.
Note that this patch depends on earlier patch that moves
plat/mmc.hintoinclude/linux/platform_data.Cc Chris Ball <[email protected]>Cc Venkatraman S <[email protected]>Cc linux-mmc at vger.kernel.orgSigned-off-by Tony Lindgren <[email protected]>---
Quoted 7 lines
Quoted 3 lines
Chris, I can set up a minimal immutable branch with omap header changes that you can also pull into MMC tree if these two MMC patches look ackable to you.
Thanks, sounds good.
Acked-by Chris Ball <[email protected]>
Thanks will do when -rc1 is available.
Looks like I posted a version before running stg refresh that was missing two compile fixes: MMC_OMAP7XXX should be MMC_OMAP7XX and !mmc_omap1 should be !mmc_omap1(). Updated patch below.
Regards,
Tony
From: Tony Lindgren <[email protected]>
Date: Thu, 4 Oct 2012 19:01:53 -0700
Subject: [PATCH] mmc: omap: Remove cpu_is_omap usage from the driver
This is needed for the ARM common zImage support.
We can use the existing slot features to pass omap1 specific options to the driver. For omap2 we don't want to pass anything new as that will be eventually moved to use device tree based init.
Note that this patch depends on earlier patch that moves plat/mmc.h into include/linux/platform_data.
Cc linux-mmc at vger.kernel.org
Cc Venkatraman S <[email protected]>
Acked-by Chris Ball <[email protected]>
Signed-off-by Tony Lindgren <[email protected]>
arch/arm/mach-omap1/devices.c +7 -0
@@ -177,6 +177,13 @@ static int __init omap_mmc_add(const char *name, int id, unsigned long base, res[3 ].name ="tx" ; res[3 ].flags =IORESOURCE_DMA ; +if (cpu_is_omap7xx ()) + data->slots[0 ].features =MMC_OMAP7XX ; +if (cpu_is_omap15xx ()) + data->slots[0 ].features =MMC_OMAP15XX ; +if (cpu_is_omap16xx ()) + data->slots[0 ].features =MMC_OMAP16XX ; + ret =platform_device_add_resources (pdev, res,ARRAY_SIZE (res));if (ret ==0 ) ret =platform_device_add_data (pdev, data,sizeof (*data));
drivers/mmc/host/omap.c +15 -8
@@ -30,7 +30,6 @@#include <linux/slab.h> #include <linux/platform_data/mmc-omap.h> -#include <plat/cpu.h> #include <plat/dma.h> #define OMAP_MMC_REG_CMD 0x00
@@ -73,6 +72,13 @@#define OMAP_MMC_STAT_CARD_BUSY (1 << 2)#define OMAP_MMC_STAT_END_OF_CMD (1 << 0) +#define mmc_omap7xx () (host->features & MMC_OMAP7XX) +#define mmc_omap15xx () (host->features & MMC_OMAP15XX) +#define mmc_omap16xx () (host->features & MMC_OMAP16XX) +#define MMC_OMAP1_MASK (MMC_OMAP7XX | MMC_OMAP15XX | MMC_OMAP16XX) +#define mmc_omap1 () (host->features & MMC_OMAP1_MASK) +#define mmc_omap2 () (!mmc_omap1()) +#define OMAP_MMC_REG (host, reg) (OMAP_MMC_REG_##reg << (host)->reg_shift)#define OMAP_MMC_READ (host, reg) __raw_readw((host)->virt_base + OMAP_MMC_REG(host, reg))#define OMAP_MMC_WRITE (host, reg, val) __raw_writew((val), (host)->virt_base + OMAP_MMC_REG(host, reg))
@@ -148,6 +154,7 @@ struct mmc_omap_host {u32 buffer_bytes_left;u32 total_bytes_left; +unsigned features; unsigned use_dma:1; unsigned brs_received:1, dma_done:1; unsigned dma_in_use:1;
@@ -989,7 +996,7 @@ mmc_omap_prepare_data(struct mmc_omap_host *host, struct mmc_request *req)* blocksize is at least that large. Blocksize is * usually 512 bytes; but not for some SD reads. */ - burst =cpu_is_omap15xx () ?32 :64 ; + burst =mmc_omap15xx () ?32 :64 ;if (burst > data->blksz) burst = data->blksz;
@@ -1105,8 +1112,7 @@ static void mmc_omap_set_power(struct mmc_omap_slot *slot, int power_on,if (slot->pdata->set_power !=NULL ) slot->pdata->set_power (mmc_dev (slot->mmc), slot->id, power_on, vdd); - -if (cpu_is_omap24xx ()) { +if (mmc_omap2 ()) {u16 w;if (power_on) {
@@ -1240,7 +1246,7 @@ static int __devinit mmc_omap_new_slot(struct mmc_omap_host *host, int id) mmc->ops = &mmc_omap_ops; mmc->f_min =400000 ; -if (cpu_class_is_omap2 ()) +if (mmc_omap2 ()) mmc->f_max =48000000 ;else mmc->f_max =24000000 ;
@@ -1360,6 +1366,7 @@ static int __devinit mmc_omap_probe(struct platform_device *pdev)init_waitqueue_head (&host->slot_wq); host->pdata = pdata; + host->features = host->pdata->slots[0 ].features; host->dev = &pdev->dev;platform_set_drvdata (pdev, host);
@@ -1392,7 +1399,7 @@ static int __devinit mmc_omap_probe(struct platform_device *pdev) host->dma_tx_burst =-1 ; host->dma_rx_burst =-1 ; -if (cpu_is_omap24xx ()) +if (mmc_omap2 ()) sig = host->id ==0 ?OMAP24XX_DMA_MMC1_TX :OMAP24XX_DMA_MMC2_TX ;else sig = host->id ==0 ?OMAP_DMA_MMC_TX :OMAP_DMA_MMC2_TX ;
@@ -1408,7 +1415,7 @@ static int __devinit mmc_omap_probe(struct platform_device *pdev)dev_warn (host->dev,"unable to obtain TX DMA engine channel %u\n" , sig);#endif -if (cpu_is_omap24xx ()) +if (mmc_omap2 ()) sig = host->id ==0 ?OMAP24XX_DMA_MMC1_RX :OMAP24XX_DMA_MMC2_RX ;else sig = host->id ==0 ?OMAP_DMA_MMC_RX :OMAP_DMA_MMC2_RX ;
@@ -1436,7 +1443,7 @@ static int __devinit mmc_omap_probe(struct platform_device *pdev) } host->nr_slots = pdata->nr_slots; - host->reg_shift = (cpu_is_omap7xx () ?1 :2 ); + host->reg_shift = (mmc_omap7xx () ?1 :2 ); host->mmc_omap_wq =alloc_workqueue ("mmc_omap" ,0 ,0 );if (!host->mmc_omap_wq)
include/linux/platform_data/mmc-omap.h +3 -0
@@ -107,6 +107,9 @@ struct omap_mmc_platform_data {/* we can put the features above into this variable */ #define HSMMC_HAS_PBIAS (1 << 0)#define HSMMC_HAS_UPDATED_RESET (1 << 1) +#define MMC_OMAP7XX (1 << 2) +#define MMC_OMAP15XX (1 << 3) +#define MMC_OMAP16XX (1 << 4)unsigned features;int switch_pin;/* gpio (card detect) */
Tony Lindgren
maintainerPATCH 1/1 mmc: omap: Remove cpu_is_omap usage from the driver
In reply to Chris BallQuoted 7 lines · Chris Ball
Quoted 4 lines · Tony Lindgren
Chris, I can set up a minimal immutable branch with omap header changes that you can also pull into MMC tree if these two MMC patches look ackable to you.
Thanks, sounds good.
Chris, I've now pushed out branch omap-for-v3.8/cleanup-headers-mmc based on -rc1. The branch is located at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
It contains two omap MMC related patches that you can also merge into the MMC tree if needed as now include plat/mmc.h is gone for omaps.
Regards,
Tony
Tony Lindgren
maintainerPATCH 10/16 ARM: OMAP: Make omap_device local to mach-omap2
In reply to Tony LindgrenLet's make omap_device local to mach-omap2 for
ARM common zImage support.
Signed-off-by Tony Lindgren <[email protected]>
---
arch/arm/mach-omap1/pm_bus.c | 1 -
arch/arm/mach-omap2/Makefile | 3 ++-
arch/arm/mach-omap2/am35xx-emac.c | 2 +-
arch/arm/mach-omap2/board-omap3beagle.c | 2 +-
arch/arm/mach-omap2/devices.c | 2 +-
arch/arm/mach-omap2/display.c | 2 +-
arch/arm/mach-omap2/dma.c | 2 +-
arch/arm/mach-omap2/drm.c | 2 +-
arch/arm/mach-omap2/gpio.c | 2 +-
arch/arm/mach-omap2/gpmc.c | 2 +-
arch/arm/mach-omap2/hdq1w.c | 2 +-
arch/arm/mach-omap2/hsmmc.c | 2 +-
arch/arm/mach-omap2/hwspinlock.c | 2 +-
arch/arm/mach-omap2/i2c.c | 2 +-
arch/arm/mach-omap2/mcbsp.c | 2 +-
arch/arm/mach-omap2/msdi.c | 2 +-
arch/arm/mach-omap2/omap_device.c | 2 +-
arch/arm/mach-omap2/omap_device.h | 0
arch/arm/mach-omap2/opp.c | 2 +-
arch/arm/mach-omap2/pm.c | 2 +-
arch/arm/mach-omap2/pmu.c | 2 +-
arch/arm/mach-omap2/serial.c | 2 +-
arch/arm/mach-omap2/sr_device.c | 2 +-
arch/arm/mach-omap2/timer.c | 2 +-
arch/arm/mach-omap2/usb-host.c | 2 +-
arch/arm/mach-omap2/usb-musb.c | 2 +-
arch/arm/plat-omap/Makefile | 1 -
arch/arm/plat-omap/omap-pm-noop.c | 3 ++-
28 files changed, 27 insertions(+), 27 deletions(-)
rename arch/arm/{plat-omap/omap_device.c => mach-omap2/omap_device.c} (99%)
rename arch/arm/{plat-omap/include/plat/omap_device.h => mach-omap2/omap_device.h} (100%)arch/arm/mach-omap1/pm_bus.c +0 -1
@@ -19,7 +19,6 @@#include <linux/clk.h> #include <linux/err.h> -#include <plat/omap_device.h> #include <plat/omap-pm.h> #ifdef CONFIG_PM_RUNTIME
arch/arm/mach-omap2/Makefile +2 -1
@@ -4,7 +4,8 @@ # Common support obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer.o pm.o \ - common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o + common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \ + omap_device.o # INTCPS IP block support - XXX should be moved to drivers/ obj-$(CONFIG_ARCH_OMAP2) += irq.o
arch/arm/mach-omap2/am35xx-emac.c +1 -1
@@ -18,7 +18,7 @@#include <linux/err.h> #include <linux/davinci_emac.h> #include <asm/system.h> -#include <plat/omap_device.h> +#include "omap_device.h" #include "am35xx.h" #include "control.h" #include "am35xx-emac.h"
arch/arm/mach-omap2/board-omap3beagle.c +1 -1
@@ -44,7 +44,7 @@#include <plat/gpmc.h> #include <linux/platform_data/mtd-nand-omap2.h> #include <plat/usb.h> -#include <plat/omap_device.h> +#include "omap_device.h" #include "mux.h" #include "hsmmc.h"
arch/arm/mach-omap2/devices.c +1 -1
@@ -26,7 +26,7 @@#include "iomap.h" #include <plat/dma.h> #include <plat/omap_hwmod.h> -#include <plat/omap_device.h> +#include "omap_device.h" #include "omap4-keypad.h" #include "soc.h"
arch/arm/mach-omap2/display.c +1 -1
@@ -26,7 +26,7 @@#include <video/omapdss.h> #include <plat/omap_hwmod.h> -#include <plat/omap_device.h> +#include "omap_device.h" #include <plat/omap-pm.h> #include "common.h"
arch/arm/mach-omap2/dma.c +1 -1
@@ -29,7 +29,7 @@#include <linux/device.h> #include <plat/omap_hwmod.h> -#include <plat/omap_device.h> +#include "omap_device.h" #include <plat/dma.h> #define OMAP2_DMA_STRIDE 0x60
arch/arm/mach-omap2/drm.c +1 -1
@@ -24,7 +24,7 @@#include <linux/platform_device.h> #include <linux/dma-mapping.h> -#include <plat/omap_device.h> +#include "omap_device.h" #include <plat/omap_hwmod.h> #if defined(CONFIG_DRM_OMAP ) || (CONFIG_DRM_OMAP_MODULE )
arch/arm/mach-omap2/gpio.c +1 -1
@@ -24,7 +24,7 @@#include <linux/platform_data/gpio-omap.h> #include <plat/omap_hwmod.h> -#include <plat/omap_device.h> +#include "omap_device.h" #include <plat/omap-pm.h> #include "powerdomain.h"
arch/arm/mach-omap2/gpmc.c +1 -1
@@ -32,7 +32,7 @@#include <plat/cpu.h> #include <plat/gpmc.h> #include <plat/sdrc.h> -#include <plat/omap_device.h> +#include "omap_device.h" #include "soc.h" #include "common.h"
arch/arm/mach-omap2/hdq1w.c +1 -1
@@ -28,7 +28,7 @@#include <linux/platform_device.h> #include <plat/omap_hwmod.h> -#include <plat/omap_device.h> +#include "omap_device.h" #include "hdq1w.h" #include "common.h"
arch/arm/mach-omap2/hsmmc.c +1 -1
@@ -19,7 +19,7 @@#include "mmc.h" #include <plat/omap-pm.h> -#include <plat/omap_device.h> +#include "omap_device.h" #include "mux.h" #include "hsmmc.h"
arch/arm/mach-omap2/hwspinlock.c +1 -1
@@ -22,7 +22,7 @@#include <linux/hwspinlock.h> #include <plat/omap_hwmod.h> -#include <plat/omap_device.h> +#include "omap_device.h" static struct hwspinlock_pdata omap_hwspinlock_pdata__initdata = { .base_id =0 ,
arch/arm/mach-omap2/i2c.c +1 -1
@@ -23,7 +23,7 @@#include "common.h" #include <plat/omap_hwmod.h> -#include <plat/omap_device.h> +#include "omap_device.h" #include <plat/omap-pm.h> #include "mux.h"
arch/arm/mach-omap2/mcbsp.c +1 -1
@@ -21,7 +21,7 @@#include <linux/platform_data/asoc-ti-mcbsp.h> #include <plat/dma.h> -#include <plat/omap_device.h> +#include "omap_device.h" #include <linux/pm_runtime.h> /*
arch/arm/mach-omap2/msdi.c +1 -1
@@ -26,7 +26,7 @@#include <linux/platform_data/gpio-omap.h> #include <plat/omap_hwmod.h> -#include <plat/omap_device.h> +#include "omap_device.h" #include "mmc.h" #include "common.h"
arch/arm/mach-omap2/omap_device.c renamed from arch/arm/plat-omap/omap_device.c +1 -1
@@ -89,7 +89,7 @@#include <linux/of.h> #include <linux/notifier.h> -#include <plat/omap_device.h> +#include "omap_device.h" #include <plat/omap_hwmod.h> #include <plat/clock.h>
arch/arm/mach-omap2/omap_device.h renamed from arch/arm/plat-omap/include/plat/omap_device.h +0 -0
arch/arm/mach-omap2/opp.c +1 -1
@@ -19,7 +19,7 @@#include <linux/module.h> #include <linux/opp.h> -#include <plat/omap_device.h> +#include "omap_device.h" #include "omap_opp_data.h"
arch/arm/mach-omap2/pm.c +1 -1
@@ -20,7 +20,7 @@#include <asm/system_misc.h> #include <plat/omap-pm.h> -#include <plat/omap_device.h> +#include "omap_device.h" #include "common.h" #include "prcm-common.h"
arch/arm/mach-omap2/pmu.c +1 -1
@@ -16,7 +16,7 @@#include <asm/pmu.h> #include <plat/omap_hwmod.h> -#include <plat/omap_device.h> +#include "omap_device.h" static char *omap2_pmu_oh_names[] = {"mpu" };static char *omap3_pmu_oh_names[] = {"mpu" ,"debugss" };
arch/arm/mach-omap2/serial.c +1 -1
@@ -31,7 +31,7 @@#include "common.h" #include <plat/dma.h> #include <plat/omap_hwmod.h> -#include <plat/omap_device.h> +#include "omap_device.h" #include <plat/omap-pm.h> #include <plat/serial.h>
arch/arm/mach-omap2/sr_device.c +1 -1
@@ -23,7 +23,7 @@#include <linux/slab.h> #include <linux/io.h> -#include <plat/omap_device.h> +#include "omap_device.h" #include "voltage.h" #include "control.h"
arch/arm/mach-omap2/timer.c +1 -1
@@ -44,7 +44,7 @@#include <asm/arch_timer.h> #include <plat/omap_hwmod.h> -#include <plat/omap_device.h> +#include "omap_device.h" #include <plat/dmtimer.h> #include <plat/omap-pm.h>
arch/arm/mach-omap2/usb-host.c +1 -1
@@ -26,7 +26,7 @@#include <asm/io.h> #include <plat/usb.h> -#include <plat/omap_device.h> +#include "omap_device.h" #include "mux.h"
arch/arm/mach-omap2/usb-musb.c +1 -1
@@ -26,7 +26,7 @@#include <linux/usb/musb.h> #include <plat/usb.h> -#include <plat/omap_device.h> +#include "omap_device.h" #include "am35xx.h"
arch/arm/plat-omap/Makefile +0 -1
@@ -9,7 +9,6 @@ obj-n := obj- := # omap_device support (OMAP2+ only at the moment) -obj-$(CONFIG_ARCH_OMAP2PLUS) += omap_device.o obj-$(CONFIG_OMAP_DM_TIMER) += dmtimer.o obj-$(CONFIG_OMAP_DEBUG_DEVICES) += debug-devices.o
arch/arm/plat-omap/omap-pm-noop.c +2 -1
@@ -24,7 +24,8 @@/* Interface documentation is in mach/omap-pm.h */ #include <plat/omap-pm.h> -#include <plat/omap_device.h> + +#include "../mach-omap2/omap_device.h" static bool off_mode_enabled;static int dummy_context_loss_counter;
Paul Walmsley
maintainerPATCH 10/16 ARM: OMAP: Make omap_device local to mach-omap2
Hi Tony
Quoted 4 lines · Tony Lindgren
Let's make
omap_devicelocal to mach-omap2 for
ARM common zImage support.Signed-off-by Tony Lindgren <[email protected]>
This one breaks a 5912-only build:
arch/arm/mach-omap1/pm_bus.c: In function 'omap1_pm_runtime_init':arch/arm/mach-omap1/pm_bus.c:69:2: error: implicit declaration of function 'cpu_class_is_omap1'
make[1]: *** [arch/arm/mach-omap1/pm_bus.o] Error 1
Fixed by the usual change; it's below.
- Paul
--- arch/arm/mach-omap1/pm_bus.c | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/mach-omap1/pm_bus.c +2 -0
@@ -19,6 +19,8 @@#include <linux/clk.h> #include <linux/err.h> +#include "soc.h" +#ifdef CONFIG_PM_RUNTIME static int omap1_pm_runtime_suspend (struct device *dev) {
Signature · 1 line
1.7.10.4
Tony Lindgren
maintainerPATCH 10/16 ARM: OMAP: Make omap_device local to mach-omap2
Quoted 9 lines · Paul Walmsley
Hi Tony
Quoted 4 lines · Tony Lindgren
Let's make
omap_devicelocal to mach-omap2 for
ARM common zImage support.Signed-off-by Tony Lindgren <[email protected]>
Quoted 8 lines
This one breaks a 5912-only build:
arch/arm/mach-omap1/pm_bus.c: In function 'omap1_pm_runtime_init':arch/arm/mach-omap1/pm_bus.c:69:2: error: implicit declaration of function 'cpu_class_is_omap1'
make[1]: *** [arch/arm/mach-omap1/pm_bus.o] Error 1Fixed by the usual change; it's below.
Thanks. I've ran randonfigs on the omap-for-v3.8/cleanup-headers, but have not seen these.
Can you do a branch on top of omap-for-v3.8/cleanup-headers with all these fixes that I can pull in?
Regards,
Tony
Quoted 19 lines
arch/arm/mach-omap1/pm_bus.c | 2 ++ 1 file changed, 2 insertions(+)arch/arm/mach-omap1/pm_bus.c +2
-0@@ -19,6 +19,8 @@#include <linux/clk.h> #include <linux/err.h> +#include "soc.h" +#ifdef CONFIG_PM_RUNTIME static int omap1_pm_runtime_suspend (struct device *dev) {Signature · 1 line
1.7.10.4
Paul Walmsley
maintainerPATCH 10/16 ARM: OMAP: Make omap_device local to mach-omap2
Quoted 2 lines · Tony Lindgren
Can you do a branch on top of omap-for-v3.8/cleanup-headers with all these fixes that I can pull in?
Yes, will do that today.
- Paul
Tony Lindgren
maintainerPATCH 10/16 ARM: OMAP: Make omap_device local to mach-omap2
Quoted 6 lines · Paul Walmsley
Quoted 2 lines · Tony Lindgren
Can you do a branch on top of omap-for-v3.8/cleanup-headers with all these fixes that I can pull in?
Yes, will do that today.
OK thanks!
Tony
Paul Walmsley
maintainerPATCH 10/16 ARM: OMAP: Make omap_device local to mach-omap2
Quoted 9 lines · Tony Lindgren
Quoted 6 lines · Paul Walmsley
Quoted 2 lines · Tony Lindgren
Can you do a branch on top of omap-for-v3.8/cleanup-headers with all these fixes that I can pull in?
Yes, will do that today.
OK thanks!
Just sent the pull request. Are you planning to rebuild cleanup-prcm also when you pull those cleanup-headers fixes in? Am planning to send another PRCM cleanup pull request next week...
- Paul
Tony Lindgren
maintainerPATCH 10/16 ARM: OMAP: Make omap_device local to mach-omap2
Quoted 8 lines · Paul Walmsley
Quoted 6 lines · Tony Lindgren
Quoted 5 lines · Paul Walmsley
Quoted 2 lines · Tony Lindgren
Can you do a branch on top of omap-for-v3.8/cleanup-headers with all these fixes that I can pull in?
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Yes, will do that today.
OK thanks!
Just sent the pull request. Are you planning to rebuild cleanup-prcm also when you pull those cleanup-headers fixes in? Am planning to send another PRCM cleanup pull request next week...
I've merged omap-for-v3.8/cleanup-headers into omap-for-v3.8/cleanup-prcm too now, so you should be able to use commit 7fc54fd3 as the base for further PRCM changes.
Regards,
Tony
Paul Walmsley
maintainerPATCH 10/16 ARM: OMAP: Make omap_device local to mach-omap2
Quoted 3 lines · Tony Lindgren
I've merged omap-for-v3.8/cleanup-headers into omap-for-v3.8/cleanup-prcm too now, so you should be able to use commit
7fc54fd3as the base for further PRCM changes.
OK thanks, will do.
- Paul
Tony Lindgren
maintainerPATCH 11/16 ARM: OMAP: Make plat/omap_hwmod.h local to mach-omap2
In reply to Tony LindgrenLet's make omap_hwmod local to mach-omap2 for
ARM common zImage support.
Signed-off-by Tony Lindgren <[email protected]>
---
arch/arm/mach-omap2/clockdomain.h | 2 +-
arch/arm/mach-omap2/devices.c | 2 +-
arch/arm/mach-omap2/display.c | 2 +-
arch/arm/mach-omap2/dma.c | 2 +-
arch/arm/mach-omap2/drm.c | 2 +-
arch/arm/mach-omap2/gpio.c | 2 +-
arch/arm/mach-omap2/hdq1w.c | 2 +-
arch/arm/mach-omap2/hdq1w.h | 2 +-
arch/arm/mach-omap2/hwspinlock.c | 2 +-
arch/arm/mach-omap2/i2c.c | 2 +-
arch/arm/mach-omap2/io.c | 2 +-
arch/arm/mach-omap2/msdi.c | 2 +-
arch/arm/mach-omap2/mux.c | 2 +-
arch/arm/mach-omap2/omap_device.c | 2 +-
arch/arm/mach-omap2/omap_device.h | 2 +-
arch/arm/mach-omap2/omap_hwmod.c | 2 +-
arch/arm/mach-omap2/omap_hwmod.h | 0
arch/arm/mach-omap2/omap_hwmod_2420_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_2430_data.c | 2 +-
.../omap_hwmod_2xxx_3xxx_interconnect_data.c | 2 +-
.../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 2 +-
.../mach-omap2/omap_hwmod_2xxx_interconnect_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_common_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_common_data.h | 2 +-
arch/arm/mach-omap2/omap_opp_data.h | 2 +-
arch/arm/mach-omap2/pmu.c | 2 +-
arch/arm/mach-omap2/serial.c | 2 +-
arch/arm/mach-omap2/timer.c | 2 +-
arch/arm/mach-omap2/wd_timer.c | 2 +-
arch/arm/mach-omap2/wd_timer.h | 2 +-
34 files changed, 33 insertions(+), 33 deletions(-)
rename arch/arm/{plat-omap/include/plat/omap_hwmod.h => mach-omap2/omap_hwmod.h} (100%)arch/arm/mach-omap2/clockdomain.h +1 -1
@@ -19,7 +19,7 @@#include "powerdomain.h" #include <plat/clock.h> -#include <plat/omap_hwmod.h> +#include "omap_hwmod.h" #include <plat/cpu.h> /*
arch/arm/mach-omap2/devices.c +1 -1
@@ -25,7 +25,7 @@#include "iomap.h" #include <plat/dma.h> -#include <plat/omap_hwmod.h> +#include "omap_hwmod.h" #include "omap_device.h" #include "omap4-keypad.h"
arch/arm/mach-omap2/display.c +1 -1
@@ -25,7 +25,7 @@#include <linux/delay.h> #include <video/omapdss.h> -#include <plat/omap_hwmod.h> +#include "omap_hwmod.h" #include "omap_device.h" #include <plat/omap-pm.h> #include "common.h"
arch/arm/mach-omap2/dma.c +1 -1
@@ -28,7 +28,7 @@#include <linux/init.h> #include <linux/device.h> -#include <plat/omap_hwmod.h> +#include "omap_hwmod.h" #include "omap_device.h" #include <plat/dma.h>
arch/arm/mach-omap2/drm.c +1 -1
@@ -25,7 +25,7 @@#include <linux/dma-mapping.h> #include "omap_device.h" -#include <plat/omap_hwmod.h> +#include "omap_hwmod.h" #if defined(CONFIG_DRM_OMAP ) || (CONFIG_DRM_OMAP_MODULE )
arch/arm/mach-omap2/gpio.c +1 -1
@@ -23,7 +23,7 @@#include <linux/of.h> #include <linux/platform_data/gpio-omap.h> -#include <plat/omap_hwmod.h> +#include "omap_hwmod.h" #include "omap_device.h" #include <plat/omap-pm.h>
arch/arm/mach-omap2/hdq1w.c +1 -1
@@ -27,7 +27,7 @@#include <linux/err.h> #include <linux/platform_device.h> -#include <plat/omap_hwmod.h> +#include "omap_hwmod.h" #include "omap_device.h" #include "hdq1w.h"
arch/arm/mach-omap2/hdq1w.h +1 -1
@@ -21,7 +21,7 @@#ifndef ARCH_ARM_MACH_OMAP2_HDQ1W_H #define ARCH_ARM_MACH_OMAP2_HDQ1W_H -#include <plat/omap_hwmod.h> +#include "omap_hwmod.h" /* * XXX A future cleanup patch should modify
arch/arm/mach-omap2/hwspinlock.c +1 -1
@@ -21,7 +21,7 @@#include <linux/err.h> #include <linux/hwspinlock.h> -#include <plat/omap_hwmod.h> +#include "omap_hwmod.h" #include "omap_device.h" static struct hwspinlock_pdata omap_hwspinlock_pdata__initdata = {
arch/arm/mach-omap2/i2c.c +1 -1
@@ -22,7 +22,7 @@#include <linux/i2c-omap.h> #include "common.h" -#include <plat/omap_hwmod.h> +#include "omap_hwmod.h" #include "omap_device.h" #include <plat/omap-pm.h>
arch/arm/mach-omap2/io.c +1 -1
@@ -28,7 +28,7 @@#include <plat/sdrc.h> #include <plat/serial.h> #include <plat/omap-pm.h> -#include <plat/omap_hwmod.h> +#include "omap_hwmod.h" #include <plat/multi.h> #include <plat/dma.h>
arch/arm/mach-omap2/msdi.c +1 -1
@@ -25,7 +25,7 @@#include <linux/err.h> #include <linux/platform_data/gpio-omap.h> -#include <plat/omap_hwmod.h> +#include "omap_hwmod.h" #include "omap_device.h" #include "mmc.h"
arch/arm/mach-omap2/mux.c +1 -1
@@ -36,7 +36,7 @@#include <linux/interrupt.h> -#include <plat/omap_hwmod.h> +#include "omap_hwmod.h" #include "control.h" #include "mux.h"
arch/arm/mach-omap2/omap_device.c +1 -1
@@ -90,7 +90,7 @@#include <linux/notifier.h> #include "omap_device.h" -#include <plat/omap_hwmod.h> +#include "omap_hwmod.h" #include <plat/clock.h> /* These parameters are passed to _omap_device_{de,}activate() */
arch/arm/mach-omap2/omap_device.h +1 -1
@@ -34,7 +34,7 @@#include <linux/kernel.h> #include <linux/platform_device.h> -#include <plat/omap_hwmod.h> +#include "omap_hwmod.h" extern struct dev_pm_domain omap_device_pm_domain;
arch/arm/mach-omap2/omap_hwmod.c +1 -1
@@ -140,7 +140,7 @@#include <linux/bootmem.h> #include <plat/clock.h> -#include <plat/omap_hwmod.h> +#include "omap_hwmod.h" #include <plat/prcm.h> #include "soc.h"
arch/arm/mach-omap2/omap_hwmod.h renamed from arch/arm/plat-omap/include/plat/omap_hwmod.h +0 -0
arch/arm/mach-omap2/omap_hwmod_2420_data.c +1 -1
@@ -16,7 +16,7 @@#include <linux/i2c-omap.h> #include <linux/platform_data/spi-omap2-mcspi.h> -#include <plat/omap_hwmod.h> +#include "omap_hwmod.h" #include <plat/dma.h> #include <plat/serial.h> #include <plat/dmtimer.h>
arch/arm/mach-omap2/omap_hwmod_2430_data.c +1 -1
@@ -17,7 +17,7 @@#include <linux/platform_data/asoc-ti-mcbsp.h> #include <linux/platform_data/spi-omap2-mcspi.h> -#include <plat/omap_hwmod.h> +#include "omap_hwmod.h" #include <plat/dma.h> #include <plat/serial.h> #include <plat/dmtimer.h>
arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_interconnect_data.c +1 -1
@@ -13,7 +13,7 @@*/ #include <asm/sizes.h> -#include <plat/omap_hwmod.h> +#include "omap_hwmod.h" #include <plat/serial.h> #include "omap_hwmod_common_data.h"
arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c +1 -1
@@ -9,7 +9,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#include <plat/omap_hwmod.h> +#include "omap_hwmod.h" #include <plat/serial.h> #include <plat/dma.h> #include "../plat-omap/common.h"
arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c +1 -1
@@ -13,7 +13,7 @@*/ #include <asm/sizes.h> -#include <plat/omap_hwmod.h> +#include "omap_hwmod.h" #include <plat/serial.h> #include "l3_2xxx.h" #include "l4_2xxx.h"
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c +1 -1
@@ -8,7 +8,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#include <plat/omap_hwmod.h> +#include "omap_hwmod.h" #include <plat/serial.h> #include <linux/platform_data/gpio-omap.h> #include <plat/dma.h>
arch/arm/mach-omap2/omap_hwmod_33xx_data.c +1 -1
@@ -16,7 +16,7 @@#include <linux/i2c-omap.h> -#include <plat/omap_hwmod.h> +#include "omap_hwmod.h" #include <plat/cpu.h> #include <linux/platform_data/gpio-omap.h> #include <linux/platform_data/spi-omap2-mcspi.h>
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +1 -1
@@ -19,7 +19,7 @@#include <linux/power/smartreflex.h> #include <linux/platform_data/gpio-omap.h> -#include <plat/omap_hwmod.h> +#include "omap_hwmod.h" #include <plat/dma.h> #include <plat/serial.h> #include "l3_3xxx.h"
arch/arm/mach-omap2/omap_hwmod_44xx_data.c +1 -1
@@ -23,7 +23,7 @@#include <linux/power/smartreflex.h> #include <linux/i2c-omap.h> -#include <plat/omap_hwmod.h> +#include "omap_hwmod.h" #include <plat/dma.h> #include <linux/platform_data/spi-omap2-mcspi.h> #include <linux/platform_data/asoc-ti-mcbsp.h>
arch/arm/mach-omap2/omap_hwmod_common_data.c +1 -1
@@ -16,7 +16,7 @@* data and their integration with other OMAP modules and Linux. */ -#include <plat/omap_hwmod.h> +#include "omap_hwmod.h" #include "omap_hwmod_common_data.h"
arch/arm/mach-omap2/omap_hwmod_common_data.h +1 -1
@@ -13,7 +13,7 @@#ifndef __ARCH_ARM_MACH_OMAP2_OMAP_HWMOD_COMMON_DATA_H#define __ARCH_ARM_MACH_OMAP2_OMAP_HWMOD_COMMON_DATA_H -#include <plat/omap_hwmod.h> +#include "omap_hwmod.h" #include "common.h" #include "display.h"
arch/arm/mach-omap2/omap_opp_data.h +1 -1
@@ -19,7 +19,7 @@#ifndef __ARCH_ARM_MACH_OMAP2_OMAP_OPP_DATA_H#define __ARCH_ARM_MACH_OMAP2_OMAP_OPP_DATA_H -#include <plat/omap_hwmod.h> +#include "omap_hwmod.h" #include "voltage.h"
arch/arm/mach-omap2/pmu.c +1 -1
@@ -15,7 +15,7 @@#include <asm/pmu.h> -#include <plat/omap_hwmod.h> +#include "omap_hwmod.h" #include "omap_device.h" static char *omap2_pmu_oh_names[] = {"mpu" };
arch/arm/mach-omap2/serial.c +1 -1
@@ -30,7 +30,7 @@#include <plat/omap-serial.h> #include "common.h" #include <plat/dma.h> -#include <plat/omap_hwmod.h> +#include "omap_hwmod.h" #include "omap_device.h" #include <plat/omap-pm.h> #include <plat/serial.h>
arch/arm/mach-omap2/timer.c +1 -1
@@ -43,7 +43,7 @@#include <asm/sched_clock.h> #include <asm/arch_timer.h> -#include <plat/omap_hwmod.h> +#include "omap_hwmod.h" #include "omap_device.h" #include <plat/dmtimer.h> #include <plat/omap-pm.h>
arch/arm/mach-omap2/wd_timer.c +1 -1
@@ -11,7 +11,7 @@#include <linux/io.h> #include <linux/err.h> -#include <plat/omap_hwmod.h> +#include "omap_hwmod.h" #include "wd_timer.h" #include "common.h"
arch/arm/mach-omap2/wd_timer.h +1 -1
@@ -10,7 +10,7 @@#ifndef __ARCH_ARM_MACH_OMAP2_WD_TIMER_H#define __ARCH_ARM_MACH_OMAP2_WD_TIMER_H -#include <plat/omap_hwmod.h> +#include "omap_hwmod.h" extern int omap2_wd_timer_disable (struct omap_hwmod *oh);extern int omap2_wd_timer_reset (struct omap_hwmod *oh);
Tony Lindgren
maintainerPATCH 12/16 ARM: OMAP: Merge plat/multi.h into plat/cpu.h
In reply to Tony LindgrenThis is private to cpu.h and no other places should need to include it and we can drop the include in mach-omap2/io.c.
Signed-off-by Tony Lindgren <[email protected]>
--- arch/arm/mach-omap2/io.c | 1 arch/arm/plat-omap/include/plat/cpu.h | 96 +++++++++++++++++++++++++ arch/arm/plat-omap/include/plat/multi.h | 120 ------------------------------- 3 files changed, 95 insertions(+), 122 deletions(-) delete mode 100644 arch/arm/plat-omap/include/plat/multi.h
arch/arm/mach-omap2/io.c +0 -1
@@ -29,7 +29,6 @@#include <plat/serial.h> #include <plat/omap-pm.h> #include "omap_hwmod.h" -#include <plat/multi.h> #include <plat/dma.h> #include "../plat-omap/sram.h"
arch/arm/plat-omap/include/plat/cpu.h +95 -1
102 lines not on this page · raw message
arch/arm/plat-omap/include/plat/multi.h deleted +0 -120
120 lines not on this page · raw message
Tony Lindgren
maintainerPATCH 13/16 ARM: OMAP: Split uncompress.h to mach-omap1 and mach-omap2
In reply to Tony LindgrenThis allows us to eventually move omap2+ to generic debug code that's configured in Kconfig for the port.
Signed-off-by Tony Lindgren <[email protected]>
--- arch/arm/mach-omap1/include/mach/uncompress.h | 121 +++++++++++++++ arch/arm/mach-omap2/include/mach/uncompress.h | 175 +++++++++++++++++++++ arch/arm/plat-omap/include/plat/uncompress.h | 204 ------------------------- 3 files changed, 292 insertions(+), 208 deletions(-) delete mode 100644 arch/arm/plat-omap/include/plat/uncompress.h
arch/arm/mach-omap1/include/mach/uncompress.h +119 -2
@@ -1,5 +1,122 @@/* -* arch/arm/mach-omap1/include/mach/uncompress.h +* arch/arm/plat-omap/include/mach/uncompress.h +* +* Serial port stubs for kernel decompress status messages +* +* Initially based on: +* linux-2.4.15-rmk1-dsplinux1.6/arch/arm/plat-omap/include/mach1510/uncompress.h +* Copyright (C) 2000 RidgeRun, Inc. +* Author: Greg Lonnon <[email protected]> +* +* Rewritten by: +* Author: <[email protected]> +* 2004 (c) MontaVista Software, Inc. +* +* This file is licensed under the terms of the GNU General Public License +* version 2. This program is licensed "as is" without any warranty of any +* kind, whether express or implied. */ -#include <plat/uncompress.h> +#include <linux/types.h> +#include <linux/serial_reg.h> + +#include <asm/memory.h> +#include <asm/mach-types.h> + +#include <plat/serial.h> + +#define MDR1_MODE_MASK 0x07 + +volatile u8 *uart_base; +int uart_shift; + +/* +* Store the DEBUG_LL uart number into memory. +* See also debug-macro.S, and serial.c for related code. +*/ +static void set_omap_uart_info (unsigned char port) +{ +/* +* Get address of some.bss variable and round it down +* a la CONFIG_AUTO_ZRELADDR. +*/ +u32 ram_start = (u32)&uart_shift &0xf8000000 ; +u32 *uart_info = (u32 *)(ram_start +OMAP_UART_INFO_OFS ); + *uart_info = port; +} + +static void putc (int c) +{ +if (!uart_base) +return ; + +/* Check for UART 16x mode */ +if ((uart_base[UART_OMAP_MDR1 << uart_shift] &MDR1_MODE_MASK ) !=0 ) +return ; + +while (!(uart_base[UART_LSR << uart_shift] &UART_LSR_THRE )) +barrier (); + uart_base[UART_TX << uart_shift] = c; +} + +static inline void flush (void ) +{ +} + +/* +* Macros to configure UART1 and debug UART +*/ +#define _DEBUG_LL_ENTRY (mach, dbg_uart, dbg_shft, dbg_id) \ + if (machine_is_##mach()) { \ + uart_base = (volatile u8 *)(dbg_uart); \ + uart_shift = (dbg_shft); \ + port = (dbg_id); \ + set_omap_uart_info(port); \ + break; \ + } + +#define DEBUG_LL_OMAP7XX (p, mach) \ + _DEBUG_LL_ENTRY(mach, OMAP1_UART##p##_BASE, OMAP7XX_PORT_SHIFT, \ + OMAP1UART##p) + +#define DEBUG_LL_OMAP1 (p, mach) \ + _DEBUG_LL_ENTRY(mach, OMAP1_UART##p##_BASE, OMAP_PORT_SHIFT, \ + OMAP1UART##p) + +static inline void arch_decomp_setup (void ) +{ +int port =0 ; + +/* +* Initialize the port based on the machine ID from the bootloader. +* Note that we're using macros here instead of switch statement +* as machine_is functions are optimized out for the boards that +* are not selected. +*/ +do { +/* omap7xx/8xx based boards using UART1 with shift 0 */ +DEBUG_LL_OMAP7XX (1 , herald); +DEBUG_LL_OMAP7XX (1 , omap_perseus2); + +/* omap15xx/16xx based boards using UART1 */ +DEBUG_LL_OMAP1 (1 , ams_delta); +DEBUG_LL_OMAP1 (1 , nokia770); +DEBUG_LL_OMAP1 (1 , omap_h2); +DEBUG_LL_OMAP1 (1 , omap_h3); +DEBUG_LL_OMAP1 (1 , omap_innovator); +DEBUG_LL_OMAP1 (1 , omap_osk); +DEBUG_LL_OMAP1 (1 , omap_palmte); +DEBUG_LL_OMAP1 (1 , omap_palmz71); + +/* omap15xx/16xx based boards using UART2 */ +DEBUG_LL_OMAP1 (2 , omap_palmtt); + +/* omap15xx/16xx based boards using UART3 */ +DEBUG_LL_OMAP1 (3 , sx1); + }while (0 ); +} + +/* +* nothing to do +*/ +#define arch_decomp_wdog ()
arch/arm/mach-omap2/include/mach/uncompress.h +173 -2
178 lines not on this page · raw message
arch/arm/plat-omap/include/plat/uncompress.h deleted +0 -204
204 lines not on this page · raw message
Tony Lindgren
maintainerPATCH 14/16 ARM: OMAP: Split plat/serial.h for omap1 and omap2+
In reply to Tony LindgrenFor omap1, we'll keep mach/serial.h around for 8250.c hardware workarounds. For omap2+, we no longer need mach/serial.h and can make it local to mach-omap2.
Signed-off-by Tony Lindgren <[email protected]>
---
arch/arm/mach-omap1/include/mach/debug-macro.S | 2 -
arch/arm/mach-omap1/include/mach/hardware.h | 2 -
arch/arm/mach-omap1/include/mach/serial.h | 53 ++++++++++++++++++++
arch/arm/mach-omap1/include/mach/uncompress.h | 2 -
arch/arm/mach-omap2/board-rm680.c | 1
arch/arm/mach-omap2/common.h | 2 -
arch/arm/mach-omap2/include/mach/debug-macro.S | 2 -
arch/arm/mach-omap2/include/mach/uncompress.h | 2 -
arch/arm/mach-omap2/io.c | 2 -
arch/arm/mach-omap2/omap_hwmod_2420_data.c | 1
arch/arm/mach-omap2/omap_hwmod_2430_data.c | 1
.../omap_hwmod_2xxx_3xxx_interconnect_data.c | 1
.../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 1
.../mach-omap2/omap_hwmod_2xxx_interconnect_data.c | 2 -
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 1
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 2 -
arch/arm/mach-omap2/serial.c | 2 -
arch/arm/mach-omap2/serial.h | 11 ----
18 files changed, 63 insertions(+), 27 deletions(-)
create mode 100644 arch/arm/mach-omap1/include/mach/serial.h
rename arch/arm/{plat-omap/include/plat/serial.h => mach-omap2/serial.h} (91%)arch/arm/mach-omap1/include/mach/debug-macro.S +1 -1
@@ -13,7 +13,7 @@ #include <linux/serial_reg.h> -#include <plat/serial.h> +#include "serial.h" .pushsection .data omap_uart_phys: .word 0x0
arch/arm/mach-omap1/include/mach/hardware.h +1 -1
@@ -72,7 +72,7 @@ static inline u32 omap_cs3_phys(void)#endif /* ifndef __ASSEMBLER__ */ -#include <plat/serial.h> +#include <mach/serial.h> /* * ---------------------------------------------------------------------------
arch/arm/mach-omap1/include/mach/serial.h new file +53 -0
53 lines not on this page · raw message
arch/arm/mach-omap1/include/mach/uncompress.h +1 -1
@@ -23,7 +23,7 @@#include <asm/memory.h> #include <asm/mach-types.h> -#include <plat/serial.h> +#include "serial.h" #define MDR1_MODE_MASK 0x07
arch/arm/mach-omap2/board-rm680.c +0 -1
@@ -26,7 +26,6 @@#include <plat/usb.h> #include <plat/gpmc.h> #include "common.h" -#include <plat/serial.h> #include "mux.h" #include "hsmmc.h"
arch/arm/mach-omap2/common.h +1 -1
@@ -35,10 +35,10 @@#include <asm/proc-fns.h> #include <plat/cpu.h> -#include <plat/serial.h> #include "../plat-omap/common.h" #include "i2c.h" +#include "serial.h" #define OMAP_INTC_START NR_IRQS
arch/arm/mach-omap2/include/mach/debug-macro.S +1 -1
@@ -13,7 +13,7 @@ #include <linux/serial_reg.h> -#include <plat/serial.h> +#include <../mach-omap2/serial.h> #define UART_OFFSET(addr) ((addr) & 0x00ffffff)
arch/arm/mach-omap2/include/mach/uncompress.h +1 -1
@@ -23,7 +23,7 @@#include <asm/memory.h> #include <asm/mach-types.h> -#include <plat/serial.h> +#include <../mach-omap2/serial.h> #define MDR1_MODE_MASK 0x07
arch/arm/mach-omap2/io.c +1 -1
@@ -26,7 +26,6 @@#include <asm/mach/map.h> #include <plat/sdrc.h> -#include <plat/serial.h> #include <plat/omap-pm.h> #include "omap_hwmod.h" #include <plat/dma.h>
@@ -43,6 +42,7 @@#include "clock2xxx.h" #include "clock3xxx.h" #include "clock44xx.h" +#include "serial.h" /* * The machine specific code may provide the extra mapping besides the
arch/arm/mach-omap2/omap_hwmod_2420_data.c +0 -1
@@ -18,7 +18,6 @@#include "omap_hwmod.h" #include <plat/dma.h> -#include <plat/serial.h> #include <plat/dmtimer.h> #include "l3_2xxx.h" #include "l4_2xxx.h"
arch/arm/mach-omap2/omap_hwmod_2430_data.c +0 -1
@@ -19,7 +19,6 @@#include "omap_hwmod.h" #include <plat/dma.h> -#include <plat/serial.h> #include <plat/dmtimer.h> #include "mmc.h" #include "l3_2xxx.h"
arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_interconnect_data.c +0 -1
@@ -14,7 +14,6 @@#include <asm/sizes.h> #include "omap_hwmod.h" -#include <plat/serial.h> #include "omap_hwmod_common_data.h"
arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c +0 -1
@@ -10,7 +10,6 @@* published by the Free Software Foundation. */ #include "omap_hwmod.h" -#include <plat/serial.h> #include <plat/dma.h> #include "../plat-omap/common.h" #include "hdq1w.h"
arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c +1 -1
@@ -14,9 +14,9 @@#include <asm/sizes.h> #include "omap_hwmod.h" -#include <plat/serial.h> #include "l3_2xxx.h" #include "l4_2xxx.h" +#include "serial.h" #include "omap_hwmod_common_data.h"
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c +0 -1
@@ -9,7 +9,6 @@* published by the Free Software Foundation. */ #include "omap_hwmod.h" -#include <plat/serial.h> #include <linux/platform_data/gpio-omap.h> #include <plat/dma.h> #include <plat/dmtimer.h>
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +1 -1
@@ -21,7 +21,6 @@#include "omap_hwmod.h" #include <plat/dma.h> -#include <plat/serial.h> #include "l3_3xxx.h" #include "l4_3xxx.h" #include "mmc.h"
@@ -38,6 +37,7 @@#include "cm-regbits-34xx.h" #include "i2c.h" #include "wd_timer.h" +#include "serial.h" /* * OMAP3xxx hardware module integration data
arch/arm/mach-omap2/serial.c +1 -1
@@ -33,7 +33,6 @@#include "omap_hwmod.h" #include "omap_device.h" #include <plat/omap-pm.h> -#include <plat/serial.h> #include "prm2xxx_3xxx.h" #include "pm.h"
@@ -41,6 +40,7 @@#include "prm-regbits-34xx.h" #include "control.h" #include "mux.h" +#include "serial.h" /* * NOTE: By default the serial auto_suspend timeout is disabled as it causes
arch/arm/mach-omap2/serial.h renamed from arch/arm/plat-omap/include/plat/serial.h +0 -11
@@ -29,11 +29,6 @@*/ #define OMAP_UART_INFO_OFS 0x3ffc -/* OMAP1 serial ports */ -#define OMAP1_UART1_BASE 0xfffb0000 -#define OMAP1_UART2_BASE 0xfffb0800 -#define OMAP1_UART3_BASE 0xfffb9800 -/* OMAP2 serial ports */ #define OMAP2_UART1_BASE 0x4806a000#define OMAP2_UART2_BASE 0x4806c000
@@ -76,20 +71,14 @@#define ZOOM_UART_VIRT 0xfa400000#define OMAP_PORT_SHIFT 2 -#define OMAP7XX_PORT_SHIFT 0#define ZOOM_PORT_SHIFT 1 -#define OMAP1510_BASE_BAUD (12000000/16) -#define OMAP16XX_BASE_BAUD (48000000/16)#define OMAP24XX_BASE_BAUD (48000000/16)/* * DEBUG_LL port encoding stored into the UART1 scratchpad register by * decomp_setup in uncompress.h */ -#define OMAP1UART1 11 -#define OMAP1UART2 12 -#define OMAP1UART3 13#define OMAP2UART1 21#define OMAP2UART2 22#define OMAP2UART3 23
Tony Lindgren
maintainerPATCH 15/16 ARM: OMAP: Move plat/omap-serial.h to linux/platform_data/serial-omap.h
In reply to Tony LindgrenWe cannot keep this in plat for ARM common zImage work. Some of the defines are local to the omap-serial.c driver, so move the defines there.
Also rename DRIVER_NAME to OMAP_SERIAL_DRIVER_NAME to avoid confusion.
Note that patch depends on at least omap patch "ARM: OMAP: Split plat/serial.h for omap1 and omap2+".
Cc Alan Cox <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Govindraj.R <[email protected]>
Cc linux-serial at vger.kernel.org
Signed-off-by Tony Lindgren <[email protected]>
--- arch/arm/mach-omap2/serial.c | 5 ++- drivers/tty/serial/omap-serial.c | 35 ++++++++++++++++++++-- include/linux/platform_data/serial-omap.h | 40 +------------------------ 3 files changed, 36 insertions(+), 44 deletions(-) rename arch/arm/plat-omap/include/plat/omap-serial.h => include/linux/platform_data/serial-omap.h (67%)
arch/arm/mach-omap2/serial.c +3 -2
@@ -26,8 +26,9 @@#include <linux/slab.h> #include <linux/pm_runtime.h> #include <linux/console.h> +#include <linux/serial_core.h> +#include <linux/platform_data/serial-omap.h> -#include <plat/omap-serial.h> #include "common.h" #include <plat/dma.h> #include "omap_hwmod.h"
@@ -293,7 +294,7 @@ void __init omap_serial_init_port(struct omap_board_data *bdata, info = omap_serial_default_info; oh = uart->oh; - name =DRIVER_NAME ; + name =OMAP_SERIAL_DRIVER_NAME ; omap_up.dma_enabled = info->dma_enabled; omap_up.uartclk =OMAP24XX_BASE_BAUD *16 ;
drivers/tty/serial/omap-serial.c +32 -3
@@ -38,11 +38,11 @@#include <linux/serial_core.h> #include <linux/irq.h> #include <linux/pm_runtime.h> +#include <linux/pm_qos.h> #include <linux/of.h> #include <linux/gpio.h> #include <linux/pinctrl/consumer.h> - -#include <plat/omap-serial.h> +#include <linux/platform_data/serial-omap.h> #define UART_BUILD_REVISION (x, y) (((x) << 8) | (y))
@@ -71,6 +71,35 @@#define OMAP_UART_MVR_MAJ_SHIFT 8#define OMAP_UART_MVR_MIN_MASK 0x3f +#define OMAP_MODE13X_SPEED 230400 + +#define OMAP_UART_SCR_TX_EMPTY 0x08 + +/* WER = 0x7F +* Enable module level wakeup in WER reg +*/ +#define OMAP_UART_WER_MOD_WKUP 0X7F + +/* Enable XON/XOFF flow control on output */ +#define OMAP_UART_SW_TX 0x8 + +/* Enable XON/XOFF flow control on input */ +#define OMAP_UART_SW_RX 0x2 + +#define OMAP_UART_SYSC_RESET 0X07 +#define OMAP_UART_TCR_TRIG 0X0F +#define OMAP_UART_SW_CLR 0XF0 +#define OMAP_UART_FIFO_CLR 0X06 + +#define OMAP_UART_DMA_CH_FREE -1 + +#define OMAP_MAX_HSUART_PORTS 6 + +#define MSR_SAVE_FLAGS UART_MSR_ANY_DELTA + +#define UART_ERRATA_i202_MDR1_ACCESS BIT(0) +#define UART_ERRATA_i291_DMA_FORCEIDLE BIT(1) +struct uart_omap_port {struct uart_port port;struct uart_omap_dma uart_dma;
@@ -1588,7 +1617,7 @@ static struct platform_driver serial_omap_driver = { .probe = serial_omap_probe, .remove = __devexit_p(serial_omap_remove), .driver = { - .name = DRIVER_NAME, + .name = OMAP_SERIAL_DRIVER_NAME, .pm = &serial_omap_dev_pm_ops, .of_match_table = of_match_ptr(omap_serial_of_match), },
include/linux/platform_data/serial-omap.h renamed from arch/arm/plat-omap/include/plat/omap-serial.h +1 -39
@@ -14,14 +14,7 @@* (at your option) any later version. */ -#ifndef __OMAP_SERIAL_H__ -#define __OMAP_SERIAL_H__ - -#include <linux/serial_core.h> -#include <linux/device.h> -#include <linux/pm_qos.h> - -#define DRIVER_NAME "omap_uart" +#define OMAP_SERIAL_DRIVER_NAME "omap_uart"/* * Use tty device name as ttyO, [O -> OMAP]
@@ -30,35 +23,6 @@*/ #define OMAP_SERIAL_NAME "ttyO" -#define OMAP_MODE13X_SPEED 230400 - -#define OMAP_UART_SCR_TX_EMPTY 0x08 - -/* WER = 0x7F -* Enable module level wakeup in WER reg -*/ -#define OMAP_UART_WER_MOD_WKUP 0X7F - -/* Enable XON/XOFF flow control on output */ -#define OMAP_UART_SW_TX 0x8 - -/* Enable XON/XOFF flow control on input */ -#define OMAP_UART_SW_RX 0x2 - -#define OMAP_UART_SYSC_RESET 0X07 -#define OMAP_UART_TCR_TRIG 0X0F -#define OMAP_UART_SW_CLR 0XF0 -#define OMAP_UART_FIFO_CLR 0X06 - -#define OMAP_UART_DMA_CH_FREE -1 - -#define OMAP_MAX_HSUART_PORTS 6 - -#define MSR_SAVE_FLAGS UART_MSR_ANY_DELTA - -#define UART_ERRATA_i202_MDR1_ACCESS BIT(0) -#define UART_ERRATA_i291_DMA_FORCEIDLE BIT(1) -struct omap_uart_port_info {bool dma_enabled;/* To specify DMA Mode */ unsigned int uartclk;/* UART clock rate */
@@ -102,5 +66,3 @@ struct uart_omap_dma {unsigned int rx_poll_rate;unsigned int rx_timeout; }; - -#endif /* __OMAP_SERIAL_H__ */
Tony Lindgren
maintainerPATCH 16/16 ARM: OMAP: Make plat/omap-pm.h local to mach-omap2
In reply to Tony LindgrenWe must move this for ARM common zImage support.
Note that neither drivers/media/rc/ir-rx51.c or drivers/media/platform/omap3isp/ispvideo.c need to include omap-pm.h, so this patch removes the include for those files.
Cc Laurent Pinchart <[email protected]>
Cc Mauro Carvalho Chehab <[email protected]>
Cc Timo Kokkonen <[email protected]>
Cc linux-media at vger.kernel.org
Signed-off-by Tony Lindgren <[email protected]>
---
arch/arm/mach-omap1/pm_bus.c | 2 --
arch/arm/mach-omap2/board-rx51-peripherals.c | 2 +-
arch/arm/mach-omap2/display.c | 2 +-
arch/arm/mach-omap2/dsp.c | 2 +-
arch/arm/mach-omap2/gpio.c | 2 +-
arch/arm/mach-omap2/hsmmc.c | 2 +-
arch/arm/mach-omap2/i2c.c | 2 +-
arch/arm/mach-omap2/io.c | 2 +-
arch/arm/mach-omap2/omap-pm.h | 0
arch/arm/mach-omap2/pm-debug.c | 2 +-
arch/arm/mach-omap2/pm.c | 2 +-
arch/arm/mach-omap2/serial.c | 2 +-
arch/arm/mach-omap2/timer.c | 2 +-
arch/arm/plat-omap/dmtimer.c | 3 ++-
arch/arm/plat-omap/omap-pm-noop.c | 4 +---
drivers/media/platform/omap3isp/ispvideo.c | 1 -
drivers/media/rc/ir-rx51.c | 1 -
17 files changed, 14 insertions(+), 19 deletions(-)
rename arch/arm/{plat-omap/include/plat/omap-pm.h => mach-omap2/omap-pm.h} (100%)arch/arm/mach-omap1/pm_bus.c +0 -2
@@ -19,8 +19,6 @@#include <linux/clk.h> #include <linux/err.h> -#include <plat/omap-pm.h> -#ifdef CONFIG_PM_RUNTIME static int omap1_pm_runtime_suspend (struct device *dev) {
arch/arm/mach-omap2/board-rx51-peripherals.c +1 -1
@@ -33,7 +33,7 @@#include "common.h" #include <plat/dma.h> #include <plat/gpmc.h> -#include <plat/omap-pm.h> +#include "omap-pm.h" #include "gpmc-smc91x.h" #include "board-rx51.h"
arch/arm/mach-omap2/display.c +1 -1
@@ -27,7 +27,7 @@#include <video/omapdss.h> #include "omap_hwmod.h" #include "omap_device.h" -#include <plat/omap-pm.h> +#include "omap-pm.h" #include "common.h" #include "iomap.h"
arch/arm/mach-omap2/dsp.c +1 -1
@@ -27,7 +27,7 @@#include "cm2xxx_3xxx.h" #include "prm2xxx_3xxx.h" #ifdef CONFIG_BRIDGE_DVFS -#include <plat/omap-pm.h> +#include "omap-pm.h" #endif #include <linux/platform_data/dsp-omap.h>
arch/arm/mach-omap2/gpio.c +1 -1
@@ -25,7 +25,7 @@#include "omap_hwmod.h" #include "omap_device.h" -#include <plat/omap-pm.h> +#include "omap-pm.h" #include "powerdomain.h"
arch/arm/mach-omap2/hsmmc.c +1 -1
@@ -18,7 +18,7 @@#include <linux/platform_data/gpio-omap.h> #include "mmc.h" -#include <plat/omap-pm.h> +#include "omap-pm.h" #include "omap_device.h" #include "mux.h"
arch/arm/mach-omap2/i2c.c +1 -1
@@ -24,7 +24,7 @@#include "common.h" #include "omap_hwmod.h" #include "omap_device.h" -#include <plat/omap-pm.h> +#include "omap-pm.h" #include "mux.h" #include "i2c.h"
arch/arm/mach-omap2/io.c +1 -1
@@ -26,7 +26,7 @@#include <asm/mach/map.h> #include <plat/sdrc.h> -#include <plat/omap-pm.h> +#include "omap-pm.h" #include "omap_hwmod.h" #include <plat/dma.h>
arch/arm/mach-omap2/omap-pm.h renamed from arch/arm/plat-omap/include/plat/omap-pm.h +0 -0
arch/arm/mach-omap2/pm-debug.c +1 -1
@@ -31,7 +31,7 @@#include "powerdomain.h" #include "clockdomain.h" #include <plat/dmtimer.h> -#include <plat/omap-pm.h> +#include "omap-pm.h" #include "cm2xxx_3xxx.h" #include "prm2xxx_3xxx.h"
arch/arm/mach-omap2/pm.c +1 -1
@@ -19,7 +19,7 @@#include <asm/system_misc.h> -#include <plat/omap-pm.h> +#include "omap-pm.h" #include "omap_device.h" #include "common.h"
arch/arm/mach-omap2/serial.c +1 -1
@@ -33,7 +33,7 @@#include <plat/dma.h> #include "omap_hwmod.h" #include "omap_device.h" -#include <plat/omap-pm.h> +#include "omap-pm.h" #include "prm2xxx_3xxx.h" #include "pm.h"
arch/arm/mach-omap2/timer.c +1 -1
@@ -46,7 +46,7 @@#include "omap_hwmod.h" #include "omap_device.h" #include <plat/dmtimer.h> -#include <plat/omap-pm.h> +#include "omap-pm.h" #include "soc.h" #include "common.h"
arch/arm/plat-omap/dmtimer.c +2 -1
@@ -42,10 +42,11 @@#include <linux/pm_runtime.h> #include <plat/dmtimer.h> -#include <plat/omap-pm.h> #include <mach/hardware.h> +#include "../mach-omap2/omap-pm.h" +static u32 omap_reserved_systimers;static LIST_HEAD (omap_timer_list);static DEFINE_SPINLOCK (dm_timer_lock);
arch/arm/plat-omap/omap-pm-noop.c +1 -3
@@ -22,10 +22,8 @@#include <linux/device.h> #include <linux/platform_device.h> -/* Interface documentation is in mach/omap-pm.h */ -#include <plat/omap-pm.h> -#include "../mach-omap2/omap_device.h" +#include "../mach-omap2/omap-pm.h" static bool off_mode_enabled;static int dummy_context_loss_counter;
drivers/media/platform/omap3isp/ispvideo.c +0 -1
@@ -36,7 +36,6 @@#include <media/v4l2-ioctl.h> #include <plat/iommu.h> #include <plat/iovmm.h> -#include <plat/omap-pm.h> #include "ispvideo.h" #include "isp.h"
drivers/media/rc/ir-rx51.c +0 -1
@@ -28,7 +28,6 @@#include <plat/dmtimer.h> #include <plat/clock.h> -#include <plat/omap-pm.h> #include <media/lirc.h> #include <media/lirc_dev.h>
PATCH 16/16 ARM: OMAP: Make plat/omap-pm.h local to mach-omap2
Hi Tony,
Thanks for the patch.
Quoted 6 lines · On Thursday 04 October 2012 15:05:10 Tony Lindgren wrote:
We must move this for ARM common zImage support.
Note that neither
drivers/media/rc/ir-rx51.cordrivers/media/platform/omap3isp/ispvideo.cneed to includeomap-pm.h, so this patch removes the include for those files.
drivers/media/platform/omap3isp/ispvideo.c used omap-pm.h APIs in the past, we forgot to remove the #include when we changed that.
For the OMAP3 ISP driver,
Acked-by Laurent Pinchart <[email protected]>
Quoted 5 lines
Cc Laurent Pinchart <[email protected]>Cc Mauro Carvalho Chehab <[email protected]>Cc Timo Kokkonen <[email protected]>Signed-off-by Tony Lindgren <[email protected]>
Signature · 3 lines
Regards, Laurent Pinchart
cover More omap plat header cleanup for v3.8 merge window
In reply to Tony LindgrenTony,
Quoted 7 lines · Tony Lindgren
Hi all,
Here are some more patches for early merging after -rc1 for v3.8 merge window to remove more plat includes for the ARM common zImage support. These are based on top of current linux next + kevin's cpufreq fixes.
Have scanned the series and movement looks fine. For the SRAM movement, I just wanted to to check if the builds are fine with errata WA enabled for OMAP4. Do you have a branch where you are stacking up these patches?
Regards
santosh
cover More omap plat header cleanup for v3.8 merge window
Quoted 5 lines · Santosh Shilimkar
Tony,
Quoted 2 lines · Tony Lindgren
Hi all,
Quoted 9 lines
Quoted 5 lines
Here are some more patches for early merging after -rc1 for v3.8 merge window to remove more plat includes for the ARM common zImage support. These are based on top of current linux next + kevin's cpufreq fixes.
Have scanned the series and movement looks fine. For the SRAM movement, I just wanted to to check if the builds are fine with errata WA enabled for OMAP4. Do you have a branch where you are stacking up these patches?
Found the branch 'tmp-testing-header-cleanup' which had these patches. Did few build test along with the errata related build. No issues seen.
Feel free to add my ack for the series.