* [PATCH/RFC 01/10] arm64: dts: r8a7795: add GPIO nodes
@ 2015-08-27 9:24 Simon Horman
2015-08-27 10:16 ` Ulrich Hecht
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Simon Horman @ 2015-08-27 9:24 UTC (permalink / raw)
To: linux-sh
From: Takeshi Kihara <takeshi.kihara.df@renesas.com>
Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com>
[horms: broken out of a larger patch; moved to soc node]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 104 +++++++++++++++++++++++++++++++
1 file changed, 104 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index 9fba8be62025..a608eb92a172 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -52,6 +52,110 @@
(GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_HIGH)>;
};
+ gpio0: gpio@e6050000 {
+ compatible = "renesas,gpio-r8a7795",
+ "renesas,gpio-rcar";
+ reg = <0 0xe6050000 0 0x50>;
+ interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
+ #gpio-cells = <2>;
+ gpio-controller;
+ gpio-ranges = <&pfc 0 0 32>;
+ #interrupt-cells = <2>;
+ interrupt-controller;
+ clocks = <&mstp9_clks R8A7795_CLK_GPIO0>;
+ };
+
+ gpio1: gpio@e6051000 {
+ compatible = "renesas,gpio-r8a7795",
+ "renesas,gpio-rcar";
+ reg = <0 0xe6051000 0 0x50>;
+ interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
+ #gpio-cells = <2>;
+ gpio-controller;
+ gpio-ranges = <&pfc 0 32 32>;
+ #interrupt-cells = <2>;
+ interrupt-controller;
+ clocks = <&mstp9_clks R8A7795_CLK_GPIO1>;
+ };
+
+ gpio2: gpio@e6052000 {
+ compatible = "renesas,gpio-r8a7795",
+ "renesas,gpio-rcar";
+ reg = <0 0xe6052000 0 0x50>;
+ interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
+ #gpio-cells = <2>;
+ gpio-controller;
+ gpio-ranges = <&pfc 0 64 32>;
+ #interrupt-cells = <2>;
+ interrupt-controller;
+ clocks = <&mstp9_clks R8A7795_CLK_GPIO2>;
+ };
+
+ gpio3: gpio@e6053000 {
+ compatible = "renesas,gpio-r8a7795",
+ "renesas,gpio-rcar";
+ reg = <0 0xe6053000 0 0x50>;
+ interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
+ #gpio-cells = <2>;
+ gpio-controller;
+ gpio-ranges = <&pfc 0 96 32>;
+ #interrupt-cells = <2>;
+ interrupt-controller;
+ clocks = <&mstp9_clks R8A7795_CLK_GPIO3>;
+ };
+
+ gpio4: gpio@e6054000 {
+ compatible = "renesas,gpio-r8a7795",
+ "renesas,gpio-rcar";
+ reg = <0 0xe6054000 0 0x50>;
+ interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
+ #gpio-cells = <2>;
+ gpio-controller;
+ gpio-ranges = <&pfc 0 128 32>;
+ #interrupt-cells = <2>;
+ interrupt-controller;
+ clocks = <&mstp9_clks R8A7795_CLK_GPIO4>;
+ };
+
+ gpio5: gpio@e6055000 {
+ compatible = "renesas,gpio-r8a7795",
+ "renesas,gpio-rcar";
+ reg = <0 0xe6055000 0 0x50>;
+ interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
+ #gpio-cells = <2>;
+ gpio-controller;
+ gpio-ranges = <&pfc 0 160 32>;
+ #interrupt-cells = <2>;
+ interrupt-controller;
+ clocks = <&mstp9_clks R8A7795_CLK_GPIO5>;
+ };
+
+ gpio6: gpio@e6055400 {
+ compatible = "renesas,gpio-r8a7795",
+ "renesas,gpio-rcar";
+ reg = <0 0xe6055400 0 0x50>;
+ interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
+ #gpio-cells = <2>;
+ gpio-controller;
+ gpio-ranges = <&pfc 0 192 32>;
+ #interrupt-cells = <2>;
+ interrupt-controller;
+ clocks = <&mstp9_clks R8A7795_CLK_GPIO5>;
+ };
+
+ gpio7: gpio@e6055800 {
+ compatible = "renesas,gpio-r8a7795",
+ "renesas,gpio-rcar";
+ reg = <0 0xe6055800 0 0x50>;
+ interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
+ #gpio-cells = <2>;
+ gpio-controller;
+ gpio-ranges = <&pfc 0 224 32>;
+ #interrupt-cells = <2>;
+ interrupt-controller;
+ clocks = <&mstp9_clks R8A7795_CLK_GPIO5>;
+ };
+
timer {
compatible = "arm,armv8-timer";
interrupts = <GIC_PPI 13
--
2.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH/RFC 01/10] arm64: dts: r8a7795: add GPIO nodes
2015-08-27 9:24 [PATCH/RFC 01/10] arm64: dts: r8a7795: add GPIO nodes Simon Horman
@ 2015-08-27 10:16 ` Ulrich Hecht
2015-08-28 0:20 ` Simon Horman
2015-08-28 0:52 ` Simon Horman
2 siblings, 0 replies; 4+ messages in thread
From: Ulrich Hecht @ 2015-08-27 10:16 UTC (permalink / raw)
To: linux-sh
Thanks for the patch.
On Thu, Aug 27, 2015 at 11:24 AM, Simon Horman
<horms+renesas@verge.net.au> wrote:
> From: Takeshi Kihara <takeshi.kihara.df@renesas.com>
>
> Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com>
> [horms: broken out of a larger patch; moved to soc node]
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> ---
> arch/arm64/boot/dts/renesas/r8a7795.dtsi | 104 +++++++++++++++++++++++++++++++
> 1 file changed, 104 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
> index 9fba8be62025..a608eb92a172 100644
> --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
> +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
> @@ -52,6 +52,110 @@
> (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_HIGH)>;
> };
>
> + gpio0: gpio@e6050000 {
> + compatible = "renesas,gpio-r8a7795",
> + "renesas,gpio-rcar";
> + reg = <0 0xe6050000 0 0x50>;
> + interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
> + #gpio-cells = <2>;
> + gpio-controller;
> + gpio-ranges = <&pfc 0 0 32>;
> + #interrupt-cells = <2>;
> + interrupt-controller;
> + clocks = <&mstp9_clks R8A7795_CLK_GPIO0>;
> + };
> +
[...]
> + gpio5: gpio@e6055000 {
> + compatible = "renesas,gpio-r8a7795",
> + "renesas,gpio-rcar";
> + reg = <0 0xe6055000 0 0x50>;
> + interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
> + #gpio-cells = <2>;
> + gpio-controller;
> + gpio-ranges = <&pfc 0 160 32>;
> + #interrupt-cells = <2>;
> + interrupt-controller;
> + clocks = <&mstp9_clks R8A7795_CLK_GPIO5>;
> + };
> +
> + gpio6: gpio@e6055400 {
> + compatible = "renesas,gpio-r8a7795",
> + "renesas,gpio-rcar";
> + reg = <0 0xe6055400 0 0x50>;
> + interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
> + #gpio-cells = <2>;
> + gpio-controller;
> + gpio-ranges = <&pfc 0 192 32>;
> + #interrupt-cells = <2>;
> + interrupt-controller;
> + clocks = <&mstp9_clks R8A7795_CLK_GPIO5>;
This should say R8A7795_CLK_GPIO6...
> + };
> +
> + gpio7: gpio@e6055800 {
> + compatible = "renesas,gpio-r8a7795",
> + "renesas,gpio-rcar";
> + reg = <0 0xe6055800 0 0x50>;
> + interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
> + #gpio-cells = <2>;
> + gpio-controller;
> + gpio-ranges = <&pfc 0 224 32>;
> + #interrupt-cells = <2>;
> + interrupt-controller;
> + clocks = <&mstp9_clks R8A7795_CLK_GPIO5>;
...and this R8A7795_CLK_GPIO7.
CU
Uli
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH/RFC 01/10] arm64: dts: r8a7795: add GPIO nodes
2015-08-27 9:24 [PATCH/RFC 01/10] arm64: dts: r8a7795: add GPIO nodes Simon Horman
2015-08-27 10:16 ` Ulrich Hecht
@ 2015-08-28 0:20 ` Simon Horman
2015-08-28 0:52 ` Simon Horman
2 siblings, 0 replies; 4+ messages in thread
From: Simon Horman @ 2015-08-28 0:20 UTC (permalink / raw)
To: linux-sh
On Thu, Aug 27, 2015 at 12:16:46PM +0200, Ulrich Hecht wrote:
> Thanks for the patch.
You are welcome.
I'll update my local copy with your suggestions regarding clocks.
I plan to replace that with a version you post whenever that occurs.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH/RFC 01/10] arm64: dts: r8a7795: add GPIO nodes
2015-08-27 9:24 [PATCH/RFC 01/10] arm64: dts: r8a7795: add GPIO nodes Simon Horman
2015-08-27 10:16 ` Ulrich Hecht
2015-08-28 0:20 ` Simon Horman
@ 2015-08-28 0:52 ` Simon Horman
2 siblings, 0 replies; 4+ messages in thread
From: Simon Horman @ 2015-08-28 0:52 UTC (permalink / raw)
To: linux-sh
On Fri, Aug 28, 2015 at 09:20:53AM +0900, Simon Horman wrote:
> On Thu, Aug 27, 2015 at 12:16:46PM +0200, Ulrich Hecht wrote:
> > Thanks for the patch.
>
> You are welcome.
>
> I'll update my local copy with your suggestions regarding clocks.
> I plan to replace that with a version you post whenever that occurs.
For reference this is what I now have.
Light testing indicates that the driver is initialised correctly,
though that was also the case before when the clocks were wrong.
From: Takeshi Kihara <takeshi.kihara.df@renesas.com>
Subject: [PATCH] arm64: dts: r8a7795: add GPIO clocks
Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com>
[horms: moved into clock node; removed non-clock nodes; updated changelog;
used R8A7795 as prefix for clock defines]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 27 +++++++++++++++++++++++++++
include/dt-bindings/clock/r8a7795-clock.h | 8 ++++++++
2 files changed, 35 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index 5ee10c375190..9fba8be62025 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -70,6 +70,14 @@
#clock-cells = <1>;
ranges;
+ cp_clk: cp_clk {
+ compatible = "fixed-factor-clock";
+ clocks = <&extal_clk>;
+ #clock-cells = <0>;
+ clock-div = <2>;
+ clock-mult = <1>;
+ };
+
s3d4_clk: s3d4 {
compatible = "fixed-factor-clock";
clocks = <&cpg_clocks R8A7795_CLK_PLL1>;
@@ -114,6 +122,25 @@
R8A7795_CLK_EHCI2>;
clock-output-names = "hsusb", "ehci0", "ehci1", "ehci2";
};
+
+ mstp9_clks: mstp9_clks@e6150994 {
+ compatible = "renesas,r8a7795-mstp-clocks",
+ "renesas,cpg-mstp-clocks";
+ reg = <0 0xe6150994 0 4>, <0 0xe61509a4 0 4>;
+ clocks = <&cp_clk>, <&cp_clk>, <&cp_clk>,
+ <&cp_clk>, <&cp_clk>, <&cp_clk>,
+ <&cp_clk>, <&cp_clk>;
+ #clock-cells = <1>;
+ clock-indices = <
+ R8A7795_CLK_GPIO7 R8A7795_CLK_GPIO6
+ R8A7795_CLK_GPIO5 R8A7795_CLK_GPIO4
+ R8A7795_CLK_GPIO3 R8A7795_CLK_GPIO2
+ R8A7795_CLK_GPIO1 R8A7795_CLK_GPIO0
+ >;
+ clock-output-names + "gpio7", "gpio6", "gpio5", "gpio4",
+ "gpio3", "gpio2", "gpio1", "gpio0";
+ };
};
};
diff --git a/include/dt-bindings/clock/r8a7795-clock.h b/include/dt-bindings/clock/r8a7795-clock.h
index 2bd9d934e341..5ca06876902f 100644
--- a/include/dt-bindings/clock/r8a7795-clock.h
+++ b/include/dt-bindings/clock/r8a7795-clock.h
@@ -37,6 +37,14 @@
/* MSTP8 */
/* MSTP9 */
+#define R8A7795_CLK_GPIO0 12
+#define R8A7795_CLK_GPIO1 11
+#define R8A7795_CLK_GPIO2 10
+#define R8A7795_CLK_GPIO3 9
+#define R8A7795_CLK_GPIO4 8
+#define R8A7795_CLK_GPIO5 7
+#define R8A7795_CLK_GPIO6 6
+#define R8A7795_CLK_GPIO7 5
/* MSTP10 */
--
2.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-08-28 0:52 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-27 9:24 [PATCH/RFC 01/10] arm64: dts: r8a7795: add GPIO nodes Simon Horman
2015-08-27 10:16 ` Ulrich Hecht
2015-08-28 0:20 ` Simon Horman
2015-08-28 0:52 ` Simon Horman
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).