[PATCH 0/2] Remove elm address space from omap4 hwmod

[PATCH 0/2] Remove elm address space from omap4 hwmod

[Franklin S Cooper Jr]

This patchset removes elm address entry from omap4 hwmod and adds
an elm DT node to omap4.dtsi.

Since no omap4 supports nand in mainline this patchset was boot
tested on a pandaboard.

Franklin S Cooper Jr (2):
  ARM: dts: omap4: Add elm node
  ARM: omap4: hwmod: Remove elm address space from hwmod data

 arch/arm/boot/dts/omap4.dtsi               |  8 ++++++++
 arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 10 ----------
 2 files changed, 8 insertions(+), 10 deletions(-)

-- 
2.6.1

[PATCH 1/2] ARM: dts: omap4: Add elm node

[Franklin S Cooper Jr]

Add device tree entry for the error location module.

Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
---
 arch/arm/boot/dts/omap4.dtsi | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 5a206c1..a40eb23 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -348,6 +348,14 @@
 			#interrupt-cells = <2>;
 		};
 
+		elm: elm@48078000 {
+			compatible = "ti,am3352-elm";
+			reg = <0x48078000 0x2000>;
+			interrupts = <4>;
+			ti,hwmods = "elm";
+			status = "disabled";
+		};
+
 		gpmc: gpmc@50000000 {
 			compatible = "ti,omap4430-gpmc";
 			reg = <0x50000000 0x1000>;
-- 
2.6.1

[PATCH 2/2] ARM: omap4: hwmod: Remove elm address space from hwmod data

[Franklin S Cooper Jr]

ELM address information is provided by device tree. No longer need
to include this information within hwmod.

This patch has only been boot tested.

Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
---
 arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index 43eebf2..8f13f4a 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -3915,21 +3915,11 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__dss_venc = {
 	.user		= OCP_USER_MPU,
 };
 
-static struct omap_hwmod_addr_space omap44xx_elm_addrs[] = {
-	{
-		.pa_start	= 0x48078000,
-		.pa_end		= 0x48078fff,
-		.flags		= ADDR_TYPE_RT
-	},
-	{ }
-};
-
 /* l4_per -> elm */
 static struct omap_hwmod_ocp_if omap44xx_l4_per__elm = {
 	.master		= &omap44xx_l4_per_hwmod,
 	.slave		= &omap44xx_elm_hwmod,
 	.clk		= "l4_div_ck",
-	.addr		= omap44xx_elm_addrs,
 	.user		= OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-- 
2.6.1

Re: [PATCH 1/2] ARM: dts: omap4: Add elm node

[Tony Lindgren]

* Franklin S Cooper Jr <fcooper@ti.com> [151028 14:02]:
> Add device tree entry for the error location module.
> 
> Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>

Applying this one into omap-for-v4.5/dt thanks.

Tony


>  arch/arm/boot/dts/omap4.dtsi | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
> index 5a206c1..a40eb23 100644
> --- a/arch/arm/boot/dts/omap4.dtsi
> +++ b/arch/arm/boot/dts/omap4.dtsi
> @@ -348,6 +348,14 @@
>  			#interrupt-cells = <2>;
>  		};
>  
> +		elm: elm@48078000 {
> +			compatible = "ti,am3352-elm";
> +			reg = <0x48078000 0x2000>;
> +			interrupts = <4>;
> +			ti,hwmods = "elm";
> +			status = "disabled";
> +		};
> +
>  		gpmc: gpmc@50000000 {
>  			compatible = "ti,omap4430-gpmc";
>  			reg = <0x50000000 0x1000>;
> -- 
> 2.6.1
> 

Re: [PATCH 2/2] ARM: omap4: hwmod: Remove elm address space from hwmod data

[Tony Lindgren]

* Franklin S Cooper Jr <fcooper@ti.com> [151028 14:02]:
> ELM address information is provided by device tree. No longer need
> to include this information within hwmod.
> 
> This patch has only been boot tested.
> 
> Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>

And this one seems safe for me to apply into omap-for-v4.5/soc thanks.

Tony

> ---
>  arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 10 ----------
>  1 file changed, 10 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> index 43eebf2..8f13f4a 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> @@ -3915,21 +3915,11 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__dss_venc = {
>  	.user		= OCP_USER_MPU,
>  };
>  
> -static struct omap_hwmod_addr_space omap44xx_elm_addrs[] = {
> -	{
> -		.pa_start	= 0x48078000,
> -		.pa_end		= 0x48078fff,
> -		.flags		= ADDR_TYPE_RT
> -	},
> -	{ }
> -};
> -
>  /* l4_per -> elm */
>  static struct omap_hwmod_ocp_if omap44xx_l4_per__elm = {
>  	.master		= &omap44xx_l4_per_hwmod,
>  	.slave		= &omap44xx_elm_hwmod,
>  	.clk		= "l4_div_ck",
> -	.addr		= omap44xx_elm_addrs,
>  	.user		= OCP_USER_MPU | OCP_USER_SDMA,
>  };
>  
> -- 
> 2.6.1
>