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

Merge tag 'renesas-dts-for-v6.4-tag1' of... 

Merge tag 'renesas-dts-for-v6.4-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into soc/dt

Renesas DTS updates for v6.4

  - Add USB3 support for the RZ/V2M SoC and the RZ/V2M Evaluation Kit 2.0,
  - Add uSD card and eMMC support for the  RZ/V2M Evaluation Kit 2.0,
  - Add CAN-FD, thermal, GMSL2 video capture, and sound support for the
    R-Car V4H SoC and the White-Hawk development board,
  - Add PMU support for the RZ/G2UL, RZ/G2L{,C}, and RZ/V2L SoCs,
  - Drop support for the obsolete R-Car H3 ES1.* (R8A77950) SoC,
  - Add I2C EEPROM support for the Atmark Techno Armadillo-800-EVA, and
    the Renesas Condor and ULCB development boards,
  - Miscellaneous fixes and improvements.

* tag 'renesas-dts-for-v6.4-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel: (30 commits)
  arm64: dts: renesas: r8a779a0: Update CAN-FD to R-Car Gen4 compatible value
  arm64: dts: renesas: ulcb: Add I2C EEPROM for PMIC
  arm64: dts: renesas: condor: Add I2C EEPROM for PMIC
  ARM: dts: armadillo800eva: Add I2C EEPROM for MAC address
  arm64: dts: renesas: Remove R-Car H3 ES1.* devicetrees
  arm64: dts: renesas: white-hawk: Add R-Car Sound support
  arm64: dts: renesas: r8a779g0: R-Car Sound support
  arm64: dts: renesas: r9a07g043: Update IRQ numbers for SSI channels
  arm64: dts: renesas: r9a07g054: Update IRQ numbers for SSI channels
  arm64: dts: renesas: r9a07g044: Update IRQ numbers for SSI channels
  arm64: dts: renesas: r8a774c0: Remove bogus voltages from OPP table
  arm64: dts: renesas: r8a77990: Remove bogus voltages from OPP table
  arm64: dts: renesas: r9a07g054: Add Cortex-A55 PMU node
  arm64: dts: renesas: white-hawk-csi-dsi: Add and connect MAX96712
  arm64: dts: renesas: r8a779g0: Add and connect all CSI-2, ISP and VIN nodes
  arm64: dts: renesas: r8a779f0: Use proper labels for thermal zones
  arm64: dts: renesas: r8a779g0: Add thermal nodes
  arm64: dts: renesas: rzv2mevk2: Add uart0 pins
  arm64: dts: renesas: Drop specifying the GIC_CPU_MASK_SIMPLE() for GICv3 systems
  arm64: dts: renesas: r9a07g044: Add Cortex-A55 PMU node
  ...

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 5b9d7292 4db0ce40

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

+13 −6
Original line number Diff line number Diff line
@@ -196,6 +196,19 @@ &cmt1 { 


&i2c0 {

	status = "okay";



	wm8978: codec@1a {

		#sound-dai-cells = <0>;

		compatible = "wlf,wm8978";

		reg = <0x1a>;

	};



	eeprom@50 {

		compatible = "st,24c01", "atmel,24c01";

		reg = <0x50>;

		pagesize = <16>;

	};



	touchscreen@55 {

		compatible = "sitronix,st1232";

		reg = <0x55>;
@@ -205,12 +218,6 @@ touchscreen@55 { 
		pinctrl-names = "default";

		gpios = <&pfc 166 GPIO_ACTIVE_LOW>;

	};



	wm8978: codec@1a {

		#sound-dai-cells = <0>;

		compatible = "wlf,wm8978";

		reg = <0x1a>;

	};

};



&i2c2 {

arch/arm64/boot/dts/renesas/Makefile

+1 −4
Original line number Diff line number Diff line
@@ -28,10 +28,6 @@ dtb-$(CONFIG_ARCH_R8A774E1) += r8a774e1-hihope-rzg2h-ex.dtb 
dtb-$(CONFIG_ARCH_R8A774E1) += r8a774e1-hihope-rzg2h-ex-idk-1110wr.dtb

dtb-$(CONFIG_ARCH_R8A774E1) += r8a774e1-hihope-rzg2h-ex-mipi-2.1.dtb



dtb-$(CONFIG_ARCH_R8A77950) += r8a77950-salvator-x.dtb

dtb-$(CONFIG_ARCH_R8A77950) += r8a77950-ulcb.dtb

dtb-$(CONFIG_ARCH_R8A77950) += r8a77950-ulcb-kf.dtb



dtb-$(CONFIG_ARCH_R8A77951) += r8a77951-salvator-x.dtb

dtb-$(CONFIG_ARCH_R8A77951) += r8a77951-salvator-xs.dtb

dtb-$(CONFIG_ARCH_R8A77951) += r8a77951-ulcb.dtb
@@ -67,6 +63,7 @@ dtb-$(CONFIG_ARCH_R8A779A0) += r8a779a0-falcon.dtb 
dtb-$(CONFIG_ARCH_R8A779F0) += r8a779f0-spider.dtb



dtb-$(CONFIG_ARCH_R8A779G0) += r8a779g0-white-hawk.dtb

dtb-$(CONFIG_ARCH_R8A779G0) += r8a779g0-white-hawk-ard-audio-da7212.dtbo



dtb-$(CONFIG_ARCH_R8A77951) += r8a779m1-salvator-xs.dtb

dtb-$(CONFIG_ARCH_R8A77951) += r8a779m1-ulcb.dtb

arch/arm64/boot/dts/renesas/r8a774c0.dtsi

+0 −3
Original line number Diff line number Diff line
@@ -49,17 +49,14 @@ cluster1_opp: opp-table-1 { 
		opp-shared;

		opp-800000000 {

			opp-hz = /bits/ 64 <800000000>;

			opp-microvolt = <820000>;

			clock-latency-ns = <300000>;

		};

		opp-1000000000 {

			opp-hz = /bits/ 64 <1000000000>;

			opp-microvolt = <820000>;

			clock-latency-ns = <300000>;

		};

		opp-1200000000 {

			opp-hz = /bits/ 64 <1200000000>;

			opp-microvolt = <820000>;

			clock-latency-ns = <300000>;

			opp-suspend;

		};

arch/arm64/boot/dts/renesas/r8a77950-salvator-x.dts

deleted100644 → 0
+0 −49
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Device Tree Source for the Salvator-X board with R-Car H3 ES1.x

 *

 * Copyright (C) 2015 Renesas Electronics Corp.

 */



/dts-v1/;

#include "r8a77950.dtsi"

#include "salvator-x.dtsi"



/ {

	model = "Renesas Salvator-X board based on r8a77950";

	compatible = "renesas,salvator-x", "renesas,r8a7795";



	memory@48000000 {

		device_type = "memory";

		/* first 128MB is reserved for secure area. */

		reg = <0x0 0x48000000 0x0 0x38000000>;

	};



	memory@500000000 {

		device_type = "memory";

		reg = <0x5 0x00000000 0x0 0x40000000>;

	};



	memory@600000000 {

		device_type = "memory";

		reg = <0x6 0x00000000 0x0 0x40000000>;

	};



	memory@700000000 {

		device_type = "memory";

		reg = <0x7 0x00000000 0x0 0x40000000>;

	};

};



&du {

	clocks = <&cpg CPG_MOD 724>,

		 <&cpg CPG_MOD 723>,

		 <&cpg CPG_MOD 722>,

		 <&cpg CPG_MOD 721>,

		 <&versaclock5 1>,

		 <&x21_clk>,

		 <&x22_clk>,

		 <&versaclock5 2>;

	clock-names = "du.0", "du.1", "du.2", "du.3",

		      "dclkin.0", "dclkin.1", "dclkin.2", "dclkin.3";

};

arch/arm64/boot/dts/renesas/r8a77950-ulcb-kf.dts

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Device Tree Source for the H3ULCB Kingfisher board with R-Car H3 ES1.x

 *

 * Copyright (C) 2017 Renesas Electronics Corp.

 * Copyright (C) 2017 Cogent Embedded, Inc.

 */



#include "r8a77950-ulcb.dts"

#include "ulcb-kf.dtsi"



/ {

	model = "Renesas H3ULCB Kingfisher board based on r8a77950";

	compatible = "shimafuji,kingfisher", "renesas,h3ulcb",

		     "renesas,r8a7795";

};