Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff28ea63 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-dt2-for-v4.2' of... 

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

* Describe DMA for the serial ports of R-Car Gen2 SoCs
* Add MMCIF max-frequency to R-Car Gen2 SoCs
* Use "nor-jedec" instead of "jedec,spi-nor"

* tag 'renesas-dt2-for-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a7790 dtsi: Describe DMA for the serial ports
  ARM: shmobile: r8a7791 dtsi: Describe DMA for the serial ports
  ARM: shmobile: r8a7794 dtsi: Describe DMA for the serial ports
  ARM: shmobile: r8a7791: add MMCIF max-frequency
  ARM: shmobile: r8a7790: add MMCIF max-frequency
  ARM: shmobile: bockw dts: Replace "nor-jedec" by "jedec,spi-nor"
  ARM: shmobile: henninger dts: Replace "nor-jedec" by "jedec,spi-nor"
  ARM: shmobile: bockw-reference dts: Replace "nor-jedec" by "jedec,spi-nor"
  ARM: shmobile: koelsch dts: Replace "nor-jedec" by "jedec,spi-nor"
  ARM: shmobile: lager dts: Replace "nor-jedec" by "jedec,spi-nor"
parents 047d378a acea43fc

arch/arm/boot/dts/r8a7778-bockw-reference.dts

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ 
	flash: flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "spansion,s25fl008k", "nor-jedec";

		compatible = "spansion,s25fl008k", "jedec,spi-nor";

		reg = <0>;

		spi-max-frequency = <104000000>;

		m25p,fast-read;

arch/arm/boot/dts/r8a7778-bockw.dts

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ 
	flash: flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "spansion,s25fl008k", "nor-jedec";

		compatible = "spansion,s25fl008k", "jedec,spi-nor";

		reg = <0>;

		spi-max-frequency = <104000000>;

		m25p,fast-read;

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

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ 
	flash: flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "spansion,s25fl512s", "nor-jedec";

		compatible = "spansion,s25fl512s", "jedec,spi-nor";

		reg = <0>;

		spi-max-frequency = <30000000>;

		spi-tx-bus-width = <4>;

arch/arm/boot/dts/r8a7790.dtsi

+22 −0
Original line number Diff line number Diff line
@@ -490,6 +490,7 @@ 
		dma-names = "tx", "rx";

		reg-io-width = <4>;

		status = "disabled";

		max-frequency = <97500000>;

	};



	mmcif1: mmc@ee220000 {
@@ -501,6 +502,7 @@ 
		dma-names = "tx", "rx";

		reg-io-width = <4>;

		status = "disabled";

		max-frequency = <97500000>;

	};



	pfc: pfc@e6060000 {
@@ -554,6 +556,8 @@ 
		interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp2_clks R8A7790_CLK_SCIFA0>;

		clock-names = "sci_ick";

		dmas = <&dmac0 0x21>, <&dmac0 0x22>;

		dma-names = "tx", "rx";

		status = "disabled";

	};
@@ -563,6 +567,8 @@ 
		interrupts = <0 145 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp2_clks R8A7790_CLK_SCIFA1>;

		clock-names = "sci_ick";

		dmas = <&dmac0 0x25>, <&dmac0 0x26>;

		dma-names = "tx", "rx";

		status = "disabled";

	};
@@ -572,6 +578,8 @@ 
		interrupts = <0 151 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp2_clks R8A7790_CLK_SCIFA2>;

		clock-names = "sci_ick";

		dmas = <&dmac0 0x27>, <&dmac0 0x28>;

		dma-names = "tx", "rx";

		status = "disabled";

	};
@@ -581,6 +589,8 @@ 
		interrupts = <0 148 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp2_clks R8A7790_CLK_SCIFB0>;

		clock-names = "sci_ick";

		dmas = <&dmac0 0x3d>, <&dmac0 0x3e>;

		dma-names = "tx", "rx";

		status = "disabled";

	};
@@ -590,6 +600,8 @@ 
		interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp2_clks R8A7790_CLK_SCIFB1>;

		clock-names = "sci_ick";

		dmas = <&dmac0 0x19>, <&dmac0 0x1a>;

		dma-names = "tx", "rx";

		status = "disabled";

	};
@@ -599,6 +611,8 @@ 
		interrupts = <0 150 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp2_clks R8A7790_CLK_SCIFB2>;

		clock-names = "sci_ick";

		dmas = <&dmac0 0x1d>, <&dmac0 0x1e>;

		dma-names = "tx", "rx";

		status = "disabled";

	};
@@ -608,6 +622,8 @@ 
		interrupts = <0 152 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp7_clks R8A7790_CLK_SCIF0>;

		clock-names = "sci_ick";

		dmas = <&dmac0 0x29>, <&dmac0 0x2a>;

		dma-names = "tx", "rx";

		status = "disabled";

	};
@@ -617,6 +633,8 @@ 
		interrupts = <0 153 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp7_clks R8A7790_CLK_SCIF1>;

		clock-names = "sci_ick";

		dmas = <&dmac0 0x2d>, <&dmac0 0x2e>;

		dma-names = "tx", "rx";

		status = "disabled";

	};
@@ -626,6 +644,8 @@ 
		interrupts = <0 154 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp7_clks R8A7790_CLK_HSCIF0>;

		clock-names = "sci_ick";

		dmas = <&dmac0 0x39>, <&dmac0 0x3a>;

		dma-names = "tx", "rx";

		status = "disabled";

	};
@@ -635,6 +655,8 @@ 
		interrupts = <0 155 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp7_clks R8A7790_CLK_HSCIF1>;

		clock-names = "sci_ick";

		dmas = <&dmac0 0x4d>, <&dmac0 0x4e>;

		dma-names = "tx", "rx";

		status = "disabled";

	};

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

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ 
	flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "spansion,s25fl512s", "nor-jedec";

		compatible = "spansion,s25fl512s", "jedec,spi-nor";

		reg = <0>;

		spi-max-frequency = <30000000>;

		spi-tx-bus-width = <4>;