* [PATCH 1/2] ARM: shmobile: pm-rmobile: Postpone call to pm_genpd_init()
2016-06-08 1:00 [GIT PULL] Renesas ARM Based SoC Updates for v4.8 Simon Horman
@ 2016-06-08 1:00 ` Simon Horman
2016-06-08 1:00 ` [PATCH 2/2] ARM: shmobile: rcar-gen2: Use ICRAM1 for jump stub on all SoCs Simon Horman
2016-06-13 22:44 ` [GIT PULL] Renesas ARM Based SoC Updates for v4.8 Olof Johansson
2 siblings, 0 replies; 4+ messages in thread
From: Simon Horman @ 2016-06-08 1:00 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
All local setup of the generic_pm_domain structure should have been
completed before calling pm_genpd_init().
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/pm-rmobile.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/pm-rmobile.c b/arch/arm/mach-shmobile/pm-rmobile.c
index c0b05e9e6442..45a195501b78 100644
--- a/arch/arm/mach-shmobile/pm-rmobile.c
+++ b/arch/arm/mach-shmobile/pm-rmobile.c
@@ -131,13 +131,13 @@ static void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd)
struct dev_power_governor *gov = rmobile_pd->gov;
genpd->flags = GENPD_FLAG_PM_CLK;
- pm_genpd_init(genpd, gov ? : &simple_qos_governor, false);
genpd->dev_ops.active_wakeup = rmobile_pd_active_wakeup;
genpd->power_off = rmobile_pd_power_down;
genpd->power_on = rmobile_pd_power_up;
genpd->attach_dev = cpg_mstp_attach_dev;
genpd->detach_dev = cpg_mstp_detach_dev;
__rmobile_pd_power_up(rmobile_pd, false);
+ pm_genpd_init(genpd, gov ? : &simple_qos_governor, false);
}
static int rmobile_pd_suspend_busy(void)
--
2.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] ARM: shmobile: rcar-gen2: Use ICRAM1 for jump stub on all SoCs
2016-06-08 1:00 [GIT PULL] Renesas ARM Based SoC Updates for v4.8 Simon Horman
2016-06-08 1:00 ` [PATCH 1/2] ARM: shmobile: pm-rmobile: Postpone call to pm_genpd_init() Simon Horman
@ 2016-06-08 1:00 ` Simon Horman
2016-06-13 22:44 ` [GIT PULL] Renesas ARM Based SoC Updates for v4.8 Olof Johansson
2 siblings, 0 replies; 4+ messages in thread
From: Simon Horman @ 2016-06-08 1:00 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Currently the different SoCs in the R-Car Gen2 family use different
types of on-chip RAM for the jump stub:
- R-Car H2 uses Media RAM,
- R-Car M2-W uses another type of optional On-chip RAM, as it doesn't
have Media RAM,
- R-Car M2-N uses Inter Connect RAM in Magnus Damm's "ARM: shmobile:
r8a7793 boot address update".
As all R-Car Gen2 SoCs have 4 KiB of Inter Connect RAM, consolidate the
code by always using that.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/pm-rcar-gen2.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/arch/arm/mach-shmobile/pm-rcar-gen2.c b/arch/arm/mach-shmobile/pm-rcar-gen2.c
index 691ac166a277..61361dac6068 100644
--- a/arch/arm/mach-shmobile/pm-rcar-gen2.c
+++ b/arch/arm/mach-shmobile/pm-rcar-gen2.c
@@ -26,8 +26,7 @@
#define CA7RESCNT 0x0044
/* On-chip RAM */
-#define MERAM 0xe8080000
-#define RAM 0xe6300000
+#define ICRAM1 0xe63c0000 /* Inter Connect RAM1 (4 KiB) */
/* SYSC */
#define SYSCIER 0x0c
@@ -58,7 +57,7 @@ void __init rcar_gen2_pm_init(void)
struct device_node *np, *cpus;
bool has_a7 = false;
bool has_a15 = false;
- phys_addr_t boot_vector_addr = 0;
+ phys_addr_t boot_vector_addr = ICRAM1;
u32 syscier = 0;
if (once++)
@@ -75,14 +74,10 @@ void __init rcar_gen2_pm_init(void)
has_a7 = true;
}
- if (of_machine_is_compatible("renesas,r8a7790")) {
- boot_vector_addr = MERAM;
+ if (of_machine_is_compatible("renesas,r8a7790"))
syscier = 0x013111ef;
-
- } else if (of_machine_is_compatible("renesas,r8a7791")) {
- boot_vector_addr = RAM;
+ else if (of_machine_is_compatible("renesas,r8a7791"))
syscier = 0x00111003;
- }
/* RAM for jump stub, because BAR requires 256KB aligned address */
p = ioremap_nocache(boot_vector_addr, shmobile_boot_size);
--
2.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* [GIT PULL] Renesas ARM Based SoC Updates for v4.8
2016-06-08 1:00 [GIT PULL] Renesas ARM Based SoC Updates for v4.8 Simon Horman
2016-06-08 1:00 ` [PATCH 1/2] ARM: shmobile: pm-rmobile: Postpone call to pm_genpd_init() Simon Horman
2016-06-08 1:00 ` [PATCH 2/2] ARM: shmobile: rcar-gen2: Use ICRAM1 for jump stub on all SoCs Simon Horman
@ 2016-06-13 22:44 ` Olof Johansson
2 siblings, 0 replies; 4+ messages in thread
From: Olof Johansson @ 2016-06-13 22:44 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jun 08, 2016 at 10:00:19AM +0900, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
>
> Please consider these Renesas ARM based SoC updates for v4.8.
>
>
> The following changes since commit 1a695a905c18548062509178b98bc91e67510864:
>
> Linux 4.7-rc1 (2016-05-29 09:29:24 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-for-v4.8
>
> for you to fetch changes up to c94bc815f3c757df402d6f6a3e8d855b9168e6af:
>
> ARM: shmobile: rcar-gen2: Use ICRAM1 for jump stub on all SoCs (2016-05-30 09:39:43 +0900)
>
> ----------------------------------------------------------------
> Renesas ARM Based SoC Updates for v4.8
>
> * Use ICRAM1 for jump stub on R-Car Gen 2 SoCs
> * Postpone call to pm_genpd_init
>
> ----------------------------------------------------------------
> Geert Uytterhoeven (2):
> ARM: shmobile: pm-rmobile: Postpone call to pm_genpd_init()
> ARM: shmobile: rcar-gen2: Use ICRAM1 for jump stub on all SoCs
>
> arch/arm/mach-shmobile/pm-rcar-gen2.c | 13 ++++---------
> arch/arm/mach-shmobile/pm-rmobile.c | 2 +-
> 2 files changed, 5 insertions(+), 10 deletions(-)
Merged, thanks.
-Olof
^ permalink raw reply [flat|nested] 4+ messages in thread