ARM: dts: qcom: klte: Add support for hw keys, flash and usb
Subsystems (2)
v2 cover ARM: dts: qcom: klte: Add support for hw keys, flash and usb
Enable support for gpio-keys (volume up/down + home), internal flash storage (sdhci), and usb (for usb-ethernet) for the Samsung Galaxy S5, codename klte.
v1: https://lkml.org/lkml/2020/4/9/927
changes in v2:
- do not include PMA8084 PMIC node in the msm8974 dtsi, instead only declare it in the device dts.
Daniele Debernardi (5):
ARM: dts: qcom: msm8974-klte: Add pma8084 regulator nodes
ARM: dts: qcom: msm8974-klte: Remove inherited vreg_boost node
ARM: dts: qcom: msm8974-klte: Add gpio-keys nodes
ARM: dts: qcom: msm8974-klte: Add sdhci1 node
ARM: dts: qcom: msm8974-klte: Add USB node
.../boot/dts/qcom-msm8974-samsung-klte.dts | 294 +++++++++++++++++- 1 file changed, 292 insertions(+), 2 deletions(-)
base-commit: 873e37a44b1ee8ad4628ca257dc51c0c7c654326 --
2.26.0
PATCH v2 1/5 ARM: dts: qcom: msm8974-klte: Add pma8084 regulator nodes
From: Daniele Debernardi <[email protected]>
The pma8084 replaces the pm8841,pm8941 found in other msm8974 devices. It is used for various things including gpio keys, sdhci, usb, dsi.
The voltages are pulled from the vendor source tree.
--- .../boot/dts/qcom-msm8974-samsung-klte.dts | 184 ++++++++++++++++++ 1 file changed, 184 insertions(+)
arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts +184 -0
@@ -2,6 +2,7 @@ #include "qcom-msm8974pro.dtsi" #include "qcom-pm8841.dtsi" #include "qcom-pm8941.dtsi" +#include "qcom-pma8084.dtsi" / { model = "Samsung Galaxy S5";
@@ -14,6 +15,189 @@ aliases { chosen { stdout-path = "serial0:115200n8"; }; + + smd { + rpm { + rpm_requests { + pma8084-regulators { + compatible = "qcom,rpm-pma8084-regulators"; + status = "okay"; + + pma8084_s1: s1 { + regulator-min-microvolt = <675000>; + regulator-max-microvolt = <1050000>; + }; + + pma8084_s2: s2 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <1050000>; + }; + + pma8084_s3: s3 { + regulator-min-microvolt = <1300000>; + regulator-max-microvolt = <1300000>; + }; + + pma8084_s4: s4 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + pma8084_s5: s5 { + regulator-min-microvolt = <2150000>; + regulator-max-microvolt = <2150000>; + }; + + pma8084_s6: s6 { + regulator-min-microvolt = <1050000>; + regulator-max-microvolt = <1050000>; + }; + + pma8084_l1: l1 { + regulator-min-microvolt = <1225000>; + regulator-max-microvolt = <1225000>; + }; + + pma8084_l2: l2 { + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + }; + + pma8084_l3: l3 { + regulator-min-microvolt = <1050000>; + regulator-max-microvolt = <1200000>; + }; + + pma8084_l4: l4 { + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1225000>; + }; + + pma8084_l5: l5 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + pma8084_l6: l6 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + pma8084_l7: l7 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + pma8084_l8: l8 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + pma8084_l9: l9 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <2950000>; + }; + + pma8084_l10: l10 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <2950000>; + }; + + pma8084_l11: l11 { + regulator-min-microvolt = <1300000>; + regulator-max-microvolt = <1300000>; + }; + + pma8084_l12: l12 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + pma8084_l13: l13 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <2950000>; + }; + + pma8084_l14: l14 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + pma8084_l15: l15 { + regulator-min-microvolt = <2050000>; + regulator-max-microvolt = <2050000>; + }; + + pma8084_l16: l16 { + regulator-min-microvolt = <2700000>; + regulator-max-microvolt = <2700000>; + }; + + pma8084_l17: l17 { + regulator-min-microvolt = <2850000>; + regulator-max-microvolt = <2850000>; + }; + + pma8084_l18: l18 { + regulator-min-microvolt = <2850000>; + regulator-max-microvolt = <2850000>; + }; + + pma8084_l19: l19 { + regulator-min-microvolt = <2900000>; + regulator-max-microvolt = <3300000>; + }; + + pma8084_l20: l20 { + regulator-min-microvolt = <2950000>; + regulator-max-microvolt = <2950000>; + }; + + pma8084_l21: l21 { + regulator-min-microvolt = <2950000>; + regulator-max-microvolt = <2950000>; + }; + + pma8084_l22: l22 { + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3300000>; + }; + + pma8084_l23: l23 { + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + }; + + pma8084_l24: l24 { + regulator-min-microvolt = <3075000>; + regulator-max-microvolt = <3075000>; + }; + + pma8084_l25: l25 { + regulator-min-microvolt = <2100000>; + regulator-max-microvolt = <2100000>; + }; + + pma8084_l26: l26 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <2050000>; + }; + + pma8084_l27: l27 { + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1225000>; + }; + + pma8084_lvs1: lvs1 {}; + pma8084_lvs2: lvs2 {}; + pma8084_lvs3: lvs3 {}; + pma8084_lvs4: lvs4 {}; + + pma8084_5vs1: 5vs1 {}; + }; + }; + }; + }; }; &soc {
Signature · 1 line
2.26.0
PATCH v2 2/5 ARM: dts: qcom: msm8974-klte: Remove inherited vreg_boost node
In reply to Iskren ChernevFrom: Daniele Debernardi <[email protected]>
The Samsung klte does not have a vreg_boost node. vreg_boost also depends on pm8941-gpio which are not present on the klte.
--- arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts +2 -2
@@ -1,7 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 #include "qcom-msm8974pro.dtsi" -#include "qcom-pm8841.dtsi" -#include "qcom-pm8941.dtsi" #include "qcom-pma8084.dtsi" / {
@@ -198,6 +196,8 @@ pma8084_l27: l27 { }; }; }; + + /delete-node/ vreg-boost; }; &soc {
Signature · 1 line
2.26.0
PATCH v2 3/5 ARM: dts: qcom: msm8974-klte: Add gpio-keys nodes
In reply to Iskren ChernevFrom: Daniele Debernardi <[email protected]>
This introduces the gpio-keys nodes for volume/home keys and the associated pinctrl state.
--- .../boot/dts/qcom-msm8974-samsung-klte.dts | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+)
arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts +49 -0
@@ -1,6 +1,9 @@ // SPDX-License-Identifier: GPL-2.0 #include "qcom-msm8974pro.dtsi" #include "qcom-pma8084.dtsi" +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> +#include <dt-bindings/pinctrl/qcom,pmic-gpio.h> / { model = "Samsung Galaxy S5";
@@ -205,4 +208,50 @@ serial@f991e000 { status = "ok"; }; + gpio-keys { + compatible = "gpio-keys"; + input-name = "gpio-keys"; + + pinctrl-names = "default"; + pinctrl-0 = <&gpio_keys_pin_a>; + + volume-down { + label = "volume_down"; + gpios = <&pma8084_gpios 2 GPIO_ACTIVE_LOW>; + linux,input-type = <1>; + linux,code = <KEY_VOLUMEDOWN>; + debounce-interval = <15>; + }; + + home-key { + label = "home_key"; + gpios = <&pma8084_gpios 3 GPIO_ACTIVE_LOW>; + linux,input-type = <1>; + linux,code = <KEY_HOMEPAGE>; + wakeup-source; + debounce-interval = <15>; + }; + + volume-up { + label = "volume_up"; + gpios = <&pma8084_gpios 5 GPIO_ACTIVE_LOW>; + linux,input-type = <1>; + linux,code = <KEY_VOLUMEUP>; + debounce-interval = <15>; + }; + }; +}; + +&spmi_bus { + pma8084@0 { + gpios@c000 { + gpio_keys_pin_a: gpio-keys-active { + pins = "gpio2", "gpio3", "gpio5"; + function = "normal"; + + bias-pull-up; + power-source = <PMA8084_GPIO_S4>; + }; + }; + }; };
Signature · 1 line
2.26.0
PATCH v2 4/5 ARM: dts: qcom: msm8974-klte: Add sdhci1 node
In reply to Iskren ChernevFrom: Daniele Debernardi <[email protected]>
This introduces the eMMC sdhci node and its pinctrl state
--- .../boot/dts/qcom-msm8974-samsung-klte.dts | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+)
arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts +32 -0
@@ -152,6 +152,9 @@ pma8084_l19: l19 { pma8084_l20: l20 { regulator-min-microvolt = <2950000>; regulator-max-microvolt = <2950000>; + + regulator-allow-set-load; + regulator-system-load = <200000>; }; pma8084_l21: l21 {
@@ -240,6 +243,35 @@ volume-up { debounce-interval = <15>; }; }; + + pinctrl@fd510000 { + sdhc1_pin_a: sdhc1-pin-active { + clk { + pins = "sdc1_clk"; + drive-strength = <4>; + bias-disable; + }; + + cmd-data { + pins = "sdc1_cmd", "sdc1_data"; + drive-strength = <4>; + bias-pull-up; + }; + }; + }; + + sdhci@f9824900 { + status = "ok"; + + vmmc-supply = <&pma8084_l20>; + vqmmc-supply = <&pma8084_s4>; + + bus-width = <8>; + non-removable; + + pinctrl-names = "default"; + pinctrl-0 = <&sdhc1_pin_a>; + }; }; &spmi_bus {
Signature · 1 line
2.26.0
PATCH v2 5/5 ARM: dts: qcom: msm8974-klte: Add USB node
In reply to Iskren ChernevFrom: Daniele Debernardi <[email protected]>
This introduces the usb node which can be used e.g. for USB_ETH
--- .../boot/dts/qcom-msm8974-samsung-klte.dts | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+)
arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts +25 -0
@@ -272,6 +272,31 @@ sdhci@f9824900 { pinctrl-names = "default"; pinctrl-0 = <&sdhc1_pin_a>; }; + + usb@f9a55000 { + status = "ok"; + + phys = <&usb_hs1_phy>; + phy-select = <&tcsr 0xb000 0>; + /*extcon = <&smbb>, <&usb_id>;*/ + /*vbus-supply = <&chg_otg>;*/ + + hnp-disable; + srp-disable; + adp-disable; + + ulpi { + phy@a { + status = "ok"; + + v1p8-supply = <&pma8084_l6>; + v3p3-supply = <&pma8084_l24>; + + /*extcon = <&smbb>;*/ + qcom,init-seq = /bits/ 8 <0x1 0x64>; + }; + }; + }; }; &spmi_bus {
Signature · 1 line
2.26.0