Skip to content

Clean up omap24xx.h symbolic constants

Paul Walmsley linux-omap 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest5 patches 6 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/5omap2: modify omap24xx.h to improve constant names and prepare for multi-arch kernelsinclude/asm-arm/arch-omap/io.h include/asm-arm/arch-omap/omap24xx.h+51 -270 replies
2/5omap2: use OMAP24XX_32KSYNCT_BASE in place of OMAP_32KSYNCT_BASEarch/arm/mach-omap2/pm.c arch/arm/mach-omap2/sram-fn.S arch/arm/plat-omap/common.c +2 more+4 -50 replies
3/5omap2: use PRCM_BASE in place of OMAP24XX_PRCM_BASEarch/arm/mach-omap2/mmu.c arch/arm/mach-omap2/pm.c arch/arm/mach-omap2/prcm-regs.h +2 more+9 -100 replies
4/5omap2: use SDRC_BASE in place of OMAP24XX_SDRC_BASEarch/arm/mach-omap2/prcm-regs.h arch/arm/mach-omap2/sleep.S arch/arm/mach-omap2/sram-fn.S +2 more+16 -150 replies
5/5omap2: use CTRL_BASE in place of OMAP24XX_CTRL_BASEarch/arm/mach-omap2/prcm-regs.h arch/arm/plat-omap/mux.c include/asm-arm/arch-omap/omap24xx.h+4 -60 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 0/5] Clean up omap24xx.h symbolic constants

These patches clean up the symbolic constants defined in include/asm-arm/arch-omap/omap24xx.h. The names of some constants, like OMAP24XX_SDRC_BASE, denote that their values are the same on all OMAP24XX platforms. This isn't so - the constant is defined to different values depending on the Kconfig architecture parameters. Also, we'd eventually like to create kernels that can be used on both 2420 or 2430, with runtime CPU detection. These types of defines prevent that from happening.

Fix these defines by explicitly defining separate constants for both architectures, when the values are different. Use ifdefs to control which value is assigned to the "base name" of the constant.

So, to continue the example above, the OMAP24XX_SDRC_BASE constant will be removed, and replaced with two defines: OMAP2420_SDRC_BASE and OMAP243X_SDRC_BASE. Depending on which CONFIG_ARCH_OMAP* Kconfig parameter is specified, we then set an SDRC_BASE define to point to one of the two architecture-specific values.

These patches are necessary prerequisites for the forthcoming PRCM cleanup series.

- Paul