From c99f88ab5b9d2821050650b8dc9b668386abbef5 Mon Sep 17 00:00:00 2001
From: MarvelMathesh <123v.mathesh@gmail.com>
Date: Fri, 31 May 2024 11:17:00 +0530
Subject: [PATCH 1/2] arm64: dts: qcom: msm8953: Add device tree for 10or G
---
arch/arm64/boot/dts/qcom/Makefile | 1 +
arch/arm64/boot/dts/qcom/msm8953-10or-g.dts | 310 ++++++++++++++++++++
2 files changed, 311 insertions(+)
create mode 100644 arch/arm64/boot/dts/qcom/msm8953-10or-g.dts
diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
index 756acaf7dd58c4..4391df02e52be6 100644
--- a/arch/arm64/boot/dts/qcom/Makefile
+++ b/arch/arm64/boot/dts/qcom/Makefile
@@ -53,6 +53,7 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8939-huawei-kiwi.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8939-longcheer-l9100.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8939-samsung-a7.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8939-sony-xperia-kanuti-tulip.dtb
+dtb-$(CONFIG_ARCH_QCOM) += msm8953-10or-g.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8953-huawei-milan.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8953-lenovo-kuntao.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8953-motorola-potter.dtb
diff --git a/arch/arm64/boot/dts/qcom/msm8953-10or-g.dts b/arch/arm64/boot/dts/qcom/msm8953-10or-g.dts
new file mode 100644
index 00000000000000..b158e6e4cd3621
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/msm8953-10or-g.dts
@@ -0,0 +1,310 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2024, MarvelMathesh <123v.mathesh@gmail.com>
+ */
+/dts-v1/;
+
+#include "msm8953.dtsi"
+#include "pm8953.dtsi"
+#include "pmi8950.dtsi"
+
+/delete-node/ &qseecom_mem;
+
+/ {
+ model = "10or G";
+ compatible = "10or,g", "qcom,msm8953";
+ chassis-type = "handset";
+ qcom,msm-id = <293 0x0>;
+ qcom,board-id = <0x2000b 0x0>;
+
+ battery: battery {
+ compatible = "simple-battery";
+ charge-full-design-microamp-hours = <4000000>;
+ constant-charge-current-max-microamp = <1000000>;
+ voltage-min-design-microvolt = <3400000>;
+ voltage-max-design-microvolt = <4400000>;
+ };
+
+ gpio-keys {
+ compatible = "gpio-keys";
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&gpio_key_default>;
+
+ key-volume-up {
+ label = "Volume Up";
+ gpios = <&tlmm 85 GPIO_ACTIVE_LOW>;
+ linux,code = <KEY_VOLUMEUP>;
+ };
+ };
+
+ reserved-memory {
+ qseecom_mem: qseecom@84a00000 {
+ reg = <0x0 0x84a00000 0x0 0x1900000>;
+ no-map;
+ };
+
+ ramoops@9ff00000 {
+ compatible = "ramoops";
+ reg = <0x0 0x9ff00000 0x0 0x00100000>;
+ console-size = <0x100000>;
+ };
+ };
+
+ vph_pwr: vph-pwr-regulator {
+ compatible = "regulator-fixed";
+ regulator-name = "vph_pwr";
+ regulator-always-on;
+ regulator-boot-on;
+ };
+};
+
+&hsusb_phy {
+ vdd-supply = <&pm8953_l3>;
+ vdda-pll-supply = <&pm8953_l7>;
+ vdda-phy-dpdm-supply = <&pm8953_l13>;
+ status = "okay";
+};
+
+&pm8953_resin {
+ linux,code = <KEY_VOLUMEDOWN>;
+ status = "okay";
+};
+
+&pmi8950_fg {
+ monitored-battery = <&battery>;
+ power-supplies = <&pmi8950_smbcharger>;
+
+ status = "okay";
+};
+
+&pmi8950_smbcharger {
+ monitored-battery = <&battery>;
+
+ status = "okay";
+};
+
+&rpm_requests {
+ regulators {
+ compatible = "qcom,rpm-pm8953-regulators";
+
+ vdd_s1-supply = <&vph_pwr>;
+ vdd_s2-supply = <&vph_pwr>;
+ vdd_s3-supply = <&vph_pwr>;
+ vdd_s4-supply = <&vph_pwr>;
+ vdd_s5-supply = <&vph_pwr>;
+ vdd_s6-supply = <&vph_pwr>;
+ vdd_s7-supply = <&vph_pwr>;
+ vdd_l1-supply = <&pm8953_s3>;
+ vdd_l2_l3-supply = <&pm8953_s3>;
+ vdd_l4_l5_l6_l7_l16_l19-supply = <&pm8953_s4>;
+ vdd_l8_l11_l12_l13_l14_l15-supply = <&vph_pwr>;
+ vdd_l9_l10_l17_l18_l22-supply = <&vph_pwr>;
+ vdd_l23-supply = <&pm8953_s3>;
+
+ pm8953_s1: s1 {
+ regulator-min-microvolt = <863000>;
+ regulator-max-microvolt = <1152000>;
+ };
+
+ pm8953_s3: s3 {
+ regulator-min-microvolt = <984000>;
+ regulator-max-microvolt = <1224000>;
+ };
+
+ pm8953_s4: s4 {
+ regulator-min-microvolt = <1896000>;
+ regulator-max-microvolt = <2048000>;
+ };
+
+ pm8953_l1: l1 {
+ regulator-min-microvolt = <1000000>;
+ regulator-max-microvolt = <1100000>;
+ };
+
+ pm8953_l2: l2 {
+ regulator-min-microvolt = <975000>;
+ regulator-max-microvolt = <1225000>;
+ };
+
+ pm8953_l3: l3 {
+ regulator-min-microvolt = <925000>;
+ regulator-max-microvolt = <925000>;
+ regulator-allow-set-load;
+ };
+
+ pm8953_l5: l5 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ };
+
+ pm8953_l6: l6 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ };
+
+ pm8953_l7: l7 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1900000>;
+ };
+
+ pm8953_l8: l8 {
+ regulator-min-microvolt = <2900000>;
+ regulator-max-microvolt = <2900000>;
+ };
+
+ pm8953_l9: l9 {
+ regulator-min-microvolt = <3000000>;
+ regulator-max-microvolt = <3300000>;
+ };
+
+ pm8953_l10: l10 {
+ regulator-min-microvolt = <2850000>;
+ regulator-max-microvolt = <2850000>;
+ };
+
+ pm8953_l11: l11 {
+ regulator-min-microvolt = <2950000>;
+ regulator-max-microvolt = <2950000>;
+ };
+
+ pm8953_l12: l12 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <2950000>;
+ };
+
+ pm8953_l13: l13 {
+ regulator-min-microvolt = <3125000>;
+ regulator-max-microvolt = <3125000>;
+ };
+
+ pm8953_l16: l16 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ };
+
+ pm8953_l17: l17 {
+ regulator-min-microvolt = <2750000>;
+ regulator-max-microvolt = <2850000>;
+ };
+
+ pm8953_l19: l19 {
+ regulator-min-microvolt = <1200000>;
+ regulator-max-microvolt = <1350000>;
+ };
+
+ pm8953_l22: l22 {
+ regulator-min-microvolt = <2800000>;
+ regulator-max-microvolt = <2850000>;
+ };
+
+ pm8953_l23: l23 {
+ regulator-min-microvolt = <975000>;
+ regulator-max-microvolt = <1225000>;
+ };
+ };
+};
+
+&sdhc_1 {
+ vmmc-supply = <&pm8953_l8>;
+ vqmmc-supply = <&pm8953_l5>;
+
+ status = "okay";
+};
+
+&sdhc_2 {
+ vmmc-supply = <&pm8953_l11>;
+ vqmmc-supply = <&pm8953_l12>;
+
+ cd-gpios = <&tlmm 133 GPIO_ACTIVE_LOW>;
+
+ pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_off>;
+ pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
+ pinctrl-names = "default", "sleep";
+
+ status = "okay";
+};
+
+&tlmm {
+ gpio-reserved-ranges = <0 4>, <135 4>;
+
+ ts_int_active: ts-int-active-state {
+ pins = "gpio65";
+ function = "gpio";
+ drive-strength = <8>;
+ bias-pull-up;
+ };
+
+ ts_int_default: ts-int-default {
+ pins = "gpio65";
+ function = "gpio";
+ drive-strength = <16>;
+ input-enable;
+ bias-disable;
+ };
+
+ ts_int_suspend: ts-int-suspend-state {
+ pins = "gpio65";
+ function = "gpio";
+ drive-strength = <2>;
+ bias-pull-down;
+ };
+
+ pmx_mdss_default: pmx-mdss-default-state {
+ pins = "gpio61";
+ function = "gpio";
+ drive-strength = <8>;
+ bias-disable;
+ output-high;
+ };
+
+ pmx_mdss_sleep: pmx-mdss-sleep-state {
+ pins = "gpio61";
+ function = "gpio";
+ drive-strength = <2>;
+ bias-pull-down;
+ };
+
+ ts_reset_active: ts-reset-active-state {
+ pins = "gpio64";
+ function = "gpio";
+ drive-strength = <8>;
+ bias-pull-up;
+ };
+
+ ts_reset_suspend: ts-reset-suspend-state {
+ pins = "gpio64";
+ function = "gpio";
+ drive-strength = <2>;
+ bias-pull-down;
+ };
+
+ tlmm_pri_ws_default: tlmm_pri_ws_default {
+ pins = "gpio92";
+ function = "pri_mi2s_ws";
+ drive-strength = <8>;
+ };
+};
+
+&usb3 {
+ status = "okay";
+};
+
+&usb3_dwc3 {
+ dr_mode = "peripheral";
+};
+
+&wcnss {
+ vddpx-supply = <&pm8953_l5>;
+
+ status = "okay";
+};
+
+&wcnss_iris {
+ compatible = "qcom,wcn3620";
+
+ vddxo-supply = <&pm8953_l7>;
+ vddrfa-supply = <&pm8953_l19>;
+ vddpa-supply = <&pm8953_l9>;
+ vdddig-supply = <&pm8953_l5>;
+};
From 434187e6d641f639bfb380745a5d14e1c7add4bb Mon Sep 17 00:00:00 2001
From: MarvelMathesh <123v.mathesh@gmail.com>
Date: Tue, 11 Jun 2024 13:29:18 +0530
Subject: [PATCH 2/2] drm/panel: Rename 10or G panels
---
.../gpu/drm/panel/msm8953-generated/Kconfig | 25 ++++++++++---------
.../gpu/drm/panel/msm8953-generated/Makefile | 6 ++---
...8399c_auo.c => panel-10or-g-hx8399c-auo.c} | 2 +-
..._auo.c => panel-10or-g-ili7807d-djn-auo.c} | 2 +-
...807d_djn.c => panel-10or-g-ili7807d-djn.c} | 2 +-
5 files changed, 19 insertions(+), 18 deletions(-)
rename drivers/gpu/drm/panel/msm8953-generated/{panel-tenor-hx8399c_auo.c => panel-10or-g-hx8399c-auo.c} (99%)
rename drivers/gpu/drm/panel/msm8953-generated/{panel-tenor-ili7807d_djn_auo.c => panel-10or-g-ili7807d-djn-auo.c} (99%)
rename drivers/gpu/drm/panel/msm8953-generated/{panel-tenor-ili7807d_djn.c => panel-10or-g-ili7807d-djn.c} (99%)
diff --git a/drivers/gpu/drm/panel/msm8953-generated/Kconfig b/drivers/gpu/drm/panel/msm8953-generated/Kconfig
index 6e9893596a3911..d5898842f11b5f 100644
--- a/drivers/gpu/drm/panel/msm8953-generated/Kconfig
+++ b/drivers/gpu/drm/panel/msm8953-generated/Kconfig
@@ -5,6 +5,19 @@ menu "MSM8953 panel drivers generated with linux-mdss-dsi-panel-driver-generator
config DRM_PANEL_MSM8953_GENERATED
tristate "Select all generated MSM8953 panel drivers by default"
+config DRM_PANEL_10OR_G_HX8399C_AUO
+ tristate "10or G HX8399C AUO"
+ default DRM_PANEL_MSM8953_GENERATED
+
+config DRM_PANEL_10OR_G_ILI7807D_DJN_AUO
+ tristate "10or G ILI7807D DJN AUO"
+ default DRM_PANEL_MSM8953_GENERATED
+
+config DRM_PANEL_10OR_G_ILI7807D_DJN
+ tristate "10or G ILI7807D DJN"
+ default DRM_PANEL_MSM8953_GENERATED
+
+
config DRM_PANEL_BOE_BS052FHM_A00_6C01
tristate "Boe BS052FHM A00 6C01"
default DRM_PANEL_MSM8953_GENERATED
@@ -109,18 +122,6 @@ config DRM_PANEL_OFILM_622_V0
tristate "Ofilm 622 V0"
default DRM_PANEL_MSM8953_GENERATED
-config DRM_PANEL_TENOR_HX8399C_AUO
- tristate "Tenor HX8399C_AUO"
- default DRM_PANEL_MSM8953_GENERATED
-
-config DRM_PANEL_TENOR_ILI7807D_DJN_AUO
- tristate "Tenor ILI7807D_DJN_AUO"
- default DRM_PANEL_MSM8953_GENERATED
-
-config DRM_PANEL_TENOR_ILI7807D_DJN
- tristate "Tenor ILI7807D_DJN"
- default DRM_PANEL_MSM8953_GENERATED
-
config DRM_PANEL_TIANMA_622_V0
tristate "Tianma 622 V0"
default DRM_PANEL_MSM8953_GENERATED
diff --git a/drivers/gpu/drm/panel/msm8953-generated/Makefile b/drivers/gpu/drm/panel/msm8953-generated/Makefile
index 737adaeb28e5fd..c75657a9fdc66e 100644
--- a/drivers/gpu/drm/panel/msm8953-generated/Makefile
+++ b/drivers/gpu/drm/panel/msm8953-generated/Makefile
@@ -1,3 +1,6 @@
+obj-$(CONFIG_DRM_PANEL_10OR_G_HX8399C_AUO) += panel-10or-g-hx8399c-auo.o
+obj-$(CONFIG_DRM_PANEL_10OR_G_ILI7807D_DJN_AUO) += panel-10or-g-ili7807d-djn-auo.o
+obj-$(CONFIG_DRM_PANEL_10OR_G_ILI7807D_DJN) += panel-10or-g-ili7807d-djn.o
obj-$(CONFIG_DRM_PANEL_BOE_BS052FHM_A00_6C01) += panel-boe-bs052fhm-a00-6c01.o
obj-$(CONFIG_DRM_PANEL_CSOT_622_V0) += panel-csot-622-v0.o
obj-$(CONFIG_DRM_PANEL_FAIRPHONE_FP3_HX83112B) += panel-fairphone-fp3-hx83112b.o
@@ -24,9 +27,6 @@ obj-$(CONFIG_DRM_PANEL_MDSS_R63350) += panel-mdss-r63350.o
obj-$(CONFIG_DRM_PANEL_MOTOROLA_ALI_BOE) += panel-motorola-ali-boe.o
obj-$(CONFIG_DRM_PANEL_MOTOROLA_ALI_TIANMA) += panel-motorola-ali-tianma.o
obj-$(CONFIG_DRM_PANEL_OFILM_622_V0) += panel-ofilm-622-v0.o
-obj-$(CONFIG_DRM_PANEL_TENOR_HX8399C_AUO) += panel-tenor-hx8399c_auo.o
-obj-$(CONFIG_DRM_PANEL_TENOR_ILI7807D_DJN_AUO) += panel-tenor-ili7807d_djn_auo.o
-obj-$(CONFIG_DRM_PANEL_TENOR_ILI7807D_DJN) += panel-tenor-ili7807d_djn.o
obj-$(CONFIG_DRM_PANEL_TIANMA_622_V0) += panel-tianma-622-v0.o
obj-$(CONFIG_DRM_PANEL_TIANMA_TL052VDXP02) += panel-tianma-tl052vdxp02.o
obj-$(CONFIG_DRM_PANEL_XIAOMI_AUO_R61322) += panel-xiaomi-auo-r61322.o
diff --git a/drivers/gpu/drm/panel/msm8953-generated/panel-tenor-hx8399c_auo.c b/drivers/gpu/drm/panel/msm8953-generated/panel-10or-g-hx8399c-auo.c
similarity index 99%
rename from drivers/gpu/drm/panel/msm8953-generated/panel-tenor-hx8399c_auo.c
rename to drivers/gpu/drm/panel/msm8953-generated/panel-10or-g-hx8399c-auo.c
index 9d283c5b2cd5c6..3a3e8f673774e0 100644
--- a/drivers/gpu/drm/panel/msm8953-generated/panel-tenor-hx8399c_auo.c
+++ b/drivers/gpu/drm/panel/msm8953-generated/panel-10or-g-hx8399c-auo.c
@@ -281,7 +281,7 @@ static void hx8399c_auo_53_remove(struct mipi_dsi_device *dsi)
}
static const struct of_device_id hx8399c_auo_53_of_match[] = {
- { .compatible = "tenor,hx8399c_auo" }, // FIXME
+ { .compatible = "10or,g-hx8399c-auo" }, // FIXME
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, hx8399c_auo_53_of_match);
diff --git a/drivers/gpu/drm/panel/msm8953-generated/panel-tenor-ili7807d_djn_auo.c b/drivers/gpu/drm/panel/msm8953-generated/panel-10or-g-ili7807d-djn-auo.c
similarity index 99%
rename from drivers/gpu/drm/panel/msm8953-generated/panel-tenor-ili7807d_djn_auo.c
rename to drivers/gpu/drm/panel/msm8953-generated/panel-10or-g-ili7807d-djn-auo.c
index b948096c78d2e0..efc7383d872e7f 100644
--- a/drivers/gpu/drm/panel/msm8953-generated/panel-tenor-ili7807d_djn_auo.c
+++ b/drivers/gpu/drm/panel/msm8953-generated/panel-10or-g-ili7807d-djn-auo.c
@@ -717,7 +717,7 @@ static void ili7807d_djn_auo_53_remove(struct mipi_dsi_device *dsi)
}
static const struct of_device_id ili7807d_djn_auo_53_of_match[] = {
- { .compatible = "tenor,ili7807d_djn_auo" }, // FIXME
+ { .compatible = "10or,g-ili7807d-djn-auo" }, // FIXME
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, ili7807d_djn_auo_53_of_match);
diff --git a/drivers/gpu/drm/panel/msm8953-generated/panel-tenor-ili7807d_djn.c b/drivers/gpu/drm/panel/msm8953-generated/panel-10or-g-ili7807d-djn.c
similarity index 99%
rename from drivers/gpu/drm/panel/msm8953-generated/panel-tenor-ili7807d_djn.c
rename to drivers/gpu/drm/panel/msm8953-generated/panel-10or-g-ili7807d-djn.c
index f428f5717e64a2..89fee3d8d0a564 100644
--- a/drivers/gpu/drm/panel/msm8953-generated/panel-tenor-ili7807d_djn.c
+++ b/drivers/gpu/drm/panel/msm8953-generated/panel-10or-g-ili7807d-djn.c
@@ -716,7 +716,7 @@ static void ili7807d_djn_53_remove(struct mipi_dsi_device *dsi)
}
static const struct of_device_id ili7807d_djn_53_of_match[] = {
- { .compatible = "tenor,ili7807d_djn" }, // FIXME
+ { .compatible = "10or,g-ili7807d-djn" }, // FIXME
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, ili7807d_djn_53_of_match);