* [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.16
@ 2014-05-16 0:58 Simon Horman
2014-05-16 0:58 ` [PATCH 01/11] ARM: shmobile: henninger: specify EXTAL frequency Simon Horman
` (11 more replies)
0 siblings, 12 replies; 13+ messages in thread
From: Simon Horman @ 2014-05-16 0:58 UTC (permalink / raw)
To: linux-arm-kernel
Hi Olof, Hi Kevin, Hi Arnd,
Please consider these third round of Renesas ARM based SoC DT updates for v3.16.
This pull request is based on the previous round of
such requests, tagged as renesas-dt2-for-v3.16,
which I have already sent a pull-request for.
The following changes since commit 5a62ec57004f1a434bfd3feed43e447b5780baf6:
ARM: shmobile: henninger: enable SATA0 (2014-04-28 09:12:04 +0900)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt3-for-v3.16
for you to fetch changes up to 3fa3985e624aea24334abc9a33b484c3d316e64e:
ARM: shmobile: r8a7740 dtsi: Remove duplicate interrupt-parent property (2014-05-15 08:09:59 +0900)
----------------------------------------------------------------
Third Round of Renesas ARM Based SoC DT Updates for v3.16
r8a7791 (R-Car M2), r8a7779 (R-Car H1), r8a7778 (R-Car M1),
r8a7740 (R-Mobile A1) and r8a73a4 (R-Mobile APE6) SoCs
* Move interrupt-parent property to root node
r8a7791 (R-Car M2) and r8a7790 (R-Car H2) SoCs
* Add GPIO clocks
r8a7791 (R-Car M2) based Henninger board
* Add MSIOF0, QSPI and SDHI0/2 support
* Specify EXTAL frequency
r8a7779 (R-Car H1) based Marzen board
* Set SMSC lan to use irq-push-pull
r8a7740 (R-Mobile A1) SoC
* Remove duplicate interrupt-parent property
r8a7740 (R-Mobile A1) based Armadillo800 EVA board
* Add Ethernet support
----------------------------------------------------------------
Geert Uytterhoeven (5):
ARM: shmobile: r8a7740 dtsi: Add Ethernet support
ARM: shmobile: armadillo-reference dts: Add Ethernet support
ARM: shmobile: r8a7790 dtsi: Add GPIO clocks
ARM: shmobile: r8a7791 dtsi: Add GPIO clocks
ARM: shmobile: r8a7740 dtsi: Remove duplicate interrupt-parent property
Laurent Pinchart (1):
ARM: shmobile: dts: Move interrupt-parent property to root node
Sergei Shtylyov (4):
ARM: shmobile: henninger: specify EXTAL frequency
ARM: shmobile: henninger: add SDHI0/2 DT support
ARM: shmobile: henninger: add QSPI DT support
ARM: shmobile: henninger: add MSIOF0 DT support
Simon Horman (1):
ARM: shmobile: marzen-reference: Set SMSC lan to use irq-push-pull
arch/arm/boot/dts/r8a73a4.dtsi | 18 ---
.../boot/dts/r8a7740-armadillo800eva-reference.dts | 17 +++
arch/arm/boot/dts/r8a7740.dtsi | 24 ++--
arch/arm/boot/dts/r8a7778.dtsi | 18 +--
arch/arm/boot/dts/r8a7779-marzen-reference.dts | 1 +
arch/arm/boot/dts/r8a7779.dtsi | 21 +---
arch/arm/boot/dts/r8a7790.dtsi | 13 +-
arch/arm/boot/dts/r8a7791-henninger.dts | 139 +++++++++++++++++++++
arch/arm/boot/dts/r8a7791.dtsi | 22 +++-
9 files changed, 200 insertions(+), 73 deletions(-)
^ permalink raw reply [flat|nested] 13+ messages in thread* [PATCH 01/11] ARM: shmobile: henninger: specify EXTAL frequency 2014-05-16 0:58 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.16 Simon Horman @ 2014-05-16 0:58 ` Simon Horman 2014-05-16 0:58 ` [PATCH 02/11] ARM: shmobile: henninger: add SDHI0/2 DT support Simon Horman ` (10 subsequent siblings) 11 siblings, 0 replies; 13+ messages in thread From: Simon Horman @ 2014-05-16 0:58 UTC (permalink / raw) To: linux-arm-kernel From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> When creating the initial device tree for the Henninger board, I've overlooked that EXTAL frequency needs to be overridden there. The 'sh-sci' driver managed to work somehow but the SDHI driver that I've tried to enable just hanged with the default EXTAL frequency of 0... Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/boot/dts/r8a7791-henninger.dts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/boot/dts/r8a7791-henninger.dts b/arch/arm/boot/dts/r8a7791-henninger.dts index 6e67cea..0a65523 100644 --- a/arch/arm/boot/dts/r8a7791-henninger.dts +++ b/arch/arm/boot/dts/r8a7791-henninger.dts @@ -35,6 +35,10 @@ }; }; +&extal_clk { + clock-frequency = <20000000>; +}; + &pfc { scif0_pins: serial0 { renesas,groups = "scif0_data_d"; -- 1.8.5.2 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 02/11] ARM: shmobile: henninger: add SDHI0/2 DT support 2014-05-16 0:58 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.16 Simon Horman 2014-05-16 0:58 ` [PATCH 01/11] ARM: shmobile: henninger: specify EXTAL frequency Simon Horman @ 2014-05-16 0:58 ` Simon Horman 2014-05-16 0:58 ` [PATCH 03/11] ARM: shmobile: henninger: add QSPI " Simon Horman ` (9 subsequent siblings) 11 siblings, 0 replies; 13+ messages in thread From: Simon Horman @ 2014-05-16 0:58 UTC (permalink / raw) To: linux-arm-kernel From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Define the Henninger board dependent part of the SDHI0/2 device nodes along with the necessary voltage regulators (note that the Vcc regulators are dummy -- they are required but don't actually exist on the board). Also, GPIOs have to be used for the CD and WP signals due to the SDHI driver constraints... Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/boot/dts/r8a7791-henninger.dts | 76 +++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/arch/arm/boot/dts/r8a7791-henninger.dts b/arch/arm/boot/dts/r8a7791-henninger.dts index 0a65523..2e45c06 100644 --- a/arch/arm/boot/dts/r8a7791-henninger.dts +++ b/arch/arm/boot/dts/r8a7791-henninger.dts @@ -11,6 +11,7 @@ /dts-v1/; #include "r8a7791.dtsi" +#include <dt-bindings/gpio/gpio.h> / { model = "Henninger"; @@ -33,6 +34,50 @@ device_type = "memory"; reg = <2 0x00000000 0 0x40000000>; }; + + vcc_sdhi0: regulator at 0 { + compatible = "regulator-fixed"; + + regulator-name = "SDHI0 Vcc"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vccq_sdhi0: regulator at 1 { + compatible = "regulator-gpio"; + + regulator-name = "SDHI0 VccQ"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + + gpios = <&gpio2 12 GPIO_ACTIVE_HIGH>; + gpios-states = <1>; + states = <3300000 1 + 1800000 0>; + }; + + vcc_sdhi2: regulator at 2 { + compatible = "regulator-fixed"; + + regulator-name = "SDHI2 Vcc"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vccq_sdhi2: regulator at 3 { + compatible = "regulator-gpio"; + + regulator-name = "SDHI2 VccQ"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + + gpios = <&gpio2 26 GPIO_ACTIVE_HIGH>; + gpios-states = <1>; + states = <3300000 1 + 1800000 0>; + }; }; &extal_clk { @@ -54,6 +99,16 @@ renesas,groups = "intc_irq0"; renesas,function = "intc"; }; + + sdhi0_pins: sd0 { + renesas,groups = "sdhi0_data4", "sdhi0_ctrl"; + renesas,function = "sdhi0"; + }; + + sdhi2_pins: sd2 { + renesas,groups = "sdhi2_data4", "sdhi2_ctrl"; + renesas,function = "sdhi2"; + }; }; &scif0 { @@ -82,3 +137,24 @@ &sata0 { status = "okay"; }; + +&sdhi0 { + pinctrl-0 = <&sdhi0_pins>; + pinctrl-names = "default"; + + vmmc-supply = <&vcc_sdhi0>; + vqmmc-supply = <&vccq_sdhi0>; + cd-gpios = <&gpio6 6 GPIO_ACTIVE_LOW>; + wp-gpios = <&gpio6 7 GPIO_ACTIVE_HIGH>; + status = "okay"; +}; + +&sdhi2 { + pinctrl-0 = <&sdhi2_pins>; + pinctrl-names = "default"; + + vmmc-supply = <&vcc_sdhi2>; + vqmmc-supply = <&vccq_sdhi2>; + cd-gpios = <&gpio6 22 GPIO_ACTIVE_LOW>; + status = "okay"; +}; -- 1.8.5.2 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 03/11] ARM: shmobile: henninger: add QSPI DT support 2014-05-16 0:58 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.16 Simon Horman 2014-05-16 0:58 ` [PATCH 01/11] ARM: shmobile: henninger: specify EXTAL frequency Simon Horman 2014-05-16 0:58 ` [PATCH 02/11] ARM: shmobile: henninger: add SDHI0/2 DT support Simon Horman @ 2014-05-16 0:58 ` Simon Horman 2014-05-16 0:58 ` [PATCH 04/11] ARM: shmobile: henninger: add MSIOF0 " Simon Horman ` (8 subsequent siblings) 11 siblings, 0 replies; 13+ messages in thread From: Simon Horman @ 2014-05-16 0:58 UTC (permalink / raw) To: linux-arm-kernel From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Define the Henninger board dependent part of the QSPI device node. Add device nodes for Spansion S25FL512S SPI flash and MTD partitions on it. Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/boot/dts/r8a7791-henninger.dts | 38 +++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/arch/arm/boot/dts/r8a7791-henninger.dts b/arch/arm/boot/dts/r8a7791-henninger.dts index 2e45c06..1d715a3 100644 --- a/arch/arm/boot/dts/r8a7791-henninger.dts +++ b/arch/arm/boot/dts/r8a7791-henninger.dts @@ -109,6 +109,11 @@ renesas,groups = "sdhi2_data4", "sdhi2_ctrl"; renesas,function = "sdhi2"; }; + + qspi_pins: spi0 { + renesas,groups = "qspi_ctrl", "qspi_data4"; + renesas,function = "qspi"; + }; }; &scif0 { @@ -158,3 +163,36 @@ cd-gpios = <&gpio6 22 GPIO_ACTIVE_LOW>; status = "okay"; }; + +&qspi { + pinctrl-0 = <&qspi_pins>; + pinctrl-names = "default"; + + status = "okay"; + + flash at 0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "spansion,s25fl512s"; + reg = <0>; + spi-max-frequency = <30000000>; + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; + m25p,fast-read; + + partition at 0 { + label = "loader_prg"; + reg = <0x00000000 0x00040000>; + read-only; + }; + partition at 40000 { + label = "user_prg"; + reg = <0x00040000 0x00400000>; + read-only; + }; + partition at 440000 { + label = "flash_fs"; + reg = <0x00440000 0x03bc0000>; + }; + }; +}; -- 1.8.5.2 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 04/11] ARM: shmobile: henninger: add MSIOF0 DT support 2014-05-16 0:58 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.16 Simon Horman ` (2 preceding siblings ...) 2014-05-16 0:58 ` [PATCH 03/11] ARM: shmobile: henninger: add QSPI " Simon Horman @ 2014-05-16 0:58 ` Simon Horman 2014-05-16 0:58 ` [PATCH 05/11] ARM: shmobile: r8a7740 dtsi: Add Ethernet support Simon Horman ` (7 subsequent siblings) 11 siblings, 0 replies; 13+ messages in thread From: Simon Horman @ 2014-05-16 0:58 UTC (permalink / raw) To: linux-arm-kernel From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Define the Henninger board dependent part of the MSIOF0 device node. Add device node for Renesas R2A11302FT PMIC for which no bindings exist yet. Based on the Koelsch MSIOF device tree patch by Geert Uytterhoeven. Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/boot/dts/r8a7791-henninger.dts | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/arch/arm/boot/dts/r8a7791-henninger.dts b/arch/arm/boot/dts/r8a7791-henninger.dts index 1d715a3..cc6d992 100644 --- a/arch/arm/boot/dts/r8a7791-henninger.dts +++ b/arch/arm/boot/dts/r8a7791-henninger.dts @@ -114,6 +114,12 @@ renesas,groups = "qspi_ctrl", "qspi_data4"; renesas,function = "qspi"; }; + + msiof0_pins: spi1 { + renesas,groups = "msiof0_clk", "msiof0_sync", "msiof0_rx", + "msiof0_tx"; + renesas,function = "msiof0"; + }; }; &scif0 { @@ -196,3 +202,18 @@ }; }; }; + +&msiof0 { + pinctrl-0 = <&msiof0_pins>; + pinctrl-names = "default"; + + status = "okay"; + + pmic at 0 { + compatible = "renesas,r2a11302ft"; + reg = <0>; + spi-max-frequency = <6000000>; + spi-cpol; + spi-cpha; + }; +}; -- 1.8.5.2 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 05/11] ARM: shmobile: r8a7740 dtsi: Add Ethernet support 2014-05-16 0:58 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.16 Simon Horman ` (3 preceding siblings ...) 2014-05-16 0:58 ` [PATCH 04/11] ARM: shmobile: henninger: add MSIOF0 " Simon Horman @ 2014-05-16 0:58 ` Simon Horman 2014-05-16 0:58 ` [PATCH 06/11] ARM: shmobile: armadillo-reference dts: " Simon Horman ` (6 subsequent siblings) 11 siblings, 0 replies; 13+ messages in thread From: Simon Horman @ 2014-05-16 0:58 UTC (permalink / raw) To: linux-arm-kernel From: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/boot/dts/r8a7740.dtsi | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi index 9f65986..f014789 100644 --- a/arch/arm/boot/dts/r8a7740.dtsi +++ b/arch/arm/boot/dts/r8a7740.dtsi @@ -123,6 +123,19 @@ 0 149 IRQ_TYPE_LEVEL_HIGH>; }; + ether: ethernet at e9a00000 { + compatible = "renesas,gether-r8a7740"; + reg = <0xe9a00000 0x800>, + <0xe9a01800 0x800>; + interrupt-parent = <&gic>; + interrupts = <0 110 IRQ_TYPE_LEVEL_HIGH>; + /* clocks = <&mstp3_clks R8A7740_CLK_GETHER>; */ + phy-mode = "mii"; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + i2c0: i2c at fff20000 { #address-cells = <1>; #size-cells = <0>; -- 1.8.5.2 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 06/11] ARM: shmobile: armadillo-reference dts: Add Ethernet support 2014-05-16 0:58 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.16 Simon Horman ` (4 preceding siblings ...) 2014-05-16 0:58 ` [PATCH 05/11] ARM: shmobile: r8a7740 dtsi: Add Ethernet support Simon Horman @ 2014-05-16 0:58 ` Simon Horman 2014-05-16 0:58 ` [PATCH 07/11] ARM: shmobile: dts: Move interrupt-parent property to root node Simon Horman ` (5 subsequent siblings) 11 siblings, 0 replies; 13+ messages in thread From: Simon Horman @ 2014-05-16 0:58 UTC (permalink / raw) To: linux-arm-kernel From: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts index 10344e6..486007d 100644 --- a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts +++ b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts @@ -158,6 +158,18 @@ }; }; +ðer { + pinctrl-0 = <ðer_pins>; + pinctrl-names = "default"; + + phy-handle = <&phy0>; + status = "ok"; + + phy0: ethernet-phy at 0 { + reg = <0>; + }; +}; + &i2c0 { status = "okay"; touchscreen at 55 { @@ -189,6 +201,11 @@ pinctrl-0 = <&scifa1_pins>; pinctrl-names = "default"; + ether_pins: ether { + renesas,groups = "gether_mii", "gether_int"; + renesas,function = "gether"; + }; + scifa1_pins: serial1 { renesas,groups = "scifa1_data"; renesas,function = "scifa1"; -- 1.8.5.2 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 07/11] ARM: shmobile: dts: Move interrupt-parent property to root node 2014-05-16 0:58 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.16 Simon Horman ` (5 preceding siblings ...) 2014-05-16 0:58 ` [PATCH 06/11] ARM: shmobile: armadillo-reference dts: " Simon Horman @ 2014-05-16 0:58 ` Simon Horman 2014-05-16 0:58 ` [PATCH 08/11] ARM: shmobile: r8a7790 dtsi: Add GPIO clocks Simon Horman ` (4 subsequent siblings) 11 siblings, 0 replies; 13+ messages in thread From: Simon Horman @ 2014-05-16 0:58 UTC (permalink / raw) To: linux-arm-kernel From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> There's no need to duplicate the interrupt-parent property in all DT nodes as the kernel automatically walks parent nodes to find the property. Specify it once in the root node only. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/boot/dts/r8a73a4.dtsi | 18 ------------------ arch/arm/boot/dts/r8a7740.dtsi | 12 +----------- arch/arm/boot/dts/r8a7778.dtsi | 18 +----------------- arch/arm/boot/dts/r8a7779.dtsi | 21 +-------------------- arch/arm/boot/dts/r8a7791.dtsi | 3 --- 5 files changed, 3 insertions(+), 69 deletions(-) diff --git a/arch/arm/boot/dts/r8a73a4.dtsi b/arch/arm/boot/dts/r8a73a4.dtsi index 62d0211..82c5ac8 100644 --- a/arch/arm/boot/dts/r8a73a4.dtsi +++ b/arch/arm/boot/dts/r8a73a4.dtsi @@ -55,7 +55,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>, @@ -95,7 +94,6 @@ #interrupt-cells = <2>; interrupt-controller; reg = <0 0xe61c0200 0 0x200>; - interrupt-parent = <&gic>; interrupts = <0 32 IRQ_TYPE_LEVEL_HIGH>, <0 33 IRQ_TYPE_LEVEL_HIGH>, <0 34 IRQ_TYPE_LEVEL_HIGH>, @@ -136,7 +134,6 @@ dma0: dma-controller at e6700020 { compatible = "renesas,shdma-r8a73a4"; reg = <0 0xe6700020 0 0x89e0>; - interrupt-parent = <&gic>; interrupts = <0 220 IRQ_TYPE_LEVEL_HIGH 0 200 IRQ_TYPE_LEVEL_HIGH 0 201 IRQ_TYPE_LEVEL_HIGH @@ -171,7 +168,6 @@ compatible = "renesas,rcar-thermal"; reg = <0 0xe61f0000 0 0x14>, <0 0xe61f0100 0 0x38>, <0 0xe61f0200 0 0x38>, <0 0xe61f0300 0 0x38>; - interrupt-parent = <&gic>; interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>; }; @@ -180,7 +176,6 @@ #size-cells = <0>; compatible = "renesas,rmobile-iic"; reg = <0 0xe6500000 0 0x428>; - interrupt-parent = <&gic>; interrupts = <0 174 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; }; @@ -190,7 +185,6 @@ #size-cells = <0>; compatible = "renesas,rmobile-iic"; reg = <0 0xe6510000 0 0x428>; - interrupt-parent = <&gic>; interrupts = <0 175 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; }; @@ -200,7 +194,6 @@ #size-cells = <0>; compatible = "renesas,rmobile-iic"; reg = <0 0xe6520000 0 0x428>; - interrupt-parent = <&gic>; interrupts = <0 176 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; }; @@ -210,7 +203,6 @@ #size-cells = <0>; compatible = "renesas,rmobile-iic"; reg = <0 0xe6530000 0 0x428>; - interrupt-parent = <&gic>; interrupts = <0 177 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; }; @@ -220,7 +212,6 @@ #size-cells = <0>; compatible = "renesas,rmobile-iic"; reg = <0 0xe6540000 0 0x428>; - interrupt-parent = <&gic>; interrupts = <0 178 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; }; @@ -230,7 +221,6 @@ #size-cells = <0>; compatible = "renesas,rmobile-iic"; reg = <0 0xe60b0000 0 0x428>; - interrupt-parent = <&gic>; interrupts = <0 179 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; }; @@ -240,7 +230,6 @@ #size-cells = <0>; compatible = "renesas,rmobile-iic"; reg = <0 0xe6550000 0 0x428>; - interrupt-parent = <&gic>; interrupts = <0 184 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; }; @@ -250,7 +239,6 @@ #size-cells = <0>; compatible = "renesas,rmobile-iic"; reg = <0 0xe6560000 0 0x428>; - interrupt-parent = <&gic>; interrupts = <0 185 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; }; @@ -260,7 +248,6 @@ #size-cells = <0>; compatible = "renesas,rmobile-iic"; reg = <0 0xe6570000 0 0x428>; - interrupt-parent = <&gic>; interrupts = <0 173 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; }; @@ -268,7 +255,6 @@ mmcif0: mmc at ee200000 { compatible = "renesas,sh-mmcif"; reg = <0 0xee200000 0 0x80>; - interrupt-parent = <&gic>; interrupts = <0 169 IRQ_TYPE_LEVEL_HIGH>; reg-io-width = <4>; status = "disabled"; @@ -277,7 +263,6 @@ mmcif1: mmc at ee220000 { compatible = "renesas,sh-mmcif"; reg = <0 0xee220000 0 0x80>; - interrupt-parent = <&gic>; interrupts = <0 170 IRQ_TYPE_LEVEL_HIGH>; reg-io-width = <4>; status = "disabled"; @@ -309,7 +294,6 @@ sdhi0: sd at ee100000 { compatible = "renesas,sdhi-r8a73a4"; reg = <0 0xee100000 0 0x100>; - interrupt-parent = <&gic>; interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>; cap-sd-highspeed; status = "disabled"; @@ -318,7 +302,6 @@ sdhi1: sd at ee120000 { compatible = "renesas,sdhi-r8a73a4"; reg = <0 0xee120000 0 0x100>; - interrupt-parent = <&gic>; interrupts = <0 166 IRQ_TYPE_LEVEL_HIGH>; cap-sd-highspeed; status = "disabled"; @@ -327,7 +310,6 @@ sdhi2: sd at ee140000 { compatible = "renesas,sdhi-r8a73a4"; reg = <0 0xee140000 0 0x100>; - interrupt-parent = <&gic>; interrupts = <0 167 IRQ_TYPE_LEVEL_HIGH>; cap-sd-highspeed; status = "disabled"; diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi index f014789..fbf47fb 100644 --- a/arch/arm/boot/dts/r8a7740.dtsi +++ b/arch/arm/boot/dts/r8a7740.dtsi @@ -14,6 +14,7 @@ / { compatible = "renesas,r8a7740"; + interrupt-parent = <&gic>; cpus { #address-cells = <1>; @@ -49,7 +50,6 @@ <0xe6900020 1>, <0xe6900040 1>, <0xe6900060 1>; - interrupt-parent = <&gic>; interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH 0 149 IRQ_TYPE_LEVEL_HIGH 0 149 IRQ_TYPE_LEVEL_HIGH @@ -70,7 +70,6 @@ <0xe6900024 1>, <0xe6900044 1>, <0xe6900064 1>; - interrupt-parent = <&gic>; interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH 0 149 IRQ_TYPE_LEVEL_HIGH 0 149 IRQ_TYPE_LEVEL_HIGH @@ -91,7 +90,6 @@ <0xe6900028 1>, <0xe6900048 1>, <0xe6900068 1>; - interrupt-parent = <&gic>; interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH 0 149 IRQ_TYPE_LEVEL_HIGH 0 149 IRQ_TYPE_LEVEL_HIGH @@ -112,7 +110,6 @@ <0xe690002c 1>, <0xe690004c 1>, <0xe690006c 1>; - interrupt-parent = <&gic>; interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH 0 149 IRQ_TYPE_LEVEL_HIGH 0 149 IRQ_TYPE_LEVEL_HIGH @@ -141,7 +138,6 @@ #size-cells = <0>; compatible = "renesas,iic-r8a7740", "renesas,rmobile-iic"; reg = <0xfff20000 0x425>; - interrupt-parent = <&gic>; interrupts = <0 201 IRQ_TYPE_LEVEL_HIGH 0 202 IRQ_TYPE_LEVEL_HIGH 0 203 IRQ_TYPE_LEVEL_HIGH @@ -154,7 +150,6 @@ #size-cells = <0>; compatible = "renesas,iic-r8a7740", "renesas,rmobile-iic"; reg = <0xe6c20000 0x425>; - interrupt-parent = <&gic>; interrupts = <0 70 IRQ_TYPE_LEVEL_HIGH 0 71 IRQ_TYPE_LEVEL_HIGH 0 72 IRQ_TYPE_LEVEL_HIGH @@ -189,7 +184,6 @@ mmcif0: mmc@e6bd0000 { compatible = "renesas,mmcif-r8a7740", "renesas,sh-mmcif"; reg = <0xe6bd0000 0x100>; - interrupt-parent = <&gic>; interrupts = <0 56 IRQ_TYPE_LEVEL_HIGH 0 57 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; @@ -198,7 +192,6 @@ sdhi0: sd at e6850000 { compatible = "renesas,sdhi-r8a7740"; reg = <0xe6850000 0x100>; - interrupt-parent = <&gic>; interrupts = <0 117 IRQ_TYPE_LEVEL_HIGH 0 118 IRQ_TYPE_LEVEL_HIGH 0 119 IRQ_TYPE_LEVEL_HIGH>; @@ -210,7 +203,6 @@ sdhi1: sd at e6860000 { compatible = "renesas,sdhi-r8a7740"; reg = <0xe6860000 0x100>; - interrupt-parent = <&gic>; interrupts = <0 121 IRQ_TYPE_LEVEL_HIGH 0 122 IRQ_TYPE_LEVEL_HIGH 0 123 IRQ_TYPE_LEVEL_HIGH>; @@ -222,7 +214,6 @@ sdhi2: sd at e6870000 { compatible = "renesas,sdhi-r8a7740"; reg = <0xe6870000 0x100>; - interrupt-parent = <&gic>; interrupts = <0 125 IRQ_TYPE_LEVEL_HIGH 0 126 IRQ_TYPE_LEVEL_HIGH 0 127 IRQ_TYPE_LEVEL_HIGH>; @@ -235,7 +226,6 @@ #sound-dai-cells = <1>; compatible = "renesas,fsi2-r8a7740", "renesas,sh_fsi2"; reg = <0xfe1f0000 0x400>; - interrupt-parent = <&gic>; interrupts = <0 9 0x4>; status = "disabled"; }; diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi index 3c6fab5..3af0a21 100644 --- a/arch/arm/boot/dts/r8a7778.dtsi +++ b/arch/arm/boot/dts/r8a7778.dtsi @@ -20,6 +20,7 @@ / { compatible = "renesas,r8a7778"; + interrupt-parent = <&gic>; cpus { cpu at 0 { @@ -52,7 +53,6 @@ <0xfe780024 4>, <0xfe780044 4>, <0xfe780064 4>; - interrupt-parent = <&gic>; interrupts = <0 27 IRQ_TYPE_LEVEL_HIGH 0 28 IRQ_TYPE_LEVEL_HIGH 0 29 IRQ_TYPE_LEVEL_HIGH @@ -63,7 +63,6 @@ gpio0: gpio@ffc40000 { compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; reg = <0xffc40000 0x2c>; - interrupt-parent = <&gic>; interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>; #gpio-cells = <2>; gpio-controller; @@ -75,7 +74,6 @@ gpio1: gpio at ffc41000 { compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; reg = <0xffc41000 0x2c>; - interrupt-parent = <&gic>; interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>; #gpio-cells = <2>; gpio-controller; @@ -87,7 +85,6 @@ gpio2: gpio at ffc42000 { compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; reg = <0xffc42000 0x2c>; - interrupt-parent = <&gic>; interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>; #gpio-cells = <2>; gpio-controller; @@ -99,7 +96,6 @@ gpio3: gpio at ffc43000 { compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; reg = <0xffc43000 0x2c>; - interrupt-parent = <&gic>; interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>; #gpio-cells = <2>; gpio-controller; @@ -111,7 +107,6 @@ gpio4: gpio at ffc44000 { compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; reg = <0xffc44000 0x2c>; - interrupt-parent = <&gic>; interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>; #gpio-cells = <2>; gpio-controller; @@ -130,7 +125,6 @@ #size-cells = <0>; compatible = "renesas,i2c-r8a7778"; reg = <0xffc70000 0x1000>; - interrupt-parent = <&gic>; interrupts = <0 67 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; }; @@ -140,7 +134,6 @@ #size-cells = <0>; compatible = "renesas,i2c-r8a7778"; reg = <0xffc71000 0x1000>; - interrupt-parent = <&gic>; interrupts = <0 78 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; }; @@ -150,7 +143,6 @@ #size-cells = <0>; compatible = "renesas,i2c-r8a7778"; reg = <0xffc72000 0x1000>; - interrupt-parent = <&gic>; interrupts = <0 76 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; }; @@ -160,7 +152,6 @@ #size-cells = <0>; compatible = "renesas,i2c-r8a7778"; reg = <0xffc73000 0x1000>; - interrupt-parent = <&gic>; interrupts = <0 77 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; }; @@ -168,7 +159,6 @@ mmcif: mmc at ffe4e000 { compatible = "renesas,sh-mmcif"; reg = <0xffe4e000 0x100>; - interrupt-parent = <&gic>; interrupts = <0 61 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; }; @@ -176,7 +166,6 @@ sdhi0: sd at ffe4c000 { compatible = "renesas,sdhi-r8a7778"; reg = <0xffe4c000 0x100>; - interrupt-parent = <&gic>; interrupts = <0 87 IRQ_TYPE_LEVEL_HIGH>; cap-sd-highspeed; cap-sdio-irq; @@ -186,7 +175,6 @@ sdhi1: sd at ffe4d000 { compatible = "renesas,sdhi-r8a7778"; reg = <0xffe4d000 0x100>; - interrupt-parent = <&gic>; interrupts = <0 88 IRQ_TYPE_LEVEL_HIGH>; cap-sd-highspeed; cap-sdio-irq; @@ -196,7 +184,6 @@ sdhi2: sd at ffe4f000 { compatible = "renesas,sdhi-r8a7778"; reg = <0xffe4f000 0x100>; - interrupt-parent = <&gic>; interrupts = <0 86 IRQ_TYPE_LEVEL_HIGH>; cap-sd-highspeed; cap-sdio-irq; @@ -206,7 +193,6 @@ hspi0: spi at fffc7000 { compatible = "renesas,hspi-r8a7778", "renesas,hspi"; reg = <0xfffc7000 0x18>; - interrupt-parent = <&gic>; interrupts = <0 63 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; @@ -216,7 +202,6 @@ hspi1: spi at fffc8000 { compatible = "renesas,hspi-r8a7778", "renesas,hspi"; reg = <0xfffc8000 0x18>; - interrupt-parent = <&gic>; interrupts = <0 84 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; @@ -226,7 +211,6 @@ hspi2: spi at fffc6000 { compatible = "renesas,hspi-r8a7778", "renesas,hspi"; reg = <0xfffc6000 0x18>; - interrupt-parent = <&gic>; interrupts = <0 85 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi index 8b1a336..b517c8e 100644 --- a/arch/arm/boot/dts/r8a7779.dtsi +++ b/arch/arm/boot/dts/r8a7779.dtsi @@ -15,6 +15,7 @@ / { compatible = "renesas,r8a7779"; + interrupt-parent = <&gic>; cpus { #address-cells = <1>; @@ -59,7 +60,6 @@ gpio0: gpio at ffc40000 { compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar"; reg = <0xffc40000 0x2c>; - interrupt-parent = <&gic>; interrupts = <0 141 IRQ_TYPE_LEVEL_HIGH>; #gpio-cells = <2>; gpio-controller; @@ -71,7 +71,6 @@ gpio1: gpio at ffc41000 { compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar"; reg = <0xffc41000 0x2c>; - interrupt-parent = <&gic>; interrupts = <0 142 IRQ_TYPE_LEVEL_HIGH>; #gpio-cells = <2>; gpio-controller; @@ -83,7 +82,6 @@ gpio2: gpio at ffc42000 { compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar"; reg = <0xffc42000 0x2c>; - interrupt-parent = <&gic>; interrupts = <0 143 IRQ_TYPE_LEVEL_HIGH>; #gpio-cells = <2>; gpio-controller; @@ -95,7 +93,6 @@ gpio3: gpio at ffc43000 { compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar"; reg = <0xffc43000 0x2c>; - interrupt-parent = <&gic>; interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>; #gpio-cells = <2>; gpio-controller; @@ -107,7 +104,6 @@ gpio4: gpio at ffc44000 { compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar"; reg = <0xffc44000 0x2c>; - interrupt-parent = <&gic>; interrupts = <0 145 IRQ_TYPE_LEVEL_HIGH>; #gpio-cells = <2>; gpio-controller; @@ -119,7 +115,6 @@ gpio5: gpio at ffc45000 { compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar"; reg = <0xffc45000 0x2c>; - interrupt-parent = <&gic>; interrupts = <0 146 IRQ_TYPE_LEVEL_HIGH>; #gpio-cells = <2>; gpio-controller; @@ -131,7 +126,6 @@ gpio6: gpio at ffc46000 { compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar"; reg = <0xffc46000 0x2c>; - interrupt-parent = <&gic>; interrupts = <0 147 IRQ_TYPE_LEVEL_HIGH>; #gpio-cells = <2>; gpio-controller; @@ -150,7 +144,6 @@ <0xfe780024 4>, <0xfe780044 4>, <0xfe780064 4>; - interrupt-parent = <&gic>; interrupts = <0 27 IRQ_TYPE_LEVEL_HIGH 0 28 IRQ_TYPE_LEVEL_HIGH 0 29 IRQ_TYPE_LEVEL_HIGH @@ -163,7 +156,6 @@ #size-cells = <0>; compatible = "renesas,i2c-r8a7779"; reg = <0xffc70000 0x1000>; - interrupt-parent = <&gic>; interrupts = <0 79 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; }; @@ -173,7 +165,6 @@ #size-cells = <0>; compatible = "renesas,i2c-r8a7779"; reg = <0xffc71000 0x1000>; - interrupt-parent = <&gic>; interrupts = <0 82 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; }; @@ -183,7 +174,6 @@ #size-cells = <0>; compatible = "renesas,i2c-r8a7779"; reg = <0xffc72000 0x1000>; - interrupt-parent = <&gic>; interrupts = <0 80 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; }; @@ -193,7 +183,6 @@ #size-cells = <0>; compatible = "renesas,i2c-r8a7779"; reg = <0xffc73000 0x1000>; - interrupt-parent = <&gic>; interrupts = <0 81 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; }; @@ -211,14 +200,12 @@ sata: sata at fc600000 { compatible = "renesas,rcar-sata"; reg = <0xfc600000 0x2000>; - interrupt-parent = <&gic>; interrupts = <0 100 IRQ_TYPE_LEVEL_HIGH>; }; sdhi0: sd at ffe4c000 { compatible = "renesas,sdhi-r8a7779"; reg = <0xffe4c000 0x100>; - interrupt-parent = <&gic>; interrupts = <0 104 IRQ_TYPE_LEVEL_HIGH>; cap-sd-highspeed; cap-sdio-irq; @@ -228,7 +215,6 @@ sdhi1: sd at ffe4d000 { compatible = "renesas,sdhi-r8a7779"; reg = <0xffe4d000 0x100>; - interrupt-parent = <&gic>; interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>; cap-sd-highspeed; cap-sdio-irq; @@ -238,7 +224,6 @@ sdhi2: sd at ffe4e000 { compatible = "renesas,sdhi-r8a7779"; reg = <0xffe4e000 0x100>; - interrupt-parent = <&gic>; interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>; cap-sd-highspeed; cap-sdio-irq; @@ -248,7 +233,6 @@ sdhi3: sd at ffe4f000 { compatible = "renesas,sdhi-r8a7779"; reg = <0xffe4f000 0x100>; - interrupt-parent = <&gic>; interrupts = <0 106 IRQ_TYPE_LEVEL_HIGH>; cap-sd-highspeed; cap-sdio-irq; @@ -258,7 +242,6 @@ hspi0: spi at fffc7000 { compatible = "renesas,hspi-r8a7779", "renesas,hspi"; reg = <0xfffc7000 0x18>; - interrupt-parent = <&gic>; interrupts = <0 73 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; @@ -268,7 +251,6 @@ hspi1: spi at fffc8000 { compatible = "renesas,hspi-r8a7779", "renesas,hspi"; reg = <0xfffc8000 0x18>; - interrupt-parent = <&gic>; interrupts = <0 74 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; @@ -278,7 +260,6 @@ hspi2: spi at fffc6000 { compatible = "renesas,hspi-r8a7779", "renesas,hspi"; reg = <0xfffc6000 0x18>; - interrupt-parent = <&gic>; interrupts = <0 75 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi index 98baff4..f4d47e1 100644 --- a/arch/arm/boot/dts/r8a7791.dtsi +++ b/arch/arm/boot/dts/r8a7791.dtsi @@ -289,7 +289,6 @@ sdhi0: sd at ee100000 { compatible = "renesas,sdhi-r8a7791"; reg = <0 0xee100000 0 0x200>; - interrupt-parent = <&gic>; interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp3_clks R8A7791_CLK_SDHI0>; status = "disabled"; @@ -298,7 +297,6 @@ sdhi1: sd at ee140000 { compatible = "renesas,sdhi-r8a7791"; reg = <0 0xee140000 0 0x100>; - interrupt-parent = <&gic>; interrupts = <0 167 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp3_clks R8A7791_CLK_SDHI1>; status = "disabled"; @@ -307,7 +305,6 @@ sdhi2: sd at ee160000 { compatible = "renesas,sdhi-r8a7791"; reg = <0 0xee160000 0 0x100>; - interrupt-parent = <&gic>; interrupts = <0 168 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp3_clks R8A7791_CLK_SDHI2>; status = "disabled"; -- 1.8.5.2 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 08/11] ARM: shmobile: r8a7790 dtsi: Add GPIO clocks 2014-05-16 0:58 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.16 Simon Horman ` (6 preceding siblings ...) 2014-05-16 0:58 ` [PATCH 07/11] ARM: shmobile: dts: Move interrupt-parent property to root node Simon Horman @ 2014-05-16 0:58 ` Simon Horman 2014-05-16 0:58 ` [PATCH 09/11] ARM: shmobile: r8a7791 " Simon Horman ` (3 subsequent siblings) 11 siblings, 0 replies; 13+ messages in thread From: Simon Horman @ 2014-05-16 0:58 UTC (permalink / raw) To: linux-arm-kernel From: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/boot/dts/r8a7790.dtsi | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi index bf2db38..e6130d6 100644 --- a/arch/arm/boot/dts/r8a7790.dtsi +++ b/arch/arm/boot/dts/r8a7790.dtsi @@ -117,6 +117,7 @@ gpio-ranges = <&pfc 0 0 32>; #interrupt-cells = <2>; interrupt-controller; + clocks = <&mstp9_clks R8A7790_CLK_GPIO0>; }; gpio1: gpio at e6051000 { @@ -128,6 +129,7 @@ gpio-ranges = <&pfc 0 32 32>; #interrupt-cells = <2>; interrupt-controller; + clocks = <&mstp9_clks R8A7790_CLK_GPIO1>; }; gpio2: gpio at e6052000 { @@ -139,6 +141,7 @@ gpio-ranges = <&pfc 0 64 32>; #interrupt-cells = <2>; interrupt-controller; + clocks = <&mstp9_clks R8A7790_CLK_GPIO2>; }; gpio3: gpio at e6053000 { @@ -150,6 +153,7 @@ gpio-ranges = <&pfc 0 96 32>; #interrupt-cells = <2>; interrupt-controller; + clocks = <&mstp9_clks R8A7790_CLK_GPIO3>; }; gpio4: gpio at e6054000 { @@ -161,6 +165,7 @@ gpio-ranges = <&pfc 0 128 32>; #interrupt-cells = <2>; interrupt-controller; + clocks = <&mstp9_clks R8A7790_CLK_GPIO4>; }; gpio5: gpio at e6055000 { @@ -172,6 +177,7 @@ gpio-ranges = <&pfc 0 160 32>; #interrupt-cells = <2>; interrupt-controller; + clocks = <&mstp9_clks R8A7790_CLK_GPIO5>; }; thermal at e61f0000 { @@ -802,14 +808,19 @@ mstp9_clks: mstp9_clks at e6150994 { compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks"; reg = <0 0xe6150994 0 4>, <0 0xe61509a4 0 4>; - clocks = <&p_clk>, <&p_clk>, <&cpg_clocks R8A7790_CLK_QSPI>, <&cp_clk>, + clocks = <&cp_clk>, <&cp_clk>, <&cp_clk>, + <&cp_clk>, <&cp_clk>, <&cp_clk>, + <&p_clk>, <&p_clk>, <&cpg_clocks R8A7790_CLK_QSPI>, <&cp_clk>, <&hp_clk>, <&hp_clk>, <&hp_clk>, <&hp_clk>; #clock-cells = <1>; renesas,clock-indices = < + R8A7790_CLK_GPIO5 R8A7790_CLK_GPIO4 R8A7790_CLK_GPIO3 + R8A7790_CLK_GPIO2 R8A7790_CLK_GPIO1 R8A7790_CLK_GPIO0 R8A7790_CLK_RCAN1 R8A7790_CLK_RCAN0 R8A7790_CLK_QSPI_MOD R8A7790_CLK_IICDVFS R8A7790_CLK_I2C3 R8A7790_CLK_I2C2 R8A7790_CLK_I2C1 R8A7790_CLK_I2C0 >; clock-output-names = + "gpio5", "gpio4", "gpio3", "gpio2", "gpio1", "gpio0", "rcan1", "rcan0", "qspi_mod", "iic3", "i2c3", "i2c2", "i2c1", "i2c0"; }; -- 1.8.5.2 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 09/11] ARM: shmobile: r8a7791 dtsi: Add GPIO clocks 2014-05-16 0:58 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.16 Simon Horman ` (7 preceding siblings ...) 2014-05-16 0:58 ` [PATCH 08/11] ARM: shmobile: r8a7790 dtsi: Add GPIO clocks Simon Horman @ 2014-05-16 0:58 ` Simon Horman 2014-05-16 0:58 ` [PATCH 10/11] ARM: shmobile: marzen-reference: Set SMSC lan to use irq-push-pull Simon Horman ` (2 subsequent siblings) 11 siblings, 0 replies; 13+ messages in thread From: Simon Horman @ 2014-05-16 0:58 UTC (permalink / raw) To: linux-arm-kernel From: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/boot/dts/r8a7791.dtsi | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi index f4d47e1..5eea08f 100644 --- a/arch/arm/boot/dts/r8a7791.dtsi +++ b/arch/arm/boot/dts/r8a7791.dtsi @@ -76,6 +76,7 @@ gpio-ranges = <&pfc 0 0 32>; #interrupt-cells = <2>; interrupt-controller; + clocks = <&mstp9_clks R8A7791_CLK_GPIO0>; }; gpio1: gpio at e6051000 { @@ -87,6 +88,7 @@ gpio-ranges = <&pfc 0 32 32>; #interrupt-cells = <2>; interrupt-controller; + clocks = <&mstp9_clks R8A7791_CLK_GPIO1>; }; gpio2: gpio at e6052000 { @@ -98,6 +100,7 @@ gpio-ranges = <&pfc 0 64 32>; #interrupt-cells = <2>; interrupt-controller; + clocks = <&mstp9_clks R8A7791_CLK_GPIO2>; }; gpio3: gpio at e6053000 { @@ -109,6 +112,7 @@ gpio-ranges = <&pfc 0 96 32>; #interrupt-cells = <2>; interrupt-controller; + clocks = <&mstp9_clks R8A7791_CLK_GPIO3>; }; gpio4: gpio at e6054000 { @@ -120,6 +124,7 @@ gpio-ranges = <&pfc 0 128 32>; #interrupt-cells = <2>; interrupt-controller; + clocks = <&mstp9_clks R8A7791_CLK_GPIO4>; }; gpio5: gpio at e6055000 { @@ -131,6 +136,7 @@ gpio-ranges = <&pfc 0 160 32>; #interrupt-cells = <2>; interrupt-controller; + clocks = <&mstp9_clks R8A7791_CLK_GPIO5>; }; gpio6: gpio at e6055400 { @@ -142,6 +148,7 @@ gpio-ranges = <&pfc 0 192 32>; #interrupt-cells = <2>; interrupt-controller; + clocks = <&mstp9_clks R8A7791_CLK_GPIO6>; }; gpio7: gpio at e6055800 { @@ -153,6 +160,7 @@ gpio-ranges = <&pfc 0 224 26>; #interrupt-cells = <2>; interrupt-controller; + clocks = <&mstp9_clks R8A7791_CLK_GPIO7>; }; thermal at e61f0000 { @@ -802,18 +810,23 @@ mstp9_clks: mstp9_clks at e6150994 { compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks"; reg = <0 0xe6150994 0 4>, <0 0xe61509a4 0 4>; - clocks = <&p_clk>, <&p_clk>, <&cpg_clocks R8A7791_CLK_QSPI>, <&hp_clk>, + clocks = <&cp_clk>, <&cp_clk>, <&cp_clk>, <&cp_clk>, + <&cp_clk>, <&cp_clk>, <&cp_clk>, <&cp_clk>, + <&p_clk>, <&p_clk>, <&cpg_clocks R8A7791_CLK_QSPI>, <&hp_clk>, <&cp_clk>, <&hp_clk>, <&hp_clk>, <&hp_clk>, <&hp_clk>, <&hp_clk>; #clock-cells = <1>; renesas,clock-indices = < + R8A7791_CLK_GPIO7 R8A7791_CLK_GPIO6 R8A7791_CLK_GPIO5 R8A7791_CLK_GPIO4 + R8A7791_CLK_GPIO3 R8A7791_CLK_GPIO2 R8A7791_CLK_GPIO1 R8A7791_CLK_GPIO0 R8A7791_CLK_RCAN1 R8A7791_CLK_RCAN0 R8A7791_CLK_QSPI_MOD R8A7791_CLK_I2C5 R8A7791_CLK_IICDVFS R8A7791_CLK_I2C4 R8A7791_CLK_I2C3 R8A7791_CLK_I2C2 R8A7791_CLK_I2C1 R8A7791_CLK_I2C0 >; clock-output-names = - "rcan1", "rcan0", "qspi_mod", "i2c5", "i2c6", "i2c4", "i2c3", - "i2c2", "i2c1", "i2c0"; + "gpio7", "gpio6", "gpio5", "gpio4", "gpio3", "gpio2", "gpio1", "gpio0", + "rcan1", "rcan0", "qspi_mod", "i2c5", "i2c6", "i2c4", "i2c3", "i2c2", + "i2c1", "i2c0"; }; mstp11_clks: mstp11_clks at e615099c { compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks"; -- 1.8.5.2 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 10/11] ARM: shmobile: marzen-reference: Set SMSC lan to use irq-push-pull 2014-05-16 0:58 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.16 Simon Horman ` (8 preceding siblings ...) 2014-05-16 0:58 ` [PATCH 09/11] ARM: shmobile: r8a7791 " Simon Horman @ 2014-05-16 0:58 ` Simon Horman 2014-05-16 0:58 ` [PATCH 11/11] ARM: shmobile: r8a7740 dtsi: Remove duplicate interrupt-parent property Simon Horman 2014-05-20 6:04 ` [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.16 Olof Johansson 11 siblings, 0 replies; 13+ messages in thread From: Simon Horman @ 2014-05-16 0:58 UTC (permalink / raw) To: linux-arm-kernel This change makes the DTS consistent with the platform data that exists in board-marzen.c. Empirically it does not appear to be necessary. Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/boot/dts/r8a7779-marzen-reference.dts | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/boot/dts/r8a7779-marzen-reference.dts b/arch/arm/boot/dts/r8a7779-marzen-reference.dts index 76f5eef..b27c637 100644 --- a/arch/arm/boot/dts/r8a7779-marzen-reference.dts +++ b/arch/arm/boot/dts/r8a7779-marzen-reference.dts @@ -45,6 +45,7 @@ phy-mode = "mii"; interrupt-parent = <&irqpin0>; interrupts = <1 IRQ_TYPE_EDGE_FALLING>; + smsc,irq-push-pull; reg-io-width = <4>; vddvario-supply = <&fixedregulator3v3>; vdd33a-supply = <&fixedregulator3v3>; -- 1.8.5.2 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 11/11] ARM: shmobile: r8a7740 dtsi: Remove duplicate interrupt-parent property 2014-05-16 0:58 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.16 Simon Horman ` (9 preceding siblings ...) 2014-05-16 0:58 ` [PATCH 10/11] ARM: shmobile: marzen-reference: Set SMSC lan to use irq-push-pull Simon Horman @ 2014-05-16 0:58 ` Simon Horman 2014-05-20 6:04 ` [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.16 Olof Johansson 11 siblings, 0 replies; 13+ messages in thread From: Simon Horman @ 2014-05-16 0:58 UTC (permalink / raw) To: linux-arm-kernel From: Geert Uytterhoeven <geert+renesas@glider.be> Caused by interaction between commit 08ec67b50db7ca8c9077e67ca23850cdc5bfc716 ("ARM: shmobile: r8a7740 dtsi: Add Ethernet support") and commit 9ff254adc1e32db46000a33b8ecbc4d7047672be ("ARM: shmobile: dts: Move interrupt-parent property to root node"). Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/boot/dts/r8a7740.dtsi | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi index fbf47fb..5d2edd8 100644 --- a/arch/arm/boot/dts/r8a7740.dtsi +++ b/arch/arm/boot/dts/r8a7740.dtsi @@ -124,7 +124,6 @@ compatible = "renesas,gether-r8a7740"; reg = <0xe9a00000 0x800>, <0xe9a01800 0x800>; - interrupt-parent = <&gic>; interrupts = <0 110 IRQ_TYPE_LEVEL_HIGH>; /* clocks = <&mstp3_clks R8A7740_CLK_GETHER>; */ phy-mode = "mii"; -- 1.8.5.2 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.16 2014-05-16 0:58 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.16 Simon Horman ` (10 preceding siblings ...) 2014-05-16 0:58 ` [PATCH 11/11] ARM: shmobile: r8a7740 dtsi: Remove duplicate interrupt-parent property Simon Horman @ 2014-05-20 6:04 ` Olof Johansson 11 siblings, 0 replies; 13+ messages in thread From: Olof Johansson @ 2014-05-20 6:04 UTC (permalink / raw) To: linux-arm-kernel On Fri, May 16, 2014 at 09:58:16AM +0900, Simon Horman wrote: > Hi Olof, Hi Kevin, Hi Arnd, > > Please consider these third round of Renesas ARM based SoC DT updates for v3.16. > > This pull request is based on the previous round of > such requests, tagged as renesas-dt2-for-v3.16, > which I have already sent a pull-request for. > > > The following changes since commit 5a62ec57004f1a434bfd3feed43e447b5780baf6: > > ARM: shmobile: henninger: enable SATA0 (2014-04-28 09:12:04 +0900) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt3-for-v3.16 > > for you to fetch changes up to 3fa3985e624aea24334abc9a33b484c3d316e64e: > > ARM: shmobile: r8a7740 dtsi: Remove duplicate interrupt-parent property (2014-05-15 08:09:59 +0900) > > ---------------------------------------------------------------- > Third Round of Renesas ARM Based SoC DT Updates for v3.16 > > r8a7791 (R-Car M2), r8a7779 (R-Car H1), r8a7778 (R-Car M1), > r8a7740 (R-Mobile A1) and r8a73a4 (R-Mobile APE6) SoCs > * Move interrupt-parent property to root node > > r8a7791 (R-Car M2) and r8a7790 (R-Car H2) SoCs > * Add GPIO clocks > > r8a7791 (R-Car M2) based Henninger board > * Add MSIOF0, QSPI and SDHI0/2 support > * Specify EXTAL frequency > > r8a7779 (R-Car H1) based Marzen board > * Set SMSC lan to use irq-push-pull > > r8a7740 (R-Mobile A1) SoC > * Remove duplicate interrupt-parent property > > r8a7740 (R-Mobile A1) based Armadillo800 EVA board > * Add Ethernet support Merged into next/dt. You can shorten down the tag texts a bit if you want, right now they mostly duplicate what's in the shortlog already. Thanks, -Olof ^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2014-05-20 6:04 UTC | newest] Thread overview: 13+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-05-16 0:58 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.16 Simon Horman 2014-05-16 0:58 ` [PATCH 01/11] ARM: shmobile: henninger: specify EXTAL frequency Simon Horman 2014-05-16 0:58 ` [PATCH 02/11] ARM: shmobile: henninger: add SDHI0/2 DT support Simon Horman 2014-05-16 0:58 ` [PATCH 03/11] ARM: shmobile: henninger: add QSPI " Simon Horman 2014-05-16 0:58 ` [PATCH 04/11] ARM: shmobile: henninger: add MSIOF0 " Simon Horman 2014-05-16 0:58 ` [PATCH 05/11] ARM: shmobile: r8a7740 dtsi: Add Ethernet support Simon Horman 2014-05-16 0:58 ` [PATCH 06/11] ARM: shmobile: armadillo-reference dts: " Simon Horman 2014-05-16 0:58 ` [PATCH 07/11] ARM: shmobile: dts: Move interrupt-parent property to root node Simon Horman 2014-05-16 0:58 ` [PATCH 08/11] ARM: shmobile: r8a7790 dtsi: Add GPIO clocks Simon Horman 2014-05-16 0:58 ` [PATCH 09/11] ARM: shmobile: r8a7791 " Simon Horman 2014-05-16 0:58 ` [PATCH 10/11] ARM: shmobile: marzen-reference: Set SMSC lan to use irq-push-pull Simon Horman 2014-05-16 0:58 ` [PATCH 11/11] ARM: shmobile: r8a7740 dtsi: Remove duplicate interrupt-parent property Simon Horman 2014-05-20 6:04 ` [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v3.16 Olof Johansson
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).