arm64: dts: qcom: pm8916: Remove wrong reg-names for rtc@6000
PATCH 1/3 arm64: dts: qcom: pm8916: Remove wrong reg-names for rtc@6000
While removing the size from the "reg" properties in pm8916.dtsi, commit bd6429e81010 ("ARM64: dts: qcom: Remove size elements from pmic reg properties") mistakenly also removed the second register address for the rtc@6000 device. That one did not represent the size of the register region but actually the address of the second "alarm" register region of the rtc@6000 device.
Now there are "reg-names" for two "reg" elements, but there is actually only one "reg" listed.
Since the DT schema for "qcom,pm8941-rtc" only expects one "reg" element anyway, just drop the "reg-names" entirely to fix this.
--- arch/arm64/boot/dts/qcom/pm8916.dtsi | 1 - 1 file changed, 1 deletion(-)
arch/arm64/boot/dts/qcom/pm8916.dtsi +0 -1
@@ -86,7 +86,6 @@ adc-chan@f { rtc@6000 { compatible = "qcom,pm8941-rtc"; reg = <0x6000>; - reg-names = "rtc", "alarm"; interrupts = <0x0 0x61 0x1 IRQ_TYPE_EDGE_RISING>; };
Signature · 1 line
2.33.0
PATCH 2/3 arm64: dts: qcom: pm8916: Add pm8941-misc extcon for USB detection
At the moment, USB gadget mode on MSM8916 works only with an extcon device that reports the correct USB mode. This might be because the USB PHY needs to be configured appropriately.
Unfortunately there is currently no simple approach to get such an extcon device during early bring-up. The extcon device for USB VBUS (i.e. gadget/peripheral mode) is typically provided by the charging driver which is almost always very complex to port.
On pretty much all devices with PM8916, the USB VBUS is also connected to the PM8916 "USB_IN" pad, no matter if they use the linear charger integrated into PM8916 or not. The state of this pad can be checked with the "USBIN_VALID" interrupt of PM8916.
The "qcom,pm8941-misc" binding exists to expose an "usb_vbus" and/or "usb_id" interrupt from the PMIC as an extcon device.
Add a &pm8916_usbin node to pm8916.dtsi which can be used as simple extcon device for devices that are currently lacking a proper charger driver.
--- arch/arm64/boot/dts/qcom/pm8916.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/arm64/boot/dts/qcom/pm8916.dtsi +8 -0
@@ -41,6 +41,14 @@ watchdog { }; }; + pm8916_usbin: extcon@1300 { + compatible = "qcom,pm8941-misc"; + reg = <0x1300>; + interrupts = <0x0 0x13 1 IRQ_TYPE_EDGE_BOTH>; + interrupt-names = "usb_vbus"; + status = "disabled"; + }; + pm8916_temp: temp-alarm@2400 { compatible = "qcom,spmi-temp-alarm"; reg = <0x2400>;
Signature · 1 line
2.33.0
PATCH 3/3 arm64: dts: qcom: msm8916-longcheer-l8150: Use &pm8916_usbin extcon
In reply to Stephan GerholdAt the moment, longcheer-l8150 is using a dummy extcon-usb-gpio device that permanently enables USB gadget mode. This workaround allows USB to work but is actually wrong and confusing. The "vbus-gpio" used there refers to an unused (floating) GPIO that is pulled up to make extcon-usb-gpio report USB gadget mode permanently.
Replace this with the new &pm8916_usbin extcon device that actually reports if an USB cable is attached or not. This allows the USB PHY to be turned off when there is no USB cable attached and is much cleaner overall.
--- .../boot/dts/qcom/msm8916-longcheer-l8150.dts | 23 +++++-------------- 1 file changed, 6 insertions(+), 17 deletions(-)
arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts +6 -17
@@ -30,14 +30,6 @@ wcnss_mem: wcnss@8b600000 { }; }; - // FIXME: Use extcon device provided by charger driver when available - usb_vbus: usb-vbus { - compatible = "linux,extcon-usb-gpio"; - vbus-gpio = <&msmgpio 62 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&usb_vbus_default>; - }; - gpio-keys { compatible = "gpio-keys";
@@ -215,6 +207,10 @@ &pm8916_resin { linux,code = <KEY_VOLUMEDOWN>; }; +&pm8916_usbin { + status = "okay"; +}; + &pm8916_vib { status = "okay"; };
@@ -244,11 +240,11 @@ &sdhc_2 { &usb { status = "okay"; dr_mode = "peripheral"; - extcon = <&usb_vbus>; + extcon = <&pm8916_usbin>; }; &usb_hs_phy { - extcon = <&usb_vbus>; + extcon = <&pm8916_usbin>; }; &smd_rpm_regulators {
@@ -410,11 +406,4 @@ tp_int_default: tp-int-default { drive-strength = <2>; bias-disable; }; - - usb_vbus_default: usb-vbus-default { - pins = "gpio62"; - function = "gpio"; - - bias-pull-up; - }; };
Signature · 1 line
2.33.0
Bjorn Andersson
AppliedQuoted 8 lines · Stephan Gerhold
While removing the size from the "reg" properties in
pm8916.dtsi, commitbd6429e81010("ARM64: dts: qcom: Remove size elements from pmic reg properties") mistakenly also removed the second register address for the rtc@6000 device. That one did not represent the size of the register region but actually the address of the second "alarm" register region of the rtc@6000 device.[...]
Applied, thanks!
[1/3] arm64: dts: qcom: pm8916: Remove wrong reg-names for rtc@6000
commit: 483de2b44cd3a168458f8f9ff237e78a434729bc
[2/3] arm64: dts: qcom: pm8916: Add pm8941-misc extcon for USB detection
commit: f5d7bca55425c8611e6cfa3f236d1f56031920e8
[3/3] arm64: dts: qcom: msm8916-longcheer-l8150: Use &pm8916_usbin extcon
commit: b30cad26d8030bddeb0ee2373b6d4c1440ffb1a3Best regards,
Signature · 1 line
Bjorn Andersson <[email protected]>
This series was applied to qcom/linux.git (refs/heads/for-next):
Hello:
This series was applied to qcom/linux.git (refs/heads/for-next):
Quoted 8 lines · On Tue, 28 Sep 2021 13:29:43 +0200 you wrote:
While removing the size from the "reg" properties in
pm8916.dtsi, commitbd6429e81010("ARM64: dts: qcom: Remove size elements from pmic reg properties") mistakenly also removed the second register address for the rtc@6000 device. That one did not represent the size of the register region but actually the address of the second "alarm" register region of the rtc@6000 device.[...]
Here is the summary with links:
- [1/3] arm64: dts: qcom: pm8916: Remove wrong reg-names for rtc@6000
https://git.kernel.org/qcom/c/483de2b44cd3 - [2/3] arm64: dts: qcom: pm8916: Add pm8941-misc extcon for USB detection https://git.kernel.org/qcom/c/f5d7bca55425 - [3/3] arm64: dts: qcom: msm8916-longcheer-l8150: Use &pm8916_usbin extcon https://git.kernel.org/qcom/c/b30cad26d803
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html