* [PATCH 01/28] ARM: shmobile: Add silk device tree bindings documentation
2015-10-07 1:58 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.4 Simon Horman
@ 2015-10-07 1:57 ` Simon Horman
2015-10-07 1:57 ` [PATCH 02/28] ARM: shmobile: r8a7794: add GPIO clocks Simon Horman
` (27 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Simon Horman @ 2015-10-07 1:57 UTC (permalink / raw)
To: linux-arm-kernel
Add Silk Device tree bindings Documentation, listing it as a supported board.
This allows to use checkpatch to validate DTSes referring to the Silk board.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
Documentation/devicetree/bindings/arm/shmobile.txt | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/devicetree/bindings/arm/shmobile.txt b/Documentation/devicetree/bindings/arm/shmobile.txt
index 2b9cb62838f2..1d70e78e7c80 100644
--- a/Documentation/devicetree/bindings/arm/shmobile.txt
+++ b/Documentation/devicetree/bindings/arm/shmobile.txt
@@ -55,3 +55,5 @@ Boards:
compatible = "renesas,lager", "renesas,r8a7790"
- Marzen
compatible = "renesas,marzen", "renesas,r8a7779"
+ - Silk
+ compatible = "renesas,silk", "renesas,r8a7794";
--
2.1.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 02/28] ARM: shmobile: r8a7794: add GPIO clocks
2015-10-07 1:58 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.4 Simon Horman
2015-10-07 1:57 ` [PATCH 01/28] ARM: shmobile: Add silk device tree bindings documentation Simon Horman
@ 2015-10-07 1:57 ` Simon Horman
2015-10-07 1:57 ` [PATCH 03/28] ARM: shmobile: r8a7794: add GPIO DT support Simon Horman
` (26 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Simon Horman @ 2015-10-07 1:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Describe the GPIO clocks in the R8A7794 device tree.
Based on the original patch by Koji Matsuoka <koji.matsuoka.xm@renesas.com>.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7794.dtsi | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index 97c8e9ace5eb..b6db773b9e55 100644
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -749,16 +749,22 @@
mstp9_clks: mstp9_clks@e6150994 {
compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
reg = <0 0xe6150994 0 4>, <0 0xe61509a4 0 4>;
- clocks = <&cpg_clocks R8A7794_CLK_QSPI>, <&hp_clk>, <&hp_clk>,
- <&hp_clk>, <&hp_clk>, <&hp_clk>, <&hp_clk>;
+ 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>;
#clock-cells = <1>;
- clock-indices = <
- R8A7794_CLK_QSPI_MOD R8A7794_CLK_I2C5 R8A7794_CLK_I2C4
- R8A7794_CLK_I2C3 R8A7794_CLK_I2C2 R8A7794_CLK_I2C1
- R8A7794_CLK_I2C0
- >;
+ 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_I2C5 R8A7794_CLK_I2C4
+ R8A7794_CLK_I2C3 R8A7794_CLK_I2C2
+ R8A7794_CLK_I2C1 R8A7794_CLK_I2C0>;
clock-output-names - "qspi_mod", "i2c5", "i2c4", "i2c3", "i2c2", "i2c1", "i2c0";
+ "gpio6", "gpio5", "gpio4", "gpio3", "gpio2",
+ "gpio1", "gpio0", "qspi_mod",
+ "i2c5", "i2c4", "i2c3", "i2c2", "i2c1", "i2c0";
};
mstp11_clks: mstp11_clks@e615099c {
compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
--
2.1.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 03/28] ARM: shmobile: r8a7794: add GPIO DT support
2015-10-07 1:58 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.4 Simon Horman
2015-10-07 1:57 ` [PATCH 01/28] ARM: shmobile: Add silk device tree bindings documentation Simon Horman
2015-10-07 1:57 ` [PATCH 02/28] ARM: shmobile: r8a7794: add GPIO clocks Simon Horman
@ 2015-10-07 1:57 ` Simon Horman
2015-10-07 1:57 ` [PATCH 04/28] ARM: shmobile: r8a7794: add QSPI " Simon Horman
` (25 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Simon Horman @ 2015-10-07 1:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Describe GPIO[0-6] controllers in the R8A7794 device tree.
Based on original patch by Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7794.dtsi | 91 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 91 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index b6db773b9e55..e9fab31e0709 100644
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -50,6 +50,97 @@
interrupts = <1 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;
};
+ gpio0: gpio@e6050000 {
+ compatible = "renesas,gpio-r8a7794", "renesas,gpio-rcar";
+ reg = <0 0xe6050000 0 0x50>;
+ interrupts = <0 4 IRQ_TYPE_LEVEL_HIGH>;
+ #gpio-cells = <2>;
+ gpio-controller;
+ gpio-ranges = <&pfc 0 0 32>;
+ #interrupt-cells = <2>;
+ interrupt-controller;
+ clocks = <&mstp9_clks R8A7794_CLK_GPIO0>;
+ power-domains = <&cpg_clocks>;
+ };
+
+ gpio1: gpio@e6051000 {
+ compatible = "renesas,gpio-r8a7794", "renesas,gpio-rcar";
+ reg = <0 0xe6051000 0 0x50>;
+ interrupts = <0 5 IRQ_TYPE_LEVEL_HIGH>;
+ #gpio-cells = <2>;
+ gpio-controller;
+ gpio-ranges = <&pfc 0 32 26>;
+ #interrupt-cells = <2>;
+ interrupt-controller;
+ clocks = <&mstp9_clks R8A7794_CLK_GPIO1>;
+ power-domains = <&cpg_clocks>;
+ };
+
+ gpio2: gpio@e6052000 {
+ compatible = "renesas,gpio-r8a7794", "renesas,gpio-rcar";
+ reg = <0 0xe6052000 0 0x50>;
+ interrupts = <0 6 IRQ_TYPE_LEVEL_HIGH>;
+ #gpio-cells = <2>;
+ gpio-controller;
+ gpio-ranges = <&pfc 0 64 32>;
+ #interrupt-cells = <2>;
+ interrupt-controller;
+ clocks = <&mstp9_clks R8A7794_CLK_GPIO2>;
+ power-domains = <&cpg_clocks>;
+ };
+
+ gpio3: gpio@e6053000 {
+ compatible = "renesas,gpio-r8a7794", "renesas,gpio-rcar";
+ reg = <0 0xe6053000 0 0x50>;
+ interrupts = <0 7 IRQ_TYPE_LEVEL_HIGH>;
+ #gpio-cells = <2>;
+ gpio-controller;
+ gpio-ranges = <&pfc 0 96 32>;
+ #interrupt-cells = <2>;
+ interrupt-controller;
+ clocks = <&mstp9_clks R8A7794_CLK_GPIO3>;
+ power-domains = <&cpg_clocks>;
+ };
+
+ gpio4: gpio@e6054000 {
+ compatible = "renesas,gpio-r8a7794", "renesas,gpio-rcar";
+ reg = <0 0xe6054000 0 0x50>;
+ interrupts = <0 8 IRQ_TYPE_LEVEL_HIGH>;
+ #gpio-cells = <2>;
+ gpio-controller;
+ gpio-ranges = <&pfc 0 128 32>;
+ #interrupt-cells = <2>;
+ interrupt-controller;
+ clocks = <&mstp9_clks R8A7794_CLK_GPIO4>;
+ power-domains = <&cpg_clocks>;
+ };
+
+ gpio5: gpio@e6055000 {
+ compatible = "renesas,gpio-r8a7794", "renesas,gpio-rcar";
+ reg = <0 0xe6055000 0 0x50>;
+ interrupts = <0 9 IRQ_TYPE_LEVEL_HIGH>;
+ #gpio-cells = <2>;
+ gpio-controller;
+ gpio-ranges = <&pfc 0 160 28>;
+ #interrupt-cells = <2>;
+ interrupt-controller;
+ clocks = <&mstp9_clks R8A7794_CLK_GPIO5>;
+ power-domains = <&cpg_clocks>;
+ };
+
+ gpio6: gpio@e6055400 {
+ compatible = "renesas,gpio-r8a7794", "renesas,gpio-rcar";
+ reg = <0 0xe6055400 0 0x50>;
+ interrupts = <0 10 IRQ_TYPE_LEVEL_HIGH>;
+ #gpio-cells = <2>;
+ gpio-controller;
+ gpio-ranges = <&pfc 0 192 26>;
+ #interrupt-cells = <2>;
+ interrupt-controller;
+ clocks = <&mstp9_clks R8A7794_CLK_GPIO6>;
+ power-domains = <&cpg_clocks>;
+ };
+
cmt0: timer@ffca0000 {
compatible = "renesas,cmt-48-gen2";
reg = <0 0xffca0000 0 0x1004>;
--
2.1.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 04/28] ARM: shmobile: r8a7794: add QSPI DT support
2015-10-07 1:58 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.4 Simon Horman
` (2 preceding siblings ...)
2015-10-07 1:57 ` [PATCH 03/28] ARM: shmobile: r8a7794: add GPIO DT support Simon Horman
@ 2015-10-07 1:57 ` Simon Horman
2015-10-07 1:57 ` [PATCH 05/28] ARM: shmobile: silk: " Simon Horman
` (24 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Simon Horman @ 2015-10-07 1:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Define the generic R8A7794 part of the QSPI device node.
Based on original patch by Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7794.dtsi | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index e9fab31e0709..e0f32ede2181 100644
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -19,6 +19,10 @@
#address-cells = <2>;
#size-cells = <2>;
+ aliases {
+ spi0 = &qspi;
+ };
+
cpus {
#address-cells = <1>;
#size-cells = <0>;
@@ -537,6 +541,20 @@
status = "disabled";
};
+ qspi: spi@e6b10000 {
+ compatible = "renesas,qspi-r8a7794", "renesas,qspi";
+ reg = <0 0xe6b10000 0 0x2c>;
+ interrupts = <0 184 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp9_clks R8A7794_CLK_QSPI_MOD>;
+ dmas = <&dmac0 0x17>, <&dmac0 0x18>;
+ dma-names = "tx", "rx";
+ power-domains = <&cpg_clocks>;
+ num-cs = <1>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "disabled";
+ };
+
clocks {
#address-cells = <2>;
#size-cells = <2>;
--
2.1.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 05/28] ARM: shmobile: silk: add QSPI DT support
2015-10-07 1:58 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.4 Simon Horman
` (3 preceding siblings ...)
2015-10-07 1:57 ` [PATCH 04/28] ARM: shmobile: r8a7794: add QSPI " Simon Horman
@ 2015-10-07 1:57 ` Simon Horman
2015-10-07 1:57 ` [PATCH 06/28] ARM: shmobile: marzen: Board specific serial port order Simon Horman
` (23 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Simon Horman @ 2015-10-07 1:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Define the SILK board dependent part of the QSPI device node.
Add device nodes for Spansion S25FL512S SPI flash and MTD partitions on it.
Based on the original patch by Vladimir Barinov
<vladimir.barinov@cogentembedded.com>.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7794-silk.dts | 40 ++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7794-silk.dts b/arch/arm/boot/dts/r8a7794-silk.dts
index d4dd5a30ccdf..f49bc00738a3 100644
--- a/arch/arm/boot/dts/r8a7794-silk.dts
+++ b/arch/arm/boot/dts/r8a7794-silk.dts
@@ -65,6 +65,11 @@
renesas,groups = "mmc_data8", "mmc_ctrl";
renesas,function = "mmc";
};
+
+ qspi_pins: spi0 {
+ renesas,groups = "qspi_ctrl", "qspi_data4";
+ renesas,function = "qspi";
+ };
};
&scif2 {
@@ -100,3 +105,38 @@
non-removable;
status = "okay";
};
+
+&qspi {
+ pinctrl-0 = <&qspi_pins>;
+ pinctrl-names = "default";
+
+ status = "okay";
+
+ flash@0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "spansion,s25fl512s", "jedec,spi-nor";
+ reg = <0>;
+ spi-max-frequency = <30000000>;
+ spi-tx-bus-width = <4>;
+ spi-rx-bus-width = <4>;
+ spi-cpol;
+ spi-cpha;
+ m25p,fast-read;
+
+ partition@0 {
+ label = "loader";
+ reg = <0x00000000 0x00040000>;
+ read-only;
+ };
+ partition@40000 {
+ label = "user";
+ reg = <0x00040000 0x00400000>;
+ read-only;
+ };
+ partition@440000 {
+ label = "flash";
+ reg = <0x00440000 0x03bc0000>;
+ };
+ };
+};
--
2.1.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 06/28] ARM: shmobile: marzen: Board specific serial port order
2015-10-07 1:58 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.4 Simon Horman
` (4 preceding siblings ...)
2015-10-07 1:57 ` [PATCH 05/28] ARM: shmobile: silk: " Simon Horman
@ 2015-10-07 1:57 ` Simon Horman
2015-10-07 1:57 ` [PATCH 07/28] ARM: shmobile: kzm9g dts: Use adxl345-specific compatible property Simon Horman
` (22 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Simon Horman @ 2015-10-07 1:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Convert Marzen to use board-specific serial0 and serial1 instead
of the older shared SoC-specific SCIF index.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7779-marzen.dts | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7779-marzen.dts b/arch/arm/boot/dts/r8a7779-marzen.dts
index 20afea6f06ef..fe396c8d58db 100644
--- a/arch/arm/boot/dts/r8a7779-marzen.dts
+++ b/arch/arm/boot/dts/r8a7779-marzen.dts
@@ -19,12 +19,12 @@
compatible = "renesas,marzen", "renesas,r8a7779";
aliases {
- serial2 = &scif2;
- serial4 = &scif4;
+ serial0 = &scif2;
+ serial1 = &scif4;
};
chosen {
- bootargs = "console=ttySC2,115200 ignore_loglevel root=/dev/nfs ip=on";
+ bootargs = "ignore_loglevel root=/dev/nfs ip=on";
stdout-path = &scif2;
};
--
2.1.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 07/28] ARM: shmobile: kzm9g dts: Use adxl345-specific compatible property
2015-10-07 1:58 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.4 Simon Horman
` (5 preceding siblings ...)
2015-10-07 1:57 ` [PATCH 06/28] ARM: shmobile: marzen: Board specific serial port order Simon Horman
@ 2015-10-07 1:57 ` Simon Horman
2015-10-07 1:57 ` [PATCH 08/28] ARM: shmobile: r8a7794: add I2C DT support Simon Horman
` (21 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Simon Horman @ 2015-10-07 1:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Replace the deprecated generic "adi,adxl34x" compatible value by the
adxl345-specific "adi,adxl345" value, cfr. commit e465bf6fc55d5ce2 ("DT:
i2c: Deprecate adi,adxl34x compatible string").
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/sh73a0-kzm9g.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/sh73a0-kzm9g.dts b/arch/arm/boot/dts/sh73a0-kzm9g.dts
index 24b4cd24dceb..7fc5602810ad 100644
--- a/arch/arm/boot/dts/sh73a0-kzm9g.dts
+++ b/arch/arm/boot/dts/sh73a0-kzm9g.dts
@@ -206,7 +206,7 @@
};
accelerometer@1d {
- compatible = "adi,adxl34x";
+ compatible = "adi,adxl345";
reg = <0x1d>;
interrupt-parent = <&irqpin3>;
interrupts = <2 IRQ_TYPE_LEVEL_HIGH>,
--
2.1.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 08/28] ARM: shmobile: r8a7794: add I2C DT support
2015-10-07 1:58 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.4 Simon Horman
` (6 preceding siblings ...)
2015-10-07 1:57 ` [PATCH 07/28] ARM: shmobile: kzm9g dts: Use adxl345-specific compatible property Simon Horman
@ 2015-10-07 1:57 ` Simon Horman
2015-10-07 1:57 ` [PATCH 09/28] ARM: shmobile: silk: add I2C1 " Simon Horman
` (20 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Simon Horman @ 2015-10-07 1:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Define the generic R8A7794 parts of the I2C[0-5] device nodes.
Based on the original patch by Koji Matsuoka <koji.matsuoka.xm@renesas.com>.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7794.dtsi | 73 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 73 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index e0f32ede2181..7384db2a3992 100644
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -20,6 +20,12 @@
#size-cells = <2>;
aliases {
+ i2c0 = &i2c0;
+ i2c1 = &i2c1;
+ i2c2 = &i2c2;
+ i2c3 = &i2c3;
+ i2c4 = &i2c4;
+ i2c5 = &i2c5;
spi0 = &qspi;
};
@@ -502,6 +508,73 @@
status = "disabled";
};
+ /* The memory map in the User's Manual maps the cores to bus numbers */
+ i2c0: i2c@e6508000 {
+ compatible = "renesas,i2c-r8a7794";
+ reg = <0 0xe6508000 0 0x40>;
+ interrupts = <0 287 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp9_clks R8A7794_CLK_I2C0>;
+ power-domains = <&cpg_clocks>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "disabled";
+ };
+
+ i2c1: i2c@e6518000 {
+ compatible = "renesas,i2c-r8a7794";
+ reg = <0 0xe6518000 0 0x40>;
+ interrupts = <0 288 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp9_clks R8A7794_CLK_I2C1>;
+ power-domains = <&cpg_clocks>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "disabled";
+ };
+
+ i2c2: i2c@e6530000 {
+ compatible = "renesas,i2c-r8a7794";
+ reg = <0 0xe6530000 0 0x40>;
+ interrupts = <0 286 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp9_clks R8A7794_CLK_I2C2>;
+ power-domains = <&cpg_clocks>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "disabled";
+ };
+
+ i2c3: i2c@e6540000 {
+ compatible = "renesas,i2c-r8a7794";
+ reg = <0 0xe6540000 0 0x40>;
+ interrupts = <0 290 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp9_clks R8A7794_CLK_I2C3>;
+ power-domains = <&cpg_clocks>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "disabled";
+ };
+
+ i2c4: i2c@e6520000 {
+ compatible = "renesas,i2c-r8a7794";
+ reg = <0 0xe6520000 0 0x40>;
+ interrupts = <0 19 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp9_clks R8A7794_CLK_I2C4>;
+ power-domains = <&cpg_clocks>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "disabled";
+ };
+
+ i2c5: i2c@e6528000 {
+ compatible = "renesas,i2c-r8a7794";
+ reg = <0 0xe6528000 0 0x40>;
+ interrupts = <0 20 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp9_clks R8A7794_CLK_I2C5>;
+ power-domains = <&cpg_clocks>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "disabled";
+ };
+
mmcif0: mmc@ee200000 {
compatible = "renesas,mmcif-r8a7794", "renesas,sh-mmcif";
reg = <0 0xee200000 0 0x80>;
--
2.1.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 09/28] ARM: shmobile: silk: add I2C1 DT support
2015-10-07 1:58 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.4 Simon Horman
` (7 preceding siblings ...)
2015-10-07 1:57 ` [PATCH 08/28] ARM: shmobile: r8a7794: add I2C DT support Simon Horman
@ 2015-10-07 1:57 ` Simon Horman
2015-10-07 1:57 ` [PATCH 10/28] ARM: shmobile: r8a7794: add VIN " Simon Horman
` (19 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Simon Horman @ 2015-10-07 1:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Define the SILK board dependent part of the I2C1 device node.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7794-silk.dts | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7794-silk.dts b/arch/arm/boot/dts/r8a7794-silk.dts
index f49bc00738a3..3f808724106e 100644
--- a/arch/arm/boot/dts/r8a7794-silk.dts
+++ b/arch/arm/boot/dts/r8a7794-silk.dts
@@ -61,6 +61,11 @@
renesas,function = "intc";
};
+ i2c1_pins: i2c1 {
+ renesas,groups = "i2c1";
+ renesas,function = "i2c1";
+ };
+
mmcif0_pins: mmcif0 {
renesas,groups = "mmc_data8", "mmc_ctrl";
renesas,function = "mmc";
@@ -95,6 +100,14 @@
};
};
+&i2c1 {
+ pinctrl-0 = <&i2c1_pins>;
+ pinctrl-names = "default";
+
+ status = "okay";
+ clock-frequency = <400000>;
+};
+
&mmcif0 {
pinctrl-0 = <&mmcif0_pins>;
pinctrl-names = "default";
--
2.1.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 10/28] ARM: shmobile: r8a7794: add VIN DT support
2015-10-07 1:58 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.4 Simon Horman
` (8 preceding siblings ...)
2015-10-07 1:57 ` [PATCH 09/28] ARM: shmobile: silk: add I2C1 " Simon Horman
@ 2015-10-07 1:57 ` Simon Horman
2015-10-07 1:57 ` [PATCH 11/28] ARM: shmobile: silk: add VIN0/ADV7180 " Simon Horman
` (18 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Simon Horman @ 2015-10-07 1:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Define the generic R8A7794 part of the VIN[01] device nodes. Add aliases for
the VIN[01] device nodes.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7794.dtsi | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index 7384db2a3992..e54f3dea2d70 100644
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -27,6 +27,8 @@
i2c4 = &i2c4;
i2c5 = &i2c5;
spi0 = &qspi;
+ vin0 = &vin0;
+ vin1 = &vin1;
};
cpus {
@@ -628,6 +630,24 @@
status = "disabled";
};
+ vin0: video@e6ef0000 {
+ compatible = "renesas,vin-r8a7794";
+ reg = <0 0xe6ef0000 0 0x1000>;
+ interrupts = <0 188 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp8_clks R8A7794_CLK_VIN0>;
+ power-domains = <&cpg_clocks>;
+ status = "disabled";
+ };
+
+ vin1: video@e6ef1000 {
+ compatible = "renesas,vin-r8a7794";
+ reg = <0 0xe6ef1000 0 0x1000>;
+ interrupts = <0 189 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp8_clks R8A7794_CLK_VIN1>;
+ power-domains = <&cpg_clocks>;
+ status = "disabled";
+ };
+
clocks {
#address-cells = <2>;
#size-cells = <2>;
--
2.1.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 11/28] ARM: shmobile: silk: add VIN0/ADV7180 DT support
2015-10-07 1:58 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.4 Simon Horman
` (9 preceding siblings ...)
2015-10-07 1:57 ` [PATCH 10/28] ARM: shmobile: r8a7794: add VIN " Simon Horman
@ 2015-10-07 1:57 ` Simon Horman
2015-10-07 1:57 ` [PATCH 12/28] ARM: shmobile: koelsch: use CCF for audio clock Simon Horman
` (17 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Simon Horman @ 2015-10-07 1:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Define the SILK board dependent part of the VIN0 device node.
Add the device node for Analog Devices ADV7180 video decoder to I2C1 bus.
Add the necessary subnodes to interconnect VIN0 and ADV7180 devices.
Based on the Henninger VIN0/ADV8170 device tree patch by myself.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7794-silk.dts | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7794-silk.dts b/arch/arm/boot/dts/r8a7794-silk.dts
index 3f808724106e..bb0a22423dc4 100644
--- a/arch/arm/boot/dts/r8a7794-silk.dts
+++ b/arch/arm/boot/dts/r8a7794-silk.dts
@@ -75,6 +75,11 @@
renesas,groups = "qspi_ctrl", "qspi_data4";
renesas,function = "qspi";
};
+
+ vin0_pins: vin0 {
+ renesas,groups = "vin0_data8", "vin0_clk";
+ renesas,function = "vin0";
+ };
};
&scif2 {
@@ -106,6 +111,19 @@
status = "okay";
clock-frequency = <400000>;
+
+ composite-in@20 {
+ compatible = "adi,adv7180";
+ reg = <0x20>;
+ remote = <&vin0>;
+
+ port {
+ adv7180: endpoint {
+ bus-width = <8>;
+ remote-endpoint = <&vin0ep>;
+ };
+ };
+ };
};
&mmcif0 {
@@ -153,3 +171,20 @@
};
};
};
+
+/* composite video input */
+&vin0 {
+ status = "okay";
+ pinctrl-0 = <&vin0_pins>;
+ pinctrl-names = "default";
+
+ port {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ vin0ep: endpoint {
+ remote-endpoint = <&adv7180>;
+ bus-width = <8>;
+ };
+ };
+};
--
2.1.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 12/28] ARM: shmobile: koelsch: use CCF for audio clock
2015-10-07 1:58 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.4 Simon Horman
` (10 preceding siblings ...)
2015-10-07 1:57 ` [PATCH 11/28] ARM: shmobile: silk: add VIN0/ADV7180 " Simon Horman
@ 2015-10-07 1:57 ` Simon Horman
2015-10-07 1:57 ` [PATCH 13/28] ARM: shmobile: lager: " Simon Horman
` (16 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Simon Horman @ 2015-10-07 1:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Because of historical reason, audio clock didn't use CCF.
Let's use it now.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7791-koelsch.dts | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index dc158845afdc..fc44ea361a4b 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -242,6 +242,13 @@
1800000 0>;
};
+ audio_clock: clock {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <11289600>;
+ clock-output-names = "audio_clock";
+ };
+
rsnd_ak4643: sound {
compatible = "simple-audio-card";
@@ -255,7 +262,7 @@
sndcodec: simple-audio-card,codec {
sound-dai = <&ak4643>;
- system-clock-frequency = <11289600>;
+ clocks = <&audio_clock>;
};
};
--
2.1.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 13/28] ARM: shmobile: lager: use CCF for audio clock
2015-10-07 1:58 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.4 Simon Horman
` (11 preceding siblings ...)
2015-10-07 1:57 ` [PATCH 12/28] ARM: shmobile: koelsch: use CCF for audio clock Simon Horman
@ 2015-10-07 1:57 ` Simon Horman
2015-10-07 1:57 ` [PATCH 14/28] ARM: shmobile: r8a7790: tidyup SSI resource region Simon Horman
` (15 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Simon Horman @ 2015-10-07 1:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Because of historical reason, audio clock didn't use CCF.
Let's use it now.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7790-lager.dts | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 37dec5269491..6f5d7f50d5ca 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -174,6 +174,13 @@
1800000 0>;
};
+ audio_clock: clock {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <11289600>;
+ clock-output-names = "audio_clock";
+ };
+
rsnd_ak4643: sound {
compatible = "simple-audio-card";
@@ -187,7 +194,7 @@
sndcodec: simple-audio-card,codec {
sound-dai = <&ak4643>;
- system-clock-frequency = <11289600>;
+ clocks = <&audio_clock>;
};
};
--
2.1.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 14/28] ARM: shmobile: r8a7790: tidyup SSI resource region
2015-10-07 1:58 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.4 Simon Horman
` (12 preceding siblings ...)
2015-10-07 1:57 ` [PATCH 13/28] ARM: shmobile: lager: " Simon Horman
@ 2015-10-07 1:57 ` Simon Horman
2015-10-07 1:57 ` [PATCH 15/28] ARM: shmobile: r8a7791: " Simon Horman
` (14 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Simon Horman @ 2015-10-07 1:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
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 a0b2a79cbfbd..ae5eb281d43a 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -1599,7 +1599,7 @@
reg = <0 0xec500000 0 0x1000>, /* SCU */
<0 0xec5a0000 0 0x100>, /* ADG */
<0 0xec540000 0 0x1000>, /* SSIU */
- <0 0xec541000 0 0x1280>, /* SSI */
+ <0 0xec541000 0 0x280>, /* SSI */
<0 0xec740000 0 0x200>; /* Audio DMAC peri peri*/
reg-names = "scu", "adg", "ssiu", "ssi", "audmapp";
--
2.1.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 15/28] ARM: shmobile: r8a7791: tidyup SSI resource region
2015-10-07 1:58 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.4 Simon Horman
` (13 preceding siblings ...)
2015-10-07 1:57 ` [PATCH 14/28] ARM: shmobile: r8a7790: tidyup SSI resource region Simon Horman
@ 2015-10-07 1:57 ` Simon Horman
2015-10-07 1:57 ` [PATCH 16/28] ARM: shmobile: r8a7778: " Simon Horman
` (13 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Simon Horman @ 2015-10-07 1:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
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 831525dd39a6..3b8e26dde36d 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -1649,7 +1649,7 @@
reg = <0 0xec500000 0 0x1000>, /* SCU */
<0 0xec5a0000 0 0x100>, /* ADG */
<0 0xec540000 0 0x1000>, /* SSIU */
- <0 0xec541000 0 0x1280>, /* SSI */
+ <0 0xec541000 0 0x280>, /* SSI */
<0 0xec740000 0 0x200>; /* Audio DMAC peri peri*/
reg-names = "scu", "adg", "ssiu", "ssi", "audmapp";
--
2.1.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 16/28] ARM: shmobile: r8a7778: tidyup SSI resource region
2015-10-07 1:58 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.4 Simon Horman
` (14 preceding siblings ...)
2015-10-07 1:57 ` [PATCH 15/28] ARM: shmobile: r8a7791: " Simon Horman
@ 2015-10-07 1:57 ` Simon Horman
2015-10-07 1:57 ` [PATCH 17/28] ARM: shmobile: r8a7790: lager: add pinmux for iic0 Simon Horman
` (12 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Simon Horman @ 2015-10-07 1:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7778.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi
index 4b1fa9f42ad5..4f8e07811746 100644
--- a/arch/arm/boot/dts/r8a7778.dtsi
+++ b/arch/arm/boot/dts/r8a7778.dtsi
@@ -239,7 +239,7 @@
#sound-dai-cells = <1>;
compatible = "renesas,rcar_sound-r8a7778", "renesas,rcar_sound-gen1";
reg = <0xffd90000 0x1000>, /* SRU */
- <0xffd91000 0x1240>, /* SSI */
+ <0xffd91000 0x240>, /* SSI */
<0xfffe0000 0x24>; /* ADG */
clocks = <&mstp3_clks R8A7778_CLK_SSI8>,
<&mstp3_clks R8A7778_CLK_SSI7>,
--
2.1.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 17/28] ARM: shmobile: r8a7790: lager: add pinmux for iic0
2015-10-07 1:58 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.4 Simon Horman
` (15 preceding siblings ...)
2015-10-07 1:57 ` [PATCH 16/28] ARM: shmobile: r8a7778: " Simon Horman
@ 2015-10-07 1:57 ` Simon Horman
2015-10-07 1:57 ` [PATCH 18/28] ARM: shmobile: r8a7794: add internal PCI bridge nodes Simon Horman
` (11 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Simon Horman @ 2015-10-07 1:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Wolfram Sang <wsa@sang-engineering.com>
It seems we used to rely on the default pinmux setting of this HW, but
currently we need to explicitly set the pinmux to access this bus. It is
better style, too.
Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7790-lager.dts | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 6f5d7f50d5ca..c553abd711ee 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -342,6 +342,11 @@
renesas,function = "msiof1";
};
+ iic0_pins: iic0 {
+ renesas,groups = "iic0";
+ renesas,function = "iic0";
+ };
+
iic1_pins: iic1 {
renesas,groups = "iic1";
renesas,function = "iic1";
@@ -517,6 +522,8 @@
&iic0 {
status = "okay";
+ pinctrl-0 = <&iic0_pins>;
+ pinctrl-names = "default";
};
&iic1 {
--
2.1.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 18/28] ARM: shmobile: r8a7794: add internal PCI bridge nodes
2015-10-07 1:58 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.4 Simon Horman
` (16 preceding siblings ...)
2015-10-07 1:57 ` [PATCH 17/28] ARM: shmobile: r8a7790: lager: add pinmux for iic0 Simon Horman
@ 2015-10-07 1:57 ` Simon Horman
2015-10-07 1:57 ` [PATCH 19/28] ARM: shmobile: silk: enable internal PCI Simon Horman
` (10 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Simon Horman @ 2015-10-07 1:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Add device nodes for the R8A7794 internal PCI bridge devices.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7794.dtsi | 42 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index e54f3dea2d70..a0747d749bb1 100644
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -648,6 +648,48 @@
status = "disabled";
};
+ pci0: pci@ee090000 {
+ compatible = "renesas,pci-r8a7794";
+ device_type = "pci";
+ reg = <0 0xee090000 0 0xc00>,
+ <0 0xee080000 0 0x1100>;
+ interrupts = <0 108 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp7_clks R8A7794_CLK_EHCI>;
+ power-domains = <&cpg_clocks>;
+ status = "disabled";
+
+ bus-range = <0 0>;
+ #address-cells = <3>;
+ #size-cells = <2>;
+ #interrupt-cells = <1>;
+ ranges = <0x02000000 0 0xee080000 0 0xee080000 0 0x00010000>;
+ interrupt-map-mask = <0xff00 0 0 0x7>;
+ interrupt-map = <0x0000 0 0 1 &gic 0 108 IRQ_TYPE_LEVEL_HIGH
+ 0x0800 0 0 1 &gic 0 108 IRQ_TYPE_LEVEL_HIGH
+ 0x1000 0 0 2 &gic 0 108 IRQ_TYPE_LEVEL_HIGH>;
+ };
+
+ pci1: pci@ee0d0000 {
+ compatible = "renesas,pci-r8a7794";
+ device_type = "pci";
+ reg = <0 0xee0d0000 0 0xc00>,
+ <0 0xee0c0000 0 0x1100>;
+ interrupts = <0 113 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp7_clks R8A7794_CLK_EHCI>;
+ power-domains = <&cpg_clocks>;
+ status = "disabled";
+
+ bus-range = <1 1>;
+ #address-cells = <3>;
+ #size-cells = <2>;
+ #interrupt-cells = <1>;
+ ranges = <0x02000000 0 0xee0c0000 0 0xee0c0000 0 0x00010000>;
+ interrupt-map-mask = <0xff00 0 0 0x7>;
+ interrupt-map = <0x0000 0 0 1 &gic 0 113 IRQ_TYPE_LEVEL_HIGH
+ 0x0800 0 0 1 &gic 0 113 IRQ_TYPE_LEVEL_HIGH
+ 0x1000 0 0 2 &gic 0 113 IRQ_TYPE_LEVEL_HIGH>;
+ };
+
clocks {
#address-cells = <2>;
#size-cells = <2>;
--
2.1.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 19/28] ARM: shmobile: silk: enable internal PCI
2015-10-07 1:58 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.4 Simon Horman
` (17 preceding siblings ...)
2015-10-07 1:57 ` [PATCH 18/28] ARM: shmobile: r8a7794: add internal PCI bridge nodes Simon Horman
@ 2015-10-07 1:57 ` Simon Horman
2015-10-07 1:57 ` [PATCH 20/28] ARM: shmobile: add Porter board DT bindings Simon Horman
` (9 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Simon Horman @ 2015-10-07 1:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Enable internal AHB-PCI bridges for the USB EHCI/OHCI controllers attached to
them.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7794-silk.dts | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7794-silk.dts b/arch/arm/boot/dts/r8a7794-silk.dts
index bb0a22423dc4..71bb56fef7e5 100644
--- a/arch/arm/boot/dts/r8a7794-silk.dts
+++ b/arch/arm/boot/dts/r8a7794-silk.dts
@@ -80,6 +80,16 @@
renesas,groups = "vin0_data8", "vin0_clk";
renesas,function = "vin0";
};
+
+ usb0_pins: usb0 {
+ renesas,groups = "usb0";
+ renesas,function = "usb0";
+ };
+
+ usb1_pins: usb1 {
+ renesas,groups = "usb1";
+ renesas,function = "usb1";
+ };
};
&scif2 {
@@ -188,3 +198,15 @@
};
};
};
+
+&pci0 {
+ status = "okay";
+ pinctrl-0 = <&usb0_pins>;
+ pinctrl-names = "default";
+};
+
+&pci1 {
+ status = "okay";
+ pinctrl-0 = <&usb1_pins>;
+ pinctrl-names = "default";
+};
--
2.1.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 20/28] ARM: shmobile: add Porter board DT bindings
2015-10-07 1:58 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.4 Simon Horman
` (18 preceding siblings ...)
2015-10-07 1:57 ` [PATCH 19/28] ARM: shmobile: silk: enable internal PCI Simon Horman
@ 2015-10-07 1:57 ` Simon Horman
2015-10-07 1:57 ` [PATCH 21/28] ARM: shmobile: porter: initial device tree Simon Horman
` (8 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Simon Horman @ 2015-10-07 1:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Add Porter device tree bindings documentation, listing it as a supported board.
This allows to use checkpatch to validate DTSes referring to the Porter board.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
Documentation/devicetree/bindings/arm/shmobile.txt | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/devicetree/bindings/arm/shmobile.txt b/Documentation/devicetree/bindings/arm/shmobile.txt
index 1d70e78e7c80..a9148b1dcd96 100644
--- a/Documentation/devicetree/bindings/arm/shmobile.txt
+++ b/Documentation/devicetree/bindings/arm/shmobile.txt
@@ -55,5 +55,7 @@ Boards:
compatible = "renesas,lager", "renesas,r8a7790"
- Marzen
compatible = "renesas,marzen", "renesas,r8a7779"
+ - Porter (M2-LCDP)
+ compatible = "renesas,porter", "renesas,r8a7791"
- Silk
compatible = "renesas,silk", "renesas,r8a7794";
--
2.1.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 21/28] ARM: shmobile: porter: initial device tree
2015-10-07 1:58 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.4 Simon Horman
` (19 preceding siblings ...)
2015-10-07 1:57 ` [PATCH 20/28] ARM: shmobile: add Porter board DT bindings Simon Horman
@ 2015-10-07 1:57 ` Simon Horman
2015-10-07 1:57 ` [PATCH 22/28] ARM: shmobile: r8a7794: add USB PHY DT support Simon Horman
` (7 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Simon Horman @ 2015-10-07 1:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Add the initial device tree for the R8A7791 SoC based Porter low cost board
(which is a slightly modified version of the Henninger board).
SCIF0 serial port support is included, so that the serial console can work.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/r8a7791-porter.dts | 54 ++++++++++++++++++++++++++++++++++++
2 files changed, 55 insertions(+)
create mode 100644 arch/arm/boot/dts/r8a7791-porter.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 08f85bcc7da7..d285d9816d9d 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -532,6 +532,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \
r8a7790-lager.dtb \
r8a7791-henninger.dtb \
r8a7791-koelsch.dtb \
+ r8a7791-porter.dtb \
r8a7793-gose.dtb \
r8a7794-alt.dtb \
r8a7794-silk.dtb \
diff --git a/arch/arm/boot/dts/r8a7791-porter.dts b/arch/arm/boot/dts/r8a7791-porter.dts
new file mode 100644
index 000000000000..b5670dd388e6
--- /dev/null
+++ b/arch/arm/boot/dts/r8a7791-porter.dts
@@ -0,0 +1,54 @@
+/*
+ * Device Tree Source for the Porter board
+ *
+ * Copyright (C) 2015 Cogent Embedded, Inc.
+ *
+ * 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 "r8a7791.dtsi"
+
+/ {
+ model = "Porter";
+ compatible = "renesas,porter", "renesas,r8a7791";
+
+ aliases {
+ serial0 = &scif0;
+ };
+
+ chosen {
+ bootargs = "ignore_loglevel";
+ stdout-path = &scif0;
+ };
+
+ memory@40000000 {
+ device_type = "memory";
+ reg = <0 0x40000000 0 0x40000000>;
+ };
+
+ memory@200000000 {
+ device_type = "memory";
+ reg = <2 0x00000000 0 0x40000000>;
+ };
+};
+
+&extal_clk {
+ clock-frequency = <20000000>;
+};
+
+&pfc {
+ scif0_pins: serial0 {
+ renesas,groups = "scif0_data_d";
+ renesas,function = "scif0";
+ };
+};
+
+&scif0 {
+ pinctrl-0 = <&scif0_pins>;
+ pinctrl-names = "default";
+
+ status = "okay";
+};
--
2.1.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 22/28] ARM: shmobile: r8a7794: add USB PHY DT support
2015-10-07 1:58 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.4 Simon Horman
` (20 preceding siblings ...)
2015-10-07 1:57 ` [PATCH 21/28] ARM: shmobile: porter: initial device tree Simon Horman
@ 2015-10-07 1:57 ` Simon Horman
2015-10-07 1:58 ` [PATCH 23/28] ARM: shmobile: silk: enable USB PHY Simon Horman
` (6 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Simon Horman @ 2015-10-07 1:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Define the R8A7794 generic part of the USB PHY device node. It is up to the
board file to enable the device.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7794.dtsi | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index a0747d749bb1..6ba0fa4890d0 100644
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -690,6 +690,26 @@
0x1000 0 0 2 &gic 0 113 IRQ_TYPE_LEVEL_HIGH>;
};
+ usbphy: usb-phy@e6590100 {
+ compatible = "renesas,usb-phy-r8a7794";
+ reg = <0 0xe6590100 0 0x100>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ clocks = <&mstp7_clks R8A7794_CLK_HSUSB>;
+ clock-names = "usbhs";
+ power-domains = <&cpg_clocks>;
+ status = "disabled";
+
+ usb0: usb-channel@0 {
+ reg = <0>;
+ #phy-cells = <1>;
+ };
+ usb2: usb-channel@2 {
+ reg = <2>;
+ #phy-cells = <1>;
+ };
+ };
+
clocks {
#address-cells = <2>;
#size-cells = <2>;
--
2.1.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 23/28] ARM: shmobile: silk: enable USB PHY
2015-10-07 1:58 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.4 Simon Horman
` (21 preceding siblings ...)
2015-10-07 1:57 ` [PATCH 22/28] ARM: shmobile: r8a7794: add USB PHY DT support Simon Horman
@ 2015-10-07 1:58 ` Simon Horman
2015-10-07 1:58 ` [PATCH 24/28] ARM: shmobile: r8a7794: link PCI USB devices to " Simon Horman
` (5 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Simon Horman @ 2015-10-07 1:58 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Enable USB PHY device for the SILK board.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7794-silk.dts | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7794-silk.dts b/arch/arm/boot/dts/r8a7794-silk.dts
index 71bb56fef7e5..48ff3e2958ae 100644
--- a/arch/arm/boot/dts/r8a7794-silk.dts
+++ b/arch/arm/boot/dts/r8a7794-silk.dts
@@ -210,3 +210,7 @@
pinctrl-0 = <&usb1_pins>;
pinctrl-names = "default";
};
+
+&usbphy {
+ status = "okay";
+};
--
2.1.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 24/28] ARM: shmobile: r8a7794: link PCI USB devices to USB PHY
2015-10-07 1:58 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.4 Simon Horman
` (22 preceding siblings ...)
2015-10-07 1:58 ` [PATCH 23/28] ARM: shmobile: silk: enable USB PHY Simon Horman
@ 2015-10-07 1:58 ` Simon Horman
2015-10-07 1:58 ` [PATCH 25/28] ARM: shmobile: dts: Add common file for AA121TD01 panel Simon Horman
` (4 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Simon Horman @ 2015-10-07 1:58 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Describe the PCI USB devices that are behind the PCI bridges, adding necessary
links to the USB PHY device.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
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 6ba0fa4890d0..efc3548511c4 100644
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -667,6 +667,20 @@
interrupt-map = <0x0000 0 0 1 &gic 0 108 IRQ_TYPE_LEVEL_HIGH
0x0800 0 0 1 &gic 0 108 IRQ_TYPE_LEVEL_HIGH
0x1000 0 0 2 &gic 0 108 IRQ_TYPE_LEVEL_HIGH>;
+
+ usb@0,1 {
+ reg = <0x800 0 0 0 0>;
+ device_type = "pci";
+ phys = <&usb0 0>;
+ phy-names = "usb";
+ };
+
+ usb@0,2 {
+ reg = <0x1000 0 0 0 0>;
+ device_type = "pci";
+ phys = <&usb0 0>;
+ phy-names = "usb";
+ };
};
pci1: pci@ee0d0000 {
@@ -688,6 +702,20 @@
interrupt-map = <0x0000 0 0 1 &gic 0 113 IRQ_TYPE_LEVEL_HIGH
0x0800 0 0 1 &gic 0 113 IRQ_TYPE_LEVEL_HIGH
0x1000 0 0 2 &gic 0 113 IRQ_TYPE_LEVEL_HIGH>;
+
+ usb@0,1 {
+ reg = <0x800 0 0 0 0>;
+ device_type = "pci";
+ phys = <&usb2 0>;
+ phy-names = "usb";
+ };
+
+ usb@0,2 {
+ reg = <0x1000 0 0 0 0>;
+ device_type = "pci";
+ phys = <&usb2 0>;
+ phy-names = "usb";
+ };
};
usbphy: usb-phy@e6590100 {
--
2.1.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 25/28] ARM: shmobile: dts: Add common file for AA121TD01 panel
2015-10-07 1:58 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.4 Simon Horman
` (23 preceding siblings ...)
2015-10-07 1:58 ` [PATCH 24/28] ARM: shmobile: r8a7794: link PCI USB devices to " Simon Horman
@ 2015-10-07 1:58 ` Simon Horman
2015-10-07 1:58 ` [PATCH 26/28] ARM: shmobile: r8a7794: add HS-USB DT support Simon Horman
` (3 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Simon Horman @ 2015-10-07 1:58 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
The Mitsubishi AA121TD01 panel is commonly used with the Marzen, Lager
and Koelsch boards. Create a .dtsi file that describe the panel and its
connection to the board.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a77xx-aa121td01-panel.dtsi | 41 ++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
create mode 100644 arch/arm/boot/dts/r8a77xx-aa121td01-panel.dtsi
diff --git a/arch/arm/boot/dts/r8a77xx-aa121td01-panel.dtsi b/arch/arm/boot/dts/r8a77xx-aa121td01-panel.dtsi
new file mode 100644
index 000000000000..a07ebf8f6938
--- /dev/null
+++ b/arch/arm/boot/dts/r8a77xx-aa121td01-panel.dtsi
@@ -0,0 +1,41 @@
+/*
+ * Common file for the AA121TD01 panel connected to Renesas R-Car boards
+ *
+ * Copyright (C) 2015 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.
+ */
+
+/ {
+ panel {
+ compatible = "mitsubishi,aa121td01", "panel-dpi";
+
+ width-mm = <261>;
+ height-mm = <163>;
+
+ panel-timing {
+ /* 1280x800 @60Hz */
+ clock-frequency = <71000000>;
+ hactive = <1280>;
+ vactive = <800>;
+ hsync-len = <70>;
+ hfront-porch = <20>;
+ hback-porch = <70>;
+ vsync-len = <5>;
+ vfront-porch = <3>;
+ vback-porch = <15>;
+ };
+
+ port {
+ panel_in: endpoint {
+ remote-endpoint = <&lvds_connector>;
+ };
+ };
+ };
+};
+
+&lvds_connector {
+ remote-endpoint = <&panel_in>;
+};
--
2.1.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 26/28] ARM: shmobile: r8a7794: add HS-USB DT support
2015-10-07 1:58 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.4 Simon Horman
` (24 preceding siblings ...)
2015-10-07 1:58 ` [PATCH 25/28] ARM: shmobile: dts: Add common file for AA121TD01 panel Simon Horman
@ 2015-10-07 1:58 ` Simon Horman
2015-10-07 1:58 ` [PATCH 27/28] ARM: shmobile: fix SILK board name Simon Horman
` (2 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Simon Horman @ 2015-10-07 1:58 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Define the R8A7794 generic part of the HS-USB device node.
It is up to the board file to enable the device.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7794.dtsi | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index efc3548511c4..a9977d6ee81a 100644
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -718,6 +718,18 @@
};
};
+ hsusb: usb@e6590000 {
+ compatible = "renesas,usbhs-r8a7794";
+ reg = <0 0xe6590000 0 0x100>;
+ interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp7_clks R8A7794_CLK_HSUSB>;
+ power-domains = <&cpg_clocks>;
+ renesas,buswait = <4>;
+ phys = <&usb0 1>;
+ phy-names = "usb";
+ status = "disabled";
+ };
+
usbphy: usb-phy@e6590100 {
compatible = "renesas,usb-phy-r8a7794";
reg = <0 0xe6590100 0 0x100>;
--
2.1.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 27/28] ARM: shmobile: fix SILK board name
2015-10-07 1:58 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.4 Simon Horman
` (25 preceding siblings ...)
2015-10-07 1:58 ` [PATCH 26/28] ARM: shmobile: r8a7794: add HS-USB DT support Simon Horman
@ 2015-10-07 1:58 ` Simon Horman
2015-10-07 1:58 ` [PATCH 28/28] ARM: shmobile: porter: add Ether DT support Simon Horman
2015-10-08 15:21 ` [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.4 Arnd Bergmann
28 siblings, 0 replies; 30+ messages in thread
From: Simon Horman @ 2015-10-07 1:58 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Unfortunately, the SILK board bindings were not quite correct, as the board
name should be all caps. Fix that, adding the board model # in parens and
removing stray semicolon.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
Documentation/devicetree/bindings/arm/shmobile.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/arm/shmobile.txt b/Documentation/devicetree/bindings/arm/shmobile.txt
index a9148b1dcd96..40bb9007cd0d 100644
--- a/Documentation/devicetree/bindings/arm/shmobile.txt
+++ b/Documentation/devicetree/bindings/arm/shmobile.txt
@@ -57,5 +57,5 @@ Boards:
compatible = "renesas,marzen", "renesas,r8a7779"
- Porter (M2-LCDP)
compatible = "renesas,porter", "renesas,r8a7791"
- - Silk
- compatible = "renesas,silk", "renesas,r8a7794";
+ - SILK (RTP0RC7794LCB00011S)
+ compatible = "renesas,silk", "renesas,r8a7794"
--
2.1.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 28/28] ARM: shmobile: porter: add Ether DT support
2015-10-07 1:58 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.4 Simon Horman
` (26 preceding siblings ...)
2015-10-07 1:58 ` [PATCH 27/28] ARM: shmobile: fix SILK board name Simon Horman
@ 2015-10-07 1:58 ` Simon Horman
2015-10-08 15:21 ` [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.4 Arnd Bergmann
28 siblings, 0 replies; 30+ messages in thread
From: Simon Horman @ 2015-10-07 1:58 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Define the Porter board dependent part of the Ether device node.
Enable DHCP and NFS root for the kernel booting.
This patch is analogous to the commit 26b0d2cf73cb ("ARM: shmobile:
henninger: add Ether DT support") as there are no differences between
those boards in this respect.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7791-porter.dts | 28 +++++++++++++++++++++++++++-
1 file changed, 27 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a7791-porter.dts b/arch/arm/boot/dts/r8a7791-porter.dts
index b5670dd388e6..ca59ff861923 100644
--- a/arch/arm/boot/dts/r8a7791-porter.dts
+++ b/arch/arm/boot/dts/r8a7791-porter.dts
@@ -20,7 +20,7 @@
};
chosen {
- bootargs = "ignore_loglevel";
+ bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp";
stdout-path = &scif0;
};
@@ -44,6 +44,16 @@
renesas,groups = "scif0_data_d";
renesas,function = "scif0";
};
+
+ ether_pins: ether {
+ renesas,groups = "eth_link", "eth_mdio", "eth_rmii";
+ renesas,function = "eth";
+ };
+
+ phy1_pins: phy1 {
+ renesas,groups = "intc_irq0";
+ renesas,function = "intc";
+ };
};
&scif0 {
@@ -52,3 +62,19 @@
status = "okay";
};
+
+ðer {
+ pinctrl-0 = <ðer_pins &phy1_pins>;
+ pinctrl-names = "default";
+
+ phy-handle = <&phy1>;
+ renesas,ether-link-active-low;
+ status = "ok";
+
+ phy1: ethernet-phy@1 {
+ reg = <1>;
+ interrupt-parent = <&irqc0>;
+ interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+ micrel,led-mode = <1>;
+ };
+};
--
2.1.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.4
2015-10-07 1:58 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.4 Simon Horman
` (27 preceding siblings ...)
2015-10-07 1:58 ` [PATCH 28/28] ARM: shmobile: porter: add Ether DT support Simon Horman
@ 2015-10-08 15:21 ` Arnd Bergmann
28 siblings, 0 replies; 30+ messages in thread
From: Arnd Bergmann @ 2015-10-08 15:21 UTC (permalink / raw)
To: linux-arm-kernel
On Wednesday 07 October 2015 10:58:00 Simon Horman wrote:
> The main differences since v1 of this pull-request are:
>
> * Removed "Add missing CPG/MSTP Clock Domain for sound "* patches
> which are fixes now present in the ARM SoC fixes branch
> via the renesas-fixes-for-v4.3 tag of the renesas tree.
> * Enable more hardware via DT
> + Enable PCI, USB PHY and HS, and VIN support on r8a7794/Silk
> + Add initial support for r8a7791/porter
> + Add common file for AA121TD01 panel
>
>
Merged into next/dt, thanks!
Arnd
^ permalink raw reply [flat|nested] 30+ messages in thread