From 43a2e6c759ae1891ff6ad1fcf1f7bbd9b8d1b6e4 Mon Sep 17 00:00:00 2001 From: Shilpa Suresh Date: Mon, 29 Apr 2024 15:15:56 +0530 Subject: [PATCH] ARM: dts: msm: Enable PM8010, flash, PON, PWM & other nodes for parrot Add compatible strings to PON, PWM-LPG, TRI-LED, VIBRATOR, FLASH-V2, PM8008/PM8010 regulator and AMOLED regulator DT nodes. These were removed from the bulk DT porting for Parrot on qcom-6.6 device-tree branch. While at it, remove the REVID Device node reference and the WLED and LCDB device nodes as they are not required for Parrot. These were initially added as a part of the bulk DT porting done for Parrot on qcom-6.6. Change-Id: I59666d86f449fd74366b1862bb23d8762b8abdad Signed-off-by: Shilpa Suresh --- qcom/parrot-pmic-overlay.dtsi | 16 ++------ qcom/pm6150l.dtsi | 72 +++-------------------------------- qcom/pm6450.dtsi | 1 + qcom/pm7250b.dtsi | 2 + qcom/pm8350b.dtsi | 1 + qcom/pmk8350.dtsi | 13 +++++++ 6 files changed, 27 insertions(+), 78 deletions(-) diff --git a/qcom/parrot-pmic-overlay.dtsi b/qcom/parrot-pmic-overlay.dtsi index 3a2c1a20..59248e27 100644 --- a/qcom/parrot-pmic-overlay.dtsi +++ b/qcom/parrot-pmic-overlay.dtsi @@ -169,10 +169,6 @@ }; }; -&pm6150l_revid { - status = "disabled"; -}; - &pm6150l_4 { qcom,power-on@800 { status = "disabled"; @@ -422,16 +418,13 @@ pinctrl-0 = <&pm8010i_active>; pm8010-chip@900 { + compatible = "qcom,pm8008-chip"; reg = <0x900>; PM8010I_EN: qcom,pm8008-chip-en { regulator-name = "pm8010i-chip-en"; }; }; - - qcom,revid@100 { - reg = <0x100>; - }; }; pm8010i@9 { @@ -441,6 +434,7 @@ #size-cells = <0>; qcom,pm8010i-regulator { + compatible = "qcom,pm8010-regulator"; #address-cells = <1>; #size-cells = <0>; @@ -517,16 +511,13 @@ pinctrl-0 = <&pm8010j_active>; pm8010-chip@900 { + compatible = "qcom,pm8008-chip"; reg = <0x900>; PM8010J_EN: qcom,pm8008-chip-en { regulator-name = "pm8010j-chip-en"; }; }; - - qcom,revid@100 { - reg = <0x100>; - }; }; pm8010j@d { @@ -536,6 +527,7 @@ #size-cells = <0>; qcom,pm8010j-regulator { + compatible = "qcom,pm8010-regulator"; #address-cells = <1>; #size-cells = <0>; diff --git a/qcom/pm6150l.dtsi b/qcom/pm6150l.dtsi index 5f476b01..eeca9757 100644 --- a/qcom/pm6150l.dtsi +++ b/qcom/pm6150l.dtsi @@ -20,11 +20,8 @@ #address-cells = <1>; #size-cells = <0>; - pm6150l_revid: qcom,revid@100 { - reg = <0x100>; - }; - qcom,power-on@800 { + compatible = "qcom,qpnp-power-on"; reg = <0x800>; }; @@ -124,45 +121,15 @@ pm6150l_pwm_1: qcom,pwms@bc00 { status = "disabled"; + compatible = "qcom,pwm-lpg"; reg = <0xbc00>; reg-names = "lpg-base"; qcom,num-lpg-channels = <1>; #pwm-cells = <2>; }; - pm6150l_lcdb: qcom,lcdb@ec00 { - #address-cells = <1>; - #size-cells = <0>; - reg = <0xec00>; - interrupts = <0x5 0xec 0x1 IRQ_TYPE_EDGE_RISING>; - interrupt-names = "sc-irq"; - qcom,pmic-revid = <&pm6150l_revid>; - qcom,voltage-step-ramp; - status = "disabled"; - - lcdb_ldo_vreg: ldo { - label = "ldo"; - regulator-name = "lcdb_ldo"; - regulator-min-microvolt = <4000000>; - regulator-max-microvolt = <6000000>; - }; - - lcdb_ncp_vreg: ncp { - label = "ncp"; - regulator-name = "lcdb_ncp"; - regulator-min-microvolt = <4000000>; - regulator-max-microvolt = <6000000>; - }; - - lcdb_bst_vreg: bst { - label = "bst"; - regulator-name = "lcdb_bst"; - regulator-min-microvolt = <4700000>; - regulator-max-microvolt = <6275000>; - }; - }; - flash_led: qcom,leds@d300 { + compatible = "qcom,pm6150l-flash-led-v2"; status = "disabled"; reg = <0xd300>; label = "flash"; @@ -179,7 +146,6 @@ qcom,thermal-derate-en; qcom,thermal-derate-current = <200 500 1000>; qcom,isc-delay = <192>; - qcom,pmic-revid = <&pm6150l_revid>; pm6150l_flash0: qcom,flash_0 { label = "flash"; @@ -280,36 +246,8 @@ }; }; - pm6150l_wled: qcom,wled@d800 { - reg = <0xd800>, <0xd900>; - reg-names = "wled-ctrl-base", "wled-sink-base"; - label = "backlight"; - interrupts = <0x5 0xd8 0x1 IRQ_TYPE_EDGE_RISING>, - <0x5 0xd8 0x4 IRQ_TYPE_EDGE_BOTH>, - <0x5 0xd8 0x5 IRQ_TYPE_EDGE_BOTH>; - interrupt-names = "ovp-irq", "pre-flash-irq", - "flash-irq"; - qcom,auto-calibration; - status = "disabled"; - - wled_flash: qcom,wled-flash { - label = "flash"; - qcom,default-led-trigger = "wled_flash"; - }; - - wled_torch: qcom,wled-torch { - label = "torch"; - qcom,default-led-trigger = "wled_torch"; - qcom,wled-torch-timer = <1200>; - }; - - wled_switch: qcom,wled-switch { - label = "switch"; - qcom,default-led-trigger = "wled_switch"; - }; - }; - pm6150l_lpg: qcom,pwms@b100 { + compatible = "qcom,pwm-lpg"; reg = <0xb100>, <0xb000>; reg-names = "lpg-base", "lut-base"; #pwm-cells = <2>; @@ -351,6 +289,7 @@ }; pm6150l_rgb_led: qcom,leds@d000 { + compatible = "qcom,tri-led"; reg = <0xd000>; red { label = "red"; @@ -375,6 +314,7 @@ }; pm6150a_amoled: qcom,amoled { + compatible = "qcom,amoled-regulator"; status = "disabled"; oledb_vreg: oledb@e000 { diff --git a/qcom/pm6450.dtsi b/qcom/pm6450.dtsi index 3c08ec15..936d2c03 100644 --- a/qcom/pm6450.dtsi +++ b/qcom/pm6450.dtsi @@ -36,6 +36,7 @@ pm6450_pwm_1: qcom,pwms@e800 { status = "disabled"; + compatible = "qcom,pwm-lpg"; reg = <0xe800>; reg-names = "lpg-base"; qcom,num-lpg-channels = <1>; diff --git a/qcom/pm7250b.dtsi b/qcom/pm7250b.dtsi index 4559bd12..d5f00e24 100644 --- a/qcom/pm7250b.dtsi +++ b/qcom/pm7250b.dtsi @@ -21,6 +21,7 @@ #size-cells = <0>; qcom,power-on@800 { + compatible = "qcom,qpnp-power-on"; reg = <0x800>; }; @@ -199,6 +200,7 @@ #size-cells = <0>; pm7250b_vib: qcom,vibrator@5300 { + compatible = "qcom,qpnp-vibrator-ldo"; reg = <0x5300>; qcom,vib-ldo-volt-uv = <3000000>; qcom,disable-overdrive; diff --git a/qcom/pm8350b.dtsi b/qcom/pm8350b.dtsi index 06c66741..df01c429 100644 --- a/qcom/pm8350b.dtsi +++ b/qcom/pm8350b.dtsi @@ -180,6 +180,7 @@ }; pm8350b_amoled: qcom,amoled { + compatible = "qcom,amoled-regulator"; #address-cells = <1>; #size-cells = <0>; diff --git a/qcom/pmk8350.dtsi b/qcom/pmk8350.dtsi index 2c947449..a7d14676 100644 --- a/qcom/pmk8350.dtsi +++ b/qcom/pmk8350.dtsi @@ -4,6 +4,7 @@ */ #include +#include #include #include #include @@ -25,16 +26,28 @@ #size-cells = <0>; pon_pbs@800 { + compatible = "qcom,qpnp-power-on"; reg = <0x800>; qcom,system-reset; qcom,store-hard-reset-reason; }; pmk8350_pon: pon_hlos@1300 { + compatible = "qcom,qpnp-power-on"; reg = <0x1300>; interrupts = <0x0 0x13 0x7 IRQ_TYPE_EDGE_BOTH>, <0x0 0x13 0x6 IRQ_TYPE_EDGE_BOTH>; interrupt-names = "kpdpwr", "resin"; + + qcom,pon_1 { + qcom,pon-type = ; + linux,code = ; + }; + + qcom,pon_2 { + qcom,pon-type = ; + linux,code = ; + }; }; pmk8350_vadc: vadc@3100 {