Unverified Commit c328a66d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-arm-dt-for-v6.1-tag2' of... 

Merge tag 'renesas-arm-dt-for-v6.1-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/dt

Renesas ARM DT updates for v6.1 (take two)

  - Merge Renesas ARM/ARM64 maintainers entries,
  - CAN support for the RZ/N1 SoC and the RZN1D-DB development board,
  - Watchdog, pin control, I2C (EEPROM), GPIO (LEDS/switches), and
    Ethernet support for the R-Car V4H SoC and the White Hawk
    development board,
  - Miscellaneous fixes and improvements.

* tag 'renesas-arm-dt-for-v6.1-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel: (26 commits)
  arm64: dts: renesas: Adjust whitespace around '{'
  arm64: dts: renesas: rzg2ul-smarc: Include SoM DTSI into board DTS
  arm64: dts: renesas: rzg2ul-smarc-som: Drop enabling wdt2
  ARM: dts: renesas: Fix USB PHY device and child node names
  arm64: dts: renesas: r8a779a0: Update to R-Car Gen4 compatible values
  arm64: dts: renesas: white-hawk-cpu: Add missing bootargs
  arm64: dts: renesas: spider-cpu: Add missing bootargs
  arm64: dts: renesas: spider: Move aliases and chosen
  arm64: dts: renesas: white-hawk-cpu: Add Ethernet support
  arm64: dts: renesas: white-hawk: Move aliases and chosen
  arm64: dts: renesas: r8a779g0: Add RAVB nodes
  arm64: dts: renesas: white-hawk-cpu: Add push switches
  arm64: dts: renesas: white-hawk-cpu: Add GP LEDs
  arm64: dts: renesas: r8a779g0: Add GPIO nodes
  arm64: dts: renesas: white-hawk: Add Ethernet sub-board
  arm64: dts: renesas: white-hawk: Add CSI/DSI sub-board
  arm64: dts: renesas: white-hawk: Add I2C0 and EEPROMs
  arm64: dts: renesas: r8a779g0: Add I2C nodes
  arm64: dts: renesas: white-hawk-cpu: Add serial port pin control
  arm64: dts: renesas: r8a779g0: Add pinctrl device node
  ...

Link: https://lore.kernel.org/r/cover.1663588776.git.geert+renesas@glider.be


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 9cc2df42 4ebf297b

MAINTAINERS

+11 −24
Original line number Diff line number Diff line
@@ -2650,7 +2650,7 @@ F: arch/arm/boot/dts/rtd* 
F:	arch/arm/mach-realtek/

F:	arch/arm64/boot/dts/realtek/









ARM/RENESAS ARM64 ARCHITECTURE









ARM/RENESAS ARCHITECTURE









M:	Geert Uytterhoeven <geert+renesas@glider.be>









M:	Magnus Damm <magnus.damm@gmail.com>









L:	linux-renesas-soc@vger.kernel.org










@@ -2661,6 +2661,16 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git nex







F:	Documentation/devicetree/bindings/arm/renesas.yaml









F:	Documentation/devicetree/bindings/hwinfo/renesas,prr.yaml









F:	Documentation/devicetree/bindings/soc/renesas/









F:	arch/arm/boot/dts/emev2*









F:	arch/arm/boot/dts/gr-peach*









F:	arch/arm/boot/dts/iwg20d-q7*









F:	arch/arm/boot/dts/r7s*









F:	arch/arm/boot/dts/r8a*









F:	arch/arm/boot/dts/r9a*









F:	arch/arm/boot/dts/sh*









F:	arch/arm/configs/shmobile_defconfig









F:	arch/arm/include/debug/renesas-scif.S









F:	arch/arm/mach-shmobile/









F:	arch/arm64/boot/dts/renesas/









F:	drivers/soc/renesas/









F:	include/linux/soc/renesas/










@@ -2772,29 +2782,6 @@ L:	linux-media@vger.kernel.org







S:	Maintained









F:	drivers/media/platform/samsung/s5p-mfc/

















ARM/SHMOBILE ARM ARCHITECTURE









M:	Geert Uytterhoeven <geert+renesas@glider.be>









M:	Magnus Damm <magnus.damm@gmail.com>









L:	linux-renesas-soc@vger.kernel.org









S:	Supported









Q:	http://patchwork.kernel.org/project/linux-renesas-soc/list/









C:	irc://irc.libera.chat/renesas-soc









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git next









F:	Documentation/devicetree/bindings/arm/renesas.yaml









F:	Documentation/devicetree/bindings/soc/renesas/









F:	arch/arm/boot/dts/emev2*









F:	arch/arm/boot/dts/gr-peach*









F:	arch/arm/boot/dts/iwg20d-q7*









F:	arch/arm/boot/dts/r7s*









F:	arch/arm/boot/dts/r8a*









F:	arch/arm/boot/dts/r9a*









F:	arch/arm/boot/dts/sh*









F:	arch/arm/configs/shmobile_defconfig









F:	arch/arm/include/debug/renesas-scif.S









F:	arch/arm/mach-shmobile/









F:	drivers/soc/renesas/









F:	include/linux/soc/renesas/

















ARM/SOCFPGA ARCHITECTURE









M:	Dinh Nguyen <dinguyen@kernel.org>









S:	Maintained


































arch/arm/boot/dts/r8a7742.dtsi



+3
−3






























Original line number
Diff line number
Diff line







@@ -633,7 +633,7 @@ hsusb: usb@e6590000 {







			status = "disabled";









		};



















		usbphy: usb-phy@e6590100 {









		usbphy: usb-phy-controller@e6590100 {









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









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









			reg = <0 0xe6590100 0 0x100>;










@@ -645,11 +645,11 @@ usbphy: usb-phy@e6590100 {







			resets = <&cpg 704>;









			status = "disabled";



















			usb0: usb-channel@0 {









			usb0: usb-phy@0 {









				reg = <0>;









				#phy-cells = <1>;









			};









			usb2: usb-channel@2 {









			usb2: usb-phy@2 {









				reg = <2>;









				#phy-cells = <1>;









			};


































arch/arm/boot/dts/r8a7743.dtsi



+3
−3






























Original line number
Diff line number
Diff line







@@ -584,7 +584,7 @@ hsusb: usb@e6590000 {







			status = "disabled";









		};



















		usbphy: usb-phy@e6590100 {









		usbphy: usb-phy-controller@e6590100 {









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









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









			reg = <0 0xe6590100 0 0x100>;










@@ -596,11 +596,11 @@ usbphy: usb-phy@e6590100 {







			resets = <&cpg 704>;









			status = "disabled";



















			usb0: usb-channel@0 {









			usb0: usb-phy@0 {









				reg = <0>;









				#phy-cells = <1>;









			};









			usb2: usb-channel@2 {









			usb2: usb-phy@2 {









				reg = <2>;









				#phy-cells = <1>;









			};


































arch/arm/boot/dts/r8a7744.dtsi



+3
−3






























Original line number
Diff line number
Diff line







@@ -584,7 +584,7 @@ hsusb: usb@e6590000 {







			status = "disabled";









		};



















		usbphy: usb-phy@e6590100 {









		usbphy: usb-phy-controller@e6590100 {









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









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









			reg = <0 0xe6590100 0 0x100>;










@@ -596,11 +596,11 @@ usbphy: usb-phy@e6590100 {







			resets = <&cpg 704>;









			status = "disabled";



















			usb0: usb-channel@0 {









			usb0: usb-phy@0 {









				reg = <0>;









				#phy-cells = <1>;









			};









			usb2: usb-channel@2 {









			usb2: usb-phy@2 {









				reg = <2>;









				#phy-cells = <1>;









			};


































arch/arm/boot/dts/r8a7745.dtsi



+3
−3






























Original line number
Diff line number
Diff line







@@ -525,7 +525,7 @@ hsusb: usb@e6590000 {







			status = "disabled";









		};



















		usbphy: usb-phy@e6590100 {









		usbphy: usb-phy-controller@e6590100 {









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









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









			reg = <0 0xe6590100 0 0x100>;










@@ -537,11 +537,11 @@ usbphy: usb-phy@e6590100 {







			resets = <&cpg 704>;









			status = "disabled";



















			usb0: usb-channel@0 {









			usb0: usb-phy@0 {









				reg = <0>;









				#phy-cells = <1>;









			};









			usb2: usb-channel@2 {









			usb2: usb-phy@2 {









				reg = <2>;









				#phy-cells = <1>;









			};