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

Commit 5ba3c24c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Pull "Second Round of Renesas ARM Based SoC DT Updates for v3.19" from Simon Horman:

* Add labels for LEDs on kzm9g-reference and koelsch
* Add Sound support to r8a7790/lager and r8a7791/koelsch
* Add IIC DMA nodes to r8a7790 and r8a7791
* Use SoC-specific IIC compatible properties on sh73a0 and r8a73a4
* Add SGX, MMP and VSP1 clocks to r8a7794
* Add USBDMAC{0,1} clocks to r8a7790 and r8a7791

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

: (29 commits)
  ARM: shmobile: r8a7791: add USBDMAC{0,1} clocks to device tree
  ARM: shmobile: r8a7790: add USBDMAC{0,1} clocks to device tree
  ARM: shmobile: r8a7794: Add MMP and VSP1 clocks to device tree
  ARM: shmobile: r8a7794: Add SGX clock to device tree
  ARM: shmobile: koelsch: add Volume Ramp usage on comment
  ARM: shmobile: lager: add Volume Ramp usage on comment
  ARM: shmobile: r8a7791: add DMA nodes for IIC
  ARM: shmobile: r8a7790: add DMA nodes for IIC
  ARM: shmobile: kzm9g-reference dts: Add labels for the LEDs
  ARM: shmobile: koelsch dts: Add labels for the LEDs
  ARM: shmobile: sh73a0 dtsi: Add SoC-specific IIC compatible properties
  ARM: shmobile: r8a73a4 dtsi: Add SoC-specific IIC compatible properties
  ARM: shmobile: koelsch: Sound DMA support via DVC on DTS
  ARM: shmobile: koelsch: Sound DMA support via SRC on DTS
  ARM: shmobile: koelsch: Sound DMA support via BUSIF on DTS
  ARM: shmobile: koelsch: Sound DMA support on DTS
  ARM: shmobile: koelsch: Sound PIO support on DTS
  ARM: shmobile: koelsch: fixup I2C2 clock frequency
  ARM: shmobile: lager: Sound DMA support via DVC on DTS
  ARM: shmobile: lager: Sound DMA support via SRC on DTS
  ...

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 1bc7f27d b9473d9f

arch/arm/boot/dts/r8a73a4.dtsi

+9 −9
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ 
	i2c5: i2c@e60b0000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "renesas,rmobile-iic";

		compatible = "renesas,iic-r8a73a4", "renesas,rmobile-iic";

		reg = <0 0xe60b0000 0 0x428>;

		interrupts = <0 179 IRQ_TYPE_LEVEL_HIGH>;
@@ -205,7 +205,7 @@ 
	i2c0: i2c@e6500000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "renesas,rmobile-iic";

		compatible = "renesas,iic-r8a73a4", "renesas,rmobile-iic";

		reg = <0 0xe6500000 0 0x428>;

		interrupts = <0 174 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";
@@ -214,7 +214,7 @@ 
	i2c1: i2c@e6510000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "renesas,rmobile-iic";

		compatible = "renesas,iic-r8a73a4", "renesas,rmobile-iic";

		reg = <0 0xe6510000 0 0x428>;

		interrupts = <0 175 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";
@@ -223,7 +223,7 @@ 
	i2c2: i2c@e6520000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "renesas,rmobile-iic";

		compatible = "renesas,iic-r8a73a4", "renesas,rmobile-iic";

		reg = <0 0xe6520000 0 0x428>;

		interrupts = <0 176 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";
@@ -232,7 +232,7 @@ 
	i2c3: i2c@e6530000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "renesas,rmobile-iic";

		compatible = "renesas,iic-r8a73a4", "renesas,rmobile-iic";

		reg = <0 0xe6530000 0 0x428>;

		interrupts = <0 177 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";
@@ -241,7 +241,7 @@ 
	i2c4: i2c@e6540000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "renesas,rmobile-iic";

		compatible = "renesas,iic-r8a73a4", "renesas,rmobile-iic";

		reg = <0 0xe6540000 0 0x428>;

		interrupts = <0 178 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";
@@ -250,7 +250,7 @@ 
	i2c6: i2c@e6550000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "renesas,rmobile-iic";

		compatible = "renesas,iic-r8a73a4", "renesas,rmobile-iic";

		reg = <0 0xe6550000 0 0x428>;

		interrupts = <0 184 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";
@@ -259,7 +259,7 @@ 
	i2c7: i2c@e6560000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "renesas,rmobile-iic";

		compatible = "renesas,iic-r8a73a4", "renesas,rmobile-iic";

		reg = <0 0xe6560000 0 0x428>;

		interrupts = <0 185 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";
@@ -268,7 +268,7 @@ 
	i2c8: i2c@e6570000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "renesas,rmobile-iic";

		compatible = "renesas,iic-r8a73a4", "renesas,rmobile-iic";

		reg = <0 0xe6570000 0 0x428>;

		interrupts = <0 173 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

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

+83 −0
Original line number Diff line number Diff line
@@ -9,6 +9,34 @@ 
 * kind, whether express or implied.

 */



/*

 * SSI-AK4643

 *

 * SW1: 1: AK4643

 *      2: CN22

 *      3: ADV7511

 *

 * This command is required when Playback/Capture

 *

 *	amixer set "LINEOUT Mixer DACL" on

 *	amixer set "DVC Out" 100%

 *	amixer set "DVC In" 100%

 *

 * You can use Mute

 *

 *	amixer set "DVC Out Mute" on

 *	amixer set "DVC In Mute" on

 *

 * You can use Volume Ramp

 *

 *	amixer set "DVC Out Ramp Up Rate"   "0.125 dB/64 steps"

 *	amixer set "DVC Out Ramp Down Rate" "0.125 dB/512 steps"

 *	amixer set "DVC Out Ramp" on

 *	aplay xxx.wav &

 *	amixer set "DVC Out"  80%  // Volume Down

 *	amixer set "DVC Out" 100%  // Volume Up

 */



/dts-v1/;

#include "r8a7790.dtsi"

#include <dt-bindings/gpio/gpio.h>
@@ -146,6 +174,23 @@ 
			  1800000 0>;

	};



	sound {

		compatible = "simple-audio-card";



		simple-audio-card,format = "left_j";

		simple-audio-card,bitclock-master = <&sndcodec>;

		simple-audio-card,frame-master = <&sndcodec>;



		sndcpu: simple-audio-card,cpu {

			sound-dai = <&rcar_sound>;

		};



		sndcodec: simple-audio-card,codec {

			sound-dai = <&ak4643>;

			system-clock-frequency = <11289600>;

		};

	};



	vga-encoder {

		compatible = "adi,adv7123";
@@ -292,6 +337,16 @@ 
		renesas,groups = "vin1_data8", "vin1_clk";

		renesas,function = "vin1";

	};



	sound_pins: sound {

		renesas,groups = "ssi0129_ctrl", "ssi0_data", "ssi1_data";

		renesas,function = "ssi";

	};



	sound_clk_pins: sound_clk {

		renesas,groups = "audio_clk_a";

		renesas,function = "audio_clk";

	};

};



&ether {
@@ -429,6 +484,14 @@ 
	pinctrl-0 = <&iic2_pins>;

	pinctrl-names = "default";



	clock-frequency = <100000>;



	ak4643: sound-codec@12 {

		compatible = "asahi-kasei,ak4643";

		#sound-dai-cells = <0>;

		reg = <0x12>;

	};



	composite-in@20 {

		compatible = "adi,adv7180";

		reg = <0x20>;
@@ -511,3 +574,23 @@ 
		};

	};

};



&rcar_sound {

	pinctrl-0 = <&sound_pins &sound_clk_pins>;

	pinctrl-names = "default";



	#sound-dai-cells = <0>;



	status = "okay";



	rcar_sound,dai {

		dai0 {

			playback = <&ssi0 &src2 &dvc0>;

			capture  = <&ssi1 &src3 &dvc1>;

		};

	};

};



&ssi1 {

	shared-pin;

};

arch/arm/boot/dts/r8a7790.dtsi

+81 −5
Original line number Diff line number Diff line
@@ -312,6 +312,70 @@ 
		#dma-cells = <1>;

		dma-channels = <15>;

	};



	audma0: dma-controller@ec700000 {

		compatible = "renesas,rcar-dmac";

		reg = <0 0xec700000 0 0x10000>;

		interrupts =	<0 346 IRQ_TYPE_LEVEL_HIGH

				 0 320 IRQ_TYPE_LEVEL_HIGH

				 0 321 IRQ_TYPE_LEVEL_HIGH

				 0 322 IRQ_TYPE_LEVEL_HIGH

				 0 323 IRQ_TYPE_LEVEL_HIGH

				 0 324 IRQ_TYPE_LEVEL_HIGH

				 0 325 IRQ_TYPE_LEVEL_HIGH

				 0 326 IRQ_TYPE_LEVEL_HIGH

				 0 327 IRQ_TYPE_LEVEL_HIGH

				 0 328 IRQ_TYPE_LEVEL_HIGH

				 0 329 IRQ_TYPE_LEVEL_HIGH

				 0 330 IRQ_TYPE_LEVEL_HIGH

				 0 331 IRQ_TYPE_LEVEL_HIGH

				 0 332 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "error",

				"ch0", "ch1", "ch2", "ch3",

				"ch4", "ch5", "ch6", "ch7",

				"ch8", "ch9", "ch10", "ch11",

				"ch12";

		clocks = <&mstp5_clks R8A7790_CLK_AUDIO_DMAC0>;

		clock-names = "fck";

		#dma-cells = <1>;

		dma-channels = <13>;

	};



	audma1: dma-controller@ec720000 {

		compatible = "renesas,rcar-dmac";

		reg = <0 0xec720000 0 0x10000>;

		interrupts =	<0 347 IRQ_TYPE_LEVEL_HIGH

				 0 333 IRQ_TYPE_LEVEL_HIGH

				 0 334 IRQ_TYPE_LEVEL_HIGH

				 0 335 IRQ_TYPE_LEVEL_HIGH

				 0 336 IRQ_TYPE_LEVEL_HIGH

				 0 337 IRQ_TYPE_LEVEL_HIGH

				 0 338 IRQ_TYPE_LEVEL_HIGH

				 0 339 IRQ_TYPE_LEVEL_HIGH

				 0 340 IRQ_TYPE_LEVEL_HIGH

				 0 341 IRQ_TYPE_LEVEL_HIGH

				 0 342 IRQ_TYPE_LEVEL_HIGH

				 0 343 IRQ_TYPE_LEVEL_HIGH

				 0 344 IRQ_TYPE_LEVEL_HIGH

				 0 345 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "error",

				"ch0", "ch1", "ch2", "ch3",

				"ch4", "ch5", "ch6", "ch7",

				"ch8", "ch9", "ch10", "ch11",

				"ch12";

		clocks = <&mstp5_clks R8A7790_CLK_AUDIO_DMAC1>;

		clock-names = "fck";

		#dma-cells = <1>;

		dma-channels = <13>;

	};



	audmapp: dma-controller@ec740000 {

		compatible = "renesas,rcar-audmapp";

		#dma-cells = <1>;



		reg = <0 0xec740000 0 0x200>;

	};



	i2c0: i2c@e6508000 {

		#address-cells = <1>;

		#size-cells = <0>;
@@ -359,6 +423,8 @@ 
		reg = <0 0xe6500000 0 0x425>;

		interrupts = <0 174 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp3_clks R8A7790_CLK_IIC0>;

		dmas = <&dmac0 0x61>, <&dmac0 0x62>;

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

		status = "disabled";

	};
@@ -369,6 +435,8 @@ 
		reg = <0 0xe6510000 0 0x425>;

		interrupts = <0 175 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp3_clks R8A7790_CLK_IIC1>;

		dmas = <&dmac0 0x65>, <&dmac0 0x66>;

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

		status = "disabled";

	};
@@ -379,6 +447,8 @@ 
		reg = <0 0xe6520000 0 0x425>;

		interrupts = <0 176 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp3_clks R8A7790_CLK_IIC2>;

		dmas = <&dmac0 0x69>, <&dmac0 0x6a>;

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

		status = "disabled";

	};
@@ -389,6 +459,8 @@ 
		reg = <0 0xe60b0000 0 0x425>;

		interrupts = <0 173 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp9_clks R8A7790_CLK_IICDVFS>;

		dmas = <&dmac0 0x77>, <&dmac0 0x78>;

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

		status = "disabled";

	};
@@ -1031,25 +1103,29 @@ 
			reg = <0 0xe615013c 0 4>, <0 0xe6150048 0 4>;

			clocks = <&hp_clk>, <&cp_clk>, <&mmc1_clk>, <&sd3_clk>,

				 <&sd2_clk>, <&cpg_clocks R8A7790_CLK_SD1>, <&cpg_clocks R8A7790_CLK_SD0>, <&mmc0_clk>,

				 <&hp_clk>, <&mp_clk>, <&hp_clk>, <&mp_clk>, <&rclk_clk>;

				 <&hp_clk>, <&mp_clk>, <&hp_clk>, <&mp_clk>, <&rclk_clk>,

				 <&hp_clk>, <&hp_clk>;

			#clock-cells = <1>;

			renesas,clock-indices = <

				R8A7790_CLK_IIC2 R8A7790_CLK_TPU0 R8A7790_CLK_MMCIF1 R8A7790_CLK_SDHI3

				R8A7790_CLK_SDHI2 R8A7790_CLK_SDHI1 R8A7790_CLK_SDHI0 R8A7790_CLK_MMCIF0

				R8A7790_CLK_IIC0 R8A7790_CLK_PCIEC R8A7790_CLK_IIC1 R8A7790_CLK_SSUSB R8A7790_CLK_CMT1

				R8A7790_CLK_USBDMAC0 R8A7790_CLK_USBDMAC1

			>;

			clock-output-names =

				"iic2", "tpu0", "mmcif1", "sdhi3",

				"sdhi2", "sdhi1", "sdhi0", "mmcif0",

				"iic0", "pciec", "iic1", "ssusb", "cmt1";

				"iic0", "pciec", "iic1", "ssusb", "cmt1",

				"usbdmac0", "usbdmac1";

		};

		mstp5_clks: mstp5_clks@e6150144 {

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

			reg = <0 0xe6150144 0 4>, <0 0xe615003c 0 4>;

			clocks = <&extal_clk>, <&p_clk>;

			clocks = <&hp_clk>, <&hp_clk>, <&extal_clk>, <&p_clk>;

			#clock-cells = <1>;

			renesas,clock-indices = <R8A7790_CLK_THERMAL R8A7790_CLK_PWM>;

			clock-output-names = "thermal", "pwm";

			renesas,clock-indices = <R8A7790_CLK_AUDIO_DMAC0 R8A7790_CLK_AUDIO_DMAC1

						 R8A7790_CLK_THERMAL R8A7790_CLK_PWM>;

			clock-output-names = "audmac0", "audmac1", "thermal", "pwm";

		};

		mstp7_clks: mstp7_clks@e615014c {

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

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

+85 −1
Original line number Diff line number Diff line
@@ -10,6 +10,34 @@ 
 * kind, whether express or implied.

 */



/*

 * SSI-AK4643

 *

 * SW1: 1: AK4643

 *      2: CN22

 *      3: ADV7511

 *

 * This command is required when Playback/Capture

 *

 *	amixer set "LINEOUT Mixer DACL" on

 *	amixer set "DVC Out" 100%

 *	amixer set "DVC In" 100%

 *

 * You can use Mute

 *

 *	amixer set "DVC Out Mute" on

 *	amixer set "DVC In Mute" on

 *

 * You can use Volume Ramp

 *

 *	amixer set "DVC Out Ramp Up Rate"   "0.125 dB/64 steps"

 *	amixer set "DVC Out Ramp Down Rate" "0.125 dB/512 steps"

 *	amixer set "DVC Out Ramp" on

 *	aplay xxx.wav &

 *	amixer set "DVC Out"  80%  // Volume Down

 *	amixer set "DVC Out" 100%  // Volume Up

 */



/dts-v1/;

#include "r8a7791.dtsi"

#include <dt-bindings/gpio/gpio.h>
@@ -130,12 +158,15 @@ 
		compatible = "gpio-leds";

		led6 {

			gpios = <&gpio2 19 GPIO_ACTIVE_HIGH>;

			label = "LED6";

		};

		led7 {

			gpios = <&gpio2 20 GPIO_ACTIVE_HIGH>;

			label = "LED7";

		};

		led8 {

			gpios = <&gpio2 21 GPIO_ACTIVE_HIGH>;

			label = "LED8";

		};

	};
@@ -210,6 +241,23 @@ 
		states = <3300000 1

			  1800000 0>;

	};



	sound {

		compatible = "simple-audio-card";



		simple-audio-card,format = "left_j";

		simple-audio-card,bitclock-master = <&sndcodec>;

		simple-audio-card,frame-master = <&sndcodec>;



		sndcpu: simple-audio-card,cpu {

			sound-dai = <&rcar_sound>;

		};



		sndcodec: simple-audio-card,codec {

			sound-dai = <&ak4643>;

			system-clock-frequency = <11289600>;

		};

	};

};



&du {
@@ -300,6 +348,16 @@ 
		renesas,groups = "vin1_data8", "vin1_clk";

		renesas,function = "vin1";

	};



	sound_pins: sound {

		renesas,groups = "ssi0129_ctrl", "ssi0_data", "ssi1_data";

		renesas,function = "ssi";

	};



	sound_clk_pins: sound_clk {

		renesas,groups = "audio_clk_a";

		renesas,function = "audio_clk";

	};

};



&ether {
@@ -425,7 +483,13 @@ 
	pinctrl-names = "default";



	status = "okay";

	clock-frequency = <400000>;

	clock-frequency = <100000>;



	ak4643: sound-codec@12 {

		compatible = "asahi-kasei,ak4643";

		#sound-dai-cells = <0>;

		reg = <0x12>;

	};



	composite-in@20 {

		compatible = "adi,adv7180";
@@ -513,3 +577,23 @@ 
		};

	};

};



&rcar_sound {

	pinctrl-0 = <&sound_pins &sound_clk_pins>;

	pinctrl-names = "default";



	#sound-dai-cells = <0>;



	status = "okay";



	rcar_sound,dai {

		dai0 {

			playback = <&ssi0 &src2 &dvc0>;

			capture  = <&ssi1 &src3 &dvc1>;

		};

	};

};



&ssi1 {

	shared-pin;

};

arch/arm/boot/dts/r8a7791.dtsi

+78 −5
Original line number Diff line number Diff line
@@ -301,6 +301,69 @@ 
		dma-channels = <15>;

	};



	audma0: dma-controller@ec700000 {

		compatible = "renesas,rcar-dmac";

		reg = <0 0xec700000 0 0x10000>;

		interrupts =	<0 346 IRQ_TYPE_LEVEL_HIGH

				 0 320 IRQ_TYPE_LEVEL_HIGH

				 0 321 IRQ_TYPE_LEVEL_HIGH

				 0 322 IRQ_TYPE_LEVEL_HIGH

				 0 323 IRQ_TYPE_LEVEL_HIGH

				 0 324 IRQ_TYPE_LEVEL_HIGH

				 0 325 IRQ_TYPE_LEVEL_HIGH

				 0 326 IRQ_TYPE_LEVEL_HIGH

				 0 327 IRQ_TYPE_LEVEL_HIGH

				 0 328 IRQ_TYPE_LEVEL_HIGH

				 0 329 IRQ_TYPE_LEVEL_HIGH

				 0 330 IRQ_TYPE_LEVEL_HIGH

				 0 331 IRQ_TYPE_LEVEL_HIGH

				 0 332 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "error",

				"ch0", "ch1", "ch2", "ch3",

				"ch4", "ch5", "ch6", "ch7",

				"ch8", "ch9", "ch10", "ch11",

				"ch12";

		clocks = <&mstp5_clks R8A7791_CLK_AUDIO_DMAC0>;

		clock-names = "fck";

		#dma-cells = <1>;

		dma-channels = <13>;

	};



	audma1: dma-controller@ec720000 {

		compatible = "renesas,rcar-dmac";

		reg = <0 0xec720000 0 0x10000>;

		interrupts =	<0 347 IRQ_TYPE_LEVEL_HIGH

				 0 333 IRQ_TYPE_LEVEL_HIGH

				 0 334 IRQ_TYPE_LEVEL_HIGH

				 0 335 IRQ_TYPE_LEVEL_HIGH

				 0 336 IRQ_TYPE_LEVEL_HIGH

				 0 337 IRQ_TYPE_LEVEL_HIGH

				 0 338 IRQ_TYPE_LEVEL_HIGH

				 0 339 IRQ_TYPE_LEVEL_HIGH

				 0 340 IRQ_TYPE_LEVEL_HIGH

				 0 341 IRQ_TYPE_LEVEL_HIGH

				 0 342 IRQ_TYPE_LEVEL_HIGH

				 0 343 IRQ_TYPE_LEVEL_HIGH

				 0 344 IRQ_TYPE_LEVEL_HIGH

				 0 345 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "error",

				"ch0", "ch1", "ch2", "ch3",

				"ch4", "ch5", "ch6", "ch7",

				"ch8", "ch9", "ch10", "ch11",

				"ch12";

		clocks = <&mstp5_clks R8A7791_CLK_AUDIO_DMAC1>;

		clock-names = "fck";

		#dma-cells = <1>;

		dma-channels = <13>;

	};



	audmapp: dma-controller@ec740000 {

		compatible = "renesas,rcar-audmapp";

		#dma-cells = <1>;



		reg = <0 0xec740000 0 0x200>;

	};



	/* The memory map in the User's Manual maps the cores to bus numbers */

	i2c0: i2c@e6508000 {

		#address-cells = <1>;
@@ -371,6 +434,8 @@ 
		reg = <0 0xe60b0000 0 0x425>;

		interrupts = <0 173 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp9_clks R8A7791_CLK_IICDVFS>;

		dmas = <&dmac0 0x77>, <&dmac0 0x78>;

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

		status = "disabled";

	};
@@ -381,6 +446,8 @@ 
		reg = <0 0xe6500000 0 0x425>;

		interrupts = <0 174 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp3_clks R8A7791_CLK_IIC0>;

		dmas = <&dmac0 0x61>, <&dmac0 0x62>;

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

		status = "disabled";

	};
@@ -391,6 +458,8 @@ 
		reg = <0 0xe6510000 0 0x425>;

		interrupts = <0 175 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp3_clks R8A7791_CLK_IIC1>;

		dmas = <&dmac0 0x65>, <&dmac0 0x66>;

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

		status = "disabled";

	};
@@ -1039,24 +1108,28 @@ 
			compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks";

			reg = <0 0xe615013c 0 4>, <0 0xe6150048 0 4>;

			clocks = <&cp_clk>, <&sd2_clk>, <&sd1_clk>, <&cpg_clocks R8A7791_CLK_SD0>,

				 <&mmc0_clk>, <&hp_clk>, <&mp_clk>, <&hp_clk>, <&mp_clk>, <&rclk_clk>;

				 <&mmc0_clk>, <&hp_clk>, <&mp_clk>, <&hp_clk>, <&mp_clk>, <&rclk_clk>,

				 <&hp_clk>, <&hp_clk>;

			#clock-cells = <1>;

			renesas,clock-indices = <

				R8A7791_CLK_TPU0 R8A7791_CLK_SDHI2 R8A7791_CLK_SDHI1 R8A7791_CLK_SDHI0

				R8A7791_CLK_MMCIF0 R8A7791_CLK_IIC0 R8A7791_CLK_PCIEC R8A7791_CLK_IIC1

				R8A7791_CLK_SSUSB R8A7791_CLK_CMT1

				R8A7791_CLK_USBDMAC0 R8A7791_CLK_USBDMAC1

			>;

			clock-output-names =

				"tpu0", "sdhi2", "sdhi1", "sdhi0",

				"mmcif0", "i2c7", "pciec", "i2c8", "ssusb", "cmt1";

				"mmcif0", "i2c7", "pciec", "i2c8", "ssusb", "cmt1",

				"usbdmac0", "usbdmac1";

		};

		mstp5_clks: mstp5_clks@e6150144 {

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

			reg = <0 0xe6150144 0 4>, <0 0xe615003c 0 4>;

			clocks = <&extal_clk>, <&p_clk>;

			clocks = <&hp_clk>, <&hp_clk>, <&extal_clk>, <&p_clk>;

			#clock-cells = <1>;

			renesas,clock-indices = <R8A7791_CLK_THERMAL R8A7791_CLK_PWM>;

			clock-output-names = "thermal", "pwm";

			renesas,clock-indices = <R8A7791_CLK_AUDIO_DMAC0 R8A7791_CLK_AUDIO_DMAC1

						 R8A7791_CLK_THERMAL R8A7791_CLK_PWM>;

			clock-output-names = "audmac0", "audmac1", "thermal", "pwm";

		};

		mstp7_clks: mstp7_clks@e615014c {

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