Commit 7a093c74 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge branch 'renesas/dt2' into next/dt 



From Simon Horman:
* renesas/dt2: (21 commits)
  ARM: shmobile: bockw: fixup ether node naming
  ARM: shmobile: r8a7779: add irqpin default status on DTSI
  ARM: shmobile: marzen: fixup SMSC IRQ number on DTS
  ARM: shmobile: bockw: add SMSC support on DTS
  ARM: shmobile: r8a7778: add renesas_intc_irqpin support on DTSI
  ARM: shmobile: r8a7791 SMP device tree node
  ARM: shmobile: r8a7791 Arch timer device tree node
  ARM: shmobile: r8a7791 IRQC device tree node
  ARM: shmobile: armadillo800eva-reference: add SDHI and MMCIF interfaces
  ARM: shmobile: armadillo-reference: Add PWM backlight node to DT
  ARM: shmobile: r8a73a4: add a DT node for the DMAC
  ARM: shmobile: r8a7790: add I2C DT nodes
  ARM: shmobile: only enable used I2C interfaces in DT on all Renesas boards
  ARM: shmobile: r8a7778: add usb phy power control function
  ARM: shmobile: r8a7778: add USBHS clock
  ARM: shmobile: r8a7791 CMT support
  ARM: shmobile: r8a7791 SCIF support
  ARM: shmobile: Initial r8a7791 SoC support
  ARM: shmobile: r8a7778: add SSI/SRU clock support
  ARM: shmobile: r8a7790: Add DU and LVDS clocks
  ...

Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
parents 03984365 73c79afa

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

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ 
};



&i2c5 {

	status = "okay";

	vdd_dvfs: max8973@1b {

		compatible = "maxim,max8973";

		reg = <0x1b>;

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

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
};



&i2c5 {

	status = "okay";

	vdd_dvfs: max8973@1b {

		compatible = "maxim,max8973";

		reg = <0x1b>;

arch/arm/boot/dts/r8a73a4.dtsi

+52 −0
Original line number Diff line number Diff line
@@ -78,6 +78,49 @@ 
				<0 56 4>, <0 57 4>;

	};



	dmac: dma-multiplexer@0 {

		compatible = "renesas,shdma-mux";

		#dma-cells = <1>;

		dma-channels = <20>;

		dma-requests = <256>;

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;



		dma0: dma-controller@e6700020 {

			compatible = "renesas,shdma-r8a73a4";

			reg = <0 0xe6700020 0 0x89e0>;

			interrupt-parent = <&gic>;

			interrupts = <0 220 4

					0 200 4

					0 201 4

					0 202 4

					0 203 4

					0 204 4

					0 205 4

					0 206 4

					0 207 4

					0 208 4

					0 209 4

					0 210 4

					0 211 4

					0 212 4

					0 213 4

					0 214 4

					0 215 4

					0 216 4

					0 217 4

					0 218 4

					0 219 4>;

			interrupt-names = "error",

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

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

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

					"ch12", "ch13", "ch14", "ch15",

					"ch16", "ch17", "ch18", "ch19";

		};

	};



	thermal@e61f0000 {

		compatible = "renesas,rcar-thermal";

		reg = <0 0xe61f0000 0 0x14>, <0 0xe61f0100 0 0x38>,
@@ -93,6 +136,7 @@ 
		reg = <0 0xe6500000 0 0x428>;

		interrupt-parent = <&gic>;

		interrupts = <0 174 0x4>;

		status = "disabled";

	};



	i2c1: i2c@e6510000 {
@@ -102,6 +146,7 @@ 
		reg = <0 0xe6510000 0 0x428>;

		interrupt-parent = <&gic>;

		interrupts = <0 175 0x4>;

		status = "disabled";

	};



	i2c2: i2c@e6520000 {
@@ -111,6 +156,7 @@ 
		reg = <0 0xe6520000 0 0x428>;

		interrupt-parent = <&gic>;

		interrupts = <0 176 0x4>;

		status = "disabled";

	};



	i2c3: i2c@e6530000 {
@@ -120,6 +166,7 @@ 
		reg = <0 0xe6530000 0 0x428>;

		interrupt-parent = <&gic>;

		interrupts = <0 177 0x4>;

		status = "disabled";

	};



	i2c4: i2c@e6540000 {
@@ -129,6 +176,7 @@ 
		reg = <0 0xe6540000 0 0x428>;

		interrupt-parent = <&gic>;

		interrupts = <0 178 0x4>;

		status = "disabled";

	};



	i2c5: i2c@e60b0000 {
@@ -138,6 +186,7 @@ 
		reg = <0 0xe60b0000 0 0x428>;

		interrupt-parent = <&gic>;

		interrupts = <0 179 0x4>;

		status = "disabled";

	};



	i2c6: i2c@e6550000 {
@@ -147,6 +196,7 @@ 
		reg = <0 0xe6550000 0 0x428>;

		interrupt-parent = <&gic>;

		interrupts = <0 184 0x4>;

		status = "disabled";

	};



	i2c7: i2c@e6560000 {
@@ -156,6 +206,7 @@ 
		reg = <0 0xe6560000 0 0x428>;

		interrupt-parent = <&gic>;

		interrupts = <0 185 0x4>;

		status = "disabled";

	};



	i2c8: i2c@e6570000 {
@@ -165,6 +216,7 @@ 
		reg = <0 0xe6570000 0 0x428>;

		interrupt-parent = <&gic>;

		interrupts = <0 173 0x4>;

		status = "disabled";

	};



	mmcif0: mmcif@ee200000 {

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

+78 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
/dts-v1/;

/include/ "r8a7740.dtsi"

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/pwm/pwm.h>



/ {

	model = "armadillo 800 eva reference";
@@ -34,6 +35,33 @@ 
		regulator-boot-on;

	};



	vcc_sdhi0: regulator@1 {

		compatible = "regulator-fixed";



		regulator-name = "SDHI0 Vcc";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;



		gpio = <&pfc 75 GPIO_ACTIVE_HIGH>;

		enable-active-high;

	};



	vccq_sdhi0: regulator@2 {

		compatible = "regulator-gpio";



		regulator-name = "SDHI0 VccQ";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <3300000>;

		vin-supply = <&vcc_sdhi0>;



		enable-gpio = <&pfc 74 GPIO_ACTIVE_HIGH>;

		gpios = <&pfc 17 GPIO_ACTIVE_HIGH>;

		states = <3300000 0

			  1800000 1>;



		enable-active-high;

	};



	leds {

		compatible = "gpio-leds";

		led1 {
@@ -49,9 +77,19 @@ 
			gpios = <&pfc 177 GPIO_ACTIVE_HIGH>;

		};

	};



	backlight {

		compatible = "pwm-backlight";

		pwms = <&tpu 2 33333 PWM_POLARITY_INVERTED>;

		brightness-levels = <0 1 2 4 8 16 32 64 128 255>;

		default-brightness-level = <9>;

		pinctrl-0 = <&backlight_pins>;

		pinctrl-names = "default";

	};

};



&i2c0 {

	status = "okay";

	touchscreen: st1232@55 {

		compatible = "sitronix,st1232";

		reg = <0x55>;
@@ -76,4 +114,44 @@ 
		renesas,groups = "intc_irq10";

		renesas,function = "intc";

	};



	backlight_pins: backlight {

		renesas,groups = "tpu0_to2_1";

		renesas,function = "tpu0";

	};



	mmc0_pins: mmc0 {

		renesas,groups = "mmc0_data8_1", "mmc0_ctrl_1";

		renesas,function = "mmc0";

	};



	sdhi0_pins: sdhi0 {

		renesas,groups = "sdhi0_data4", "sdhi0_ctrl", "sdhi0_wp";

		renesas,function = "sdhi0";

	};

};



&tpu {

	status = "okay";

};



&mmcif0 {

	pinctrl-0 = <&mmc0_pins>;

	pinctrl-names = "default";



	vmmc-supply = <&reg_3p3v>;

	bus-width = <8>;

	non-removable;

	status = "okay";

};



&sdhi0 {

	pinctrl-0 = <&sdhi0_pins>;

	pinctrl-names = "default";



	vmmc-supply = <&vcc_sdhi0>;

	vqmmc-supply = <&vccq_sdhi0>;

	bus-width = <4>;

	cd-gpios = <&pfc 167 GPIO_ACTIVE_LOW>;

	status = "okay";

};

arch/arm/boot/dts/r8a7740.dtsi

+35 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ 
			      0 202 0x4

			      0 203 0x4

			      0 204 0x4>;

		status = "disabled";

	};



	i2c1: i2c@e6c20000 {
@@ -143,6 +144,7 @@ 
			      0 71 0x4

			      0 72 0x4

			      0 73 0x4>;

		status = "disabled";

	};



	pfc: pfc@e6050000 {
@@ -159,4 +161,37 @@ 
		status = "disabled";

		#pwm-cells = <3>;

	};



	mmcif0: mmcif@e6bd0000 {

		compatible = "renesas,sh-mmcif";

		reg = <0xe6bd0000 0x100>;

		interrupt-parent = <&gic>;

		interrupts = <0 56 4

				0 57 4>;

		status = "disabled";

	};



	sdhi0: sdhi@e6850000 {

		compatible = "renesas,sdhi-r8a7740";

		reg = <0xe6850000 0x100>;

		interrupt-parent = <&gic>;

		interrupts = <0 117 4

				0 118 4

				0 119 4>;

		cap-sd-highspeed;

		cap-sdio-irq;

		status = "disabled";

	};



	sdhi1: sdhi@e6860000 {

		compatible = "renesas,sdhi-r8a7740";

		reg = <0xe6860000 0x100>;

		interrupt-parent = <&gic>;

		interrupts = <0 121 4

				0 122 4

				0 123 4>;

		cap-sd-highspeed;

		cap-sdio-irq;

		status = "disabled";

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE