* Lauri Leukkunen <lauri.leukkunen@xxxxxxxxx> [081031 07:06]: > system_rev is meant for board revision, this patch changes > all relevant instances to use the new omap_rev() function > liberating system_rev to be used with ATAG_REVISION as it > has been designed. Pushing. Tony > Signed-off-by: Lauri Leukkunen <lauri.leukkunen@xxxxxxxxx> > --- > arch/arm/mach-omap1/id.c | 31 +++++++++++++------- > arch/arm/mach-omap1/pm.c | 4 +- > arch/arm/mach-omap2/board-3430sdp.c | 6 ++-- > arch/arm/mach-omap2/board-h4.c | 2 +- > arch/arm/mach-omap2/board-ldp.c | 2 +- > arch/arm/mach-omap2/clock34xx.c | 4 +- > arch/arm/mach-omap2/id.c | 34 ++++++++++++++--------- > arch/arm/mach-omap2/pm34xx.c | 10 +++--- > arch/arm/mach-omap2/smartreflex.c | 2 +- > arch/arm/plat-omap/include/mach/board-apollon.h | 4 ++- > arch/arm/plat-omap/include/mach/cpu.h | 10 +++--- > arch/arm/plat-omap/sram.c | 3 +- > 12 files changed, 66 insertions(+), 46 deletions(-) > > diff --git a/arch/arm/mach-omap1/id.c b/arch/arm/mach-omap1/id.c > index d6110fe..3691024 100644 > --- a/arch/arm/mach-omap1/id.c > +++ b/arch/arm/mach-omap1/id.c > @@ -15,6 +15,7 @@ > #include <linux/kernel.h> > #include <linux/init.h> > #include <linux/io.h> > +#include <mach/cpu.h> > > #define OMAP_DIE_ID_0 0xfffe1800 > #define OMAP_DIE_ID_1 0xfffe1804 > @@ -30,6 +31,8 @@ struct omap_id { > u32 type; /* Cpu id bits [31:08], cpu class bits [07:00] */ > }; > > +static unsigned int omap_revision; > + > /* Register values to detect the OMAP version */ > static struct omap_id omap_ids[] __initdata = { > { .jtag_id = 0xb574, .die_rev = 0x2, .omap_id = 0x03310315, .type = 0x03100000}, > @@ -53,6 +56,12 @@ static struct omap_id omap_ids[] __initdata = { > { .jtag_id = 0xb5f7, .die_rev = 0x2, .omap_id = 0x03330100, .type = 0x17100000}, > }; > > +unsigned int omap_rev(void) > +{ > + return omap_revision; > +} > +EXPORT_SYMBOL(omap_rev); > + > /* > * Get OMAP type from PROD_ID. > * 1710 has the PROD_ID in bits 15:00, not in 16:01 as documented in TRM. > @@ -140,7 +149,7 @@ void __init omap_check_revision(void) > /* First check only the major version in a safe way */ > for (i = 0; i < ARRAY_SIZE(omap_ids); i++) { > if (jtag_id == (omap_ids[i].jtag_id)) { > - system_rev = omap_ids[i].type; > + omap_revision = omap_ids[i].type; > break; > } > } > @@ -148,7 +157,7 @@ void __init omap_check_revision(void) > /* Check if we can find the die revision */ > for (i = 0; i < ARRAY_SIZE(omap_ids); i++) { > if (jtag_id == omap_ids[i].jtag_id && die_rev == omap_ids[i].die_rev) { > - system_rev = omap_ids[i].type; > + omap_revision = omap_ids[i].type; > break; > } > } > @@ -158,35 +167,35 @@ void __init omap_check_revision(void) > if (jtag_id == omap_ids[i].jtag_id > && die_rev == omap_ids[i].die_rev > && omap_id == omap_ids[i].omap_id) { > - system_rev = omap_ids[i].type; > + omap_revision = omap_ids[i].type; > break; > } > } > > /* Add the cpu class info (7xx, 15xx, 16xx, 24xx) */ > - cpu_type = system_rev >> 24; > + cpu_type = omap_revision >> 24; > > switch (cpu_type) { > case 0x07: > - system_rev |= 0x07; > + omap_revision |= 0x07; > break; > case 0x03: > case 0x15: > - system_rev |= 0x15; > + omap_revision |= 0x15; > break; > case 0x16: > case 0x17: > - system_rev |= 0x16; > + omap_revision |= 0x16; > break; > default: > printk("Unknown OMAP cpu type: 0x%02x\n", cpu_type); > } > > - printk("OMAP%04x", system_rev >> 16); > - if ((system_rev >> 8) & 0xff) > - printk("%x", (system_rev >> 8) & 0xff); > + printk("OMAP%04x", omap_revision >> 16); > + if ((omap_revision >> 8) & 0xff) > + printk("%x", (omap_revision >> 8) & 0xff); > printk(" revision %i handled as %02xxx id: %08x%08x\n", > - die_rev, system_rev & 0xff, system_serial_low, > + die_rev, omap_revision & 0xff, system_serial_low, > system_serial_high); > } > > diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c > index 770d256..9423c47 100644 > --- a/arch/arm/mach-omap1/pm.c > +++ b/arch/arm/mach-omap1/pm.c > @@ -226,7 +226,7 @@ void omap_pm_suspend(void) > { > unsigned long arg0 = 0, arg1 = 0; > > - printk("PM: OMAP%x is trying to enter deep sleep...\n", system_rev); > + printk("PM: OMAP%x is trying to enter deep sleep...\n", omap_rev()); > > omap_serial_wake_trigger(1); > > @@ -421,7 +421,7 @@ void omap_pm_suspend(void) > > omap_serial_wake_trigger(0); > > - printk("PM: OMAP%x is re-starting from deep sleep...\n", system_rev); > + printk("PM: OMAP%x is re-starting from deep sleep...\n", omap_rev()); > } > > #if defined(DEBUG) && defined(CONFIG_PROC_FS) > diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c > index 8773698..cee9f78 100644 > --- a/arch/arm/mach-omap2/board-3430sdp.c > +++ b/arch/arm/mach-omap2/board-3430sdp.c > @@ -129,7 +129,7 @@ static int __init msecure_init(void) > #ifdef CONFIG_RTC_DRV_TWL4030 > /* 3430ES2.0 doesn't have msecure/gpio-22 line connected to T2 */ > if (omap_type() == OMAP2_DEVICE_TYPE_GP && > - system_rev < OMAP3430_REV_ES2_0) { > + omap_rev() < OMAP3430_REV_ES2_0) { > void __iomem *msecure_pad_config_reg = omap_ctrl_base_get() + > 0xA3C; > int mux_mask = 0x04; > @@ -266,7 +266,7 @@ static inline void __init sdp3430_init_smc91x(void) > sdp3430_smc91x_resources[0].end = cs_mem_base + 0xf; > udelay(100); > > - if (system_rev > OMAP3430_REV_ES1_0) > + if (omap_rev() > OMAP3430_REV_ES1_0) > eth_gpio = OMAP34XX_ETHR_GPIO_IRQ_SDPV2; > else > eth_gpio = OMAP34XX_ETHR_GPIO_IRQ_SDPV1; > @@ -452,7 +452,7 @@ static void __init omap_3430sdp_init(void) > platform_add_devices(sdp3430_devices, ARRAY_SIZE(sdp3430_devices)); > omap_board_config = sdp3430_config; > omap_board_config_size = ARRAY_SIZE(sdp3430_config); > - if (system_rev > OMAP3430_REV_ES1_0) > + if (omap_rev() > OMAP3430_REV_ES1_0) > ts_gpio = OMAP34XX_TS_GPIO_IRQ_SDPV2; > else > ts_gpio = OMAP34XX_TS_GPIO_IRQ_SDPV1; > diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c > index baa378f..24155e0 100644 > --- a/arch/arm/mach-omap2/board-h4.c > +++ b/arch/arm/mach-omap2/board-h4.c > @@ -495,7 +495,7 @@ static void __init tusb_evm_setup(void) > omap_cfg_reg(L2_GPMC_NCS7); > omap_cfg_reg(M1_GPMC_WAIT2); > > - switch ((system_rev >> 8) & 0x0f) { > + switch ((omap_rev() >> 8) & 0x0f) { > case 0: /* ES 1.0 */ > case 1: /* ES 2.0 */ > /* Assume early board revision without optional ES2.0 > diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c > index d4d4e90..563e33d 100644 > --- a/arch/arm/mach-omap2/board-ldp.c > +++ b/arch/arm/mach-omap2/board-ldp.c > @@ -57,7 +57,7 @@ static int __init msecure_init(void) > #ifdef CONFIG_RTC_DRV_TWL4030 > /* 3430ES2.0 doesn't have msecure/gpio-22 line connected to T2 */ > if (omap_type() == OMAP2_DEVICE_TYPE_GP && > - system_rev < OMAP3430_REV_ES2_0) { > + omap_rev() < OMAP3430_REV_ES2_0) { > void __iomem *msecure_pad_config_reg = > omap_ctrl_base_get() + 0xA3C; > int mux_mask = 0x04; > diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c > index cc43f4f..1e5d51b 100644 > --- a/arch/arm/mach-omap2/clock34xx.c > +++ b/arch/arm/mach-omap2/clock34xx.c > @@ -343,7 +343,7 @@ static int omap3_noncore_dpll_program(struct clk *clk, u16 m, u8 n, u16 freqsel) > * on 3430ES1 prevents us from changing DPLL multipliers or dividers > * on DPLL4. > */ > - if (system_rev == OMAP3430_REV_ES1_0 && > + if (omap_rev() == OMAP3430_REV_ES1_0 && > !strcmp("dpll4_ck", clk->name)) { > printk(KERN_ERR "clock: DPLL4 cannot change rate due to " > "silicon 'Limitation 2.5' on 3430ES1.\n"); > @@ -711,7 +711,7 @@ int __init omap2_clk_init(void) > * Update this if there are further clock changes between ES2 > * and production parts > */ > - if (system_rev == OMAP3430_REV_ES1_0) { > + if (omap_rev() == OMAP3430_REV_ES1_0) { > /* No 3430ES1-only rates exist, so no RATE_IN_3430ES1 */ > cpu_clkflg |= CLOCK_IN_OMAP3430ES1; > } else { > diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c > index 002420c..2c5e0a3 100644 > --- a/arch/arm/mach-omap2/id.c > +++ b/arch/arm/mach-omap2/id.c > @@ -23,6 +23,14 @@ > #include <mach/cpu.h> > > static struct omap_chip_id omap_chip; > +static unsigned int omap_revision; > + > + > +unsigned int omap_rev(void) > +{ > + return omap_revision; > +} > +EXPORT_SYMBOL(omap_rev); > > /** > * omap_chip_is - test whether currently running OMAP matches a chip type > @@ -72,7 +80,7 @@ EXPORT_SYMBOL(omap_type); > struct omap_id { > u16 hawkeye; /* Silicon type (Hawkeye id) */ > u8 dev; /* Device type from production_id reg */ > - u32 type; /* Combined type id copied to system_rev */ > + u32 type; /* Combined type id copied to omap_revision */ > }; > > /* Register values to detect the OMAP version */ > @@ -138,9 +146,9 @@ void __init omap24xx_check_revision(void) > j = i; > } > > - pr_info("OMAP%04x", system_rev >> 16); > - if ((system_rev >> 8) & 0x0f) > - pr_info("ES%x", (system_rev >> 12) & 0xf); > + pr_info("OMAP%04x", omap_rev() >> 16); > + if ((omap_rev() >> 8) & 0x0f) > + pr_info("ES%x", (omap_rev() >> 12) & 0xf); > pr_info("\n"); > } > > @@ -158,7 +166,7 @@ void __init omap34xx_check_revision(void) > */ > cpuid = read_cpuid(CPUID_ID); > if ((((cpuid >> 4) & 0xfff) == 0xc08) && ((cpuid & 0xf) == 0x0)) { > - system_rev = OMAP3430_REV_ES1_0; > + omap_revision = OMAP3430_REV_ES1_0; > goto out; > } > > @@ -175,26 +183,26 @@ void __init omap34xx_check_revision(void) > if (hawkeye == 0xb7ae) { > switch (rev) { > case 0: > - system_rev = OMAP3430_REV_ES2_0; > + omap_revision = OMAP3430_REV_ES2_0; > rev_name = "ES2.0"; > break; > case 2: > - system_rev = OMAP3430_REV_ES2_1; > + omap_revision = OMAP3430_REV_ES2_1; > rev_name = "ES2.1"; > break; > case 3: > - system_rev = OMAP3430_REV_ES3_0; > + omap_revision = OMAP3430_REV_ES3_0; > rev_name = "ES3.0"; > break; > default: > /* Use the latest known revision as default */ > - system_rev = OMAP3430_REV_ES3_0; > + omap_revision = OMAP3430_REV_ES3_0; > rev_name = "Unknown revision\n"; > } > } > > out: > - pr_info("OMAP%04x %s\n", system_rev >> 16, rev_name); > + pr_info("OMAP%04x %s\n", omap_rev() >> 16, rev_name); > } > > /* > @@ -225,9 +233,9 @@ void __init omap2_check_revision(void) > omap_chip.oc |= CHIP_IS_OMAP2420; > } else if (cpu_is_omap343x()) { > omap_chip.oc = CHIP_IS_OMAP3430; > - if (system_rev == OMAP3430_REV_ES1_0) > + if (omap_rev() == OMAP3430_REV_ES1_0) > omap_chip.oc |= CHIP_IS_OMAP3430ES1; > - else if (system_rev > OMAP3430_REV_ES1_0) > + else if (omap_rev() > OMAP3430_REV_ES1_0) > omap_chip.oc |= CHIP_IS_OMAP3430ES2; > } else { > pr_err("Uninitialized omap_chip, please fix!\n"); > @@ -243,7 +251,7 @@ void __init omap2_check_revision(void) > */ > void __init omap2_set_globals_tap(struct omap_globals *omap2_globals) > { > - system_rev = omap2_globals->class; > + omap_revision = omap2_globals->class; > tap_base = omap2_globals->tap; > > if (cpu_is_omap34xx()) > diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c > index 457639f..a11a657 100644 > --- a/arch/arm/mach-omap2/pm34xx.c > +++ b/arch/arm/mach-omap2/pm34xx.c > @@ -109,7 +109,7 @@ static irqreturn_t prcm_interrupt_handler (int irq, void *dev_id) > cm_write_mod_reg(fclk, OMAP3430_PER_MOD, CM_FCLKEN); > } > > - if (system_rev > OMAP3430_REV_ES1_0) { > + if (omap_rev() > OMAP3430_REV_ES1_0) { > /* USBHOST */ > wkst = prm_read_mod_reg(OMAP3430ES2_USBHOST_MOD, PM_WKST); > if (wkst) { > @@ -194,7 +194,7 @@ static int omap3_fclks_active(void) > > fck_core1 = cm_read_mod_reg(CORE_MOD, > CM_FCLKEN1); > - if (system_rev > OMAP3430_REV_ES1_0) { > + if (omap_rev() > OMAP3430_REV_ES1_0) { > fck_core3 = cm_read_mod_reg(CORE_MOD, > OMAP3430ES2_CM_FCLKEN3); > fck_sgx = cm_read_mod_reg(OMAP3430ES2_SGX_MOD, > @@ -368,7 +368,7 @@ static void __init prcm_setup_regs(void) > prm_write_mod_reg(0, OMAP3430_NEON_MOD, PM_WKDEP); > prm_write_mod_reg(0, OMAP3430_CAM_MOD, PM_WKDEP); > prm_write_mod_reg(0, OMAP3430_PER_MOD, PM_WKDEP); > - if (system_rev > OMAP3430_REV_ES1_0) { > + if (omap_rev() > OMAP3430_REV_ES1_0) { > prm_write_mod_reg(0, OMAP3430ES2_SGX_MOD, PM_WKDEP); > prm_write_mod_reg(0, OMAP3430ES2_USBHOST_MOD, PM_WKDEP); > } else > @@ -418,7 +418,7 @@ static void __init prcm_setup_regs(void) > OMAP3430_AUTO_DES1, > CORE_MOD, CM_AUTOIDLE2); > > - if (system_rev > OMAP3430_REV_ES1_0) { > + if (omap_rev() > OMAP3430_REV_ES1_0) { > cm_write_mod_reg( > OMAP3430ES2_AUTO_USBTLL, > CORE_MOD, CM_AUTOIDLE3); > @@ -465,7 +465,7 @@ static void __init prcm_setup_regs(void) > OMAP3430_PER_MOD, > CM_AUTOIDLE); > > - if (system_rev > OMAP3430_REV_ES1_0) { > + if (omap_rev() > OMAP3430_REV_ES1_0) { > cm_write_mod_reg( > OMAP3430ES2_AUTO_USBHOST, > OMAP3430ES2_USBHOST_MOD, > diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c > index 453569a..9fa033d 100644 > --- a/arch/arm/mach-omap2/smartreflex.c > +++ b/arch/arm/mach-omap2/smartreflex.c > @@ -766,7 +766,7 @@ static int __init omap3_sr_init(void) > int ret = 0; > u8 RdReg; > > - if (system_rev > OMAP3430_REV_ES1_0) { > + if (omap_rev() > OMAP3430_REV_ES1_0) { > current_vdd1_opp = PRCM_VDD1_OPP3; > current_vdd2_opp = PRCM_VDD2_OPP3; > } else { > diff --git a/arch/arm/plat-omap/include/mach/board-apollon.h b/arch/arm/plat-omap/include/mach/board-apollon.h > index 731c858..61bd5e8 100644 > --- a/arch/arm/plat-omap/include/mach/board-apollon.h > +++ b/arch/arm/plat-omap/include/mach/board-apollon.h > @@ -29,12 +29,14 @@ > #ifndef __ASM_ARCH_OMAP_APOLLON_H > #define __ASM_ARCH_OMAP_APOLLON_H > > +#include <mach/cpu.h> > + > extern void apollon_mmc_init(void); > > static inline int apollon_plus(void) > { > /* The apollon plus has IDCODE revision 5 */ > - return system_rev & 0xc0; > + return omap_rev() & 0xc0; > } > > /* Placeholder for APOLLON specific defines */ > diff --git a/arch/arm/plat-omap/include/mach/cpu.h b/arch/arm/plat-omap/include/mach/cpu.h > index 4325bbc..b2062f1 100644 > --- a/arch/arm/plat-omap/include/mach/cpu.h > +++ b/arch/arm/plat-omap/include/mach/cpu.h > @@ -34,12 +34,12 @@ struct omap_chip_id { > #define OMAP_CHIP_INIT(x) { .oc = x } > > /* > - * system_rev bits: > + * omap_rev bits: > * CPU id bits (0730, 1510, 1710, 2422...) [31:16] > * CPU revision (See _REV_ defined in cpu.h) [15:08] > * CPU class bits (15xx, 16xx, 24xx, 34xx...) [07:00] > */ > -extern unsigned int system_rev; > +unsigned int omap_rev(void); > > /* > * Test if multicore OMAP support is needed > @@ -113,7 +113,7 @@ extern unsigned int system_rev; > * cpu_is_omap243x(): True for OMAP2430 > * cpu_is_omap343x(): True for OMAP3430 > */ > -#define GET_OMAP_CLASS (system_rev & 0xff) > +#define GET_OMAP_CLASS (omap_rev() & 0xff) > > #define IS_OMAP_CLASS(class, id) \ > static inline int is_omap ##class (void) \ > @@ -121,7 +121,7 @@ static inline int is_omap ##class (void) \ > return (GET_OMAP_CLASS == (id)) ? 1 : 0; \ > } > > -#define GET_OMAP_SUBCLASS ((system_rev >> 20) & 0x0fff) > +#define GET_OMAP_SUBCLASS ((omap_rev() >> 20) & 0x0fff) > > #define IS_OMAP_SUBCLASS(subclass, id) \ > static inline int is_omap ##subclass (void) \ > @@ -231,7 +231,7 @@ IS_OMAP_SUBCLASS(343x, 0x343) > * cpu_is_omap2430(): True for OMAP2430 > * cpu_is_omap3430(): True for OMAP3430 > */ > -#define GET_OMAP_TYPE ((system_rev >> 16) & 0xffff) > +#define GET_OMAP_TYPE ((omap_rev() >> 16) & 0xffff) > > #define IS_OMAP_TYPE(type, id) \ > static inline int is_omap ##type (void) \ > diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c > index 027b101..702e3b9 100644 > --- a/arch/arm/plat-omap/sram.c > +++ b/arch/arm/plat-omap/sram.c > @@ -24,6 +24,7 @@ > > #include <mach/sram.h> > #include <mach/board.h> > +#include <mach/cpu.h> > > #include <mach/control.h> > > @@ -87,7 +88,7 @@ static int is_sram_locked(void) > int type = 0; > > if (cpu_is_omap242x()) > - type = system_rev & OMAP2_DEVICETYPE_MASK; > + type = omap_rev() & OMAP2_DEVICETYPE_MASK; > > if (type == GP_DEVICE) { > /* RAMFW: R/W access to all initiators for all qualifier sets */ > -- > 1.5.6.5 > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html