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

Commit 0d639e0a authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-dt3-for-v4.5' of... 

Merge tag 'renesas-dt3-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt

Third Round of Renesas ARM Based SoC DT Updates for v4.5

* Use SoC-specific usb-dmac and IPMMU compatibility strings
* Add internal delay for i2c IPs
* Add missing serial devices to r8a7793
* Enable DMA for r8a7793 serial devices
* Add serial port config to chosen/stdout-path
* Tidyup #sound-dai-cells settings for r8a7798/bockw
* Remove deprecated #gpio-range-cells from r8a7793
* Add EtherAVB support to r8a7791
* Add MSIOF support to sh73a0

* tag 'renesas-dt3-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

: (25 commits)
  ARM: shmobile: r8a779x: use SoC-specific usb-dmac compatibility strings
  ARM: shmobile: r8a7794: IPMMU compat string SoC part number update
  ARM: shmobile: r8a7793: IPMMU compat string SoC part number update
  ARM: shmobile: r8a7791: IPMMU compat string SoC part number update
  ARM: shmobile: r8a7790: IPMMU compat string SoC part number update
  ARM: shmobile: r8a7794: dtsi: add internal delay for i2c IPs
  ARM: shmobile: r8a7791: dtsi: add internal delay for i2c IPs
  ARM: shmobile: r8a7790: dtsi: add internal delay for i2c IPs
  ARM: shmobile: r8a7793: Describe DMA for the serial ports
  ARM: shmobile: r8a7793: Add missing serial devices to DT
  ARM: shmobile: lager dts: Add serial port config to chosen/stdout-path
  ARM: shmobile: porter dts: Add serial port config to chosen/stdout-path
  ARM: shmobile: silk dts: Add serial port config to chosen/stdout-path
  ARM: shmobile: gose dts: Add serial port config to chosen/stdout-path
  ARM: shmobile: bockw dts: Update console parameters
  ARM: shmobile: ape6evm dts: Add serial port config to chosen/stdout-path
  ARM: shmobile: alt dts: Add serial port config to chosen/stdout-path
  ARM: shmobile: koelsch dts: Add serial port config to chosen/stdout-path
  ARM: shmobile: r8a7778: tidyup #sound-dai-cells settings
  ARM: shmobile: bockw dts: Override #sound-dai-cells to zero
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 8eb1f10e d01c8bec

arch/arm/boot/dts/r8a73a4-ape6evm.dts

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 


	chosen {

		bootargs = "ignore_loglevel root=/dev/nfs ip=dhcp rw";

		stdout-path = &scifa0;

		stdout-path = "serial0:115200n8";

	};



	memory@40000000 {

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

+7 −2
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ 
	};



	chosen {

		bootargs = "console=ttySC0,115200 ignore_loglevel ip=dhcp root=/dev/nfs rw";

		stdout-path = &scif0;

		bootargs = "ignore_loglevel ip=dhcp root=/dev/nfs rw";

		stdout-path = "serial0:115200n8";

	};



	memory {
@@ -172,6 +172,11 @@ 
	};

};



&rcar_sound {

	/* Single DAI */

	#sound-dai-cells = <0>;

};



&sdhi0 {

	pinctrl-0 = <&sdhi0_pins>, <&sdhi0_pup_pins>;

	pinctrl-names = "default";

arch/arm/boot/dts/r8a7778.dtsi

+6 −1
Original line number Diff line number Diff line
@@ -236,7 +236,12 @@ 
	};



	rcar_sound: sound@ffd90000 {

		#sound-dai-cells = <1>;

		/*

		 * #sound-dai-cells is required

		 *

		 * Single DAI : #sound-dai-cells = <0>;         <&rcar_sound>;

		 * Multi  DAI : #sound-dai-cells = <1>;         <&rcar_sound N>;

		 */

		compatible = "renesas,rcar_sound-r8a7778", "renesas,rcar_sound-gen1";

		reg =	<0xffd90000 0x1000>,	/* SRU */

			<0xffd91000 0x240>,	/* SSI */

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

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 


	chosen {

		bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp";

		stdout-path = &scif0;

		stdout-path = "serial0:115200n8";

	};



	memory@40000000 {

arch/arm/boot/dts/r8a7790.dtsi

+12 −8
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ 
	};



	usb_dmac0: dma-controller@e65a0000 {

		compatible = "renesas,usb-dmac";

		compatible = "renesas,r8a7790-usb-dmac", "renesas,usb-dmac";

		reg = <0 0xe65a0000 0 0x100>;

		interrupts = <0 109 IRQ_TYPE_LEVEL_HIGH

			      0 109 IRQ_TYPE_LEVEL_HIGH>;
@@ -398,7 +398,7 @@ 
	};



	usb_dmac1: dma-controller@e65b0000 {

		compatible = "renesas,usb-dmac";

		compatible = "renesas,r8a7790-usb-dmac", "renesas,usb-dmac";

		reg = <0 0xe65b0000 0 0x100>;

		interrupts = <0 110 IRQ_TYPE_LEVEL_HIGH

			      0 110 IRQ_TYPE_LEVEL_HIGH>;
@@ -417,6 +417,7 @@ 
		interrupts = <0 287 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp9_clks R8A7790_CLK_I2C0>;

		power-domains = <&cpg_clocks>;

		i2c-scl-internal-delay-ns = <110>;

		status = "disabled";

	};
@@ -428,6 +429,7 @@ 
		interrupts = <0 288 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp9_clks R8A7790_CLK_I2C1>;

		power-domains = <&cpg_clocks>;

		i2c-scl-internal-delay-ns = <6>;

		status = "disabled";

	};
@@ -439,6 +441,7 @@ 
		interrupts = <0 286 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp9_clks R8A7790_CLK_I2C2>;

		power-domains = <&cpg_clocks>;

		i2c-scl-internal-delay-ns = <6>;

		status = "disabled";

	};
@@ -450,6 +453,7 @@ 
		interrupts = <0 290 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp9_clks R8A7790_CLK_I2C3>;

		power-domains = <&cpg_clocks>;

		i2c-scl-internal-delay-ns = <110>;

		status = "disabled";

	};
@@ -1766,7 +1770,7 @@ 
	};



	ipmmu_sy0: mmu@e6280000 {

		compatible = "renesas,ipmmu-vmsa";

		compatible = "renesas,ipmmu-r8a7790", "renesas,ipmmu-vmsa";

		reg = <0 0xe6280000 0 0x1000>;

		interrupts = <0 223 IRQ_TYPE_LEVEL_HIGH>,

			     <0 224 IRQ_TYPE_LEVEL_HIGH>;
@@ -1775,7 +1779,7 @@ 
	};



	ipmmu_sy1: mmu@e6290000 {

		compatible = "renesas,ipmmu-vmsa";

		compatible = "renesas,ipmmu-r8a7790", "renesas,ipmmu-vmsa";

		reg = <0 0xe6290000 0 0x1000>;

		interrupts = <0 225 IRQ_TYPE_LEVEL_HIGH>;

		#iommu-cells = <1>;
@@ -1783,7 +1787,7 @@ 
	};



	ipmmu_ds: mmu@e6740000 {

		compatible = "renesas,ipmmu-vmsa";

		compatible = "renesas,ipmmu-r8a7790", "renesas,ipmmu-vmsa";

		reg = <0 0xe6740000 0 0x1000>;

		interrupts = <0 198 IRQ_TYPE_LEVEL_HIGH>,

			     <0 199 IRQ_TYPE_LEVEL_HIGH>;
@@ -1792,7 +1796,7 @@ 
	};



	ipmmu_mp: mmu@ec680000 {

		compatible = "renesas,ipmmu-vmsa";

		compatible = "renesas,ipmmu-r8a7790", "renesas,ipmmu-vmsa";

		reg = <0 0xec680000 0 0x1000>;

		interrupts = <0 226 IRQ_TYPE_LEVEL_HIGH>;

		#iommu-cells = <1>;
@@ -1800,7 +1804,7 @@ 
	};



	ipmmu_mx: mmu@fe951000 {

		compatible = "renesas,ipmmu-vmsa";

		compatible = "renesas,ipmmu-r8a7790", "renesas,ipmmu-vmsa";

		reg = <0 0xfe951000 0 0x1000>;

		interrupts = <0 222 IRQ_TYPE_LEVEL_HIGH>,

			     <0 221 IRQ_TYPE_LEVEL_HIGH>;
@@ -1809,7 +1813,7 @@ 
	};



	ipmmu_rt: mmu@ffc80000 {

		compatible = "renesas,ipmmu-vmsa";

		compatible = "renesas,ipmmu-r8a7790", "renesas,ipmmu-vmsa";

		reg = <0 0xffc80000 0 0x1000>;

		interrupts = <0 307 IRQ_TYPE_LEVEL_HIGH>;

		#iommu-cells = <1>;