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

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

Merge tag 'renesas-dt2-for-v3.15' 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.15" from Simon
Horman:

r8a7791 (R-Car M2) based Koelsch board
- Add QSPI nodes

r7s72100 (RZ/A1H) SoC
- Add RSPI nodes

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

:
  ARM: shmobile: koelsch dts: Add QSPI nodes
  ARM: shmobile: r8a7791 dtsi: Add QSPI node
  ARM: shmobile: r7s72100 dtsi: Add RSPI nodes

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 447e3295 e02ee513

arch/arm/boot/dts/r7s72100-genmai-reference.dts

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
 */



/dts-v1/;

/include/ "r7s72100.dtsi"

#include "r7s72100.dtsi"



/ {

	model = "Genmai";

arch/arm/boot/dts/r7s72100.dtsi

+75 −0
Original line number Diff line number Diff line
@@ -8,12 +8,22 @@ 
 * kind, whether express or implied.

 */



#include <dt-bindings/interrupt-controller/irq.h>



/ {

	compatible = "renesas,r7s72100";

	interrupt-parent = <&gic>;

	#address-cells = <1>;

	#size-cells = <1>;



	aliases {

		spi0 = &spi0;

		spi1 = &spi1;

		spi2 = &spi2;

		spi3 = &spi3;

		spi4 = &spi4;

	};



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;
@@ -33,4 +43,69 @@ 
		reg = <0xe8201000 0x1000>,

			<0xe8202000 0x1000>;

	};



	spi0: spi@e800c800 {

		compatible = "renesas,rspi-r7s72100", "renesas,rspi-rz";

		reg = <0xe800c800 0x24>;

		interrupts = <0 238 IRQ_TYPE_LEVEL_HIGH>,

			     <0 239 IRQ_TYPE_LEVEL_HIGH>,

			     <0 240 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "error", "rx", "tx";

		num-cs = <1>;

		#address-cells = <1>;

		#size-cells = <0>;

		status = "disabled";

	};



	spi1: spi@e800d000 {

		compatible = "renesas,rspi-r7s72100", "renesas,rspi-rz";

		reg = <0xe800d000 0x24>;

		interrupts = <0 241 IRQ_TYPE_LEVEL_HIGH>,

			     <0 242 IRQ_TYPE_LEVEL_HIGH>,

			     <0 243 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "error", "rx", "tx";

		num-cs = <1>;

		#address-cells = <1>;

		#size-cells = <0>;

		status = "disabled";

	};



	spi2: spi@e800d800 {

		compatible = "renesas,rspi-r7s72100", "renesas,rspi-rz";

		reg = <0xe800d800 0x24>;

		interrupts = <0 244 IRQ_TYPE_LEVEL_HIGH>,

			     <0 245 IRQ_TYPE_LEVEL_HIGH>,

			     <0 246 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "error", "rx", "tx";

		num-cs = <1>;

		#address-cells = <1>;

		#size-cells = <0>;

		status = "disabled";

	};



	spi3: spi@e800e000 {

		compatible = "renesas,rspi-r7s72100", "renesas,rspi-rz";

		reg = <0xe800e000 0x24>;

		interrupts = <0 247 IRQ_TYPE_LEVEL_HIGH>,

			     <0 248 IRQ_TYPE_LEVEL_HIGH>,

			     <0 249 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "error", "rx", "tx";

		num-cs = <1>;

		#address-cells = <1>;

		#size-cells = <0>;

		status = "disabled";

	};



	spi4: spi@e800e800 {

		compatible = "renesas,rspi-r7s72100", "renesas,rspi-rz";

		reg = <0xe800e800 0x24>;

		interrupts = <0 250 IRQ_TYPE_LEVEL_HIGH>,

			     <0 251 IRQ_TYPE_LEVEL_HIGH>,

			     <0 252 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "error", "rx", "tx";

		num-cs = <1>;

		#address-cells = <1>;

		#size-cells = <0>;

		status = "disabled";

	};

};

arch/arm/boot/dts/r8a7791-koelsch.dts

+36 −0
Original line number Diff line number Diff line
@@ -121,8 +121,44 @@ 
		renesas,groups = "scif1_data_d";

		renesas,function = "scif1";

	};



	qspi_pins: spi {

		renesas,groups = "qspi_ctrl", "qspi_data4";

		renesas,function = "qspi";

	};

};



&sata0 {

	status = "okay";

};



&spi {

	pinctrl-0 = <&qspi_pins>;

	pinctrl-names = "default";



	status = "okay";



	flash: flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "spansion,s25fl512s";

		reg = <0>;

		spi-max-frequency = <30000000>;

		m25p,fast-read;



		partition@0 {

			label = "loader";

			reg = <0x00000000 0x00080000>;

			read-only;

		};

		partition@80000 {

			label = "bootenv";

			reg = <0x00080000 0x00080000>;

			read-only;

		};

		partition@100000 {

			label = "data";

			reg = <0x00100000 0x03f00000>;

		};

	};

};

arch/arm/boot/dts/r8a7791.dtsi

+12 −0
Original line number Diff line number Diff line
@@ -710,4 +710,16 @@ 
			clock-output-names = "scifa3", "scifa4", "scifa5";

		};

	};



	spi: spi@e6b10000 {

		compatible = "renesas,qspi-r8a7791", "renesas,qspi";

		reg = <0 0xe6b10000 0 0x2c>;

		interrupt-parent = <&gic>;

		interrupts = <0 184 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp9_clks R8A7791_CLK_QSPI_MOD>;

		num-cs = <1>;

		#address-cells = <1>;

		#size-cells = <0>;

		status = "disabled";

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE