Commit c38114f3 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-dt2-for-v3.17' of... 

Merge tag 'renesas-dt2-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt

Merge "Second Round of Renesas ARM Based SoC DT Updates for v3.17" from Simon
Horman:

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

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

:
  ARM: shmobile: r8a7791: add DVC support for sound node on DTSI
  ARM: shmobile: r8a7790: add DVC support for sound node on DTSI
  ARM: shmobile: lager: enable internal PCI
  ARM: shmobile: r8a7790: add internal PCI bridge nodes

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 74498a6d 150c8ad4

arch/arm/boot/dts/r8a7790-lager.dts

+33 −0
Original line number Diff line number Diff line
@@ -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";

};

arch/arm/boot/dts/r8a7790.dtsi

+67 −0
Original line number Diff line number Diff line
@@ -930,6 +930,66 @@ 
		status = "disabled";

	};



	pci0: pci@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@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@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@fe000000 {

		compatible = "renesas,pcie-r8a7790";

		reg = <0 0xfe000000 0 0x80000>;
@@ -974,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@0 { };

			dvc1: dvc@1 { };

		};



		rcar_sound,src {

			src0: src@0 { };

			src1: src@1 { };

arch/arm/boot/dts/r8a7791.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -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@0 { };

			dvc1: dvc@1 { };

		};



		rcar_sound,src {

			src0: src@0 { };

			src1: src@1 { };

CRA Git | Maintained and supported by SUSTech CRA and CCSE