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

Merge tag 'renesas-arm-dt-for-v5.2' of... 

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

Renesas ARM Based SoC DT Updates for v5.2

* R-Car E2 (r8a7794) based Alt board
  - Enable USB and DA9063 PMIC

* R-Car V2H (R8A77920) based Blanche board
  - Enable IIC3 and DA9063 PMIC

* RZ/G1C (r8a77470) based iWave SBC
  - Enable HDMI, USB Phy[01], USB2.0 Host and HS-USB

* RZ/G1C (r8a77470) SoC
  - Describe DU, VIN, PWM and HSCIF, USB PHY, USB2.0 Host and HSUSB in DT

* RZ/A1H (R7S7210) based rskrza1 board
  - Enable remaining LEDs and I2C

* R-Mobile A1 (r8a7740) based ape6evm,
  R-Car H1 (r8a7779) based marzen,
  R-Car M1A (R8A7778) based bockw and
  Emma Mobile EV2 based kzm9d boads
  - Tidy up bootargs

* R-Mobile A1 (r8a7740) based ape6evm
  - Enable NOR FLASH

* tag 'renesas-arm-dt-for-v5.2' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

: (21 commits)
  ARM: dts: ape6evm: Reorder bootargs
  ARM: dts: marzen: Add rw to bootargs and use ip=dhcp
  ARM: dts: bockw: Reorder bootargs
  ARM: dts: kzm9d: Add rw parameter to bootargs
  ARM: dts: iwg23s-sbc: Enable HS-USB
  ARM: dts: r8a77470: Add HSUSB device nodes
  ARM: dts: iwg23s-sbc: Enable USB USB2.0 Host
  ARM: dts: r8a77470: Add USB2.0 Host (EHCI/OHCI) device
  ARM: dts: iwg23s-sbc: Enable USB Phy[01]
  ARM: dts: r8a77470: Add USB PHY DT support
  ARM: dts: r8a77470: Add VIN support
  ARM: dts: r8a77470: Add PWM support
  ARM: dts: r8a77470: Add HSCIF support
  ARM: dts: alt: Enable USB support
  ARM: dts: rskrza1: Add remaining LEDs
  ARM: dts: rskrza1: Add I2C support
  ARM: dts: iwg23s-sbc: Add HDMI support
  ARM: dts: r8a77470: Add DU support
  ARM: dts: ape6evm: Add NOR FLASH
  ARM: dts: alt: Add DA9063 PMIC node
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 64f32d9d 0750e834

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

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
	};



	chosen {

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

		bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp";

		stdout-path = "serial1:115200n8";

	};

arch/arm/boot/dts/r7s72100-rskrza1.dts

+45 −1
Original line number Diff line number Diff line
@@ -34,12 +34,23 @@ 
	};



	leds {

		status = "okay";

		compatible = "gpio-leds";



		led0 {

			gpios = <&port7 1 GPIO_ACTIVE_LOW>;

		};



		led1 {

			gpios = <&io_expander1 0 GPIO_ACTIVE_LOW>;

		};



		led2 {

			gpios = <&io_expander1 1 GPIO_ACTIVE_LOW>;

		};



		led3 {

			gpios = <&io_expander1 2 GPIO_ACTIVE_LOW>;

		};

	};

};
@@ -47,6 +58,34 @@ 
	clock-frequency = <13330000>;

};



&i2c3 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c3_pins>;

	status = "okay";



	clock-frequency = <400000>;



	io_expander1: gpio@20 {

		compatible = "onnn,cat9554";

		reg = <0x20>;

		gpio-controller;

		#gpio-cells = <2>;

	};



	io_expander2: gpio@21 {

		compatible = "onnn,cat9554";

		reg = <0x21>;

		gpio-controller;

		#gpio-cells = <2>;

	};



	eeprom@50 {

		compatible = "renesas,r1ex24016", "atmel,24c16";

		reg = <0x50>;

		pagesize = <16>;

	};

};



&usb_x1_clk {

	clock-frequency = <48000000>;

};
@@ -56,6 +95,11 @@ 
};



&pinctrl {

	/* RIIC ch3 (Port Expander, EEPROM (MAC Addr), Audio Codec) */

	i2c3_pins: i2c3 {

		pinmux = <RZA1_PINMUX(1, 6, 1)>,	/* RIIC3SCL */

			 <RZA1_PINMUX(1, 7, 1)>;	/* RIIC3SDA */

	};



	/* Serial Console */

	scif2_pins: serial2 {

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

+28 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
	};



	chosen {

		bootargs = "ignore_loglevel root=/dev/nfs ip=dhcp rw";

		bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp";

		stdout-path = "serial0:115200n8";

	};
@@ -166,6 +166,33 @@ 
};



&bsc {

	flash@0 {

		compatible = "cfi-flash", "mtd-rom";

		reg = <0x0 0x08000000>;

		bank-width = <2>;



		partitions {

			compatible = "fixed-partitions";

			#address-cells = <1>;

			#size-cells = <1>;



			partition@0 {

				label = "uboot";

				reg = <0x00000000 0x00040000>;

				read-only;

			};

			partition@40000 {

				label = "uboot-env";

				reg = <0x00040000 0x00040000>;

				read-only;

			};

			partition@80000 {

				label = "flash";

				reg = <0x00080000 0x07f80000>;

			};

		};

	};



	ethernet@8000000 {

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

		reg = <0x08000000 0x1000>;

arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts

+123 −0
Original line number Diff line number Diff line
@@ -22,6 +22,17 @@ 
		stdout-path = "serial1:115200n8";

	};



	hdmi-out {

		compatible = "hdmi-connector";

		type = "a";



		port {

			hdmi_con: endpoint {

				remote-endpoint = <&bridge_out>;

			};

		};

	};



	memory@40000000 {

		device_type = "memory";

		reg = <0 0x40000000 0 0x20000000>;
@@ -80,10 +91,42 @@ 
	status = "okay";

};



&du {

	pinctrl-0 = <&du0_pins>;

	pinctrl-names = "default";



	status = "okay";



	ports {

		port@0 {

			endpoint {

				remote-endpoint = <&bridge_in>;

			};

		};

	};

};



&ehci1 {

	status = "okay";

};



&extal_clk {

	clock-frequency = <20000000>;

};



&gpio2 {

	interrupt-fixup {

		gpio-hog;

		gpios = <29 GPIO_ACTIVE_HIGH>;

		line-name = "hdmi-hpd-int";

		input;

	};

};



&hsusb0 {

	status = "okay";

};



&i2c3 {

	pinctrl-0 = <&i2c3_pins>;

	pinctrl-names = "default";
@@ -97,12 +140,60 @@ 
	};

};



&i2c4 {

	pinctrl-0 = <&i2c4_pins>;

	pinctrl-names = "default";



	status = "okay";

	clock-frequency = <100000>;



	hdmi@39 {

		compatible = "sil,sii9022";

		reg = <0x39>;

		interrupt-parent = <&gpio2>;

		interrupts = <29 IRQ_TYPE_LEVEL_LOW>;



		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				reg = <0>;

				bridge_in: endpoint {

					remote-endpoint = <&du_out_rgb0>;

				};

			};



			port@1 {

				reg = <1>;

				bridge_out: endpoint {

					remote-endpoint = <&hdmi_con>;

				};

			};

		};

	};

};



&ohci1 {

	status = "okay";

};



&pfc {

	avb_pins: avb {

		groups = "avb_mdio", "avb_gmii_tx_rx";

		function = "avb";

	};



	du0_pins: du0 {

		groups = "du0_rgb888", "du0_sync", "du0_disp", "du0_clk0_out";

		function = "du0";

	};



	i2c4_pins: i2c4 {

		groups = "i2c4_e";

		function = "i2c4";

	};



	i2c3_pins: i2c3 {

		groups = "i2c3_c";

		function = "i2c3";
@@ -135,6 +226,16 @@ 
		function = "sdhi2";

		power-source = <1800>;

	};



	usb0_pins: usb0 {

		groups = "usb0";

		function = "usb0";

	};



	usb1_pins: usb1 {

		groups = "usb1";

		function = "usb1";

	};

};



&qspi0 {
@@ -195,3 +296,25 @@ 
	sd-uhs-sdr50;

	status = "okay";

};



&usb2_phy0 {

	status = "okay";

};



&usb2_phy1 {

	status = "okay";

};



&usbphy0 {

	pinctrl-0 = <&usb0_pins>;

	pinctrl-names = "default";



	status = "okay";

};



&usbphy1 {

	pinctrl-0 = <&usb1_pins>;

	pinctrl-names = "default";



	status = "okay";

};

arch/arm/boot/dts/r8a77470.dtsi

+313 −0
Original line number Diff line number Diff line
@@ -325,6 +325,77 @@ 
			status = "disabled";

		};



		hsusb0: hsusb@e6590000 {

			compatible = "renesas,usbhs-r8a77470",

				     "renesas,rcar-gen2-usbhs";

			reg = <0 0xe6590000 0 0x100>;

			interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 704>;

			dmas = <&usb_dmac00 0>, <&usb_dmac00 1>,

			       <&usb_dmac10 0>, <&usb_dmac10 1>;

			dma-names = "ch0", "ch1", "ch2", "ch3";

			renesas,buswait = <4>;

			phys = <&usb0 1>;

			phy-names = "usb";

			power-domains = <&sysc R8A77470_PD_ALWAYS_ON>;

			resets = <&cpg 704>;

			status = "disabled";

		};



		usbphy0: usb-phy@e6590100 {

			compatible = "renesas,usb-phy-r8a77470",

				     "renesas,rcar-gen2-usb-phy";

			reg = <0 0xe6590100 0 0x100>;

			#address-cells = <1>;

			#size-cells = <0>;

			clocks = <&cpg CPG_MOD 704>;

			clock-names = "usbhs";

			power-domains = <&sysc R8A77470_PD_ALWAYS_ON>;

			resets = <&cpg 704>;

			status = "disabled";



			usb0: usb-channel@0 {

				reg = <0>;

				#phy-cells = <1>;

			};

		};



		hsusb1: hsusb@e6598000 {

			compatible = "renesas,usbhs-r8a77470",

				     "renesas,rcar-gen2-usbhs";

			reg = <0 0xe6598000 0 0x100>;

			interrupts = <GIC_SPI 291 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 706>;

			dmas = <&usb_dmac01 0>, <&usb_dmac01 1>,

			       <&usb_dmac11 0>, <&usb_dmac11 1>;

			dma-names = "ch0", "ch1", "ch2", "ch3";

			renesas,buswait = <4>;

			/* We need to turn on usbphy0 to make usbphy1 to work */

			phys = <&usb1 1>;

			phy-names = "usb";

			power-domains = <&sysc R8A77470_PD_ALWAYS_ON>;

			resets = <&cpg 706>;

			status = "disabled";

		};



		usbphy1: usb-phy@e6598100 {

			compatible = "renesas,usb-phy-r8a77470",

				     "renesas,rcar-gen2-usb-phy";

			reg = <0 0xe6598100 0 0x100>;

			#address-cells = <1>;

			#size-cells = <0>;

			clocks = <&cpg CPG_MOD 706>;

			clock-names = "usbhs";

			power-domains = <&sysc R8A77470_PD_ALWAYS_ON>;

			resets = <&cpg 706>;

			status = "disabled";



			usb1: usb-channel@0 {

				reg = <0>;

				#phy-cells = <1>;

			};

		};



		usb_dmac00: dma-controller@e65a0000 {

			compatible = "renesas,r8a77470-usb-dmac",

				     "renesas,usb-dmac";
@@ -588,6 +659,216 @@ 
			status = "disabled";

		};



		hscif0: serial@e62c0000 {

			compatible = "renesas,hscif-r8a77470",

				     "renesas,rcar-gen2-hscif", "renesas,hscif";

			reg = <0 0xe62c0000 0 0x60>;

			interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 717>,

				 <&cpg CPG_CORE R8A77470_CLK_ZS>, <&scif_clk>;

			clock-names = "fck", "brg_int", "scif_clk";

			dmas = <&dmac0 0x39>, <&dmac0 0x3a>,

			       <&dmac1 0x39>, <&dmac1 0x3a>;

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

			power-domains = <&sysc R8A77470_PD_ALWAYS_ON>;

			resets = <&cpg 717>;

			status = "disabled";

		};



		hscif1: serial@e62c8000 {

			compatible = "renesas,hscif-r8a77470",

				     "renesas,rcar-gen2-hscif", "renesas,hscif";

			reg = <0 0xe62c8000 0 0x60>;

			interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 716>,

				 <&cpg CPG_CORE R8A77470_CLK_ZS>, <&scif_clk>;

			clock-names = "fck", "brg_int", "scif_clk";

			dmas = <&dmac0 0x4d>, <&dmac0 0x4e>,

			       <&dmac1 0x4d>, <&dmac1 0x4e>;

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

			power-domains = <&sysc R8A77470_PD_ALWAYS_ON>;

			resets = <&cpg 716>;

			status = "disabled";

		};



		hscif2: serial@e62d0000 {

			compatible = "renesas,hscif-r8a77470",

				     "renesas,rcar-gen2-hscif", "renesas,hscif";

			reg = <0 0xe62d0000 0 0x60>;

			interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 713>,

				 <&cpg CPG_CORE R8A77470_CLK_ZS>, <&scif_clk>;

			clock-names = "fck", "brg_int", "scif_clk";

			dmas = <&dmac0 0x3b>, <&dmac0 0x3c>,

			       <&dmac1 0x3b>, <&dmac1 0x3c>;

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

			power-domains = <&sysc R8A77470_PD_ALWAYS_ON>;

			resets = <&cpg 713>;

			status = "disabled";

		};



		pwm0: pwm@e6e30000 {

			compatible = "renesas,pwm-r8a77470", "renesas,pwm-rcar";

			reg = <0 0xe6e30000 0 0x8>;

			clocks = <&cpg CPG_MOD 523>;

			power-domains = <&sysc R8A77470_PD_ALWAYS_ON>;

			resets = <&cpg 523>;

			#pwm-cells = <2>;

			status = "disabled";

		};



		pwm1: pwm@e6e31000 {

			compatible = "renesas,pwm-r8a77470", "renesas,pwm-rcar";

			reg = <0 0xe6e31000 0 0x8>;

			clocks = <&cpg CPG_MOD 523>;

			power-domains = <&sysc R8A77470_PD_ALWAYS_ON>;

			resets = <&cpg 523>;

			#pwm-cells = <2>;

			status = "disabled";

		};



		pwm2: pwm@e6e32000 {

			compatible = "renesas,pwm-r8a77470", "renesas,pwm-rcar";

			reg = <0 0xe6e32000 0 0x8>;

			clocks = <&cpg CPG_MOD 523>;

			power-domains = <&sysc R8A77470_PD_ALWAYS_ON>;

			resets = <&cpg 523>;

			#pwm-cells = <2>;

			status = "disabled";

		};



		pwm3: pwm@e6e33000 {

			compatible = "renesas,pwm-r8a77470", "renesas,pwm-rcar";

			reg = <0 0xe6e33000 0 0x8>;

			clocks = <&cpg CPG_MOD 523>;

			power-domains = <&sysc R8A77470_PD_ALWAYS_ON>;

			resets = <&cpg 523>;

			#pwm-cells = <2>;

			status = "disabled";

		};



		pwm4: pwm@e6e34000 {

			compatible = "renesas,pwm-r8a77470", "renesas,pwm-rcar";

			reg = <0 0xe6e34000 0 0x8>;

			clocks = <&cpg CPG_MOD 523>;

			power-domains = <&sysc R8A77470_PD_ALWAYS_ON>;

			resets = <&cpg 523>;

			#pwm-cells = <2>;

			status = "disabled";

		};



		pwm5: pwm@e6e35000 {

			compatible = "renesas,pwm-r8a77470", "renesas,pwm-rcar";

			reg = <0 0xe6e35000 0 0x8>;

			clocks = <&cpg CPG_MOD 523>;

			power-domains = <&sysc R8A77470_PD_ALWAYS_ON>;

			resets = <&cpg 523>;

			#pwm-cells = <2>;

			status = "disabled";

		};



		pwm6: pwm@e6e36000 {

			compatible = "renesas,pwm-r8a77470", "renesas,pwm-rcar";

			reg = <0 0xe6e36000 0 0x8>;

			clocks = <&cpg CPG_MOD 523>;

			power-domains = <&sysc R8A77470_PD_ALWAYS_ON>;

			resets = <&cpg 523>;

			#pwm-cells = <2>;

			status = "disabled";

		};



		vin0: video@e6ef0000 {

			compatible = "renesas,vin-r8a77470",

				     "renesas,rcar-gen2-vin";

			reg = <0 0xe6ef0000 0 0x1000>;

			interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 811>;

			power-domains = <&sysc R8A77470_PD_ALWAYS_ON>;

			resets = <&cpg 811>;

			status = "disabled";

		};



		vin1: video@e6ef1000 {

			compatible = "renesas,vin-r8a77470",

				     "renesas,rcar-gen2-vin";

			reg = <0 0xe6ef1000 0 0x1000>;

			interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 810>;

			power-domains = <&sysc R8A77470_PD_ALWAYS_ON>;

			resets = <&cpg 810>;

			status = "disabled";

		};



		ohci0: usb@ee080000 {

			compatible = "generic-ohci";

			reg = <0 0xee080000 0 0x100>;

			interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 703>;

			phys = <&usb0 0>, <&usb2_phy0>;

			phy-names = "usb";

			power-domains = <&sysc R8A77470_PD_ALWAYS_ON>;

			resets = <&cpg 703>;

			status = "disabled";

		};



		ehci0: usb@ee080100 {

			compatible = "generic-ehci";

			reg = <0 0xee080100 0 0x100>;

			interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 703>;

			phys = <&usb0 0>, <&usb2_phy0>;

			phy-names = "usb";

			companion = <&ohci0>;

			power-domains = <&sysc R8A77470_PD_ALWAYS_ON>;

			resets = <&cpg 703>;

			status = "disabled";

		};



		usb2_phy0: usb-phy@ee080200 {

			compatible = "renesas,usb2-phy-r8a77470";

			reg = <0 0xee080200 0 0x700>;

			clocks = <&cpg CPG_MOD 703>;

			power-domains = <&sysc R8A77470_PD_ALWAYS_ON>;

			resets = <&cpg 703>;

			#phy-cells = <0>;

			status = "disabled";

		};



		ohci1: usb@ee0c0000 {

			compatible = "generic-ohci";

			reg = <0 0xee0c0000 0 0x100>;

			interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 705>;

			phys = <&usb0 1>, <&usb2_phy1>, <&usb1 0>;

			phy-names = "usb";

			power-domains = <&sysc R8A77470_PD_ALWAYS_ON>;

			resets = <&cpg 705>;

			status = "disabled";

		};



		ehci1: usb@ee0c0100 {

			compatible = "generic-ehci";

			reg = <0 0xee0c0100 0 0x100>;

			interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 705>;

			phys = <&usb0 1>, <&usb2_phy1>, <&usb1 0>;

			phy-names = "usb";

			companion = <&ohci1>;

			power-domains = <&sysc R8A77470_PD_ALWAYS_ON>;

			resets = <&cpg 705>;

			status = "disabled";

		};



		usb2_phy1: usb-phy@ee0c0200 {

			compatible = "renesas,usb2-phy-r8a77470";

			reg = <0 0xee0c0200 0 0x700>;

			clocks = <&cpg CPG_MOD 705>;

			power-domains = <&sysc R8A77470_PD_ALWAYS_ON>;

			resets = <&cpg 705>;

			#phy-cells = <0>;

			status = "disabled";

		};



		sdhi0: sd@ee100000 {

			compatible = "renesas,sdhi-r8a77470",

				     "renesas,rcar-gen2-sdhi";
@@ -643,6 +924,38 @@ 
			resets = <&cpg 408>;

		};



		du: display@feb00000 {

			compatible = "renesas,du-r8a77470";

			reg = <0 0xfeb00000 0 0x40000>;

			interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 724>,

				 <&cpg CPG_MOD 723>;

			clock-names = "du.0", "du.1";

			status = "disabled";



			ports {

				#address-cells = <1>;

				#size-cells = <0>;



				port@0 {

					reg = <0>;

					du_out_rgb0: endpoint {

					};

				};

				port@1 {

					reg = <1>;

					du_out_rgb1: endpoint {

					};

				};

				port@2 {

					reg = <2>;

					du_out_lvds0: endpoint {

					};

				};

			};

		};



		prr: chipid@ff000044 {

			compatible = "renesas,prr";

			reg = <0 0xff000044 0 4>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE