diff --git a/Kbuild b/Kbuild
index da849afb..82161dd3 100644
--- a/Kbuild
+++ b/Kbuild
@@ -4,8 +4,7 @@ dtbo-y += gpu/pineapple-gpu.dtbo \
 endif
 
 ifeq ($(CONFIG_ARCH_SUN), y)
-dtbo-y += gpu/sun-gpu.dtbo \
-		gpu/sun-v2-gpu.dtbo
+dtbo-y += gpu/sun-gpu.dtbo
 endif
 
 always-y    := $(dtb-y) $(dtbo-y)
diff --git a/gpu/sun-v2-gpu-pwrlevels.dtsi b/gpu/sun-v2-gpu-pwrlevels.dtsi
deleted file mode 100644
index 8d44b096..00000000
--- a/gpu/sun-v2-gpu-pwrlevels.dtsi
+++ /dev/null
@@ -1,369 +0,0 @@
-// SPDX-License-Identifier: BSD-3-Clause
-/*
- * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved.
- */
-
-/* ACD Control register values */
-#define ACD_LEVEL_TURBO_L3    0x882a5ffd
-#define ACD_LEVEL_TURBO_L1    0x882a5ffd
-#define ACD_LEVEL_NOM_L1      0x882b5ffd
-#define ACD_LEVEL_NOM         0x882b5ffd
-#define ACD_LEVEL_SVS_L2      0x882b5ffd
-#define ACD_LEVEL_SVS_L1      0xa82b5ffd
-#define ACD_LEVEL_SVS_L0      0x882d5ffd
-#define ACD_LEVEL_SVS         0xa82e5ffd
-#define ACD_LEVEL_LOW_SVS_L1  0xc0285ffd
-#define ACD_LEVEL_LOW_SVS     0xe02d5ffd
-#define ACD_LEVEL_LOW_SVS_D0  0xe02f5ffd
-#define ACD_LEVEL_LOW_SVS_D1  0xe8285ffd
-#define ACD_LEVEL_LOW_SVS_D2  0xe82f5ffd
-
-&msm_gpu {
-	/* Power levels */
-	qcom,gpu-pwrlevel-bins {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		compatible = "qcom,gpu-pwrlevels-bins";
-
-		qcom,gpu-pwrlevels-0 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			qcom,initial-pwrlevel = <9>;
-			qcom,initial-min-pwrlevel = <9>;
-			qcom,sku-codes = <SKU_CODE(PCODE_UNKNOWN, FC_AB)
-					SKU_CODE(PCODE_UNKNOWN, FC_AC)>;
-
-			/* NOM */
-			qcom,gpu-pwrlevel@0 {
-				reg = <0>;
-				qcom,gpu-freq = <900000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_NOM>;
-
-				qcom,bus-freq = <11>;
-				qcom,bus-min = <11>;
-				qcom,bus-max = <11>;
-
-				qcom,acd-level = <ACD_LEVEL_NOM>;
-			};
-
-			/* SVS_L2 */
-			qcom,gpu-pwrlevel@1 {
-				reg = <1>;
-				qcom,gpu-freq = <832000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_SVS_L2>;
-
-				qcom,bus-freq = <10>;
-				qcom,bus-min = <7>;
-				qcom,bus-max = <10>;
-
-				qcom,acd-level = <ACD_LEVEL_SVS_L2>;
-			};
-
-			/* SVS_L1 */
-			qcom,gpu-pwrlevel@2 {
-				reg = <2>;
-				qcom,gpu-freq = <734000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_SVS_L1>;
-
-				qcom,bus-freq = <8>;
-				qcom,bus-min = <6>;
-				qcom,bus-max = <10>;
-
-				qcom,acd-level = <ACD_LEVEL_SVS_L1>;
-			};
-
-			/* SVS_L0 */
-			qcom,gpu-pwrlevel@3 {
-				reg = <3>;
-				qcom,gpu-freq = <660000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_SVS_L0>;
-
-				qcom,bus-freq = <6>;
-				qcom,bus-min = <4>;
-				qcom,bus-max = <7>;
-
-				qcom,acd-level = <ACD_LEVEL_SVS_L0>;
-			};
-
-			/* SVS */
-			qcom,gpu-pwrlevel@4 {
-				reg = <4>;
-				qcom,gpu-freq = <607000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_SVS>;
-
-				qcom,bus-freq = <6>;
-				qcom,bus-min = <4>;
-				qcom,bus-max = <7>;
-
-				qcom,acd-level = <ACD_LEVEL_SVS>;
-			};
-
-			/* Low_SVS_L1 */
-			qcom,gpu-pwrlevel@5 {
-				reg = <5>;
-				qcom,gpu-freq = <525000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_LOW_SVS_L1>;
-
-				qcom,bus-freq = <4>;
-				qcom,bus-min = <2>;
-				qcom,bus-max = <6>;
-
-				qcom,acd-level = <ACD_LEVEL_LOW_SVS_L1>;
-			};
-
-			/* Low_SVS */
-			qcom,gpu-pwrlevel@6 {
-				reg = <6>;
-				qcom,gpu-freq = <443000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_LOW_SVS>;
-
-				qcom,bus-freq = <4>;
-				qcom,bus-min = <2>;
-				qcom,bus-max = <6>;
-
-				qcom,acd-level = <ACD_LEVEL_LOW_SVS>;
-			};
-
-			/* Low_SVS_D0 */
-			qcom,gpu-pwrlevel@7 {
-				reg = <7>;
-				qcom,gpu-freq = <389000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_LOW_SVS_D0>;
-
-				qcom,bus-freq = <4>;
-				qcom,bus-min = <2>;
-				qcom,bus-max = <6>;
-
-				qcom,acd-level = <ACD_LEVEL_LOW_SVS_D0>;
-			};
-
-			/* Low_SVS_D1 */
-			qcom,gpu-pwrlevel@8 {
-				reg = <8>;
-				qcom,gpu-freq = <342000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_LOW_SVS_D1>;
-
-				qcom,bus-freq = <3>;
-				qcom,bus-min = <2>;
-				qcom,bus-max = <6>;
-
-				qcom,acd-level = <ACD_LEVEL_LOW_SVS_D1>;
-			};
-
-			/* Low_SVS_D2 */
-			qcom,gpu-pwrlevel@9 {
-				reg = <9>;
-				qcom,gpu-freq = <222000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_LOW_SVS_D2>;
-
-				qcom,bus-freq = <3>;
-				qcom,bus-min = <2>;
-				qcom,bus-max = <3>;
-
-				qcom,acd-level = <ACD_LEVEL_LOW_SVS_D2>;
-			};
-
-			/* Low_SVS_D3 */
-			qcom,gpu-pwrlevel@10 {
-				reg = <10>;
-				qcom,gpu-freq = <160000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_LOW_SVS_D3>;
-
-				qcom,bus-freq = <2>;
-				qcom,bus-min = <2>;
-				qcom,bus-max = <2>;
-			};
-		};
-
-		qcom,gpu-pwrlevels-1 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			qcom,initial-pwrlevel = <12>;
-			qcom,initial-min-pwrlevel = <12>;
-			qcom,sku-codes = <SKU_CODE(PCODE_UNKNOWN, FC_UNKNOWN)>;
-
-			/* TURBO_L3 */
-			qcom,gpu-pwrlevel@0 {
-				reg = <0>;
-				qcom,gpu-freq = <1150000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_TURBO_L3>;
-
-				qcom,bus-freq = <11>;
-				qcom,bus-min = <11>;
-				qcom,bus-max = <11>;
-
-				qcom,acd-level = <ACD_LEVEL_TURBO_L3>;
-			};
-
-			/* TURBO_L1 */
-			qcom,gpu-pwrlevel@1 {
-				reg = <1>;
-				qcom,gpu-freq = <1050000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_TURBO_L1>;
-
-				qcom,bus-freq = <11>;
-				qcom,bus-min = <11>;
-				qcom,bus-max = <11>;
-
-				qcom,acd-level = <ACD_LEVEL_TURBO_L1>;
-			};
-
-			/* NOM_L1 */
-			qcom,gpu-pwrlevel@2 {
-				reg = <2>;
-				qcom,gpu-freq = <967000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_NOM_L1>;
-
-				qcom,bus-freq = <10>;
-				qcom,bus-min = <10>;
-				qcom,bus-max = <11>;
-
-				qcom,acd-level = <ACD_LEVEL_NOM_L1>;
-			};
-
-			/* NOM */
-			qcom,gpu-pwrlevel@3 {
-				reg = <3>;
-				qcom,gpu-freq = <900000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_NOM>;
-
-				qcom,bus-freq = <10>;
-				qcom,bus-min = <7>;
-				qcom,bus-max = <10>;
-
-				qcom,acd-level = <ACD_LEVEL_NOM>;
-			};
-
-			/* SVS_L2 */
-			qcom,gpu-pwrlevel@4 {
-				reg = <4>;
-				qcom,gpu-freq = <832000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_SVS_L2>;
-
-				qcom,bus-freq = <10>;
-				qcom,bus-min = <7>;
-				qcom,bus-max = <10>;
-
-				qcom,acd-level = <ACD_LEVEL_SVS_L2>;
-			};
-
-			/* SVS_L1 */
-			qcom,gpu-pwrlevel@5 {
-				reg = <5>;
-				qcom,gpu-freq = <734000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_SVS_L1>;
-
-				qcom,bus-freq = <8>;
-				qcom,bus-min = <6>;
-				qcom,bus-max = <10>;
-
-				qcom,acd-level = <ACD_LEVEL_SVS_L1>;
-			};
-
-			/* SVS_L0 */
-			qcom,gpu-pwrlevel@6 {
-				reg = <6>;
-				qcom,gpu-freq = <660000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_SVS_L0>;
-
-				qcom,bus-freq = <6>;
-				qcom,bus-min = <4>;
-				qcom,bus-max = <7>;
-
-				qcom,acd-level = <ACD_LEVEL_SVS_L0>;
-			};
-
-			/* SVS */
-			qcom,gpu-pwrlevel@7 {
-				reg = <7>;
-				qcom,gpu-freq = <607000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_SVS>;
-
-				qcom,bus-freq = <6>;
-				qcom,bus-min = <4>;
-				qcom,bus-max = <7>;
-
-				qcom,acd-level = <ACD_LEVEL_SVS>;
-			};
-
-			/* Low_SVS_L1 */
-			qcom,gpu-pwrlevel@8 {
-				reg = <8>;
-				qcom,gpu-freq = <525000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_LOW_SVS_L1>;
-
-				qcom,bus-freq = <4>;
-				qcom,bus-min = <2>;
-				qcom,bus-max = <6>;
-
-				qcom,acd-level = <ACD_LEVEL_LOW_SVS_L1>;
-			};
-
-			/* Low_SVS */
-			qcom,gpu-pwrlevel@9 {
-				reg = <9>;
-				qcom,gpu-freq = <443000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_LOW_SVS>;
-
-				qcom,bus-freq = <4>;
-				qcom,bus-min = <2>;
-				qcom,bus-max = <6>;
-
-				qcom,acd-level = <ACD_LEVEL_LOW_SVS>;
-			};
-
-			/* Low_SVS_D0 */
-			qcom,gpu-pwrlevel@10 {
-				reg = <10>;
-				qcom,gpu-freq = <389000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_LOW_SVS_D0>;
-
-				qcom,bus-freq = <4>;
-				qcom,bus-min = <2>;
-				qcom,bus-max = <6>;
-
-				qcom,acd-level = <ACD_LEVEL_LOW_SVS_D0>;
-			};
-
-			/* Low_SVS_D1 */
-			qcom,gpu-pwrlevel@11 {
-				reg = <11>;
-				qcom,gpu-freq = <342000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_LOW_SVS_D1>;
-
-				qcom,bus-freq = <3>;
-				qcom,bus-min = <2>;
-				qcom,bus-max = <6>;
-
-				qcom,acd-level = <ACD_LEVEL_LOW_SVS_D1>;
-			};
-
-			/* Low_SVS_D2 */
-			qcom,gpu-pwrlevel@12 {
-				reg = <12>;
-				qcom,gpu-freq = <222000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_LOW_SVS_D2>;
-
-				qcom,bus-freq = <3>;
-				qcom,bus-min = <2>;
-				qcom,bus-max = <3>;
-
-				qcom,acd-level = <ACD_LEVEL_LOW_SVS_D2>;
-			};
-
-			/* Low_SVS_D3 */
-			qcom,gpu-pwrlevel@13 {
-				reg = <13>;
-				qcom,gpu-freq = <160000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_LOW_SVS_D3>;
-
-				qcom,bus-freq = <2>;
-				qcom,bus-min = <2>;
-				qcom,bus-max = <2>;
-			};
-		};
-	};
-};
diff --git a/gpu/sun-v2-gpu.dts b/gpu/sun-v2-gpu.dts
deleted file mode 100644
index f317c536..00000000
--- a/gpu/sun-v2-gpu.dts
+++ /dev/null
@@ -1,26 +0,0 @@
-// SPDX-License-Identifier: BSD-3-Clause
-/*
- * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved.
- */
-
-/dts-v1/;
-/plugin/;
-
-#include <dt-bindings/clock/qcom,aop-qmp.h>
-#include <dt-bindings/clock/qcom,gcc-sun.h>
-#include <dt-bindings/clock/qcom,gpucc-sun.h>
-#include <dt-bindings/clock/qcom,rpmh.h>
-#include <dt-bindings/interconnect/qcom,sun.h>
-#include <dt-bindings/interrupt-controller/arm-gic.h>
-#include <dt-bindings/regulator/qcom,rpmh-regulator-levels.h>
-#include <dt-bindings/interrupt-controller/arm-gic.h>
-
-#include "sun-v2-gpu.dtsi"
-#include "sun-v2-gpu-pwrlevels.dtsi"
-
-/ {
-	model = "Qualcomm Technologies, Inc. sun";
-	compatible = "qcom,sun";
-	qcom,msm-id = <0x26a 0x20000>, <0x27f 0x20000>, <0x100026a 0x20000>, <0x100027f 0x20000>;
-	qcom,board-id = <0 0>;
-};
diff --git a/gpu/sun-v2-gpu.dtsi b/gpu/sun-v2-gpu.dtsi
deleted file mode 100644
index b9366d3f..00000000
--- a/gpu/sun-v2-gpu.dtsi
+++ /dev/null
@@ -1,14 +0,0 @@
-// SPDX-License-Identifier: BSD-3-Clause
-/*
- * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved.
- */
-
-#include "sun-gpu.dtsi"
-
-&msm_gpu {
-	compatible = "qcom,adreno-gpu-gen8-0-1", "qcom,kgsl-3d0";
-
-	qcom,gpu-model = "Adreno830v2";
-
-	qcom,chipid = <0x44050001>;
-};