linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: robherring2@gmail.com (Rob Herring)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 04/10] arm: zynq: Load scu baseaddress at run time
Date: Mon, 25 Mar 2013 09:06:12 -0500	[thread overview]
Message-ID: <515059D4.5070903@gmail.com> (raw)
In-Reply-To: <1364219596-4954-4-git-send-email-michal.simek@xilinx.com>

On 03/25/2013 08:53 AM, Michal Simek wrote:
> Use Cortex a9 cp15 to read scu baseaddress.
> 
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
>  arch/arm/boot/dts/zynq-7000.dtsi |    5 +++++
>  arch/arm/mach-zynq/common.c      |   33 +++++++++++++++++++++------------
>  arch/arm/mach-zynq/common.h      |    2 ++
>  3 files changed, 28 insertions(+), 12 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi
> index 2a72339..4943568 100644
> --- a/arch/arm/boot/dts/zynq-7000.dtsi
> +++ b/arch/arm/boot/dts/zynq-7000.dtsi
> @@ -22,6 +22,11 @@
>  		interrupt-parent = <&intc>;
>  		ranges;
>  
> +		scu: scu at f8f000000 {
> +			compatible = "arm,cortex-a9-scu";
> +			reg = <0xf8f00000 0x58>;
> +		};
> +

It's fine to add this, but you don't really need it for this patch.

>  		intc: interrupt-controller at f8f01000 {
>  			compatible = "arm,cortex-a9-gic";
>  			#interrupt-cells = <3>;
> diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
> index 68e0907..13f9d8b 100644
> --- a/arch/arm/mach-zynq/common.c
> +++ b/arch/arm/mach-zynq/common.c
> @@ -33,10 +33,13 @@
>  #include <asm/mach-types.h>
>  #include <asm/page.h>
>  #include <asm/pgtable.h>
> +#include <asm/smp_scu.h>
>  #include <asm/hardware/cache-l2x0.h>
>  
>  #include "common.h"
>  
> +void __iomem *scu_base;
> +
>  static struct of_device_id zynq_of_bus_ids[] __initdata = {
>  	{ .compatible = "simple-bus", },
>  	{}
> @@ -56,17 +59,6 @@ static void __init xilinx_init_machine(void)
>  	of_platform_bus_probe(NULL, zynq_of_bus_ids, NULL);
>  }
>  
> -#define SCU_PERIPH_PHYS		0xF8F00000
> -#define SCU_PERIPH_SIZE		SZ_8K
> -#define SCU_PERIPH_VIRT		(VMALLOC_END - SCU_PERIPH_SIZE)
> -
> -static struct map_desc scu_desc __initdata = {
> -	.virtual	= SCU_PERIPH_VIRT,
> -	.pfn		= __phys_to_pfn(SCU_PERIPH_PHYS),
> -	.length		= SCU_PERIPH_SIZE,
> -	.type		= MT_DEVICE,
> -};
> -
>  static void __init xilinx_zynq_timer_init(void)
>  {
>  	struct device_node *np;
> @@ -81,13 +73,30 @@ static void __init xilinx_zynq_timer_init(void)
>  	clocksource_of_init();
>  }
>  
> +static struct map_desc zynq_cortex_a9_scu_map __initdata = {
> +	.length	= SZ_256,
> +	.type	= MT_DEVICE,
> +};
> +
> +static void __init scu_init(void)
> +{
> +	unsigned long base;
> +
> +	base = scu_a9_get_base();
> +	zynq_cortex_a9_scu_map.pfn = __phys_to_pfn(base);
> +	zynq_cortex_a9_scu_map.virtual = base;

You are setting the virtual address to the physical base?

> +	iotable_init(&zynq_cortex_a9_scu_map, 1);

Then creating a static mapping...

> +	scu_base = ioremap(base, zynq_cortex_a9_scu_map.length);

And also a dynamic mapping?

Rob

  reply	other threads:[~2013-03-25 14:06 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-25 13:53 [PATCH 01/10] arm: zynq: Use standard timer binding Michal Simek
2013-03-25 13:53 ` [PATCH 02/10] arm: zynq: Move timer to clocksource interface Michal Simek
2013-03-25 13:53 ` [PATCH 03/10] arm: zynq: Move timer to generic location Michal Simek
2013-03-25 16:01   ` Steffen Trumtrar
2013-03-25 16:24     ` Michal Simek
2013-03-25 13:53 ` [PATCH 04/10] arm: zynq: Load scu baseaddress at run time Michal Simek
2013-03-25 14:06   ` Rob Herring [this message]
2013-03-25 14:51     ` Michal Simek
2013-03-25 15:37       ` Rob Herring
2013-03-25 16:07         ` Michal Simek
2013-03-25 22:34           ` Rob Herring
2013-03-26 10:45             ` Michal Simek
2013-03-26 12:28               ` Rob Herring
2013-03-26 12:33                 ` Michal Simek
2013-04-02 16:40           ` Pawel Moll
     [not found]             ` <CAHTX3dKD4G0E8qoxTR2HnJVdagoeOerM+TiZzkJUPjcGwYdX_Q@mail.gmail.com>
2013-04-03  7:25               ` Steffen Trumtrar
2013-04-03 16:06               ` Pawel Moll
     [not found]                 ` <CAHTX3dJMpp+E2u-cAeYbqtxC1WAYWpCeRx6W7G=dWDcgzUz5DA@mail.gmail.com>
2013-04-03 17:11                   ` Pawel Moll
2013-03-25 13:53 ` [PATCH 05/10] arm: zynq: Move slcr initialization to separate file Michal Simek
2013-03-25 16:19   ` Steffen Trumtrar
2013-03-25 16:37     ` Michal Simek
2013-03-25 13:53 ` [PATCH 06/10] arm: zynq: Add support for system reset Michal Simek
2013-03-25 13:53 ` [PATCH 07/10] arm: zynq: Add support for pmu Michal Simek
2013-03-25 13:53 ` [PATCH 08/10] arm: zynq: Add smp support Michal Simek
2013-03-25 14:16   ` Rob Herring
2013-03-25 16:31     ` Michal Simek
2013-03-25 22:10       ` Rob Herring
2013-03-26  7:42         ` Michal Simek
2013-04-01 22:40           ` Rob Herring
2013-04-03  6:44             ` Michal Simek
2013-03-25 13:53 ` [PATCH 09/10] arm: zynq: Add hotplug support Michal Simek
2013-03-25 13:53 ` [PATCH 10/10] arm: zynq: Add cpuidle support Michal Simek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=515059D4.5070903@gmail.com \
    --to=robherring2@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).