* [PATCH 0/6] ARM: shmobile: various DT files sorted by address
@ 2014-09-12 8:51 Ulrich Hecht
2014-09-12 8:51 ` [PATCH 1/6] ARM: shmobile: r7s72100: sort dtsi file " Ulrich Hecht
` (5 more replies)
0 siblings, 6 replies; 14+ messages in thread
From: Ulrich Hecht @ 2014-09-12 8:51 UTC (permalink / raw)
To: horms, Olof Johansson; +Cc: linux-sh, devicetree, magnus.damm, Ulrich Hecht
Hi!
Here's a bunch of DT files sorted by address only. I hope nobody sees a
need to break those down any further.
None of these patches depend on each other, or anything else for that
matter, so feel free to pick and choose.
Olof, is there a consensus on other sort criteria? I'm thinking of
"'compatible' first", for instance. (Should that take precedence over #...
properties, too? I have implemented that as the default in
https://github.com/uli/dtssort, but it looks slightly odd to me.)
CU
Uli
Ulrich Hecht (6):
ARM: shmobile: r7s72100: sort dtsi file by address
ARM: shmobile: emev2: sort dtsi file by address
ARM: shmobile: kzm9d: sort dts file by address
ARM: shmobile: r8a73a4: sort dtsi file by address
ARM: shmobile: ape6evm: sort dts file by address
ARM: shmobile: ape6evm-reference: sort dts file by address
arch/arm/boot/dts/emev2-kzm9d.dts | 62 +++----
arch/arm/boot/dts/emev2.dtsi | 120 ++++++------
arch/arm/boot/dts/r7s72100.dtsi | 202 ++++++++++-----------
arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 26 +--
arch/arm/boot/dts/r8a73a4-ape6evm.dts | 36 ++--
arch/arm/boot/dts/r8a73a4.dtsi | 232 ++++++++++++------------
6 files changed, 339 insertions(+), 339 deletions(-)
--
1.8.4.5
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 1/6] ARM: shmobile: r7s72100: sort dtsi file by address 2014-09-12 8:51 [PATCH 0/6] ARM: shmobile: various DT files sorted by address Ulrich Hecht @ 2014-09-12 8:51 ` Ulrich Hecht 2014-09-16 0:49 ` Simon Horman 2014-09-12 8:51 ` [PATCH 2/6] ARM: shmobile: emev2: " Ulrich Hecht ` (4 subsequent siblings) 5 siblings, 1 reply; 14+ messages in thread From: Ulrich Hecht @ 2014-09-12 8:51 UTC (permalink / raw) To: horms, Olof Johansson; +Cc: linux-sh, devicetree, magnus.damm, Ulrich Hecht Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> --- arch/arm/boot/dts/r7s72100.dtsi | 202 ++++++++++++++++++++-------------------- 1 file changed, 101 insertions(+), 101 deletions(-) diff --git a/arch/arm/boot/dts/r7s72100.dtsi b/arch/arm/boot/dts/r7s72100.dtsi index 1d28d01..6a0e57e 100644 --- a/arch/arm/boot/dts/r7s72100.dtsi +++ b/arch/arm/boot/dts/r7s72100.dtsi @@ -52,16 +52,6 @@ clock-output-names = "usb_x1"; }; - /* Special CPG clocks */ - cpg_clocks: cpg_clocks@fcfe0000 { - #clock-cells = <1>; - compatible = "renesas,r7s72100-cpg-clocks", - "renesas,rz-cpg-clocks"; - reg = <0xfcfe0000 0x18>; - clocks = <&extal_clk>, <&usb_x1_clk>; - clock-output-names = "pll", "i", "g"; - }; - /* Fixed factor clocks */ b_clk: b_clk { #clock-cells = <0>; @@ -88,6 +78,16 @@ clock-output-names = "p0"; }; + /* Special CPG clocks */ + cpg_clocks: cpg_clocks@fcfe0000 { + #clock-cells = <1>; + compatible = "renesas,r7s72100-cpg-clocks", + "renesas,rz-cpg-clocks"; + reg = <0xfcfe0000 0x18>; + clocks = <&extal_clk>, <&usb_x1_clk>; + clock-output-names = "pll", "i", "g"; + }; + /* MSTP clocks */ mstp3_clks: mstp3_clks@fcfe0420 { #clock-cells = <1>; @@ -148,97 +148,6 @@ }; }; - gic: interrupt-controller@e8201000 { - compatible = "arm,cortex-a9-gic"; - #interrupt-cells = <3>; - #address-cells = <0>; - interrupt-controller; - reg = <0xe8201000 0x1000>, - <0xe8202000 0x1000>; - }; - - i2c0: i2c@fcfee000 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "renesas,riic-r7s72100", "renesas,riic-rz"; - reg = <0xfcfee000 0x44>; - interrupts = <0 157 IRQ_TYPE_LEVEL_HIGH>, - <0 158 IRQ_TYPE_EDGE_RISING>, - <0 159 IRQ_TYPE_EDGE_RISING>, - <0 160 IRQ_TYPE_LEVEL_HIGH>, - <0 161 IRQ_TYPE_LEVEL_HIGH>, - <0 162 IRQ_TYPE_LEVEL_HIGH>, - <0 163 IRQ_TYPE_LEVEL_HIGH>, - <0 164 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&mstp9_clks R7S72100_CLK_I2C0>; - clock-frequency = <100000>; - status = "disabled"; - }; - - i2c1: i2c@fcfee400 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "renesas,riic-r7s72100", "renesas,riic-rz"; - reg = <0xfcfee400 0x44>; - interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>, - <0 166 IRQ_TYPE_EDGE_RISING>, - <0 167 IRQ_TYPE_EDGE_RISING>, - <0 168 IRQ_TYPE_LEVEL_HIGH>, - <0 169 IRQ_TYPE_LEVEL_HIGH>, - <0 170 IRQ_TYPE_LEVEL_HIGH>, - <0 171 IRQ_TYPE_LEVEL_HIGH>, - <0 172 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&mstp9_clks R7S72100_CLK_I2C1>; - clock-frequency = <100000>; - status = "disabled"; - }; - - i2c2: i2c@fcfee800 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "renesas,riic-r7s72100", "renesas,riic-rz"; - reg = <0xfcfee800 0x44>; - interrupts = <0 173 IRQ_TYPE_LEVEL_HIGH>, - <0 174 IRQ_TYPE_EDGE_RISING>, - <0 175 IRQ_TYPE_EDGE_RISING>, - <0 176 IRQ_TYPE_LEVEL_HIGH>, - <0 177 IRQ_TYPE_LEVEL_HIGH>, - <0 178 IRQ_TYPE_LEVEL_HIGH>, - <0 179 IRQ_TYPE_LEVEL_HIGH>, - <0 180 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&mstp9_clks R7S72100_CLK_I2C2>; - clock-frequency = <100000>; - status = "disabled"; - }; - - i2c3: i2c@fcfeec00 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "renesas,riic-r7s72100", "renesas,riic-rz"; - reg = <0xfcfeec00 0x44>; - interrupts = <0 181 IRQ_TYPE_LEVEL_HIGH>, - <0 182 IRQ_TYPE_EDGE_RISING>, - <0 183 IRQ_TYPE_EDGE_RISING>, - <0 184 IRQ_TYPE_LEVEL_HIGH>, - <0 185 IRQ_TYPE_LEVEL_HIGH>, - <0 186 IRQ_TYPE_LEVEL_HIGH>, - <0 187 IRQ_TYPE_LEVEL_HIGH>, - <0 188 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&mstp9_clks R7S72100_CLK_I2C3>; - clock-frequency = <100000>; - status = "disabled"; - }; - - mtu2: timer@fcff0000 { - compatible = "renesas,mtu2"; - reg = <0xfcff0000 0x400>; - interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "tgi0a"; - clocks = <&mstp3_clks R7S72100_CLK_MTU2>; - clock-names = "fck"; - status = "disabled"; - }; - scif0: serial@e8007000 { compatible = "renesas,scif-r7s72100", "renesas,scif"; reg = <0xe8007000 64>; @@ -404,4 +313,95 @@ #size-cells = <0>; status = "disabled"; }; + + gic: interrupt-controller@e8201000 { + compatible = "arm,cortex-a9-gic"; + #interrupt-cells = <3>; + #address-cells = <0>; + interrupt-controller; + reg = <0xe8201000 0x1000>, + <0xe8202000 0x1000>; + }; + + i2c0: i2c@fcfee000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "renesas,riic-r7s72100", "renesas,riic-rz"; + reg = <0xfcfee000 0x44>; + interrupts = <0 157 IRQ_TYPE_LEVEL_HIGH>, + <0 158 IRQ_TYPE_EDGE_RISING>, + <0 159 IRQ_TYPE_EDGE_RISING>, + <0 160 IRQ_TYPE_LEVEL_HIGH>, + <0 161 IRQ_TYPE_LEVEL_HIGH>, + <0 162 IRQ_TYPE_LEVEL_HIGH>, + <0 163 IRQ_TYPE_LEVEL_HIGH>, + <0 164 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp9_clks R7S72100_CLK_I2C0>; + clock-frequency = <100000>; + status = "disabled"; + }; + + i2c1: i2c@fcfee400 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "renesas,riic-r7s72100", "renesas,riic-rz"; + reg = <0xfcfee400 0x44>; + interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>, + <0 166 IRQ_TYPE_EDGE_RISING>, + <0 167 IRQ_TYPE_EDGE_RISING>, + <0 168 IRQ_TYPE_LEVEL_HIGH>, + <0 169 IRQ_TYPE_LEVEL_HIGH>, + <0 170 IRQ_TYPE_LEVEL_HIGH>, + <0 171 IRQ_TYPE_LEVEL_HIGH>, + <0 172 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp9_clks R7S72100_CLK_I2C1>; + clock-frequency = <100000>; + status = "disabled"; + }; + + i2c2: i2c@fcfee800 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "renesas,riic-r7s72100", "renesas,riic-rz"; + reg = <0xfcfee800 0x44>; + interrupts = <0 173 IRQ_TYPE_LEVEL_HIGH>, + <0 174 IRQ_TYPE_EDGE_RISING>, + <0 175 IRQ_TYPE_EDGE_RISING>, + <0 176 IRQ_TYPE_LEVEL_HIGH>, + <0 177 IRQ_TYPE_LEVEL_HIGH>, + <0 178 IRQ_TYPE_LEVEL_HIGH>, + <0 179 IRQ_TYPE_LEVEL_HIGH>, + <0 180 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp9_clks R7S72100_CLK_I2C2>; + clock-frequency = <100000>; + status = "disabled"; + }; + + i2c3: i2c@fcfeec00 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "renesas,riic-r7s72100", "renesas,riic-rz"; + reg = <0xfcfeec00 0x44>; + interrupts = <0 181 IRQ_TYPE_LEVEL_HIGH>, + <0 182 IRQ_TYPE_EDGE_RISING>, + <0 183 IRQ_TYPE_EDGE_RISING>, + <0 184 IRQ_TYPE_LEVEL_HIGH>, + <0 185 IRQ_TYPE_LEVEL_HIGH>, + <0 186 IRQ_TYPE_LEVEL_HIGH>, + <0 187 IRQ_TYPE_LEVEL_HIGH>, + <0 188 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp9_clks R7S72100_CLK_I2C3>; + clock-frequency = <100000>; + status = "disabled"; + }; + + mtu2: timer@fcff0000 { + compatible = "renesas,mtu2"; + reg = <0xfcff0000 0x400>; + interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "tgi0a"; + clocks = <&mstp3_clks R7S72100_CLK_MTU2>; + clock-names = "fck"; + status = "disabled"; + }; }; -- 1.8.4.5 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH 1/6] ARM: shmobile: r7s72100: sort dtsi file by address 2014-09-12 8:51 ` [PATCH 1/6] ARM: shmobile: r7s72100: sort dtsi file " Ulrich Hecht @ 2014-09-16 0:49 ` Simon Horman 0 siblings, 0 replies; 14+ messages in thread From: Simon Horman @ 2014-09-16 0:49 UTC (permalink / raw) To: Ulrich Hecht; +Cc: Olof Johansson, linux-sh, devicetree, magnus.damm On Fri, Sep 12, 2014 at 10:51:11AM +0200, Ulrich Hecht wrote: > Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> > --- > arch/arm/boot/dts/r7s72100.dtsi | 202 ++++++++++++++++++++-------------------- This seems to have some (probably trivial) conflicts with other changes queued up for v3.18. Accordingly I am deferring it to v3.19. Please repost once v3.17-rc6 has been released. > 1 file changed, 101 insertions(+), 101 deletions(-) > > diff --git a/arch/arm/boot/dts/r7s72100.dtsi b/arch/arm/boot/dts/r7s72100.dtsi > index 1d28d01..6a0e57e 100644 > --- a/arch/arm/boot/dts/r7s72100.dtsi > +++ b/arch/arm/boot/dts/r7s72100.dtsi > @@ -52,16 +52,6 @@ > clock-output-names = "usb_x1"; > }; > > - /* Special CPG clocks */ > - cpg_clocks: cpg_clocks@fcfe0000 { > - #clock-cells = <1>; > - compatible = "renesas,r7s72100-cpg-clocks", > - "renesas,rz-cpg-clocks"; > - reg = <0xfcfe0000 0x18>; > - clocks = <&extal_clk>, <&usb_x1_clk>; > - clock-output-names = "pll", "i", "g"; > - }; > - > /* Fixed factor clocks */ > b_clk: b_clk { > #clock-cells = <0>; > @@ -88,6 +78,16 @@ > clock-output-names = "p0"; > }; > > + /* Special CPG clocks */ > + cpg_clocks: cpg_clocks@fcfe0000 { > + #clock-cells = <1>; > + compatible = "renesas,r7s72100-cpg-clocks", > + "renesas,rz-cpg-clocks"; > + reg = <0xfcfe0000 0x18>; > + clocks = <&extal_clk>, <&usb_x1_clk>; > + clock-output-names = "pll", "i", "g"; > + }; > + > /* MSTP clocks */ > mstp3_clks: mstp3_clks@fcfe0420 { > #clock-cells = <1>; > @@ -148,97 +148,6 @@ > }; > }; > > - gic: interrupt-controller@e8201000 { > - compatible = "arm,cortex-a9-gic"; > - #interrupt-cells = <3>; > - #address-cells = <0>; > - interrupt-controller; > - reg = <0xe8201000 0x1000>, > - <0xe8202000 0x1000>; > - }; > - > - i2c0: i2c@fcfee000 { > - #address-cells = <1>; > - #size-cells = <0>; > - compatible = "renesas,riic-r7s72100", "renesas,riic-rz"; > - reg = <0xfcfee000 0x44>; > - interrupts = <0 157 IRQ_TYPE_LEVEL_HIGH>, > - <0 158 IRQ_TYPE_EDGE_RISING>, > - <0 159 IRQ_TYPE_EDGE_RISING>, > - <0 160 IRQ_TYPE_LEVEL_HIGH>, > - <0 161 IRQ_TYPE_LEVEL_HIGH>, > - <0 162 IRQ_TYPE_LEVEL_HIGH>, > - <0 163 IRQ_TYPE_LEVEL_HIGH>, > - <0 164 IRQ_TYPE_LEVEL_HIGH>; > - clocks = <&mstp9_clks R7S72100_CLK_I2C0>; > - clock-frequency = <100000>; > - status = "disabled"; > - }; > - > - i2c1: i2c@fcfee400 { > - #address-cells = <1>; > - #size-cells = <0>; > - compatible = "renesas,riic-r7s72100", "renesas,riic-rz"; > - reg = <0xfcfee400 0x44>; > - interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>, > - <0 166 IRQ_TYPE_EDGE_RISING>, > - <0 167 IRQ_TYPE_EDGE_RISING>, > - <0 168 IRQ_TYPE_LEVEL_HIGH>, > - <0 169 IRQ_TYPE_LEVEL_HIGH>, > - <0 170 IRQ_TYPE_LEVEL_HIGH>, > - <0 171 IRQ_TYPE_LEVEL_HIGH>, > - <0 172 IRQ_TYPE_LEVEL_HIGH>; > - clocks = <&mstp9_clks R7S72100_CLK_I2C1>; > - clock-frequency = <100000>; > - status = "disabled"; > - }; > - > - i2c2: i2c@fcfee800 { > - #address-cells = <1>; > - #size-cells = <0>; > - compatible = "renesas,riic-r7s72100", "renesas,riic-rz"; > - reg = <0xfcfee800 0x44>; > - interrupts = <0 173 IRQ_TYPE_LEVEL_HIGH>, > - <0 174 IRQ_TYPE_EDGE_RISING>, > - <0 175 IRQ_TYPE_EDGE_RISING>, > - <0 176 IRQ_TYPE_LEVEL_HIGH>, > - <0 177 IRQ_TYPE_LEVEL_HIGH>, > - <0 178 IRQ_TYPE_LEVEL_HIGH>, > - <0 179 IRQ_TYPE_LEVEL_HIGH>, > - <0 180 IRQ_TYPE_LEVEL_HIGH>; > - clocks = <&mstp9_clks R7S72100_CLK_I2C2>; > - clock-frequency = <100000>; > - status = "disabled"; > - }; > - > - i2c3: i2c@fcfeec00 { > - #address-cells = <1>; > - #size-cells = <0>; > - compatible = "renesas,riic-r7s72100", "renesas,riic-rz"; > - reg = <0xfcfeec00 0x44>; > - interrupts = <0 181 IRQ_TYPE_LEVEL_HIGH>, > - <0 182 IRQ_TYPE_EDGE_RISING>, > - <0 183 IRQ_TYPE_EDGE_RISING>, > - <0 184 IRQ_TYPE_LEVEL_HIGH>, > - <0 185 IRQ_TYPE_LEVEL_HIGH>, > - <0 186 IRQ_TYPE_LEVEL_HIGH>, > - <0 187 IRQ_TYPE_LEVEL_HIGH>, > - <0 188 IRQ_TYPE_LEVEL_HIGH>; > - clocks = <&mstp9_clks R7S72100_CLK_I2C3>; > - clock-frequency = <100000>; > - status = "disabled"; > - }; > - > - mtu2: timer@fcff0000 { > - compatible = "renesas,mtu2"; > - reg = <0xfcff0000 0x400>; > - interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>; > - interrupt-names = "tgi0a"; > - clocks = <&mstp3_clks R7S72100_CLK_MTU2>; > - clock-names = "fck"; > - status = "disabled"; > - }; > - > scif0: serial@e8007000 { > compatible = "renesas,scif-r7s72100", "renesas,scif"; > reg = <0xe8007000 64>; > @@ -404,4 +313,95 @@ > #size-cells = <0>; > status = "disabled"; > }; > + > + gic: interrupt-controller@e8201000 { > + compatible = "arm,cortex-a9-gic"; > + #interrupt-cells = <3>; > + #address-cells = <0>; > + interrupt-controller; > + reg = <0xe8201000 0x1000>, > + <0xe8202000 0x1000>; > + }; > + > + i2c0: i2c@fcfee000 { > + #address-cells = <1>; > + #size-cells = <0>; > + compatible = "renesas,riic-r7s72100", "renesas,riic-rz"; > + reg = <0xfcfee000 0x44>; > + interrupts = <0 157 IRQ_TYPE_LEVEL_HIGH>, > + <0 158 IRQ_TYPE_EDGE_RISING>, > + <0 159 IRQ_TYPE_EDGE_RISING>, > + <0 160 IRQ_TYPE_LEVEL_HIGH>, > + <0 161 IRQ_TYPE_LEVEL_HIGH>, > + <0 162 IRQ_TYPE_LEVEL_HIGH>, > + <0 163 IRQ_TYPE_LEVEL_HIGH>, > + <0 164 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&mstp9_clks R7S72100_CLK_I2C0>; > + clock-frequency = <100000>; > + status = "disabled"; > + }; > + > + i2c1: i2c@fcfee400 { > + #address-cells = <1>; > + #size-cells = <0>; > + compatible = "renesas,riic-r7s72100", "renesas,riic-rz"; > + reg = <0xfcfee400 0x44>; > + interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>, > + <0 166 IRQ_TYPE_EDGE_RISING>, > + <0 167 IRQ_TYPE_EDGE_RISING>, > + <0 168 IRQ_TYPE_LEVEL_HIGH>, > + <0 169 IRQ_TYPE_LEVEL_HIGH>, > + <0 170 IRQ_TYPE_LEVEL_HIGH>, > + <0 171 IRQ_TYPE_LEVEL_HIGH>, > + <0 172 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&mstp9_clks R7S72100_CLK_I2C1>; > + clock-frequency = <100000>; > + status = "disabled"; > + }; > + > + i2c2: i2c@fcfee800 { > + #address-cells = <1>; > + #size-cells = <0>; > + compatible = "renesas,riic-r7s72100", "renesas,riic-rz"; > + reg = <0xfcfee800 0x44>; > + interrupts = <0 173 IRQ_TYPE_LEVEL_HIGH>, > + <0 174 IRQ_TYPE_EDGE_RISING>, > + <0 175 IRQ_TYPE_EDGE_RISING>, > + <0 176 IRQ_TYPE_LEVEL_HIGH>, > + <0 177 IRQ_TYPE_LEVEL_HIGH>, > + <0 178 IRQ_TYPE_LEVEL_HIGH>, > + <0 179 IRQ_TYPE_LEVEL_HIGH>, > + <0 180 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&mstp9_clks R7S72100_CLK_I2C2>; > + clock-frequency = <100000>; > + status = "disabled"; > + }; > + > + i2c3: i2c@fcfeec00 { > + #address-cells = <1>; > + #size-cells = <0>; > + compatible = "renesas,riic-r7s72100", "renesas,riic-rz"; > + reg = <0xfcfeec00 0x44>; > + interrupts = <0 181 IRQ_TYPE_LEVEL_HIGH>, > + <0 182 IRQ_TYPE_EDGE_RISING>, > + <0 183 IRQ_TYPE_EDGE_RISING>, > + <0 184 IRQ_TYPE_LEVEL_HIGH>, > + <0 185 IRQ_TYPE_LEVEL_HIGH>, > + <0 186 IRQ_TYPE_LEVEL_HIGH>, > + <0 187 IRQ_TYPE_LEVEL_HIGH>, > + <0 188 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&mstp9_clks R7S72100_CLK_I2C3>; > + clock-frequency = <100000>; > + status = "disabled"; > + }; > + > + mtu2: timer@fcff0000 { > + compatible = "renesas,mtu2"; > + reg = <0xfcff0000 0x400>; > + interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>; > + interrupt-names = "tgi0a"; > + clocks = <&mstp3_clks R7S72100_CLK_MTU2>; > + clock-names = "fck"; > + status = "disabled"; > + }; > }; > -- > 1.8.4.5 > > -- > 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] 14+ messages in thread
* [PATCH 2/6] ARM: shmobile: emev2: sort dtsi file by address 2014-09-12 8:51 [PATCH 0/6] ARM: shmobile: various DT files sorted by address Ulrich Hecht 2014-09-12 8:51 ` [PATCH 1/6] ARM: shmobile: r7s72100: sort dtsi file " Ulrich Hecht @ 2014-09-12 8:51 ` Ulrich Hecht 2014-09-16 0:46 ` Simon Horman 2014-09-12 8:51 ` [PATCH 3/6] ARM: shmobile: kzm9d: sort dts " Ulrich Hecht ` (3 subsequent siblings) 5 siblings, 1 reply; 14+ messages in thread From: Ulrich Hecht @ 2014-09-12 8:51 UTC (permalink / raw) To: horms, Olof Johansson; +Cc: linux-sh, devicetree, magnus.damm, Ulrich Hecht Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> --- arch/arm/boot/dts/emev2.dtsi | 120 +++++++++++++++++++++---------------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/arch/arm/boot/dts/emev2.dtsi b/arch/arm/boot/dts/emev2.dtsi index 00eeed3..41d2da7 100644 --- a/arch/arm/boot/dts/emev2.dtsi +++ b/arch/arm/boot/dts/emev2.dtsi @@ -41,6 +41,12 @@ }; }; + pmu { + compatible = "arm,cortex-a9-pmu"; + interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>, + <0 121 IRQ_TYPE_LEVEL_HIGH>; + }; + gic: interrupt-controller@e0020000 { compatible = "arm,cortex-a9-gic"; interrupt-controller; @@ -49,10 +55,60 @@ <0xe0020000 0x0100>; }; - pmu { - compatible = "arm,cortex-a9-pmu"; - interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>, - <0 121 IRQ_TYPE_LEVEL_HIGH>; + gpio0: gpio@e0050000 { + compatible = "renesas,em-gio"; + reg = <0xe0050000 0x2c>, <0xe0050040 0x20>; + interrupts = <0 67 IRQ_TYPE_LEVEL_HIGH>, + <0 68 IRQ_TYPE_LEVEL_HIGH>; + gpio-controller; + #gpio-cells = <2>; + ngpios = <32>; + interrupt-controller; + #interrupt-cells = <2>; + }; + gpio1: gpio@e0050080 { + compatible = "renesas,em-gio"; + reg = <0xe0050080 0x2c>, <0xe00500c0 0x20>; + interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>, + <0 70 IRQ_TYPE_LEVEL_HIGH>; + gpio-controller; + #gpio-cells = <2>; + ngpios = <32>; + interrupt-controller; + #interrupt-cells = <2>; + }; + gpio2: gpio@e0050100 { + compatible = "renesas,em-gio"; + reg = <0xe0050100 0x2c>, <0xe0050140 0x20>; + interrupts = <0 71 IRQ_TYPE_LEVEL_HIGH>, + <0 72 IRQ_TYPE_LEVEL_HIGH>; + gpio-controller; + #gpio-cells = <2>; + ngpios = <32>; + interrupt-controller; + #interrupt-cells = <2>; + }; + gpio3: gpio@e0050180 { + compatible = "renesas,em-gio"; + reg = <0xe0050180 0x2c>, <0xe00501c0 0x20>; + interrupts = <0 73 IRQ_TYPE_LEVEL_HIGH>, + <0 74 IRQ_TYPE_LEVEL_HIGH>; + gpio-controller; + #gpio-cells = <2>; + ngpios = <32>; + interrupt-controller; + #interrupt-cells = <2>; + }; + gpio4: gpio@e0050200 { + compatible = "renesas,em-gio"; + reg = <0xe0050200 0x2c>, <0xe0050240 0x20>; + interrupts = <0 75 IRQ_TYPE_LEVEL_HIGH>, + <0 76 IRQ_TYPE_LEVEL_HIGH>; + gpio-controller; + #gpio-cells = <2>; + ngpios = <31>; + interrupt-controller; + #interrupt-cells = <2>; }; smu@e0110000 { @@ -168,60 +224,4 @@ clocks = <&usib_u3_sclk>; clock-names = "sclk"; }; - - gpio0: gpio@e0050000 { - compatible = "renesas,em-gio"; - reg = <0xe0050000 0x2c>, <0xe0050040 0x20>; - interrupts = <0 67 IRQ_TYPE_LEVEL_HIGH>, - <0 68 IRQ_TYPE_LEVEL_HIGH>; - gpio-controller; - #gpio-cells = <2>; - ngpios = <32>; - interrupt-controller; - #interrupt-cells = <2>; - }; - gpio1: gpio@e0050080 { - compatible = "renesas,em-gio"; - reg = <0xe0050080 0x2c>, <0xe00500c0 0x20>; - interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>, - <0 70 IRQ_TYPE_LEVEL_HIGH>; - gpio-controller; - #gpio-cells = <2>; - ngpios = <32>; - interrupt-controller; - #interrupt-cells = <2>; - }; - gpio2: gpio@e0050100 { - compatible = "renesas,em-gio"; - reg = <0xe0050100 0x2c>, <0xe0050140 0x20>; - interrupts = <0 71 IRQ_TYPE_LEVEL_HIGH>, - <0 72 IRQ_TYPE_LEVEL_HIGH>; - gpio-controller; - #gpio-cells = <2>; - ngpios = <32>; - interrupt-controller; - #interrupt-cells = <2>; - }; - gpio3: gpio@e0050180 { - compatible = "renesas,em-gio"; - reg = <0xe0050180 0x2c>, <0xe00501c0 0x20>; - interrupts = <0 73 IRQ_TYPE_LEVEL_HIGH>, - <0 74 IRQ_TYPE_LEVEL_HIGH>; - gpio-controller; - #gpio-cells = <2>; - ngpios = <32>; - interrupt-controller; - #interrupt-cells = <2>; - }; - gpio4: gpio@e0050200 { - compatible = "renesas,em-gio"; - reg = <0xe0050200 0x2c>, <0xe0050240 0x20>; - interrupts = <0 75 IRQ_TYPE_LEVEL_HIGH>, - <0 76 IRQ_TYPE_LEVEL_HIGH>; - gpio-controller; - #gpio-cells = <2>; - ngpios = <31>; - interrupt-controller; - #interrupt-cells = <2>; - }; }; -- 1.8.4.5 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH 2/6] ARM: shmobile: emev2: sort dtsi file by address 2014-09-12 8:51 ` [PATCH 2/6] ARM: shmobile: emev2: " Ulrich Hecht @ 2014-09-16 0:46 ` Simon Horman 0 siblings, 0 replies; 14+ messages in thread From: Simon Horman @ 2014-09-16 0:46 UTC (permalink / raw) To: Ulrich Hecht; +Cc: Olof Johansson, linux-sh, devicetree, magnus.damm On Fri, Sep 12, 2014 at 10:51:12AM +0200, Ulrich Hecht wrote: > Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> > --- > arch/arm/boot/dts/emev2.dtsi | 120 +++++++++++++++++++++---------------------- Thanks, this file seems very quiet so this change doesn't seem to conflict with anything else that has been done for v3.18. I have queued it up. ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 3/6] ARM: shmobile: kzm9d: sort dts file by address 2014-09-12 8:51 [PATCH 0/6] ARM: shmobile: various DT files sorted by address Ulrich Hecht 2014-09-12 8:51 ` [PATCH 1/6] ARM: shmobile: r7s72100: sort dtsi file " Ulrich Hecht 2014-09-12 8:51 ` [PATCH 2/6] ARM: shmobile: emev2: " Ulrich Hecht @ 2014-09-12 8:51 ` Ulrich Hecht 2014-09-12 8:58 ` Geert Uytterhoeven 2014-09-12 8:51 ` [PATCH 4/6] ARM: shmobile: r8a73a4: sort dtsi " Ulrich Hecht ` (2 subsequent siblings) 5 siblings, 1 reply; 14+ messages in thread From: Ulrich Hecht @ 2014-09-12 8:51 UTC (permalink / raw) To: horms, Olof Johansson; +Cc: linux-sh, devicetree, magnus.damm, Ulrich Hecht Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> --- arch/arm/boot/dts/emev2-kzm9d.dts | 62 +++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/arch/arm/boot/dts/emev2-kzm9d.dts b/arch/arm/boot/dts/emev2-kzm9d.dts index 50ccd15..a1794cb 100644 --- a/arch/arm/boot/dts/emev2-kzm9d.dts +++ b/arch/arm/boot/dts/emev2-kzm9d.dts @@ -27,37 +27,6 @@ bootargs = "console=ttyS1,115200n81 ignore_loglevel root=/dev/nfs ip=dhcp"; }; - reg_1p8v: regulator@0 { - compatible = "regulator-fixed"; - regulator-name = "fixed-1.8V"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-always-on; - regulator-boot-on; - }; - - reg_3p3v: regulator@1 { - compatible = "regulator-fixed"; - regulator-name = "fixed-3.3V"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - regulator-boot-on; - }; - - lan9220@20000000 { - compatible = "smsc,lan9220", "smsc,lan9115"; - reg = <0x20000000 0x10000>; - phy-mode = "mii"; - interrupt-parent = <&gpio0>; - interrupts = <1 IRQ_TYPE_EDGE_RISING>; - reg-io-width = <4>; - smsc,irq-active-high; - smsc,irq-push-pull; - vddvario-supply = <®_1p8v>; - vdd33a-supply = <®_3p3v>; - }; - gpio_keys { compatible = "gpio-keys"; #address-cells = <1>; @@ -92,4 +61,35 @@ gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>; }; }; + + reg_1p8v: regulator@0 { + compatible = "regulator-fixed"; + regulator-name = "fixed-1.8V"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + regulator-boot-on; + }; + + reg_3p3v: regulator@1 { + compatible = "regulator-fixed"; + regulator-name = "fixed-3.3V"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + regulator-boot-on; + }; + + lan9220@20000000 { + compatible = "smsc,lan9220", "smsc,lan9115"; + reg = <0x20000000 0x10000>; + phy-mode = "mii"; + interrupt-parent = <&gpio0>; + interrupts = <1 IRQ_TYPE_EDGE_RISING>; + reg-io-width = <4>; + smsc,irq-active-high; + smsc,irq-push-pull; + vddvario-supply = <®_1p8v>; + vdd33a-supply = <®_3p3v>; + }; }; -- 1.8.4.5 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH 3/6] ARM: shmobile: kzm9d: sort dts file by address 2014-09-12 8:51 ` [PATCH 3/6] ARM: shmobile: kzm9d: sort dts " Ulrich Hecht @ 2014-09-12 8:58 ` Geert Uytterhoeven 2014-09-16 0:45 ` Simon Horman 0 siblings, 1 reply; 14+ messages in thread From: Geert Uytterhoeven @ 2014-09-12 8:58 UTC (permalink / raw) To: Ulrich Hecht Cc: Simon Horman, Olof Johansson, Linux-sh list, devicetree@vger.kernel.org, Magnus Damm Hi Ulrich, I know this is not your fault, but... On Fri, Sep 12, 2014 at 10:51 AM, Ulrich Hecht <ulrich.hecht+renesas@gmail.com> wrote: > + reg_1p8v: regulator@0 { As there is no "reg" property, the "@0" must not be present. However, in the absence of a unit-address, the node name must be unique. > + compatible = "regulator-fixed"; > + regulator-name = "fixed-1.8V"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <1800000>; > + regulator-always-on; > + regulator-boot-on; > + }; > + > + reg_3p3v: regulator@1 { Likewise. > + compatible = "regulator-fixed"; > + regulator-name = "fixed-3.3V"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + regulator-always-on; > + regulator-boot-on; > + }; 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] 14+ messages in thread
* Re: [PATCH 3/6] ARM: shmobile: kzm9d: sort dts file by address 2014-09-12 8:58 ` Geert Uytterhoeven @ 2014-09-16 0:45 ` Simon Horman 0 siblings, 0 replies; 14+ messages in thread From: Simon Horman @ 2014-09-16 0:45 UTC (permalink / raw) To: Geert Uytterhoeven Cc: Ulrich Hecht, Olof Johansson, Linux-sh list, devicetree@vger.kernel.org, Magnus Damm On Fri, Sep 12, 2014 at 10:58:37AM +0200, Geert Uytterhoeven wrote: > Hi Ulrich, > > I know this is not your fault, but... > > On Fri, Sep 12, 2014 at 10:51 AM, Ulrich Hecht > <ulrich.hecht+renesas@gmail.com> wrote: > > + reg_1p8v: regulator@0 { > > As there is no "reg" property, the "@0" must not be present. > However, in the absence of a unit-address, the node name must be unique. Bother. Ulrich, could you correct this and other problems raised by Geert in relation to other patches; rebase this series; and repost? Ideally I would like to include these patches early on in the cycle for v3.19. > > + compatible = "regulator-fixed"; > > + regulator-name = "fixed-1.8V"; > > + regulator-min-microvolt = <1800000>; > > + regulator-max-microvolt = <1800000>; > > + regulator-always-on; > > + regulator-boot-on; > > + }; > > + > > + reg_3p3v: regulator@1 { > > Likewise. > > > + compatible = "regulator-fixed"; > > + regulator-name = "fixed-3.3V"; > > + regulator-min-microvolt = <3300000>; > > + regulator-max-microvolt = <3300000>; > > + regulator-always-on; > > + regulator-boot-on; > > + }; > > 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 > -- > 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] 14+ messages in thread
* [PATCH 4/6] ARM: shmobile: r8a73a4: sort dtsi file by address 2014-09-12 8:51 [PATCH 0/6] ARM: shmobile: various DT files sorted by address Ulrich Hecht ` (2 preceding siblings ...) 2014-09-12 8:51 ` [PATCH 3/6] ARM: shmobile: kzm9d: sort dts " Ulrich Hecht @ 2014-09-12 8:51 ` Ulrich Hecht 2014-09-12 9:01 ` Geert Uytterhoeven 2014-09-12 8:51 ` [PATCH 5/6] ARM: shmobile: ape6evm: sort dts " Ulrich Hecht 2014-09-12 8:51 ` [PATCH 6/6] ARM: shmobile: ape6evm-reference: " Ulrich Hecht 5 siblings, 1 reply; 14+ messages in thread From: Ulrich Hecht @ 2014-09-12 8:51 UTC (permalink / raw) To: horms, Olof Johansson; +Cc: linux-sh, devicetree, magnus.damm, Ulrich Hecht Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> --- arch/arm/boot/dts/r8a73a4.dtsi | 232 ++++++++++++++++++++--------------------- 1 file changed, 116 insertions(+), 116 deletions(-) diff --git a/arch/arm/boot/dts/r8a73a4.dtsi b/arch/arm/boot/dts/r8a73a4.dtsi index fba39a2..2b7735c 100644 --- a/arch/arm/boot/dts/r8a73a4.dtsi +++ b/arch/arm/boot/dts/r8a73a4.dtsi @@ -30,18 +30,6 @@ }; }; - gic: interrupt-controller@f1001000 { - compatible = "arm,cortex-a15-gic"; - #interrupt-cells = <3>; - #address-cells = <0>; - interrupt-controller; - reg = <0 0xf1001000 0 0x1000>, - <0 0xf1002000 0 0x1000>, - <0 0xf1004000 0 0x2000>, - <0 0xf1006000 0 0x2000>; - interrupts = <1 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; - }; - timer { compatible = "arm,armv7-timer"; interrupts = <1 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, @@ -50,6 +38,80 @@ <1 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>; }; + dmac: dma-multiplexer@0 { + compatible = "renesas,shdma-mux"; + #dma-cells = <1>; + dma-channels = <20>; + dma-requests = <256>; + #address-cells = <2>; + #size-cells = <2>; + ranges; + + dma0: dma-controller@e6700020 { + compatible = "renesas,shdma-r8a73a4"; + reg = <0 0xe6700020 0 0x89e0>; + interrupts = <0 220 IRQ_TYPE_LEVEL_HIGH + 0 200 IRQ_TYPE_LEVEL_HIGH + 0 201 IRQ_TYPE_LEVEL_HIGH + 0 202 IRQ_TYPE_LEVEL_HIGH + 0 203 IRQ_TYPE_LEVEL_HIGH + 0 204 IRQ_TYPE_LEVEL_HIGH + 0 205 IRQ_TYPE_LEVEL_HIGH + 0 206 IRQ_TYPE_LEVEL_HIGH + 0 207 IRQ_TYPE_LEVEL_HIGH + 0 208 IRQ_TYPE_LEVEL_HIGH + 0 209 IRQ_TYPE_LEVEL_HIGH + 0 210 IRQ_TYPE_LEVEL_HIGH + 0 211 IRQ_TYPE_LEVEL_HIGH + 0 212 IRQ_TYPE_LEVEL_HIGH + 0 213 IRQ_TYPE_LEVEL_HIGH + 0 214 IRQ_TYPE_LEVEL_HIGH + 0 215 IRQ_TYPE_LEVEL_HIGH + 0 216 IRQ_TYPE_LEVEL_HIGH + 0 217 IRQ_TYPE_LEVEL_HIGH + 0 218 IRQ_TYPE_LEVEL_HIGH + 0 219 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "error", + "ch0", "ch1", "ch2", "ch3", + "ch4", "ch5", "ch6", "ch7", + "ch8", "ch9", "ch10", "ch11", + "ch12", "ch13", "ch14", "ch15", + "ch16", "ch17", "ch18", "ch19"; + }; + }; + + pfc: pfc@e6050000 { + compatible = "renesas,pfc-r8a73a4"; + reg = <0 0xe6050000 0 0x9000>; + gpio-controller; + #gpio-cells = <2>; + interrupts-extended = + <&irqc0 0 0>, <&irqc0 1 0>, <&irqc0 2 0>, <&irqc0 3 0>, + <&irqc0 4 0>, <&irqc0 5 0>, <&irqc0 6 0>, <&irqc0 7 0>, + <&irqc0 8 0>, <&irqc0 9 0>, <&irqc0 10 0>, <&irqc0 11 0>, + <&irqc0 12 0>, <&irqc0 13 0>, <&irqc0 14 0>, <&irqc0 15 0>, + <&irqc0 16 0>, <&irqc0 17 0>, <&irqc0 18 0>, <&irqc0 19 0>, + <&irqc0 20 0>, <&irqc0 21 0>, <&irqc0 22 0>, <&irqc0 23 0>, + <&irqc0 24 0>, <&irqc0 25 0>, <&irqc0 26 0>, <&irqc0 27 0>, + <&irqc0 28 0>, <&irqc0 29 0>, <&irqc0 30 0>, <&irqc0 31 0>, + <&irqc1 0 0>, <&irqc1 1 0>, <&irqc1 2 0>, <&irqc1 3 0>, + <&irqc1 4 0>, <&irqc1 5 0>, <&irqc1 6 0>, <&irqc1 7 0>, + <&irqc1 8 0>, <&irqc1 9 0>, <&irqc1 10 0>, <&irqc1 11 0>, + <&irqc1 12 0>, <&irqc1 13 0>, <&irqc1 14 0>, <&irqc1 15 0>, + <&irqc1 16 0>, <&irqc1 17 0>, <&irqc1 18 0>, <&irqc1 19 0>, + <&irqc1 20 0>, <&irqc1 21 0>, <&irqc1 22 0>, <&irqc1 23 0>, + <&irqc1 24 0>, <&irqc1 25 0>; + }; + + i2c5: i2c@e60b0000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "renesas,rmobile-iic"; + reg = <0 0xe60b0000 0 0x428>; + interrupts = <0 179 IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; + }; + irqc0: interrupt-controller@e61c0000 { compatible = "renesas,irqc"; #interrupt-cells = <2>; @@ -122,48 +184,6 @@ <0 57 IRQ_TYPE_LEVEL_HIGH>; }; - dmac: dma-multiplexer@0 { - compatible = "renesas,shdma-mux"; - #dma-cells = <1>; - dma-channels = <20>; - dma-requests = <256>; - #address-cells = <2>; - #size-cells = <2>; - ranges; - - dma0: dma-controller@e6700020 { - compatible = "renesas,shdma-r8a73a4"; - reg = <0 0xe6700020 0 0x89e0>; - interrupts = <0 220 IRQ_TYPE_LEVEL_HIGH - 0 200 IRQ_TYPE_LEVEL_HIGH - 0 201 IRQ_TYPE_LEVEL_HIGH - 0 202 IRQ_TYPE_LEVEL_HIGH - 0 203 IRQ_TYPE_LEVEL_HIGH - 0 204 IRQ_TYPE_LEVEL_HIGH - 0 205 IRQ_TYPE_LEVEL_HIGH - 0 206 IRQ_TYPE_LEVEL_HIGH - 0 207 IRQ_TYPE_LEVEL_HIGH - 0 208 IRQ_TYPE_LEVEL_HIGH - 0 209 IRQ_TYPE_LEVEL_HIGH - 0 210 IRQ_TYPE_LEVEL_HIGH - 0 211 IRQ_TYPE_LEVEL_HIGH - 0 212 IRQ_TYPE_LEVEL_HIGH - 0 213 IRQ_TYPE_LEVEL_HIGH - 0 214 IRQ_TYPE_LEVEL_HIGH - 0 215 IRQ_TYPE_LEVEL_HIGH - 0 216 IRQ_TYPE_LEVEL_HIGH - 0 217 IRQ_TYPE_LEVEL_HIGH - 0 218 IRQ_TYPE_LEVEL_HIGH - 0 219 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "error", - "ch0", "ch1", "ch2", "ch3", - "ch4", "ch5", "ch6", "ch7", - "ch8", "ch9", "ch10", "ch11", - "ch12", "ch13", "ch14", "ch15", - "ch16", "ch17", "ch18", "ch19"; - }; - }; - thermal@e61f0000 { compatible = "renesas,thermal-r8a73a4", "renesas,rcar-thermal"; reg = <0 0xe61f0000 0 0x14>, <0 0xe61f0100 0 0x38>, @@ -216,15 +236,6 @@ status = "disabled"; }; - i2c5: i2c@e60b0000 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "renesas,rmobile-iic"; - reg = <0 0xe60b0000 0 0x428>; - interrupts = <0 179 IRQ_TYPE_LEVEL_HIGH>; - status = "disabled"; - }; - i2c6: i2c@e6550000 { #address-cells = <1>; #size-cells = <0>; @@ -252,20 +263,6 @@ status = "disabled"; }; - scifa0: serial@e6c40000 { - compatible = "renesas,scifa-r8a73a4", "renesas,scifa"; - reg = <0 0xe6c40000 0 0x100>; - interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>; - status = "disabled"; - }; - - scifa1: serial@e6c50000 { - compatible = "renesas,scifa-r8a73a4", "renesas,scifa"; - reg = <0 0xe6c50000 0 0x100>; - interrupts = <0 145 IRQ_TYPE_LEVEL_HIGH>; - status = "disabled"; - }; - scifb2: serial@e6c20000 { compatible = "renesas,scifb-r8a73a4", "renesas,scifb"; reg = <0 0xe6c20000 0 0x100>; @@ -280,6 +277,20 @@ status = "disabled"; }; + scifa0: serial@e6c40000 { + compatible = "renesas,scifa-r8a73a4", "renesas,scifa"; + reg = <0 0xe6c40000 0 0x100>; + interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; + }; + + scifa1: serial@e6c50000 { + compatible = "renesas,scifa-r8a73a4", "renesas,scifa"; + reg = <0 0xe6c50000 0 0x100>; + interrupts = <0 145 IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; + }; + scifb4: serial@e6ce0000 { compatible = "renesas,scifb-r8a73a4", "renesas,scifb"; reg = <0 0xe6ce0000 0 0x100>; @@ -294,45 +305,6 @@ status = "disabled"; }; - mmcif0: mmc@ee200000 { - compatible = "renesas,sh-mmcif"; - reg = <0 0xee200000 0 0x80>; - interrupts = <0 169 IRQ_TYPE_LEVEL_HIGH>; - reg-io-width = <4>; - status = "disabled"; - }; - - mmcif1: mmc@ee220000 { - compatible = "renesas,sh-mmcif"; - reg = <0 0xee220000 0 0x80>; - interrupts = <0 170 IRQ_TYPE_LEVEL_HIGH>; - reg-io-width = <4>; - status = "disabled"; - }; - - pfc: pfc@e6050000 { - compatible = "renesas,pfc-r8a73a4"; - reg = <0 0xe6050000 0 0x9000>; - gpio-controller; - #gpio-cells = <2>; - interrupts-extended = - <&irqc0 0 0>, <&irqc0 1 0>, <&irqc0 2 0>, <&irqc0 3 0>, - <&irqc0 4 0>, <&irqc0 5 0>, <&irqc0 6 0>, <&irqc0 7 0>, - <&irqc0 8 0>, <&irqc0 9 0>, <&irqc0 10 0>, <&irqc0 11 0>, - <&irqc0 12 0>, <&irqc0 13 0>, <&irqc0 14 0>, <&irqc0 15 0>, - <&irqc0 16 0>, <&irqc0 17 0>, <&irqc0 18 0>, <&irqc0 19 0>, - <&irqc0 20 0>, <&irqc0 21 0>, <&irqc0 22 0>, <&irqc0 23 0>, - <&irqc0 24 0>, <&irqc0 25 0>, <&irqc0 26 0>, <&irqc0 27 0>, - <&irqc0 28 0>, <&irqc0 29 0>, <&irqc0 30 0>, <&irqc0 31 0>, - <&irqc1 0 0>, <&irqc1 1 0>, <&irqc1 2 0>, <&irqc1 3 0>, - <&irqc1 4 0>, <&irqc1 5 0>, <&irqc1 6 0>, <&irqc1 7 0>, - <&irqc1 8 0>, <&irqc1 9 0>, <&irqc1 10 0>, <&irqc1 11 0>, - <&irqc1 12 0>, <&irqc1 13 0>, <&irqc1 14 0>, <&irqc1 15 0>, - <&irqc1 16 0>, <&irqc1 17 0>, <&irqc1 18 0>, <&irqc1 19 0>, - <&irqc1 20 0>, <&irqc1 21 0>, <&irqc1 22 0>, <&irqc1 23 0>, - <&irqc1 24 0>, <&irqc1 25 0>; - }; - sdhi0: sd@ee100000 { compatible = "renesas,sdhi-r8a73a4"; reg = <0 0xee100000 0 0x100>; @@ -356,4 +328,32 @@ cap-sd-highspeed; status = "disabled"; }; + + mmcif0: mmc@ee200000 { + compatible = "renesas,sh-mmcif"; + reg = <0 0xee200000 0 0x80>; + interrupts = <0 169 IRQ_TYPE_LEVEL_HIGH>; + reg-io-width = <4>; + status = "disabled"; + }; + + mmcif1: mmc@ee220000 { + compatible = "renesas,sh-mmcif"; + reg = <0 0xee220000 0 0x80>; + interrupts = <0 170 IRQ_TYPE_LEVEL_HIGH>; + reg-io-width = <4>; + status = "disabled"; + }; + + gic: interrupt-controller@f1001000 { + compatible = "arm,cortex-a15-gic"; + #interrupt-cells = <3>; + #address-cells = <0>; + interrupt-controller; + reg = <0 0xf1001000 0 0x1000>, + <0 0xf1002000 0 0x1000>, + <0 0xf1004000 0 0x2000>, + <0 0xf1006000 0 0x2000>; + interrupts = <1 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; + }; }; -- 1.8.4.5 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH 4/6] ARM: shmobile: r8a73a4: sort dtsi file by address 2014-09-12 8:51 ` [PATCH 4/6] ARM: shmobile: r8a73a4: sort dtsi " Ulrich Hecht @ 2014-09-12 9:01 ` Geert Uytterhoeven 0 siblings, 0 replies; 14+ messages in thread From: Geert Uytterhoeven @ 2014-09-12 9:01 UTC (permalink / raw) To: Ulrich Hecht Cc: Simon Horman, Olof Johansson, Linux-sh list, devicetree@vger.kernel.org, Magnus Damm Hi Ulrich, I know this is not your fault, but... On Fri, Sep 12, 2014 at 10:51 AM, Ulrich Hecht <ulrich.hecht+renesas@gmail.com> wrote: > + dmac: dma-multiplexer@0 { As there is no "reg" property, the "@0" must not be present. > + compatible = "renesas,shdma-mux"; > + #dma-cells = <1>; > + dma-channels = <20>; > + dma-requests = <256>; > + #address-cells = <2>; > + #size-cells = <2>; > + ranges; > + 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] 14+ messages in thread
* [PATCH 5/6] ARM: shmobile: ape6evm: sort dts file by address 2014-09-12 8:51 [PATCH 0/6] ARM: shmobile: various DT files sorted by address Ulrich Hecht ` (3 preceding siblings ...) 2014-09-12 8:51 ` [PATCH 4/6] ARM: shmobile: r8a73a4: sort dtsi " Ulrich Hecht @ 2014-09-12 8:51 ` Ulrich Hecht 2014-09-12 9:04 ` Geert Uytterhoeven 2014-09-12 8:51 ` [PATCH 6/6] ARM: shmobile: ape6evm-reference: " Ulrich Hecht 5 siblings, 1 reply; 14+ messages in thread From: Ulrich Hecht @ 2014-09-12 8:51 UTC (permalink / raw) To: horms, Olof Johansson; +Cc: linux-sh, devicetree, magnus.damm, Ulrich Hecht Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> --- arch/arm/boot/dts/r8a73a4-ape6evm.dts | 36 +++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/arch/arm/boot/dts/r8a73a4-ape6evm.dts b/arch/arm/boot/dts/r8a73a4-ape6evm.dts index ce085fa..23e9925 100644 --- a/arch/arm/boot/dts/r8a73a4-ape6evm.dts +++ b/arch/arm/boot/dts/r8a73a4-ape6evm.dts @@ -20,24 +20,6 @@ bootargs = "console=ttySC0,115200 ignore_loglevel root=/dev/nfs ip=dhcp rw"; }; - memory@40000000 { - device_type = "memory"; - reg = <0 0x40000000 0 0x40000000>; - }; - - memory@200000000 { - device_type = "memory"; - reg = <2 0x00000000 0 0x40000000>; - }; - - ape6evm_fixed_3v3: fixedregulator@0 { - compatible = "regulator-fixed"; - regulator-name = "3V3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - }; - lbsc { #address-cells = <1>; #size-cells = <1>; @@ -55,6 +37,24 @@ vddvario-supply = <&ape6evm_fixed_3v3>; }; }; + + ape6evm_fixed_3v3: fixedregulator@0 { + compatible = "regulator-fixed"; + regulator-name = "3V3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + memory@40000000 { + device_type = "memory"; + reg = <0 0x40000000 0 0x40000000>; + }; + + memory@200000000 { + device_type = "memory"; + reg = <2 0x00000000 0 0x40000000>; + }; }; &i2c5 { -- 1.8.4.5 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH 5/6] ARM: shmobile: ape6evm: sort dts file by address 2014-09-12 8:51 ` [PATCH 5/6] ARM: shmobile: ape6evm: sort dts " Ulrich Hecht @ 2014-09-12 9:04 ` Geert Uytterhoeven 0 siblings, 0 replies; 14+ messages in thread From: Geert Uytterhoeven @ 2014-09-12 9:04 UTC (permalink / raw) To: Ulrich Hecht Cc: Simon Horman, Olof Johansson, Linux-sh list, devicetree@vger.kernel.org, Magnus Damm Hi Ulrich, I know this is not your fault, but... On Fri, Sep 12, 2014 at 10:51 AM, Ulrich Hecht <ulrich.hecht+renesas@gmail.com> wrote: > + ape6evm_fixed_3v3: fixedregulator@0 { As there is no "reg" property, the "@0" must not be present. > + compatible = "regulator-fixed"; > + regulator-name = "3V3"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + regulator-always-on; > + }; 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] 14+ messages in thread
* [PATCH 6/6] ARM: shmobile: ape6evm-reference: sort dts file by address 2014-09-12 8:51 [PATCH 0/6] ARM: shmobile: various DT files sorted by address Ulrich Hecht ` (4 preceding siblings ...) 2014-09-12 8:51 ` [PATCH 5/6] ARM: shmobile: ape6evm: sort dts " Ulrich Hecht @ 2014-09-12 8:51 ` Ulrich Hecht 2014-09-16 0:46 ` Simon Horman 5 siblings, 1 reply; 14+ messages in thread From: Ulrich Hecht @ 2014-09-12 8:51 UTC (permalink / raw) To: horms, Olof Johansson; +Cc: linux-sh, devicetree, magnus.damm, Ulrich Hecht Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> --- arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 26 ++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts index a860f32..bb45a70 100644 --- a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts +++ b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts @@ -24,14 +24,11 @@ bootargs = "console=ttySC0,115200 ignore_loglevel rw"; }; - memory@40000000 { - device_type = "memory"; - reg = <0 0x40000000 0 0x40000000>; - }; - - memory@200000000 { - device_type = "memory"; - reg = <2 0x00000000 0 0x40000000>; + lbsc { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0 0 0x80000000>; }; vcc_mmc0: regulator@0 { @@ -62,11 +59,14 @@ regulator-always-on; }; - lbsc { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <1>; - ranges = <0 0 0 0x80000000>; + memory@40000000 { + device_type = "memory"; + reg = <0 0x40000000 0 0x40000000>; + }; + + memory@200000000 { + device_type = "memory"; + reg = <2 0x00000000 0 0x40000000>; }; }; -- 1.8.4.5 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH 6/6] ARM: shmobile: ape6evm-reference: sort dts file by address 2014-09-12 8:51 ` [PATCH 6/6] ARM: shmobile: ape6evm-reference: " Ulrich Hecht @ 2014-09-16 0:46 ` Simon Horman 0 siblings, 0 replies; 14+ messages in thread From: Simon Horman @ 2014-09-16 0:46 UTC (permalink / raw) To: Ulrich Hecht; +Cc: Olof Johansson, linux-sh, devicetree, magnus.damm On Fri, Sep 12, 2014 at 10:51:16AM +0200, Ulrich Hecht wrote: > Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> > --- > arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 26 ++++++++++++------------- > 1 file changed, 13 insertions(+), 13 deletions(-) Thanks, this file seems very quiet so this change doesn't seem to conflict with anything else that has been done for v3.18. I have queued it up. ^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2014-09-16 0:49 UTC | newest] Thread overview: 14+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-09-12 8:51 [PATCH 0/6] ARM: shmobile: various DT files sorted by address Ulrich Hecht 2014-09-12 8:51 ` [PATCH 1/6] ARM: shmobile: r7s72100: sort dtsi file " Ulrich Hecht 2014-09-16 0:49 ` Simon Horman 2014-09-12 8:51 ` [PATCH 2/6] ARM: shmobile: emev2: " Ulrich Hecht 2014-09-16 0:46 ` Simon Horman 2014-09-12 8:51 ` [PATCH 3/6] ARM: shmobile: kzm9d: sort dts " Ulrich Hecht 2014-09-12 8:58 ` Geert Uytterhoeven 2014-09-16 0:45 ` Simon Horman 2014-09-12 8:51 ` [PATCH 4/6] ARM: shmobile: r8a73a4: sort dtsi " Ulrich Hecht 2014-09-12 9:01 ` Geert Uytterhoeven 2014-09-12 8:51 ` [PATCH 5/6] ARM: shmobile: ape6evm: sort dts " Ulrich Hecht 2014-09-12 9:04 ` Geert Uytterhoeven 2014-09-12 8:51 ` [PATCH 6/6] ARM: shmobile: ape6evm-reference: " Ulrich Hecht 2014-09-16 0:46 ` Simon Horman
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).