* [PATCH 1/5] ARM: shmobile: r8a7791: remove superfluous interrupt-parents
2014-02-16 9:40 [PATCH 0/5] enable i2c on koelsch-dt (and cleanup lager) Wolfram Sang
@ 2014-02-16 9:40 ` Wolfram Sang
2014-02-16 9:40 ` [PATCH 2/5] ARM: shmobile: r8a7791: add i2c master nodes to dtsi Wolfram Sang
` (4 subsequent siblings)
5 siblings, 0 replies; 20+ messages in thread
From: Wolfram Sang @ 2014-02-16 9:40 UTC (permalink / raw)
To: linux-sh
Cc: linux-arm-kernel, devicetree, Magnus Damm, Simon Horman,
Wolfram Sang
From: Wolfram Sang <wsa@sang-engineering.com>
These values are inherited, so don't need to be specified again.
Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
---
arch/arm/boot/dts/r8a7791.dtsi | 31 -------------------------------
1 file changed, 31 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 240c4ec..41194fe 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -53,7 +53,6 @@
gpio0: gpio@e6050000 {
compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar";
reg = <0 0xe6050000 0 0x50>;
- interrupt-parent = <&gic>;
interrupts = <0 4 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>;
gpio-controller;
@@ -65,7 +64,6 @@
gpio1: gpio@e6051000 {
compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar";
reg = <0 0xe6051000 0 0x50>;
- interrupt-parent = <&gic>;
interrupts = <0 5 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>;
gpio-controller;
@@ -77,7 +75,6 @@
gpio2: gpio@e6052000 {
compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar";
reg = <0 0xe6052000 0 0x50>;
- interrupt-parent = <&gic>;
interrupts = <0 6 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>;
gpio-controller;
@@ -89,7 +86,6 @@
gpio3: gpio@e6053000 {
compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar";
reg = <0 0xe6053000 0 0x50>;
- interrupt-parent = <&gic>;
interrupts = <0 7 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>;
gpio-controller;
@@ -101,7 +97,6 @@
gpio4: gpio@e6054000 {
compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar";
reg = <0 0xe6054000 0 0x50>;
- interrupt-parent = <&gic>;
interrupts = <0 8 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>;
gpio-controller;
@@ -113,7 +108,6 @@
gpio5: gpio@e6055000 {
compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar";
reg = <0 0xe6055000 0 0x50>;
- interrupt-parent = <&gic>;
interrupts = <0 9 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>;
gpio-controller;
@@ -125,7 +119,6 @@
gpio6: gpio@e6055400 {
compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar";
reg = <0 0xe6055400 0 0x50>;
- interrupt-parent = <&gic>;
interrupts = <0 10 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>;
gpio-controller;
@@ -137,7 +130,6 @@
gpio7: gpio@e6055800 {
compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar";
reg = <0 0xe6055800 0 0x50>;
- interrupt-parent = <&gic>;
interrupts = <0 11 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>;
gpio-controller;
@@ -149,7 +141,6 @@
thermal@e61f0000 {
compatible = "renesas,thermal-r8a7791", "renesas,rcar-thermal";
reg = <0 0xe61f0000 0 0x14>, <0 0xe61f0100 0 0x38>;
- interrupt-parent = <&gic>;
interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp5_clks R8A7791_CLK_THERMAL>;
};
@@ -167,7 +158,6 @@
#interrupt-cells = <2>;
interrupt-controller;
reg = <0 0xe61c0000 0 0x200>;
- interrupt-parent = <&gic>;
interrupts = <0 0 IRQ_TYPE_LEVEL_HIGH>,
<0 1 IRQ_TYPE_LEVEL_HIGH>,
<0 2 IRQ_TYPE_LEVEL_HIGH>,
@@ -189,7 +179,6 @@
scifa0: serial@e6c40000 {
compatible = "renesas,scifa-r8a7791", "renesas,scifa";
reg = <0 0xe6c40000 0 64>;
- interrupt-parent = <&gic>;
interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp2_clks R8A7791_CLK_SCIFA0>;
clock-names = "sci_ick";
@@ -198,7 +187,6 @@
scifa1: serial@e6c50000 {
compatible = "renesas,scifa-r8a7791", "renesas,scifa";
- interrupt-parent = <&gic>;
reg = <0 0xe6c50000 0 64>;
interrupts = <0 145 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp2_clks R8A7791_CLK_SCIFA1>;
@@ -208,7 +196,6 @@
scifa2: serial@e6c60000 {
compatible = "renesas,scifa-r8a7791", "renesas,scifa";
- interrupt-parent = <&gic>;
reg = <0 0xe6c60000 0 64>;
interrupts = <0 151 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp2_clks R8A7791_CLK_SCIFA2>;
@@ -218,7 +205,6 @@
scifa3: serial@e6c70000 {
compatible = "renesas,scifa-r8a7791", "renesas,scifa";
- interrupt-parent = <&gic>;
reg = <0 0xe6c70000 0 64>;
interrupts = <0 29 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp11_clks R8A7791_CLK_SCIFA3>;
@@ -228,7 +214,6 @@
scifa4: serial@e6c78000 {
compatible = "renesas,scifa-r8a7791", "renesas,scifa";
- interrupt-parent = <&gic>;
reg = <0 0xe6c78000 0 64>;
interrupts = <0 30 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp11_clks R8A7791_CLK_SCIFA4>;
@@ -238,7 +223,6 @@
scifa5: serial@e6c80000 {
compatible = "renesas,scifa-r8a7791", "renesas,scifa";
- interrupt-parent = <&gic>;
reg = <0 0xe6c80000 0 64>;
interrupts = <0 31 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp11_clks R8A7791_CLK_SCIFA5>;
@@ -248,7 +232,6 @@
scifb0: serial@e6c20000 {
compatible = "renesas,scifb-r8a7791", "renesas,scifb";
- interrupt-parent = <&gic>;
reg = <0 0xe6c20000 0 64>;
interrupts = <0 148 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp2_clks R8A7791_CLK_SCIFB0>;
@@ -258,7 +241,6 @@
scifb1: serial@e6c30000 {
compatible = "renesas,scifb-r8a7791", "renesas,scifb";
- interrupt-parent = <&gic>;
reg = <0 0xe6c30000 0 64>;
interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp2_clks R8A7791_CLK_SCIFB1>;
@@ -268,7 +250,6 @@
scifb2: serial@e6ce0000 {
compatible = "renesas,scifb-r8a7791", "renesas,scifb";
- interrupt-parent = <&gic>;
reg = <0 0xe6ce0000 0 64>;
interrupts = <0 150 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp2_clks R8A7791_CLK_SCIFB2>;
@@ -278,7 +259,6 @@
scif0: serial@e6e60000 {
compatible = "renesas,scif-r8a7791", "renesas,scif";
- interrupt-parent = <&gic>;
reg = <0 0xe6e60000 0 64>;
interrupts = <0 152 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp7_clks R8A7791_CLK_SCIF0>;
@@ -288,7 +268,6 @@
scif1: serial@e6e68000 {
compatible = "renesas,scif-r8a7791", "renesas,scif";
- interrupt-parent = <&gic>;
reg = <0 0xe6e68000 0 64>;
interrupts = <0 153 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp7_clks R8A7791_CLK_SCIF1>;
@@ -298,7 +277,6 @@
scif2: serial@e6e58000 {
compatible = "renesas,scif-r8a7791", "renesas,scif";
- interrupt-parent = <&gic>;
reg = <0 0xe6e58000 0 64>;
interrupts = <0 22 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp7_clks R8A7791_CLK_SCIF2>;
@@ -308,7 +286,6 @@
scif3: serial@e6ea8000 {
compatible = "renesas,scif-r8a7791", "renesas,scif";
- interrupt-parent = <&gic>;
reg = <0 0xe6ea8000 0 64>;
interrupts = <0 23 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp7_clks R8A7791_CLK_SCIF3>;
@@ -318,7 +295,6 @@
scif4: serial@e6ee0000 {
compatible = "renesas,scif-r8a7791", "renesas,scif";
- interrupt-parent = <&gic>;
reg = <0 0xe6ee0000 0 64>;
interrupts = <0 24 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp7_clks R8A7791_CLK_SCIF4>;
@@ -328,7 +304,6 @@
scif5: serial@e6ee8000 {
compatible = "renesas,scif-r8a7791", "renesas,scif";
- interrupt-parent = <&gic>;
reg = <0 0xe6ee8000 0 64>;
interrupts = <0 25 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp7_clks R8A7791_CLK_SCIF5>;
@@ -338,7 +313,6 @@
hscif0: serial@e62c0000 {
compatible = "renesas,hscif-r8a7791", "renesas,hscif";
- interrupt-parent = <&gic>;
reg = <0 0xe62c0000 0 96>;
interrupts = <0 154 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp7_clks R8A7791_CLK_HSCIF0>;
@@ -348,7 +322,6 @@
hscif1: serial@e62c8000 {
compatible = "renesas,hscif-r8a7791", "renesas,hscif";
- interrupt-parent = <&gic>;
reg = <0 0xe62c8000 0 96>;
interrupts = <0 155 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp7_clks R8A7791_CLK_HSCIF1>;
@@ -358,7 +331,6 @@
hscif2: serial@e62d0000 {
compatible = "renesas,hscif-r8a7791", "renesas,hscif";
- interrupt-parent = <&gic>;
reg = <0 0xe62d0000 0 96>;
interrupts = <0 21 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp7_clks R8A7791_CLK_HSCIF2>;
@@ -369,7 +341,6 @@
sata0: sata@ee300000 {
compatible = "renesas,sata-r8a7791";
reg = <0 0xee300000 0 0x2000>;
- interrupt-parent = <&gic>;
interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp8_clks R8A7791_CLK_SATA0>;
status = "disabled";
@@ -378,7 +349,6 @@
sata1: sata@ee500000 {
compatible = "renesas,sata-r8a7791";
reg = <0 0xee500000 0 0x2000>;
- interrupt-parent = <&gic>;
interrupts = <0 106 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp8_clks R8A7791_CLK_SATA1>;
status = "disabled";
@@ -714,7 +684,6 @@
spi: spi@e6b10000 {
compatible = "renesas,qspi-r8a7791", "renesas,qspi";
reg = <0 0xe6b10000 0 0x2c>;
- interrupt-parent = <&gic>;
interrupts = <0 184 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp9_clks R8A7791_CLK_QSPI_MOD>;
num-cs = <1>;
--
1.8.5.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 2/5] ARM: shmobile: r8a7791: add i2c master nodes to dtsi
2014-02-16 9:40 [PATCH 0/5] enable i2c on koelsch-dt (and cleanup lager) Wolfram Sang
2014-02-16 9:40 ` [PATCH 1/5] ARM: shmobile: r8a7791: remove superfluous interrupt-parents Wolfram Sang
@ 2014-02-16 9:40 ` Wolfram Sang
2014-02-17 7:54 ` Wolfram Sang
2014-02-16 9:40 ` [PATCH 3/5] ARM: shmobile: r8a7791: add i2c2 bus to koelsch dt Wolfram Sang
` (3 subsequent siblings)
5 siblings, 1 reply; 20+ messages in thread
From: Wolfram Sang @ 2014-02-16 9:40 UTC (permalink / raw)
To: linux-sh
Cc: linux-arm-kernel, devicetree, Magnus Damm, Simon Horman,
Wolfram Sang
From: Wolfram Sang <wsa@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
---
arch/arm/boot/dts/r8a7791.dtsi | 69 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 69 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 41194fe..5807b7a 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -19,6 +19,15 @@
#address-cells = <2>;
#size-cells = <2>;
+ aliases {
+ i2c0 = &i2c0;
+ i2c1 = &i2c1;
+ i2c2 = &i2c2;
+ i2c3 = &i2c3;
+ i2c4 = &i2c4;
+ i2c5 = &i2c5;
+ };
+
cpus {
#address-cells = <1>;
#size-cells = <0>;
@@ -170,6 +179,66 @@
<0 17 IRQ_TYPE_LEVEL_HIGH>;
};
+ i2c0: i2c@e6508000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "renesas,i2c-r8a7791", "renesas,i2c-r8a7790";
+ reg = <0 0xe6508000 0 0x40>;
+ interrupts = <0 287 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp9_clks R8A7791_CLK_I2C0>;
+ status = "disabled";
+ };
+
+ i2c1: i2c@e6518000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "renesas,i2c-r8a7791", "renesas,i2c-r8a7790";
+ reg = <0 0xe6518000 0 0x40>;
+ interrupts = <0 288 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp9_clks R8A7791_CLK_I2C1>;
+ status = "disabled";
+ };
+
+ i2c2: i2c@e6530000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "renesas,i2c-r8a7791", "renesas,i2c-r8a7790";
+ reg = <0 0xe6530000 0 0x40>;
+ interrupts = <0 286 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp9_clks R8A7791_CLK_I2C2>;
+ status = "disabled";
+ };
+
+ i2c3: i2c@e6540000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "renesas,i2c-r8a7791", "renesas,i2c-r8a7790";
+ reg = <0 0xe6540000 0 0x40>;
+ interrupts = <0 290 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp9_clks R8A7791_CLK_I2C3>;
+ status = "disabled";
+ };
+
+ i2c4: i2c@e6520000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "renesas,i2c-r8a7791", "renesas,i2c-r8a7790";
+ reg = <0 0xe6520000 0 0x40>;
+ interrupts = <0 19 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp9_clks R8A7791_CLK_I2C4>;
+ status = "disabled";
+ };
+
+ i2c5: i2c@e6528000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "renesas,i2c-r8a7791", "renesas,i2c-r8a7790";
+ reg = <0 0xe6528000 0 0x40>;
+ interrupts = <0 20 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp9_clks R8A7791_CLK_I2C5>;
+ status = "disabled";
+ };
+
pfc: pfc@e6060000 {
compatible = "renesas,pfc-r8a7791";
reg = <0 0xe6060000 0 0x250>;
--
1.8.5.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [PATCH 2/5] ARM: shmobile: r8a7791: add i2c master nodes to dtsi
2014-02-16 9:40 ` [PATCH 2/5] ARM: shmobile: r8a7791: add i2c master nodes to dtsi Wolfram Sang
@ 2014-02-17 7:54 ` Wolfram Sang
2014-02-17 8:02 ` Magnus Damm
0 siblings, 1 reply; 20+ messages in thread
From: Wolfram Sang @ 2014-02-17 7:54 UTC (permalink / raw)
To: linux-sh; +Cc: linux-arm-kernel, devicetree, Magnus Damm, Simon Horman
[-- Attachment #1: Type: text/plain, Size: 1866 bytes --]
On Sun, Feb 16, 2014 at 10:40:55AM +0100, Wolfram Sang wrote:
> From: Wolfram Sang <wsa@sang-engineering.com>
>
> Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
From your other mail:
"[2/5] needs to be reworked to exclude the r8a7790 compatible string."
> + compatible = "renesas,i2c-r8a7791", "renesas,i2c-r8a7790";
Why is that? From my knowledge, you start with the exact compatible
property and hardware compatible entries may follow. This is backed up
by Documentation/devicetree/usage-model.txt:
===
The 'compatible' property contains a sorted list of strings starting
with the exact name of the machine, followed by an optional list of
boards it is compatible with sorted from most compatible to least.
===
And from the devicetree wiki [1]:
===
compatible is a list of strings. The first string in the list specifies
the exact device that the node represents in the form
"<manufacturer>,<model>". The following strings represent other devices
that the device is compatible with.
For example, the Freescale MPC8349 System on Chip (SoC) has a serial
device which implements the National Semiconductor ns16550 register
interface. The compatible property for the MPC8349 serial device should
therefore be: compatible = "fsl,mpc8349-uart", "ns16550". In this case,
fsl,mpc8349-uart specifies the exact device, and ns16550 states that it
is register-level compatible with a National Semiconductor 16550 UART.
Note: ns16550 doesn't have a manufacturer prefix purely for historical
reasons. All new compatible values should use the manufacturer prefix.
This practice allows existing device drivers to be bound to a newer
device, while still uniquely identifying the exact hardware.
===
Has this changed?
[1 ]http://www.devicetree.org/Device_Tree_Usage#Understanding_the_compatible_Property
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 2/5] ARM: shmobile: r8a7791: add i2c master nodes to dtsi
2014-02-17 7:54 ` Wolfram Sang
@ 2014-02-17 8:02 ` Magnus Damm
2014-02-17 9:11 ` Geert Uytterhoeven
2014-02-17 9:12 ` Wolfram Sang
0 siblings, 2 replies; 20+ messages in thread
From: Magnus Damm @ 2014-02-17 8:02 UTC (permalink / raw)
To: Wolfram Sang
Cc: SH-Linux, linux-arm-kernel@lists.infradead.org, devicetree,
Simon Horman
Hi Wolfram,
On Mon, Feb 17, 2014 at 4:54 PM, Wolfram Sang <wsa@the-dreams.de> wrote:
> On Sun, Feb 16, 2014 at 10:40:55AM +0100, Wolfram Sang wrote:
>> From: Wolfram Sang <wsa@sang-engineering.com>
>>
>> Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
>
> From your other mail:
>
> "[2/5] needs to be reworked to exclude the r8a7790 compatible string."
>
>> + compatible = "renesas,i2c-r8a7791", "renesas,i2c-r8a7790";
>
> Why is that? From my knowledge, you start with the exact compatible
> property and hardware compatible entries may follow.
I think this boils down to if they really are compatible or not. If
for instance a 16550 port would be compatible with 8250 on a hardware
level then using them in the order of "16550", "8250" makes sense. In
this case the r8a7791 i2c is not really strictly based on r8a7790 i2c,
it is just that r8a7790 has support in the driver. So it's a short cut
instead of actual hardware compatibility.
So far we've dealt with this by updating the driver and only relying
on the actual SoC name as suffix.
I'm sure there are tons of opinions. =)
Cheers,
/ magnus
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 2/5] ARM: shmobile: r8a7791: add i2c master nodes to dtsi
2014-02-17 8:02 ` Magnus Damm
@ 2014-02-17 9:11 ` Geert Uytterhoeven
2014-02-17 9:19 ` Wolfram Sang
2014-02-17 9:12 ` Wolfram Sang
1 sibling, 1 reply; 20+ messages in thread
From: Geert Uytterhoeven @ 2014-02-17 9:11 UTC (permalink / raw)
To: Magnus Damm
Cc: Wolfram Sang, SH-Linux, linux-arm-kernel@lists.infradead.org,
devicetree@vger.kernel.org, Simon Horman
On Mon, Feb 17, 2014 at 9:02 AM, Magnus Damm <magnus.damm@gmail.com> wrote:
> On Mon, Feb 17, 2014 at 4:54 PM, Wolfram Sang <wsa@the-dreams.de> wrote:
>> On Sun, Feb 16, 2014 at 10:40:55AM +0100, Wolfram Sang wrote:
>>> From: Wolfram Sang <wsa@sang-engineering.com>
>>>
>>> Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
>>
>> From your other mail:
>>
>> "[2/5] needs to be reworked to exclude the r8a7790 compatible string."
>>
>>> + compatible = "renesas,i2c-r8a7791", "renesas,i2c-r8a7790";
>>
>> Why is that? From my knowledge, you start with the exact compatible
>> property and hardware compatible entries may follow.
Thanks for posting the link to the device tree wiki/quoting from it.
I had faint memories of that quote, but couldn't remember where I read it.
> I think this boils down to if they really are compatible or not. If
> for instance a 16550 port would be compatible with 8250 on a hardware
> level then using them in the order of "16550", "8250" makes sense. In
> this case the r8a7791 i2c is not really strictly based on r8a7790 i2c,
> it is just that r8a7790 has support in the driver. So it's a short cut
> instead of actual hardware compatibility.
>
> So far we've dealt with this by updating the driver and only relying
> on the actual SoC name as suffix.
>
> I'm sure there are tons of opinions. =)
Hehe ;-)
I think the tricky part is when a driver for "renesas,i2c-r8a7790" is updated
with a new feature for r8a7790, which doesn't necessarily exist in r8a7791.
Then the compatible entry above will cause breakage.
In our case, this probably won't happen, as we will have "renesas,i2c-r8a7791"
in the driver, but the driver could be forked in between the addition of
"renesas,i2c-r8a7790" and "renesas,i2c-r8a7791" in our non-ideal world.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 20+ messages in thread* Re: [PATCH 2/5] ARM: shmobile: r8a7791: add i2c master nodes to dtsi
2014-02-17 9:11 ` Geert Uytterhoeven
@ 2014-02-17 9:19 ` Wolfram Sang
2014-02-17 9:23 ` Geert Uytterhoeven
0 siblings, 1 reply; 20+ messages in thread
From: Wolfram Sang @ 2014-02-17 9:19 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Magnus Damm, SH-Linux, linux-arm-kernel@lists.infradead.org,
devicetree@vger.kernel.org, Simon Horman
[-- Attachment #1: Type: text/plain, Size: 494 bytes --]
> I think the tricky part is when a driver for "renesas,i2c-r8a7790" is updated
> with a new feature for r8a7790, which doesn't necessarily exist in r8a7791.
> Then the compatible entry above will cause breakage.
If the driver is updated in that way, then it MUST introduce an r8a7791
compatible entry and make sure the new feature is only used on r8a7790.
Otherwise it is a bug. If this is adhered, we won't have a breakage
because the specific entry (here r8a7791) always comes first. Or?
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 2/5] ARM: shmobile: r8a7791: add i2c master nodes to dtsi
2014-02-17 9:19 ` Wolfram Sang
@ 2014-02-17 9:23 ` Geert Uytterhoeven
2014-02-17 9:31 ` Wolfram Sang
0 siblings, 1 reply; 20+ messages in thread
From: Geert Uytterhoeven @ 2014-02-17 9:23 UTC (permalink / raw)
To: Wolfram Sang
Cc: Magnus Damm, SH-Linux, linux-arm-kernel@lists.infradead.org,
devicetree@vger.kernel.org, Simon Horman
Hi Wolfram,
On Mon, Feb 17, 2014 at 10:19 AM, Wolfram Sang <wsa@the-dreams.de> wrote:
>> I think the tricky part is when a driver for "renesas,i2c-r8a7790" is updated
>> with a new feature for r8a7790, which doesn't necessarily exist in r8a7791.
>> Then the compatible entry above will cause breakage.
>
> If the driver is updated in that way, then it MUST introduce an r8a7791
> compatible entry and make sure the new feature is only used on r8a7790.
> Otherwise it is a bug. If this is adhered, we won't have a breakage
> because the specific entry (here r8a7791) always comes first. Or?
That will indeed prevent breakage. But in the distributed development world,
the person who modifies the driver may not be aware of the r8a7791.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 20+ messages in thread* Re: [PATCH 2/5] ARM: shmobile: r8a7791: add i2c master nodes to dtsi
2014-02-17 9:23 ` Geert Uytterhoeven
@ 2014-02-17 9:31 ` Wolfram Sang
2014-02-17 10:03 ` Magnus Damm
0 siblings, 1 reply; 20+ messages in thread
From: Wolfram Sang @ 2014-02-17 9:31 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Magnus Damm, SH-Linux, linux-arm-kernel@lists.infradead.org,
devicetree@vger.kernel.org, Simon Horman
[-- Attachment #1: Type: text/plain, Size: 1260 bytes --]
On Mon, Feb 17, 2014 at 10:23:31AM +0100, Geert Uytterhoeven wrote:
> Hi Wolfram,
>
> On Mon, Feb 17, 2014 at 10:19 AM, Wolfram Sang <wsa@the-dreams.de> wrote:
> >> I think the tricky part is when a driver for "renesas,i2c-r8a7790" is updated
> >> with a new feature for r8a7790, which doesn't necessarily exist in r8a7791.
> >> Then the compatible entry above will cause breakage.
> >
> > If the driver is updated in that way, then it MUST introduce an r8a7791
> > compatible entry and make sure the new feature is only used on r8a7790.
> > Otherwise it is a bug. If this is adhered, we won't have a breakage
> > because the specific entry (here r8a7791) always comes first. Or?
>
> That will indeed prevent breakage. But in the distributed development world,
> the person who modifies the driver may not be aware of the r8a7791.
Then it will break even with a seperate r8a7791 compatible entry as
well, sadly. Currently, the only thing encoded in the .data field of all
compatibles, is which generation of the core is used. This is the same
for r8a7790 and r8a7791 (this is why they ARE compatible ;)). So, even
in the unlikely case of an r8a7790-only-feature, some code/reactoring to
make the distinction is absolutely necessary.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 2/5] ARM: shmobile: r8a7791: add i2c master nodes to dtsi
2014-02-17 9:31 ` Wolfram Sang
@ 2014-02-17 10:03 ` Magnus Damm
2014-02-17 10:08 ` Wolfram Sang
0 siblings, 1 reply; 20+ messages in thread
From: Magnus Damm @ 2014-02-17 10:03 UTC (permalink / raw)
To: Wolfram Sang
Cc: Geert Uytterhoeven, SH-Linux,
linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
Simon Horman
On Mon, Feb 17, 2014 at 6:31 PM, Wolfram Sang <wsa@the-dreams.de> wrote:
> On Mon, Feb 17, 2014 at 10:23:31AM +0100, Geert Uytterhoeven wrote:
>> Hi Wolfram,
>>
>> On Mon, Feb 17, 2014 at 10:19 AM, Wolfram Sang <wsa@the-dreams.de> wrote:
>> >> I think the tricky part is when a driver for "renesas,i2c-r8a7790" is updated
>> >> with a new feature for r8a7790, which doesn't necessarily exist in r8a7791.
>> >> Then the compatible entry above will cause breakage.
>> >
>> > If the driver is updated in that way, then it MUST introduce an r8a7791
>> > compatible entry and make sure the new feature is only used on r8a7790.
>> > Otherwise it is a bug. If this is adhered, we won't have a breakage
>> > because the specific entry (here r8a7791) always comes first. Or?
>>
>> That will indeed prevent breakage. But in the distributed development world,
>> the person who modifies the driver may not be aware of the r8a7791.
>
> Then it will break even with a seperate r8a7791 compatible entry as
> well, sadly. Currently, the only thing encoded in the .data field of all
> compatibles, is which generation of the core is used. This is the same
> for r8a7790 and r8a7791 (this is why they ARE compatible ;)). So, even
> in the unlikely case of an r8a7790-only-feature, some code/reactoring to
> make the distinction is absolutely necessary.
It won't break because anyone who modifies r8a7790 support need to
make it specific to that SoC to not pull in r8a7791 into some
assumption. Just because the driver assumes something now doesn't mean
the hardware actually is compatible.
I think I understand your proposal with making an assumption of the
current state of the driver and making sure to add the new SoC
compatible value before adjusting the fallback. But this mainly seems
like a optimization to improve throughput commit-wise. I actually
proposed the same way for SDHI, but now when I think about it I
realize that there is no shortcut for adding the compatible string to
the driver. It has to be done sooner or later anyway.
Or what am I missing? =)
/ magnus
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 2/5] ARM: shmobile: r8a7791: add i2c master nodes to dtsi
2014-02-17 10:03 ` Magnus Damm
@ 2014-02-17 10:08 ` Wolfram Sang
2014-02-17 10:11 ` Magnus Damm
0 siblings, 1 reply; 20+ messages in thread
From: Wolfram Sang @ 2014-02-17 10:08 UTC (permalink / raw)
To: Magnus Damm
Cc: Geert Uytterhoeven, SH-Linux,
linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
Simon Horman
[-- Attachment #1: Type: text/plain, Size: 581 bytes --]
> It won't break because anyone who modifies r8a7790 support need to
> make it specific to that SoC to not pull in r8a7791 into some
> assumption.
Geert's assumption was that exactly this can be forgotten. While this is
true, my point was that this is a bug. And as it turned out, neither
this or that solution helps the case :) It needs to be fixed or done
properly right from the beginning.
> realize that there is no shortcut for adding the compatible string to
> the driver. It has to be done sooner or later anyway.
OK, can be seen this way. As said before, I'll resend.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 2/5] ARM: shmobile: r8a7791: add i2c master nodes to dtsi
2014-02-17 10:08 ` Wolfram Sang
@ 2014-02-17 10:11 ` Magnus Damm
2014-02-17 10:25 ` Wolfram Sang
0 siblings, 1 reply; 20+ messages in thread
From: Magnus Damm @ 2014-02-17 10:11 UTC (permalink / raw)
To: Wolfram Sang
Cc: Geert Uytterhoeven, SH-Linux,
linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
Simon Horman
On Mon, Feb 17, 2014 at 7:08 PM, Wolfram Sang <wsa@the-dreams.de> wrote:
>
>> It won't break because anyone who modifies r8a7790 support need to
>> make it specific to that SoC to not pull in r8a7791 into some
>> assumption.
>
> Geert's assumption was that exactly this can be forgotten. While this is
> true, my point was that this is a bug. And as it turned out, neither
> this or that solution helps the case :) It needs to be fixed or done
> properly right from the beginning.
>
>> realize that there is no shortcut for adding the compatible string to
>> the driver. It has to be done sooner or later anyway.
>
> OK, can be seen this way. As said before, I'll resend.
Thanks! I'd be happy to discuss this more over a beverage in the not
so distant future! =)
/ magnus
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 2/5] ARM: shmobile: r8a7791: add i2c master nodes to dtsi
2014-02-17 8:02 ` Magnus Damm
2014-02-17 9:11 ` Geert Uytterhoeven
@ 2014-02-17 9:12 ` Wolfram Sang
2014-02-17 9:57 ` Magnus Damm
1 sibling, 1 reply; 20+ messages in thread
From: Wolfram Sang @ 2014-02-17 9:12 UTC (permalink / raw)
To: Magnus Damm
Cc: SH-Linux, linux-arm-kernel@lists.infradead.org, devicetree,
Simon Horman
[-- Attachment #1: Type: text/plain, Size: 956 bytes --]
> > Why is that? From my knowledge, you start with the exact compatible
> > property and hardware compatible entries may follow.
>
> I think this boils down to if they really are compatible or not. If
> for instance a 16550 port would be compatible with 8250 on a hardware
> level then using them in the order of "16550", "8250" makes sense. In
> this case the r8a7791 i2c is not really strictly based on r8a7790 i2c,
> it is just that r8a7790 has support in the driver. So it's a short cut
> instead of actual hardware compatibility.
I don't get this point. The legacy board code for koelsch and lager both
create a platform_device with "i2c-rcar_gen2", so the cores surely must
be compatible? Maybe the cores are not strictly based on each other, but
compatible, yes, I'd say.
> So far we've dealt with this by updating the driver and only relying
> on the actual SoC name as suffix.
OK, for consistency reasons I will resend.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 2/5] ARM: shmobile: r8a7791: add i2c master nodes to dtsi
2014-02-17 9:12 ` Wolfram Sang
@ 2014-02-17 9:57 ` Magnus Damm
0 siblings, 0 replies; 20+ messages in thread
From: Magnus Damm @ 2014-02-17 9:57 UTC (permalink / raw)
To: Wolfram Sang
Cc: SH-Linux, linux-arm-kernel@lists.infradead.org, devicetree,
Simon Horman
On Mon, Feb 17, 2014 at 6:12 PM, Wolfram Sang <wsa@the-dreams.de> wrote:
>
>> > Why is that? From my knowledge, you start with the exact compatible
>> > property and hardware compatible entries may follow.
>>
>> I think this boils down to if they really are compatible or not. If
>> for instance a 16550 port would be compatible with 8250 on a hardware
>> level then using them in the order of "16550", "8250" makes sense. In
>> this case the r8a7791 i2c is not really strictly based on r8a7790 i2c,
>> it is just that r8a7790 has support in the driver. So it's a short cut
>> instead of actual hardware compatibility.
>
> I don't get this point. The legacy board code for koelsch and lager both
> create a platform_device with "i2c-rcar_gen2", so the cores surely must
> be compatible? Maybe the cores are not strictly based on each other, but
> compatible, yes, I'd say.
The devices may be compatible seen from the limited use case coming
from the current version of the device driver. But that does not
necessarily mean they are compatible from a hardware point of view. My
view is that the hardware should not be seen compatible unless it is
explicitly documented to be so.
For platform devices we make use of "unstable ids" or feature flags to
describe a certain part of hardware as we know it at the time of
writing the code. Then we can update the features in the driver and
make sure all in-tree boards/socs using the "unstable id" keeps on
working by for instance adjusting platform data or adding resources. I
think this is a fine model for platform devices.
In my mind the above model is quite different from how I think we
should describe devices via DT. In the DT case I think it is wrong to
rely on software defined "unstable ids" like for instance
"i2c-rcar-gen2" because they are built on our perhaps limited
interpretation of the hardware. Of course, if the hardware
documentation would be correct and we have hardware ids described in
the documentation then we can start using those as compatible strings.
Until then I feel it is safe to use the SoC name in the compatible
string.
Cheers,
/ magnus
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 3/5] ARM: shmobile: r8a7791: add i2c2 bus to koelsch dt
2014-02-16 9:40 [PATCH 0/5] enable i2c on koelsch-dt (and cleanup lager) Wolfram Sang
2014-02-16 9:40 ` [PATCH 1/5] ARM: shmobile: r8a7791: remove superfluous interrupt-parents Wolfram Sang
2014-02-16 9:40 ` [PATCH 2/5] ARM: shmobile: r8a7791: add i2c master nodes to dtsi Wolfram Sang
@ 2014-02-16 9:40 ` Wolfram Sang
2014-02-16 9:40 ` [PATCH 4/5] ARM: shmobile: r8a7790: remove superfluous interrupt-parents Wolfram Sang
` (2 subsequent siblings)
5 siblings, 0 replies; 20+ messages in thread
From: Wolfram Sang @ 2014-02-16 9:40 UTC (permalink / raw)
To: linux-sh
Cc: linux-arm-kernel, devicetree, Magnus Damm, Simon Horman,
Wolfram Sang
From: Wolfram Sang <wsa@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
---
arch/arm/boot/dts/r8a7791-koelsch.dts | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index d4b9bba..b3f75d7 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -108,10 +108,29 @@
clock-frequency = <20000000>;
};
+&i2c2 {
+ pinctrl-0 = <&i2c2_pins>;
+ pinctrl-names = "default";
+
+ status = "okay";
+ clock-frequency = <400000>;
+
+ eeprom@50 {
+ compatible = "renesas,24c02";
+ reg = <0x50>;
+ pagesize = <16>;
+ };
+};
+
&pfc {
pinctrl-0 = <&scif0_pins &scif1_pins>;
pinctrl-names = "default";
+ i2c2_pins: i2c {
+ renesas,groups = "i2c2";
+ renesas,function = "i2c2";
+ };
+
scif0_pins: serial0 {
renesas,groups = "scif0_data_d";
renesas,function = "scif0";
--
1.8.5.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 4/5] ARM: shmobile: r8a7790: remove superfluous interrupt-parents
2014-02-16 9:40 [PATCH 0/5] enable i2c on koelsch-dt (and cleanup lager) Wolfram Sang
` (2 preceding siblings ...)
2014-02-16 9:40 ` [PATCH 3/5] ARM: shmobile: r8a7791: add i2c2 bus to koelsch dt Wolfram Sang
@ 2014-02-16 9:40 ` Wolfram Sang
2014-02-16 9:40 ` [PATCH 5/5] ARM: shmobile: r8a7790: add i2c aliases to dtsi Wolfram Sang
2014-02-17 3:13 ` [PATCH 0/5] enable i2c on koelsch-dt (and cleanup lager) Magnus Damm
5 siblings, 0 replies; 20+ messages in thread
From: Wolfram Sang @ 2014-02-16 9:40 UTC (permalink / raw)
To: linux-sh
Cc: linux-arm-kernel, devicetree, Magnus Damm, Simon Horman,
Wolfram Sang
From: Wolfram Sang <wsa@sang-engineering.com>
These values are inherited, so don't need to be specified again.
Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
---
arch/arm/boot/dts/r8a7790.dtsi | 31 -------------------------------
1 file changed, 31 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 16bc116..a6e3713 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -94,7 +94,6 @@
gpio0: gpio@e6050000 {
compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
reg = <0 0xe6050000 0 0x50>;
- interrupt-parent = <&gic>;
interrupts = <0 4 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>;
gpio-controller;
@@ -106,7 +105,6 @@
gpio1: gpio@e6051000 {
compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
reg = <0 0xe6051000 0 0x50>;
- interrupt-parent = <&gic>;
interrupts = <0 5 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>;
gpio-controller;
@@ -118,7 +116,6 @@
gpio2: gpio@e6052000 {
compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
reg = <0 0xe6052000 0 0x50>;
- interrupt-parent = <&gic>;
interrupts = <0 6 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>;
gpio-controller;
@@ -130,7 +127,6 @@
gpio3: gpio@e6053000 {
compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
reg = <0 0xe6053000 0 0x50>;
- interrupt-parent = <&gic>;
interrupts = <0 7 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>;
gpio-controller;
@@ -142,7 +138,6 @@
gpio4: gpio@e6054000 {
compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
reg = <0 0xe6054000 0 0x50>;
- interrupt-parent = <&gic>;
interrupts = <0 8 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>;
gpio-controller;
@@ -154,7 +149,6 @@
gpio5: gpio@e6055000 {
compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
reg = <0 0xe6055000 0 0x50>;
- interrupt-parent = <&gic>;
interrupts = <0 9 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>;
gpio-controller;
@@ -166,7 +160,6 @@
thermal@e61f0000 {
compatible = "renesas,thermal-r8a7790", "renesas,rcar-thermal";
reg = <0 0xe61f0000 0 0x14>, <0 0xe61f0100 0 0x38>;
- interrupt-parent = <&gic>;
interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp5_clks R8A7790_CLK_THERMAL>;
};
@@ -184,7 +177,6 @@
#interrupt-cells = <2>;
interrupt-controller;
reg = <0 0xe61c0000 0 0x200>;
- interrupt-parent = <&gic>;
interrupts = <0 0 IRQ_TYPE_LEVEL_HIGH>,
<0 1 IRQ_TYPE_LEVEL_HIGH>,
<0 2 IRQ_TYPE_LEVEL_HIGH>,
@@ -196,7 +188,6 @@
#size-cells = <0>;
compatible = "renesas,i2c-r8a7790";
reg = <0 0xe6508000 0 0x40>;
- interrupt-parent = <&gic>;
interrupts = <0 287 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp9_clks R8A7790_CLK_I2C0>;
status = "disabled";
@@ -207,7 +198,6 @@
#size-cells = <0>;
compatible = "renesas,i2c-r8a7790";
reg = <0 0xe6518000 0 0x40>;
- interrupt-parent = <&gic>;
interrupts = <0 288 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp9_clks R8A7790_CLK_I2C1>;
status = "disabled";
@@ -218,7 +208,6 @@
#size-cells = <0>;
compatible = "renesas,i2c-r8a7790";
reg = <0 0xe6530000 0 0x40>;
- interrupt-parent = <&gic>;
interrupts = <0 286 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp9_clks R8A7790_CLK_I2C2>;
status = "disabled";
@@ -229,7 +218,6 @@
#size-cells = <0>;
compatible = "renesas,i2c-r8a7790";
reg = <0 0xe6540000 0 0x40>;
- interrupt-parent = <&gic>;
interrupts = <0 290 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp9_clks R8A7790_CLK_I2C3>;
status = "disabled";
@@ -238,7 +226,6 @@
mmcif0: mmcif@ee200000 {
compatible = "renesas,mmcif-r8a7790", "renesas,sh-mmcif";
reg = <0 0xee200000 0 0x80>;
- interrupt-parent = <&gic>;
interrupts = <0 169 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp3_clks R8A7790_CLK_MMCIF0>;
reg-io-width = <4>;
@@ -248,7 +235,6 @@
mmcif1: mmc@ee220000 {
compatible = "renesas,mmcif-r8a7790", "renesas,sh-mmcif";
reg = <0 0xee220000 0 0x80>;
- interrupt-parent = <&gic>;
interrupts = <0 170 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp3_clks R8A7790_CLK_MMCIF1>;
reg-io-width = <4>;
@@ -263,7 +249,6 @@
sdhi0: sd@ee100000 {
compatible = "renesas,sdhi-r8a7790";
reg = <0 0xee100000 0 0x200>;
- interrupt-parent = <&gic>;
interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp3_clks R8A7790_CLK_SDHI0>;
cap-sd-highspeed;
@@ -273,7 +258,6 @@
sdhi1: sd@ee120000 {
compatible = "renesas,sdhi-r8a7790";
reg = <0 0xee120000 0 0x200>;
- interrupt-parent = <&gic>;
interrupts = <0 166 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp3_clks R8A7790_CLK_SDHI1>;
cap-sd-highspeed;
@@ -283,7 +267,6 @@
sdhi2: sd@ee140000 {
compatible = "renesas,sdhi-r8a7790";
reg = <0 0xee140000 0 0x100>;
- interrupt-parent = <&gic>;
interrupts = <0 167 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp3_clks R8A7790_CLK_SDHI2>;
cap-sd-highspeed;
@@ -293,7 +276,6 @@
sdhi3: sd@ee160000 {
compatible = "renesas,sdhi-r8a7790";
reg = <0 0xee160000 0 0x100>;
- interrupt-parent = <&gic>;
interrupts = <0 168 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp3_clks R8A7790_CLK_SDHI3>;
cap-sd-highspeed;
@@ -303,7 +285,6 @@
scifa0: serial@e6c40000 {
compatible = "renesas,scifa-r8a7790", "renesas,scifa";
reg = <0 0xe6c40000 0 64>;
- interrupt-parent = <&gic>;
interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp2_clks R8A7790_CLK_SCIFA0>;
clock-names = "sci_ick";
@@ -312,7 +293,6 @@
scifa1: serial@e6c50000 {
compatible = "renesas,scifa-r8a7790", "renesas,scifa";
- interrupt-parent = <&gic>;
reg = <0 0xe6c50000 0 64>;
interrupts = <0 145 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp2_clks R8A7790_CLK_SCIFA1>;
@@ -322,7 +302,6 @@
scifa2: serial@e6c60000 {
compatible = "renesas,scifa-r8a7790", "renesas,scifa";
- interrupt-parent = <&gic>;
reg = <0 0xe6c60000 0 64>;
interrupts = <0 151 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp2_clks R8A7790_CLK_SCIFA2>;
@@ -332,7 +311,6 @@
scifb0: serial@e6c20000 {
compatible = "renesas,scifb-r8a7790", "renesas,scifb";
- interrupt-parent = <&gic>;
reg = <0 0xe6c20000 0 64>;
interrupts = <0 148 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp2_clks R8A7790_CLK_SCIFB0>;
@@ -342,7 +320,6 @@
scifb1: serial@e6c30000 {
compatible = "renesas,scifb-r8a7790", "renesas,scifb";
- interrupt-parent = <&gic>;
reg = <0 0xe6c30000 0 64>;
interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp2_clks R8A7790_CLK_SCIFB1>;
@@ -352,7 +329,6 @@
scifb2: serial@e6ce0000 {
compatible = "renesas,scifb-r8a7790", "renesas,scifb";
- interrupt-parent = <&gic>;
reg = <0 0xe6ce0000 0 64>;
interrupts = <0 150 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp2_clks R8A7790_CLK_SCIFB2>;
@@ -362,7 +338,6 @@
scif0: serial@e6e60000 {
compatible = "renesas,scif-r8a7790", "renesas,scif";
- interrupt-parent = <&gic>;
reg = <0 0xe6e60000 0 64>;
interrupts = <0 152 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp7_clks R8A7790_CLK_SCIF0>;
@@ -372,7 +347,6 @@
scif1: serial@e6e68000 {
compatible = "renesas,scif-r8a7790", "renesas,scif";
- interrupt-parent = <&gic>;
reg = <0 0xe6e68000 0 64>;
interrupts = <0 153 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp7_clks R8A7790_CLK_SCIF1>;
@@ -382,7 +356,6 @@
hscif0: serial@e62c0000 {
compatible = "renesas,hscif-r8a7790", "renesas,hscif";
- interrupt-parent = <&gic>;
reg = <0 0xe62c0000 0 96>;
interrupts = <0 154 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp7_clks R8A7790_CLK_HSCIF0>;
@@ -392,7 +365,6 @@
hscif1: serial@e62c8000 {
compatible = "renesas,hscif-r8a7790", "renesas,hscif";
- interrupt-parent = <&gic>;
reg = <0 0xe62c8000 0 96>;
interrupts = <0 155 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp7_clks R8A7790_CLK_HSCIF1>;
@@ -403,7 +375,6 @@
sata0: sata@ee300000 {
compatible = "renesas,sata-r8a7790";
reg = <0 0xee300000 0 0x2000>;
- interrupt-parent = <&gic>;
interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp8_clks R8A7790_CLK_SATA0>;
status = "disabled";
@@ -412,7 +383,6 @@
sata1: sata@ee500000 {
compatible = "renesas,sata-r8a7790";
reg = <0 0xee500000 0 0x2000>;
- interrupt-parent = <&gic>;
interrupts = <0 106 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp8_clks R8A7790_CLK_SATA1>;
status = "disabled";
@@ -779,7 +749,6 @@
spi: spi@e6b10000 {
compatible = "renesas,qspi-r8a7790", "renesas,qspi";
reg = <0 0xe6b10000 0 0x2c>;
- interrupt-parent = <&gic>;
interrupts = <0 184 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp9_clks R8A7790_CLK_QSPI_MOD>;
num-cs = <1>;
--
1.8.5.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 5/5] ARM: shmobile: r8a7790: add i2c aliases to dtsi
2014-02-16 9:40 [PATCH 0/5] enable i2c on koelsch-dt (and cleanup lager) Wolfram Sang
` (3 preceding siblings ...)
2014-02-16 9:40 ` [PATCH 4/5] ARM: shmobile: r8a7790: remove superfluous interrupt-parents Wolfram Sang
@ 2014-02-16 9:40 ` Wolfram Sang
2014-02-17 3:13 ` [PATCH 0/5] enable i2c on koelsch-dt (and cleanup lager) Magnus Damm
5 siblings, 0 replies; 20+ messages in thread
From: Wolfram Sang @ 2014-02-16 9:40 UTC (permalink / raw)
To: linux-sh
Cc: linux-arm-kernel, devicetree, Magnus Damm, Simon Horman,
Wolfram Sang
From: Wolfram Sang <wsa@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
---
arch/arm/boot/dts/r8a7790.dtsi | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index a6e3713..a1e7c39 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -18,6 +18,13 @@
#address-cells = <2>;
#size-cells = <2>;
+ aliases {
+ i2c0 = &i2c0;
+ i2c1 = &i2c1;
+ i2c2 = &i2c2;
+ i2c3 = &i2c3;
+ };
+
cpus {
#address-cells = <1>;
#size-cells = <0>;
--
1.8.5.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [PATCH 0/5] enable i2c on koelsch-dt (and cleanup lager)
2014-02-16 9:40 [PATCH 0/5] enable i2c on koelsch-dt (and cleanup lager) Wolfram Sang
` (4 preceding siblings ...)
2014-02-16 9:40 ` [PATCH 5/5] ARM: shmobile: r8a7790: add i2c aliases to dtsi Wolfram Sang
@ 2014-02-17 3:13 ` Magnus Damm
2014-02-17 3:19 ` Simon Horman
5 siblings, 1 reply; 20+ messages in thread
From: Magnus Damm @ 2014-02-17 3:13 UTC (permalink / raw)
To: Wolfram Sang
Cc: SH-Linux, linux-arm-kernel@lists.infradead.org, devicetree,
Simon Horman
Hi Wolfram,
On Sun, Feb 16, 2014 at 6:40 PM, Wolfram Sang <wsa@the-dreams.de> wrote:
> This series adds all rcar cores to the r8a7791 dtsi and enables bus 2 on the
> koelsch board. Functionality was tested with reading/writing to an eeprom. Some
> rcar driver issues have been observed, but they are independent from the dt
> binding provided here. On the way, some cleanups were found which apply to
> r8a7790 as well, yet those are only compile tested since I don't have HW access
> to the lager board (yet).
>
> The series is based on tag 'renesas-devel-v3.14-rc2-20140213' and can be found here
> git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git renesas/r8a7791-i2c
>
> Please review/apply.
Thanks for your patches. I think they look good in general, but patch
[2/5] needs to be reworked to exclude the r8a7790 compatible string.
Patch [3/5] probably depends on [2/5] so it needs to wait too.
> Wolfram Sang (5):
> ARM: shmobile: r8a7791: remove superfluous interrupt-parents
[1/5] looks fine
> ARM: shmobile: r8a7791: add i2c master nodes to dtsi
> ARM: shmobile: r8a7791: add i2c2 bus to koelsch dt
[2/5] needs rework
[3/5] depends on [2/5] - needs to wait
> ARM: shmobile: r8a7790: remove superfluous interrupt-parents
> ARM: shmobile: r8a7790: add i2c aliases to dtsi
[4/5] looks good
[5/5] looks good
For the patches [1/5], [4/5], [5/5]
Acked-by: Magnus Damm <damm@opensource.se>
Let us discuss [2/5] in a separate thread.
Thanks for your help!
/ magnus
^ permalink raw reply [flat|nested] 20+ messages in thread* Re: [PATCH 0/5] enable i2c on koelsch-dt (and cleanup lager)
2014-02-17 3:13 ` [PATCH 0/5] enable i2c on koelsch-dt (and cleanup lager) Magnus Damm
@ 2014-02-17 3:19 ` Simon Horman
0 siblings, 0 replies; 20+ messages in thread
From: Simon Horman @ 2014-02-17 3:19 UTC (permalink / raw)
To: Magnus Damm
Cc: Wolfram Sang, SH-Linux, linux-arm-kernel@lists.infradead.org,
devicetree
On Mon, Feb 17, 2014 at 12:13:09PM +0900, Magnus Damm wrote:
> Hi Wolfram,
>
> On Sun, Feb 16, 2014 at 6:40 PM, Wolfram Sang <wsa@the-dreams.de> wrote:
> > This series adds all rcar cores to the r8a7791 dtsi and enables bus 2 on the
> > koelsch board. Functionality was tested with reading/writing to an eeprom. Some
> > rcar driver issues have been observed, but they are independent from the dt
> > binding provided here. On the way, some cleanups were found which apply to
> > r8a7790 as well, yet those are only compile tested since I don't have HW access
> > to the lager board (yet).
> >
> > The series is based on tag 'renesas-devel-v3.14-rc2-20140213' and can be found here
> > git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git renesas/r8a7791-i2c
> >
> > Please review/apply.
>
> Thanks for your patches. I think they look good in general, but patch
> [2/5] needs to be reworked to exclude the r8a7790 compatible string.
> Patch [3/5] probably depends on [2/5] so it needs to wait too.
>
> > Wolfram Sang (5):
> > ARM: shmobile: r8a7791: remove superfluous interrupt-parents
> [1/5] looks fine
>
> > ARM: shmobile: r8a7791: add i2c master nodes to dtsi
> > ARM: shmobile: r8a7791: add i2c2 bus to koelsch dt
> [2/5] needs rework
> [3/5] depends on [2/5] - needs to wait
>
> > ARM: shmobile: r8a7790: remove superfluous interrupt-parents
> > ARM: shmobile: r8a7790: add i2c aliases to dtsi
> [4/5] looks good
> [5/5] looks good
>
> For the patches [1/5], [4/5], [5/5]
>
> Acked-by: Magnus Damm <damm@opensource.se>
Thanks, I will queue those up.
> Let us discuss [2/5] in a separate thread.
>
> Thanks for your help!
>
> / magnus
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 20+ messages in thread