This patch series aims to improvide the shmobile DT bindings, DT binding
documentation, and the actual device trees.
It reduces the number of checkpatch warnings about un-documented compatible
strings in the DTSes by 50%.
The last 4 patches contain compatible strings for new R-Car Gen2 SoCs,
which are not yet in active use, hence the RFC status.
[01/13] of: Add vendor prefix for Sitronix
[02/13] irqchip: renesas-intc-irqpin: Document SoC-specific bindings
[03/13] irqchip: renesas-irqc: Add DT binding documentation
[04/13] mmc: tmio-mmc: Add renesas,sdhi-r8a7791 to binding documentation
[05/13] thermal: rcar: Document SoC-specific bindings
[06/13] sh-pfc: Add renesas,pfc-r8a7791 to binding documentation
[07/13] ARM: shmobile: r8a73a4 dtsi: Add SoC-specific irqc compatible
property
[08/13] ARM: shmobile: r8a73a4 dtsi: Add SoC-specific thermal compatible
property
[09/13] ARM: shmobile: r8a7779 dtsi: Add SoC-specific thermal compatible
property
[10/13] [RFC] ARM: dts: Add shmobile platform device tree bindings
documentation
[11/13] [RFC] mmc: tmio-mmc: Add support for SDHI on new R-Car Gen2 SoCs
[12/13] [RFC] thermal: rcar: Add binding docs for new R-Car Gen2 SoCs
[13/13] [RFC] irqchip: renesas-irqc: Add binding docs for new R-Car Gen2 SoCs
Documentation/devicetree/bindings/arm/shmobile.txt | 71 ++++++++++++++++++++++
.../interrupt-controller/renesas,intc-irqpin.txt | 8 ++-
.../bindings/interrupt-controller/renesas,irqc.txt | 33 ++++++++++
Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 4 ++
.../bindings/pinctrl/renesas,pfc-pinctrl.txt | 1 +
.../devicetree/bindings/thermal/rcar-thermal.txt | 21 +++++--
.../devicetree/bindings/vendor-prefixes.txt | 1 +
arch/arm/boot/dts/r8a73a4.dtsi | 6 +-
arch/arm/boot/dts/r8a7779.dtsi | 2 +-
drivers/mmc/host/sh_mobile_sdhi.c | 3 +
10 files changed, 139 insertions(+), 11 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/shmobile.txt
create mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt
Thanks for your comments!
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
The driver already supports the r8a7791 SoC, and "renesas,sdhi-r8a7791"
is already in use.
Signed-off-by: Geert Uytterhoeven <[email protected]>
Cc: Ian Molton <[email protected]>
Cc: Chris Ball <[email protected]>
Cc: [email protected]
---
Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/mmc/tmio_mmc.txt b/Documentation/devicetree/bindings/mmc/tmio_mmc.txt
index 6a2a1160a70d..fa0f327cde01 100644
--- a/Documentation/devicetree/bindings/mmc/tmio_mmc.txt
+++ b/Documentation/devicetree/bindings/mmc/tmio_mmc.txt
@@ -18,6 +18,7 @@ Required properties:
"renesas,sdhi-r8a7778" - SDHI IP on R8A7778 SoC
"renesas,sdhi-r8a7779" - SDHI IP on R8A7779 SoC
"renesas,sdhi-r8a7790" - SDHI IP on R8A7790 SoC
+ "renesas,sdhi-r8a7791" - SDHI IP on R8A7791 SoC
Optional properties:
- toshiba,mmc-wrprotect-disable: write-protect detection is unavailable
--
1.9.1
- r8a7792 (R-Car V2H)
- r8a7793 (R-Car M2-N)
- r8a7794 (R-Car E2)
Signed-off-by: Geert Uytterhoeven <[email protected]>
---
Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 3 +++
drivers/mmc/host/sh_mobile_sdhi.c | 3 +++
2 files changed, 6 insertions(+)
diff --git a/Documentation/devicetree/bindings/mmc/tmio_mmc.txt b/Documentation/devicetree/bindings/mmc/tmio_mmc.txt
index fa0f327cde01..400b640fabc7 100644
--- a/Documentation/devicetree/bindings/mmc/tmio_mmc.txt
+++ b/Documentation/devicetree/bindings/mmc/tmio_mmc.txt
@@ -19,6 +19,9 @@ Required properties:
"renesas,sdhi-r8a7779" - SDHI IP on R8A7779 SoC
"renesas,sdhi-r8a7790" - SDHI IP on R8A7790 SoC
"renesas,sdhi-r8a7791" - SDHI IP on R8A7791 SoC
+ "renesas,sdhi-r8a7792" - SDHI IP on R8A7792 SoC
+ "renesas,sdhi-r8a7793" - SDHI IP on R8A7793 SoC
+ "renesas,sdhi-r8a7794" - SDHI IP on R8A7794 SoC
Optional properties:
- toshiba,mmc-wrprotect-disable: write-protect detection is unavailable
diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c
index 91058dabd11a..443c20969bd7 100644
--- a/drivers/mmc/host/sh_mobile_sdhi.c
+++ b/drivers/mmc/host/sh_mobile_sdhi.c
@@ -68,6 +68,9 @@ static const struct of_device_id sh_mobile_sdhi_of_match[] = {
{ .compatible = "renesas,sdhi-r8a7779", .data = &of_rcar_gen1_compatible, },
{ .compatible = "renesas,sdhi-r8a7790", .data = &of_rcar_gen2_compatible, },
{ .compatible = "renesas,sdhi-r8a7791", .data = &of_rcar_gen2_compatible, },
+ { .compatible = "renesas,sdhi-r8a7792", .data = &of_rcar_gen2_compatible, },
+ { .compatible = "renesas,sdhi-r8a7793", .data = &of_rcar_gen2_compatible, },
+ { .compatible = "renesas,sdhi-r8a7794", .data = &of_rcar_gen2_compatible, },
{},
};
MODULE_DEVICE_TABLE(of, sh_mobile_sdhi_of_match);
--
1.9.1
The stock ticker for Sitronix is just a number.
"sitronix,st1232" is used for the Sitronix st1232 touchscreen controller.
Signed-off-by: Geert Uytterhoeven <[email protected]>
---
Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 46a311e728a8..967bb7797a54 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -120,6 +120,7 @@ silabs Silicon Laboratories
simtek
sii Seiko Instruments, Inc.
sirf SiRF Technology, Inc.
+sitronix Sitronix Technology Corporation
smsc Standard Microsystems Corporation
snps Synopsys, Inc.
spansion Spansion Inc.
--
1.9.1
Add Renesas SH-Mobile, R-Mobile, and R-Car Platform Device Tree Bindings
Documentation, listing supported SoCs and boards.
This allows to use checkpatch to validate DTSes referring to Renesas
shmobile SoCs, and boards containing those SoCs.
Signed-off-by: Geert Uytterhoeven <[email protected]>
Cc: [email protected]
---
Documentation/devicetree/bindings/arm/shmobile.txt | 71 ++++++++++++++++++++++
1 file changed, 71 insertions(+)
create mode 100644 Documentation/devicetree/bindings/arm/shmobile.txt
diff --git a/Documentation/devicetree/bindings/arm/shmobile.txt b/Documentation/devicetree/bindings/arm/shmobile.txt
new file mode 100644
index 000000000000..baa25c92597d
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/shmobile.txt
@@ -0,0 +1,71 @@
+Renesas SH-Mobile, R-Mobile, and R-Car Platform Device Tree Bindings
+--------------------------------------------------------------------
+
+SoCs:
+
+ - Emma Mobile EV2
+ compatible = "renesas,emev2"
+ - RZ/A1H (R7S72100)
+ compatible = "renesas,r7s72100"
+ - R-Mobile APE6 (R8A73A40)
+ compatible = "renesas,r8a73a4"
+ - R-Mobile A1 (R8A77400)
+ compatible = "renesas,r8a7740"
+ - R-Car M1A (R8A77781)
+ compatible = "renesas,r8a7778"
+ - R-Car H1 (R8A77790)
+ compatible = "renesas,r8a7779"
+ - R-Car H2 (R8A77900)
+ compatible = "renesas,r8a7790"
+ - R-Car M2-W (R8A77910)
+ compatible = "renesas,r8a7791"
+ - R-Car V2H (R8A77920)
+ compatible = "renesas,r8a7792"
+ - R-Car M2-N (R8A77930)
+ compatible = "renesas,r8a7793"
+ - R-Car E2 (R8A77940)
+ compatible = "renesas,r8a7794"
+ - SH-Mobile AP4 (R8A73720/SH7372)
+ compatible = "renesas,sh7372"
+ - SH-Mobile AG5 (R8A73A00/SH73A0)
+ compatible = "renesas,sh73a0"
+
+
+Boards:
+
+ - Alt
+ compatible = "renesas,alt", "renesas,r8a7794"
+ - APE6-EVM
+ compatible = "renesas,ape6evm", "renesas,r8a73a4"
+ - APE6-EVM - Reference Device Tree Implementation
+ compatible = "renesas,ape6evm-reference", "renesas,r8a73a4"
+ - Atmark Techno Armadillo-800 EVA
+ compatible = "renesas,armadillo800eva"
+ - Atmark Techno Armadillo-800 EVA - Reference Device Tree Implementation
+ compatible = "renesas,armadillo800eva-reference", "renesas,r8a7740"
+ - BOCK-W
+ compatible = "renesas,bockw", "renesas,r8a7778"
+ - BOCK-W - Reference Device Tree Implementation
+ compatible = "renesas,bockw-reference", "renesas,r8a7778"
+ - Genmai (RTK772100BC00000BR)
+ compatible = "renesas,genmai", "renesas,r7s72100"
+ - Henninger
+ compatible = "renesas,henninger", "renesas,r8a7791"
+ - Koelsch (RTP0RC7791SEB00010S)
+ compatible = "renesas,koelsch", "renesas,r8a7791"
+ - EMEV2 KZM9D
+ compatible = "renesas,kzm9d", "renesas,emev2"
+ - KZM-A9-GT
+ compatible = "renesas,kzm9g", "renesas,sh73a0"
+ - KZM-A9-GT - Reference Device Tree Implementation
+ compatible = "renesas,kzm9g-reference", "renesas,sh73a0"
+ - Lager (RTP0RC7790SEB00010S)
+ compatible = "renesas,lager", "renesas,r8a7790"
+ - Mackerel (R0P7372LC0016RL, AP4 EVM 2nd)
+ compatible = "renesas,mackerel"
+ - Marzen
+ compatible = "renesas,marzen", "renesas,r8a7779"
+
+Note: Reference Device Tree Implementations are temporary implementations
+ to ease the migration from platform devices to Device Tree, and are
+ intended to be removed in the future.
--
1.9.1
The driver already supports the r8a7791 SoC, and "renesas,pfc-r8a7791"
is already in use.
Signed-off-by: Geert Uytterhoeven <[email protected]>
Cc: Linus Walleij <[email protected]>
Cc: Laurent Pinchart <[email protected]>
---
Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt
index 35d2e1f186f0..daef6fad6a5f 100644
--- a/Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt
@@ -15,6 +15,7 @@ Required Properties:
- "renesas,pfc-r8a7778": for R8A7778 (R-Mobile M1) compatible pin-controller.
- "renesas,pfc-r8a7779": for R8A7779 (R-Car H1) compatible pin-controller.
- "renesas,pfc-r8a7790": for R8A7790 (R-Car H2) compatible pin-controller.
+ - "renesas,pfc-r8a7791": for R8A7791 (R-Car M2) compatible pin-controller.
- "renesas,pfc-sh7372": for SH7372 (SH-Mobile AP4) compatible pin-controller.
- "renesas,pfc-sh73a0": for SH73A0 (SH-Mobile AG5) compatible pin-controller.
--
1.9.1
- r8a7792 (R-Car V2H)
- r8a7793 (R-Car M2-N)
- r8a7794 (R-Car E2)
r8a7791 is now called "R-Car M2-W".
Signed-off-by: Geert Uytterhoeven <[email protected]>
---
Documentation/devicetree/bindings/thermal/rcar-thermal.txt | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/thermal/rcar-thermal.txt b/Documentation/devicetree/bindings/thermal/rcar-thermal.txt
index 0ef00be44b01..43404b197933 100644
--- a/Documentation/devicetree/bindings/thermal/rcar-thermal.txt
+++ b/Documentation/devicetree/bindings/thermal/rcar-thermal.txt
@@ -7,7 +7,10 @@ Required properties:
- "renesas,thermal-r8a73a4" (R-Mobile AP6)
- "renesas,thermal-r8a7779" (R-Car H1)
- "renesas,thermal-r8a7790" (R-Car H2)
- - "renesas,thermal-r8a7791" (R-Car M2)
+ - "renesas,thermal-r8a7791" (R-Car M2-W)
+ - "renesas,thermal-r8a7792" (R-Car V2H)
+ - "renesas,thermal-r8a7793" (R-Car M2-N)
+ - "renesas,thermal-r8a7794" (R-Car E2)
- reg : Address range of the thermal registers.
The 1st reg will be recognized as common register
if it has "interrupts".
--
1.9.1
- r8a7792 (R-Car V2H)
- r8a7793 (R-Car M2-N)
- r8a7794 (R-Car E2)
r8a7791 is now called "R-Car M2-W".
Signed-off-by: Geert Uytterhoeven <[email protected]>
---
.../devicetree/bindings/interrupt-controller/renesas,irqc.txt | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt b/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt
index f819e2a5907c..cd9d92708c21 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt
+++ b/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt
@@ -6,7 +6,10 @@ Required properties:
Examples with soctypes are:
- "renesas,irqc-r8a73a4" (R-Mobile AP6)
- "renesas,irqc-r8a7790" (R-Car H2)
- - "renesas,irqc-r8a7791" (R-Car M2)
+ - "renesas,irqc-r8a7791" (R-Car M2-W)
+ - "renesas,irqc-r8a7792" (R-Car V2H)
+ - "renesas,irqc-r8a7793" (R-Car M2-N)
+ - "renesas,irqc-r8a7794" (R-Car E2)
- #interrupt-cells: has to be <2>: an interrupt index and flags, as defined in
interrupts.txt in this directory
--
1.9.1
The thermal node used the generic compatible property only.
Add the SoC-specific one, to make it future proof.
Signed-off-by: Geert Uytterhoeven <[email protected]>
---
arch/arm/boot/dts/r8a73a4.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a73a4.dtsi b/arch/arm/boot/dts/r8a73a4.dtsi
index f3bd3d4603d7..59145b267862 100644
--- a/arch/arm/boot/dts/r8a73a4.dtsi
+++ b/arch/arm/boot/dts/r8a73a4.dtsi
@@ -165,7 +165,7 @@
};
thermal@e61f0000 {
- compatible = "renesas,rcar-thermal";
+ compatible = "renesas,thermal-r8a73a4", "renesas,rcar-thermal";
reg = <0 0xe61f0000 0 0x14>, <0 0xe61f0100 0 0x38>,
<0 0xe61f0200 0 0x38>, <0 0xe61f0300 0 0x38>;
interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>;
--
1.9.1
The thermal node used the generic compatible property only.
Add the SoC-specific one, to make it future proof.
Signed-off-by: Geert Uytterhoeven <[email protected]>
---
arch/arm/boot/dts/r8a7779.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
index 94e2fc836492..aca1f9bd714e 100644
--- a/arch/arm/boot/dts/r8a7779.dtsi
+++ b/arch/arm/boot/dts/r8a7779.dtsi
@@ -262,7 +262,7 @@
};
thermal@ffc48000 {
- compatible = "renesas,rcar-thermal";
+ compatible = "renesas,thermal-r8a7779", "renesas,rcar-thermal";
reg = <0xffc48000 0x38>;
};
--
1.9.1
The interrupt controller used the generic compatible property only.
Add the SoC-specific one, to make it future proof.
Signed-off-by: Geert Uytterhoeven <[email protected]>
---
arch/arm/boot/dts/r8a73a4.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/r8a73a4.dtsi b/arch/arm/boot/dts/r8a73a4.dtsi
index 82c5ac825386..f3bd3d4603d7 100644
--- a/arch/arm/boot/dts/r8a73a4.dtsi
+++ b/arch/arm/boot/dts/r8a73a4.dtsi
@@ -51,7 +51,7 @@
};
irqc0: interrupt-controller@e61c0000 {
- compatible = "renesas,irqc";
+ compatible = "renesas,irqc-r8a73a4", "renesas,irqc";
#interrupt-cells = <2>;
interrupt-controller;
reg = <0 0xe61c0000 0 0x200>;
@@ -90,7 +90,7 @@
};
irqc1: interrupt-controller@e61c0200 {
- compatible = "renesas,irqc";
+ compatible = "renesas,irqc-r8a73a4", "renesas,irqc";
#interrupt-cells = <2>;
interrupt-controller;
reg = <0 0xe61c0200 0 0x200>;
--
1.9.1
The documentation only mentioned the generic fallback compatible property.
Add the missing SoC-specific compatible properties, some of which are
already in use.
Signed-off-by: Geert Uytterhoeven <[email protected]>
Cc: Zhang Rui <[email protected]>
Cc: Eduardo Valentin <[email protected]>
Cc: [email protected]
---
.../devicetree/bindings/thermal/rcar-thermal.txt | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/Documentation/devicetree/bindings/thermal/rcar-thermal.txt b/Documentation/devicetree/bindings/thermal/rcar-thermal.txt
index 28ef498a66e5..0ef00be44b01 100644
--- a/Documentation/devicetree/bindings/thermal/rcar-thermal.txt
+++ b/Documentation/devicetree/bindings/thermal/rcar-thermal.txt
@@ -1,7 +1,13 @@
* Renesas R-Car Thermal
Required properties:
-- compatible : "renesas,rcar-thermal"
+- compatible : "renesas,thermal-<soctype>", "renesas,rcar-thermal"
+ as fallback.
+ Examples with soctypes are:
+ - "renesas,thermal-r8a73a4" (R-Mobile AP6)
+ - "renesas,thermal-r8a7779" (R-Car H1)
+ - "renesas,thermal-r8a7790" (R-Car H2)
+ - "renesas,thermal-r8a7791" (R-Car M2)
- reg : Address range of the thermal registers.
The 1st reg will be recognized as common register
if it has "interrupts".
@@ -12,18 +18,18 @@ Option properties:
Example (non interrupt support):
-thermal@e61f0100 {
- compatible = "renesas,rcar-thermal";
- reg = <0xe61f0100 0x38>;
+thermal@ffc48000 {
+ compatible = "renesas,thermal-r8a7779", "renesas,rcar-thermal";
+ reg = <0xffc48000 0x38>;
};
Example (interrupt support):
thermal@e61f0000 {
- compatible = "renesas,rcar-thermal";
+ compatible = "renesas,thermal-r8a73a4", "renesas,rcar-thermal";
reg = <0xe61f0000 0x14
0xe61f0100 0x38
0xe61f0200 0x38
0xe61f0300 0x38>;
- interrupts = <0 69 4>;
+ interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>;
};
--
1.9.1
The renesas-irqc driver supports DT, but the DT binding documentation was
missing.
Signed-off-by: Geert Uytterhoeven <[email protected]>
Cc: Thomas Gleixner <[email protected]>
---
.../bindings/interrupt-controller/renesas,irqc.txt | 30 ++++++++++++++++++++++
1 file changed, 30 insertions(+)
create mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt
diff --git a/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt b/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt
new file mode 100644
index 000000000000..f819e2a5907c
--- /dev/null
+++ b/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt
@@ -0,0 +1,30 @@
+DT bindings for the R-Mobile/R-Car interrupt controller
+
+Required properties:
+
+- compatible: has to be "renesas,irqc-<soctype>", "renesas,irqc" as fallback.
+ Examples with soctypes are:
+ - "renesas,irqc-r8a73a4" (R-Mobile AP6)
+ - "renesas,irqc-r8a7790" (R-Car H2)
+ - "renesas,irqc-r8a7791" (R-Car M2)
+- #interrupt-cells: has to be <2>: an interrupt index and flags, as defined in
+ interrupts.txt in this directory
+
+Optional properties:
+
+- any properties, listed in interrupts.txt, and any standard resource allocation
+ properties
+
+Example:
+
+ irqc0: interrupt-controller@e61c0000 {
+ compatible = "renesas,irqc-r8a7790", "renesas,irqc";
+ #interrupt-cells = <2>;
+ interrupt-controller;
+ reg = <0 0xe61c0000 0 0x200>;
+ interrupts = <0 0 IRQ_TYPE_LEVEL_HIGH>,
+ <0 1 IRQ_TYPE_LEVEL_HIGH>,
+ <0 2 IRQ_TYPE_LEVEL_HIGH>,
+ <0 3 IRQ_TYPE_LEVEL_HIGH>;
+ };
+
--
1.9.1
The documentation only mentioned the generic fallback compatible property.
Add the missing SoC-specific compatible properties, which are already in
use.
Signed-off-by: Geert Uytterhoeven <[email protected]>
Cc: Thomas Gleixner <[email protected]>
---
.../bindings/interrupt-controller/renesas,intc-irqpin.txt | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/interrupt-controller/renesas,intc-irqpin.txt b/Documentation/devicetree/bindings/interrupt-controller/renesas,intc-irqpin.txt
index 1f8b0c507c26..c73acd060093 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/renesas,intc-irqpin.txt
+++ b/Documentation/devicetree/bindings/interrupt-controller/renesas,intc-irqpin.txt
@@ -2,7 +2,13 @@ DT bindings for the R-/SH-Mobile irqpin controller
Required properties:
-- compatible: has to be "renesas,intc-irqpin"
+- compatible: has to be "renesas,intc-irqpin-<soctype>", "renesas,intc-irqpin"
+ as fallback.
+ Examples with soctypes are:
+ - "renesas,intc-irqpin-r8a7740" (R-Mobile A1)
+ - "renesas,intc-irqpin-r8a7778" (R-Car M1A)
+ - "renesas,intc-irqpin-r8a7779" (R-Car H1)
+ - "renesas,intc-irqpin-sh73a0" (SH-Mobile AG5)
- #interrupt-cells: has to be <2>: an interrupt index and flags, as defined in
interrupts.txt in this directory
--
1.9.1
On 9 July 2014 14:23, Geert Uytterhoeven <[email protected]> wrote:
> The driver already supports the r8a7791 SoC, and "renesas,sdhi-r8a7791"
> is already in use.
>
> Signed-off-by: Geert Uytterhoeven <[email protected]>
> Cc: Ian Molton <[email protected]>
> Cc: Chris Ball <[email protected]>
> Cc: [email protected]
Thanks! Applied for next.
Kind regards
Uffe
> ---
> Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/Documentation/devicetree/bindings/mmc/tmio_mmc.txt b/Documentation/devicetree/bindings/mmc/tmio_mmc.txt
> index 6a2a1160a70d..fa0f327cde01 100644
> --- a/Documentation/devicetree/bindings/mmc/tmio_mmc.txt
> +++ b/Documentation/devicetree/bindings/mmc/tmio_mmc.txt
> @@ -18,6 +18,7 @@ Required properties:
> "renesas,sdhi-r8a7778" - SDHI IP on R8A7778 SoC
> "renesas,sdhi-r8a7779" - SDHI IP on R8A7779 SoC
> "renesas,sdhi-r8a7790" - SDHI IP on R8A7790 SoC
> + "renesas,sdhi-r8a7791" - SDHI IP on R8A7791 SoC
>
> Optional properties:
> - toshiba,mmc-wrprotect-disable: write-protect detection is unavailable
> --
> 1.9.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
Hi Geert,
Thank you for the patch.
On Wednesday 09 July 2014 14:23:36 Geert Uytterhoeven wrote:
> The driver already supports the r8a7791 SoC, and "renesas,pfc-r8a7791"
> is already in use.
>
> Signed-off-by: Geert Uytterhoeven <[email protected]>
> Cc: Linus Walleij <[email protected]>
> Cc: Laurent Pinchart <[email protected]>
Acked-by: Laurent Pinchart <[email protected]>
> ---
> Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git
> a/Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt
> b/Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt index
> 35d2e1f186f0..daef6fad6a5f 100644
> --- a/Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt
> +++ b/Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt
> @@ -15,6 +15,7 @@ Required Properties:
> - "renesas,pfc-r8a7778": for R8A7778 (R-Mobile M1) compatible
> pin-controller. - "renesas,pfc-r8a7779": for R8A7779 (R-Car H1) compatible
> pin-controller. - "renesas,pfc-r8a7790": for R8A7790 (R-Car H2) compatible
> pin-controller. + - "renesas,pfc-r8a7791": for R8A7791 (R-Car M2)
> compatible pin-controller. - "renesas,pfc-sh7372": for SH7372 (SH-Mobile
> AP4) compatible pin-controller. - "renesas,pfc-sh73a0": for SH73A0
> (SH-Mobile AG5) compatible pin-controller.
--
Regards,
Laurent Pinchart
On Wed, Jul 9, 2014 at 2:23 PM, Geert Uytterhoeven
<[email protected]> wrote:
> The driver already supports the r8a7791 SoC, and "renesas,pfc-r8a7791"
> is already in use.
>
> Signed-off-by: Geert Uytterhoeven <[email protected]>
> Cc: Linus Walleij <[email protected]>
> Cc: Laurent Pinchart <[email protected]>
Patch applied with Laurent's ACK.
Yours,
Linus Walleij
On Wed, Jul 09, 2014 at 02:23:33PM +0200, Geert Uytterhoeven wrote:
> The renesas-irqc driver supports DT, but the DT binding documentation was
> missing.
>
> Signed-off-by: Geert Uytterhoeven <[email protected]>
> Cc: Thomas Gleixner <[email protected]>
Acked-by: Simon Horman <[email protected]>
> ---
> .../bindings/interrupt-controller/renesas,irqc.txt | 30 ++++++++++++++++++++++
> 1 file changed, 30 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt
>
> diff --git a/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt b/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt
> new file mode 100644
> index 000000000000..f819e2a5907c
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt
> @@ -0,0 +1,30 @@
> +DT bindings for the R-Mobile/R-Car interrupt controller
> +
> +Required properties:
> +
> +- compatible: has to be "renesas,irqc-<soctype>", "renesas,irqc" as fallback.
> + Examples with soctypes are:
> + - "renesas,irqc-r8a73a4" (R-Mobile AP6)
> + - "renesas,irqc-r8a7790" (R-Car H2)
> + - "renesas,irqc-r8a7791" (R-Car M2)
> +- #interrupt-cells: has to be <2>: an interrupt index and flags, as defined in
> + interrupts.txt in this directory
> +
> +Optional properties:
> +
> +- any properties, listed in interrupts.txt, and any standard resource allocation
> + properties
> +
> +Example:
> +
> + irqc0: interrupt-controller@e61c0000 {
> + compatible = "renesas,irqc-r8a7790", "renesas,irqc";
> + #interrupt-cells = <2>;
> + interrupt-controller;
> + reg = <0 0xe61c0000 0 0x200>;
> + interrupts = <0 0 IRQ_TYPE_LEVEL_HIGH>,
> + <0 1 IRQ_TYPE_LEVEL_HIGH>,
> + <0 2 IRQ_TYPE_LEVEL_HIGH>,
> + <0 3 IRQ_TYPE_LEVEL_HIGH>;
> + };
> +
> --
> 1.9.1
>
On Wed, Jul 09, 2014 at 02:23:37PM +0200, Geert Uytterhoeven wrote:
> The interrupt controller used the generic compatible property only.
> Add the SoC-specific one, to make it future proof.
>
> Signed-off-by: Geert Uytterhoeven <[email protected]>
Thanks, please repost this once the binding has been
accepted by the maintainer.
> ---
> arch/arm/boot/dts/r8a73a4.dtsi | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/boot/dts/r8a73a4.dtsi b/arch/arm/boot/dts/r8a73a4.dtsi
> index 82c5ac825386..f3bd3d4603d7 100644
> --- a/arch/arm/boot/dts/r8a73a4.dtsi
> +++ b/arch/arm/boot/dts/r8a73a4.dtsi
> @@ -51,7 +51,7 @@
> };
>
> irqc0: interrupt-controller@e61c0000 {
> - compatible = "renesas,irqc";
> + compatible = "renesas,irqc-r8a73a4", "renesas,irqc";
> #interrupt-cells = <2>;
> interrupt-controller;
> reg = <0 0xe61c0000 0 0x200>;
> @@ -90,7 +90,7 @@
> };
>
> irqc1: interrupt-controller@e61c0200 {
> - compatible = "renesas,irqc";
> + compatible = "renesas,irqc-r8a73a4", "renesas,irqc";
> #interrupt-cells = <2>;
> interrupt-controller;
> reg = <0 0xe61c0200 0 0x200>;
> --
> 1.9.1
>
On Wed, Jul 09, 2014 at 02:23:42PM +0200, Geert Uytterhoeven wrote:
> - r8a7792 (R-Car V2H)
> - r8a7793 (R-Car M2-N)
> - r8a7794 (R-Car E2)
>
> r8a7791 is now called "R-Car M2-W".
I don't feel strongly about this either way. But it seems to me that if we
want to start using "M2-W" then we should make some effort, though not
necessarily immediately, to update all instances of "M2" that already exist
in the tree.
> Signed-off-by: Geert Uytterhoeven <[email protected]>
> ---
> Documentation/devicetree/bindings/thermal/rcar-thermal.txt | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/devicetree/bindings/thermal/rcar-thermal.txt b/Documentation/devicetree/bindings/thermal/rcar-thermal.txt
> index 0ef00be44b01..43404b197933 100644
> --- a/Documentation/devicetree/bindings/thermal/rcar-thermal.txt
> +++ b/Documentation/devicetree/bindings/thermal/rcar-thermal.txt
> @@ -7,7 +7,10 @@ Required properties:
> - "renesas,thermal-r8a73a4" (R-Mobile AP6)
> - "renesas,thermal-r8a7779" (R-Car H1)
> - "renesas,thermal-r8a7790" (R-Car H2)
> - - "renesas,thermal-r8a7791" (R-Car M2)
> + - "renesas,thermal-r8a7791" (R-Car M2-W)
> + - "renesas,thermal-r8a7792" (R-Car V2H)
> + - "renesas,thermal-r8a7793" (R-Car M2-N)
> + - "renesas,thermal-r8a7794" (R-Car E2)
> - reg : Address range of the thermal registers.
> The 1st reg will be recognized as common register
> if it has "interrupts".
> --
> 1.9.1
>
On Wed, Jul 09, 2014 at 02:23:43PM +0200, Geert Uytterhoeven wrote:
> - r8a7792 (R-Car V2H)
> - r8a7793 (R-Car M2-N)
> - r8a7794 (R-Car E2)
>
> r8a7791 is now called "R-Car M2-W".
As per my comments on patches in this series:
I don't feel strongly about this either way. But it seems to me
that if we want to start using "M2-W" then we should make some
effort, though not necessarily immediately, to update all instances
of "M2" that already exist in the tree.
This seems to be in keeping with the approach we ave taken for
these SoCs for other drivers. And from that point of view it is
fine by me. But I wonder how sure are we that the hardware on the
SoCs will work with this approach.
> Signed-off-by: Geert Uytterhoeven <[email protected]>
> ---
> .../devicetree/bindings/interrupt-controller/renesas,irqc.txt | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt b/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt
> index f819e2a5907c..cd9d92708c21 100644
> --- a/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt
> +++ b/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt
> @@ -6,7 +6,10 @@ Required properties:
> Examples with soctypes are:
> - "renesas,irqc-r8a73a4" (R-Mobile AP6)
> - "renesas,irqc-r8a7790" (R-Car H2)
> - - "renesas,irqc-r8a7791" (R-Car M2)
> + - "renesas,irqc-r8a7791" (R-Car M2-W)
> + - "renesas,irqc-r8a7792" (R-Car V2H)
> + - "renesas,irqc-r8a7793" (R-Car M2-N)
> + - "renesas,irqc-r8a7794" (R-Car E2)
> - #interrupt-cells: has to be <2>: an interrupt index and flags, as defined in
> interrupts.txt in this directory
>
> --
> 1.9.1
>
On Wed, Jul 09, 2014 at 02:23:38PM +0200, Geert Uytterhoeven wrote:
> The thermal node used the generic compatible property only.
> Add the SoC-specific one, to make it future proof.
>
> Signed-off-by: Geert Uytterhoeven <[email protected]>
Thanks, please repost this once the binding has been
accepted by the maintainer.
> ---
> arch/arm/boot/dts/r8a73a4.dtsi | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/boot/dts/r8a73a4.dtsi b/arch/arm/boot/dts/r8a73a4.dtsi
> index f3bd3d4603d7..59145b267862 100644
> --- a/arch/arm/boot/dts/r8a73a4.dtsi
> +++ b/arch/arm/boot/dts/r8a73a4.dtsi
> @@ -165,7 +165,7 @@
> };
>
> thermal@e61f0000 {
> - compatible = "renesas,rcar-thermal";
> + compatible = "renesas,thermal-r8a73a4", "renesas,rcar-thermal";
> reg = <0 0xe61f0000 0 0x14>, <0 0xe61f0100 0 0x38>,
> <0 0xe61f0200 0 0x38>, <0 0xe61f0300 0 0x38>;
> interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>;
> --
> 1.9.1
>
On Wed, Jul 09, 2014 at 02:23:35PM +0200, Geert Uytterhoeven wrote:
> The documentation only mentioned the generic fallback compatible property.
> Add the missing SoC-specific compatible properties, some of which are
> already in use.
>
> Signed-off-by: Geert Uytterhoeven <[email protected]>
> Cc: Zhang Rui <[email protected]>
> Cc: Eduardo Valentin <[email protected]>
> Cc: [email protected]
Acked-by: Simon Horman <[email protected]>
> ---
> .../devicetree/bindings/thermal/rcar-thermal.txt | 18 ++++++++++++------
> 1 file changed, 12 insertions(+), 6 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/thermal/rcar-thermal.txt b/Documentation/devicetree/bindings/thermal/rcar-thermal.txt
> index 28ef498a66e5..0ef00be44b01 100644
> --- a/Documentation/devicetree/bindings/thermal/rcar-thermal.txt
> +++ b/Documentation/devicetree/bindings/thermal/rcar-thermal.txt
> @@ -1,7 +1,13 @@
> * Renesas R-Car Thermal
>
> Required properties:
> -- compatible : "renesas,rcar-thermal"
> +- compatible : "renesas,thermal-<soctype>", "renesas,rcar-thermal"
> + as fallback.
> + Examples with soctypes are:
> + - "renesas,thermal-r8a73a4" (R-Mobile AP6)
> + - "renesas,thermal-r8a7779" (R-Car H1)
> + - "renesas,thermal-r8a7790" (R-Car H2)
> + - "renesas,thermal-r8a7791" (R-Car M2)
> - reg : Address range of the thermal registers.
> The 1st reg will be recognized as common register
> if it has "interrupts".
> @@ -12,18 +18,18 @@ Option properties:
>
> Example (non interrupt support):
>
> -thermal@e61f0100 {
> - compatible = "renesas,rcar-thermal";
> - reg = <0xe61f0100 0x38>;
> +thermal@ffc48000 {
> + compatible = "renesas,thermal-r8a7779", "renesas,rcar-thermal";
> + reg = <0xffc48000 0x38>;
> };
>
> Example (interrupt support):
>
> thermal@e61f0000 {
> - compatible = "renesas,rcar-thermal";
> + compatible = "renesas,thermal-r8a73a4", "renesas,rcar-thermal";
> reg = <0xe61f0000 0x14
> 0xe61f0100 0x38
> 0xe61f0200 0x38
> 0xe61f0300 0x38>;
> - interrupts = <0 69 4>;
> + interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>;
> };
> --
> 1.9.1
>
On Wed, Jul 09, 2014 at 02:23:40PM +0200, Geert Uytterhoeven wrote:
> Add Renesas SH-Mobile, R-Mobile, and R-Car Platform Device Tree Bindings
> Documentation, listing supported SoCs and boards.
>
> This allows to use checkpatch to validate DTSes referring to Renesas
> shmobile SoCs, and boards containing those SoCs.
>
> Signed-off-by: Geert Uytterhoeven <[email protected]>
> Cc: [email protected]
Thanks Geert,
from my point of view this seems nice. Is there a reason it is marked as an RFC?
> ---
> Documentation/devicetree/bindings/arm/shmobile.txt | 71 ++++++++++++++++++++++
> 1 file changed, 71 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/arm/shmobile.txt
>
> diff --git a/Documentation/devicetree/bindings/arm/shmobile.txt b/Documentation/devicetree/bindings/arm/shmobile.txt
> new file mode 100644
> index 000000000000..baa25c92597d
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/arm/shmobile.txt
> @@ -0,0 +1,71 @@
> +Renesas SH-Mobile, R-Mobile, and R-Car Platform Device Tree Bindings
> +--------------------------------------------------------------------
> +
> +SoCs:
> +
> + - Emma Mobile EV2
> + compatible = "renesas,emev2"
> + - RZ/A1H (R7S72100)
> + compatible = "renesas,r7s72100"
> + - R-Mobile APE6 (R8A73A40)
> + compatible = "renesas,r8a73a4"
> + - R-Mobile A1 (R8A77400)
> + compatible = "renesas,r8a7740"
> + - R-Car M1A (R8A77781)
> + compatible = "renesas,r8a7778"
> + - R-Car H1 (R8A77790)
> + compatible = "renesas,r8a7779"
> + - R-Car H2 (R8A77900)
> + compatible = "renesas,r8a7790"
> + - R-Car M2-W (R8A77910)
> + compatible = "renesas,r8a7791"
> + - R-Car V2H (R8A77920)
> + compatible = "renesas,r8a7792"
> + - R-Car M2-N (R8A77930)
> + compatible = "renesas,r8a7793"
> + - R-Car E2 (R8A77940)
> + compatible = "renesas,r8a7794"
> + - SH-Mobile AP4 (R8A73720/SH7372)
> + compatible = "renesas,sh7372"
> + - SH-Mobile AG5 (R8A73A00/SH73A0)
> + compatible = "renesas,sh73a0"
> +
> +
> +Boards:
> +
> + - Alt
> + compatible = "renesas,alt", "renesas,r8a7794"
> + - APE6-EVM
> + compatible = "renesas,ape6evm", "renesas,r8a73a4"
> + - APE6-EVM - Reference Device Tree Implementation
> + compatible = "renesas,ape6evm-reference", "renesas,r8a73a4"
> + - Atmark Techno Armadillo-800 EVA
> + compatible = "renesas,armadillo800eva"
> + - Atmark Techno Armadillo-800 EVA - Reference Device Tree Implementation
> + compatible = "renesas,armadillo800eva-reference", "renesas,r8a7740"
> + - BOCK-W
> + compatible = "renesas,bockw", "renesas,r8a7778"
> + - BOCK-W - Reference Device Tree Implementation
> + compatible = "renesas,bockw-reference", "renesas,r8a7778"
> + - Genmai (RTK772100BC00000BR)
> + compatible = "renesas,genmai", "renesas,r7s72100"
> + - Henninger
> + compatible = "renesas,henninger", "renesas,r8a7791"
> + - Koelsch (RTP0RC7791SEB00010S)
> + compatible = "renesas,koelsch", "renesas,r8a7791"
> + - EMEV2 KZM9D
> + compatible = "renesas,kzm9d", "renesas,emev2"
> + - KZM-A9-GT
> + compatible = "renesas,kzm9g", "renesas,sh73a0"
> + - KZM-A9-GT - Reference Device Tree Implementation
> + compatible = "renesas,kzm9g-reference", "renesas,sh73a0"
> + - Lager (RTP0RC7790SEB00010S)
> + compatible = "renesas,lager", "renesas,r8a7790"
> + - Mackerel (R0P7372LC0016RL, AP4 EVM 2nd)
> + compatible = "renesas,mackerel"
> + - Marzen
> + compatible = "renesas,marzen", "renesas,r8a7779"
> +
> +Note: Reference Device Tree Implementations are temporary implementations
> + to ease the migration from platform devices to Device Tree, and are
> + intended to be removed in the future.
> --
> 1.9.1
>
On Wed, Jul 09, 2014 at 02:23:41PM +0200, Geert Uytterhoeven wrote:
> - r8a7792 (R-Car V2H)
> - r8a7793 (R-Car M2-N)
> - r8a7794 (R-Car E2)
>
> Signed-off-by: Geert Uytterhoeven <[email protected]>
This seems to be in keeping with the approach we ave taken for these
SoCs for other drivers. And from that point of view it is fine by me.
But I wonder how sure are we that the hardware on the SoCs will work
with this approach.
> ---
> Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 3 +++
> drivers/mmc/host/sh_mobile_sdhi.c | 3 +++
> 2 files changed, 6 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/mmc/tmio_mmc.txt b/Documentation/devicetree/bindings/mmc/tmio_mmc.txt
> index fa0f327cde01..400b640fabc7 100644
> --- a/Documentation/devicetree/bindings/mmc/tmio_mmc.txt
> +++ b/Documentation/devicetree/bindings/mmc/tmio_mmc.txt
> @@ -19,6 +19,9 @@ Required properties:
> "renesas,sdhi-r8a7779" - SDHI IP on R8A7779 SoC
> "renesas,sdhi-r8a7790" - SDHI IP on R8A7790 SoC
> "renesas,sdhi-r8a7791" - SDHI IP on R8A7791 SoC
> + "renesas,sdhi-r8a7792" - SDHI IP on R8A7792 SoC
> + "renesas,sdhi-r8a7793" - SDHI IP on R8A7793 SoC
> + "renesas,sdhi-r8a7794" - SDHI IP on R8A7794 SoC
>
> Optional properties:
> - toshiba,mmc-wrprotect-disable: write-protect detection is unavailable
> diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c
> index 91058dabd11a..443c20969bd7 100644
> --- a/drivers/mmc/host/sh_mobile_sdhi.c
> +++ b/drivers/mmc/host/sh_mobile_sdhi.c
> @@ -68,6 +68,9 @@ static const struct of_device_id sh_mobile_sdhi_of_match[] = {
> { .compatible = "renesas,sdhi-r8a7779", .data = &of_rcar_gen1_compatible, },
> { .compatible = "renesas,sdhi-r8a7790", .data = &of_rcar_gen2_compatible, },
> { .compatible = "renesas,sdhi-r8a7791", .data = &of_rcar_gen2_compatible, },
> + { .compatible = "renesas,sdhi-r8a7792", .data = &of_rcar_gen2_compatible, },
> + { .compatible = "renesas,sdhi-r8a7793", .data = &of_rcar_gen2_compatible, },
> + { .compatible = "renesas,sdhi-r8a7794", .data = &of_rcar_gen2_compatible, },
> {},
> };
> MODULE_DEVICE_TABLE(of, sh_mobile_sdhi_of_match);
> --
> 1.9.1
>
On Fri, Jul 11, 2014 at 11:21:12AM +0200, Simon Horman wrote:
> On Wed, Jul 09, 2014 at 02:23:42PM +0200, Geert Uytterhoeven wrote:
> > - r8a7792 (R-Car V2H)
> > - r8a7793 (R-Car M2-N)
> > - r8a7794 (R-Car E2)
> >
> > r8a7791 is now called "R-Car M2-W".
>
> I don't feel strongly about this either way. But it seems to me that if we
> want to start using "M2-W" then we should make some effort, though not
> necessarily immediately, to update all instances of "M2" that already exist
> in the tree.
Also, as per my comment on tmio-mmc:
This seems to be in keeping with the approach we ave taken for
these SoCs for other drivers. And from that point of view it is
fine by me. But I wonder how sure are we that the hardware on the
SoCs will work with this approach.
> > Signed-off-by: Geert Uytterhoeven <[email protected]>
> > ---
> > Documentation/devicetree/bindings/thermal/rcar-thermal.txt | 5 ++++-
> > 1 file changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/Documentation/devicetree/bindings/thermal/rcar-thermal.txt b/Documentation/devicetree/bindings/thermal/rcar-thermal.txt
> > index 0ef00be44b01..43404b197933 100644
> > --- a/Documentation/devicetree/bindings/thermal/rcar-thermal.txt
> > +++ b/Documentation/devicetree/bindings/thermal/rcar-thermal.txt
> > @@ -7,7 +7,10 @@ Required properties:
> > - "renesas,thermal-r8a73a4" (R-Mobile AP6)
> > - "renesas,thermal-r8a7779" (R-Car H1)
> > - "renesas,thermal-r8a7790" (R-Car H2)
> > - - "renesas,thermal-r8a7791" (R-Car M2)
> > + - "renesas,thermal-r8a7791" (R-Car M2-W)
> > + - "renesas,thermal-r8a7792" (R-Car V2H)
> > + - "renesas,thermal-r8a7793" (R-Car M2-N)
> > + - "renesas,thermal-r8a7794" (R-Car E2)
> > - reg : Address range of the thermal registers.
> > The 1st reg will be recognized as common register
> > if it has "interrupts".
> > --
> > 1.9.1
> >
On Wed, Jul 09, 2014 at 02:23:39PM +0200, Geert Uytterhoeven wrote:
> The thermal node used the generic compatible property only.
> Add the SoC-specific one, to make it future proof.
>
> Signed-off-by: Geert Uytterhoeven <[email protected]>
Thanks, please repost this once the binding has been
accepted by the maintainer.
> ---
> arch/arm/boot/dts/r8a7779.dtsi | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
> index 94e2fc836492..aca1f9bd714e 100644
> --- a/arch/arm/boot/dts/r8a7779.dtsi
> +++ b/arch/arm/boot/dts/r8a7779.dtsi
> @@ -262,7 +262,7 @@
> };
>
> thermal@ffc48000 {
> - compatible = "renesas,rcar-thermal";
> + compatible = "renesas,thermal-r8a7779", "renesas,rcar-thermal";
> reg = <0xffc48000 0x38>;
> };
>
> --
> 1.9.1
>
On Wed, Jul 09, 2014 at 02:23:32PM +0200, Geert Uytterhoeven wrote:
> The documentation only mentioned the generic fallback compatible property.
> Add the missing SoC-specific compatible properties, which are already in
> use.
>
> Signed-off-by: Geert Uytterhoeven <[email protected]>
> Cc: Thomas Gleixner <[email protected]>
Acked-by: Simon Horman <[email protected]>
> ---
> .../bindings/interrupt-controller/renesas,intc-irqpin.txt | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/devicetree/bindings/interrupt-controller/renesas,intc-irqpin.txt b/Documentation/devicetree/bindings/interrupt-controller/renesas,intc-irqpin.txt
> index 1f8b0c507c26..c73acd060093 100644
> --- a/Documentation/devicetree/bindings/interrupt-controller/renesas,intc-irqpin.txt
> +++ b/Documentation/devicetree/bindings/interrupt-controller/renesas,intc-irqpin.txt
> @@ -2,7 +2,13 @@ DT bindings for the R-/SH-Mobile irqpin controller
>
> Required properties:
>
> -- compatible: has to be "renesas,intc-irqpin"
> +- compatible: has to be "renesas,intc-irqpin-<soctype>", "renesas,intc-irqpin"
> + as fallback.
> + Examples with soctypes are:
> + - "renesas,intc-irqpin-r8a7740" (R-Mobile A1)
> + - "renesas,intc-irqpin-r8a7778" (R-Car M1A)
> + - "renesas,intc-irqpin-r8a7779" (R-Car H1)
> + - "renesas,intc-irqpin-sh73a0" (SH-Mobile AG5)
> - #interrupt-cells: has to be <2>: an interrupt index and flags, as defined in
> interrupts.txt in this directory
>
> --
> 1.9.1
>
Hi Simon,
On Fri, Jul 11, 2014 at 11:17 AM, Simon Horman <[email protected]> wrote:
> On Wed, Jul 09, 2014 at 02:23:40PM +0200, Geert Uytterhoeven wrote:
>> Add Renesas SH-Mobile, R-Mobile, and R-Car Platform Device Tree Bindings
>> Documentation, listing supported SoCs and boards.
>>
>> This allows to use checkpatch to validate DTSes referring to Renesas
>> shmobile SoCs, and boards containing those SoCs.
>>
>> Signed-off-by: Geert Uytterhoeven <[email protected]>
>> Cc: [email protected]
>
> Thanks Geert,
>
> from my point of view this seems nice. Is there a reason it is marked as an RFC?
>From the cover letter:
"The last 4 patches contain compatible strings for new R-Car Gen2 SoCs,
which are not yet in active use, hence the RFC status."
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
On Fri, Jul 11, 2014 at 04:26:03PM +0200, Geert Uytterhoeven wrote:
> Hi Simon,
>
> On Fri, Jul 11, 2014 at 11:17 AM, Simon Horman <[email protected]> wrote:
> > On Wed, Jul 09, 2014 at 02:23:40PM +0200, Geert Uytterhoeven wrote:
> >> Add Renesas SH-Mobile, R-Mobile, and R-Car Platform Device Tree Bindings
> >> Documentation, listing supported SoCs and boards.
> >>
> >> This allows to use checkpatch to validate DTSes referring to Renesas
> >> shmobile SoCs, and boards containing those SoCs.
> >>
> >> Signed-off-by: Geert Uytterhoeven <[email protected]>
> >> Cc: [email protected]
> >
> > Thanks Geert,
> >
> > from my point of view this seems nice. Is there a reason it is marked as an RFC?
>
> >From the cover letter:
>
> "The last 4 patches contain compatible strings for new R-Car Gen2 SoCs,
> which are not yet in active use, hence the RFC status."
Thanks, sorry for missing that.
On Fri, 2014-07-11 at 11:13 +0200, Simon Horman wrote:
> On Wed, Jul 09, 2014 at 02:23:35PM +0200, Geert Uytterhoeven wrote:
> > The documentation only mentioned the generic fallback compatible property.
> > Add the missing SoC-specific compatible properties, some of which are
> > already in use.
> >
> > Signed-off-by: Geert Uytterhoeven <[email protected]>
> > Cc: Zhang Rui <[email protected]>
> > Cc: Eduardo Valentin <[email protected]>
> > Cc: [email protected]
>
> Acked-by: Simon Horman <[email protected]>
Kuninori,
what' your opinion of this patch?
thanks,
rui
>
> > ---
> > .../devicetree/bindings/thermal/rcar-thermal.txt | 18 ++++++++++++------
> > 1 file changed, 12 insertions(+), 6 deletions(-)
> >
> > diff --git a/Documentation/devicetree/bindings/thermal/rcar-thermal.txt b/Documentation/devicetree/bindings/thermal/rcar-thermal.txt
> > index 28ef498a66e5..0ef00be44b01 100644
> > --- a/Documentation/devicetree/bindings/thermal/rcar-thermal.txt
> > +++ b/Documentation/devicetree/bindings/thermal/rcar-thermal.txt
> > @@ -1,7 +1,13 @@
> > * Renesas R-Car Thermal
> >
> > Required properties:
> > -- compatible : "renesas,rcar-thermal"
> > +- compatible : "renesas,thermal-<soctype>", "renesas,rcar-thermal"
> > + as fallback.
> > + Examples with soctypes are:
> > + - "renesas,thermal-r8a73a4" (R-Mobile AP6)
> > + - "renesas,thermal-r8a7779" (R-Car H1)
> > + - "renesas,thermal-r8a7790" (R-Car H2)
> > + - "renesas,thermal-r8a7791" (R-Car M2)
> > - reg : Address range of the thermal registers.
> > The 1st reg will be recognized as common register
> > if it has "interrupts".
> > @@ -12,18 +18,18 @@ Option properties:
> >
> > Example (non interrupt support):
> >
> > -thermal@e61f0100 {
> > - compatible = "renesas,rcar-thermal";
> > - reg = <0xe61f0100 0x38>;
> > +thermal@ffc48000 {
> > + compatible = "renesas,thermal-r8a7779", "renesas,rcar-thermal";
> > + reg = <0xffc48000 0x38>;
> > };
> >
> > Example (interrupt support):
> >
> > thermal@e61f0000 {
> > - compatible = "renesas,rcar-thermal";
> > + compatible = "renesas,thermal-r8a73a4", "renesas,rcar-thermal";
> > reg = <0xe61f0000 0x14
> > 0xe61f0100 0x38
> > 0xe61f0200 0x38
> > 0xe61f0300 0x38>;
> > - interrupts = <0 69 4>;
> > + interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>;
> > };
> > --
> > 1.9.1
> >
Hi
> > > The documentation only mentioned the generic fallback compatible property.
> > > Add the missing SoC-specific compatible properties, some of which are
> > > already in use.
> > >
> > > Signed-off-by: Geert Uytterhoeven <[email protected]>
> > > Cc: Zhang Rui <[email protected]>
> > > Cc: Eduardo Valentin <[email protected]>
> > > Cc: [email protected]
> >
> > Acked-by: Simon Horman <[email protected]>
>
> Kuninori,
>
> what' your opinion of this patch?
>
> thanks,
> rui
> >
> > > ---
> > > .../devicetree/bindings/thermal/rcar-thermal.txt | 18 ++++++++++++------
> > > 1 file changed, 12 insertions(+), 6 deletions(-)
> > >
> > > diff --git a/Documentation/devicetree/bindings/thermal/rcar-thermal.txt b/Documentation/devicetree/bindings/thermal/rcar-thermal.txt
> > > index 28ef498a66e5..0ef00be44b01 100644
> > > --- a/Documentation/devicetree/bindings/thermal/rcar-thermal.txt
> > > +++ b/Documentation/devicetree/bindings/thermal/rcar-thermal.txt
> > > @@ -1,7 +1,13 @@
> > > * Renesas R-Car Thermal
> > >
> > > Required properties:
> > > -- compatible : "renesas,rcar-thermal"
> > > +- compatible : "renesas,thermal-<soctype>", "renesas,rcar-thermal"
> > > + as fallback.
> > > + Examples with soctypes are:
> > > + - "renesas,thermal-r8a73a4" (R-Mobile AP6)
> > > + - "renesas,thermal-r8a7779" (R-Car H1)
> > > + - "renesas,thermal-r8a7790" (R-Car H2)
> > > + - "renesas,thermal-r8a7791" (R-Car M2)
> > > - reg : Address range of the thermal registers.
> > > The 1st reg will be recognized as common register
> > > if it has "interrupts".
> > > @@ -12,18 +18,18 @@ Option properties:
> > >
> > > Example (non interrupt support):
> > >
> > > -thermal@e61f0100 {
> > > - compatible = "renesas,rcar-thermal";
> > > - reg = <0xe61f0100 0x38>;
> > > +thermal@ffc48000 {
> > > + compatible = "renesas,thermal-r8a7779", "renesas,rcar-thermal";
> > > + reg = <0xffc48000 0x38>;
> > > };
> > >
> > > Example (interrupt support):
> > >
> > > thermal@e61f0000 {
> > > - compatible = "renesas,rcar-thermal";
> > > + compatible = "renesas,thermal-r8a73a4", "renesas,rcar-thermal";
> > > reg = <0xe61f0000 0x14
> > > 0xe61f0100 0x38
> > > 0xe61f0200 0x38
> > > 0xe61f0300 0x38>;
> > > - interrupts = <0 69 4>;
> > > + interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>;
> > > };
This patch and [12/13] are adding SoC-specific compatible name.
Of course we don't know future request,
and, adding SoC-specific compatible name for
fallbacking is nice safety for us.
So, I don't have strong objection about it.
But, thermal driver side do nothing for each
SoC-specific compatible name at this point.
This means
-> There is no trouble in driver/SoC
-> Add new (and not used) compatible name
-> Nothing happen in driver/SoC
My questions are...
1) How to verify this patch ?
2) Do we need to update example SoC "specific name" list in rcar-thermal.txt.
Few example codes are very enough ?
On Tue, Jul 15, 2014 at 07:16:06PM -0700, Kuninori Morimoto wrote:
>
> Hi
>
> > > > The documentation only mentioned the generic fallback compatible property.
> > > > Add the missing SoC-specific compatible properties, some of which are
> > > > already in use.
> > > >
> > > > Signed-off-by: Geert Uytterhoeven <[email protected]>
> > > > Cc: Zhang Rui <[email protected]>
> > > > Cc: Eduardo Valentin <[email protected]>
> > > > Cc: [email protected]
> > >
> > > Acked-by: Simon Horman <[email protected]>
> >
> > Kuninori,
> >
> > what' your opinion of this patch?
> >
> > thanks,
> > rui
> > >
> > > > ---
> > > > .../devicetree/bindings/thermal/rcar-thermal.txt | 18 ++++++++++++------
> > > > 1 file changed, 12 insertions(+), 6 deletions(-)
> > > >
> > > > diff --git a/Documentation/devicetree/bindings/thermal/rcar-thermal.txt b/Documentation/devicetree/bindings/thermal/rcar-thermal.txt
> > > > index 28ef498a66e5..0ef00be44b01 100644
> > > > --- a/Documentation/devicetree/bindings/thermal/rcar-thermal.txt
> > > > +++ b/Documentation/devicetree/bindings/thermal/rcar-thermal.txt
> > > > @@ -1,7 +1,13 @@
> > > > * Renesas R-Car Thermal
> > > >
> > > > Required properties:
> > > > -- compatible : "renesas,rcar-thermal"
> > > > +- compatible : "renesas,thermal-<soctype>", "renesas,rcar-thermal"
> > > > + as fallback.
> > > > + Examples with soctypes are:
> > > > + - "renesas,thermal-r8a73a4" (R-Mobile AP6)
> > > > + - "renesas,thermal-r8a7779" (R-Car H1)
> > > > + - "renesas,thermal-r8a7790" (R-Car H2)
> > > > + - "renesas,thermal-r8a7791" (R-Car M2)
> > > > - reg : Address range of the thermal registers.
> > > > The 1st reg will be recognized as common register
> > > > if it has "interrupts".
> > > > @@ -12,18 +18,18 @@ Option properties:
> > > >
> > > > Example (non interrupt support):
> > > >
> > > > -thermal@e61f0100 {
> > > > - compatible = "renesas,rcar-thermal";
> > > > - reg = <0xe61f0100 0x38>;
> > > > +thermal@ffc48000 {
> > > > + compatible = "renesas,thermal-r8a7779", "renesas,rcar-thermal";
> > > > + reg = <0xffc48000 0x38>;
> > > > };
> > > >
> > > > Example (interrupt support):
> > > >
> > > > thermal@e61f0000 {
> > > > - compatible = "renesas,rcar-thermal";
> > > > + compatible = "renesas,thermal-r8a73a4", "renesas,rcar-thermal";
> > > > reg = <0xe61f0000 0x14
> > > > 0xe61f0100 0x38
> > > > 0xe61f0200 0x38
> > > > 0xe61f0300 0x38>;
> > > > - interrupts = <0 69 4>;
> > > > + interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>;
> > > > };
>
> This patch and [12/13] are adding SoC-specific compatible name.
> Of course we don't know future request,
> and, adding SoC-specific compatible name for
> fallbacking is nice safety for us.
> So, I don't have strong objection about it.
>
> But, thermal driver side do nothing for each
> SoC-specific compatible name at this point.
> This means
>
> -> There is no trouble in driver/SoC
> -> Add new (and not used) compatible name
> -> Nothing happen in driver/SoC
>
> My questions are...
> 1) How to verify this patch ?
> 2) Do we need to update example SoC "specific name" list in rcar-thermal.txt.
> Few example codes are very enough ?
Hi Morimoto-san,
I believe that the approach taken with this patch is similar to the
approach that has been taken for several other drivers used by Renesas
SoCs. The implication of this approach is:
1. That the (in this case thermal) IP on the SoC's listed is known
to work with the driver using the generic (in this case
renesas,rcar-thermal) compatibility string.
2. That if some incompatibility is subsequently found such that the
IP on SoC does function correctly using the generic compatibility
string or some new feature is to be enabled which is not generic
then it the driver should be updated with code that is triggered
by the SoC-specific compat string.
3. That Soc dts(i) files should list the more specific SoC compat string
followed bu the generic compat string. In this way so long as the
driver only matches on the generic compat string it will be used. But
if the driver is updated match on the SoC-specific compat string
then it will be used instead. In this way dtbs should be forwards
compatible with driver updates.
I believe that this series includes patches to update the relevant
dtsi files accordingly.
In relation to verification, I believe all the SoCs listed in this patch
are known to work with the generic compat string. And they should continue
to work with this change because its only an documentation change. In the
future, if a SoC specific compat string is added to the driver code then
verification would need to occur.
>From my point of view the documentation in rcar-thermal.txt is consistent
with the documentation for other drivers that use this binding scheme
(at least the ones that are documented :). I would not have any problems
examples but I don't think its entirely necessary.
Hi Simon
> 1. That the (in this case thermal) IP on the SoC's listed is known
> to work with the driver using the generic (in this case
> renesas,rcar-thermal) compatibility string.
>
> 2. That if some incompatibility is subsequently found such that the
> IP on SoC does function correctly using the generic compatibility
> string or some new feature is to be enabled which is not generic
> then it the driver should be updated with code that is triggered
> by the SoC-specific compat string.
> 3. That Soc dts(i) files should list the more specific SoC compat string
> followed bu the generic compat string. In this way so long as the
> driver only matches on the generic compat string it will be used. But
> if the driver is updated match on the SoC-specific compat string
> then it will be used instead. In this way dtbs should be forwards
> compatible with driver updates.
>
> I believe that this series includes patches to update the relevant
> dtsi files accordingly.
>
> In relation to verification, I believe all the SoCs listed in this patch
> are known to work with the generic compat string. And they should continue
> to work with this change because its only an documentation change. In the
> future, if a SoC specific compat string is added to the driver code then
> verification would need to occur.
>
> From my point of view the documentation in rcar-thermal.txt is consistent
> with the documentation for other drivers that use this binding scheme
> (at least the ones that are documented :). I would not have any problems
> examples but I don't think its entirely necessary.
>From my point of view,
I have no object to adding SoC-specific compatible
string on dts(i) file.
It can be insurance for future (above 1, 2, 3).
My concern is to add "known working SoC" to documentation.
I have no objection if this listed "known working SoC"
was matched to "SoC-specific" compatible name.
Because driver cares it specially.
And, this case, documentation should list it.
But this case, listed SoC are matched to "generic name".
> +- compatible : "renesas,thermal-<soctype>", "renesas,rcar-thermal"
> + as fallback.
> + Examples with soctypes are:
> + - "renesas,thermal-r8a73a4" (R-Mobile AP6)
> + - "renesas,thermal-r8a7779" (R-Car H1)
> + - "renesas,thermal-r8a7790" (R-Car H2)
> + - "renesas,thermal-r8a7791" (R-Car M2)
>From my (general?) point of view,
it seems that these listed SoC doesn't match to "generic name".
I mean that driver will do something special for these SoC.
And, we will confuse if driver supports "SoC-specific" compatible name.
(which one is special ? which one is generic ?)
And, I don't want to keep updating
"generic name matched SoC" on document.
Best regards
---
Kuninori Morimoto