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

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

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

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

  - External interrupt (INTC-EX) support for the R-Car M3-W+ SoC,
  - Initial support for the new RZ/G2L SoC on the RZ/G2L SMARC EVK
    board,
  - Miscellaneous fixes and improvements.

* tag 'renesas-arm-dt-for-v5.14-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
  arm64: dts: renesas: r9a07g044: Add SYSC node
  arm64: dts: renesas: Add initial device tree for RZ/G2L SMARC EVK
  arm64: dts: renesas: Add initial DTSI for RZ/G2{L,LC} SoC's
  dt-bindings: clock: Add r9a07g044 CPG Clock Definitions
  arm64: dts: renesas: r8a779a0: Drop power-domains property from GIC node
  arm64: dts: renesas: r8a77961: Add INTC-EX device node
  ARM: dts: silk: Configure pull-up for SOFT_SW GPIO keys
  ARM: dts: gose: Configure pull-up for SOFT_SW GPIO keys
  ARM: dts: blanche: Configure pull-up for SOFT_SW and SW25 GPIO keys
  ARM: dts: lager: Configure pull-up for SOFT_SW GPIO keys
  arm64: dts: renesas: r8a7796[01]: Fix OPP table entry voltages
  arm64: dts: renesas: Add missing opp-suspend properties

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


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 9bfa3829 42bbd003

arch/arm/boot/dts/r8a7790-lager.dts

+8 −0
Original line number Diff line number Diff line
@@ -81,6 +81,9 @@ lbsc { 
	keyboard {

		compatible = "gpio-keys";



		pinctrl-0 = <&keyboard_pins>;

		pinctrl-names = "default";



		one {

			linux,code = <KEY_1>;

			label = "SW2-1";
@@ -659,6 +662,11 @@ sound_clk_pins: sound_clk { 
		groups = "audio_clk_a";

		function = "audio_clk";

	};



	keyboard_pins: keyboard {

		pins = "GP_1_14", "GP_1_24", "GP_1_26", "GP_1_28";

		bias-pull-up;

	};

};



&ether {

arch/arm/boot/dts/r8a7792-blanche.dts

+8 −0
Original line number Diff line number Diff line
@@ -112,6 +112,9 @@ x2_clk: x2 { 
	keyboard {

		compatible = "gpio-keys";



		pinctrl-0 = <&keyboard_pins>;

		pinctrl-names = "default";



		key-1 {

			linux,code = <KEY_1>;

			label = "SW2-1";
@@ -235,6 +238,11 @@ du1_pins: du1 { 
		function = "du1";

	};



	keyboard_pins: keyboard {

		pins = "GP_3_10", "GP_3_11", "GP_3_12", "GP_3_15", "GP_11_02";

		bias-pull-up;

	};



	pmic_irq_pins: pmicirq {

		groups = "intc_irq2";

		function = "intc";

arch/arm/boot/dts/r8a7793-gose.dts

+9 −1
Original line number Diff line number Diff line
@@ -64,9 +64,12 @@ memory@40000000 { 
		reg = <0 0x40000000 0 0x40000000>;

	};



	gpio-keys {

	keyboard {

		compatible = "gpio-keys";



		pinctrl-0 = <&keyboard_pins>;

		pinctrl-names = "default";



		key-1 {

			gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_1>;
@@ -567,6 +570,11 @@ sound_clk_pins: sound_clk { 
		function = "audio_clk";

	};



	keyboard_pins: keyboard {

		pins = "GP_5_0", "GP_5_1", "GP_5_2", "GP_5_3";

		bias-pull-up;

	};



	vin0_pins: vin0 {

		groups = "vin0_data24", "vin0_sync", "vin0_clkenb", "vin0_clk";

		function = "vin0";

arch/arm/boot/dts/r8a7794-silk.dts

+9 −1
Original line number Diff line number Diff line
@@ -45,9 +45,12 @@ memory@40000000 { 
		reg = <0 0x40000000 0 0x40000000>;

	};



	gpio-keys {

	keyboard {

		compatible = "gpio-keys";



		pinctrl-0 = <&keyboard_pins>;

		pinctrl-names = "default";



		key-3 {

			gpios = <&gpio5 10 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_3>;
@@ -358,6 +361,11 @@ du1_pins: du1 { 
		function = "du1";

	};



	keyboard_pins: keyboard {

		pins = "GP_3_9", "GP_3_10", "GP_3_11", "GP_3_12";

		bias-pull-up;

	};



	ssi_pins: sound {

		groups = "ssi0129_ctrl", "ssi0_data", "ssi1_data";

		function = "ssi";

arch/arm64/boot/dts/renesas/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -62,3 +62,5 @@ dtb-$(CONFIG_ARCH_R8A77990) += r8a77990-ebisu.dtb 
dtb-$(CONFIG_ARCH_R8A77995) += r8a77995-draak.dtb



dtb-$(CONFIG_ARCH_R8A779A0) += r8a779a0-falcon.dtb



dtb-$(CONFIG_ARCH_R9A07G044) += r9a07g044l2-smarc.dtb