* [PATCH 1/8] arm64: dts: r8a7795: Add missing blank lines between cpu nodes
2016-07-07 14:39 ` Simon Horman
@ 2016-07-07 14:39 ` Simon Horman
-1 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2016-07-07 14:39 UTC (permalink / raw)
To: linux-renesas-soc
Cc: linux-arm-kernel, Magnus Damm, Geert Uytterhoeven, Simon Horman
From: Geert Uytterhoeven <geert+renesas@glider.be>
For consistency with a57_0/a57_1 cpu nodes, and all other nodes.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index 04eb0bc65634..fad6dd8b7771 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -53,6 +53,7 @@
next-level-cache = <&L2_CA57>;
enable-method = "psci";
};
+
a57_2: cpu@2 {
compatible = "arm,cortex-a57","arm,armv8";
reg = <0x2>;
@@ -61,6 +62,7 @@
next-level-cache = <&L2_CA57>;
enable-method = "psci";
};
+
a57_3: cpu@3 {
compatible = "arm,cortex-a57","arm,armv8";
reg = <0x3>;
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 1/8] arm64: dts: r8a7795: Add missing blank lines between cpu nodes
@ 2016-07-07 14:39 ` Simon Horman
0 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2016-07-07 14:39 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
For consistency with a57_0/a57_1 cpu nodes, and all other nodes.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index 04eb0bc65634..fad6dd8b7771 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -53,6 +53,7 @@
next-level-cache = <&L2_CA57>;
enable-method = "psci";
};
+
a57_2: cpu at 2 {
compatible = "arm,cortex-a57","arm,armv8";
reg = <0x2>;
@@ -61,6 +62,7 @@
next-level-cache = <&L2_CA57>;
enable-method = "psci";
};
+
a57_3: cpu at 3 {
compatible = "arm,cortex-a57","arm,armv8";
reg = <0x3>;
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 2/8] arm64: dts: r8a7795: Add CAN FD support
2016-07-07 14:39 ` Simon Horman
@ 2016-07-07 14:39 ` Simon Horman
-1 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2016-07-07 14:39 UTC (permalink / raw)
To: linux-renesas-soc
Cc: linux-arm-kernel, Magnus Damm, Ramesh Shanmugasundaram, Simon Horman
From: Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com>
Adds CAN FD controller node for r8a7795.
Note: CAN FD controller register base address specified in R-Car Gen3
Hardware User Manual v0.5E is incorrect. The correct address is:
CAN FD - 0xe66c0000
Signed-off-by: Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index fad6dd8b7771..b902356873c2 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -583,6 +583,30 @@
status = "disabled";
};
+ canfd: can@e66c0000 {
+ compatible = "renesas,r8a7795-canfd",
+ "renesas,rcar-gen3-canfd";
+ reg = <0 0xe66c0000 0 0x8000>;
+ interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&cpg CPG_MOD 914>,
+ <&cpg CPG_CORE R8A7795_CLK_CANFD>,
+ <&can_clk>;
+ clock-names = "fck", "canfd", "can_clk";
+ assigned-clocks = <&cpg CPG_CORE R8A7795_CLK_CANFD>;
+ assigned-clock-rates = <40000000>;
+ power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+ status = "disabled";
+
+ channel0 {
+ status = "disabled";
+ };
+
+ channel1 {
+ status = "disabled";
+ };
+ };
+
hscif0: serial@e6540000 {
compatible = "renesas,hscif-r8a7795",
"renesas,rcar-gen3-hscif",
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [GIT PULL v2] Second Round of Renesas ARM64 Based SoC DT Updates for v4.8
@ 2016-07-07 14:39 ` Simon Horman
0 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2016-07-07 14:39 UTC (permalink / raw)
To: arm
Cc: linux-renesas-soc, Olof Johansson, Kevin Hilman, Arnd Bergmann,
linux-arm-kernel, Magnus Damm, Simon Horman
Hi Olof, Hi Kevin, Hi Arnd,
Please consider these second round of Renesas ARM64 based SoC DT updates for v4.8.
This pull request is based on a merge of:
* The previous round of such requests, tagged as renesas-arm64-dt2-for-v4.8,
which you have already pulled.
* The clk-renesas-for-v4.8-tag2 tag of Geert Uytterhoeven's
renesas-driver's tree which has been accepted into clk-next.
This tag provides clock definitions needed by the r8a7796 DT files.
This is v2 of this pull request. v1 did not include the
clk-renesas-for-v4.8-tag2 tag and instead provided a duplicate clk patch.
The following changes since commit fffae950cf00a60ff584618ecc939c6a931e4bbb:
Merge tag 'clk-renesas-for-v4.8-tag2' into HEAD (2016-07-07 10:21:07 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-arm64-dt2-for-v4.8
for you to fetch changes up to c805f1a7013a76ae63c002e52cc667d7c37228ea:
arm64: dts: r8a7796/salvator-x: Enable watchdog timer (2016-07-07 10:21:28 +0200)
----------------------------------------------------------------
Second Round of Renesas ARM64 Based SoC DT Updates for v4.8
* Add support for r8a7796/salvator-x (R-Car Gen 3 M3-W)
* Add CAN support to r8a7795 (R-Car Gen 3 H3)
----------------------------------------------------------------
Geert Uytterhoeven (5):
arm64: dts: r8a7795: Add missing blank lines between cpu nodes
arm64: dts: r8a7796: Add SYSC PM Domains
arm64: dts: r8a7796: Use SYSC "always-on" PM Domain
arm64: dts: r8a7796: Add RWDT node
arm64: dts: r8a7796/salvator-x: Enable watchdog timer
Ramesh Shanmugasundaram (1):
arm64: dts: r8a7795: Add CAN FD support
Simon Horman (1):
arm64: dts: r8a7796: Add Renesas R8A7796 SoC support
Takeshi Kihara (1):
arm64: dts: salvator-x: add Salvator-X board on R8A7796 SoC
Documentation/devicetree/bindings/arm/shmobile.txt | 4 +
arch/arm64/Kconfig.platforms | 6 +
arch/arm64/boot/dts/renesas/Makefile | 1 +
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 26 ++++
arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 50 ++++++++
arch/arm64/boot/dts/renesas/r8a7796.dtsi | 138 +++++++++++++++++++++
6 files changed, 225 insertions(+)
create mode 100644 arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
create mode 100644 arch/arm64/boot/dts/renesas/r8a7796.dtsi
^ permalink raw reply [flat|nested] 26+ messages in thread
* [GIT PULL v2] Second Round of Renesas ARM64 Based SoC DT Updates for v4.8
@ 2016-07-07 14:39 ` Simon Horman
0 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2016-07-07 14:39 UTC (permalink / raw)
To: linux-arm-kernel
Hi Olof, Hi Kevin, Hi Arnd,
Please consider these second round of Renesas ARM64 based SoC DT updates for v4.8.
This pull request is based on a merge of:
* The previous round of such requests, tagged as renesas-arm64-dt2-for-v4.8,
which you have already pulled.
* The clk-renesas-for-v4.8-tag2 tag of Geert Uytterhoeven's
renesas-driver's tree which has been accepted into clk-next.
This tag provides clock definitions needed by the r8a7796 DT files.
This is v2 of this pull request. v1 did not include the
clk-renesas-for-v4.8-tag2 tag and instead provided a duplicate clk patch.
The following changes since commit fffae950cf00a60ff584618ecc939c6a931e4bbb:
Merge tag 'clk-renesas-for-v4.8-tag2' into HEAD (2016-07-07 10:21:07 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-arm64-dt2-for-v4.8
for you to fetch changes up to c805f1a7013a76ae63c002e52cc667d7c37228ea:
arm64: dts: r8a7796/salvator-x: Enable watchdog timer (2016-07-07 10:21:28 +0200)
----------------------------------------------------------------
Second Round of Renesas ARM64 Based SoC DT Updates for v4.8
* Add support for r8a7796/salvator-x (R-Car Gen 3 M3-W)
* Add CAN support to r8a7795 (R-Car Gen 3 H3)
----------------------------------------------------------------
Geert Uytterhoeven (5):
arm64: dts: r8a7795: Add missing blank lines between cpu nodes
arm64: dts: r8a7796: Add SYSC PM Domains
arm64: dts: r8a7796: Use SYSC "always-on" PM Domain
arm64: dts: r8a7796: Add RWDT node
arm64: dts: r8a7796/salvator-x: Enable watchdog timer
Ramesh Shanmugasundaram (1):
arm64: dts: r8a7795: Add CAN FD support
Simon Horman (1):
arm64: dts: r8a7796: Add Renesas R8A7796 SoC support
Takeshi Kihara (1):
arm64: dts: salvator-x: add Salvator-X board on R8A7796 SoC
Documentation/devicetree/bindings/arm/shmobile.txt | 4 +
arch/arm64/Kconfig.platforms | 6 +
arch/arm64/boot/dts/renesas/Makefile | 1 +
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 26 ++++
arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 50 ++++++++
arch/arm64/boot/dts/renesas/r8a7796.dtsi | 138 +++++++++++++++++++++
6 files changed, 225 insertions(+)
create mode 100644 arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
create mode 100644 arch/arm64/boot/dts/renesas/r8a7796.dtsi
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH 2/8] arm64: dts: r8a7795: Add CAN FD support
@ 2016-07-07 14:39 ` Simon Horman
0 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2016-07-07 14:39 UTC (permalink / raw)
To: linux-arm-kernel
From: Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com>
Adds CAN FD controller node for r8a7795.
Note: CAN FD controller register base address specified in R-Car Gen3
Hardware User Manual v0.5E is incorrect. The correct address is:
CAN FD - 0xe66c0000
Signed-off-by: Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index fad6dd8b7771..b902356873c2 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -583,6 +583,30 @@
status = "disabled";
};
+ canfd: can at e66c0000 {
+ compatible = "renesas,r8a7795-canfd",
+ "renesas,rcar-gen3-canfd";
+ reg = <0 0xe66c0000 0 0x8000>;
+ interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&cpg CPG_MOD 914>,
+ <&cpg CPG_CORE R8A7795_CLK_CANFD>,
+ <&can_clk>;
+ clock-names = "fck", "canfd", "can_clk";
+ assigned-clocks = <&cpg CPG_CORE R8A7795_CLK_CANFD>;
+ assigned-clock-rates = <40000000>;
+ power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+ status = "disabled";
+
+ channel0 {
+ status = "disabled";
+ };
+
+ channel1 {
+ status = "disabled";
+ };
+ };
+
hscif0: serial at e6540000 {
compatible = "renesas,hscif-r8a7795",
"renesas,rcar-gen3-hscif",
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 3/8] arm64: dts: r8a7796: Add Renesas R8A7796 SoC support
2016-07-07 14:39 ` Simon Horman
@ 2016-07-07 14:39 ` Simon Horman
-1 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2016-07-07 14:39 UTC (permalink / raw)
To: linux-renesas-soc; +Cc: linux-arm-kernel, Magnus Damm, Simon Horman
Basic support for the Gen 3 R-Car M3-W SoC.
Based on work for the r8a7795 and r8a7796 SoCs by
Takeshi Kihara, Dirk Behme and Geert Uytterhoeven.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
Documentation/devicetree/bindings/arm/shmobile.txt | 4 +
arch/arm64/Kconfig.platforms | 6 ++
arch/arm64/boot/dts/renesas/r8a7796.dtsi | 120 +++++++++++++++++++++
3 files changed, 130 insertions(+)
create mode 100644 arch/arm64/boot/dts/renesas/r8a7796.dtsi
diff --git a/Documentation/devicetree/bindings/arm/shmobile.txt b/Documentation/devicetree/bindings/arm/shmobile.txt
index 9cf67e48f222..d5ed554830d7 100644
--- a/Documentation/devicetree/bindings/arm/shmobile.txt
+++ b/Documentation/devicetree/bindings/arm/shmobile.txt
@@ -29,6 +29,8 @@ SoCs:
compatible = "renesas,r8a7794"
- R-Car H3 (R8A77950)
compatible = "renesas,r8a7795"
+ - R-Car M3-W (R8A77960)
+ compatible = "renesas,r8a7796"
Boards:
@@ -61,5 +63,7 @@ Boards:
compatible = "renesas,porter", "renesas,r8a7791"
- Salvator-X (RTP0RC7795SIPB0010S)
compatible = "renesas,salvator-x", "renesas,r8a7795";
+ - Salvator-X
+ compatible = "renesas,salvator-x", "renesas,r8a7796";
- SILK (RTP0RC7794LCB00011S)
compatible = "renesas,silk", "renesas,r8a7794"
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 7ef1d05859ae..2182fd5c8153 100644
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -121,6 +121,12 @@ config ARCH_R8A7795
help
This enables support for the Renesas R-Car H3 SoC.
+config ARCH_R8A7796
+ bool "Renesas R-Car M3-W SoC Platform"
+ depends on ARCH_RENESAS
+ help
+ This enables support for the Renesas R-Car M3-W SoC.
+
config ARCH_STRATIX10
bool "Altera's Stratix 10 SoCFPGA Family"
help
diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
new file mode 100644
index 000000000000..178debf68318
--- /dev/null
+++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
@@ -0,0 +1,120 @@
+/*
+ * Device Tree Source for the r8a7796 SoC
+ *
+ * Copyright (C) 2016 Renesas Electronics Corp.
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+#include <dt-bindings/clock/r8a7796-cpg-mssr.h>
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+
+/ {
+ compatible = "renesas,r8a7796";
+ #address-cells = <2>;
+ #size-cells = <2>;
+
+ psci {
+ compatible = "arm,psci-0.2";
+ method = "smc";
+ };
+
+ cpus {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ /* 1 core only at this point */
+ a57_0: cpu@0 {
+ compatible = "arm,cortex-a57", "arm,armv8";
+ reg = <0x0>;
+ device_type = "cpu";
+ next-level-cache = <&L2_CA57>;
+ enable-method = "psci";
+ };
+
+ L2_CA57: cache-controller@0 {
+ compatible = "cache";
+ reg = <0>;
+ cache-unified;
+ cache-level = <2>;
+ };
+ };
+
+ extal_clk: extal {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ /* This value must be overridden by the board */
+ clock-frequency = <0>;
+ };
+
+ extalr_clk: extalr {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ /* This value must be overridden by the board */
+ clock-frequency = <0>;
+ };
+
+ /* External SCIF clock - to be overridden by boards that provide it */
+ scif_clk: scif {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <0>;
+ };
+
+ soc {
+ compatible = "simple-bus";
+ interrupt-parent = <&gic>;
+ #address-cells = <2>;
+ #size-cells = <2>;
+ ranges;
+
+ gic: interrupt-controller@f1010000 {
+ compatible = "arm,gic-400";
+ #interrupt-cells = <3>;
+ #address-cells = <0>;
+ interrupt-controller;
+ reg = <0x0 0xf1010000 0 0x1000>,
+ <0x0 0xf1020000 0 0x20000>,
+ <0x0 0xf1040000 0 0x20000>,
+ <0x0 0xf1060000 0 0x20000>;
+ interrupts = <GIC_PPI 9
+ (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_HIGH)>;
+ };
+
+ timer {
+ compatible = "arm,armv8-timer";
+ interrupts = <GIC_PPI 13
+ (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>,
+ <GIC_PPI 14
+ (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>,
+ <GIC_PPI 11
+ (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>,
+ <GIC_PPI 10
+ (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>;
+ };
+
+ cpg: clock-controller@e6150000 {
+ compatible = "renesas,r8a7796-cpg-mssr";
+ reg = <0 0xe6150000 0 0x1000>;
+ clocks = <&extal_clk>, <&extalr_clk>;
+ clock-names = "extal", "extalr";
+ #clock-cells = <2>;
+ #power-domain-cells = <0>;
+ };
+
+ scif2: serial@e6e88000 {
+ compatible = "renesas,scif-r8a7796",
+ "renesas,rcar-gen3-scif", "renesas,scif";
+ reg = <0 0xe6e88000 0 64>;
+ interrupts = <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&cpg CPG_MOD 310>,
+ <&cpg CPG_CORE R8A7796_CLK_S3D1>,
+ <&scif_clk>;
+ clock-names = "fck", "brg_int", "scif_clk";
+ power-domains = <&cpg>;
+ status = "disabled";
+ };
+ };
+};
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 3/8] arm64: dts: r8a7796: Add Renesas R8A7796 SoC support
@ 2016-07-07 14:39 ` Simon Horman
0 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2016-07-07 14:39 UTC (permalink / raw)
To: linux-arm-kernel
Basic support for the Gen 3 R-Car M3-W SoC.
Based on work for the r8a7795 and r8a7796 SoCs by
Takeshi Kihara, Dirk Behme and Geert Uytterhoeven.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
Documentation/devicetree/bindings/arm/shmobile.txt | 4 +
arch/arm64/Kconfig.platforms | 6 ++
arch/arm64/boot/dts/renesas/r8a7796.dtsi | 120 +++++++++++++++++++++
3 files changed, 130 insertions(+)
create mode 100644 arch/arm64/boot/dts/renesas/r8a7796.dtsi
diff --git a/Documentation/devicetree/bindings/arm/shmobile.txt b/Documentation/devicetree/bindings/arm/shmobile.txt
index 9cf67e48f222..d5ed554830d7 100644
--- a/Documentation/devicetree/bindings/arm/shmobile.txt
+++ b/Documentation/devicetree/bindings/arm/shmobile.txt
@@ -29,6 +29,8 @@ SoCs:
compatible = "renesas,r8a7794"
- R-Car H3 (R8A77950)
compatible = "renesas,r8a7795"
+ - R-Car M3-W (R8A77960)
+ compatible = "renesas,r8a7796"
Boards:
@@ -61,5 +63,7 @@ Boards:
compatible = "renesas,porter", "renesas,r8a7791"
- Salvator-X (RTP0RC7795SIPB0010S)
compatible = "renesas,salvator-x", "renesas,r8a7795";
+ - Salvator-X
+ compatible = "renesas,salvator-x", "renesas,r8a7796";
- SILK (RTP0RC7794LCB00011S)
compatible = "renesas,silk", "renesas,r8a7794"
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 7ef1d05859ae..2182fd5c8153 100644
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -121,6 +121,12 @@ config ARCH_R8A7795
help
This enables support for the Renesas R-Car H3 SoC.
+config ARCH_R8A7796
+ bool "Renesas R-Car M3-W SoC Platform"
+ depends on ARCH_RENESAS
+ help
+ This enables support for the Renesas R-Car M3-W SoC.
+
config ARCH_STRATIX10
bool "Altera's Stratix 10 SoCFPGA Family"
help
diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
new file mode 100644
index 000000000000..178debf68318
--- /dev/null
+++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
@@ -0,0 +1,120 @@
+/*
+ * Device Tree Source for the r8a7796 SoC
+ *
+ * Copyright (C) 2016 Renesas Electronics Corp.
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+#include <dt-bindings/clock/r8a7796-cpg-mssr.h>
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+
+/ {
+ compatible = "renesas,r8a7796";
+ #address-cells = <2>;
+ #size-cells = <2>;
+
+ psci {
+ compatible = "arm,psci-0.2";
+ method = "smc";
+ };
+
+ cpus {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ /* 1 core only at this point */
+ a57_0: cpu at 0 {
+ compatible = "arm,cortex-a57", "arm,armv8";
+ reg = <0x0>;
+ device_type = "cpu";
+ next-level-cache = <&L2_CA57>;
+ enable-method = "psci";
+ };
+
+ L2_CA57: cache-controller at 0 {
+ compatible = "cache";
+ reg = <0>;
+ cache-unified;
+ cache-level = <2>;
+ };
+ };
+
+ extal_clk: extal {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ /* This value must be overridden by the board */
+ clock-frequency = <0>;
+ };
+
+ extalr_clk: extalr {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ /* This value must be overridden by the board */
+ clock-frequency = <0>;
+ };
+
+ /* External SCIF clock - to be overridden by boards that provide it */
+ scif_clk: scif {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <0>;
+ };
+
+ soc {
+ compatible = "simple-bus";
+ interrupt-parent = <&gic>;
+ #address-cells = <2>;
+ #size-cells = <2>;
+ ranges;
+
+ gic: interrupt-controller at f1010000 {
+ compatible = "arm,gic-400";
+ #interrupt-cells = <3>;
+ #address-cells = <0>;
+ interrupt-controller;
+ reg = <0x0 0xf1010000 0 0x1000>,
+ <0x0 0xf1020000 0 0x20000>,
+ <0x0 0xf1040000 0 0x20000>,
+ <0x0 0xf1060000 0 0x20000>;
+ interrupts = <GIC_PPI 9
+ (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_HIGH)>;
+ };
+
+ timer {
+ compatible = "arm,armv8-timer";
+ interrupts = <GIC_PPI 13
+ (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>,
+ <GIC_PPI 14
+ (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>,
+ <GIC_PPI 11
+ (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>,
+ <GIC_PPI 10
+ (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>;
+ };
+
+ cpg: clock-controller at e6150000 {
+ compatible = "renesas,r8a7796-cpg-mssr";
+ reg = <0 0xe6150000 0 0x1000>;
+ clocks = <&extal_clk>, <&extalr_clk>;
+ clock-names = "extal", "extalr";
+ #clock-cells = <2>;
+ #power-domain-cells = <0>;
+ };
+
+ scif2: serial at e6e88000 {
+ compatible = "renesas,scif-r8a7796",
+ "renesas,rcar-gen3-scif", "renesas,scif";
+ reg = <0 0xe6e88000 0 64>;
+ interrupts = <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&cpg CPG_MOD 310>,
+ <&cpg CPG_CORE R8A7796_CLK_S3D1>,
+ <&scif_clk>;
+ clock-names = "fck", "brg_int", "scif_clk";
+ power-domains = <&cpg>;
+ status = "disabled";
+ };
+ };
+};
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 4/8] arm64: dts: salvator-x: add Salvator-X board on R8A7796 SoC
2016-07-07 14:39 ` Simon Horman
@ 2016-07-07 14:39 ` Simon Horman
-1 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2016-07-07 14:39 UTC (permalink / raw)
To: linux-renesas-soc
Cc: linux-arm-kernel, Magnus Damm, Takeshi Kihara, Simon Horman
From: Takeshi Kihara <takeshi.kihara.df@renesas.com>
This patch adds initial board support for R8A7796 Salvator-X.
Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm64/boot/dts/renesas/Makefile | 1 +
arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 45 ++++++++++++++++++++++
2 files changed, 46 insertions(+)
create mode 100644 arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
diff --git a/arch/arm64/boot/dts/renesas/Makefile b/arch/arm64/boot/dts/renesas/Makefile
index 9ce1890a650e..17139f7003a6 100644
--- a/arch/arm64/boot/dts/renesas/Makefile
+++ b/arch/arm64/boot/dts/renesas/Makefile
@@ -1,4 +1,5 @@
dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-salvator-x.dtb
+dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-salvator-x.dtb
always := $(dtb-y)
clean-files := *.dtb
diff --git a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
new file mode 100644
index 000000000000..9c52613fb88c
--- /dev/null
+++ b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
@@ -0,0 +1,45 @@
+/*
+ * Device Tree Source for the Salvator-X board
+ *
+ * Copyright (C) 2016 Renesas Electronics Corp.
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+/dts-v1/;
+#include "r8a7796.dtsi"
+
+/ {
+ model = "Renesas Salvator-X board based on r8a7796";
+ compatible = "renesas,salvator-x", "renesas,r8a7796";
+
+ aliases {
+ serial0 = &scif2;
+ };
+
+ chosen {
+ bootargs = "ignore_loglevel";
+ stdout-path = "serial0:115200n8";
+ };
+
+ memory@48000000 {
+ device_type = "memory";
+ /* first 128MB is reserved for secure area. */
+ reg = <0x0 0x48000000 0x0 0x78000000>;
+ };
+};
+
+&extal_clk {
+ clock-frequency = <16666666>;
+};
+
+&scif2 {
+ status = "okay";
+};
+
+&scif_clk {
+ clock-frequency = <14745600>;
+ status = "okay";
+};
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 4/8] arm64: dts: salvator-x: add Salvator-X board on R8A7796 SoC
@ 2016-07-07 14:39 ` Simon Horman
0 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2016-07-07 14:39 UTC (permalink / raw)
To: linux-arm-kernel
From: Takeshi Kihara <takeshi.kihara.df@renesas.com>
This patch adds initial board support for R8A7796 Salvator-X.
Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm64/boot/dts/renesas/Makefile | 1 +
arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 45 ++++++++++++++++++++++
2 files changed, 46 insertions(+)
create mode 100644 arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
diff --git a/arch/arm64/boot/dts/renesas/Makefile b/arch/arm64/boot/dts/renesas/Makefile
index 9ce1890a650e..17139f7003a6 100644
--- a/arch/arm64/boot/dts/renesas/Makefile
+++ b/arch/arm64/boot/dts/renesas/Makefile
@@ -1,4 +1,5 @@
dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-salvator-x.dtb
+dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-salvator-x.dtb
always := $(dtb-y)
clean-files := *.dtb
diff --git a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
new file mode 100644
index 000000000000..9c52613fb88c
--- /dev/null
+++ b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
@@ -0,0 +1,45 @@
+/*
+ * Device Tree Source for the Salvator-X board
+ *
+ * Copyright (C) 2016 Renesas Electronics Corp.
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+/dts-v1/;
+#include "r8a7796.dtsi"
+
+/ {
+ model = "Renesas Salvator-X board based on r8a7796";
+ compatible = "renesas,salvator-x", "renesas,r8a7796";
+
+ aliases {
+ serial0 = &scif2;
+ };
+
+ chosen {
+ bootargs = "ignore_loglevel";
+ stdout-path = "serial0:115200n8";
+ };
+
+ memory at 48000000 {
+ device_type = "memory";
+ /* first 128MB is reserved for secure area. */
+ reg = <0x0 0x48000000 0x0 0x78000000>;
+ };
+};
+
+&extal_clk {
+ clock-frequency = <16666666>;
+};
+
+&scif2 {
+ status = "okay";
+};
+
+&scif_clk {
+ clock-frequency = <14745600>;
+ status = "okay";
+};
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 5/8] arm64: dts: r8a7796: Add SYSC PM Domains
2016-07-07 14:39 ` Simon Horman
@ 2016-07-07 14:39 ` Simon Horman
-1 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2016-07-07 14:39 UTC (permalink / raw)
To: linux-renesas-soc
Cc: linux-arm-kernel, Magnus Damm, Geert Uytterhoeven, Simon Horman
From: Geert Uytterhoeven <geert+renesas@glider.be>
Add a device node for the System Controller.
Hook up the Cortex-A57 CPU core and L2 cache/SCU to their respective PM
Domains.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm64/boot/dts/renesas/r8a7796.dtsi | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
index 178debf68318..85f0843ddd87 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
@@ -10,6 +10,7 @@
#include <dt-bindings/clock/r8a7796-cpg-mssr.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/power/r8a7796-sysc.h>
/ {
compatible = "renesas,r8a7796";
@@ -30,6 +31,7 @@
compatible = "arm,cortex-a57", "arm,armv8";
reg = <0x0>;
device_type = "cpu";
+ power-domains = <&sysc R8A7796_PD_CA57_CPU0>;
next-level-cache = <&L2_CA57>;
enable-method = "psci";
};
@@ -37,6 +39,7 @@
L2_CA57: cache-controller@0 {
compatible = "cache";
reg = <0>;
+ power-domains = <&sysc R8A7796_PD_CA57_SCU>;
cache-unified;
cache-level = <2>;
};
@@ -104,6 +107,12 @@
#power-domain-cells = <0>;
};
+ sysc: system-controller@e6180000 {
+ compatible = "renesas,r8a7796-sysc";
+ reg = <0 0xe6180000 0 0x0400>;
+ #power-domain-cells = <1>;
+ };
+
scif2: serial@e6e88000 {
compatible = "renesas,scif-r8a7796",
"renesas,rcar-gen3-scif", "renesas,scif";
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 5/8] arm64: dts: r8a7796: Add SYSC PM Domains
@ 2016-07-07 14:39 ` Simon Horman
0 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2016-07-07 14:39 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Add a device node for the System Controller.
Hook up the Cortex-A57 CPU core and L2 cache/SCU to their respective PM
Domains.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm64/boot/dts/renesas/r8a7796.dtsi | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
index 178debf68318..85f0843ddd87 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
@@ -10,6 +10,7 @@
#include <dt-bindings/clock/r8a7796-cpg-mssr.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/power/r8a7796-sysc.h>
/ {
compatible = "renesas,r8a7796";
@@ -30,6 +31,7 @@
compatible = "arm,cortex-a57", "arm,armv8";
reg = <0x0>;
device_type = "cpu";
+ power-domains = <&sysc R8A7796_PD_CA57_CPU0>;
next-level-cache = <&L2_CA57>;
enable-method = "psci";
};
@@ -37,6 +39,7 @@
L2_CA57: cache-controller at 0 {
compatible = "cache";
reg = <0>;
+ power-domains = <&sysc R8A7796_PD_CA57_SCU>;
cache-unified;
cache-level = <2>;
};
@@ -104,6 +107,12 @@
#power-domain-cells = <0>;
};
+ sysc: system-controller at e6180000 {
+ compatible = "renesas,r8a7796-sysc";
+ reg = <0 0xe6180000 0 0x0400>;
+ #power-domain-cells = <1>;
+ };
+
scif2: serial at e6e88000 {
compatible = "renesas,scif-r8a7796",
"renesas,rcar-gen3-scif", "renesas,scif";
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 6/8] arm64: dts: r8a7796: Use SYSC "always-on" PM Domain
2016-07-07 14:39 ` Simon Horman
@ 2016-07-07 14:39 ` Simon Horman
-1 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2016-07-07 14:39 UTC (permalink / raw)
To: linux-renesas-soc
Cc: linux-arm-kernel, Magnus Damm, Geert Uytterhoeven, Simon Horman
From: Geert Uytterhoeven <geert+renesas@glider.be>
Hook up all devices that are part of the CPG/MSSR Clock Domain to the
SYSC "always-on" PM Domain, for a more consistent device-power-area
description in DT.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm64/boot/dts/renesas/r8a7796.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
index 85f0843ddd87..fab61eddede3 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
@@ -122,7 +122,7 @@
<&cpg CPG_CORE R8A7796_CLK_S3D1>,
<&scif_clk>;
clock-names = "fck", "brg_int", "scif_clk";
- power-domains = <&cpg>;
+ power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
status = "disabled";
};
};
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 6/8] arm64: dts: r8a7796: Use SYSC "always-on" PM Domain
@ 2016-07-07 14:39 ` Simon Horman
0 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2016-07-07 14:39 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Hook up all devices that are part of the CPG/MSSR Clock Domain to the
SYSC "always-on" PM Domain, for a more consistent device-power-area
description in DT.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm64/boot/dts/renesas/r8a7796.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
index 85f0843ddd87..fab61eddede3 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
@@ -122,7 +122,7 @@
<&cpg CPG_CORE R8A7796_CLK_S3D1>,
<&scif_clk>;
clock-names = "fck", "brg_int", "scif_clk";
- power-domains = <&cpg>;
+ power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
status = "disabled";
};
};
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 7/8] arm64: dts: r8a7796: Add RWDT node
2016-07-07 14:39 ` Simon Horman
@ 2016-07-07 14:39 ` Simon Horman
-1 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2016-07-07 14:39 UTC (permalink / raw)
To: linux-renesas-soc
Cc: linux-arm-kernel, Magnus Damm, Geert Uytterhoeven, Simon Horman
From: Geert Uytterhoeven <geert+renesas@glider.be>
Add a device node for the Watchdog Timer (WDT) controller on the Renesas
R-Car M3-W (r8a7796) SoC.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm64/boot/dts/renesas/r8a7796.dtsi | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
index fab61eddede3..1edf82440d78 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
@@ -98,6 +98,15 @@
(GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>;
};
+ wdt0: watchdog@e6020000 {
+ compatible = "renesas,r8a7796-wdt",
+ "renesas,rcar-gen3-wdt";
+ reg = <0 0xe6020000 0 0x0c>;
+ clocks = <&cpg CPG_MOD 402>;
+ power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+ status = "disabled";
+ };
+
cpg: clock-controller@e6150000 {
compatible = "renesas,r8a7796-cpg-mssr";
reg = <0 0xe6150000 0 0x1000>;
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 7/8] arm64: dts: r8a7796: Add RWDT node
@ 2016-07-07 14:39 ` Simon Horman
0 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2016-07-07 14:39 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Add a device node for the Watchdog Timer (WDT) controller on the Renesas
R-Car M3-W (r8a7796) SoC.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm64/boot/dts/renesas/r8a7796.dtsi | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
index fab61eddede3..1edf82440d78 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
@@ -98,6 +98,15 @@
(GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>;
};
+ wdt0: watchdog at e6020000 {
+ compatible = "renesas,r8a7796-wdt",
+ "renesas,rcar-gen3-wdt";
+ reg = <0 0xe6020000 0 0x0c>;
+ clocks = <&cpg CPG_MOD 402>;
+ power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+ status = "disabled";
+ };
+
cpg: clock-controller at e6150000 {
compatible = "renesas,r8a7796-cpg-mssr";
reg = <0 0xe6150000 0 0x1000>;
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 8/8] arm64: dts: r8a7796/salvator-x: Enable watchdog timer
2016-07-07 14:39 ` Simon Horman
@ 2016-07-07 14:39 ` Simon Horman
-1 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2016-07-07 14:39 UTC (permalink / raw)
To: linux-renesas-soc
Cc: linux-arm-kernel, Magnus Damm, Geert Uytterhoeven, Simon Horman
From: Geert Uytterhoeven <geert+renesas@glider.be>
Enable the Watchdog Timer (WDT) controller on the Renesas Salvator-X
board equipped with an R-Car M3-W (r8a7796) SoC.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
index 9c52613fb88c..e72be3856d79 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
@@ -43,3 +43,8 @@
clock-frequency = <14745600>;
status = "okay";
};
+
+&wdt0 {
+ timeout-sec = <60>;
+ status = "okay";
+};
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 8/8] arm64: dts: r8a7796/salvator-x: Enable watchdog timer
@ 2016-07-07 14:39 ` Simon Horman
0 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2016-07-07 14:39 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Enable the Watchdog Timer (WDT) controller on the Renesas Salvator-X
board equipped with an R-Car M3-W (r8a7796) SoC.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
index 9c52613fb88c..e72be3856d79 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
@@ -43,3 +43,8 @@
clock-frequency = <14745600>;
status = "okay";
};
+
+&wdt0 {
+ timeout-sec = <60>;
+ status = "okay";
+};
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 26+ messages in thread
* Re: [GIT PULL v2] Second Round of Renesas ARM64 Based SoC DT Updates for v4.8
2016-07-07 14:39 ` Simon Horman
@ 2016-07-14 14:03 ` Arnd Bergmann
-1 siblings, 0 replies; 26+ messages in thread
From: Arnd Bergmann @ 2016-07-14 14:03 UTC (permalink / raw)
To: Simon Horman
Cc: arm, linux-renesas-soc, Olof Johansson, Kevin Hilman,
linux-arm-kernel, Magnus Damm
On Thursday, July 7, 2016 4:39:45 PM CEST Simon Horman wrote:
> Second Round of Renesas ARM64 Based SoC DT Updates for v4.8
>
> * Add support for r8a7796/salvator-x (R-Car Gen 3 M3-W)
> * Add CAN support to r8a7795 (R-Car Gen 3 H3)
>
Merged into next/late to better deal with the dependency, thanks!
Arnd
^ permalink raw reply [flat|nested] 26+ messages in thread
* [GIT PULL v2] Second Round of Renesas ARM64 Based SoC DT Updates for v4.8
@ 2016-07-14 14:03 ` Arnd Bergmann
0 siblings, 0 replies; 26+ messages in thread
From: Arnd Bergmann @ 2016-07-14 14:03 UTC (permalink / raw)
To: linux-arm-kernel
On Thursday, July 7, 2016 4:39:45 PM CEST Simon Horman wrote:
> Second Round of Renesas ARM64 Based SoC DT Updates for v4.8
>
> * Add support for r8a7796/salvator-x (R-Car Gen 3 M3-W)
> * Add CAN support to r8a7795 (R-Car Gen 3 H3)
>
Merged into next/late to better deal with the dependency, thanks!
Arnd
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [GIT PULL v2] Second Round of Renesas ARM64 Based SoC DT Updates for v4.8
2016-07-07 14:39 ` Simon Horman
@ 2016-07-14 15:54 ` Arnd Bergmann
-1 siblings, 0 replies; 26+ messages in thread
From: Arnd Bergmann @ 2016-07-14 15:54 UTC (permalink / raw)
To: Simon Horman
Cc: arm, linux-renesas-soc, Olof Johansson, Kevin Hilman,
linux-arm-kernel, Magnus Damm
On Thursday, July 7, 2016 4:39:45 PM CEST Simon Horman wrote:
> arm64: dts: r8a7796: Add SYSC PM Domains
>
While doing some sanity checks on our branch contents, I noticed
that this commit breaks running "make dtbs" on top of our next/dt64
branch, and I'd like to avoid that.
I found a couple more problems (tegra and meson), and I ended up
fixing them all up (by merging the dependencies into next/dt64),
so everything is sorted for 4.8, but it would be good to do a
'make dtbs' run on a branch that has dt changes before you send it,
and I'll try to do the same when pulling it to avoid the problem in
the future.
Arnd
^ permalink raw reply [flat|nested] 26+ messages in thread
* [GIT PULL v2] Second Round of Renesas ARM64 Based SoC DT Updates for v4.8
@ 2016-07-14 15:54 ` Arnd Bergmann
0 siblings, 0 replies; 26+ messages in thread
From: Arnd Bergmann @ 2016-07-14 15:54 UTC (permalink / raw)
To: linux-arm-kernel
On Thursday, July 7, 2016 4:39:45 PM CEST Simon Horman wrote:
> arm64: dts: r8a7796: Add SYSC PM Domains
>
While doing some sanity checks on our branch contents, I noticed
that this commit breaks running "make dtbs" on top of our next/dt64
branch, and I'd like to avoid that.
I found a couple more problems (tegra and meson), and I ended up
fixing them all up (by merging the dependencies into next/dt64),
so everything is sorted for 4.8, but it would be good to do a
'make dtbs' run on a branch that has dt changes before you send it,
and I'll try to do the same when pulling it to avoid the problem in
the future.
Arnd
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [GIT PULL v2] Second Round of Renesas ARM64 Based SoC DT Updates for v4.8
2016-07-14 15:54 ` Arnd Bergmann
@ 2016-07-15 3:10 ` Geert Uytterhoeven
-1 siblings, 0 replies; 26+ messages in thread
From: Geert Uytterhoeven @ 2016-07-15 3:10 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Simon Horman, arm, Linux-Renesas, Olof Johansson, Kevin Hilman,
linux-arm-kernel, Magnus Damm
Hi Arnd,
On Thu, Jul 14, 2016 at 5:54 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> On Thursday, July 7, 2016 4:39:45 PM CEST Simon Horman wrote:
>> arm64: dts: r8a7796: Add SYSC PM Domains
>
> While doing some sanity checks on our branch contents, I noticed
> that this commit breaks running "make dtbs" on top of our next/dt64
> branch, and I'd like to avoid that.
>
> I found a couple more problems (tegra and meson), and I ended up
> fixing them all up (by merging the dependencies into next/dt64),
> so everything is sorted for 4.8, but it would be good to do a
> 'make dtbs' run on a branch that has dt changes before you send it,
> and I'll try to do the same when pulling it to avoid the problem in
> the future.
Oh right, it can't find <dt-bindings/power/r8a7796-sysc.h>.
I guess this didn't show up for us, as arm64 defconfig in
renesas-arm64-dt2-for-v4.8 doesn't enable CONFIG_ARCH_R8A7796 yet.
Sorry for that.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 26+ messages in thread
* [GIT PULL v2] Second Round of Renesas ARM64 Based SoC DT Updates for v4.8
@ 2016-07-15 3:10 ` Geert Uytterhoeven
0 siblings, 0 replies; 26+ messages in thread
From: Geert Uytterhoeven @ 2016-07-15 3:10 UTC (permalink / raw)
To: linux-arm-kernel
Hi Arnd,
On Thu, Jul 14, 2016 at 5:54 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> On Thursday, July 7, 2016 4:39:45 PM CEST Simon Horman wrote:
>> arm64: dts: r8a7796: Add SYSC PM Domains
>
> While doing some sanity checks on our branch contents, I noticed
> that this commit breaks running "make dtbs" on top of our next/dt64
> branch, and I'd like to avoid that.
>
> I found a couple more problems (tegra and meson), and I ended up
> fixing them all up (by merging the dependencies into next/dt64),
> so everything is sorted for 4.8, but it would be good to do a
> 'make dtbs' run on a branch that has dt changes before you send it,
> and I'll try to do the same when pulling it to avoid the problem in
> the future.
Oh right, it can't find <dt-bindings/power/r8a7796-sysc.h>.
I guess this didn't show up for us, as arm64 defconfig in
renesas-arm64-dt2-for-v4.8 doesn't enable CONFIG_ARCH_R8A7796 yet.
Sorry for that.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [GIT PULL v2] Second Round of Renesas ARM64 Based SoC DT Updates for v4.8
2016-07-14 15:54 ` Arnd Bergmann
@ 2016-07-15 4:29 ` Simon Horman
-1 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2016-07-15 4:29 UTC (permalink / raw)
To: Arnd Bergmann
Cc: arm, linux-renesas-soc, Olof Johansson, Kevin Hilman,
linux-arm-kernel, Magnus Damm
On Thu, Jul 14, 2016 at 05:54:25PM +0200, Arnd Bergmann wrote:
> On Thursday, July 7, 2016 4:39:45 PM CEST Simon Horman wrote:
> > arm64: dts: r8a7796: Add SYSC PM Domains
> >
>
> While doing some sanity checks on our branch contents, I noticed
> that this commit breaks running "make dtbs" on top of our next/dt64
> branch, and I'd like to avoid that.
>
> I found a couple more problems (tegra and meson), and I ended up
> fixing them all up (by merging the dependencies into next/dt64),
> so everything is sorted for 4.8, but it would be good to do a
> 'make dtbs' run on a branch that has dt changes before you send it,
> and I'll try to do the same when pulling it to avoid the problem in
> the future.
Thanks, I apologise for letting this slip through.
^ permalink raw reply [flat|nested] 26+ messages in thread
* [GIT PULL v2] Second Round of Renesas ARM64 Based SoC DT Updates for v4.8
@ 2016-07-15 4:29 ` Simon Horman
0 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2016-07-15 4:29 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jul 14, 2016 at 05:54:25PM +0200, Arnd Bergmann wrote:
> On Thursday, July 7, 2016 4:39:45 PM CEST Simon Horman wrote:
> > arm64: dts: r8a7796: Add SYSC PM Domains
> >
>
> While doing some sanity checks on our branch contents, I noticed
> that this commit breaks running "make dtbs" on top of our next/dt64
> branch, and I'd like to avoid that.
>
> I found a couple more problems (tegra and meson), and I ended up
> fixing them all up (by merging the dependencies into next/dt64),
> so everything is sorted for 4.8, but it would be good to do a
> 'make dtbs' run on a branch that has dt changes before you send it,
> and I'll try to do the same when pulling it to avoid the problem in
> the future.
Thanks, I apologise for letting this slip through.
^ permalink raw reply [flat|nested] 26+ messages in thread
end of thread, other threads:[~2016-07-15 4:29 UTC | newest]
Thread overview: 26+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-07 14:39 [GIT PULL v2] Second Round of Renesas ARM64 Based SoC DT Updates for v4.8 Simon Horman
2016-07-07 14:39 ` Simon Horman
2016-07-07 14:39 ` [PATCH 1/8] arm64: dts: r8a7795: Add missing blank lines between cpu nodes Simon Horman
2016-07-07 14:39 ` Simon Horman
2016-07-07 14:39 ` [PATCH 2/8] arm64: dts: r8a7795: Add CAN FD support Simon Horman
2016-07-07 14:39 ` Simon Horman
2016-07-07 14:39 ` [PATCH 3/8] arm64: dts: r8a7796: Add Renesas R8A7796 SoC support Simon Horman
2016-07-07 14:39 ` Simon Horman
2016-07-07 14:39 ` [PATCH 4/8] arm64: dts: salvator-x: add Salvator-X board on R8A7796 SoC Simon Horman
2016-07-07 14:39 ` Simon Horman
2016-07-07 14:39 ` [PATCH 5/8] arm64: dts: r8a7796: Add SYSC PM Domains Simon Horman
2016-07-07 14:39 ` Simon Horman
2016-07-07 14:39 ` [PATCH 6/8] arm64: dts: r8a7796: Use SYSC "always-on" PM Domain Simon Horman
2016-07-07 14:39 ` Simon Horman
2016-07-07 14:39 ` [PATCH 7/8] arm64: dts: r8a7796: Add RWDT node Simon Horman
2016-07-07 14:39 ` Simon Horman
2016-07-07 14:39 ` [PATCH 8/8] arm64: dts: r8a7796/salvator-x: Enable watchdog timer Simon Horman
2016-07-07 14:39 ` Simon Horman
2016-07-14 14:03 ` [GIT PULL v2] Second Round of Renesas ARM64 Based SoC DT Updates for v4.8 Arnd Bergmann
2016-07-14 14:03 ` Arnd Bergmann
2016-07-14 15:54 ` Arnd Bergmann
2016-07-14 15:54 ` Arnd Bergmann
2016-07-15 3:10 ` Geert Uytterhoeven
2016-07-15 3:10 ` Geert Uytterhoeven
2016-07-15 4:29 ` Simon Horman
2016-07-15 4:29 ` Simon Horman
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.