fix(dts): remove duplicate label on qnovo_fet_ctrl_default

arch/arm/include/asm/arch_gicv3.h

@@ -276,6 +276,7 @@ static inline u64 __gic_readq_nonatomic(const volatile void __iomem *addr)
  *  The upper-word (aff3) will always be 0, so there is no need for a lock.
  */
 #define gic_write_irouter(v, c)		__gic_writeq_nonatomic(v, c)
+#define gic_read_irouter(c)		__gic_readq_nonatomic(c)
 
 /*
  * GICR_TYPER is an ID register and doesn't need atomicity.

arch/arm64/Kconfig.platforms

@@ -230,6 +230,16 @@ config ARCH_SDM660
 	  This enables support for the SDM660 chipset. If you do not
 	  wish to build a kernel that runs on this chipset, say 'N' here.
 
+config ARCH_SDM845
+	bool "Enable Support for Qualcomm Technologies Inc. SDM845"
+	depends on ARCH_QCOM
+	select COMMON_CLK
+	select COMMON_CLK_QCOM
+	select QCOM_GDSC
+	help
+	  This enables support for the SDM845 chipset. If you do not
+	  wish to build a kernel that runs on this chipset, say 'N' here.
+
 config ARCH_REALTEK
 	bool "Realtek Platforms"
 	help

arch/arm64/boot/dts/Makefile

@@ -33,7 +33,11 @@ subdir-y += zte
 
 
 else
+    ifeq ($(CONFIG_ARCH_SDM845),y)
+        subdir-y += qcom
+    else
         subdir-y += vendor
+    endif
 endif
 
 dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(foreach d,$(subdir), $(wildcard $(dtstree)/$(d)/*.dts)))

arch/arm64/boot/dts/qcom/Makefile

@@ -1,12 +1,66 @@
 # SPDX-License-Identifier: GPL-2.0
-dtb-$(CONFIG_ARCH_QCOM)	+= apq8016-sbc.dtb
-dtb-$(CONFIG_ARCH_QCOM)	+= apq8096-db820c.dtb
-dtb-$(CONFIG_ARCH_QCOM)	+= ipq8074-hk01.dtb
-dtb-$(CONFIG_ARCH_QCOM)	+= msm8916-mtp.dtb
-dtb-$(CONFIG_ARCH_QCOM)	+= msm8992-bullhead-rev-101.dtb
-dtb-$(CONFIG_ARCH_QCOM)	+= msm8994-angler-rev-101.dtb
-dtb-$(CONFIG_ARCH_QCOM)	+= msm8996-mtp.dtb
+# dtb-$(CONFIG_ARCH_QCOM)	+= apq8016-sbc.dtb
+# dtb-$(CONFIG_ARCH_QCOM)	+= apq8096-db820c.dtb
+# dtb-$(CONFIG_ARCH_QCOM)	+= ipq8074-hk01.dtb
+# dtb-$(CONFIG_ARCH_QCOM)	+= msm8916-mtp.dtb
+# dtb-$(CONFIG_ARCH_QCOM)	+= msm8992-bullhead-rev-101.dtb
+# dtb-$(CONFIG_ARCH_QCOM)	+= msm8994-angler-rev-101.dtb
+# dtb-$(CONFIG_ARCH_QCOM)	+= msm8996-mtp.dtb
+
+ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
+dtbo-$(CONFIG_ARCH_QCOM) += \
+	sdm845-mtp-overlay.dtbo \
+	sdm845-v2-mtp-overlay.dtbo \
+	sdm845-v2.1-mtp-overlay.dtbo \
+	enchilada-evb-v2.1-overlay.dtbo \
+	enchilada-t0-v2.1-overlay.dtbo \
+	enchilada-evt1-v2.1-overlay.dtbo \
+	enchilada-evt2-v2.1-overlay.dtbo \
+	enchilada-evt2-cxo-v2.1-overlay.dtbo \
+	enchilada-dvt-v2.1-overlay.dtbo \
+	enchilada-dvt-v2.1-backup-overlay.dtbo \
+	enchilada-dvt-v2.1-usb30-overlay.dtbo \
+	enchilada-pvt-v2.1-overlay.dtbo \
+	enchilada-pvt-v2.1-backup-overlay.dtbo \
+	enchilada-mp-v2.1-overlay.dtbo \
+	fajita-evb-v2.1-overlay.dtbo \
+	fajita-t0-v2.1-overlay.dtbo \
+	fajita-evt1-v2.1-overlay.dtbo \
+	fajita-dvt-v2.1-overlay.dtbo \
+	fajita-dvt-v2.1-bu-overlay.dtbo \
+	fajita-pvt-v2.1-overlay.dtbo \
+	fajita-pvt-v2.1-bu-overlay.dtbo \
+	fajita-pvt-v2.1-v1-overlay.dtbo \
+	fajita-pvt-v2.1-spec-overlay.dtbo \
+	fajita-mp-v2.1-spec-overlay.dtbo
+
+sdm845-mtp-overlay.dtbo-base := sdm845.dtb
+sdm845-v2-mtp-overlay.dtbo-base := sdm845-v2.dtb
+sdm845-v2.1-mtp-overlay.dtbo-base := sdm845-v2.1.dtb
+enchilada-evb-v2.1-overlay.dtbo-base := sdm845-v2.1.dtb
+enchilada-t0-v2.1-overlay.dtbo-base := sdm845-v2.1.dtb
+enchilada-evt1-v2.1-overlay.dtbo-base := sdm845-v2.1.dtb
+enchilada-evt2-v2.1-overlay.dtbo-base := sdm845-v2.1.dtb
+enchilada-evt2-cxo-v2.1-overlay.dtbo-base := sdm845-v2.1.dtb
+enchilada-dvt-v2.1-overlay.dtbo-base := sdm845-v2.1.dtb
+enchilada-dvt-v2.1-backup-overlay.dtbo-base := sdm845-v2.1.dtb
+enchilada-dvt-v2.1-usb30-overlay.dtbo-base := sdm845-v2.1.dtb
+enchilada-pvt-v2.1-overlay.dtbo-base := sdm845-v2.1.dtb
+enchilada-pvt-v2.1-backup-overlay.dtbo-base := sdm845-v2.1.dtb
+enchilada-mp-v2.1-overlay.dtbo-base := sdm845-v2.1.dtb
+fajita-evb-v2.1-overlay.dtbo-base := sdm845-v2.1.dtb
+fajita-t0-v2.1-overlay.dtbo-base := sdm845-v2.1.dtb
+fajita-evt1-v2.1-overlay.dtbo-base := sdm845-v2.1.dtb
+fajita-dvt-v2.1-overlay.dtbo-base := sdm845-v2.1.dtb
+fajita-dvt-v2.1-bu-overlay.dtbo-base := sdm845-v2.1.dtb
+fajita-pvt-v2.1-overlay.dtbo-base := sdm845-v2.1.dtb
+fajita-pvt-v2.1-bu-overlay.dtbo-base := sdm845-v2.1.dtb
+fajita-pvt-v2.1-v1-overlay.dtbo-base := sdm845-v2.1.dtb
+fajita-pvt-v2.1-spec-overlay.dtbo-base := sdm845-v2.1.dtb
+fajita-mp-v2.1-spec-overlay.dtbo-base := sdm845-v2.1.dtb
+else
 dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-mtp.dtb
+endif
 
 always		:= $(dtb-y)
 subdir-y	:= $(dts-dirs)

arch/arm64/boot/dts/qcom/OP-batterydata-3300mah.dtsi

@@ -0,0 +1,80 @@
+/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+qcom,OP_3300mah {
+	qcom,max-voltage-uv = <4370000>;
+	qcom,fg-cc-cv-threshold-mv = <4360>;
+	qcom,fastchg-current-ma = <3000>;
+	qcom,batt-id-kohm = <200>;
+	qcom,battery-beta = <3450>;
+	qcom,battery-type = "OP_3300mah";
+	qcom,checksum = <0xE06B>;
+	qcom,gui-version = "PMI8998GUI - 0.0.0.82";
+	qcom,fg-profile-data = [
+		 A4 1F 6E 05
+		 9C 0A 16 06
+		 32 1D 24 E5
+		 61 0B 1B 15
+		 AD 17 8C 22
+		 EB 3C 87 4A
+		 5B 00 00 00
+		 12 00 00 00
+		 00 00 62 C2
+		 0C CD D8 C2
+		 19 00 0C 00
+		 7E 00 C7 EC
+		 E3 05 5D FA
+		 97 F5 12 12
+		 C2 05 90 3B
+		 22 09 40 40
+		 07 00 05 00
+		 7D 1F DE 05
+		 3F 0A 73 06
+		 72 1D E2 F5
+		 6F 12 BF 1D
+		 88 18 FB 22
+		 8D 45 C6 52
+		 54 00 00 00
+		 0F 00 00 00
+		 00 00 BD CD
+		 55 C2 5D C5
+		 14 00 00 00
+		 7E 00 C7 EC
+		 60 06 BB 00
+		 B3 FC 61 03
+		 6A 06 78 1B
+		 B3 33 08 33
+		 07 10 00 00
+		 3E 0B 99 45
+		 14 00 19 00
+		 AE 01 0A FA
+		 FF 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+	];
+};

arch/arm64/boot/dts/qcom/OP-batterydata-3700mah.dtsi

@@ -0,0 +1,80 @@
+/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+qcom,OP_3700mAh {
+	qcom,max-voltage-uv = <4370000>;
+	qcom,fg-cc-cv-threshold-mv = <4360>;
+	qcom,fastchg-current-ma = <3000>;
+	qcom,batt-id-kohm = <200>;
+	qcom,battery-beta = <3450>;
+	qcom,battery-type = "OP_3700mAh";
+	qcom,checksum = <0xE06B>;
+	qcom,gui-version = "PMI8998GUI - 0.0.0.82";
+	qcom,fg-profile-data = [
+		 A4 1F 6E 05
+		 9C 0A 16 06
+		 32 1D 24 E5
+		 61 0B 1B 15
+		 AD 17 8C 22
+		 EB 3C 87 4A
+		 5B 00 00 00
+		 12 00 00 00
+		 00 00 62 C2
+		 0C CD D8 C2
+		 19 00 0C 00
+		 7E 00 C7 EC
+		 E3 05 5D FA
+		 97 F5 12 12
+		 C2 05 90 3B
+		 22 09 40 40
+		 07 00 05 00
+		 7D 1F DE 05
+		 3F 0A 73 06
+		 72 1D E2 F5
+		 6F 12 BF 1D
+		 88 18 FB 22
+		 8D 45 C6 52
+		 54 00 00 00
+		 0F 00 00 00
+		 00 00 BD CD
+		 55 C2 5D C5
+		 14 00 00 00
+		 7E 00 C7 EC
+		 60 06 BB 00
+		 B3 FC 61 03
+		 6A 06 78 1B
+		 B3 33 08 33
+		 07 10 00 00
+		 3E 0B 99 45
+		 14 00 19 00
+		 AE 01 0A FA
+		 FF 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+	];
+};

arch/arm64/boot/dts/qcom/dsi-panel-nt35597-dualmipi-wqxga-cmd.dtsi

@@ -0,0 +1,105 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
+ */
+
+&mdss_mdp {
+	dsi_dual_nt35597_cmd: qcom,mdss_dsi_nt35597_wqxga_cmd{
+		qcom,mdss-dsi-panel-name =
+			"Dual nt35597 cmd mode dsi panel without DSC";
+		qcom,mdss-dsi-panel-type = "dsi_cmd_mode";
+		qcom,mdss-dsi-virtual-channel-id = <0>;
+		qcom,mdss-dsi-stream = <0>;
+		qcom,mdss-dsi-bpp = <24>;
+		qcom,mdss-dsi-color-order = "rgb_swap_rgb";
+		qcom,mdss-dsi-underflow-color = <0xff>;
+		qcom,mdss-dsi-border-color = <0>;
+		qcom,mdss-dsi-traffic-mode = "non_burst_sync_event";
+		qcom,mdss-dsi-bllp-eof-power-mode;
+		qcom,mdss-dsi-bllp-power-mode;
+		qcom,mdss-dsi-lane-0-state;
+		qcom,mdss-dsi-lane-1-state;
+		qcom,mdss-dsi-lane-2-state;
+		qcom,mdss-dsi-lane-3-state;
+		qcom,adjust-timer-wakeup-ms = <1>;
+		qcom,mdss-dsi-reset-sequence = <1 10>, <0 10>, <1 10>;
+		qcom,mdss-pan-physical-width-dimension = <74>;
+		qcom,mdss-pan-physical-height-dimension = <131>;
+		qcom,mdss-dsi-t-clk-post = <0x0d>;
+		qcom,mdss-dsi-t-clk-pre = <0x2d>;
+		qcom,mdss-dsi-bl-max-level = <4095>;
+		qcom,mdss-dsi-dma-trigger = "trigger_sw";
+		qcom,mdss-dsi-mdp-trigger = "none";
+		qcom,mdss-dsi-te-pin-select = <1>;
+		qcom,mdss-dsi-wr-mem-start = <0x2c>;
+		qcom,mdss-dsi-wr-mem-continue = <0x3c>;
+		qcom,mdss-dsi-te-dcs-command = <1>;
+		qcom,mdss-dsi-te-check-enable;
+		qcom,mdss-dsi-te-using-te-pin;
+		qcom,ulps-enabled;
+
+		qcom,mdss-dsi-display-timings {
+			timing@0{
+				qcom,mdss-dsi-panel-width = <720>;
+				qcom,mdss-dsi-panel-height = <2560>;
+				qcom,mdss-dsi-h-front-porch = <100>;
+				qcom,mdss-dsi-h-back-porch = <32>;
+				qcom,mdss-dsi-h-pulse-width = <16>;
+				qcom,mdss-dsi-h-sync-skew = <0>;
+				qcom,mdss-dsi-v-back-porch = <7>;
+				qcom,mdss-dsi-v-front-porch = <8>;
+				qcom,mdss-dsi-v-pulse-width = <1>;
+				qcom,mdss-dsi-h-sync-pulse = <0>;
+				qcom,mdss-dsi-h-left-border = <0>;
+				qcom,mdss-dsi-h-right-border = <0>;
+				qcom,mdss-dsi-v-top-border = <0>;
+				qcom,mdss-dsi-v-bottom-border = <0>;
+				qcom,mdss-dsi-panel-framerate = <60>;
+				qcom,mdss-dsi-on-command =
+					[15 01 00 00 10 00 02 ff 10
+					15 01 00 00 10 00 02 fb 01
+					15 01 00 00 10 00 02 ba 03
+					15 01 00 00 10 00 02 e5 01
+					15 01 00 00 10 00 02 35 00
+					15 01 00 00 10 00 02 bb 10
+					15 01 00 00 10 00 02 b0 03
+					15 01 00 00 10 00 02 ff e0
+					15 01 00 00 10 00 02 fb 01
+					15 01 00 00 10 00 02 6b 3d
+					15 01 00 00 10 00 02 6c 3d
+					15 01 00 00 10 00 02 6d 3d
+					15 01 00 00 10 00 02 6e 3d
+					15 01 00 00 10 00 02 6f 3d
+					15 01 00 00 10 00 02 35 02
+					15 01 00 00 10 00 02 36 72
+					15 01 00 00 10 00 02 37 10
+					15 01 00 00 10 00 02 08 c0
+					15 01 00 00 10 00 02 ff 24
+					15 01 00 00 10 00 02 fb 01
+					15 01 00 00 10 00 02 c6 06
+					15 01 00 00 10 00 02 ff 10
+					05 01 00 00 a0 00 02 11 00
+					05 01 00 00 a0 00 02 29 00];
+
+				qcom,mdss-dsi-off-command = [05 01 00 00 0a 00
+					02 28 00 05 01 00 00 3c 00 02 10 00];
+
+				qcom,mdss-dsi-on-command-state = "dsi_lp_mode";
+				qcom,mdss-dsi-off-command-state = "dsi_hs_mode";
+				qcom,mdss-dsi-panel-timings = [cd 32 22 00 60
+					64 26 34 29 03 04 00];
+
+				qcom,config-select =
+					<&dsi_dual_nt35597_cmd_config0>;
+
+				dsi_dual_nt35597_cmd_config0: config0 {
+					qcom,split-mode = "dualctl-split";
+				};
+
+				dsi_dual_nt35597_cmd_config1: config1 {
+					qcom,split-mode = "pingpong-split";
+				};
+			};
+		};
+	};
+};