From mboxrd@z Thu Jan  1 00:00:00 1970
From: lee.jones@linaro.org (Lee Jones)
Date: Mon, 25 Mar 2013 15:32:10 +0000
Subject: [PATCH 2/3] mfd: db8500-prcmu: Fetch the PRCMU TCDM base address
 from Device Tree
In-Reply-To: <1364223758-17621-2-git-send-email-lee.jones@linaro.org>
References: <1364223758-17621-1-git-send-email-lee.jones@linaro.org>
 <1364223758-17621-2-git-send-email-lee.jones@linaro.org>
Message-ID: <20130325153210.GE3568@gmail.com>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

Sam, and this one, sorry.

> A recent move to send the base addresses though the PRCMU platform
> device resource instead of defines found in <mach/*>, means that dbx500
> devices can no longer boot successfully when booting with Device Tree
> enabled. This patch ensures the addresses are obtained correctly from
> DT.
> 
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ---
>  drivers/mfd/db8500-prcmu.c |   28 ++++++++++++++++++++--------
>  1 file changed, 20 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
> index 21f261b..8602bf8 100644
> --- a/drivers/mfd/db8500-prcmu.c
> +++ b/drivers/mfd/db8500-prcmu.c
> @@ -17,6 +17,8 @@
>  #include <linux/err.h>
>  #include <linux/spinlock.h>
>  #include <linux/io.h>
> +#include <linux/of.h>
> +#include <linux/of_address.h>
>  #include <linux/slab.h>
>  #include <linux/mutex.h>
>  #include <linux/completion.h>
> @@ -2790,19 +2792,29 @@ static int db8500_irq_init(struct device_node *np)
>  }
>  
>  static void dbx500_fw_version_init(struct platform_device *pdev,
> -			    u32 version_offset)
> +				   u32 version_offset,
> +				   struct device_node *np)
>  {
> +	struct device_node *tcpm_np;
>  	struct resource *res;
> -	void __iomem *tcpm_base;
> +	void __iomem *tcpm_base = NULL;
>  
>  	res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
>  					   "prcmu-tcpm");
>  	if (!res) {
> -		dev_err(&pdev->dev,
> -			"Error: no prcmu tcpm memory region provided\n");
> -		return;
> -	}
> -	tcpm_base = ioremap(res->start, resource_size(res));
> +		if (np) {
> +			tcpm_np = of_find_node_by_name(np->parent,
> +						       "prcmu-tcpm-per4");
> +			if (!tcpm_np) {
> +				dev_err(&pdev->dev,
> +					"no prcmu tcpm mem region provided\n");
> +				return;
> +			}
> +			tcpm_base = of_iomap(tcpm_np, 0);
> +		}
> +	} else
> +		tcpm_base = ioremap(res->start, resource_size(res));
> +
>  	if (tcpm_base != NULL) {
>  		u32 version;
>  
> @@ -3154,7 +3166,7 @@ static int db8500_prcmu_probe(struct platform_device *pdev)
>  
>  	init_prcm_registers();
>  
> -	dbx500_fw_version_init(pdev, pdata->version_offset);
> +	dbx500_fw_version_init(pdev, pdata->version_offset, np);
>  	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "prcmu-tcdm");
>  	if (!res) {
>  		dev_err(&pdev->dev, "no prcmu tcdm region provided\n");

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog