Commit ec671085 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-arm-dt-for-v5.6-tag1' of... 

Merge tag 'renesas-arm-dt-for-v5.6-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/dt

Renesas ARM DT updates for v5.6

  - Touch screen support for the iwg20d board,
  - ARM global timer support on Cortex-A9 MPCore SoCs,
  - Miscellaneous fixes for issues detected by "make dtbs_check".

* tag 'renesas-arm-dt-for-v5.6-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
  ARM: dts: sh73a0: Add missing clock-frequency for fixed clocks
  ARM: dts: r8a7778: Add missing clock-frequency for fixed clocks
  ARM: dts: rcar-gen2: Add missing mmio-sram bus properties
  ARM: dts: rcar-gen2: Fix PCI high address in interrupt-map-mask
  ARM: dts: renesas: Group tuples in pci ranges and dma-ranges properties
  ARM: dts: renesas: Group tuples in interrupt properties
  ARM: dts: renesas: Group tuples in regulator-gpio states properties
  ARM: dts: r8a7779: Add device node for ARM global timer
  ARM: dts: sh73a0: Add device node for ARM global timer
  ARM: dts: sh73a0: Rename twd clock to periph clock
  ARM: dts: iwg20d-q7-common: Add LCD support

Link: https://lore.kernel.org/r/20200106104857.8361-3-geert+renesas@glider.be


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 0b0d7158 fe4a76fa

arch/arm/boot/dts/iwg20d-q7-common.dtsi

+86 −2
Original line number Diff line number Diff line
@@ -46,6 +46,49 @@ audio_clock: audio_clock { 
		clock-frequency = <26000000>;

	};



	lcd_backlight: backlight {

		compatible = "pwm-backlight";



		pwms = <&pwm3 0 5000000 0>;

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

		default-brightness-level = <7>;

		enable-gpios = <&gpio5 14 GPIO_ACTIVE_HIGH>;

	};



	lvds-receiver {

		compatible = "ti,ds90cf384a", "lvds-decoder";

		powerdown-gpios = <&gpio7 25 GPIO_ACTIVE_LOW>;



		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				reg = <0>;

				lvds_receiver_in: endpoint {

					remote-endpoint = <&lvds0_out>;

				};

			};

			port@1 {

				reg = <1>;

				lvds_receiver_out: endpoint {

					remote-endpoint = <&panel_in>;

				};

			};

		};

	};



	panel {

		compatible = "edt,etm0700g0dh6";

		backlight = <&lcd_backlight>;



		port {

			panel_in: endpoint {

				remote-endpoint = <&lvds_receiver_out>;

			};

		};

	};



	reg_1p5v: 1p5v {

		compatible = "regulator-fixed";

		regulator-name = "1P5V";
@@ -89,8 +132,7 @@ vccq_sdhi1: regulator-vccq-sdhi1 { 


		gpios = <&gpio2 30 GPIO_ACTIVE_HIGH>;

		gpios-states = <1>;

		states = <3300000 1

			  1800000 0>;

		states = <3300000 1>, <1800000 0>;

	};

};
@@ -120,6 +162,18 @@ &cmt0 { 
	status = "okay";

};



&du {

	status = "okay";

};



&gpio2 {

	touch-interrupt {

		gpio-hog;

		gpios = <12 GPIO_ACTIVE_LOW>;

		input;

	};

};



&hsusb {

	status = "okay";

	pinctrl-0 = <&usb0_pins>;
@@ -147,6 +201,25 @@ sgtl5000: codec@a { 
		VDDIO-supply = <&reg_3p3v>;

		VDDD-supply = <&reg_1p5v>;

	};



	touch: touchpanel@38 {

		compatible = "edt,edt-ft5406";

		reg = <0x38>;

		interrupt-parent = <&gpio2>;

		interrupts = <12 IRQ_TYPE_EDGE_FALLING>;

	};

};



&lvds0 {

	status = "okay";



	ports {

		port@1 {

			lvds0_out: endpoint {

				remote-endpoint = <&lvds_receiver_in>;

			};

		};

	};

};



&pci0 {
@@ -180,6 +253,11 @@ i2c2_pins: i2c2 { 
		function = "i2c2";

	};



	pwm3_pins: pwm3 {

		groups = "pwm3";

		function = "pwm3";

	};



	scif0_pins: scif0 {

		groups = "scif0_data_d";

		function = "scif0";
@@ -218,6 +296,12 @@ usb1_pins: usb1 { 
	};

};



&pwm3 {

	pinctrl-0 = <&pwm3_pins>;

	pinctrl-names = "default";

	status = "okay";

};



&rcar_sound {

	pinctrl-0 = <&sound_pins>;

	pinctrl-names = "default";

arch/arm/boot/dts/iwg20d-q7-dbcm-ca.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ &can1 { 
&du {

	pinctrl-0 = <&du_pins>;

	pinctrl-names = "default";

	status = "okay";



	ports {

		port@0 {

arch/arm/boot/dts/r7s72100.dtsi

+9 −9
Original line number Diff line number Diff line
@@ -313,9 +313,9 @@ usbhs1: usb@e8207000 { 
		mmcif: mmc@e804c800 {

			compatible = "renesas,mmcif-r7s72100", "renesas,sh-mmcif";

			reg = <0xe804c800 0x80>;

			interrupts = <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 269 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>;

			interrupts = <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 269 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&mstp8_clks R7S72100_CLK_MMCIF>;

			power-domains = <&cpg_clocks>;

			reg-io-width = <4>;
@@ -326,9 +326,9 @@ GIC_SPI 269 IRQ_TYPE_LEVEL_HIGH 
		sdhi0: sd@e804e000 {

			compatible = "renesas,sdhi-r7s72100";

			reg = <0xe804e000 0x100>;

			interrupts = <GIC_SPI 270 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 271 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 272 IRQ_TYPE_LEVEL_HIGH>;

			interrupts = <GIC_SPI 270 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 271 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 272 IRQ_TYPE_LEVEL_HIGH>;



			clocks = <&mstp12_clks R7S72100_CLK_SDHI00>,

				 <&mstp12_clks R7S72100_CLK_SDHI01>;
@@ -342,9 +342,9 @@ GIC_SPI 271 IRQ_TYPE_LEVEL_HIGH 
		sdhi1: sd@e804e800 {

			compatible = "renesas,sdhi-r7s72100";

			reg = <0xe804e800 0x100>;

			interrupts = <GIC_SPI 273 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 274 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 275 IRQ_TYPE_LEVEL_HIGH>;

			interrupts = <GIC_SPI 273 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 274 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 275 IRQ_TYPE_LEVEL_HIGH>;



			clocks = <&mstp12_clks R7S72100_CLK_SDHI10>,

				 <&mstp12_clks R7S72100_CLK_SDHI11>;

arch/arm/boot/dts/r8a73a4.dtsi

+21 −21
Original line number Diff line number Diff line
@@ -84,27 +84,27 @@ dmac: dma-multiplexer { 
		dma0: dma-controller@e6700020 {

			compatible = "renesas,shdma-r8a73a4";

			reg = <0 0xe6700020 0 0x89e0>;

			interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH

					GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH

					GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH

					GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH

					GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH

					GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH

					GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH

					GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH

					GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH

					GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH

					GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH

					GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH

					GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH

					GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH

					GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH

					GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH

					GIC_SPI 215 IRQ_TYPE_LEVEL_HIGH

					GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH

					GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH

					GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH

					GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH>;

			interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 215 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "error",

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

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

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

+1 −2
Original line number Diff line number Diff line
@@ -60,8 +60,7 @@ vccq_sdhi0: regulator-vccq-sdhi0 { 


		enable-gpio = <&pfc 74 GPIO_ACTIVE_HIGH>;

		gpios = <&pfc 17 GPIO_ACTIVE_HIGH>;

		states = <3300000 0

			  1800000 1>;

		states = <3300000 0>, <1800000 1>;



		enable-active-high;

	};