* [PATCH 01/22] ARM: dts: r8a7790: use fallback jpu compatibility string
2016-04-25 4:27 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.7 Simon Horman
@ 2016-04-25 4:27 ` Simon Horman
2016-04-25 4:27 ` [PATCH 02/22] ARM: dts: r8a7791: " Simon Horman
` (21 subsequent siblings)
22 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-04-25 4:27 UTC (permalink / raw)
To: linux-arm-kernel
Use recently added fallback compatibility string in r8a7790 device trees.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/boot/dts/r8a7790.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 283698fc0fea..60db8e4f5790 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -990,7 +990,7 @@
};
jpu: jpeg-codec at fe980000 {
- compatible = "renesas,jpu-r8a7790";
+ compatible = "renesas,jpu-r8a7790", "renesas,rcar-gen2-jpu";
reg = <0 0xfe980000 0 0x10300>;
interrupts = <GIC_SPI 272 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp1_clks R8A7790_CLK_JPU>;
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 02/22] ARM: dts: r8a7791: use fallback jpu compatibility string
2016-04-25 4:27 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.7 Simon Horman
2016-04-25 4:27 ` [PATCH 01/22] ARM: dts: r8a7790: use fallback jpu compatibility string Simon Horman
@ 2016-04-25 4:27 ` Simon Horman
2016-04-25 4:27 ` [PATCH 03/22] ARM: dts: r8a7790: Add SCIF2 clock Simon Horman
` (20 subsequent siblings)
22 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-04-25 4:27 UTC (permalink / raw)
To: linux-arm-kernel
Use recently added fallback compatibility string in r8a7791 device tree.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/boot/dts/r8a7791.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 8010d935300f..d4de6db1143b 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -1035,7 +1035,7 @@
};
jpu: jpeg-codec at fe980000 {
- compatible = "renesas,jpu-r8a7791";
+ compatible = "renesas,jpu-r8a7791", "renesas,rcar-gen2-jpu";
reg = <0 0xfe980000 0 0x10300>;
interrupts = <GIC_SPI 272 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp1_clks R8A7791_CLK_JPU>;
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 03/22] ARM: dts: r8a7790: Add SCIF2 clock
2016-04-25 4:27 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.7 Simon Horman
2016-04-25 4:27 ` [PATCH 01/22] ARM: dts: r8a7790: use fallback jpu compatibility string Simon Horman
2016-04-25 4:27 ` [PATCH 02/22] ARM: dts: r8a7791: " Simon Horman
@ 2016-04-25 4:27 ` Simon Horman
2016-04-25 4:27 ` [PATCH 04/22] ARM: dts: r8a7790: Add SCIF2 device node Simon Horman
` (19 subsequent siblings)
22 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-04-25 4:27 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Based on Rev. 2.00 of the R-Car Gen2 datasheet.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7790.dtsi | 6 +++---
include/dt-bindings/clock/r8a7790-clock.h | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 60db8e4f5790..6f4fdfccdcfd 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -1302,19 +1302,19 @@
mstp3_clks: mstp3_clks at e615013c {
compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
reg = <0 0xe615013c 0 4>, <0 0xe6150048 0 4>;
- clocks = <&hp_clk>, <&cp_clk>, <&mmc1_clk>, <&sd3_clk>,
+ clocks = <&hp_clk>, <&cp_clk>, <&mmc1_clk>, <&p_clk>, <&sd3_clk>,
<&sd2_clk>, <&cpg_clocks R8A7790_CLK_SD1>, <&cpg_clocks R8A7790_CLK_SD0>, <&mmc0_clk>,
<&hp_clk>, <&mp_clk>, <&hp_clk>, <&mp_clk>, <&rclk_clk>,
<&hp_clk>, <&hp_clk>;
#clock-cells = <1>;
clock-indices = <
- R8A7790_CLK_IIC2 R8A7790_CLK_TPU0 R8A7790_CLK_MMCIF1 R8A7790_CLK_SDHI3
+ R8A7790_CLK_IIC2 R8A7790_CLK_TPU0 R8A7790_CLK_MMCIF1 R8A7790_CLK_SCIF2 R8A7790_CLK_SDHI3
R8A7790_CLK_SDHI2 R8A7790_CLK_SDHI1 R8A7790_CLK_SDHI0 R8A7790_CLK_MMCIF0
R8A7790_CLK_IIC0 R8A7790_CLK_PCIEC R8A7790_CLK_IIC1 R8A7790_CLK_SSUSB R8A7790_CLK_CMT1
R8A7790_CLK_USBDMAC0 R8A7790_CLK_USBDMAC1
>;
clock-output-names =
- "iic2", "tpu0", "mmcif1", "sdhi3",
+ "iic2", "tpu0", "mmcif1", "scif2", "sdhi3",
"sdhi2", "sdhi1", "sdhi0", "mmcif0",
"iic0", "pciec", "iic1", "ssusb", "cmt1",
"usbdmac0", "usbdmac1";
diff --git a/include/dt-bindings/clock/r8a7790-clock.h b/include/dt-bindings/clock/r8a7790-clock.h
index 7b1ad8922eec..fa5e8da809f2 100644
--- a/include/dt-bindings/clock/r8a7790-clock.h
+++ b/include/dt-bindings/clock/r8a7790-clock.h
@@ -66,6 +66,7 @@
#define R8A7790_CLK_IIC2 0
#define R8A7790_CLK_TPU0 4
#define R8A7790_CLK_MMCIF1 5
+#define R8A7790_CLK_SCIF2 10
#define R8A7790_CLK_SDHI3 11
#define R8A7790_CLK_SDHI2 12
#define R8A7790_CLK_SDHI1 13
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 04/22] ARM: dts: r8a7790: Add SCIF2 device node
2016-04-25 4:27 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.7 Simon Horman
` (2 preceding siblings ...)
2016-04-25 4:27 ` [PATCH 03/22] ARM: dts: r8a7790: Add SCIF2 clock Simon Horman
@ 2016-04-25 4:27 ` Simon Horman
2016-04-25 4:27 ` [PATCH 05/22] ARM: dts: r8a7791: use fallback can compatibility string Simon Horman
` (18 subsequent siblings)
22 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-04-25 4:27 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7790.dtsi | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 6f4fdfccdcfd..e96f8a4cb66f 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -732,6 +732,20 @@
status = "disabled";
};
+ scif2: serial at e6e56000 {
+ compatible = "renesas,scif-r8a7790", "renesas,rcar-gen2-scif",
+ "renesas,scif";
+ reg = <0 0xe6e56000 0 64>;
+ interrupts = <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp3_clks R8A7790_CLK_SCIF2>, <&zs_clk>,
+ <&scif_clk>;
+ clock-names = "fck", "brg_int", "scif_clk";
+ dmas = <&dmac0 0x2b>, <&dmac0 0x2c>;
+ dma-names = "tx", "rx";
+ power-domains = <&cpg_clocks>;
+ status = "disabled";
+ };
+
hscif0: serial at e62c0000 {
compatible = "renesas,hscif-r8a7790",
"renesas,rcar-gen2-hscif", "renesas,hscif";
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 05/22] ARM: dts: r8a7791: use fallback can compatibility string
2016-04-25 4:27 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.7 Simon Horman
` (3 preceding siblings ...)
2016-04-25 4:27 ` [PATCH 04/22] ARM: dts: r8a7790: Add SCIF2 device node Simon Horman
@ 2016-04-25 4:27 ` Simon Horman
2016-04-25 4:27 ` [PATCH 06/22] ARM: dts: r8a7790: " Simon Horman
` (17 subsequent siblings)
22 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-04-25 4:27 UTC (permalink / raw)
To: linux-arm-kernel
Use recently added fallback compatibility string in r8a7791 device tree.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/boot/dts/r8a7791.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index d4de6db1143b..6122a7919c9f 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -1013,7 +1013,7 @@
};
can0: can at e6e80000 {
- compatible = "renesas,can-r8a7791";
+ compatible = "renesas,can-r8a7791", "renesas,rcar-gen2-can";
reg = <0 0xe6e80000 0 0x1000>;
interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp9_clks R8A7791_CLK_RCAN0>,
@@ -1024,7 +1024,7 @@
};
can1: can at e6e88000 {
- compatible = "renesas,can-r8a7791";
+ compatible = "renesas,can-r8a7791", "renesas,rcar-gen2-can";
reg = <0 0xe6e88000 0 0x1000>;
interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp9_clks R8A7791_CLK_RCAN1>,
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 06/22] ARM: dts: r8a7790: use fallback can compatibility string
2016-04-25 4:27 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.7 Simon Horman
` (4 preceding siblings ...)
2016-04-25 4:27 ` [PATCH 05/22] ARM: dts: r8a7791: use fallback can compatibility string Simon Horman
@ 2016-04-25 4:27 ` Simon Horman
2016-04-25 4:27 ` [PATCH 07/22] ARM: dts: r8a7794: add CAN clocks to device tree Simon Horman
` (16 subsequent siblings)
22 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-04-25 4:27 UTC (permalink / raw)
To: linux-arm-kernel
Use recently added fallback compatibility string in r8a7790 device tree.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/boot/dts/r8a7790.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index e96f8a4cb66f..7cf52e6da956 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -982,7 +982,7 @@
};
can0: can at e6e80000 {
- compatible = "renesas,can-r8a7790";
+ compatible = "renesas,can-r8a7790", "renesas,rcar-gen2-can";
reg = <0 0xe6e80000 0 0x1000>;
interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp9_clks R8A7790_CLK_RCAN0>,
@@ -993,7 +993,7 @@
};
can1: can at e6e88000 {
- compatible = "renesas,can-r8a7790";
+ compatible = "renesas,can-r8a7790", "renesas,rcar-gen2-can";
reg = <0 0xe6e88000 0 0x1000>;
interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp9_clks R8A7790_CLK_RCAN1>,
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 07/22] ARM: dts: r8a7794: add CAN clocks to device tree
2016-04-25 4:27 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.7 Simon Horman
` (5 preceding siblings ...)
2016-04-25 4:27 ` [PATCH 06/22] ARM: dts: r8a7790: " Simon Horman
@ 2016-04-25 4:27 ` Simon Horman
2016-04-25 4:27 ` [PATCH 08/22] ARM: dts: r8a7794: add CAN nodes " Simon Horman
` (15 subsequent siblings)
22 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-04-25 4:27 UTC (permalink / raw)
To: linux-arm-kernel
Add CAN nodes to r8a7794 device tree.
Based on work by Sergei Shtylyov for the r8a7791 SoC.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com>
---
arch/arm/boot/dts/r8a7794.dtsi | 33 ++++++++++++++++++++++++-------
include/dt-bindings/clock/r8a7794-clock.h | 3 +++
2 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index 7d7d18766540..2d8835bdf3f6 100644
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -843,6 +843,22 @@
clock-frequency = <0>;
};
+ /* External USB clock - can be overridden by the board */
+ usb_extal_clk: usb_extal {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <48000000>;
+ };
+
+ /* External CAN clock */
+ can_clk: can {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ /* This value must be overridden by the board. */
+ clock-frequency = <0>;
+ status = "disabled";
+ };
+
/* External SCIF clock */
scif_clk: scif {
compatible = "fixed-clock";
@@ -857,10 +873,11 @@
compatible = "renesas,r8a7794-cpg-clocks",
"renesas,rcar-gen2-cpg-clocks";
reg = <0 0xe6150000 0 0x1000>;
- clocks = <&extal_clk>;
+ clocks = <&extal_clk &usb_extal_clk>;
#clock-cells = <1>;
clock-output-names = "main", "pll0", "pll1", "pll3",
- "lb", "qspi", "sdh", "sd0", "z";
+ "lb", "qspi", "sdh", "sd0", "z",
+ "rcan";
#power-domain-cells = <0>;
};
/* Variable factor clocks */
@@ -1115,20 +1132,22 @@
compatible = "renesas,r8a7794-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>,
- <&cpg_clocks R8A7794_CLK_QSPI>, <&hp_clk>, <&hp_clk>,
- <&hp_clk>, <&hp_clk>, <&hp_clk>, <&hp_clk>;
+ <&cp_clk>, <&cp_clk>, <&cp_clk>, <&p_clk>,
+ <&p_clk>, <&cpg_clocks R8A7794_CLK_QSPI>,
+ <&hp_clk>, <&hp_clk>, <&hp_clk>, <&hp_clk>,
+ <&hp_clk>, <&hp_clk>;
#clock-cells = <1>;
clock-indices = <R8A7794_CLK_GPIO6 R8A7794_CLK_GPIO5
R8A7794_CLK_GPIO4 R8A7794_CLK_GPIO3
R8A7794_CLK_GPIO2 R8A7794_CLK_GPIO1
- R8A7794_CLK_GPIO0 R8A7794_CLK_QSPI_MOD
+ R8A7794_CLK_GPIO0 R8A7794_CLK_RCAN1
+ R8A7794_CLK_RCAN0 R8A7794_CLK_QSPI_MOD
R8A7794_CLK_I2C5 R8A7794_CLK_I2C4
R8A7794_CLK_I2C3 R8A7794_CLK_I2C2
R8A7794_CLK_I2C1 R8A7794_CLK_I2C0>;
clock-output-names =
"gpio6", "gpio5", "gpio4", "gpio3", "gpio2",
- "gpio1", "gpio0", "qspi_mod",
+ "gpio1", "gpio0", "rcan1", "rcan0", "qspi_mod",
"i2c5", "i2c4", "i2c3", "i2c2", "i2c1", "i2c0";
};
mstp11_clks: mstp11_clks at e615099c {
diff --git a/include/dt-bindings/clock/r8a7794-clock.h b/include/dt-bindings/clock/r8a7794-clock.h
index f843de6bf377..9703fbdb81c8 100644
--- a/include/dt-bindings/clock/r8a7794-clock.h
+++ b/include/dt-bindings/clock/r8a7794-clock.h
@@ -21,6 +21,7 @@
#define R8A7794_CLK_SDH 6
#define R8A7794_CLK_SD0 7
#define R8A7794_CLK_Z 8
+#define R8A7794_CLK_RCAN 9
/* MSTP0 */
#define R8A7794_CLK_MSIOF0 0
@@ -95,6 +96,8 @@
#define R8A7794_CLK_GPIO2 10
#define R8A7794_CLK_GPIO1 11
#define R8A7794_CLK_GPIO0 12
+#define R8A7794_CLK_RCAN1 15
+#define R8A7794_CLK_RCAN0 16
#define R8A7794_CLK_QSPI_MOD 17
#define R8A7794_CLK_I2C5 25
#define R8A7794_CLK_I2C4 27
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 08/22] ARM: dts: r8a7794: add CAN nodes to device tree
2016-04-25 4:27 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.7 Simon Horman
` (6 preceding siblings ...)
2016-04-25 4:27 ` [PATCH 07/22] ARM: dts: r8a7794: add CAN clocks to device tree Simon Horman
@ 2016-04-25 4:27 ` Simon Horman
2016-04-25 4:27 ` [PATCH 09/22] ARM: dts: r8a7793: add CAN clocks " Simon Horman
` (14 subsequent siblings)
22 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-04-25 4:27 UTC (permalink / raw)
To: linux-arm-kernel
Add CAN nodes to r8a7794 device tree.
Based on work by Sergei Shtylyov for the r8a7791 SoC.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com>
---
arch/arm/boot/dts/r8a7794.dtsi | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index 2d8835bdf3f6..a1ee2a82c3c0 100644
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -830,6 +830,28 @@
};
};
+ can0: can at e6e80000 {
+ compatible = "renesas,can-r8a7794", "renesas,rcar-gen2-can";
+ reg = <0 0xe6e80000 0 0x1000>;
+ interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp9_clks R8A7794_CLK_RCAN0>,
+ <&cpg_clocks R8A7794_CLK_RCAN>, <&can_clk>;
+ clock-names = "clkp1", "clkp2", "can_clk";
+ power-domains = <&cpg_clocks>;
+ status = "disabled";
+ };
+
+ can1: can at e6e88000 {
+ compatible = "renesas,can-r8a7794", "renesas,rcar-gen2-can";
+ reg = <0 0xe6e88000 0 0x1000>;
+ interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp9_clks R8A7794_CLK_RCAN1>,
+ <&cpg_clocks R8A7794_CLK_RCAN>, <&can_clk>;
+ clock-names = "clkp1", "clkp2", "can_clk";
+ power-domains = <&cpg_clocks>;
+ status = "disabled";
+ };
+
clocks {
#address-cells = <2>;
#size-cells = <2>;
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 09/22] ARM: dts: r8a7793: add CAN clocks to device tree
2016-04-25 4:27 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.7 Simon Horman
` (7 preceding siblings ...)
2016-04-25 4:27 ` [PATCH 08/22] ARM: dts: r8a7794: add CAN nodes " Simon Horman
@ 2016-04-25 4:27 ` Simon Horman
2016-04-25 4:27 ` [PATCH 10/22] ARM: dts: r8a7793: add CAN nodes " Simon Horman
` (13 subsequent siblings)
22 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-04-25 4:27 UTC (permalink / raw)
To: linux-arm-kernel
The R-Car CAN controllers can derive the CAN bus clock not only from their
peripheral clock input (clkp1) but also from the other internal clock
(clkp2) and external clock fed on CAN_CLK pin. Describe those clocks in
the device tree along with the USB_EXTAL clock from which clkp2 is
derived.
Based on work by Sergei Shtylyov for the r8a7791 SoC.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/boot/dts/r8a7793.dtsi | 27 +++++++++++++++++++++++----
1 file changed, 23 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi
index 95bbed95b0c1..0e609bdafaa9 100644
--- a/arch/arm/boot/dts/r8a7793.dtsi
+++ b/arch/arm/boot/dts/r8a7793.dtsi
@@ -839,6 +839,22 @@
clock-frequency = <0>;
};
+ /* External USB clock - can be overridden by the board */
+ usb_extal_clk: usb_extal {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <48000000>;
+ };
+
+ /* External CAN clock */
+ can_clk: can {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ /* This value must be overridden by the board. */
+ clock-frequency = <0>;
+ status = "disabled";
+ };
+
/* External SCIF clock */
scif_clk: scif {
compatible = "fixed-clock";
@@ -853,7 +869,7 @@
compatible = "renesas,r8a7793-cpg-clocks",
"renesas,rcar-gen2-cpg-clocks";
reg = <0 0xe6150000 0 0x1000>;
- clocks = <&extal_clk>;
+ clocks = <&extal_clk &usb_extal_clk>;
#clock-cells = <1>;
clock-output-names = "main", "pll0", "pll1", "pll3",
"lb", "qspi", "sdh", "sd0", "z",
@@ -1081,6 +1097,7 @@
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>,
+ <&p_clk>, <&p_clk>,
<&cpg_clocks R8A7793_CLK_QSPI>, <&hp_clk>,
<&cp_clk>, <&hp_clk>, <&hp_clk>, <&hp_clk>,
<&hp_clk>, <&hp_clk>;
@@ -1090,7 +1107,8 @@
R8A7793_CLK_GPIO5 R8A7793_CLK_GPIO4
R8A7793_CLK_GPIO3 R8A7793_CLK_GPIO2
R8A7793_CLK_GPIO1 R8A7793_CLK_GPIO0
- R8A7793_CLK_QSPI_MOD R8A7793_CLK_I2C5
+ R8A7793_CLK_QSPI_MOD R8A7793_CLK_RCAN1
+ R8A7793_CLK_RCAN0 R8A7793_CLK_I2C5
R8A7793_CLK_IICDVFS R8A7793_CLK_I2C4
R8A7793_CLK_I2C3 R8A7793_CLK_I2C2
R8A7793_CLK_I2C1 R8A7793_CLK_I2C0
@@ -1098,8 +1116,9 @@
clock-output-names =
"gpio7", "gpio6", "gpio5", "gpio4",
"gpio3", "gpio2", "gpio1", "gpio0",
- "qspi_mod", "i2c5", "i2c6", "i2c4",
- "i2c3", "i2c2", "i2c1", "i2c0";
+ "rcan1", "rcan0", "qspi_mod", "i2c5",
+ "i2c6", "i2c4", "i2c3", "i2c2", "i2c1",
+ "i2c0";
};
mstp10_clks: mstp10_clks at e6150998 {
compatible = "renesas,r8a7793-mstp-clocks", "renesas,cpg-mstp-clocks";
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 10/22] ARM: dts: r8a7793: add CAN nodes to device tree
2016-04-25 4:27 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.7 Simon Horman
` (8 preceding siblings ...)
2016-04-25 4:27 ` [PATCH 09/22] ARM: dts: r8a7793: add CAN clocks " Simon Horman
@ 2016-04-25 4:27 ` Simon Horman
2016-04-25 4:27 ` [PATCH 11/22] ARM: dts: r8a7794: add IIC clocks Simon Horman
` (12 subsequent siblings)
22 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-04-25 4:27 UTC (permalink / raw)
To: linux-arm-kernel
Add CAN nodes to r8a7793 device tree.
Based on work by Sergei Shtylyov for the r8a7791 SoC.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7793.dtsi | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi
index 0e609bdafaa9..bddc31283bd9 100644
--- a/arch/arm/boot/dts/r8a7793.dtsi
+++ b/arch/arm/boot/dts/r8a7793.dtsi
@@ -806,6 +806,28 @@
};
};
+ can0: can at e6e80000 {
+ compatible = "renesas,can-r8a7793", "renesas,rcar-gen2-can";
+ reg = <0 0xe6e80000 0 0x1000>;
+ interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp9_clks R8A7793_CLK_RCAN0>,
+ <&cpg_clocks R8A7793_CLK_RCAN>, <&can_clk>;
+ clock-names = "clkp1", "clkp2", "can_clk";
+ power-domains = <&cpg_clocks>;
+ status = "disabled";
+ };
+
+ can1: can at e6e88000 {
+ compatible = "renesas,can-r8a7793", "renesas,rcar-gen2-can";
+ reg = <0 0xe6e88000 0 0x1000>;
+ interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp9_clks R8A7793_CLK_RCAN1>,
+ <&cpg_clocks R8A7793_CLK_RCAN>, <&can_clk>;
+ clock-names = "clkp1", "clkp2", "can_clk";
+ power-domains = <&cpg_clocks>;
+ status = "disabled";
+ };
+
clocks {
#address-cells = <2>;
#size-cells = <2>;
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 11/22] ARM: dts: r8a7794: add IIC clocks
2016-04-25 4:27 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.7 Simon Horman
` (9 preceding siblings ...)
2016-04-25 4:27 ` [PATCH 10/22] ARM: dts: r8a7793: add CAN nodes " Simon Horman
@ 2016-04-25 4:27 ` Simon Horman
2016-04-25 4:27 ` [PATCH 12/22] ARM: dts: r8a7794: Add IIC nodes Simon Horman
` (11 subsequent siblings)
22 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-04-25 4:27 UTC (permalink / raw)
To: linux-arm-kernel
Add IIC clocks to r8a7794 device tree.
Based on similar work for the r8a7790 by Wolfram Sang.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/boot/dts/r8a7794.dtsi | 9 ++++++---
include/dt-bindings/clock/r8a7794-clock.h | 2 ++
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index a1ee2a82c3c0..8b2060c87a76 100644
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -1099,16 +1099,19 @@
compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
reg = <0 0xe615013c 0 4>, <0 0xe6150048 0 4>;
clocks = <&sd3_clk>, <&sd2_clk>, <&cpg_clocks R8A7794_CLK_SD0>,
- <&mmc0_clk>, <&rclk_clk>, <&hp_clk>, <&hp_clk>;
+ <&mmc0_clk>, <&hp_clk>, <&hp_clk>, <&rclk_clk>,
+ <&hp_clk>, <&hp_clk>;
#clock-cells = <1>;
clock-indices = <
R8A7794_CLK_SDHI2 R8A7794_CLK_SDHI1 R8A7794_CLK_SDHI0
- R8A7794_CLK_MMCIF0 R8A7794_CLK_CMT1
+ R8A7794_CLK_MMCIF0 R8A7794_CLK_IIC0
+ R8A7794_CLK_IIC1 R8A7794_CLK_CMT1
R8A7794_CLK_USBDMAC0 R8A7794_CLK_USBDMAC1
>;
clock-output-names =
"sdhi2", "sdhi1", "sdhi0",
- "mmcif0", "cmt1", "usbdmac0", "usbdmac1";
+ "mmcif0", "i2c6", "i2c7",
+ "cmt1", "usbdmac0", "usbdmac1";
};
mstp4_clks: mstp4_clks at e6150140 {
compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
diff --git a/include/dt-bindings/clock/r8a7794-clock.h b/include/dt-bindings/clock/r8a7794-clock.h
index 9703fbdb81c8..4d3ecd626c1f 100644
--- a/include/dt-bindings/clock/r8a7794-clock.h
+++ b/include/dt-bindings/clock/r8a7794-clock.h
@@ -57,6 +57,8 @@
#define R8A7794_CLK_SDHI1 12
#define R8A7794_CLK_SDHI0 14
#define R8A7794_CLK_MMCIF0 15
+#define R8A7794_CLK_IIC0 18
+#define R8A7794_CLK_IIC1 23
#define R8A7794_CLK_CMT1 29
#define R8A7794_CLK_USBDMAC0 30
#define R8A7794_CLK_USBDMAC1 31
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 12/22] ARM: dts: r8a7794: Add IIC nodes
2016-04-25 4:27 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.7 Simon Horman
` (10 preceding siblings ...)
2016-04-25 4:27 ` [PATCH 11/22] ARM: dts: r8a7794: add IIC clocks Simon Horman
@ 2016-04-25 4:27 ` Simon Horman
2016-04-25 4:27 ` [PATCH 13/22] ARM: dts: sh73a0: Correct interrupt type for ARM TWD Simon Horman
` (10 subsequent siblings)
22 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-04-25 4:27 UTC (permalink / raw)
To: linux-arm-kernel
Add IIC nodes to r8a7794 device tree.
Based on similar work for the r8a7793 by Laurent Pinchart.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/boot/dts/r8a7794.dtsi | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index 8b2060c87a76..b0bce43779f1 100644
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -26,6 +26,8 @@
i2c3 = &i2c3;
i2c4 = &i2c4;
i2c5 = &i2c5;
+ i2c6 = &i2c6;
+ i2c7 = &i2c7;
spi0 = &qspi;
vin0 = &vin0;
vin1 = &vin1;
@@ -629,6 +631,32 @@
status = "disabled";
};
+ i2c6: i2c at e6500000 {
+ compatible = "renesas,iic-r8a7794", "renesas,rmobile-iic";
+ reg = <0 0xe6500000 0 0x425>;
+ interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp3_clks R8A7794_CLK_IIC0>;
+ dmas = <&dmac0 0x61>, <&dmac0 0x62>;
+ dma-names = "tx", "rx";
+ power-domains = <&cpg_clocks>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "disabled";
+ };
+
+ i2c7: i2c at e6510000 {
+ compatible = "renesas,iic-r8a7794", "renesas,rmobile-iic";
+ reg = <0 0xe6510000 0 0x425>;
+ interrupts = <GIC_SPI 175 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp3_clks R8A7794_CLK_IIC1>;
+ dmas = <&dmac0 0x65>, <&dmac0 0x66>;
+ dma-names = "tx", "rx";
+ power-domains = <&cpg_clocks>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "disabled";
+ };
+
mmcif0: mmc at ee200000 {
compatible = "renesas,mmcif-r8a7794", "renesas,sh-mmcif";
reg = <0 0xee200000 0 0x80>;
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 13/22] ARM: dts: sh73a0: Correct interrupt type for ARM TWD
2016-04-25 4:27 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.7 Simon Horman
` (11 preceding siblings ...)
2016-04-25 4:27 ` [PATCH 12/22] ARM: dts: r8a7794: Add IIC nodes Simon Horman
@ 2016-04-25 4:27 ` Simon Horman
2016-04-25 4:27 ` [PATCH 14/22] ARM: dts: r8a7779: " Simon Horman
` (9 subsequent siblings)
22 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-04-25 4:27 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
The ARM TWD interrupt is a private peripheral interrupt (PPI), and per
the ARM GIC documentation, whether the type for PPIs can be set is
IMPLEMENTATION DEFINED.
For SH-Mobile AG5 devices the PPI type cannot be set, and so when we
attempt to set the type for the ARM TWD interrupt it fails. This has
gone unnoticed because it fails silently, and because we cannot
re-configure the type it has had no impact. Nevertheless fix the type
for the TWD interrupt so that it matches the hardware configuration.
Based on patches by Jon Hunter for Tegra20/30 and OMAP4.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/sh73a0.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi
index 639ea2d76970..c4f434cdec60 100644
--- a/arch/arm/boot/dts/sh73a0.dtsi
+++ b/arch/arm/boot/dts/sh73a0.dtsi
@@ -43,7 +43,7 @@
timer at f0000600 {
compatible = "arm,cortex-a9-twd-timer";
reg = <0xf0000600 0x20>;
- interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;
+ interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_EDGE_RISING)>;
clocks = <&twd_clk>;
};
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 14/22] ARM: dts: r8a7779: Correct interrupt type for ARM TWD
2016-04-25 4:27 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.7 Simon Horman
` (12 preceding siblings ...)
2016-04-25 4:27 ` [PATCH 13/22] ARM: dts: sh73a0: Correct interrupt type for ARM TWD Simon Horman
@ 2016-04-25 4:27 ` Simon Horman
2016-04-25 4:27 ` [PATCH 15/22] ARM: dts: r8a7790: Use USB3.0 fallback compatibility string Simon Horman
` (8 subsequent siblings)
22 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-04-25 4:27 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
The ARM TWD interrupt is a private peripheral interrupt (PPI), and per
the ARM GIC documentation, whether the type for PPIs can be set is
IMPLEMENTATION DEFINED.
For R-Car H1 devices the PPI type cannot be set, and so when we attempt
to set the type for the ARM TWD interrupt it fails. This has gone
unnoticed because it fails silently, and because we cannot re-configure
the type it has had no impact. Nevertheless fix the type for the TWD
interrupt so that it matches the hardware configuration.
Based on patches by Jon Hunter for Tegra20/30 and OMAP4.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7779.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
index 60bc1e66bba9..5c1d48d712a1 100644
--- a/arch/arm/boot/dts/r8a7779.dtsi
+++ b/arch/arm/boot/dts/r8a7779.dtsi
@@ -67,7 +67,7 @@
compatible = "arm,cortex-a9-twd-timer";
reg = <0xf0000600 0x20>;
interrupts = <GIC_PPI 13
- (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
+ (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>;
clocks = <&cpg_clocks R8A7779_CLK_ZS>;
};
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 15/22] ARM: dts: r8a7790: Use USB3.0 fallback compatibility string
2016-04-25 4:27 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.7 Simon Horman
` (13 preceding siblings ...)
2016-04-25 4:27 ` [PATCH 14/22] ARM: dts: r8a7779: " Simon Horman
@ 2016-04-25 4:27 ` Simon Horman
2016-04-25 4:27 ` [PATCH 16/22] ARM: dts: r8a7791: " Simon Horman
` (7 subsequent siblings)
22 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-04-25 4:27 UTC (permalink / raw)
To: linux-arm-kernel
Use recently added fallback compatibility string in r8a7790 device tree.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/boot/dts/r8a7790.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 7cf52e6da956..7486fcf985c4 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -1513,7 +1513,7 @@
};
xhci: usb at ee000000 {
- compatible = "renesas,xhci-r8a7790";
+ compatible = "renesas,xhci-r8a7790", "renesas,rcar-gen2-xhci";
reg = <0 0xee000000 0 0xc00>;
interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp3_clks R8A7790_CLK_SSUSB>;
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 16/22] ARM: dts: r8a7791: Use USB3.0 fallback compatibility string
2016-04-25 4:27 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.7 Simon Horman
` (14 preceding siblings ...)
2016-04-25 4:27 ` [PATCH 15/22] ARM: dts: r8a7790: Use USB3.0 fallback compatibility string Simon Horman
@ 2016-04-25 4:27 ` Simon Horman
2016-04-25 4:27 ` [PATCH 17/22] ARM: dts: r8a7790: Set maximum frequencies for SDHI clocks Simon Horman
` (6 subsequent siblings)
22 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-04-25 4:27 UTC (permalink / raw)
To: linux-arm-kernel
Use recently added fallback compatibility string in r8a7791 device tree.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/boot/dts/r8a7791.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 6122a7919c9f..6d4a0b6e4df9 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -1520,7 +1520,7 @@
};
xhci: usb at ee000000 {
- compatible = "renesas,xhci-r8a7791";
+ compatible = "renesas,xhci-r8a7791", "renesas,rcar-gen2-xhci";
reg = <0 0xee000000 0 0xc00>;
interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp3_clks R8A7791_CLK_SSUSB>;
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 17/22] ARM: dts: r8a7790: Set maximum frequencies for SDHI clocks
2016-04-25 4:27 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.7 Simon Horman
` (15 preceding siblings ...)
2016-04-25 4:27 ` [PATCH 16/22] ARM: dts: r8a7791: " Simon Horman
@ 2016-04-25 4:27 ` Simon Horman
2016-04-25 4:27 ` [PATCH 18/22] ARM: dts: r8a7790: lager: Enable UHS-I SDR-50 Simon Horman
` (5 subsequent siblings)
22 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-04-25 4:27 UTC (permalink / raw)
To: linux-arm-kernel
From: Ben Hutchings <ben.hutchings@codethink.co.uk>
Taken from the datasheet.
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7790.dtsi | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 7486fcf985c4..b920facb0c3b 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -589,6 +589,7 @@
clocks = <&mstp3_clks R8A7790_CLK_SDHI0>;
dmas = <&dmac1 0xcd>, <&dmac1 0xce>;
dma-names = "tx", "rx";
+ max-frequency = <156000000>;
power-domains = <&cpg_clocks>;
status = "disabled";
};
@@ -600,6 +601,7 @@
clocks = <&mstp3_clks R8A7790_CLK_SDHI1>;
dmas = <&dmac1 0xc9>, <&dmac1 0xca>;
dma-names = "tx", "rx";
+ max-frequency = <156000000>;
power-domains = <&cpg_clocks>;
status = "disabled";
};
@@ -611,6 +613,7 @@
clocks = <&mstp3_clks R8A7790_CLK_SDHI2>;
dmas = <&dmac1 0xc1>, <&dmac1 0xc2>;
dma-names = "tx", "rx";
+ max-frequency = <97500000>;
power-domains = <&cpg_clocks>;
status = "disabled";
};
@@ -622,6 +625,7 @@
clocks = <&mstp3_clks R8A7790_CLK_SDHI3>;
dmas = <&dmac1 0xd3>, <&dmac1 0xd4>;
dma-names = "tx", "rx";
+ max-frequency = <97500000>;
power-domains = <&cpg_clocks>;
status = "disabled";
};
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 18/22] ARM: dts: r8a7790: lager: Enable UHS-I SDR-50
2016-04-25 4:27 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.7 Simon Horman
` (16 preceding siblings ...)
2016-04-25 4:27 ` [PATCH 17/22] ARM: dts: r8a7790: Set maximum frequencies for SDHI clocks Simon Horman
@ 2016-04-25 4:27 ` Simon Horman
2016-04-25 4:27 ` [PATCH 19/22] ARM: dts: kzm9g: Configure NMI key as wake-up source Simon Horman
` (4 subsequent siblings)
22 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-04-25 4:27 UTC (permalink / raw)
To: linux-arm-kernel
From: Wolfram Sang <wsa+renesas@sang-engineering.com>
Add the "1v8" pinctrl state and sd-uhs-sdr50 property to SDHI{0,2}.
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7790-lager.dts | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 823a119cb1b4..749ba02b6a53 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -345,11 +345,25 @@
sdhi0_pins: sd0 {
groups = "sdhi0_data4", "sdhi0_ctrl";
function = "sdhi0";
+ power-source = <3300>;
+ };
+
+ sdhi0_pins_uhs: sd0_uhs {
+ groups = "sdhi0_data4", "sdhi0_ctrl";
+ function = "sdhi0";
+ power-source = <1800>;
};
sdhi2_pins: sd2 {
groups = "sdhi2_data4", "sdhi2_ctrl";
function = "sdhi2";
+ power-source = <3300>;
+ };
+
+ sdhi2_pins_uhs: sd2_uhs {
+ groups = "sdhi2_data4", "sdhi2_ctrl";
+ function = "sdhi2";
+ power-source = <1800>;
};
mmc1_pins: mmc1 {
@@ -538,21 +552,25 @@
&sdhi0 {
pinctrl-0 = <&sdhi0_pins>;
- pinctrl-names = "default";
+ pinctrl-1 = <&sdhi0_pins_uhs>;
+ pinctrl-names = "default", "state_uhs";
vmmc-supply = <&vcc_sdhi0>;
vqmmc-supply = <&vccq_sdhi0>;
cd-gpios = <&gpio3 6 GPIO_ACTIVE_LOW>;
+ sd-uhs-sdr50;
status = "okay";
};
&sdhi2 {
pinctrl-0 = <&sdhi2_pins>;
- pinctrl-names = "default";
+ pinctrl-1 = <&sdhi2_pins_uhs>;
+ pinctrl-names = "default", "state_uhs";
vmmc-supply = <&vcc_sdhi2>;
vqmmc-supply = <&vccq_sdhi2>;
cd-gpios = <&gpio3 22 GPIO_ACTIVE_LOW>;
+ sd-uhs-sdr50;
status = "okay";
};
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 19/22] ARM: dts: kzm9g: Configure NMI key as wake-up source
2016-04-25 4:27 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.7 Simon Horman
` (17 preceding siblings ...)
2016-04-25 4:27 ` [PATCH 18/22] ARM: dts: r8a7790: lager: Enable UHS-I SDR-50 Simon Horman
@ 2016-04-25 4:27 ` Simon Horman
2016-04-25 4:27 ` [PATCH 20/22] ARM: dts: r8a7790: fix max-frequency for SDHI Simon Horman
` (3 subsequent siblings)
22 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-04-25 4:27 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Add a GPIO key with wake-up capability for the NMI button.
This allows to wake up the system from s2ram without relying on the
buttons on the optional switch board.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/sh73a0-kzm9g.dts | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm/boot/dts/sh73a0-kzm9g.dts b/arch/arm/boot/dts/sh73a0-kzm9g.dts
index e40a2f23b6cd..c2d8a080e392 100644
--- a/arch/arm/boot/dts/sh73a0-kzm9g.dts
+++ b/arch/arm/boot/dts/sh73a0-kzm9g.dts
@@ -149,6 +149,13 @@
label = "SW1";
wakeup-source;
};
+
+ wakeup-key {
+ gpios = <&pfc 159 GPIO_ACTIVE_LOW>;
+ linux,code = <KEY_WAKEUP>;
+ label = "NMI";
+ wakeup-source;
+ };
};
sound {
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 20/22] ARM: dts: r8a7790: fix max-frequency for SDHI
2016-04-25 4:27 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.7 Simon Horman
` (18 preceding siblings ...)
2016-04-25 4:27 ` [PATCH 19/22] ARM: dts: kzm9g: Configure NMI key as wake-up source Simon Horman
@ 2016-04-25 4:27 ` Simon Horman
2016-04-25 4:27 ` [PATCH 21/22] ARM: dts: r8a7793: Add SDHI controllers Simon Horman
` (2 subsequent siblings)
22 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-04-25 4:27 UTC (permalink / raw)
To: linux-arm-kernel
From: Wolfram Sang <wsa+renesas@sang-engineering.com>
The wrong values come from an old datasheet (H2 v0.6). Anything later
has the fixed value of 195MHz (H2 v0.7 up to Gen2-common V2.0).
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7790.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index b920facb0c3b..776a2aed81d2 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -589,7 +589,7 @@
clocks = <&mstp3_clks R8A7790_CLK_SDHI0>;
dmas = <&dmac1 0xcd>, <&dmac1 0xce>;
dma-names = "tx", "rx";
- max-frequency = <156000000>;
+ max-frequency = <195000000>;
power-domains = <&cpg_clocks>;
status = "disabled";
};
@@ -601,7 +601,7 @@
clocks = <&mstp3_clks R8A7790_CLK_SDHI1>;
dmas = <&dmac1 0xc9>, <&dmac1 0xca>;
dma-names = "tx", "rx";
- max-frequency = <156000000>;
+ max-frequency = <195000000>;
power-domains = <&cpg_clocks>;
status = "disabled";
};
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 21/22] ARM: dts: r8a7793: Add SDHI controllers
2016-04-25 4:27 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.7 Simon Horman
` (19 preceding siblings ...)
2016-04-25 4:27 ` [PATCH 20/22] ARM: dts: r8a7790: fix max-frequency for SDHI Simon Horman
@ 2016-04-25 4:27 ` Simon Horman
2016-04-25 4:27 ` [PATCH 22/22] ARM: dts: gose: Enable " Simon Horman
2016-04-25 21:02 ` [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.7 Arnd Bergmann
22 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-04-25 4:27 UTC (permalink / raw)
To: linux-arm-kernel
From: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Same as on r8a7791.
Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7793.dtsi | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi
index bddc31283bd9..6186179fd66d 100644
--- a/arch/arm/boot/dts/r8a7793.dtsi
+++ b/arch/arm/boot/dts/r8a7793.dtsi
@@ -507,6 +507,39 @@
reg = <0 0xe6060000 0 0x250>;
};
+ sdhi0: sd at ee100000 {
+ compatible = "renesas,sdhi-r8a7793";
+ reg = <0 0xee100000 0 0x328>;
+ interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp3_clks R8A7793_CLK_SDHI0>;
+ dmas = <&dmac0 0xcd>, <&dmac0 0xce>;
+ dma-names = "tx", "rx";
+ power-domains = <&cpg_clocks>;
+ status = "disabled";
+ };
+
+ sdhi1: sd at ee140000 {
+ compatible = "renesas,sdhi-r8a7793";
+ reg = <0 0xee140000 0 0x100>;
+ interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp3_clks R8A7793_CLK_SDHI1>;
+ dmas = <&dmac0 0xc1>, <&dmac0 0xc2>;
+ dma-names = "tx", "rx";
+ power-domains = <&cpg_clocks>;
+ status = "disabled";
+ };
+
+ sdhi2: sd at ee160000 {
+ compatible = "renesas,sdhi-r8a7793";
+ reg = <0 0xee160000 0 0x100>;
+ interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp3_clks R8A7793_CLK_SDHI2>;
+ dmas = <&dmac0 0xd3>, <&dmac0 0xd4>;
+ dma-names = "tx", "rx";
+ power-domains = <&cpg_clocks>;
+ status = "disabled";
+ };
+
scifa0: serial at e6c40000 {
compatible = "renesas,scifa-r8a7793",
"renesas,rcar-gen2-scifa", "renesas,scifa";
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 22/22] ARM: dts: gose: Enable SDHI controllers
2016-04-25 4:27 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.7 Simon Horman
` (20 preceding siblings ...)
2016-04-25 4:27 ` [PATCH 21/22] ARM: dts: r8a7793: Add SDHI controllers Simon Horman
@ 2016-04-25 4:27 ` Simon Horman
2016-04-25 21:02 ` [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.7 Arnd Bergmann
22 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-04-25 4:27 UTC (permalink / raw)
To: linux-arm-kernel
From: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Includes regulator and pin assignments.
Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7793-gose.dts | 119 +++++++++++++++++++++++++++++++++++++
1 file changed, 119 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7793-gose.dts b/arch/arm/boot/dts/r8a7793-gose.dts
index 3cd1c804621f..0ebc3ee34923 100644
--- a/arch/arm/boot/dts/r8a7793-gose.dts
+++ b/arch/arm/boot/dts/r8a7793-gose.dts
@@ -158,6 +158,78 @@
};
};
+ vcc_sdhi0: regulator at 0 {
+ compatible = "regulator-fixed";
+
+ regulator-name = "SDHI0 Vcc";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+
+ gpio = <&gpio7 17 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
+ };
+
+ vccq_sdhi0: regulator at 1 {
+ compatible = "regulator-gpio";
+
+ regulator-name = "SDHI0 VccQ";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+
+ gpios = <&gpio2 12 GPIO_ACTIVE_HIGH>;
+ gpios-states = <1>;
+ states = <3300000 1
+ 1800000 0>;
+ };
+
+ vcc_sdhi1: regulator at 2 {
+ compatible = "regulator-fixed";
+
+ regulator-name = "SDHI1 Vcc";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+
+ gpio = <&gpio7 18 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
+ };
+
+ vccq_sdhi1: regulator at 3 {
+ compatible = "regulator-gpio";
+
+ regulator-name = "SDHI1 VccQ";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+
+ gpios = <&gpio2 13 GPIO_ACTIVE_HIGH>;
+ gpios-states = <1>;
+ states = <3300000 1
+ 1800000 0>;
+ };
+
+ vcc_sdhi2: regulator at 4 {
+ compatible = "regulator-fixed";
+
+ regulator-name = "SDHI2 Vcc";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+
+ gpio = <&gpio7 19 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
+ };
+
+ vccq_sdhi2: regulator at 5 {
+ compatible = "regulator-gpio";
+
+ regulator-name = "SDHI2 VccQ";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+
+ gpios = <&gpio2 26 GPIO_ACTIVE_HIGH>;
+ gpios-states = <1>;
+ states = <3300000 1
+ 1800000 0>;
+ };
+
audio_clock: audio_clock {
compatible = "fixed-clock";
#clock-cells = <0>;
@@ -273,6 +345,21 @@
function = "intc";
};
+ sdhi0_pins: sd0 {
+ renesas,groups = "sdhi0_data4", "sdhi0_ctrl";
+ renesas,function = "sdhi0";
+ };
+
+ sdhi1_pins: sd1 {
+ renesas,groups = "sdhi1_data4", "sdhi1_ctrl";
+ renesas,function = "sdhi1";
+ };
+
+ sdhi2_pins: sd2 {
+ renesas,groups = "sdhi2_data4", "sdhi2_ctrl";
+ renesas,function = "sdhi2";
+ };
+
qspi_pins: spi0 {
groups = "qspi_ctrl", "qspi_data4";
function = "qspi";
@@ -328,6 +415,38 @@
status = "okay";
};
+&sdhi0 {
+ pinctrl-0 = <&sdhi0_pins>;
+ pinctrl-names = "default";
+
+ vmmc-supply = <&vcc_sdhi0>;
+ vqmmc-supply = <&vccq_sdhi0>;
+ cd-gpios = <&gpio6 6 GPIO_ACTIVE_LOW>;
+ wp-gpios = <&gpio6 7 GPIO_ACTIVE_HIGH>;
+ status = "okay";
+};
+
+&sdhi1 {
+ pinctrl-0 = <&sdhi1_pins>;
+ pinctrl-names = "default";
+
+ vmmc-supply = <&vcc_sdhi1>;
+ vqmmc-supply = <&vccq_sdhi1>;
+ cd-gpios = <&gpio6 14 GPIO_ACTIVE_LOW>;
+ wp-gpios = <&gpio6 15 GPIO_ACTIVE_HIGH>;
+ status = "okay";
+};
+
+&sdhi2 {
+ pinctrl-0 = <&sdhi2_pins>;
+ pinctrl-names = "default";
+
+ vmmc-supply = <&vcc_sdhi2>;
+ vqmmc-supply = <&vccq_sdhi2>;
+ cd-gpios = <&gpio6 22 GPIO_ACTIVE_LOW>;
+ status = "okay";
+};
+
&qspi {
pinctrl-0 = <&qspi_pins>;
pinctrl-names = "default";
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.7
2016-04-25 4:27 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.7 Simon Horman
` (21 preceding siblings ...)
2016-04-25 4:27 ` [PATCH 22/22] ARM: dts: gose: Enable " Simon Horman
@ 2016-04-25 21:02 ` Arnd Bergmann
2016-04-26 7:30 ` Geert Uytterhoeven
22 siblings, 1 reply; 29+ messages in thread
From: Arnd Bergmann @ 2016-04-25 21:02 UTC (permalink / raw)
To: linux-arm-kernel
On Monday 25 April 2016 14:27:31 Simon Horman wrote:
> Renesas ARM Based SoC DT Updates for v4.7
>
> * Configure NMI key as wakeup source in DT of kzm9g board
> * Add SDHI support to DT of gose board
> * Add support of UHS-I SDR-50 for SDHI to DT of r8a7790 SoC
> * Correct interrupt type for ARM TWD in DT of r8a7779 and sh73a0 SoCs
> * Add IIC support to DT of r8a7794 SoC
> * Add CAN support to DT of r8a7793 and r8a7794 SoCs
> * Add SCIF2 support to r8a7790 device tree
> * Use CAN, JPU and USB3.0 fallback compatibility string
> in DT of r8a7791 and r8a7790 SoCs
>
Pulled into next/dt, thanks!
Arnd
^ permalink raw reply [flat|nested] 29+ messages in thread* [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.7
2016-04-25 21:02 ` [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.7 Arnd Bergmann
@ 2016-04-26 7:30 ` Geert Uytterhoeven
2016-04-26 8:12 ` Arnd Bergmann
0 siblings, 1 reply; 29+ messages in thread
From: Geert Uytterhoeven @ 2016-04-26 7:30 UTC (permalink / raw)
To: linux-arm-kernel
Hi Arnd,
On Mon, Apr 25, 2016 at 11:02 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> On Monday 25 April 2016 14:27:31 Simon Horman wrote:
>> Renesas ARM Based SoC DT Updates for v4.7
>>
>> * Configure NMI key as wakeup source in DT of kzm9g board
>> * Add SDHI support to DT of gose board
>> * Add support of UHS-I SDR-50 for SDHI to DT of r8a7790 SoC
>> * Correct interrupt type for ARM TWD in DT of r8a7779 and sh73a0 SoCs
>> * Add IIC support to DT of r8a7794 SoC
>> * Add CAN support to DT of r8a7793 and r8a7794 SoCs
>> * Add SCIF2 support to r8a7790 device tree
>> * Use CAN, JPU and USB3.0 fallback compatibility string
>> in DT of r8a7791 and r8a7790 SoCs
>
> Pulled into next/dt, thanks!
Commit 93fafa81cad3da9c ("Merge branches 'next/dt' and 'next/dt64' into
for-next") accidentally re-added the line
clock-output-names = "can_clk";
to arch/arm/boot/dts/r8a7791.dtsi, which was removed in commit
f617604fe5d74b9c ("ARM: dts: r8a7791: Remove unnecessary
clock-output-names properties") before. It seems the same wrong
conflict resolution was made before in commit ef3b08c6c0d85753 ("Merge
branch 'fixes' into for-next").
While this won't cause failures, can you please remove the offending
line?
Thanks!
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] 29+ messages in thread* [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.7
2016-04-26 7:30 ` Geert Uytterhoeven
@ 2016-04-26 8:12 ` Arnd Bergmann
2016-04-26 8:32 ` Geert Uytterhoeven
0 siblings, 1 reply; 29+ messages in thread
From: Arnd Bergmann @ 2016-04-26 8:12 UTC (permalink / raw)
To: linux-arm-kernel
On Tuesday 26 April 2016 09:30:45 Geert Uytterhoeven wrote:
>
> Commit 93fafa81cad3da9c ("Merge branches 'next/dt' and 'next/dt64' into
> for-next") accidentally re-added the line
>
> clock-output-names = "can_clk";
>
> to arch/arm/boot/dts/r8a7791.dtsi, which was removed in commit
> f617604fe5d74b9c ("ARM: dts: r8a7791: Remove unnecessary
> clock-output-names properties") before. It seems the same wrong
> conflict resolution was made before in commit ef3b08c6c0d85753 ("Merge
> branch 'fixes' into for-next").
>
> While this won't cause failures, can you please remove the offending
> line?
>
I've merged renesas-fixes-for-v4.6 into next/dt now to resolve
the conflict there, otherwise Linus would have to do the same resolution
during the merge window.
Thanks for letting us know. If you want to verify my new resolution,
please look at next/dt, which is the more important branch.
Arnd
^ permalink raw reply [flat|nested] 29+ messages in thread* [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.7
2016-04-26 8:12 ` Arnd Bergmann
@ 2016-04-26 8:32 ` Geert Uytterhoeven
2016-04-26 10:41 ` Arnd Bergmann
0 siblings, 1 reply; 29+ messages in thread
From: Geert Uytterhoeven @ 2016-04-26 8:32 UTC (permalink / raw)
To: linux-arm-kernel
Hi Arnd,
On Tue, Apr 26, 2016 at 10:12 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> On Tuesday 26 April 2016 09:30:45 Geert Uytterhoeven wrote:
>> Commit 93fafa81cad3da9c ("Merge branches 'next/dt' and 'next/dt64' into
>> for-next") accidentally re-added the line
>>
>> clock-output-names = "can_clk";
>>
>> to arch/arm/boot/dts/r8a7791.dtsi, which was removed in commit
>> f617604fe5d74b9c ("ARM: dts: r8a7791: Remove unnecessary
>> clock-output-names properties") before. It seems the same wrong
>> conflict resolution was made before in commit ef3b08c6c0d85753 ("Merge
>> branch 'fixes' into for-next").
>>
>> While this won't cause failures, can you please remove the offending
>> line?
>
> I've merged renesas-fixes-for-v4.6 into next/dt now to resolve
> the conflict there, otherwise Linus would have to do the same resolution
> during the merge window.
>
> Thanks for letting us know. If you want to verify my new resolution,
> please look at next/dt, which is the more important branch.
Thanks, but unfortunately your new merge resolution is incorrect, as it revived
the line
status = "disabled";
for the pcie_bus node.
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] 29+ messages in thread* [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.7
2016-04-26 8:32 ` Geert Uytterhoeven
@ 2016-04-26 10:41 ` Arnd Bergmann
2016-04-26 11:22 ` Geert Uytterhoeven
0 siblings, 1 reply; 29+ messages in thread
From: Arnd Bergmann @ 2016-04-26 10:41 UTC (permalink / raw)
To: linux-arm-kernel
On Tuesday 26 April 2016 10:32:39 Geert Uytterhoeven wrote:
> Hi Arnd,
>
> On Tue, Apr 26, 2016 at 10:12 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> > On Tuesday 26 April 2016 09:30:45 Geert Uytterhoeven wrote:
> >> Commit 93fafa81cad3da9c ("Merge branches 'next/dt' and 'next/dt64' into
> >> for-next") accidentally re-added the line
> >>
> >> clock-output-names = "can_clk";
> >>
> >> to arch/arm/boot/dts/r8a7791.dtsi, which was removed in commit
> >> f617604fe5d74b9c ("ARM: dts: r8a7791: Remove unnecessary
> >> clock-output-names properties") before. It seems the same wrong
> >> conflict resolution was made before in commit ef3b08c6c0d85753 ("Merge
> >> branch 'fixes' into for-next").
> >>
> >> While this won't cause failures, can you please remove the offending
> >> line?
> >
> > I've merged renesas-fixes-for-v4.6 into next/dt now to resolve
> > the conflict there, otherwise Linus would have to do the same resolution
> > during the merge window.
> >
> > Thanks for letting us know. If you want to verify my new resolution,
> > please look at next/dt, which is the more important branch.
>
> Thanks, but unfortunately your new merge resolution is incorrect, as it revived
> the line
>
> status = "disabled";
>
> for the pcie_bus node.
>
I've done the merge once more, noticed my mistake (vimdiff syntax
coloring was slightly misleading) and fixed it.
Arnd
^ permalink raw reply [flat|nested] 29+ messages in thread* [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.7
2016-04-26 10:41 ` Arnd Bergmann
@ 2016-04-26 11:22 ` Geert Uytterhoeven
0 siblings, 0 replies; 29+ messages in thread
From: Geert Uytterhoeven @ 2016-04-26 11:22 UTC (permalink / raw)
To: linux-arm-kernel
Hi Arnd,
On Tue, Apr 26, 2016 at 12:41 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> On Tuesday 26 April 2016 10:32:39 Geert Uytterhoeven wrote:
>> On Tue, Apr 26, 2016 at 10:12 AM, Arnd Bergmann <arnd@arndb.de> wrote:
>> > On Tuesday 26 April 2016 09:30:45 Geert Uytterhoeven wrote:
>> >> Commit 93fafa81cad3da9c ("Merge branches 'next/dt' and 'next/dt64' into
>> >> for-next") accidentally re-added the line
>> >>
>> >> clock-output-names = "can_clk";
>> >>
>> >> to arch/arm/boot/dts/r8a7791.dtsi, which was removed in commit
>> >> f617604fe5d74b9c ("ARM: dts: r8a7791: Remove unnecessary
>> >> clock-output-names properties") before. It seems the same wrong
>> >> conflict resolution was made before in commit ef3b08c6c0d85753 ("Merge
>> >> branch 'fixes' into for-next").
>> >>
>> >> While this won't cause failures, can you please remove the offending
>> >> line?
>> >
>> > I've merged renesas-fixes-for-v4.6 into next/dt now to resolve
>> > the conflict there, otherwise Linus would have to do the same resolution
>> > during the merge window.
>> >
>> > Thanks for letting us know. If you want to verify my new resolution,
>> > please look at next/dt, which is the more important branch.
>>
>> Thanks, but unfortunately your new merge resolution is incorrect, as it revived
>> the line
>>
>> status = "disabled";
>>
>> for the pcie_bus node.
>
> I've done the merge once more, noticed my mistake (vimdiff syntax
> coloring was slightly misleading) and fixed it.
Thanks, that looks correct now!
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] 29+ messages in thread