Nishanth Menon <[email protected]> wrote:
> sgx, iva, l2cache, sgx, neon, isp are generic features, make
> them generic features, current OMAP3 detection mechanism
> is still retained. 192Mhz is more specific OMAP3 feature
> so it is retained as is
>
> Cc: Tony Lindgren <[email protected]>
> Cc: Angelo Arrifano <[email protected]>
> Cc: "Zebediah C. McClure" <[email protected]>
> Cc: Alistair Buxton <[email protected]>
> Cc: Paul Walmsley <[email protected]>
> Cc: Sanjeev Premi <[email protected]>
> Cc: Santosh Shilimkar <[email protected]>
> Cc: Senthilvadivu Gurusamy <[email protected]>
> Cc: Kevin Hilman <[email protected]>
> Cc: Tomi Valkeinen <[email protected]>
> Cc: Aaro Koskinen <[email protected]>
> Cc: Vikram Pandita <[email protected]>
> Cc: Vishwanath S <[email protected]>
> Cc: [email protected]
>
> Signed-off-by: Nishanth Menon <[email protected]>
> ---
> arch/arm/mach-omap2/id.c | 20 ++++++++--------
> arch/arm/plat-omap/common.c | 3 ++
> arch/arm/plat-omap/include/plat/cpu.h | 39 +++++++++++++++++++-------------
> 3 files changed, 36 insertions(+), 26 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
> index 809e13a..01555b6 100644
> --- a/arch/arm/mach-omap2/id.c
> +++ b/arch/arm/mach-omap2/id.c
> @@ -161,7 +161,7 @@ static void __init omap24xx_check_revision(void)
> #define OMAP3_CHECK_FEATURE(status,feat) \
> if (((status & OMAP3_ ##feat## _MASK) \
> >> OMAP3_ ##feat## _SHIFT) != FEAT_ ##feat## _NONE) { \
> - omap3_features |= OMAP3_HAS_ ##feat; \
> + omap_features |= OMAP_HAS_ ##feat; \
> }
"CHECK" sounds like a querying API, whereas the macro populates data.
Maybe UPDATE or SET ?
> static void __init omap3_check_features(void)
> @@ -310,20 +310,20 @@ static void __init omap3_cpuinfo(void)
> /*
> * AM35xx devices
> */
> - if (omap3_has_sgx()) {
> + if (omap_has_sgx()) {
> omap_revision = OMAP3517_REV(rev);
> strcpy(cpu_name, "AM3517");
> } else {
> /* Already set in omap3_check_revision() */
> strcpy(cpu_name, "AM3505");
> }
> - } else if (omap3_has_iva() && omap3_has_sgx()) {
> + } else if (omap_has_iva() && omap_has_sgx()) {
> /* OMAP3430, OMAP3525, OMAP3515, OMAP3503 devices */
> strcpy(cpu_name, "OMAP3430/3530");
> - } else if (omap3_has_iva()) {
> + } else if (omap_has_iva()) {
> omap_revision = OMAP3525_REV(rev);
> strcpy(cpu_name, "OMAP3525");
> - } else if (omap3_has_sgx()) {
> + } else if (omap_has_sgx()) {
> omap_revision = OMAP3515_REV(rev);
> strcpy(cpu_name, "OMAP3515");
> } else {
> @@ -354,11 +354,11 @@ static void __init omap3_cpuinfo(void)
> /* Print verbose information */
> pr_info("%s ES%s (", cpu_name, cpu_rev);
>
> - OMAP_SHOW_FEATURE(3, l2cache);
> - OMAP_SHOW_FEATURE(3, iva);
> - OMAP_SHOW_FEATURE(3, sgx);
> - OMAP_SHOW_FEATURE(3, neon);
> - OMAP_SHOW_FEATURE(3, isp);
> + OMAP_SHOW_FEATURE(, l2cache);
> + OMAP_SHOW_FEATURE(, iva);
> + OMAP_SHOW_FEATURE(, sgx);
> + OMAP_SHOW_FEATURE(, neon);
> + OMAP_SHOW_FEATURE(, isp);
> OMAP_SHOW_FEATURE(3, 192mhz_clk);
>
> printk(")\n");
> diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c
> index 459a45f..259adc7 100644
> --- a/arch/arm/plat-omap/common.c
> +++ b/arch/arm/plat-omap/common.c
> @@ -81,6 +81,9 @@ const void *omap_get_var_config(u16 tag, size_t *len)
> }
> EXPORT_SYMBOL(omap_get_var_config);
>
> +/* OMAP Generic features */
> +u32 omap_features;
> +
> void __init omap_check_revision()
> {
> #ifdef CONFIG_ARCH_OMAP1
> diff --git a/arch/arm/plat-omap/include/plat/cpu.h
> b/arch/arm/plat-omap/include/plat/cpu.h
> index f8ecbc4..3cc4947 100644
> --- a/arch/arm/plat-omap/include/plat/cpu.h
> +++ b/arch/arm/plat-omap/include/plat/cpu.h
> @@ -331,14 +331,14 @@ IS_OMAP_TYPE(3517, 0x3517)
> # undef cpu_is_omap3517
> # define cpu_is_omap3430() is_omap3430()
> # define cpu_is_omap3503() (cpu_is_omap3430() && \
> - (!omap3_has_iva()) && \
> - (!omap3_has_sgx()))
> + (!omap_has_iva()) && \
> + (!omap_has_sgx()))
> # define cpu_is_omap3515() (cpu_is_omap3430() && \
> - (!omap3_has_iva()) && \
> - (omap3_has_sgx()))
> + (!omap_has_iva()) && \
> + (omap_has_sgx()))
> # define cpu_is_omap3525() (cpu_is_omap3430() && \
> - (!omap3_has_sgx()) && \
> - (omap3_has_iva()))
> + (!omap_has_sgx()) && \
> + (omap_has_iva()))
> # define cpu_is_omap3530() (cpu_is_omap3430())
> # define cpu_is_omap3505() is_omap3505()
> # define cpu_is_omap3517() is_omap3517()
> @@ -457,22 +457,29 @@ static inline unsigned int omap##rev##_has_
> ##feat(void) \
> } \
>
> /*
> + * Runtime detection of Generic OMAP features
> + */
> +extern u32 omap_features;
> +
> +#define OMAP_HAS_L2CACHE BIT(0)
> +#define OMAP_HAS_IVA BIT(1)
> +#define OMAP_HAS_SGX BIT(2)
> +#define OMAP_HAS_NEON BIT(3)
> +#define OMAP_HAS_ISP BIT(4)
> +
> +OMAP_HAS_FEATURE(, l2cache, L2CACHE)
> +OMAP_HAS_FEATURE(, sgx, SGX)
> +OMAP_HAS_FEATURE(, iva, IVA)
> +OMAP_HAS_FEATURE(, neon, NEON)
> +OMAP_HAS_FEATURE(, isp, ISP)
> +
> +/*
> * Runtime detection of OMAP3 features
> */
> extern u32 omap3_features;
>
> -#define OMAP3_HAS_L2CACHE BIT(0)
> -#define OMAP3_HAS_IVA BIT(1)
> -#define OMAP3_HAS_SGX BIT(2)
> -#define OMAP3_HAS_NEON BIT(3)
> -#define OMAP3_HAS_ISP BIT(4)
> #define OMAP3_HAS_192MHZ_CLK BIT(5)
>
> -OMAP_HAS_FEATURE(3, l2cache, L2CACHE)
> -OMAP_HAS_FEATURE(3, sgx, SGX)
> -OMAP_HAS_FEATURE(3, iva, IVA)
> -OMAP_HAS_FEATURE(3, neon, NEON)
> -OMAP_HAS_FEATURE(3, isp, ISP)
> OMAP_HAS_FEATURE(3, 192mhz_clk, 192MHZ_CLK)
>
> #endif
> --
What about feature detection for OMAP2 and OMAP4 (similar to
omap3_check_features) ?
At least a dummy implementation with warning messages would be good,
so that they are not used without initialization.
Regards,
Venkat.
--
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
