[PATCH V2 0/4] arm: make use of common scu_a9_get_base() interface

[PATCH V2 0/4] arm: make use of common scu_a9_get_base() interface

[Jisheng Zhang]

Commit e9d6b3358ac35901ccc6a4a5a317670fa469db25 adds common APIs to
get scu base address from CP15. This patch series connverts some platforms
to use that interface.

Jisheng Zhang (4):
  arm: highbank: make use of common scu_a9_get_base() interface
  arm: imx: make use of common scu_a9_get_base() interface
  arm: prima2: make use of common scu_a9_get_base() interface
  arm: socfgpa: make use of common scu_a9_get_base() interface

 arch/arm/mach-highbank/highbank.c | 4 ++--
 arch/arm/mach-imx/platsmp.c       | 3 +--
 arch/arm/mach-prima2/platsmp.c    | 3 +--
 arch/arm/mach-socfpga/socfpga.c   | 4 ++--
 4 files changed, 6 insertions(+), 8 deletions(-)

-- 
1.8.4.2

[PATCH V2 1/4] arm: highbank: make use of common scu_a9_get_base() interface

[Jisheng Zhang]

Make use of common scu_a9_get_base() and delete the comment since the
interface is self commented.

Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
---
 arch/arm/mach-highbank/highbank.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c
index 8e63ccd..7df007b 100644
--- a/arch/arm/mach-highbank/highbank.c
+++ b/arch/arm/mach-highbank/highbank.c
@@ -29,6 +29,7 @@
 #include <asm/cacheflush.h>
 #include <asm/cputype.h>
 #include <asm/smp_plat.h>
+#include <asm/smp_scu.h>
 #include <asm/hardware/cache-l2x0.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
@@ -43,8 +44,7 @@ static void __init highbank_scu_map_io(void)
 {
 	unsigned long base;
 
-	/* Get SCU base */
-	asm("mrc p15, 4, %0, c15, c0, 0" : "=r" (base));
+	base = scu_a9_get_base();
 
 	scu_base_addr = ioremap(base, SZ_4K);
 }
-- 
1.8.4.2

[PATCH V2 2/4] arm: imx: make use of common scu_a9_get_base() interface

[Jisheng Zhang]

Make use of common scu_a9_get_base() and delete the comment since the
interface is self commented.

Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
---
 arch/arm/mach-imx/platsmp.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/arm/mach-imx/platsmp.c b/arch/arm/mach-imx/platsmp.c
index 1f24c1f..369a566 100644
--- a/arch/arm/mach-imx/platsmp.c
+++ b/arch/arm/mach-imx/platsmp.c
@@ -35,8 +35,7 @@ void __init imx_scu_map_io(void)
 {
 	unsigned long base;
 
-	/* Get SCU base */
-	asm("mrc p15, 4, %0, c15, c0, 0" : "=r" (base));
+	base = scu_a9_get_base();
 
 	scu_io_desc.virtual = IMX_IO_P2V(base);
 	scu_io_desc.pfn = __phys_to_pfn(base);
-- 
1.8.4.2

[PATCH V2 3/4] arm: prima2: make use of common scu_a9_get_base() interface

[Jisheng Zhang]

Make use of common scu_a9_get_base() and delete the comment since the
interface is self commented.

Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
---
 arch/arm/mach-prima2/platsmp.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/arm/mach-prima2/platsmp.c b/arch/arm/mach-prima2/platsmp.c
index 3dbcb1a..2d5bcc9 100644
--- a/arch/arm/mach-prima2/platsmp.c
+++ b/arch/arm/mach-prima2/platsmp.c
@@ -34,8 +34,7 @@ void __init sirfsoc_map_scu(void)
 {
 	unsigned long base;
 
-	/* Get SCU base */
-	asm("mrc p15, 4, %0, c15, c0, 0" : "=r" (base));
+	base = scu_a9_get_base();
 
 	scu_io_desc.virtual = SIRFSOC_VA(base);
 	scu_io_desc.pfn = __phys_to_pfn(base);
-- 
1.8.4.2

[PATCH V2 4/4] arm: socfgpa: make use of common scu_a9_get_base() interface

[Jisheng Zhang]

Make use of common scu_a9_get_base() and delete the comment since the
interface is self commented.

Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
---
 arch/arm/mach-socfpga/socfpga.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-socfpga/socfpga.c b/arch/arm/mach-socfpga/socfpga.c
index bfce964..b695887 100644
--- a/arch/arm/mach-socfpga/socfpga.c
+++ b/arch/arm/mach-socfpga/socfpga.c
@@ -24,6 +24,7 @@
 #include <asm/hardware/cache-l2x0.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
+#include <asm/smp_scu.h>
 
 #include "core.h"
 
@@ -51,8 +52,7 @@ static void __init socfpga_scu_map_io(void)
 {
 	unsigned long base;
 
-	/* Get SCU base */
-	asm("mrc p15, 4, %0, c15, c0, 0" : "=r" (base));
+	base = scu_a9_get_base();
 
 	scu_io_desc.pfn = __phys_to_pfn(base);
 	iotable_init(&scu_io_desc, 1);
-- 
1.8.4.2

Re: [PATCH V2 4/4] arm: socfgpa: make use of common scu_a9_get_base() interface

[Dinh Nguyen]

On Thu, 2013-11-07 at 11:16 +0800, Jisheng Zhang wrote:
> Make use of common scu_a9_get_base() and delete the comment since the
> interface is self commented.
> 
> Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
> ---
>  arch/arm/mach-socfpga/socfpga.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-socfpga/socfpga.c b/arch/arm/mach-socfpga/socfpga.c
> index bfce964..b695887 100644
> --- a/arch/arm/mach-socfpga/socfpga.c
> +++ b/arch/arm/mach-socfpga/socfpga.c
> @@ -24,6 +24,7 @@
>  #include <asm/hardware/cache-l2x0.h>
>  #include <asm/mach/arch.h>
>  #include <asm/mach/map.h>
> +#include <asm/smp_scu.h>
>  
>  #include "core.h"
>  
> @@ -51,8 +52,7 @@ static void __init socfpga_scu_map_io(void)
>  {
>  	unsigned long base;
>  
> -	/* Get SCU base */
> -	asm("mrc p15, 4, %0, c15, c0, 0" : "=r" (base));
> +	base = scu_a9_get_base();
>  
>  	scu_io_desc.pfn = __phys_to_pfn(base);
>  	iotable_init(&scu_io_desc, 1);

Acked-by: Dinh Nguyen <dinguyen@altera.com>

Thanks,