Re: [PATCH V2 1/2] ARM: OMAP2+: Prepare for device-tree PMU support

[Tony Lindgren <tony@atomide.com>]

* Jon Hunter <jon-hunter@ti.com> [121217 09:51]:
> If device-tree is present, then do not create the PMU device from within
> the OMAP specific PMU code. This is required to allow device-tree to
> create the PMU device from the PMU device-tree node.
> 
> PMU is not currently supported for OMAP4430 (due to a dependency on
> having a cross-trigger interface driver) and so ensure that this
> indicated on boot with or without device-tree.

Acked-by: Tony Lindgren <tony@atomide.com>
 
> Signed-off-by: Jon Hunter <jon-hunter@ti.com>
> ---
>  arch/arm/mach-omap2/pmu.c |   14 +++++++++++---
>  1 file changed, 11 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/pmu.c b/arch/arm/mach-omap2/pmu.c
> index eb78ae7..1a0799c 100644
> --- a/arch/arm/mach-omap2/pmu.c
> +++ b/arch/arm/mach-omap2/pmu.c
> @@ -11,6 +11,8 @@
>   * the Free Software Foundation; either version 2 of the License, or
>   * (at your option) any later version.
>   */
> +#include <linux/of.h>
> +
>  #include <asm/pmu.h>
>  
>  #include "soc.h"
> @@ -64,6 +66,15 @@ static int __init omap_init_pmu(void)
>  	unsigned oh_num;
>  	char **oh_names;
>  
> +	/* XXX Remove this check when the CTI driver is available */
> +	if (cpu_is_omap443x()) {
> +		pr_info("ARM PMU: not yet supported on OMAP4430 due to missing CTI driver\n");
> +		return 0;
> +	}
> +
> +	if (of_have_populated_dt())
> +		return 0;
> +
>  	/*
>  	 * To create an ARM-PMU device the following HWMODs
>  	 * are required for the various OMAP2+ devices.
> @@ -76,9 +87,6 @@ static int __init omap_init_pmu(void)
>  	if (cpu_is_omap443x()) {
>  		oh_num = ARRAY_SIZE(omap4430_pmu_oh_names);
>  		oh_names = omap4430_pmu_oh_names;
> -		/* XXX Remove the next two lines when CTI driver available */
> -		pr_info("ARM PMU: not yet supported on OMAP4430 due to missing CTI driver\n");
> -		return 0;
>  	} else if (cpu_is_omap34xx() || cpu_is_omap44xx()) {
>  		oh_num = ARRAY_SIZE(omap3_pmu_oh_names);
>  		oh_names = omap3_pmu_oh_names;
> -- 
> 1.7.10.4
>