linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/4] ARM: shmobile: r8a7790: add internal PCI bridge nodes
  2014-07-01  0:28 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v3.17 Simon Horman
@ 2014-07-01  0:28 ` Simon Horman
  2014-07-01  0:28 ` [PATCH 2/4] ARM: shmobile: lager: enable internal PCI Simon Horman
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2014-07-01  0:28 UTC (permalink / raw)
  To: linux-arm-kernel

From: Ben Dooks <ben.dooks@codethink.co.uk>

Add device nodes for the R8A7790 internal PCI bridge devices.

Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Reviewed-by: Ian Molton <ian.molton@codethink.co.uk>
[Sergei: added several properties to the PCI bridge nodes]
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Tested-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7790.dtsi | 60 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 994330e..373d9a21 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -930,6 +930,66 @@
 		status = "disabled";
 	};
 
+	pci0: pci at ee090000 {
+		compatible = "renesas,pci-r8a7790";
+		device_type = "pci";
+		clocks = <&mstp7_clks R8A7790_CLK_EHCI>;
+		reg = <0 0xee090000 0 0xc00>,
+		      <0 0xee080000 0 0x1100>;
+		interrupts = <0 108 IRQ_TYPE_LEVEL_HIGH>;
+		status = "disabled";
+
+		bus-range = <0 0>;
+		#address-cells = <3>;
+		#size-cells = <2>;
+		#interrupt-cells = <1>;
+		ranges = <0x02000000 0 0xee080000 0 0xee080000 0 0x00010000>;
+		interrupt-map-mask = <0xff00 0 0 0x7>;
+		interrupt-map = <0x0000 0 0 1 &gic 0 108 IRQ_TYPE_LEVEL_HIGH
+			      	 0x0800 0 0 1 &gic 0 108 IRQ_TYPE_LEVEL_HIGH
+			      	 0x1000 0 0 2 &gic 0 108 IRQ_TYPE_LEVEL_HIGH>;
+	};
+
+	pci1: pci at ee0b0000 {
+		compatible = "renesas,pci-r8a7790";
+		device_type = "pci";
+		clocks = <&mstp7_clks R8A7790_CLK_EHCI>;
+		reg = <0 0xee0b0000 0 0xc00>,
+		      <0 0xee0a0000 0 0x1100>;
+		interrupts = <0 112 IRQ_TYPE_LEVEL_HIGH>;
+		status = "disabled";
+
+		bus-range = <1 1>;
+		#address-cells = <3>;
+		#size-cells = <2>;
+		#interrupt-cells = <1>;
+		ranges = <0x02000000 0 0xee0a0000 0 0xee0a0000 0 0x00010000>;
+		interrupt-map-mask = <0xff00 0 0 0x7>;
+		interrupt-map = <0x0000 0 0 1 &gic 0 112 IRQ_TYPE_LEVEL_HIGH
+			      	 0x0800 0 0 1 &gic 0 112 IRQ_TYPE_LEVEL_HIGH
+			      	 0x1000 0 0 2 &gic 0 112 IRQ_TYPE_LEVEL_HIGH>;
+	};
+
+	pci2: pci at ee0d0000 {
+		compatible = "renesas,pci-r8a7790";
+		device_type = "pci";
+		clocks = <&mstp7_clks R8A7790_CLK_EHCI>;
+		reg = <0 0xee0d0000 0 0xc00>,
+		      <0 0xee0c0000 0 0x1100>;
+		interrupts = <0 113 IRQ_TYPE_LEVEL_HIGH>;
+		status = "disabled";
+
+		bus-range = <2 2>;
+		#address-cells = <3>;
+		#size-cells = <2>;
+		#interrupt-cells = <1>;
+		ranges = <0x02000000 0 0xee0c0000 0 0xee0c0000 0 0x00010000>;
+		interrupt-map-mask = <0xff00 0 0 0x7>;
+		interrupt-map = <0x0000 0 0 1 &gic 0 113 IRQ_TYPE_LEVEL_HIGH
+			      	 0x0800 0 0 1 &gic 0 113 IRQ_TYPE_LEVEL_HIGH
+			      	 0x1000 0 0 2 &gic 0 113 IRQ_TYPE_LEVEL_HIGH>;
+	};
+
 	pciec: pcie at fe000000 {
 		compatible = "renesas,pcie-r8a7790";
 		reg = <0 0xfe000000 0 0x80000>;
-- 
2.0.0.rc2

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v3.17
@ 2014-07-01  0:28 Simon Horman
  2014-07-01  0:28 ` [PATCH 1/4] ARM: shmobile: r8a7790: add internal PCI bridge nodes Simon Horman
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: Simon Horman @ 2014-07-01  0:28 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Olof, Hi Kevin, Hi Arnd,

Please consider these Second Round of Renesas ARM Based SoC DT Updates
for v3.17.

This pull request is based on the previous round of
such requests, tagged as renesas-dt-for-v3.17,
which I have already sent a pull-request for.


The following changes since commit 09abd1fd11f98d6abde9c23244234170e7e36c2f:

  ARM: shmobile: r8a7791: add R-Car sound support on DTSI (2014-06-17 19:58:32 +0900)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-dt2-for-v3.17

for you to fetch changes up to 150c8ad40808189423002ea9fc6a858a3a59e6dc:

  ARM: shmobile: r8a7791: add DVC support for sound node on DTSI (2014-06-28 09:02:19 +0900)

----------------------------------------------------------------
Second Round of Renesas ARM Based SoC DT Updates for v3.17

* Extend hardware coverage
  - Add DVC support for sound nodes on r8a7791 and r8a7790
  - Enable internal PCI on r8a7790/lager

----------------------------------------------------------------
Ben Dooks (2):
      ARM: shmobile: r8a7790: add internal PCI bridge nodes
      ARM: shmobile: lager: enable internal PCI

Kuninori Morimoto (2):
      ARM: shmobile: r8a7790: add DVC support for sound node on DTSI
      ARM: shmobile: r8a7791: add DVC support for sound node on DTSI

 arch/arm/boot/dts/r8a7790-lager.dts | 33 ++++++++++++++++++
 arch/arm/boot/dts/r8a7790.dtsi      | 67 +++++++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/r8a7791.dtsi      |  7 ++++
 3 files changed, 107 insertions(+)

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 2/4] ARM: shmobile: lager: enable internal PCI
  2014-07-01  0:28 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v3.17 Simon Horman
  2014-07-01  0:28 ` [PATCH 1/4] ARM: shmobile: r8a7790: add internal PCI bridge nodes Simon Horman
@ 2014-07-01  0:28 ` Simon Horman
  2014-07-01  0:28 ` [PATCH 3/4] ARM: shmobile: r8a7790: add DVC support for sound node on DTSI Simon Horman
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2014-07-01  0:28 UTC (permalink / raw)
  To: linux-arm-kernel

From: Ben Dooks <ben.dooks@codethink.co.uk>

Enable internal AHB-PCI bridges for the USB EHCI/OHCI controllers attached to
them.

Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Reviewed-by: Ian Molton <ian.molton@codethink.co.uk>
[Sergei: enabled PCI0]
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Tested-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7790-lager.dts | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 0890d47..544202b 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -219,6 +219,21 @@
 		renesas,groups = "i2c3";
 		renesas,function = "i2c3";
 	};
+
+	usb0_pins: usb0 {
+		renesas,groups = "usb0";
+		renesas,function = "usb0";
+	};
+
+	usb1_pins: usb1 {
+		renesas,groups = "usb1";
+		renesas,function = "usb1";
+	};
+
+	usb2_pins: usb2 {
+		renesas,groups = "usb2";
+		renesas,function = "usb2";
+	};
 };
 
 &ether {
@@ -368,3 +383,21 @@
 		regulator-always-on;
 	};
 };
+
+&pci0 {
+	status = "okay";
+	pinctrl-0 = <&usb0_pins>;
+	pinctrl-names = "default";
+};
+
+&pci1 {
+	status = "okay";
+	pinctrl-0 = <&usb1_pins>;
+	pinctrl-names = "default";
+};
+
+&pci2 {
+	status = "okay";
+	pinctrl-0 = <&usb2_pins>;
+	pinctrl-names = "default";
+};
-- 
2.0.0.rc2

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 3/4] ARM: shmobile: r8a7790: add DVC support for sound node on DTSI
  2014-07-01  0:28 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v3.17 Simon Horman
  2014-07-01  0:28 ` [PATCH 1/4] ARM: shmobile: r8a7790: add internal PCI bridge nodes Simon Horman
  2014-07-01  0:28 ` [PATCH 2/4] ARM: shmobile: lager: enable internal PCI Simon Horman
@ 2014-07-01  0:28 ` Simon Horman
  2014-07-01  0:28 ` [PATCH 4/4] ARM: shmobile: r8a7791: " Simon Horman
  2014-07-12 16:35 ` [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v3.17 Olof Johansson
  4 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2014-07-01  0:28 UTC (permalink / raw)
  To: linux-arm-kernel

From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 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 373d9a21..bdcb7f0 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -1034,16 +1034,23 @@
 			<&mstp10_clks R8A7790_CLK_SCU_SRC5>, <&mstp10_clks R8A7790_CLK_SCU_SRC4>,
 			<&mstp10_clks R8A7790_CLK_SCU_SRC3>, <&mstp10_clks R8A7790_CLK_SCU_SRC2>,
 			<&mstp10_clks R8A7790_CLK_SCU_SRC1>, <&mstp10_clks R8A7790_CLK_SCU_SRC0>,
+			<&mstp10_clks R8A7790_CLK_SCU_DVC0>, <&mstp10_clks R8A7790_CLK_SCU_DVC1>,
 			<&audio_clk_a>, <&audio_clk_b>, <&audio_clk_c>, <&m2_clk>;
 		clock-names = "ssi-all",
 				"ssi.9", "ssi.8", "ssi.7", "ssi.6", "ssi.5",
 				"ssi.4", "ssi.3", "ssi.2", "ssi.1", "ssi.0",
 				"src.9", "src.8", "src.7", "src.6", "src.5",
 				"src.4", "src.3", "src.2", "src.1", "src.0",
+				"dvc.0", "dvc.1",
 				"clk_a", "clk_b", "clk_c", "clk_i";
 
 		status = "disabled";
 
+		rcar_sound,dvc {
+			dvc0: dvc at 0 { };
+			dvc1: dvc at 1 { };
+		};
+
 		rcar_sound,src {
 			src0: src at 0 { };
 			src1: src at 1 { };
-- 
2.0.0.rc2

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 4/4] ARM: shmobile: r8a7791: add DVC support for sound node on DTSI
  2014-07-01  0:28 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v3.17 Simon Horman
                   ` (2 preceding siblings ...)
  2014-07-01  0:28 ` [PATCH 3/4] ARM: shmobile: r8a7790: add DVC support for sound node on DTSI Simon Horman
@ 2014-07-01  0:28 ` Simon Horman
  2014-07-12 16:35 ` [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v3.17 Olof Johansson
  4 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2014-07-01  0:28 UTC (permalink / raw)
  To: linux-arm-kernel

From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7791.dtsi | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 1997f16..336a6c0 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -1005,16 +1005,23 @@
 			<&mstp10_clks R8A7791_CLK_SCU_SRC5>, <&mstp10_clks R8A7791_CLK_SCU_SRC4>,
 			<&mstp10_clks R8A7791_CLK_SCU_SRC3>, <&mstp10_clks R8A7791_CLK_SCU_SRC2>,
 			<&mstp10_clks R8A7791_CLK_SCU_SRC1>, <&mstp10_clks R8A7791_CLK_SCU_SRC0>,
+			<&mstp10_clks R8A7791_CLK_SCU_DVC0>, <&mstp10_clks R8A7791_CLK_SCU_DVC1>,
 			<&audio_clk_a>, <&audio_clk_b>, <&audio_clk_c>, <&m2_clk>;
 		clock-names = "ssi-all",
 				"ssi.9", "ssi.8", "ssi.7", "ssi.6", "ssi.5",
 				"ssi.4", "ssi.3", "ssi.2", "ssi.1", "ssi.0",
 				"src.9", "src.8", "src.7", "src.6", "src.5",
 				"src.4", "src.3", "src.2", "src.1", "src.0",
+				"dvc.0", "dvc.1",
 				"clk_a", "clk_b", "clk_c", "clk_i";
 
 		status = "disabled";
 
+		rcar_sound,dvc {
+			dvc0: dvc at 0 { };
+			dvc1: dvc at 1 { };
+		};
+
 		rcar_sound,src {
 			src0: src at 0 { };
 			src1: src at 1 { };
-- 
2.0.0.rc2

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v3.17
  2014-07-01  0:28 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v3.17 Simon Horman
                   ` (3 preceding siblings ...)
  2014-07-01  0:28 ` [PATCH 4/4] ARM: shmobile: r8a7791: " Simon Horman
@ 2014-07-12 16:35 ` Olof Johansson
  4 siblings, 0 replies; 6+ messages in thread
From: Olof Johansson @ 2014-07-12 16:35 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Jul 01, 2014 at 09:28:19AM +0900, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
> 
> Please consider these Second Round of Renesas ARM Based SoC DT Updates
> for v3.17.
> 
> This pull request is based on the previous round of
> such requests, tagged as renesas-dt-for-v3.17,
> which I have already sent a pull-request for.
> 
> 
> The following changes since commit 09abd1fd11f98d6abde9c23244234170e7e36c2f:
> 
>   ARM: shmobile: r8a7791: add R-Car sound support on DTSI (2014-06-17 19:58:32 +0900)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-dt2-for-v3.17
> 
> for you to fetch changes up to 150c8ad40808189423002ea9fc6a858a3a59e6dc:
> 
>   ARM: shmobile: r8a7791: add DVC support for sound node on DTSI (2014-06-28 09:02:19 +0900)
> 
> ----------------------------------------------------------------
> Second Round of Renesas ARM Based SoC DT Updates for v3.17
> 
> * Extend hardware coverage
>   - Add DVC support for sound nodes on r8a7791 and r8a7790
>   - Enable internal PCI on r8a7790/lager

Merged, thanks.

-Olof

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2014-07-12 16:35 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-01  0:28 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v3.17 Simon Horman
2014-07-01  0:28 ` [PATCH 1/4] ARM: shmobile: r8a7790: add internal PCI bridge nodes Simon Horman
2014-07-01  0:28 ` [PATCH 2/4] ARM: shmobile: lager: enable internal PCI Simon Horman
2014-07-01  0:28 ` [PATCH 3/4] ARM: shmobile: r8a7790: add DVC support for sound node on DTSI Simon Horman
2014-07-01  0:28 ` [PATCH 4/4] ARM: shmobile: r8a7791: " Simon Horman
2014-07-12 16:35 ` [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v3.17 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).