Re: [PATCH 1/1] OMAP3:Re-introduce omap_type()

[Kevin Hilman <khilman@deeprootsystems.com>]

Ulrik Bech Hald <ubh@ti.com> writes:

> The functionality of omap_type() is needed for eg. watchdog
> device registration to distinguish different device types.
>
> Signed-off-by: Ulrik Bech Hald <ubh@ti.com>

Collision. :) I have an add-back of this in my fixes queue which I
just posted as well.

Kevin

> ---
>  arch/arm/mach-omap2/id.c |   21 +++++++++++++++++++++
>  1 files changed, 21 insertions(+), 0 deletions(-)
>  mode change 100644 => 100755 arch/arm/mach-omap2/id.c
>
> diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
> old mode 100644
> new mode 100755
> index 458990e..9fa61b4
> --- a/arch/arm/mach-omap2/id.c
> +++ b/arch/arm/mach-omap2/id.c
> @@ -48,6 +48,27 @@ int omap_chip_is(struct omap_chip_id oci)
>  }
>  EXPORT_SYMBOL(omap_chip_is);
>  
> +int omap_type(void)
> +{
> +	u32 val = 0;
> +
> +	if (cpu_is_omap24xx()) {
> +		val = omap_ctrl_readl(OMAP24XX_CONTROL_STATUS);
> +	} else if (cpu_is_omap34xx()) {
> +		val = omap_ctrl_readl(OMAP343X_CONTROL_STATUS);
> +	} else {
> +		pr_err("Cannot detect omap type!\n");
> +		goto out;
> +	}
> +
> +	val &= OMAP2_DEVICETYPE_MASK;
> +	val >>= 8;
> +
> +out:
> +	return val;
> +}
> +EXPORT_SYMBOL(omap_type);
> +
>  /*----------------------------------------------------------------------------*/
>  
>  #define OMAP_TAP_IDCODE		0x0204
> -- 
> 1.5.4.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html