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

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

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

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

Merge "Renesas ARM Based SoC DT Updates for v4.2" from Simon Horman:

* Enable DMA for HSUSB on r8a7790 and r8a7791 SoCs
* Configure the HOME key as wake-up source on kzm9g board
* Use generic names for device nodes on SH Mobile SoCs and boards
* Add "nor-jedec" compatible value to SH Mobile boards
* Add IRQC clock to r8a73a4, r8a779* SoCs
* Remove MSIOF address from r8a7790 and r8a7791 SoCs

* tag 'renesas-dt-for-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (31 commits)
  ARM: shmobile: r8a7791: Enable DMA for HSUSB
  ARM: shmobile: r8a7791: add USB-DMAC device nodes
  ARM: shmobile: r8a7790: Enable DMA for HSUSB
  ARM: shmobile: r8a7790: add USB-DMAC device nodes
  ARM: shmobile: kzm9g dts: Configure the HOME key as wake-up source
  ARM: shmobile: koelsch dts: Use generic names for device nodes
  ARM: shmobile: lager dts: Use generic names for device nodes
  ARM: shmobile: bockw dts: Use generic names for device nodes
  ARM: shmobile: koelsch dts: Add "nor-jedec" compatible value
  ARM: shmobile: bockw dts: Add "nor-jedec" compatible value
  ARM: shmobile: lager dts: Add "nor-jedec" compatible value
  ARM: shmobile: bockw-reference dts: Add "nor-jedec" compatible value
  ARM: shmobile: henninger dts: Add "nor-jedec" compatible value
  ARM: shmobile: armadillo800eva dts: Use generic names for device nodes
  ARM: shmobile: marzen dts: Use generic names for device nodes
  ARM: shmobile: kzm9d dts: Use generic names for device nodes
  ARM: shmobile: ape6evm dts: Use generic names for device nodes
  ARM: shmobile: sh73a0 dtsi: Use generic names for device nodes
  ARM: shmobile: r8a7791 dtsi: Use generic names for device nodes
  ARM: shmobile: r8a7790 dtsi: Use generic names for device nodes
  ...
parents 144ed970 7706993e

Documentation/devicetree/bindings/spi/sh-msiof.txt

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ Example: 


	msiof0: spi@e6e20000 {

		compatible = "renesas,msiof-r8a7791";

		reg = <0 0xe6e20000 0 0x0064>, <0 0xe7e20000 0 0x0064>;

		reg = <0 0xe6e20000 0 0x0064>;

		interrupts = <0 156 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp0_clks R8A7791_CLK_MSIOF0>;

		dmas = <&dmac0 0x51>, <&dmac0 0x52>;

arch/arm/boot/dts/emev2-kzm9d.dts

+2 −2
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ 
		regulator-boot-on;

	};



	lan9220@20000000 {

	ethernet@20000000 {

		compatible = "smsc,lan9220", "smsc,lan9115";

		reg = <0x20000000 0x10000>;

		phy-mode = "mii";
@@ -96,7 +96,7 @@ 
};



&pfc {

	uart1_pins: uart@e1030000 {

	uart1_pins: serial@e1030000 {

		renesas,groups = "uart1_ctrl", "uart1_data";

		renesas,function = "uart1";

	};

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

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


&i2c5 {

	status = "okay";

	vdd_dvfs: max8973@1b {

	vdd_dvfs: regulator@1b {

		compatible = "maxim,max8973";

		reg = <0x1b>;

arch/arm/boot/dts/r8a73a4.dtsi

+7 −4
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ 
			     <0 29 IRQ_TYPE_LEVEL_HIGH>,

			     <0 30 IRQ_TYPE_LEVEL_HIGH>,

			     <0 31 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp4_clks R8A73A4_CLK_IRQC>;

		power-domains = <&pd_c4>;

	};
@@ -197,6 +198,7 @@ 
			     <0 55 IRQ_TYPE_LEVEL_HIGH>,

			     <0 56 IRQ_TYPE_LEVEL_HIGH>,

			     <0 57 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp4_clks R8A73A4_CLK_IRQC>;

		power-domains = <&pd_c4>;

	};
@@ -724,15 +726,16 @@ 
		mstp4_clks: mstp4_clks@e6150140 {

			compatible = "renesas,r8a73a4-mstp-clocks", "renesas,cpg-mstp-clocks";

			reg = <0 0xe6150140 0 4>, <0 0xe615004c 0 4>;

			clocks = <&main_div2_clk>, <&cpg_clocks R8A73A4_CLK_HP>,

			clocks = <&main_div2_clk>, <&main_div2_clk>,

				 <&cpg_clocks R8A73A4_CLK_HP>,

				 <&cpg_clocks R8A73A4_CLK_HP>;

			#clock-cells = <1>;

			clock-indices = <

				R8A73A4_CLK_IIC5 R8A73A4_CLK_IIC4

				R8A73A4_CLK_IIC3

				R8A73A4_CLK_IRQC R8A73A4_CLK_IIC5

				R8A73A4_CLK_IIC4 R8A73A4_CLK_IIC3

			>;

			clock-output-names =

				"iic5", "iic4", "iic3";

				"irqc", "iic5", "iic4", "iic3";

		};

		mstp5_clks: mstp5_clks@e6150144 {

			compatible = "renesas,r8a73a4-mstp-clocks", "renesas,cpg-mstp-clocks";

arch/arm/boot/dts/r8a7740-armadillo800eva.dts

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ 
		gpios = <&pfc 166 GPIO_ACTIVE_LOW>;

	};



	wm8978: wm8978@1a {

	wm8978: codec@1a {

		#sound-dai-cells = <0>;

		compatible = "wlf,wm8978";

		reg = <0x1a>;