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

Merge tag 'renesas-arm-dt-for-v5.18-tag2' of... 

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

Renesas ARM DT updates for v5.18 (take two)

  - Document the use of the renesas-soc IRC channel,
  - Watchdog support for the R-Car S4-8, RZ/N1D, and RZ/G2LC SoCs on the
    Spider, RZN1D-DB, and RZ/G2LC SMARC EVK development boards,
  - Miscellaneous fixes and improvements.

* tag 'renesas-arm-dt-for-v5.18-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
  ARM: dts: renesas: Align GPIO hog names with dtschema
  arm64: dts: renesas: Align GPIO hog names with dtschema
  arm64: dts: renesas: rzg2lc-smarc-som: Enable watchdog
  ARM: dts: r9a06g032-rzn1d400-db: Enable watchdog0 with a 60s timeout
  ARM: dts: r9a06g032: Add the watchdog nodes
  dt-bindings: clock: r9a06g032: Add the definition of the watchdog clock
  arm64: dts: renesas: spider-cpu: Enable watchdog timer
  arm64: dts: renesas: r8a779f0: Add RWDT node
  MAINTAINERS: Specify IRC channel for Renesas ARM64 port
  MAINTAINERS: Specify IRC channel for Renesas ARM32 port
  arm64: dts: renesas: ulcb-kf: fix wrong comment

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 5a29ea50 6a3b10e5

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -2530,6 +2530,7 @@ 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:	arch/arm64/boot/dts/renesas/
@@ -2643,6 +2644,7 @@ 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:	arch/arm/boot/dts/emev2*

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

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ &du { 
};



&gpio2 {

	touch-interrupt {

	touch-interrupt-hog {

		gpio-hog;

		gpios = <12 GPIO_ACTIVE_LOW>;

		input;

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

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ lcd0_pins: lcd0 { 
		function = "lcd0";

	};



	lcd0_mux {

	lcd0-mux-hog {

		/* DBGMD/LCDC0/FSIA MUX */

		gpio-hog;

		gpios = <176 0>;

arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ca.dts

+2 −2
Original line number Diff line number Diff line
@@ -91,10 +91,10 @@ phy1: ethernet-phy@1 { 


&gpio0 {

	/* Disable hogging GP0_18 to output LOW */

	/delete-node/ qspi_en;

	/delete-node/ qspi-en-hog;



	/* Hog GP0_18 to output HIGH to enable VIN2 */

	vin2_en {

	vin2-en-hog {

		gpio-hog;

		gpios = <18 GPIO_ACTIVE_HIGH>;

		output-high;

arch/arm/boot/dts/r8a7742-iwg21d-q7.dts

+2 −2
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ &du { 
};



&gpio0 {

	touch-interrupt {

	touch-interrupt-hog {

		gpio-hog;

		gpios = <24 GPIO_ACTIVE_LOW>;

		input;
@@ -234,7 +234,7 @@ touch-interrupt { 
};



&gpio1 {

	can-trx-en-gpio{

	can-trx-en-hog {

		gpio-hog;

		gpios = <28 GPIO_ACTIVE_HIGH>;

		output-low;