* [PATCH 01/26] ARM: dts: r8a7794: add VSP1 support
2016-09-07 7:49 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.9 Simon Horman
@ 2016-09-07 7:49 ` Simon Horman
2016-09-07 7:49 ` [PATCH 02/26] ARM: dts: alt: add SDHI0 and 1 support Simon Horman
` (25 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-09-07 7:49 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Describe two instances (VSPS and VSPD0) of the VSP1 in the R8A7794 device
tree.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7794.dtsi | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index 6216a170a3df..611ec6df5cf6 100644
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -894,6 +894,22 @@
};
};
+ vsp1 at fe928000 {
+ compatible = "renesas,vsp1";
+ reg = <0 0xfe928000 0 0x8000>;
+ interrupts = <GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp1_clks R8A7794_CLK_VSP1_S>;
+ power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+ };
+
+ vsp1 at fe930000 {
+ compatible = "renesas,vsp1";
+ reg = <0 0xfe930000 0 0x8000>;
+ interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp1_clks R8A7794_CLK_VSP1_DU0>;
+ power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+ };
+
du: display at feb00000 {
compatible = "renesas,du-r8a7794";
reg = <0 0xfeb00000 0 0x40000>;
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 02/26] ARM: dts: alt: add SDHI0 and 1 support
2016-09-07 7:49 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.9 Simon Horman
2016-09-07 7:49 ` [PATCH 01/26] ARM: dts: r8a7794: add VSP1 support Simon Horman
@ 2016-09-07 7:49 ` Simon Horman
2016-09-07 7:49 ` [PATCH 03/26] ARM: dts: alt: add MMCIF support Simon Horman
` (24 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-09-07 7:49 UTC (permalink / raw)
To: linux-arm-kernel
Define the Alt board dependent part of the SDHI0 and 1
device nodes along with the necessary voltage regulators.
Based on work by the original patch by Vladimir Barinov and
Sergei Shtylyov for the Silk board.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7794-alt.dts | 81 +++++++++++++++++++++++++++++++++++++++
1 file changed, 81 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7794-alt.dts b/arch/arm/boot/dts/r8a7794-alt.dts
index 1ad37d431a2a..fe7c128cc965 100644
--- a/arch/arm/boot/dts/r8a7794-alt.dts
+++ b/arch/arm/boot/dts/r8a7794-alt.dts
@@ -10,6 +10,7 @@
/dts-v1/;
#include "r8a7794.dtsi"
+#include <dt-bindings/gpio/gpio.h>
/ {
model = "Alt";
@@ -29,6 +30,54 @@
reg = <0 0x40000000 0 0x40000000>;
};
+ vcc_sdhi0: regulator-vcc-sdhi0 {
+ compatible = "regulator-fixed";
+
+ regulator-name = "SDHI0 Vcc";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+
+ gpio = <&gpio2 26 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
+ };
+
+ vccq_sdhi0: regulator-vccq-sdhi0 {
+ compatible = "regulator-gpio";
+
+ regulator-name = "SDHI0 VccQ";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+
+ gpios = <&gpio2 29 GPIO_ACTIVE_HIGH>;
+ gpios-states = <1>;
+ states = <3300000 1
+ 1800000 0>;
+ };
+
+ vcc_sdhi1: regulator-vcc-sdhi1 {
+ compatible = "regulator-fixed";
+
+ regulator-name = "SDHI1 Vcc";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+
+ gpio = <&gpio4 26 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
+ };
+
+ vccq_sdhi1: regulator-vccq-sdhi1 {
+ compatible = "regulator-gpio";
+
+ regulator-name = "SDHI1 VccQ";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+
+ gpios = <&gpio4 29 GPIO_ACTIVE_HIGH>;
+ gpios-states = <1>;
+ states = <3300000 1
+ 1800000 0>;
+ };
+
lbsc {
#address-cells = <1>;
#size-cells = <1>;
@@ -140,6 +189,16 @@
groups = "vin0_data8", "vin0_clk";
function = "vin0";
};
+
+ sdhi0_pins: sd0 {
+ groups = "sdhi0_data4", "sdhi0_ctrl";
+ function = "sdhi0";
+ };
+
+ sdhi1_pins: sd1 {
+ groups = "sdhi1_data4", "sdhi1_ctrl";
+ function = "sdhi1";
+ };
};
&cmt0 {
@@ -169,6 +228,28 @@
};
};
+&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_LOW>;
+ 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_LOW>;
+ status = "okay";
+};
+
&i2c1 {
pinctrl-0 = <&i2c1_pins>;
pinctrl-names = "default";
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 03/26] ARM: dts: alt: add MMCIF support
2016-09-07 7:49 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.9 Simon Horman
2016-09-07 7:49 ` [PATCH 01/26] ARM: dts: r8a7794: add VSP1 support Simon Horman
2016-09-07 7:49 ` [PATCH 02/26] ARM: dts: alt: add SDHI0 and 1 support Simon Horman
@ 2016-09-07 7:49 ` Simon Horman
2016-09-07 7:49 ` [PATCH 04/26] ARM: dts: r8a7790: Remove obsolete vsp1 properties Simon Horman
` (23 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-09-07 7:49 UTC (permalink / raw)
To: linux-arm-kernel
Define the Alt board dependent part of the MMCIF device node.
Like the Silk the board has eMMC chip along with the necessary voltage
regulator (note that the Vcc/Vccq regulator is dummy -- it's required by
the MMCIF driver but doesn't actually exist on the board).
Based on work for the Silk board by Vladimir Barinov and Sergei Shtylyov.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7794-alt.dts | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7794-alt.dts b/arch/arm/boot/dts/r8a7794-alt.dts
index fe7c128cc965..8d1b35afaf82 100644
--- a/arch/arm/boot/dts/r8a7794-alt.dts
+++ b/arch/arm/boot/dts/r8a7794-alt.dts
@@ -30,6 +30,15 @@
reg = <0 0x40000000 0 0x40000000>;
};
+ d3_3v: regulator-d3-3v {
+ compatible = "regulator-fixed";
+ regulator-name = "D3.3V";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-boot-on;
+ regulator-always-on;
+ };
+
vcc_sdhi0: regulator-vcc-sdhi0 {
compatible = "regulator-fixed";
@@ -190,6 +199,11 @@
function = "vin0";
};
+ mmcif0_pins: mmcif0 {
+ groups = "mmc_data8", "mmc_ctrl";
+ function = "mmc";
+ };
+
sdhi0_pins: sd0 {
groups = "sdhi0_data4", "sdhi0_ctrl";
function = "sdhi0";
@@ -228,6 +242,17 @@
};
};
+&mmcif0 {
+ pinctrl-0 = <&mmcif0_pins>;
+ pinctrl-names = "default";
+
+ vmmc-supply = <&d3_3v>;
+ vqmmc-supply = <&d3_3v>;
+ bus-width = <8>;
+ non-removable;
+ status = "okay";
+};
+
&sdhi0 {
pinctrl-0 = <&sdhi0_pins>;
pinctrl-names = "default";
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 04/26] ARM: dts: r8a7790: Remove obsolete vsp1 properties
2016-09-07 7:49 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.9 Simon Horman
` (2 preceding siblings ...)
2016-09-07 7:49 ` [PATCH 03/26] ARM: dts: alt: add MMCIF support Simon Horman
@ 2016-09-07 7:49 ` Simon Horman
2016-09-07 7:49 ` [PATCH 05/26] ARM: dts: r8a7791: " Simon Horman
` (22 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-09-07 7:49 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
As of commit 5aa2eb3c86d4fd16 ("[media] v4l: vsp1: Configure device
based on IP version"), the DT properties to identify the exact VSP
device instance features are no longer used. Hence remove them.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7790.dtsi | 23 -----------------------
1 file changed, 23 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index d18558f21102..351fcc2f87df 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -944,11 +944,6 @@
interrupts = <GIC_SPI 266 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp1_clks R8A7790_CLK_VSP1_R>;
power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-
- renesas,has-sru;
- renesas,#rpf = <5>;
- renesas,#uds = <1>;
- renesas,#wpf = <4>;
};
vsp1 at fe928000 {
@@ -957,12 +952,6 @@
interrupts = <GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp1_clks R8A7790_CLK_VSP1_S>;
power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-
- renesas,has-lut;
- renesas,has-sru;
- renesas,#rpf = <5>;
- renesas,#uds = <3>;
- renesas,#wpf = <4>;
};
vsp1 at fe930000 {
@@ -971,12 +960,6 @@
interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp1_clks R8A7790_CLK_VSP1_DU0>;
power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-
- renesas,has-lif;
- renesas,has-lut;
- renesas,#rpf = <4>;
- renesas,#uds = <1>;
- renesas,#wpf = <4>;
};
vsp1 at fe938000 {
@@ -985,12 +968,6 @@
interrupts = <GIC_SPI 247 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp1_clks R8A7790_CLK_VSP1_DU1>;
power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-
- renesas,has-lif;
- renesas,has-lut;
- renesas,#rpf = <4>;
- renesas,#uds = <1>;
- renesas,#wpf = <4>;
};
du: display at feb00000 {
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 05/26] ARM: dts: r8a7791: Remove obsolete vsp1 properties
2016-09-07 7:49 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.9 Simon Horman
` (3 preceding siblings ...)
2016-09-07 7:49 ` [PATCH 04/26] ARM: dts: r8a7790: Remove obsolete vsp1 properties Simon Horman
@ 2016-09-07 7:49 ` Simon Horman
2016-09-07 7:49 ` [PATCH 06/26] ARM: dts: blanche: add support for general purpose switches Simon Horman
` (21 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-09-07 7:49 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
As of commit 5aa2eb3c86d4fd16 ("[media] v4l: vsp1: Configure device
based on IP version"), the DT properties to identify the exact VSP
device instance features are no longer used. Hence remove them.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7791.dtsi | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 8f0086bbd96b..162b55c665a3 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -983,12 +983,6 @@
interrupts = <GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp1_clks R8A7791_CLK_VSP1_S>;
power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-
- renesas,has-lut;
- renesas,has-sru;
- renesas,#rpf = <5>;
- renesas,#uds = <3>;
- renesas,#wpf = <4>;
};
vsp1 at fe930000 {
@@ -997,12 +991,6 @@
interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp1_clks R8A7791_CLK_VSP1_DU0>;
power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-
- renesas,has-lif;
- renesas,has-lut;
- renesas,#rpf = <4>;
- renesas,#uds = <1>;
- renesas,#wpf = <4>;
};
vsp1 at fe938000 {
@@ -1011,12 +999,6 @@
interrupts = <GIC_SPI 247 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp1_clks R8A7791_CLK_VSP1_DU1>;
power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-
- renesas,has-lif;
- renesas,has-lut;
- renesas,#rpf = <4>;
- renesas,#uds = <1>;
- renesas,#wpf = <4>;
};
du: display at feb00000 {
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 06/26] ARM: dts: blanche: add support for general purpose switches
2016-09-07 7:49 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.9 Simon Horman
` (4 preceding siblings ...)
2016-09-07 7:49 ` [PATCH 05/26] ARM: dts: r8a7791: " Simon Horman
@ 2016-09-07 7:49 ` Simon Horman
2016-09-07 7:49 ` [PATCH 07/26] ARM: dts: blanche: add SDHI0 support Simon Horman
` (20 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-09-07 7:49 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Add support for the general purpose software switches SW2 and tactile
switches SW24/25 as a virtual keyboard (like it was done with the Lager/
Koelsch boards).
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7792-blanche.dts | 49 +++++++++++++++++++++++++++++++++++
1 file changed, 49 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7792-blanche.dts b/arch/arm/boot/dts/r8a7792-blanche.dts
index eeffba870211..808a6aab7e5e 100644
--- a/arch/arm/boot/dts/r8a7792-blanche.dts
+++ b/arch/arm/boot/dts/r8a7792-blanche.dts
@@ -11,6 +11,8 @@
/dts-v1/;
#include "r8a7792.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
/ {
model = "Blanche";
@@ -54,6 +56,53 @@
pinctrl-0 = <&lan89218_pins>;
pinctrl-names = "default";
};
+
+ keyboard {
+ compatible = "gpio-keys";
+
+ key-1 {
+ linux,code = <KEY_1>;
+ label = "SW2-1";
+ wakeup-source;
+ debounce-interval = <20>;
+ gpios = <&gpio3 10 GPIO_ACTIVE_LOW>;
+ };
+ key-2 {
+ linux,code = <KEY_2>;
+ label = "SW2-2";
+ wakeup-source;
+ debounce-interval = <20>;
+ gpios = <&gpio3 11 GPIO_ACTIVE_LOW>;
+ };
+ key-3 {
+ linux,code = <KEY_3>;
+ label = "SW2-3";
+ wakeup-source;
+ debounce-interval = <20>;
+ gpios = <&gpio3 12 GPIO_ACTIVE_LOW>;
+ };
+ key-4 {
+ linux,code = <KEY_4>;
+ label = "SW2-4";
+ wakeup-source;
+ debounce-interval = <20>;
+ gpios = <&gpio3 15 GPIO_ACTIVE_LOW>;
+ };
+ key-a {
+ linux,code = <KEY_A>;
+ label = "SW24";
+ wakeup-source;
+ debounce-interval = <20>;
+ gpios = <&gpio3 20 GPIO_ACTIVE_LOW>;
+ };
+ key-b {
+ linux,code = <KEY_B>;
+ label = "SW25";
+ wakeup-source;
+ debounce-interval = <20>;
+ gpios = <&gpio11 2 GPIO_ACTIVE_LOW>;
+ };
+ };
};
&extal_clk {
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 07/26] ARM: dts: blanche: add SDHI0 support
2016-09-07 7:49 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.9 Simon Horman
` (5 preceding siblings ...)
2016-09-07 7:49 ` [PATCH 06/26] ARM: dts: blanche: add support for general purpose switches Simon Horman
@ 2016-09-07 7:49 ` Simon Horman
2016-09-07 7:49 ` [PATCH 08/26] ARM: dts: blanche: add DU support Simon Horman
` (19 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-09-07 7:49 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Define the Blanche board dependent part of the SDHI0 (connected to the
micro-SD slot) device node along with the necessary voltage regulator.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7792-blanche.dts | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7792-blanche.dts b/arch/arm/boot/dts/r8a7792-blanche.dts
index 808a6aab7e5e..436d44ea3c12 100644
--- a/arch/arm/boot/dts/r8a7792-blanche.dts
+++ b/arch/arm/boot/dts/r8a7792-blanche.dts
@@ -103,6 +103,17 @@
gpios = <&gpio11 2 GPIO_ACTIVE_LOW>;
};
};
+
+ vcc_sdhi0: regulator-vcc-sdhi0 {
+ compatible = "regulator-fixed";
+
+ regulator-name = "SDHI0 Vcc";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+
+ gpio = <&gpio11 12 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
+ };
};
&extal_clk {
@@ -139,6 +150,11 @@
groups = "can0_data", "can_clk";
function = "can0";
};
+
+ sdhi0_pins: sdhi0 {
+ groups = "sdhi0_data4", "sdhi0_ctrl";
+ function = "sdhi0";
+ };
};
&scif0 {
@@ -161,3 +177,12 @@
status = "okay";
};
+
+&sdhi0 {
+ pinctrl-0 = <&sdhi0_pins>;
+ pinctrl-names = "default";
+
+ vmmc-supply = <&vcc_sdhi0>;
+ cd-gpios = <&gpio11 11 GPIO_ACTIVE_LOW>;
+ status = "okay";
+};
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 08/26] ARM: dts: blanche: add DU support
2016-09-07 7:49 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.9 Simon Horman
` (6 preceding siblings ...)
2016-09-07 7:49 ` [PATCH 07/26] ARM: dts: blanche: add SDHI0 support Simon Horman
@ 2016-09-07 7:49 ` Simon Horman
2016-09-07 7:49 ` [PATCH 09/26] ARM: dts: r8a7792: add VSP1V clocks Simon Horman
` (18 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-09-07 7:49 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Define the Blanche board dependent part of the DU device node.
Add the device nodes for the Analog Devices ADV7511W HDMI transmitter
(connected to DU0) and ADV7123 video DAC (connected to DU1). Add the
necessary subnodes to interconnect DU, HDMI/VDAC devices, and HDMI/VGA
connectors.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7792-blanche.dts | 125 ++++++++++++++++++++++++++++++++++
1 file changed, 125 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7792-blanche.dts b/arch/arm/boot/dts/r8a7792-blanche.dts
index 436d44ea3c12..3c6f42b9fe9f 100644
--- a/arch/arm/boot/dts/r8a7792-blanche.dts
+++ b/arch/arm/boot/dts/r8a7792-blanche.dts
@@ -57,6 +57,61 @@
pinctrl-names = "default";
};
+ vga-encoder {
+ compatible = "adi,adv7123";
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port at 0 {
+ reg = <0>;
+ adv7123_in: endpoint {
+ remote-endpoint = <&du_out_rgb1>;
+ };
+ };
+ port at 1 {
+ reg = <1>;
+ adv7123_out: endpoint {
+ remote-endpoint = <&vga_in>;
+ };
+ };
+ };
+ };
+
+ hdmi-out {
+ compatible = "hdmi-connector";
+ type = "a";
+
+ port {
+ hdmi_con: endpoint {
+ remote-endpoint = <&adv7511_out>;
+ };
+ };
+ };
+
+ vga {
+ compatible = "vga-connector";
+
+ port {
+ vga_in: endpoint {
+ remote-endpoint = <&adv7123_out>;
+ };
+ };
+ };
+
+ x1_clk: x1 {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <74250000>;
+ };
+
+ x2_clk: x2 {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <65000000>;
+ };
+
keyboard {
compatible = "gpio-keys";
@@ -155,6 +210,16 @@
groups = "sdhi0_data4", "sdhi0_ctrl";
function = "sdhi0";
};
+
+ du0_pins: du0 {
+ groups = "du0_rgb888", "du0_sync", "du0_disp";
+ function = "du0";
+ };
+
+ du1_pins: du1 {
+ groups = "du1_rgb666", "du1_sync", "du1_disp";
+ function = "du1";
+ };
};
&scif0 {
@@ -186,3 +251,63 @@
cd-gpios = <&gpio11 11 GPIO_ACTIVE_LOW>;
status = "okay";
};
+
+&i2c1 {
+ status = "okay";
+ clock-frequency = <400000>;
+
+ hdmi at 39 {
+ compatible = "adi,adv7511w";
+ reg = <0x39>;
+ interrupt-parent = <&irqc>;
+ interrupts = <3 IRQ_TYPE_EDGE_FALLING>;
+
+ adi,input-depth = <8>;
+ adi,input-colorspace = "rgb";
+ adi,input-clock = "1x";
+ adi,input-style = <1>;
+ adi,input-justification = "evenly";
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port at 0 {
+ reg = <0>;
+ adv7511_in: endpoint {
+ remote-endpoint = <&du_out_rgb0>;
+ };
+ };
+
+ port at 1 {
+ reg = <1>;
+ adv7511_out: endpoint {
+ remote-endpoint = <&hdmi_con>;
+ };
+ };
+ };
+ };
+};
+
+&du {
+ pinctrl-0 = <&du0_pins &du1_pins>;
+ pinctrl-names = "default";
+
+ clocks = <&mstp7_clks R8A7792_CLK_DU0>, <&mstp7_clks R8A7792_CLK_DU1>,
+ <&x1_clk>, <&x2_clk>;
+ clock-names = "du.0", "du.1", "dclkin.0", "dclkin.1";
+ status = "okay";
+
+ ports {
+ port at 0 {
+ endpoint {
+ remote-endpoint = <&adv7511_in>;
+ };
+ };
+ port at 1 {
+ endpoint {
+ remote-endpoint = <&adv7123_in>;
+ };
+ };
+ };
+};
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 09/26] ARM: dts: r8a7792: add VSP1V clocks
2016-09-07 7:49 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.9 Simon Horman
` (7 preceding siblings ...)
2016-09-07 7:49 ` [PATCH 08/26] ARM: dts: blanche: add DU support Simon Horman
@ 2016-09-07 7:49 ` Simon Horman
2016-09-07 7:49 ` [PATCH 10/26] ARM: dts: r8a7792: add VSP1V support Simon Horman
` (17 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-09-07 7:49 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Describe the VSP1V clocks in the R8A7792 device tree.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7792.dtsi | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7792.dtsi b/arch/arm/boot/dts/r8a7792.dtsi
index 9763289db5ce..856e6c5b94bc 100644
--- a/arch/arm/boot/dts/r8a7792.dtsi
+++ b/arch/arm/boot/dts/r8a7792.dtsi
@@ -757,10 +757,15 @@
compatible = "renesas,r8a7792-mstp-clocks",
"renesas,cpg-mstp-clocks";
reg = <0 0xe6150134 0 4>, <0 0xe6150038 0 4>;
- clocks = <&m2_clk>;
+ clocks = <&m2_clk>, <&zs_clk>, <&zs_clk>, <&zs_clk>;
#clock-cells = <1>;
- clock-indices = <R8A7792_CLK_JPU>;
- clock-output-names = "jpu";
+ clock-indices = <
+ R8A7792_CLK_JPU
+ R8A7792_CLK_VSP1DU1 R8A7792_CLK_VSP1DU0
+ R8A7792_CLK_VSP1_SY
+ >;
+ clock-output-names = "jpu", "vsp1du1", "vsp1du0",
+ "vsp1-sy";
};
mstp2_clks: mstp2_clks at e6150138 {
compatible = "renesas,r8a7792-mstp-clocks",
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 10/26] ARM: dts: r8a7792: add VSP1V support
2016-09-07 7:49 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.9 Simon Horman
` (8 preceding siblings ...)
2016-09-07 7:49 ` [PATCH 09/26] ARM: dts: r8a7792: add VSP1V clocks Simon Horman
@ 2016-09-07 7:49 ` Simon Horman
2016-09-07 7:49 ` [PATCH 11/26] ARM: dts: blanche: add support for general purpose LEDs Simon Horman
` (16 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-09-07 7:49 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Describe 3 instances (VSPS, VSPD0, and VSPD1) of the VSP1V in the R8A7792
device tree.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7792.dtsi | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7792.dtsi b/arch/arm/boot/dts/r8a7792.dtsi
index 856e6c5b94bc..ff47755fb01e 100644
--- a/arch/arm/boot/dts/r8a7792.dtsi
+++ b/arch/arm/boot/dts/r8a7792.dtsi
@@ -668,6 +668,30 @@
status = "disabled";
};
+ vsp1 at fe928000 {
+ compatible = "renesas,vsp1";
+ reg = <0 0xfe928000 0 0x8000>;
+ interrupts = <GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp1_clks R8A7792_CLK_VSP1_SY>;
+ power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
+ };
+
+ vsp1 at fe930000 {
+ compatible = "renesas,vsp1";
+ reg = <0 0xfe930000 0 0x8000>;
+ interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp1_clks R8A7792_CLK_VSP1DU0>;
+ power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
+ };
+
+ vsp1 at fe938000 {
+ compatible = "renesas,vsp1";
+ reg = <0 0xfe938000 0 0x8000>;
+ interrupts = <GIC_SPI 247 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp1_clks R8A7792_CLK_VSP1DU1>;
+ power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
+ };
+
/* Special CPG clocks */
cpg_clocks: cpg_clocks at e6150000 {
compatible = "renesas,r8a7792-cpg-clocks",
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 11/26] ARM: dts: blanche: add support for general purpose LEDs
2016-09-07 7:49 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.9 Simon Horman
` (9 preceding siblings ...)
2016-09-07 7:49 ` [PATCH 10/26] ARM: dts: r8a7792: add VSP1V support Simon Horman
@ 2016-09-07 7:49 ` Simon Horman
2016-09-07 7:49 ` [PATCH 12/26] ARM: dts: document Wheat board Simon Horman
` (15 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-09-07 7:49 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Add support for the general purpose LEDs on the Blanche board.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7792-blanche.dts | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7792-blanche.dts b/arch/arm/boot/dts/r8a7792-blanche.dts
index 3c6f42b9fe9f..f3ea43b7b724 100644
--- a/arch/arm/boot/dts/r8a7792-blanche.dts
+++ b/arch/arm/boot/dts/r8a7792-blanche.dts
@@ -159,6 +159,23 @@
};
};
+ leds {
+ compatible = "gpio-leds";
+
+ led17 {
+ gpios = <&gpio10 10 GPIO_ACTIVE_HIGH>;
+ };
+ led18 {
+ gpios = <&gpio10 11 GPIO_ACTIVE_HIGH>;
+ };
+ led19 {
+ gpios = <&gpio10 12 GPIO_ACTIVE_HIGH>;
+ };
+ led20 {
+ gpios = <&gpio10 23 GPIO_ACTIVE_HIGH>;
+ };
+ };
+
vcc_sdhi0: regulator-vcc-sdhi0 {
compatible = "regulator-fixed";
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 12/26] ARM: dts: document Wheat board
2016-09-07 7:49 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.9 Simon Horman
` (10 preceding siblings ...)
2016-09-07 7:49 ` [PATCH 11/26] ARM: dts: blanche: add support for general purpose LEDs Simon Horman
@ 2016-09-07 7:49 ` Simon Horman
2016-09-07 7:50 ` [PATCH 13/26] ARM: dts: wheat: initial device tree Simon Horman
` (14 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-09-07 7:49 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Document the Wheat device tree bindings, listing it as a supported board.
This allows to use checkpatch.pl to validate .dts files referring to the
Wheat board.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Rob Herring <robh@kernel.org>
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 1df32d339da5..90cf237ee558 100644
--- a/Documentation/devicetree/bindings/arm/shmobile.txt
+++ b/Documentation/devicetree/bindings/arm/shmobile.txt
@@ -69,3 +69,5 @@ Boards:
compatible = "renesas,salvator-x", "renesas,r8a7796";
- SILK (RTP0RC7794LCB00011S)
compatible = "renesas,silk", "renesas,r8a7794"
+ - Wheat
+ compatible = "renesas,wheat", "renesas,r8a7792"
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 13/26] ARM: dts: wheat: initial device tree
2016-09-07 7:49 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.9 Simon Horman
` (11 preceding siblings ...)
2016-09-07 7:49 ` [PATCH 12/26] ARM: dts: document Wheat board Simon Horman
@ 2016-09-07 7:50 ` Simon Horman
2016-09-07 7:50 ` [PATCH 14/26] ARM: dts: wheat: add Ethernet support Simon Horman
` (13 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-09-07 7:50 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Add the initial device tree for the R8A7792 SoC based Wheat board.
The Wheat board itself has no serial ports wired up, the USB serial chips
are situated on a separate debug board and one of them is connected to
SCFI0 -- include unconditional support for it, so that the serial console
can work.
Based on the original (and large) patch by Vladimir Barinov
<vladimir.barinov@cogentembedded.com>.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-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/r8a7792-wheat.dts | 50 +++++++++++++++++++++++++++++++++++++
2 files changed, 51 insertions(+)
create mode 100644 arch/arm/boot/dts/r8a7792-wheat.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index faacd52370d2..d289ec733d2e 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -659,6 +659,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \
r8a7791-koelsch.dtb \
r8a7791-porter.dtb \
r8a7792-blanche.dtb \
+ r8a7792-wheat.dtb \
r8a7793-gose.dtb \
r8a7794-alt.dtb \
r8a7794-silk.dtb \
diff --git a/arch/arm/boot/dts/r8a7792-wheat.dts b/arch/arm/boot/dts/r8a7792-wheat.dts
new file mode 100644
index 000000000000..22ae14ffc917
--- /dev/null
+++ b/arch/arm/boot/dts/r8a7792-wheat.dts
@@ -0,0 +1,50 @@
+/*
+ * Device Tree Source for the Wheat board
+ *
+ * Copyright (C) 2016 Renesas Electronics Corporation
+ * Copyright (C) 2016 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 "r8a7792.dtsi"
+
+/ {
+ model = "Wheat";
+ compatible = "renesas,wheat", "renesas,r8a7792";
+
+ aliases {
+ serial0 = &scif0;
+ };
+
+ chosen {
+ bootargs = "ignore_loglevel";
+ stdout-path = "serial0:115200n8";
+ };
+
+ memory at 40000000 {
+ device_type = "memory";
+ reg = <0 0x40000000 0 0x40000000>;
+ };
+};
+
+&extal_clk {
+ clock-frequency = <20000000>;
+};
+
+&pfc {
+ scif0_pins: scif0 {
+ groups = "scif0_data";
+ function = "scif0";
+ };
+};
+
+&scif0 {
+ pinctrl-0 = <&scif0_pins>;
+ pinctrl-names = "default";
+
+ status = "okay";
+};
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 14/26] ARM: dts: wheat: add Ethernet support
2016-09-07 7:49 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.9 Simon Horman
` (12 preceding siblings ...)
2016-09-07 7:50 ` [PATCH 13/26] ARM: dts: wheat: initial device tree Simon Horman
@ 2016-09-07 7:50 ` Simon Horman
2016-09-07 7:50 ` [PATCH 15/26] ARM: dts: Add RSKRZA1 DT bindings documentation Simon Horman
` (12 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-09-07 7:50 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
R8A7792 SoC doesn't have the EtherMAC core, so SMSC LAN89218 Ethernet
chip was used instead on the Wheat debug board; this chip is compatible
with SMSC LAN9115 for which there's a (device tree aware) driver.
Describe the chip in the Wheat device tree unconditionally (the driver
should fail the probe if the debug board isn't connected); enable DHCP and
NFS root in the command line for the kernel boot...
Based on the original (and large) patch by Vladimir Barinov
<vladimir.barinov@cogentembedded.com>.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7792-wheat.dts | 38 ++++++++++++++++++++++++++++++++++++-
1 file changed, 37 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a7792-wheat.dts b/arch/arm/boot/dts/r8a7792-wheat.dts
index 22ae14ffc917..e214d707f81d 100644
--- a/arch/arm/boot/dts/r8a7792-wheat.dts
+++ b/arch/arm/boot/dts/r8a7792-wheat.dts
@@ -21,7 +21,7 @@
};
chosen {
- bootargs = "ignore_loglevel";
+ bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp";
stdout-path = "serial0:115200n8";
};
@@ -29,6 +29,31 @@
device_type = "memory";
reg = <0 0x40000000 0 0x40000000>;
};
+
+ d3_3v: regulator-3v3 {
+ compatible = "regulator-fixed";
+ regulator-name = "D3.3V";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-boot-on;
+ regulator-always-on;
+ };
+
+ ethernet at 18000000 {
+ compatible = "smsc,lan89218", "smsc,lan9115";
+ reg = <0 0x18000000 0 0x100>;
+ phy-mode = "mii";
+ interrupt-parent = <&irqc>;
+ interrupts = <0 IRQ_TYPE_EDGE_FALLING>;
+ smsc,irq-push-pull;
+ smsc,save-mac-address;
+ reg-io-width = <4>;
+ vddvario-supply = <&d3_3v>;
+ vdd33a-supply = <&d3_3v>;
+
+ pinctrl-0 = <&lan89218_pins>;
+ pinctrl-names = "default";
+ };
};
&extal_clk {
@@ -40,6 +65,17 @@
groups = "scif0_data";
function = "scif0";
};
+
+ lan89218_pins: lan89218 {
+ intc {
+ groups = "intc_irq0";
+ function = "intc";
+ };
+ lbsc {
+ groups = "lbsc_ex_cs0";
+ function = "lbsc";
+ };
+ };
};
&scif0 {
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 15/26] ARM: dts: Add RSKRZA1 DT bindings documentation
2016-09-07 7:49 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.9 Simon Horman
` (13 preceding siblings ...)
2016-09-07 7:50 ` [PATCH 14/26] ARM: dts: wheat: add Ethernet support Simon Horman
@ 2016-09-07 7:50 ` Simon Horman
2016-09-07 7:50 ` [PATCH 16/26] ARM: dts: rskrza1: initial device tree Simon Horman
` (11 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-09-07 7:50 UTC (permalink / raw)
To: linux-arm-kernel
From: Chris Brandt <chris.brandt@renesas.com>
Add RSKRZA1 Device tree bindings Documentation, listing it as a supported
board.
This allows to use checkpatch to validate DTSes referring to the RSKRZA1
board.
Signed-off-by: Chris Brandt <chris.brandt@renesas.com>
Reviewed-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 90cf237ee558..5484c31d555f 100644
--- a/Documentation/devicetree/bindings/arm/shmobile.txt
+++ b/Documentation/devicetree/bindings/arm/shmobile.txt
@@ -63,6 +63,8 @@ Boards:
compatible = "renesas,marzen", "renesas,r8a7779"
- Porter (M2-LCDP)
compatible = "renesas,porter", "renesas,r8a7791"
+ - RSKRZA1 (YR0K77210C000BE)
+ compatible = "renesas,rskrza1", "renesas,r7s72100"
- Salvator-X (RTP0RC7795SIPB0010S)
compatible = "renesas,salvator-x", "renesas,r8a7795";
- Salvator-X
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 16/26] ARM: dts: rskrza1: initial device tree
2016-09-07 7:49 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.9 Simon Horman
` (14 preceding siblings ...)
2016-09-07 7:50 ` [PATCH 15/26] ARM: dts: Add RSKRZA1 DT bindings documentation Simon Horman
@ 2016-09-07 7:50 ` Simon Horman
2016-09-07 7:50 ` [PATCH 17/26] ARM: dts: r7s72100: add ethernet clock to " Simon Horman
` (10 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-09-07 7:50 UTC (permalink / raw)
To: linux-arm-kernel
From: Chris Brandt <chris.brandt@renesas.com>
Add the initial device tree for the RZ/A1 based development board (RSK).
Signed-off-by: Chris Brandt <chris.brandt@renesas.com>
Reviewed-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/r7s72100-rskrza1.dts | 52 ++++++++++++++++++++++++++++++++++
2 files changed, 53 insertions(+)
create mode 100644 arch/arm/boot/dts/r7s72100-rskrza1.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index d289ec733d2e..80193b3a450b 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -651,6 +651,7 @@ dtb-$(CONFIG_ARCH_S5PV210) += \
dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \
emev2-kzm9d.dtb \
r7s72100-genmai.dtb \
+ r7s72100-rskrza1.dtb \
r8a73a4-ape6evm.dtb \
r8a7740-armadillo800eva.dtb \
r8a7778-bockw.dtb \
diff --git a/arch/arm/boot/dts/r7s72100-rskrza1.dts b/arch/arm/boot/dts/r7s72100-rskrza1.dts
new file mode 100644
index 000000000000..aabfa0459dc1
--- /dev/null
+++ b/arch/arm/boot/dts/r7s72100-rskrza1.dts
@@ -0,0 +1,52 @@
+/*
+ * Device Tree Source for the RZ/A1H RSK board
+ *
+ * Copyright (C) 2016 Renesas Electronics
+ *
+ * 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 "r7s72100.dtsi"
+
+/ {
+ model = "RSKRZA1";
+ compatible = "renesas,rskrza1", "renesas,r7s72100";
+
+ aliases {
+ serial0 = &scif2;
+ };
+
+ chosen {
+ bootargs = "ignore_loglevel";
+ stdout-path = "serial0:115200n8";
+ };
+
+ memory at 8000000 {
+ device_type = "memory";
+ reg = <0x08000000 0x02000000>;
+ };
+
+ lbsc {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ };
+};
+
+&extal_clk {
+ clock-frequency = <13330000>;
+};
+
+&usb_x1_clk {
+ clock-frequency = <48000000>;
+};
+
+&mtu2 {
+ status = "okay";
+};
+
+&scif2 {
+ status = "okay";
+};
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 17/26] ARM: dts: r7s72100: add ethernet clock to device tree
2016-09-07 7:49 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.9 Simon Horman
` (15 preceding siblings ...)
2016-09-07 7:50 ` [PATCH 16/26] ARM: dts: rskrza1: initial device tree Simon Horman
@ 2016-09-07 7:50 ` Simon Horman
2016-09-07 7:50 ` [PATCH 18/26] ARM: dts: r7s72100: add ethernet " Simon Horman
` (9 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-09-07 7:50 UTC (permalink / raw)
To: linux-arm-kernel
From: Chris Brandt <chris.brandt@renesas.com>
Signed-off-by: Chris Brandt <chris.brandt@renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r7s72100.dtsi | 9 +++++++++
include/dt-bindings/clock/r7s72100-clock.h | 3 +++
2 files changed, 12 insertions(+)
diff --git a/arch/arm/boot/dts/r7s72100.dtsi b/arch/arm/boot/dts/r7s72100.dtsi
index e8e2a5d71976..6d29e8ffa0d9 100644
--- a/arch/arm/boot/dts/r7s72100.dtsi
+++ b/arch/arm/boot/dts/r7s72100.dtsi
@@ -108,6 +108,15 @@
clock-output-names = "scif0", "scif1", "scif2", "scif3", "scif4", "scif5", "scif6", "scif7";
};
+ mstp7_clks: mstp7_clks at fcfe0430 {
+ #clock-cells = <1>;
+ compatible = "renesas,r7s72100-mstp-clocks", "renesas,cpg-mstp-clocks";
+ reg = <0xfcfe0430 4>;
+ clocks = <&p0_clk>;
+ clock-indices = <R7S72100_CLK_ETHER>;
+ clock-output-names = "ether";
+ };
+
mstp9_clks: mstp9_clks at fcfe0438 {
#clock-cells = <1>;
compatible = "renesas,r7s72100-mstp-clocks", "renesas,cpg-mstp-clocks";
diff --git a/include/dt-bindings/clock/r7s72100-clock.h b/include/dt-bindings/clock/r7s72100-clock.h
index 5128f4d94f44..3cd813896d08 100644
--- a/include/dt-bindings/clock/r7s72100-clock.h
+++ b/include/dt-bindings/clock/r7s72100-clock.h
@@ -25,6 +25,9 @@
#define R7S72100_CLK_SCIF6 1
#define R7S72100_CLK_SCIF7 0
+/* MSTP7 */
+#define R7S72100_CLK_ETHER 4
+
/* MSTP9 */
#define R7S72100_CLK_I2C0 7
#define R7S72100_CLK_I2C1 6
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 18/26] ARM: dts: r7s72100: add ethernet to device tree
2016-09-07 7:49 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.9 Simon Horman
` (16 preceding siblings ...)
2016-09-07 7:50 ` [PATCH 17/26] ARM: dts: r7s72100: add ethernet clock to " Simon Horman
@ 2016-09-07 7:50 ` Simon Horman
2016-09-07 7:50 ` [PATCH 19/26] ARM: dts: rskrza1: add ethernet DT support Simon Horman
` (8 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-09-07 7:50 UTC (permalink / raw)
To: linux-arm-kernel
From: Chris Brandt <chris.brandt@renesas.com>
Signed-off-by: Chris Brandt <chris.brandt@renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r7s72100.dtsi | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/arch/arm/boot/dts/r7s72100.dtsi b/arch/arm/boot/dts/r7s72100.dtsi
index 6d29e8ffa0d9..fb9ef9ca120e 100644
--- a/arch/arm/boot/dts/r7s72100.dtsi
+++ b/arch/arm/boot/dts/r7s72100.dtsi
@@ -428,4 +428,17 @@
power-domains = <&cpg_clocks>;
status = "disabled";
};
+
+ ether: ethernet at e8203000 {
+ compatible = "renesas,ether-r7s72100";
+ reg = <0xe8203000 0x800>,
+ <0xe8204800 0x200>;
+ interrupts = <GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp7_clks R7S72100_CLK_ETHER>;
+ power-domains = <&cpg_clocks>;
+ phy-mode = "mii";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "disabled";
+ };
};
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 19/26] ARM: dts: rskrza1: add ethernet DT support
2016-09-07 7:49 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.9 Simon Horman
` (17 preceding siblings ...)
2016-09-07 7:50 ` [PATCH 18/26] ARM: dts: r7s72100: add ethernet " Simon Horman
@ 2016-09-07 7:50 ` Simon Horman
2016-09-07 7:50 ` [PATCH 20/26] ARM: dts: r8a7794: fix PWM clock parent Simon Horman
` (7 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-09-07 7:50 UTC (permalink / raw)
To: linux-arm-kernel
From: Chris Brandt <chris.brandt@renesas.com>
Signed-off-by: Chris Brandt <chris.brandt@renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r7s72100-rskrza1.dts | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/arch/arm/boot/dts/r7s72100-rskrza1.dts b/arch/arm/boot/dts/r7s72100-rskrza1.dts
index aabfa0459dc1..e5dea5bb4032 100644
--- a/arch/arm/boot/dts/r7s72100-rskrza1.dts
+++ b/arch/arm/boot/dts/r7s72100-rskrza1.dts
@@ -47,6 +47,15 @@
status = "okay";
};
+ðer {
+ status = "okay";
+ renesas,no-ether-link;
+ phy-handle = <&phy0>;
+ phy0: ethernet-phy at 0 {
+ reg = <0>;
+ };
+};
+
&scif2 {
status = "okay";
};
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 20/26] ARM: dts: r8a7794: fix PWM clock parent
2016-09-07 7:49 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.9 Simon Horman
` (18 preceding siblings ...)
2016-09-07 7:50 ` [PATCH 19/26] ARM: dts: rskrza1: add ethernet DT support Simon Horman
@ 2016-09-07 7:50 ` Simon Horman
2016-09-07 7:50 ` [PATCH 21/26] ARM: dts: wheat: add CAN support Simon Horman
` (6 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-09-07 7:50 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
When removing the non-existing thermal clock I forgot to remove its
parent from the node's "clocks" property -- this led to a wrong PWM
clock's parent clock.
Fixes: 2a29f9d6fea8 ("ARM: dts: r8a7794: add MSTP5 clocks")
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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index 611ec6df5cf6..9365580a194f 100644
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -1251,7 +1251,7 @@
mstp5_clks: mstp5_clks at e6150144 {
compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
reg = <0 0xe6150144 0 4>, <0 0xe615003c 0 4>;
- clocks = <&hp_clk>, <&extal_clk>, <&p_clk>;
+ clocks = <&hp_clk>, <&p_clk>;
#clock-cells = <1>;
clock-indices = <R8A7794_CLK_AUDIO_DMAC0
R8A7794_CLK_PWM>;
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 21/26] ARM: dts: wheat: add CAN support
2016-09-07 7:49 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.9 Simon Horman
` (19 preceding siblings ...)
2016-09-07 7:50 ` [PATCH 20/26] ARM: dts: r8a7794: fix PWM clock parent Simon Horman
@ 2016-09-07 7:50 ` Simon Horman
2016-09-07 7:50 ` [PATCH 22/26] ARM: dts: wheat: add SDHI0 support Simon Horman
` (5 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-09-07 7:50 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Define the Wheat board dependent part of the CAN0/1 device nodes...
Based on the original (and large) patch by Vladimir Barinov
<vladimir.barinov@cogentembedded.com>.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7792-wheat.dts | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7792-wheat.dts b/arch/arm/boot/dts/r8a7792-wheat.dts
index e214d707f81d..65d13c83d424 100644
--- a/arch/arm/boot/dts/r8a7792-wheat.dts
+++ b/arch/arm/boot/dts/r8a7792-wheat.dts
@@ -76,6 +76,16 @@
function = "lbsc";
};
};
+
+ can0_pins: can0 {
+ groups = "can0_data";
+ function = "can0";
+ };
+
+ can1_pins: can1 {
+ groups = "can1_data";
+ function = "can1";
+ };
};
&scif0 {
@@ -84,3 +94,17 @@
status = "okay";
};
+
+&can0 {
+ pinctrl-0 = <&can0_pins>;
+ pinctrl-names = "default";
+
+ status = "okay";
+};
+
+&can1 {
+ pinctrl-0 = <&can1_pins>;
+ pinctrl-names = "default";
+
+ status = "okay";
+};
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 22/26] ARM: dts: wheat: add SDHI0 support
2016-09-07 7:49 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.9 Simon Horman
` (20 preceding siblings ...)
2016-09-07 7:50 ` [PATCH 21/26] ARM: dts: wheat: add CAN support Simon Horman
@ 2016-09-07 7:50 ` Simon Horman
2016-09-07 7:50 ` [PATCH 23/26] ARM: dts: r8a7792: add QSPI clock Simon Horman
` (4 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-09-07 7:50 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Define the Wheat board dependent part of the SDHI0 (connected to the
micro-SD slot) device node along with the necessary voltage regulator.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7792-wheat.dts | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7792-wheat.dts b/arch/arm/boot/dts/r8a7792-wheat.dts
index 65d13c83d424..ff37de35c57c 100644
--- a/arch/arm/boot/dts/r8a7792-wheat.dts
+++ b/arch/arm/boot/dts/r8a7792-wheat.dts
@@ -11,6 +11,7 @@
/dts-v1/;
#include "r8a7792.dtsi"
+#include <dt-bindings/gpio/gpio.h>
/ {
model = "Wheat";
@@ -54,6 +55,17 @@
pinctrl-0 = <&lan89218_pins>;
pinctrl-names = "default";
};
+
+ vcc_sdhi0: regulator-vcc-sdhi0 {
+ compatible = "regulator-fixed";
+
+ regulator-name = "SDHI0 Vcc";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+
+ gpio = <&gpio11 12 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
+ };
};
&extal_clk {
@@ -86,6 +98,11 @@
groups = "can1_data";
function = "can1";
};
+
+ sdhi0_pins: sdhi0 {
+ groups = "sdhi0_data4", "sdhi0_ctrl";
+ function = "sdhi0";
+ };
};
&scif0 {
@@ -108,3 +125,12 @@
status = "okay";
};
+
+&sdhi0 {
+ pinctrl-0 = <&sdhi0_pins>;
+ pinctrl-names = "default";
+
+ vmmc-supply = <&vcc_sdhi0>;
+ cd-gpios = <&gpio11 11 GPIO_ACTIVE_LOW>;
+ status = "okay";
+};
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 23/26] ARM: dts: r8a7792: add QSPI clock
2016-09-07 7:49 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.9 Simon Horman
` (21 preceding siblings ...)
2016-09-07 7:50 ` [PATCH 22/26] ARM: dts: wheat: add SDHI0 support Simon Horman
@ 2016-09-07 7:50 ` Simon Horman
2016-09-07 7:50 ` [PATCH 24/26] ARM: dts: r8a7792: add QSPI support Simon Horman
` (3 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-09-07 7:50 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Describe the QSPI clock in the R8A7792 device tree.
Based on the original (and large) patch by Vladimir Barinov
<vladimir.barinov@cogentembedded.com>.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7792.dtsi | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7792.dtsi b/arch/arm/boot/dts/r8a7792.dtsi
index ff47755fb01e..6ff3e365d56a 100644
--- a/arch/arm/boot/dts/r8a7792.dtsi
+++ b/arch/arm/boot/dts/r8a7792.dtsi
@@ -860,6 +860,7 @@
clocks = <&cp_clk>, <&cp_clk>, <&cp_clk>, <&cp_clk>,
<&cp_clk>, <&cp_clk>, <&cp_clk>, <&cp_clk>,
<&cp_clk>, <&cp_clk>, <&p_clk>, <&p_clk>,
+ <&cpg_clocks R8A7792_CLK_QSPI>,
<&cp_clk>, <&cp_clk>, <&hp_clk>, <&hp_clk>,
<&hp_clk>, <&hp_clk>, <&hp_clk>, <&hp_clk>;
#clock-cells = <1>;
@@ -870,6 +871,7 @@
R8A7792_CLK_GPIO1 R8A7792_CLK_GPIO0
R8A7792_CLK_GPIO11 R8A7792_CLK_GPIO10
R8A7792_CLK_CAN1 R8A7792_CLK_CAN0
+ R8A7792_CLK_QSPI_MOD
R8A7792_CLK_GPIO9 R8A7792_CLK_GPIO8
R8A7792_CLK_I2C5 R8A7792_CLK_I2C4
R8A7792_CLK_I2C3 R8A7792_CLK_I2C2
@@ -879,8 +881,9 @@
"gpio7", "gpio6", "gpio5", "gpio4",
"gpio3", "gpio2", "gpio1", "gpio0",
"gpio11", "gpio10", "can1", "can0",
- "gpio9", "gpio8", "i2c5", "i2c4",
- "i2c3", "i2c2", "i2c1", "i2c0";
+ "qspi_mod", "gpio9", "gpio8",
+ "i2c5", "i2c4", "i2c3", "i2c2",
+ "i2c1", "i2c0";
};
};
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 24/26] ARM: dts: r8a7792: add QSPI support
2016-09-07 7:49 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.9 Simon Horman
` (22 preceding siblings ...)
2016-09-07 7:50 ` [PATCH 23/26] ARM: dts: r8a7792: add QSPI clock Simon Horman
@ 2016-09-07 7:50 ` Simon Horman
2016-09-07 7:50 ` [PATCH 25/26] ARM: dts: wheat: " Simon Horman
` (2 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-09-07 7:50 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Define the generic R8A7792 part of the QSPI device node.
Based on the original (and large) patch by Vladimir Barinov
<vladimir.barinov@cogentembedded.com>.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7792.dtsi | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7792.dtsi b/arch/arm/boot/dts/r8a7792.dtsi
index 6ff3e365d56a..713141d38b3e 100644
--- a/arch/arm/boot/dts/r8a7792.dtsi
+++ b/arch/arm/boot/dts/r8a7792.dtsi
@@ -25,6 +25,7 @@
i2c3 = &i2c3;
i2c4 = &i2c4;
i2c5 = &i2c5;
+ spi0 = &qspi;
vin0 = &vin0;
vin1 = &vin1;
vin2 = &vin2;
@@ -556,6 +557,21 @@
status = "disabled";
};
+ qspi: spi at e6b10000 {
+ compatible = "renesas,qspi-r8a7792", "renesas,qspi";
+ reg = <0 0xe6b10000 0 0x2c>;
+ interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp9_clks R8A7792_CLK_QSPI_MOD>;
+ dmas = <&dmac0 0x17>, <&dmac0 0x18>,
+ <&dmac1 0x17>, <&dmac1 0x18>;
+ dma-names = "tx", "rx", "tx", "rx";
+ power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
+ num-cs = <1>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "disabled";
+ };
+
du: display at feb00000 {
compatible = "renesas,du-r8a7792";
reg = <0 0xfeb00000 0 0x40000>;
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 25/26] ARM: dts: wheat: add QSPI support
2016-09-07 7:49 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.9 Simon Horman
` (23 preceding siblings ...)
2016-09-07 7:50 ` [PATCH 24/26] ARM: dts: r8a7792: add QSPI support Simon Horman
@ 2016-09-07 7:50 ` Simon Horman
2016-09-07 7:50 ` [PATCH 26/26] ARM: dts: wheat: add support for tactile switches Simon Horman
2016-09-13 15:35 ` [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.9 Arnd Bergmann
26 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-09-07 7:50 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Define the Wheat 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 (and large) patch by Vladimir Barinov
<vladimir.barinov@cogentembedded.com>.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7792-wheat.dts | 43 +++++++++++++++++++++++++++++++++++++
1 file changed, 43 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7792-wheat.dts b/arch/arm/boot/dts/r8a7792-wheat.dts
index ff37de35c57c..0ec4bc606c61 100644
--- a/arch/arm/boot/dts/r8a7792-wheat.dts
+++ b/arch/arm/boot/dts/r8a7792-wheat.dts
@@ -103,6 +103,11 @@
groups = "sdhi0_data4", "sdhi0_ctrl";
function = "sdhi0";
};
+
+ qspi_pins: qspi {
+ groups = "qspi_ctrl", "qspi_data4";
+ function = "qspi";
+ };
};
&scif0 {
@@ -134,3 +139,41 @@
cd-gpios = <&gpio11 11 GPIO_ACTIVE_LOW>;
status = "okay";
};
+
+&qspi {
+ pinctrl-0 = <&qspi_pins>;
+ pinctrl-names = "default";
+ status = "okay";
+
+ flash at 0 {
+ 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;
+
+ partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ partition at 0 {
+ label = "loader";
+ reg = <0x00000000 0x00040000>;
+ read-only;
+ };
+ partition at 40000 {
+ label = "user";
+ reg = <0x00040000 0x00400000>;
+ read-only;
+ };
+ partition at 440000 {
+ label = "flash";
+ reg = <0x00440000 0x03bc0000>;
+ };
+ };
+ };
+};
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 26/26] ARM: dts: wheat: add support for tactile switches
2016-09-07 7:49 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.9 Simon Horman
` (24 preceding siblings ...)
2016-09-07 7:50 ` [PATCH 25/26] ARM: dts: wheat: " Simon Horman
@ 2016-09-07 7:50 ` Simon Horman
2016-09-13 15:35 ` [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.9 Arnd Bergmann
26 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-09-07 7:50 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Add support for the tactile switches SW2/3 (on the debug board) as a
virtual keyboard like it was done with the Blanche 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>
---
arch/arm/boot/dts/r8a7792-wheat.dts | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7792-wheat.dts b/arch/arm/boot/dts/r8a7792-wheat.dts
index 0ec4bc606c61..6dbb94114a93 100644
--- a/arch/arm/boot/dts/r8a7792-wheat.dts
+++ b/arch/arm/boot/dts/r8a7792-wheat.dts
@@ -12,6 +12,7 @@
/dts-v1/;
#include "r8a7792.dtsi"
#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
/ {
model = "Wheat";
@@ -56,6 +57,25 @@
pinctrl-names = "default";
};
+ keyboard {
+ compatible = "gpio-keys";
+
+ key-a {
+ linux,code = <KEY_A>;
+ label = "SW2";
+ wakeup-source;
+ debounce-interval = <20>;
+ gpios = <&gpio3 20 GPIO_ACTIVE_LOW>;
+ };
+ key-b {
+ linux,code = <KEY_B>;
+ label = "SW3";
+ wakeup-source;
+ debounce-interval = <20>;
+ gpios = <&gpio11 2 GPIO_ACTIVE_LOW>;
+ };
+ };
+
vcc_sdhi0: regulator-vcc-sdhi0 {
compatible = "regulator-fixed";
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 29+ messages in thread* [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.9
2016-09-07 7:49 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.9 Simon Horman
` (25 preceding siblings ...)
2016-09-07 7:50 ` [PATCH 26/26] ARM: dts: wheat: add support for tactile switches Simon Horman
@ 2016-09-13 15:35 ` Arnd Bergmann
2016-09-16 9:50 ` Simon Horman
26 siblings, 1 reply; 29+ messages in thread
From: Arnd Bergmann @ 2016-09-13 15:35 UTC (permalink / raw)
To: linux-arm-kernel
On Wednesday, September 7, 2016 9:49:30 AM CEST Simon Horman wrote:
> Second Round of Renesas ARM Based SoC DT Updates for v4.9
>
> Fixes (for v4.9):
> * Correct PWM clock parent on r8a7794 SoC
>
> Clean-up:
> * Remove obsolete vsp1 properties from r8a779[01] SoCs
>
> New boards:
> * Add r8a7792/wheat and r7s72100/rskrza1 boards
>
> Enablement:
> * Enable LEDs, DU, SDHI on r8a7792/blanche board
> * Enable MMCIF and SDHI on r8a7794/alt board
> * Add SPI and VSP1 to r8a7792 SoC
> * Add ethernet to r7s72100 SoC
>
Pulled into next/dt, thanks!
Arnd
^ permalink raw reply [flat|nested] 29+ messages in thread* [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.9
2016-09-13 15:35 ` [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.9 Arnd Bergmann
@ 2016-09-16 9:50 ` Simon Horman
0 siblings, 0 replies; 29+ messages in thread
From: Simon Horman @ 2016-09-16 9:50 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Sep 13, 2016 at 05:35:25PM +0200, Arnd Bergmann wrote:
> On Wednesday, September 7, 2016 9:49:30 AM CEST Simon Horman wrote:
> > Second Round of Renesas ARM Based SoC DT Updates for v4.9
> >
> > Fixes (for v4.9):
> > * Correct PWM clock parent on r8a7794 SoC
> >
> > Clean-up:
> > * Remove obsolete vsp1 properties from r8a779[01] SoCs
> >
> > New boards:
> > * Add r8a7792/wheat and r7s72100/rskrza1 boards
> >
> > Enablement:
> > * Enable LEDs, DU, SDHI on r8a7792/blanche board
> > * Enable MMCIF and SDHI on r8a7794/alt board
> > * Add SPI and VSP1 to r8a7792 SoC
> > * Add ethernet to r7s72100 SoC
> >
>
> Pulled into next/dt, thanks!
Great, thanks for handling this and the other pull requests I sent last week.
^ permalink raw reply [flat|nested] 29+ messages in thread