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

Commit 21fadea9 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

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

* Add missing CPG/MSTP Clock Domain for sound on r8a779[01] SoCs
* Tidy up SCI resource region on r8a779[018] SoCs
* Add pinmux for iic0 on Lager board
* Use CCF for audio clock on Lager and Koelsch boards
* Use serial0 and 1 as serial ports on Marzen board
* Use adxl345-specific compatible property for KZM9G board
* Document compat string for Silk board
* Enable GPIO, I2C, PCI, QSPI, USB PHY and HS, and VIN support on r8a7794/Silk
* Add initial support for r8a7791/porter
* Add common file for AA121TD01 panel

* tag 'renesas-dt-for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (28 commits)
  ARM: shmobile: porter: add Ether DT support
  ARM: shmobile: fix SILK board name
  ARM: shmobile: r8a7794: add HS-USB DT support
  ARM: shmobile: dts: Add common file for AA121TD01 panel
  ARM: shmobile: r8a7794: link PCI USB devices to USB PHY
  ARM: shmobile: silk: enable USB PHY
  ARM: shmobile: r8a7794: add USB PHY DT support
  ARM: shmobile: porter: initial device tree
  ARM: shmobile: add Porter board DT bindings
  ARM: shmobile: silk: enable internal PCI
  ARM: shmobile: r8a7794: add internal PCI bridge nodes
  ARM: shmobile: r8a7790: lager: add pinmux for iic0
  ARM: shmobile: r8a7778: tidyup SSI resource region
  ARM: shmobile: r8a7791: tidyup SSI resource region
  ARM: shmobile: r8a7790: tidyup SSI resource region
  ARM: shmobile: lager: use CCF for audio clock
  ARM: shmobile: koelsch: use CCF for audio clock
  ARM: shmobile: silk: add VIN0/ADV7180 DT support
  ARM: shmobile: r8a7794: add VIN DT support
  ARM: shmobile: silk: add I2C1 DT support
  ...
parents 9dd289a4 0877098d

Documentation/devicetree/bindings/arm/shmobile.txt

+4 −0
Original line number Diff line number Diff line
@@ -55,3 +55,7 @@ Boards: 
    compatible = "renesas,lager", "renesas,r8a7790"

  - Marzen

    compatible = "renesas,marzen", "renesas,r8a7779"

  - Porter (M2-LCDP)

    compatible = "renesas,porter", "renesas,r8a7791"

  - SILK (RTP0RC7794LCB00011S)

    compatible = "renesas,silk", "renesas,r8a7794"

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -532,6 +532,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \ 
	r8a7790-lager.dtb \

	r8a7791-henninger.dtb \

	r8a7791-koelsch.dtb \

	r8a7791-porter.dtb \

	r8a7793-gose.dtb \

	r8a7794-alt.dtb \

	r8a7794-silk.dtb \

arch/arm/boot/dts/r8a7778.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ 
		#sound-dai-cells = <1>;

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

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

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

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

			<0xfffe0000 0x24>;	/* ADG */

		clocks = <&mstp3_clks R8A7778_CLK_SSI8>,

			<&mstp3_clks R8A7778_CLK_SSI7>,

arch/arm/boot/dts/r8a7779-marzen.dts

+3 −3
Original line number Diff line number Diff line
@@ -19,12 +19,12 @@ 
	compatible = "renesas,marzen", "renesas,r8a7779";



	aliases {

		serial2 = &scif2;

		serial4 = &scif4;

		serial0 = &scif2;

		serial1 = &scif4;

	};



	chosen {

		bootargs = "console=ttySC2,115200 ignore_loglevel root=/dev/nfs ip=on";

		bootargs = "ignore_loglevel root=/dev/nfs ip=on";

		stdout-path = &scif2;

	};

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

+15 −1
Original line number Diff line number Diff line
@@ -174,6 +174,13 @@ 
			  1800000 0>;

	};



	audio_clock: clock {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		clock-frequency = <11289600>;

		clock-output-names = "audio_clock";

	};



	rsnd_ak4643: sound {

		compatible = "simple-audio-card";
@@ -187,7 +194,7 @@ 


		sndcodec: simple-audio-card,codec {

			sound-dai = <&ak4643>;

			system-clock-frequency = <11289600>;

			clocks = <&audio_clock>;

		};

	};
@@ -335,6 +342,11 @@ 
		renesas,function = "msiof1";

	};



	iic0_pins: iic0 {

		renesas,groups = "iic0";

		renesas,function = "iic0";

	};



	iic1_pins: iic1 {

		renesas,groups = "iic1";

		renesas,function = "iic1";
@@ -510,6 +522,8 @@ 


&iic0	{

	status = "okay";

	pinctrl-0 = <&iic0_pins>;

	pinctrl-names = "default";

};



&iic1	{