Files
build/patch/kernel/archive/sm8250-6.7/0030-arm64-dts-qcom-sm8250-xiaomi-elish-Hook-up-usb-keybo.patch
2023-11-26 23:20:57 +01:00

112 lines
2.6 KiB
Diff

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jianhua Lu <lujianhua000@gmail.com>
Date: Sat, 2 Sep 2023 14:54:26 +0800
Subject: arm64: dts: qcom: sm8250-xiaomi-elish: Hook up usb keyboard
---
arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi | 31 +++++-----
arch/arm64/boot/dts/qcom/sm8250.dtsi | 17 +++++
2 files changed, 31 insertions(+), 17 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
index ae6a2a060..31031e919 100644
--- a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
@@ -179,14 +179,6 @@ ramoops@b0000000 {
no-map;
};
};
-
- extcon_usb: extcon-usb {
- compatible = "linux,extcon-usb-gpio";
- id-gpio = <&tlmm 91 GPIO_ACTIVE_HIGH>;
- vbus-gpio = <&pm8150_gpios 10 GPIO_ACTIVE_HIGH>;
- pinctrl-0 = <&keyboard_active &usb_2_vbus_det_n>;
- pinctrl-names = "default";
- };
};
&adsp {
@@ -801,14 +793,6 @@ &pcie0_phy {
};
&pm8150_gpios {
- usb_2_vbus_det_n: usb-2-vbus-det-state {
- pins = "gpio10";
- function = "normal";
- power-source = <1>;
- input-enable;
- bias-pull-down;
- };
-
vol_up_n: vol-up-n-state {
pins = "gpio6";
function = "normal";
@@ -851,6 +835,13 @@ pm8150b_typec_hsphy_in: endpoint {
remote-endpoint = <&usb_1_dwc3_hs>;
};
};
+
+ port@1 {
+ reg = <1>;
+ pm8150b_typec_ssphy_in: endpoint {
+ remote-endpoint = <&usb_2_dwc3_ss>;
+ };
+ };
};
};
};
@@ -1090,7 +1081,10 @@ &usb_2 {
&usb_2_dwc3 {
dr_mode = "host";
maximum-speed = "super-speed";
- extcon = <&extcon_usb>;
+};
+
+&usb_2_dwc3_ss {
+ remote-endpoint = <&pm8150b_typec_ssphy_in>;
};
&usb_2_hsphy {
@@ -1104,6 +1098,9 @@ &usb_2_qmpphy {
vdda-phy-supply = <&vreg_l9a_1p2>;
vdda-pll-supply = <&vreg_l18a_0p9>;
status = "okay";
+
+ pinctrl-0 = <&keyboard_active>;
+ pinctrl-names = "default";
};
&usb_1_role_switch_out {
diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi
index d9ac8bc62..7c27e5c1a 100644
--- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
@@ -4238,6 +4238,23 @@ usb_2_dwc3: usb@a800000 {
snps,dis_enblslpm_quirk;
phys = <&usb_2_hsphy>, <&usb_2_ssphy>;
phy-names = "usb2-phy", "usb3-phy";
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+
+ usb_2_dwc3_hs: endpoint {};
+ };
+
+ port@1 {
+ reg = <1>;
+
+ usb_2_dwc3_ss: endpoint {};
+ };
+ };
};
};
--
Armbian