Unverified Commit 4bd5b4c2 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'riscv-dt-fixes-for-v6.8-rc6' of... 

Merge tag 'riscv-dt-fixes-for-v6.8-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux

 into arm/fixes

RISC-V Devicetree fixes for v6.8-rc6

Two fixes for W=2 issues in devicetrees, which should constitute fixes
for all reasonable-to-fix W=2 problems on RISC-V. The others are caused
by standard USB and MMC property names containing underscores that are
not likely to ever change.

Signed-off-by: default avatarConor Dooley <conor.dooley@microchip.com>

* tag 'riscv-dt-fixes-for-v6.8-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux:
  riscv: dts: sifive: add missing #interrupt-cells to pmic
  riscv: dts: starfive: replace underscores in node names

Link: https://lore.kernel.org/r/20240221-foil-glade-09dbf1aa3fe2@spud


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents fe514e17 ce6b6d15

arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts

+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ pmic@58 { 
		interrupt-parent = <&gpio>;

		interrupts = <1 IRQ_TYPE_LEVEL_LOW>;

		interrupt-controller;

		#interrupt-cells = <2>;



		onkey {

			compatible = "dlg,da9063-onkey";

arch/riscv/boot/dts/starfive/jh7100.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -96,14 +96,14 @@ cpu-thermal { 
			thermal-sensors = <&sfctemp>;



			trips {

				cpu_alert0 {

				cpu-alert0 {

					/* milliCelsius */

					temperature = <75000>;

					hysteresis = <2000>;

					type = "passive";

				};



				cpu_crit {

				cpu-crit {

					/* milliCelsius */

					temperature = <90000>;

					hysteresis = <2000>;
@@ -113,28 +113,28 @@ cpu_crit { 
		};

	};



	osc_sys: osc_sys {

	osc_sys: osc-sys {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		/* This value must be overridden by the board */

		clock-frequency = <0>;

	};



	osc_aud: osc_aud {

	osc_aud: osc-aud {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		/* This value must be overridden by the board */

		clock-frequency = <0>;

	};



	gmac_rmii_ref: gmac_rmii_ref {

	gmac_rmii_ref: gmac-rmii-ref {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		/* Should be overridden by the board when needed */

		clock-frequency = <0>;

	};



	gmac_gr_mii_rxclk: gmac_gr_mii_rxclk {

	gmac_gr_mii_rxclk: gmac-gr-mii-rxclk {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		/* Should be overridden by the board when needed */

arch/riscv/boot/dts/starfive/jh7110.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -237,14 +237,14 @@ map0 { 
			};



			trips {

				cpu_alert0: cpu_alert0 {

				cpu_alert0: cpu-alert0 {

					/* milliCelsius */

					temperature = <85000>;

					hysteresis = <2000>;

					type = "passive";

				};



				cpu_crit {

				cpu-crit {

					/* milliCelsius */

					temperature = <100000>;

					hysteresis = <2000>;