More header clean-up
Subsystems (5)
Tony Lindgren
maintainercover More header clean-up
Hi all,
This series cleans up the conflicting defines a bit more. Now the biggest problem is till in clock24xx.h, but at least the conflict is local. Now changing the processors should not cause everything to be rebuilt..
The first patch also fixes the CONFIG_SPINLOCK_DEBUG problem where sched_clock was called before we have things initialized.
This series causes some updates to the other pending patch series, like the PM series. But it would be nice to get in before we add more code.
Kevin, the 2/5 is improved version of what I sent you earlier, the earlier version had issues between 2420 vs 2430. Let me know if the other patches cause big headaches for your PM series.
Regards,
Tony
---
Tony Lindgren (5):
ARM: OMAP2/3: Remove OMAP_CM_REGADDR
ARM: OMAP2/3: Remove OMAP2_PRCM_BASE
ARM: OMAP2/3: Move define of OMAP2_VA_IC_BASE to be local to entry-macro.S
ARM: OMAP2/3: Remove OMAP_PRM_REGADDR and OMAP2_PRM_BASE
ARM: OMAP2/3: Remove OMAP2_32KSYNCT_BASE
arch/arm/mach-omap2/clock24xx.c | 21 ++-- arch/arm/mach-omap2/clock24xx.h | 11 ++ arch/arm/mach-omap2/clock34xx.h | 2 arch/arm/mach-omap2/cm.h | 5 - arch/arm/mach-omap2/prm.h | 136 +++++++++++++------------ arch/arm/mach-omap2/sdrc2xxx.c | 5 + arch/arm/mach-omap2/sram242x.S | 4 - arch/arm/mach-omap2/sram243x.S | 4 - arch/arm/plat-omap/common.c | 69 +++++++++++-- arch/arm/plat-omap/include/mach/entry-macro.S | 9 +- arch/arm/plat-omap/include/mach/omap24xx.h | 18 --- arch/arm/plat-omap/include/mach/omap34xx.h | 9 -- 12 files changed, 170 insertions(+), 123 deletions(-)
Signature · 1 line
Signature
Tony Lindgren
maintainerPATCH 1/5 ARM: OMAP2/3: Remove OMAP2_32KSYNCT_BASE
Use processor specific defines instead.
As an extra bonus, this patch fixes the problem of CONFIG_DEBUG_SPINLOCK calling sched_clock before we have things initialized:
http://patchwork.kernel.org/patch/15810/
--- arch/arm/mach-omap2/sram242x.S | 4 +- arch/arm/mach-omap2/sram243x.S | 4 +- arch/arm/plat-omap/common.c | 69 ++++++++++++++++++++++++---- arch/arm/plat-omap/include/mach/omap24xx.h | 2 - arch/arm/plat-omap/include/mach/omap34xx.h | 1 5 files changed, 62 insertions(+), 18 deletions(-)
arch/arm/mach-omap2/sram242x.S +2 -2
@@ -128,7 +128,7 @@ omap242x_sdi_prcm_voltctrl: prcm_mask_val: .word 0xFFFF3FFC omap242x_sdi_timer_32ksynct_cr: - .word IO_ADDRESS(OMAP2_32KSYNCT_BASE + 0x010) + .word IO_ADDRESS(OMAP2420_32KSYNCT_BASE + 0x010) ENTRY(omap242x_sram_ddr_init_sz) .word . - omap242x_sram_ddr_init
@@ -224,7 +224,7 @@ omap242x_srs_prcm_voltctrl: ddr_prcm_mask_val: .word 0xFFFF3FFC omap242x_srs_timer_32ksynct: - .word IO_ADDRESS(OMAP2_32KSYNCT_BASE + 0x010) + .word IO_ADDRESS(OMAP2420_32KSYNCT_BASE + 0x010) ENTRY(omap242x_sram_reprogram_sdrc_sz) .word . - omap242x_sram_reprogram_sdrc
arch/arm/mach-omap2/sram243x.S +2 -2
@@ -128,7 +128,7 @@ omap243x_sdi_prcm_voltctrl: prcm_mask_val: .word 0xFFFF3FFC omap243x_sdi_timer_32ksynct_cr: - .word IO_ADDRESS(OMAP2_32KSYNCT_BASE + 0x010) + .word IO_ADDRESS(OMAP2430_32KSYNCT_BASE + 0x010) ENTRY(omap243x_sram_ddr_init_sz) .word . - omap243x_sram_ddr_init
@@ -224,7 +224,7 @@ omap243x_srs_prcm_voltctrl: ddr_prcm_mask_val: .word 0xFFFF3FFC omap243x_srs_timer_32ksynct: - .word IO_ADDRESS(OMAP2_32KSYNCT_BASE + 0x010) + .word IO_ADDRESS(OMAP2430_32KSYNCT_BASE + 0x010) ENTRY(omap243x_sram_reprogram_sdrc_sz) .word . - omap243x_sram_reprogram_sdrc
arch/arm/plat-omap/common.c +58 -11
103 lines not on this page · raw message
arch/arm/plat-omap/include/mach/omap24xx.h +0 -2
@@ -87,7 +87,6 @@#if defined(CONFIG_ARCH_OMAP2420 ) -#define OMAP2_32KSYNCT_BASE OMAP2420_32KSYNCT_BASE#define OMAP2_PRCM_BASE OMAP2420_PRCM_BASE#define OMAP2_CM_BASE OMAP2420_CM_BASE#define OMAP2_PRM_BASE OMAP2420_PRM_BASE
@@ -95,7 +94,6 @@#elif defined(CONFIG_ARCH_OMAP2430 ) -#define OMAP2_32KSYNCT_BASE OMAP2430_32KSYNCT_BASE#define OMAP2_PRCM_BASE OMAP2430_PRCM_BASE#define OMAP2_CM_BASE OMAP2430_CM_BASE#define OMAP2_PRM_BASE OMAP2430_PRM_BASE
arch/arm/plat-omap/include/mach/omap34xx.h +0 -1
@@ -85,7 +85,6 @@#if defined(CONFIG_ARCH_OMAP3430 ) -#define OMAP2_32KSYNCT_BASE OMAP3430_32KSYNCT_BASE#define OMAP2_CM_BASE OMAP3430_CM_BASE#define OMAP2_PRM_BASE OMAP3430_PRM_BASE#define OMAP2_VA_IC_BASE IO_ADDRESS(OMAP34XX_IC_BASE)
Tony Lindgren
maintainerPATCH 2/5 ARM: OMAP2/3: Remove OMAP_PRM_REGADDR and OMAP2_PRM_BASE
In reply to Tony LindgrenRemove OMAP_PRM_REGADDR and use processor specific defines instead. Also remove now unused OMAP2_PRM_BASE.
--- arch/arm/mach-omap2/clock24xx.c | 21 ++-- arch/arm/mach-omap2/clock24xx.h | 9 ++ arch/arm/mach-omap2/prm.h | 136 +++++++++++++++------------- arch/arm/mach-omap2/sdrc2xxx.c | 5 + arch/arm/plat-omap/include/mach/omap24xx.h | 2 arch/arm/plat-omap/include/mach/omap34xx.h | 1 6 files changed, 98 insertions(+), 76 deletions(-)
arch/arm/mach-omap2/clock24xx.c +12 -9
@@ -233,6 +233,8 @@ static struct prcm_config *curr_prcm_set;static struct clk *vclk;static struct clk *sclk; +static void __iomem *prcm_clksrc_ctrl; +/*------------------------------------------------------------------------- * Omap24xx specific clock functions *-------------------------------------------------------------------------*/
@@ -269,10 +271,9 @@ static int omap2_enable_osc_ck(struct clk *clk) {u32 pcc; - pcc =__raw_readl (OMAP24XX_PRCM_CLKSRC_CTRL ); + pcc =__raw_readl (prcm_clksrc_ctrl); -__raw_writel (pcc & ~OMAP_AUTOEXTCLKMODE_MASK , -OMAP24XX_PRCM_CLKSRC_CTRL ); +__raw_writel (pcc & ~OMAP_AUTOEXTCLKMODE_MASK , prcm_clksrc_ctrl);return 0 ; }
@@ -281,10 +282,9 @@ static void omap2_disable_osc_ck(struct clk *clk) {u32 pcc; - pcc =__raw_readl (OMAP24XX_PRCM_CLKSRC_CTRL ); + pcc =__raw_readl (prcm_clksrc_ctrl); -__raw_writel (pcc |OMAP_AUTOEXTCLKMODE_MASK , -OMAP24XX_PRCM_CLKSRC_CTRL ); +__raw_writel (pcc |OMAP_AUTOEXTCLKMODE_MASK , prcm_clksrc_ctrl); }static const struct clkops clkops_oscck = {
@@ -654,7 +654,7 @@ static u32 omap2_get_sysclkdiv(void) {u32 div; - div =__raw_readl (OMAP24XX_PRCM_CLKSRC_CTRL ); + div =__raw_readl (prcm_clksrc_ctrl); div &=OMAP_SYSCLKDIV_MASK ; div >>=OMAP_SYSCLKDIV_SHIFT ;
@@ -714,10 +714,13 @@ int __init omap2_clk_init(void)struct omap_clk *c;u32 clkrate; -if (cpu_is_omap242x ()) +if (cpu_is_omap242x ()) { + prcm_clksrc_ctrl =OMAP2420_PRCM_CLKSRC_CTRL ; cpu_mask =RATE_IN_242X ; -else if (cpu_is_omap2430 ()) + }else if (cpu_is_omap2430 ()) { + prcm_clksrc_ctrl =OMAP2430_PRCM_CLKSRC_CTRL ; cpu_mask =RATE_IN_243X ; + }clk_init (&omap2_clk_functions);
arch/arm/mach-omap2/clock24xx.h +9 -0
@@ -24,6 +24,15 @@#include "cm-regbits-24xx.h" #include "sdrc.h" +/* REVISIT: These should be set dynamically for CONFIG_MULTI_OMAP2 */ +#ifdef CONFIG_ARCH_OMAP2420 +#define OMAP24XX_PRCM_CLKOUT_CTRL OMAP2420_PRCM_CLKOUT_CTRL +#define OMAP24XX_PRCM_CLKEMUL_CTRL OMAP2420_PRCM_CLKEMUL_CTRL +#else +#define OMAP24XX_PRCM_CLKOUT_CTRL OMAP2430_PRCM_CLKOUT_CTRL +#define OMAP24XX_PRCM_CLKEMUL_CTRL OMAP2430_PRCM_CLKEMUL_CTRL +#endif +static unsigned long omap2_table_mpu_recalc (struct clk *clk);static int omap2_select_table_rate (struct clk *clk,unsigned long rate);static long omap2_round_to_table_rate (struct clk *clk,unsigned long rate);
arch/arm/mach-omap2/prm.h +73 -63
154 lines not on this page · raw message
arch/arm/mach-omap2/sdrc2xxx.c +4 -1
@@ -99,7 +99,10 @@ u32 omap2xxx_sdrc_reprogram(u32 level, u32 force) m_type =omap2xxx_sdrc_get_type ();local_irq_save (flags); -__raw_writel (0xffff ,OMAP24XX_PRCM_VOLTSETUP ); +if (cpu_is_omap2420 ()) +__raw_writel (0xffff ,OMAP2420_PRCM_VOLTSETUP ); +else +__raw_writel (0xffff ,OMAP2430_PRCM_VOLTSETUP );omap2_sram_reprogram_sdrc (level, dll_ctrl, m_type); curr_perf_level = level;local_irq_restore (flags);
arch/arm/plat-omap/include/mach/omap24xx.h +0 -2
@@ -89,14 +89,12 @@#define OMAP2_PRCM_BASE OMAP2420_PRCM_BASE#define OMAP2_CM_BASE OMAP2420_CM_BASE -#define OMAP2_PRM_BASE OMAP2420_PRM_BASE#define OMAP2_VA_IC_BASE IO_ADDRESS(OMAP24XX_IC_BASE)#elif defined(CONFIG_ARCH_OMAP2430 )#define OMAP2_PRCM_BASE OMAP2430_PRCM_BASE#define OMAP2_CM_BASE OMAP2430_CM_BASE -#define OMAP2_PRM_BASE OMAP2430_PRM_BASE#define OMAP2_VA_IC_BASE IO_ADDRESS(OMAP24XX_IC_BASE)#endif
arch/arm/plat-omap/include/mach/omap34xx.h +0 -1
@@ -86,7 +86,6 @@#if defined(CONFIG_ARCH_OMAP3430 )#define OMAP2_CM_BASE OMAP3430_CM_BASE -#define OMAP2_PRM_BASE OMAP3430_PRM_BASE#define OMAP2_VA_IC_BASE IO_ADDRESS(OMAP34XX_IC_BASE)#endif
Re: [PATCH 2/5] ARM: OMAP2/3: Remove OMAP_PRM_REGADDR and OMAP2_PRM_BASE
Quoted 3 lines · Tony Lindgren
Remove
OMAP_PRM_REGADDRand use processor specific defines instead. Also remove now unusedOMAP2_PRM_BASE.
Tony,
For clean PM branch integration, the patch below is needed on top of this one.
The PM branch code uses almost entirely the [cm|prm]_[read|write]_* macros for accessing PRCM registers. To do so, it needs the offsets defined.
You'll also notice I use OMAP2_* and OMAP3_* instead of OMAP2xxx_* and OMAP3xxx_* for these.
This was boot tested on OMAP3 and only build tested for OMAP2.
Comments?
Kevin
Quoted 1 line
From
84dd07dfe504e241b8229476c9b417607b64835fMon Sep 17 00:00:00 2001
From: Kevin Hilman <[email protected]>
Date: Tue, 12 May 2009 14:22:39 -0700
Subject: [PATCH] OMAP: PM: add PRCM register offsets
--- arch/arm/mach-omap2/clock.c | 4 +- arch/arm/mach-omap2/cm.h | 1 + arch/arm/mach-omap2/prm.h | 75 +++++++++++++++++++++++++++++++++++++++--- 3 files changed, 72 insertions(+), 8 deletions(-)
arch/arm/mach-omap2/clock.c +2 -2
@@ -91,9 +91,9 @@ static void _omap2xxx_clk_commit(struct clk *clk)return ;prm_write_mod_reg (OMAP24XX_VALID_CONFIG ,OMAP24XX_GR_MOD , -OMAP24XX_PRCM_CLKCFG_CTRL_OFFSET ); +OMAP2_PRCM_CLKCFG_CTRL_OFFSET );/* OCP barrier */ -prm_read_mod_reg (OMAP24XX_GR_MOD ,OMAP24XX_PRCM_CLKCFG_CTRL_OFFSET ); +prm_read_mod_reg (OMAP24XX_GR_MOD ,OMAP2_PRCM_CLKCFG_CTRL_OFFSET ); }/*
arch/arm/mach-omap2/cm.h +1 -0
@@ -33,6 +33,7 @@#define OMAP3430_CM_SYSCONFIG OMAP_CM_REGADDR(OCP_MOD, 0x0010)#define OMAP3430_CM_POLCTRL OMAP_CM_REGADDR(OCP_MOD, 0x009c) +#define OMAP3_CM_CLKOUT_CTRL_OFFSET 0x0070#define OMAP3430_CM_CLKOUT_CTRL OMAP_CM_REGADDR(OMAP3430_CCR_MOD, 0x0070)/*
arch/arm/mach-omap2/prm.h +69 -6
162 lines not on this page · raw message
Signature · 1 line
1.6.2.2
Tony Lindgren
maintainerRe: [PATCH 2/5] ARM: OMAP2/3: Remove OMAP_PRM_REGADDR and OMAP2_PRM_BASE
Quoted 10 lines · Kevin Hilman
Quoted 3 lines · Tony Lindgren
Remove
OMAP_PRM_REGADDRand use processor specific defines instead. Also remove now unusedOMAP2_PRM_BASE.Tony,
For clean PM branch integration, the patch below is needed on top of this one.
Thanks!
Quoted 3 lines
The PM branch code uses almost entirely the [cm|prm]_[read|write]_* macros for accessing PRCM registers. To do so, it needs the offsets defined.
OK, offsets are better than full addresses in the long run :)
Quoted 6 lines
You'll also notice I use OMAP2_* and OMAP3_* instead of OMAP2xxx_* and OMAP3xxx_* for these.
This was boot tested on OMAP3 and only build tested for OMAP2.
Comments?
I guess we want to dedup it for duplicate offset defines though..
Regards,
Tony
Quoted 211 lines
Kevin
From
84dd07dfe504e241b8229476c9b417607b64835fMon Sep 17 00:00:00 2001
From: Kevin Hilman <[email protected]>
Date: Tue, 12 May 2009 14:22:39 -0700
Subject: [PATCH] OMAP: PM: add PRCM register offsets--- arch/arm/mach-omap2/clock.c | 4 +- arch/arm/mach-omap2/cm.h | 1 + arch/arm/mach-omap2/prm.h | 75 +++++++++++++++++++++++++++++++++++++++--- 3 files changed, 72 insertions(+), 8 deletions(-)arch/arm/mach-omap2/clock.c +2
-2@@ -91,9 +91,9 @@ static void _omap2xxx_clk_commit(struct clk *clk)return ;prm_write_mod_reg (OMAP24XX_VALID_CONFIG ,OMAP24XX_GR_MOD , -OMAP24XX_PRCM_CLKCFG_CTRL_OFFSET ); +OMAP2_PRCM_CLKCFG_CTRL_OFFSET );/* OCP barrier */ -prm_read_mod_reg (OMAP24XX_GR_MOD ,OMAP24XX_PRCM_CLKCFG_CTRL_OFFSET ); +prm_read_mod_reg (OMAP24XX_GR_MOD ,OMAP2_PRCM_CLKCFG_CTRL_OFFSET ); }/* arch/arm/mach-omap2/cm.h +1
-0@@ -33,6 +33,7 @@#define OMAP3430_CM_SYSCONFIG OMAP_CM_REGADDR(OCP_MOD, 0x0010)#define OMAP3430_CM_POLCTRL OMAP_CM_REGADDR(OCP_MOD, 0x009c) +#define OMAP3_CM_CLKOUT_CTRL_OFFSET 0x0070#define OMAP3430_CM_CLKOUT_CTRL OMAP_CM_REGADDR(OMAP3430_CCR_MOD, 0x0070)/* arch/arm/mach-omap2/prm.h +69
-6@@ -34,93 +34,156 @@*/ /* Global 24xx registers in GR_MOD (Same as OCP_MOD for 24xx) */ -#define OMAP24XX_PRCM_VOLTCTRL_OFFSET 0x0050 -#define OMAP24XX_PRCM_CLKCFG_CTRL_OFFSET 0x0080 +#define OMAP2_PRCM_VOLTCTRL_OFFSET 0x0050 +#define OMAP2_PRCM_CLKCFG_CTRL_OFFSET 0x0080/* 242x GR_MOD registers, use these only for assembly code */ #define OMAP242X_PRCM_VOLTCTRL OMAP2420_PRM_REGADDR(OMAP24XX_GR_MOD, \ - OMAP24XX_PRCM_VOLTCTRL_OFFSET) + OMAP2_PRCM_VOLTCTRL_OFFSET)#define OMAP242X_PRCM_CLKCFG_CTRL OMAP2420_PRM_REGADDR(OMAP24XX_GR_MOD, \ - OMAP24XX_PRCM_CLKCFG_CTRL_OFFSET) + OMAP2_PRCM_CLKCFG_CTRL_OFFSET)/* 243x GR_MOD registers, use these only for assembly code */ #define OMAP243X_PRCM_VOLTCTRL OMAP2430_PRM_REGADDR(OMAP24XX_GR_MOD, \ - OMAP24XX_PRCM_VOLTCTRL_OFFSET) + OMAP2_PRCM_VOLTCTRL_OFFSET)#define OMAP243X_PRCM_CLKCFG_CTRL OMAP2430_PRM_REGADDR(OMAP24XX_GR_MOD, \ - OMAP24XX_PRCM_CLKCFG_CTRL_OFFSET) + OMAP2_PRCM_CLKCFG_CTRL_OFFSET) +#define OMAP2_PRCM_REVISION_OFFSET 0x0000#define OMAP2420_PRCM_REVISION OMAP2420_PRM_REGADDR(OCP_MOD, 0x0000) +#define OMAP2_PRCM_SYSCONFIG_OFFSET 0x0010#define OMAP2420_PRCM_SYSCONFIG OMAP2420_PRM_REGADDR(OCP_MOD, 0x0010) +#define OMAP2_PRCM_IRQSTATUS_MPU_OFFSET 0x0018#define OMAP2420_PRCM_IRQSTATUS_MPU OMAP2420_PRM_REGADDR(OCP_MOD, 0x0018) +#define OMAP2_PRCM_IRQENABLE_MPU_OFFSET 0x001c#define OMAP2420_PRCM_IRQENABLE_MPU OMAP2420_PRM_REGADDR(OCP_MOD, 0x001c) +#define OMAP2_PRCM_VOLTST_OFFSET 0x0054#define OMAP2420_PRCM_VOLTST OMAP2420_PRM_REGADDR(OCP_MOD, 0x0054) +#define OMAP2_PRCM_CLKSRC_CTRL_OFFSET 0x0060#define OMAP2420_PRCM_CLKSRC_CTRL OMAP2420_PRM_REGADDR(OCP_MOD, 0x0060) +#define OMAP2_PRCM_CLKOUT_CTRL_OFFSET 0x0070#define OMAP2420_PRCM_CLKOUT_CTRL OMAP2420_PRM_REGADDR(OCP_MOD, 0x0070) +#define OMAP2_PRCM_CLKEMUL_CTRL_OFFSET 0x0078#define OMAP2420_PRCM_CLKEMUL_CTRL OMAP2420_PRM_REGADDR(OCP_MOD, 0x0078) +#define OMAP2_PRCM_CLKCFG_CTRL_OFFSET 0x0080#define OMAP2420_PRCM_CLKCFG_CTRL OMAP2420_PRM_REGADDR(OCP_MOD, 0x0080) +#define OMAP2_PRCM_CLKCFG_STATUS_OFFSET 0x0084#define OMAP2420_PRCM_CLKCFG_STATUS OMAP2420_PRM_REGADDR(OCP_MOD, 0x0084) +#define OMAP2_PRCM_VOLTSETUP_OFFSET 0x0090#define OMAP2420_PRCM_VOLTSETUP OMAP2420_PRM_REGADDR(OCP_MOD, 0x0090) +#define OMAP2_PRCM_CLKSSETUP_OFFSET 0x0094#define OMAP2420_PRCM_CLKSSETUP OMAP2420_PRM_REGADDR(OCP_MOD, 0x0094) +#define OMAP2_PRCM_POLCTRL_OFFSET 0x0098#define OMAP2420_PRCM_POLCTRL OMAP2420_PRM_REGADDR(OCP_MOD, 0x0098) +#define OMAP2_PRCM_REVISION_OFFSET 0x0000#define OMAP2430_PRCM_REVISION OMAP2430_PRM_REGADDR(OCP_MOD, 0x0000) +#define OMAP2_PRCM_SYSCONFIG_OFFSET 0x0010#define OMAP2430_PRCM_SYSCONFIG OMAP2430_PRM_REGADDR(OCP_MOD, 0x0010) +#define OMAP2_PRCM_IRQSTATUS_MPU_OFFSET 0x0018#define OMAP2430_PRCM_IRQSTATUS_MPU OMAP2430_PRM_REGADDR(OCP_MOD, 0x0018) +#define OMAP2_PRCM_IRQENABLE_MPU_OFFSET 0x001c#define OMAP2430_PRCM_IRQENABLE_MPU OMAP2430_PRM_REGADDR(OCP_MOD, 0x001c) +#define OMAP2_PRCM_VOLTST_OFFSET 0x0054#define OMAP2430_PRCM_VOLTST OMAP2430_PRM_REGADDR(OCP_MOD, 0x0054) +#define OMAP2_PRCM_CLKSRC_CTRL_OFFSET 0x0060#define OMAP2430_PRCM_CLKSRC_CTRL OMAP2430_PRM_REGADDR(OCP_MOD, 0x0060) +#define OMAP2_PRCM_CLKOUT_CTRL_OFFSET 0x0070#define OMAP2430_PRCM_CLKOUT_CTRL OMAP2430_PRM_REGADDR(OCP_MOD, 0x0070) +#define OMAP2_PRCM_CLKEMUL_CTRL_OFFSET 0x0078#define OMAP2430_PRCM_CLKEMUL_CTRL OMAP2430_PRM_REGADDR(OCP_MOD, 0x0078) +#define OMAP2_PRCM_CLKCFG_CTRL_OFFSET 0x0080#define OMAP2430_PRCM_CLKCFG_CTRL OMAP2430_PRM_REGADDR(OCP_MOD, 0x0080) +#define OMAP2_PRCM_CLKCFG_STATUS_OFFSET 0x0084#define OMAP2430_PRCM_CLKCFG_STATUS OMAP2430_PRM_REGADDR(OCP_MOD, 0x0084) +#define OMAP2_PRCM_VOLTSETUP_OFFSET 0x0090#define OMAP2430_PRCM_VOLTSETUP OMAP2430_PRM_REGADDR(OCP_MOD, 0x0090) +#define OMAP2_PRCM_CLKSSETUP_OFFSET 0x0094#define OMAP2430_PRCM_CLKSSETUP OMAP2430_PRM_REGADDR(OCP_MOD, 0x0094) +#define OMAP2_PRCM_POLCTRL_OFFSET 0x0098#define OMAP2430_PRCM_POLCTRL OMAP2430_PRM_REGADDR(OCP_MOD, 0x0098) +#define OMAP3_PRM_REVISION_OFFSET 0x0004#define OMAP3430_PRM_REVISION OMAP34XX_PRM_REGADDR(OCP_MOD, 0x0004) +#define OMAP3_PRM_SYSCONFIG_OFFSET 0x0014#define OMAP3430_PRM_SYSCONFIG OMAP34XX_PRM_REGADDR(OCP_MOD, 0x0014) +#define OMAP3_PRM_IRQSTATUS_MPU_OFFSET 0x0018#define OMAP3430_PRM_IRQSTATUS_MPU OMAP34XX_PRM_REGADDR(OCP_MOD, 0x0018) +#define OMAP3_PRM_IRQENABLE_MPU_OFFSET 0x001c#define OMAP3430_PRM_IRQENABLE_MPU OMAP34XX_PRM_REGADDR(OCP_MOD, 0x001c) +#define OMAP3_PRM_VC_SMPS_SA_OFFSET 0x0020#define OMAP3430_PRM_VC_SMPS_SA OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x0020) +#define OMAP3_PRM_VC_SMPS_VOL_RA_OFFSET 0x0024#define OMAP3430_PRM_VC_SMPS_VOL_RA OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x0024) +#define OMAP3_PRM_VC_SMPS_CMD_RA_OFFSET 0x0028#define OMAP3430_PRM_VC_SMPS_CMD_RA OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x0028) +#define OMAP3_PRM_VC_CMD_VAL_0_OFFSET 0x002c#define OMAP3430_PRM_VC_CMD_VAL_0 OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x002c) +#define OMAP3_PRM_VC_CMD_VAL_1_OFFSET 0x0030#define OMAP3430_PRM_VC_CMD_VAL_1 OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x0030) +#define OMAP3_PRM_VC_CH_CONF_OFFSET 0x0034#define OMAP3430_PRM_VC_CH_CONF OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x0034) +#define OMAP3_PRM_VC_I2C_CFG_OFFSET 0x0038#define OMAP3430_PRM_VC_I2C_CFG OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x0038) +#define OMAP3_PRM_VC_BYPASS_VAL_OFFSET 0x003c#define OMAP3430_PRM_VC_BYPASS_VAL OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x003c) +#define OMAP3_PRM_RSTCTRL_OFFSET 0x0050#define OMAP3430_PRM_RSTCTRL OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x0050) +#define OMAP3_PRM_RSTTIME_OFFSET 0x0054#define OMAP3430_PRM_RSTTIME OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x0054) +#define OMAP3_PRM_RSTST_OFFSET 0x0058#define OMAP3430_PRM_RSTST OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x0058) +#define OMAP3_PRM_VOLTCTRL_OFFSET 0x0060#define OMAP3430_PRM_VOLTCTRL OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x0060) +#define OMAP3_PRM_SRAM_PCHARGE_OFFSET 0x0064#define OMAP3430_PRM_SRAM_PCHARGE OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x0064) +#define OMAP3_PRM_CLKSRC_CTRL_OFFSET 0x0070#define OMAP3430_PRM_CLKSRC_CTRL OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x0070) +#define OMAP3_PRM_VOLTSETUP1_OFFSET 0x0090#define OMAP3430_PRM_VOLTSETUP1 OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x0090) +#define OMAP3_PRM_VOLTOFFSET_OFFSET 0x0094#define OMAP3430_PRM_VOLTOFFSET OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x0094) +#define OMAP3_PRM_CLKSETUP_OFFSET 0x0098#define OMAP3430_PRM_CLKSETUP OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x0098) +#define OMAP3_PRM_POLCTRL_OFFSET 0x009c#define OMAP3430_PRM_POLCTRL OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x009c) +#define OMAP3_PRM_VOLTSETUP2_OFFSET 0x00a0#define OMAP3430_PRM_VOLTSETUP2 OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x00a0) +#define OMAP3_PRM_VP1_CONFIG_OFFSET 0x00b0#define OMAP3430_PRM_VP1_CONFIG OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x00b0) +#define OMAP3_PRM_VP1_VSTEPMIN_OFFSET 0x00b4#define OMAP3430_PRM_VP1_VSTEPMIN OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x00b4) +#define OMAP3_PRM_VP1_VSTEPMAX_OFFSET 0x00b8#define OMAP3430_PRM_VP1_VSTEPMAX OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x00b8) +#define OMAP3_PRM_VP1_VLIMITTO_OFFSET 0x00bc#define OMAP3430_PRM_VP1_VLIMITTO OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x00bc) +#define OMAP3_PRM_VP1_VOLTAGE_OFFSET 0x00c0#define OMAP3430_PRM_VP1_VOLTAGE OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x00c0) +#define OMAP3_PRM_VP1_STATUS_OFFSET 0x00c4#define OMAP3430_PRM_VP1_STATUS OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x00c4) +#define OMAP3_PRM_VP2_CONFIG_OFFSET 0x00d0#define OMAP3430_PRM_VP2_CONFIG OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x00d0) +#define OMAP3_PRM_VP2_VSTEPMIN_OFFSET 0x00d4#define OMAP3430_PRM_VP2_VSTEPMIN OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x00d4) +#define OMAP3_PRM_VP2_VSTEPMAX_OFFSET 0x00d8#define OMAP3430_PRM_VP2_VSTEPMAX OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x00d8) +#define OMAP3_PRM_VP2_VLIMITTO_OFFSET 0x00dc#define OMAP3430_PRM_VP2_VLIMITTO OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x00dc) +#define OMAP3_PRM_VP2_VOLTAGE_OFFSET 0x00e0#define OMAP3430_PRM_VP2_VOLTAGE OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x00e0) +#define OMAP3_PRM_VP2_STATUS_OFFSET 0x00e4#define OMAP3430_PRM_VP2_STATUS OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x00e4) +#define OMAP3_PRM_CLKSEL_OFFSET 0x0040#define OMAP3430_PRM_CLKSEL OMAP34XX_PRM_REGADDR(OMAP3430_CCR_MOD, 0x0040) +#define OMAP3_PRM_CLKOUT_CTRL_OFFSET 0x0070#define OMAP3430_PRM_CLKOUT_CTRL OMAP34XX_PRM_REGADDR(OMAP3430_CCR_MOD, 0x0070)/* Signature · 1 line
1.6.2.2
Tony Lindgren
maintainerPATCH 3/5 ARM: OMAP2/3: Move define of OMAP2_VA_IC_BASE to be local to entry-macro.S
In reply to Tony LindgrenMove define of OMAP2_VA_IC_BASE to be local to entry-macro.S
--- arch/arm/plat-omap/include/mach/entry-macro.S | 9 ++++++--- arch/arm/plat-omap/include/mach/omap24xx.h | 2 -- arch/arm/plat-omap/include/mach/omap34xx.h | 1 - 3 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/plat-omap/include/mach/entry-macro.S +6 -3
@@ -58,11 +58,14 @@ #endif #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) -#if defined(CONFIG_ARCH_OMAP24XX) #include <mach/omap24xx.h> -#endif -#if defined(CONFIG_ARCH_OMAP34XX) #include <mach/omap34xx.h> + +/* REVISIT: This should be set dynamically if CONFIG_MULTI_OMAP2 is selected */ +#if defined(CONFIG_ARCH_OMAP2420) || defined(CONFIG_ARCH_OMAP2430) +#define OMAP2_VA_IC_BASE IO_ADDRESS(OMAP24XX_IC_BASE) +#elif defined(CONFIG_ARCH_OMAP34XX) +#define OMAP2_VA_IC_BASE IO_ADDRESS(OMAP34XX_IC_BASE) #endif #define INTCPS_SIR_IRQ_OFFSET 0x0040 /* Active interrupt offset */
arch/arm/plat-omap/include/mach/omap24xx.h +0 -2
@@ -89,13 +89,11 @@#define OMAP2_PRCM_BASE OMAP2420_PRCM_BASE#define OMAP2_CM_BASE OMAP2420_CM_BASE -#define OMAP2_VA_IC_BASE IO_ADDRESS(OMAP24XX_IC_BASE)#elif defined(CONFIG_ARCH_OMAP2430 )#define OMAP2_PRCM_BASE OMAP2430_PRCM_BASE#define OMAP2_CM_BASE OMAP2430_CM_BASE -#define OMAP2_VA_IC_BASE IO_ADDRESS(OMAP24XX_IC_BASE)#endif
arch/arm/plat-omap/include/mach/omap34xx.h +0 -1
@@ -86,7 +86,6 @@#if defined(CONFIG_ARCH_OMAP3430 )#define OMAP2_CM_BASE OMAP3430_CM_BASE -#define OMAP2_VA_IC_BASE IO_ADDRESS(OMAP34XX_IC_BASE)#endif
Tony Lindgren
maintainerPATCH 4/5 ARM: OMAP2/3: Remove OMAP2_PRCM_BASE
In reply to Tony LindgrenIt's currently unused, and processor specific defines should be used instead.
--- arch/arm/plat-omap/include/mach/omap24xx.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
arch/arm/plat-omap/include/mach/omap24xx.h +0 -2
@@ -87,12 +87,10 @@#if defined(CONFIG_ARCH_OMAP2420 ) -#define OMAP2_PRCM_BASE OMAP2420_PRCM_BASE#define OMAP2_CM_BASE OMAP2420_CM_BASE#elif defined(CONFIG_ARCH_OMAP2430 ) -#define OMAP2_PRCM_BASE OMAP2430_PRCM_BASE#define OMAP2_CM_BASE OMAP2430_CM_BASE#endif
Tony Lindgren
maintainerPATCH 5/5 ARM: OMAP2/3: Remove OMAP_CM_REGADDR
In reply to Tony LindgrenProcessor specific macros should be used instead.
--- arch/arm/mach-omap2/clock24xx.h | 2 ++ arch/arm/mach-omap2/clock34xx.h | 2 ++ arch/arm/mach-omap2/cm.h | 5 ----- arch/arm/plat-omap/include/mach/omap24xx.h | 10 ---------- arch/arm/plat-omap/include/mach/omap34xx.h | 6 ------ 5 files changed, 4 insertions(+), 21 deletions(-)
arch/arm/mach-omap2/clock24xx.h +2 -0
@@ -26,9 +26,11 @@/* REVISIT: These should be set dynamically for CONFIG_MULTI_OMAP2 */ #ifdef CONFIG_ARCH_OMAP2420 +#define OMAP_CM_REGADDR OMAP2420_CM_REGADDR#define OMAP24XX_PRCM_CLKOUT_CTRL OMAP2420_PRCM_CLKOUT_CTRL#define OMAP24XX_PRCM_CLKEMUL_CTRL OMAP2420_PRCM_CLKEMUL_CTRL#else +#define OMAP_CM_REGADDR OMAP2430_CM_REGADDR#define OMAP24XX_PRCM_CLKOUT_CTRL OMAP2430_PRCM_CLKOUT_CTRL#define OMAP24XX_PRCM_CLKEMUL_CTRL OMAP2430_PRCM_CLKEMUL_CTRL#endif
arch/arm/mach-omap2/clock34xx.h +2 -0
@@ -27,6 +27,8 @@#include "prm.h" #include "prm-regbits-34xx.h" +#define OMAP_CM_REGADDR OMAP34XX_CM_REGADDR +static unsigned long omap3_dpll_recalc (struct clk *clk);static unsigned long omap3_clkoutx2_recalc (struct clk *clk);static void omap3_dpll_allow_idle (struct clk *clk);
arch/arm/mach-omap2/cm.h +0 -5
@@ -16,17 +16,12 @@#include "prcm-common.h" -#ifndef __ASSEMBLER__ -#define OMAP_CM_REGADDR (module, reg) \ - IO_ADDRESS(OMAP2_CM_BASE + (module) + (reg)) -#else #define OMAP2420_CM_REGADDR (module, reg) \ IO_ADDRESS(OMAP2420_CM_BASE + (module) + (reg))#define OMAP2430_CM_REGADDR (module, reg) \ IO_ADDRESS(OMAP2430_CM_BASE + (module) + (reg))#define OMAP34XX_CM_REGADDR (module, reg) \ IO_ADDRESS(OMAP3430_CM_BASE + (module) + (reg)) -#endif /* * Architecture-specific global CM registers
arch/arm/plat-omap/include/mach/omap24xx.h +0 -10
@@ -85,15 +85,5 @@#define OMAP24XX_SEC_AES_BASE (OMAP24XX_SEC_BASE + 0x6000)#define OMAP24XX_SEC_PKA_BASE (OMAP24XX_SEC_BASE + 0x8000) -#if defined(CONFIG_ARCH_OMAP2420 ) - -#define OMAP2_CM_BASE OMAP2420_CM_BASE - -#elif defined(CONFIG_ARCH_OMAP2430 ) - -#define OMAP2_CM_BASE OMAP2430_CM_BASE - -#endif -#endif /* __ASM_ARCH_OMAP24XX_H */
arch/arm/plat-omap/include/mach/omap34xx.h +0 -6
@@ -83,12 +83,6 @@#define OMAP34XX_MAILBOX_BASE (L4_34XX_BASE + 0x94000) -#if defined(CONFIG_ARCH_OMAP3430 ) - -#define OMAP2_CM_BASE OMAP3430_CM_BASE - -#endif -#define OMAP34XX_DSP_BASE 0x58000000#define OMAP34XX_DSP_MEM_BASE (OMAP34XX_DSP_BASE + 0x0)#define OMAP34XX_DSP_IPI_BASE (OMAP34XX_DSP_BASE + 0x1000000)
If this series is planned for this window then OMAP4 series also needs few changes. Is it ?
Quoted 65 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Tony Lindgren
Sent: Friday, May 08, 2009 2:12 AM
To: [email protected]
Subject: [PATCH 0/5] More header clean-upHi all,
This series cleans up the conflicting defines a bit more. Now the biggest problem is till in
clock24xx.h, but at least the conflict is local. Now changing the processors should not cause everything to be rebuilt..The first patch also fixes the
CONFIG_SPINLOCK_DEBUGproblem wheresched_clockwas called before we have things initialized.This series causes some updates to the other pending patch series, like the PM series. But it would be nice to get in before we add more code.
Kevin, the 2/5 is improved version of what I sent you earlier, the earlier version had issues between 2420 vs 2430. Let me know if the other patches cause big headaches for your PM series.
Regards,
Tony
---
Tony Lindgren (5):
ARM: OMAP2/3: RemoveOMAP_CM_REGADDR
ARM: OMAP2/3: RemoveOMAP2_PRCM_BASE
ARM: OMAP2/3: Move define ofOMAP2_VA_IC_BASEto be
local toentry-macro.S
ARM: OMAP2/3: RemoveOMAP_PRM_REGADDRandOMAP2_PRM_BASE
ARM: OMAP2/3: RemoveOMAP2_32KSYNCT_BASEarch/arm/mach-omap2/clock24xx.c | 21 ++-- arch/arm/mach-omap2/clock24xx.h | 11 ++ arch/arm/mach-omap2/clock34xx.h | 2 arch/arm/mach-omap2/cm.h | 5 - arch/arm/mach-omap2/prm.h | 136 +++++++++++++------------ arch/arm/mach-omap2/sdrc2xxx.c | 5 + arch/arm/mach-omap2/sram242x.S | 4 - arch/arm/mach-omap2/sram243x.S | 4 - arch/arm/plat-omap/common.c | 69 +++++++++++-- arch/arm/plat-omap/include/mach/entry-macro.S | 9 +- arch/arm/plat-omap/include/mach/omap24xx.h | 18 --- arch/arm/plat-omap/include/mach/omap34xx.h | 9 -- 12 files changed, 170 insertions(+), 123 deletions(-)Signature · 6 lines
Signature -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Tony Lindgren
maintainerQuoted 1 line · Shilimkar, Santosh
If this series is planned for this window then OMAP4 series also needs few changes. Is it ?
Yeah. For omap4 those changes should be trivial though.
Maybe do a test rebase on top of these patches to see which ones you need to rename?
But when posting patches to mailings lists, please keep them against the mainline. I should be able to deal with the conflicts pretty easily when adding them to for-next.
Regards,
Tony
Quoted 65 lines
Quoted 65 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Tony Lindgren
Sent: Friday, May 08, 2009 2:12 AM
To: [email protected]
Subject: [PATCH 0/5] More header clean-upHi all,
This series cleans up the conflicting defines a bit more. Now the biggest problem is till in
clock24xx.h, but at least the conflict is local. Now changing the processors should not cause everything to be rebuilt..The first patch also fixes the
CONFIG_SPINLOCK_DEBUGproblem wheresched_clockwas called before we have things initialized.This series causes some updates to the other pending patch series, like the PM series. But it would be nice to get in before we add more code.
Kevin, the 2/5 is improved version of what I sent you earlier, the earlier version had issues between 2420 vs 2430. Let me know if the other patches cause big headaches for your PM series.
Regards,
Tony
---
Tony Lindgren (5):
ARM: OMAP2/3: RemoveOMAP_CM_REGADDR
ARM: OMAP2/3: RemoveOMAP2_PRCM_BASE
ARM: OMAP2/3: Move define ofOMAP2_VA_IC_BASEto be
local toentry-macro.S
ARM: OMAP2/3: RemoveOMAP_PRM_REGADDRandOMAP2_PRM_BASE
ARM: OMAP2/3: RemoveOMAP2_32KSYNCT_BASEarch/arm/mach-omap2/clock24xx.c | 21 ++-- arch/arm/mach-omap2/clock24xx.h | 11 ++ arch/arm/mach-omap2/clock34xx.h | 2 arch/arm/mach-omap2/cm.h | 5 - arch/arm/mach-omap2/prm.h | 136 +++++++++++++------------ arch/arm/mach-omap2/sdrc2xxx.c | 5 + arch/arm/mach-omap2/sram242x.S | 4 - arch/arm/mach-omap2/sram243x.S | 4 - arch/arm/plat-omap/common.c | 69 +++++++++++-- arch/arm/plat-omap/include/mach/entry-macro.S | 9 +- arch/arm/plat-omap/include/mach/omap24xx.h | 18 --- arch/arm/plat-omap/include/mach/omap34xx.h | 9 -- 12 files changed, 170 insertions(+), 123 deletions(-)Signature · 6 lines
Signature -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 14 lines
-----Original Message-----
From: Tony Lindgren [mailto:[email protected]]
Sent: Friday, May 08, 2009 8:51 PM
To: Shilimkar, Santosh
Cc: [email protected]
Subject: Re: [PATCH 0/5] More header clean-upQuoted 1 line · Shilimkar, Santosh
If this series is planned for this window then OMAP4 series
also needs few changes. Is it ?
Yeah. For omap4 those changes should be trivial though.
Quoted 8 lines
Maybe do a test rebase on top of these patches to see which ones you need to rename?
But when posting patches to mailings lists, please keep them against the mainline. I should be able to deal with the conflicts pretty easily
when adding them to for-next.
Sure.. I will keep you posted with delta changes.
Regards,
Santosh