--- /dev/null
+From ac919b7da7cdc1246990138a1bad3f087cd7cdcd Mon Sep 17 00:00:00 2001
+From: Zoltan HERPAI <wigyori@uid0.hu>
+Date: Tue, 30 May 2023 00:24:18 +0200
+Subject: [PATCH 121/121] dts/6.1: jh7100: fixups, remove audio blocks
+
+Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
+---
+ .../riscv/boot/dts/starfive/jh7100-common.dtsi | 4 ++--
+ arch/riscv/boot/dts/starfive/jh7100.dtsi | 18 +++++++++---------
+ 2 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/arch/riscv/boot/dts/starfive/jh7100-common.dtsi b/arch/riscv/boot/dts/starfive/jh7100-common.dtsi
+index 1a36da546137..c39ef1f8c1aa 100644
+--- a/arch/riscv/boot/dts/starfive/jh7100-common.dtsi
++++ b/arch/riscv/boot/dts/starfive/jh7100-common.dtsi
+@@ -491,11 +491,11 @@
+ status = "okay";
+ };
+
+-&pwmdac {
++/*&pwmdac {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pwmdac_pins>;
+ status = "okay";
+-};
++};*/
+
+ &qspi {
+ nor_flash: nor-flash@0 {
+diff --git a/arch/riscv/boot/dts/starfive/jh7100.dtsi b/arch/riscv/boot/dts/starfive/jh7100.dtsi
+index c67688aaaebd..8c52b3ad05c4 100644
+--- a/arch/riscv/boot/dts/starfive/jh7100.dtsi
++++ b/arch/riscv/boot/dts/starfive/jh7100.dtsi
+@@ -6,9 +6,9 @@
+
+ /dts-v1/;
+ #include <dt-bindings/clock/starfive-jh7100.h>
+-#include <dt-bindings/clock/starfive-jh7100-audio.h>
++//#include <dt-bindings/clock/starfive-jh7100-audio.h>
+ #include <dt-bindings/reset/starfive-jh7100.h>
+-#include <dt-bindings/reset/starfive-jh7100-audio.h>
++//#include <dt-bindings/reset/starfive-jh7100-audio.h>
+
+ / {
+ compatible = "starfive,jh7100";
+@@ -271,7 +271,7 @@
+ dma-names = "rx";
+ };
+
+- i2svad: i2svad@10420000 {
++/* i2svad: i2svad@10420000 {
+ compatible = "starfive,sf-i2svad";
+ reg = <0x0 0x10420000 0x0 0x1000> ;
+ clocks = <&audclk JH7100_AUDCLK_I2SVAD_APB>;
+@@ -358,7 +358,7 @@
+ clock-names = "audio_src", "audio_12288", "dom7ahb_bus";
+ #clock-cells = <1>;
+ };
+-
++*/
+ spdif_transmitter: spdif-transmitter {
+ compatible = "linux,spdif-dit";
+ #sound-dai-cells = <0>;
+@@ -379,14 +379,14 @@
+ #sound-dai-cells = <0>;
+ };
+
+- sound: snd-card {
++/* sound: snd-card {
+ compatible = "simple-audio-card";
+ simple-audio-card,name = "Starfive-Multi-Sound-Card";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ /* pwmdac */
+- simple-audio-card,dai-link@0 {
++/* simple-audio-card,dai-link@0 {
+ reg = <0>;
+ status = "okay";
+ format = "left_j";
+@@ -402,7 +402,7 @@
+ };
+ };
+ };
+-
++*/
+ usb3: usb@104c0000 {
+ compatible = "cdns,usb3";
+ reg = <0x0 0x104c0000 0x0 0x10000>, // memory area for HOST registers
+@@ -734,7 +734,7 @@
+ status = "disabled";
+ };
+
+- watchdog@12480000 {
++/* watchdog@12480000 {
+ compatible = "starfive,jh7100-wdt";
+ reg = <0x0 0x12480000 0x0 0x10000>;
+ clocks = <&clkgen JH7100_CLK_WDTIMER_APB>,
+@@ -743,7 +743,7 @@
+ resets = <&rstgen JH7100_RSTN_WDTIMER_APB>,
+ <&rstgen JH7100_RSTN_WDT>;
+ };
+-
++*/
+ watchdog@12480000 {
+ compatible = "starfive,si5-wdt";
+ reg = <0x0 0x12480000 0x0 0x10000>;
+--
+2.20.1
+