From bf468ace2bc576754ed7a9e98ce92de73b70af3d Mon Sep 17 00:00:00 2001 From: Yuxin Feng Date: Sun, 25 Apr 2021 07:12:37 +0530 Subject: [PATCH] ARM: dts: msm: Enable usb host for scuba Add extcon for usb qusb_phy0 and usb0 Change-Id: I114edc610532740748db76c980cce754a45205e7 --- qcom/pm8008.dtsi | 127 ++++++++++++++++++++++++++++++++++++ qcom/qrb2210-rb1-idp.dtsi | 8 +++ qcom/qrb2210-rb1-usb.dtsi | 9 +++ qcom/qrb2210-rb1.dtsi | 133 ++++++++++---------------------------- 4 files changed, 177 insertions(+), 100 deletions(-) create mode 100644 qcom/pm8008.dtsi diff --git a/qcom/pm8008.dtsi b/qcom/pm8008.dtsi new file mode 100644 index 000000000000..07c8824e2c70 --- /dev/null +++ b/qcom/pm8008.dtsi @@ -0,0 +1,127 @@ +#include + +pm8008_8: qcom,pm8008@8 { + compatible = "qcom,i2c-pmic"; + reg = <0x8>; + #address-cells = <1>; + #size-cells = <0>; + interrupt-controller; + #interrupt-cells = <3>; + + interrupt-names = "pm8008"; + qcom,periph-map = <0x09 0x24 0xc0 0xc1>; + + pm8008_chip: qcom,pm8008-chip@900 { + compatible = "qcom,pm8008-chip"; + reg = <0x900>; + interrupts = <0x09 4 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "ocp"; + + PM8008_EN: qcom,pm8008-chip-en { + regulator-name = "pm8008-chip-en"; + }; + }; + + qcom,revid@100 { + compatible = "qcom,qpnp-revid"; + reg = <0x100>; + }; + + pm8008_gpios: pinctrl@c000 { + compatible = "qcom,spmi-gpio"; + reg = <0xc000 0x200>; + interrupts = <0xc0 0 IRQ_TYPE_EDGE_RISING>, + <0xc1 0 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "pm8008_gpio1", "pm8008_gpio2"; + gpio-controller; + #gpio-cells = <2>; + + pm8008_gpio1_active: pm8008_gpio1_active { + pins = "gpio1"; + function = "func1"; + power-source = <1>; + output-enable; + input-disable; + bias-disable; + }; + }; +}; + +pm8008_9: qcom,pm8008@9 { + compatible = "qcom,i2c-pmic"; + reg = <0x9>; + #address-cells = <1>; + #size-cells = <0>; + + pinctrl-names = "default"; + pinctrl-0 = <&pm8008_gpio1_active>; + + pm8008_regulators: qcom,pm8008-regulator { + compatible = "qcom,pm8008-regulator"; + pm8008_en-supply = <&PM8008_EN>; + qcom,enable-ocp-broadcast; + + L1P: qcom,pm8008-l1@4000 { + reg = <0x4000>; + regulator-name = "pm8008_l1"; + regulator-min-microvolt = <528000>; + regulator-max-microvolt = <1504000>; + qcom,min-dropout-voltage = <225000>; + qcom,hpm-min-load = <10000>; + }; + + L2P: qcom,pm8008-l2@4100 { + reg = <0x4100>; + regulator-name = "pm8008_l2"; + regulator-min-microvolt = <528000>; + regulator-max-microvolt = <1504000>; + qcom,min-dropout-voltage = <225000>; + qcom,hpm-min-load = <10000>; + }; + + L3P: qcom,pm8008-l3@4200 { + reg = <0x4200>; + regulator-name = "pm8008_l3"; + regulator-min-microvolt = <1500000>; + regulator-max-microvolt = <3400000>; + qcom,min-dropout-voltage = <200000>; + qcom,hpm-min-load = <10000>; + }; + + L4P: qcom,pm8008-l4@4300 { + reg = <0x4300>; + regulator-name = "pm8008_l4"; + regulator-min-microvolt = <1500000>; + regulator-max-microvolt = <3400000>; + qcom,min-dropout-voltage = <200000>; + qcom,hpm-min-load = <10000>; + }; + + L5P: qcom,pm8008-l5@4400 { + reg = <0x4400>; + regulator-name = "pm8008_l5"; + regulator-min-microvolt = <1500000>; + regulator-max-microvolt = <3400000>; + qcom,min-dropout-voltage = <300000>; + qcom,hpm-min-load = <10000>; + }; + + L6P: qcom,pm8008-l6@4400 { + reg = <0x4500>; + regulator-name = "pm8008_l6"; + regulator-min-microvolt = <1500000>; + regulator-max-microvolt = <3400000>; + qcom,min-dropout-voltage = <300000>; + qcom,hpm-min-load = <10000>; + }; + + L7P: qcom,pm8008-l7@4400 { + reg = <0x4600>; + regulator-name = "pm8008_l7"; + regulator-min-microvolt = <1500000>; + regulator-max-microvolt = <3400000>; + qcom,min-dropout-voltage = <300000>; + qcom,hpm-min-load = <10000>; + }; + }; +}; diff --git a/qcom/qrb2210-rb1-idp.dtsi b/qcom/qrb2210-rb1-idp.dtsi index 18399c7871d2..546342256767 100644 --- a/qcom/qrb2210-rb1-idp.dtsi +++ b/qcom/qrb2210-rb1-idp.dtsi @@ -77,3 +77,11 @@ "chg_temp"; qcom,thermal-mitigation = <2000000 1500000 1000000 500000>; }; + +&qusb_phy0 { + extcon = <&pm2250_charger>; +}; + +&usb0 { + extcon = <&qusb_phy0>, <&eud>; +}; diff --git a/qcom/qrb2210-rb1-usb.dtsi b/qcom/qrb2210-rb1-usb.dtsi index a1e96689f6d8..0b8d35cc49ed 100644 --- a/qcom/qrb2210-rb1-usb.dtsi +++ b/qcom/qrb2210-rb1-usb.dtsi @@ -53,6 +53,15 @@ <&system_noc MASTER_USB3 &config_noc SLAVE_IPA_CFG>, <&bimc MASTER_AMPSS_M0 &config_noc SLAVE_USB3>; + qcom,interconnect-values-nom = /* NOMINAL Votes */ + <1000000 1550000>, + <0 2400>, + <0 40000>; + qcom,interconnect-values-svs = /* SVS Votes */ + <240000 700000>, + <0 2400>, + <0 40000>; + dwc3@4e00000 { compatible = "snps,dwc3"; reg = <0x4e00000 0xcd00>; diff --git a/qcom/qrb2210-rb1.dtsi b/qcom/qrb2210-rb1.dtsi index 8046d16978dd..619bb26bb176 100644 --- a/qcom/qrb2210-rb1.dtsi +++ b/qcom/qrb2210-rb1.dtsi @@ -660,6 +660,23 @@ }; + eud: qcom,msm-eud@1610000 { + compatible = "qcom,msm-eud"; + interrupt-names = "eud_irq"; + interrupts = ; + reg = <0x1610000 0x2000>, + <0x1612000 0x1000>, + <0x3E5018 0x4>; + reg-names = "eud_base", "eud_mode_mgr2", + "eud_tcsr_check_reg"; + qcom,secure-eud-en; + qcom,eud-tcsr-check-enable; + qcom,eud-clock-vote-req; + clocks = <&gcc GCC_AHB2PHY_USB_CLK>; + clock-names = "eud_ahb2phy_clk"; + status = "ok"; + }; + wdog: qcom,wdt@f017000 { compatible = "qcom,msm-watchdog"; reg = <0xf017000 0x1000>; @@ -672,7 +689,7 @@ qcom,wakeup-enable; }; -dcc: dcc_v2@1be2000 { + dcc: dcc_v2@1be2000 { compatible = "qcom,dcc-v2"; reg = <0x1be2000 0x1000>, <0x1bee000 0x2000>; @@ -688,6 +705,11 @@ dcc: dcc_v2@1be2000 { rpm-channel-type = <15>; /* SMD_APPS_RPM */ }; + qcom,sps { + compatible = "qcom,msm-sps-4k"; + qcom,pipe-attr-ee; + }; + mem_dump { compatible = "qcom,mem-dump"; memory-region = <&dump_mem>; @@ -1346,108 +1368,19 @@ dcc: dcc_v2@1be2000 { #size-cells = <0>; status = "ok"; - pm8008_8: qcom,pm8008@8 { - compatible = "qcom,i2c-pmic"; - reg = <0x8>; - #address-cells = <1>; - #size-cells = <0>; + #include "pm8008.dtsi" +}; - pinctrl-names = "default"; - pinctrl-0 = <&pm8008_active>; +&pm8008_8 { + interrupt-parent = <&tlmm>; + interrupts = <25 IRQ_TYPE_EDGE_RISING>; - pm8008_chip: qcom,pm8008-chip@900 { - compatible = "qcom,pm8008-chip"; - reg = <0x900>; + pinctrl-names = "default"; + pinctrl-0 = <&pm8008_active &pm8008_interrupt>; +}; - PM8008_EN: qcom,pm8008-chip-en { - regulator-name = "pm8008-chip-en"; - }; - }; - - qcom,revid@100 { - compatible = "qcom,qpnp-revid"; - reg = <0x100>; - }; - }; - - pm8008_9: qcom,pm8008@9 { - compatible = "qcom,i2c-pmic"; - reg = <0x9>; - #address-cells = <1>; - #size-cells = <0>; - - pm8008_regulators: qcom,pm8008-regulator { - compatible = "qcom,pm8008-regulator"; - #address-cells = <1>; - #size-cells = <0>; - pm8008_en-supply = <&PM8008_EN>; - - vdd_l1_l2-supply = <&S3A>; - - L1P: qcom,pm8008-l1@4000 { - reg = <0x4000>; - regulator-name = "pm8008_l1"; - regulator-min-microvolt = <528000>; - regulator-max-microvolt = <1256000>; - qcom,min-dropout-voltage = <75000>; - qcom,hpm-min-load = <10000>; - }; - - L2P: qcom,pm8008-l2@4100 { - reg = <0x4100>; - regulator-name = "pm8008_l2"; - regulator-min-microvolt = <528000>; - regulator-max-microvolt = <1144000>; - qcom,min-dropout-voltage = <187500>; - qcom,hpm-min-load = <10000>; - }; - - L3P: qcom,pm8008-l3@4200 { - reg = <0x4200>; - regulator-name = "pm8008_l3"; - regulator-min-microvolt = <2704000>; - regulator-max-microvolt = <2896000>; - qcom,min-dropout-voltage = <200000>; - qcom,hpm-min-load = <10000>; - }; - - L4P: qcom,pm8008-l4@4300 { - reg = <0x4300>; - regulator-name = "pm8008_l4"; - regulator-min-microvolt = <2704000>; - regulator-max-microvolt = <2896000>; - qcom,min-dropout-voltage = <200000>; - qcom,hpm-min-load = <10000>; - }; - - L5P: qcom,pm8008-l5@4400 { - reg = <0x4400>; - regulator-name = "pm8008_l5"; - regulator-min-microvolt = <2704000>; - regulator-max-microvolt = <2896000>; - qcom,min-dropout-voltage = <300000>; - qcom,hpm-min-load = <10000>; - }; - - L6P: qcom,pm8008-l6@4500 { - reg = <0x4500>; - regulator-name = "pm8008_l6"; - regulator-min-microvolt = <2704000>; - regulator-max-microvolt = <2896000>; - qcom,min-dropout-voltage = <300000>; - qcom,hpm-min-load = <10000>; - }; - - L7P: qcom,pm8008-l7@4600 { - reg = <0x4600>; - regulator-name = "pm8008_l7"; - regulator-min-microvolt = <1656000>; - regulator-max-microvolt = <1896000>; - qcom,min-dropout-voltage = <300000>; - qcom,hpm-min-load = <10000>; - }; - }; - }; +&pm8008_regulators { + vdd_l1_l2-supply = <&S3A>; }; &gcc_camss_top_gdsc {