There are two typos in this dtsi, so fix it.
classis -> chassis.
80700000 -> 80600000
Signed-off-by: Jianhua Lu <[email protected]>
---
arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 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 85e5cf3dc91e..3d4ea428e4cb 100644
--- a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
@@ -23,7 +23,7 @@
/delete-node/ &xbl_aop_mem;
/ {
- classis-type = "tablet";
+ chassis-type = "tablet";
/* required for bootloader to select correct board */
qcom,msm-id = <QCOM_ID_SM8250 0x20001>; /* SM8250 v2.1 */
@@ -114,7 +114,7 @@ vreg_s6c_0p88: smpc6-regulator {
};
reserved-memory {
- xbl_aop_mem: xbl-aop@80700000 {
+ xbl_aop_mem: xbl-aop@80600000 {
reg = <0x0 0x80600000 0x0 0x260000>;
no-map;
};
--
2.41.0
ufs node isn't in a right place, 'f' is front of 's', so move it to
above usb node.
Signed-off-by: Jianhua Lu <[email protected]>
---
.../dts/qcom/sm8250-xiaomi-elish-common.dtsi | 32 +++++++++----------
1 file changed, 16 insertions(+), 16 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 3d4ea428e4cb..3de7cb918448 100644
--- a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
@@ -657,6 +657,22 @@ &tlmm {
gpio-reserved-ranges = <40 4>;
};
+&ufs_mem_hc {
+ vcc-supply = <&vreg_l17a_3p0>;
+ vcc-max-microamp = <800000>;
+ vccq-supply = <&vreg_l6a_1p2>;
+ vccq-max-microamp = <800000>;
+ vccq2-supply = <&vreg_s4a_1p8>;
+ vccq2-max-microamp = <800000>;
+ status = "okay";
+};
+
+&ufs_mem_phy {
+ vdda-phy-supply = <&vreg_l5a_0p88>;
+ vdda-pll-supply = <&vreg_l9a_1p2>;
+ status = "okay";
+};
+
&usb_1 {
/* USB 2.0 only */
qcom,select-utmi-as-pipe-clk;
@@ -678,22 +694,6 @@ &usb_1_hsphy {
status = "okay";
};
-&ufs_mem_hc {
- vcc-supply = <&vreg_l17a_3p0>;
- vcc-max-microamp = <800000>;
- vccq-supply = <&vreg_l6a_1p2>;
- vccq-max-microamp = <800000>;
- vccq2-supply = <&vreg_s4a_1p8>;
- vccq2-max-microamp = <800000>;
- status = "okay";
-};
-
-&ufs_mem_phy {
- vdda-phy-supply = <&vreg_l5a_0p88>;
- vdda-pll-supply = <&vreg_l9a_1p2>;
- status = "okay";
-};
-
&venus {
firmware-name = "qcom/sm8250/xiaomi/elish/venus.mbn";
status = "okay";
--
2.41.0
Add type-c node to feature otg function.
Signed-off-by: Jianhua Lu <[email protected]>
---
.../dts/qcom/sm8250-xiaomi-elish-common.dtsi | 36 +++++++++++++++++++
1 file changed, 36 insertions(+)
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 3de7cb918448..87a83f9bdea5 100644
--- a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
@@ -6,6 +6,7 @@
#include <dt-bindings/arm/qcom,ids.h>
#include <dt-bindings/phy/phy.h>
#include <dt-bindings/regulator/qcom,rpmh-regulator.h>
+#include <dt-bindings/usb/pd.h>
#include "sm8250.dtsi"
#include "pm8150.dtsi"
#include "pm8150b.dtsi"
@@ -627,6 +628,37 @@ vol_up_n: vol-up-n-state {
};
};
+&pm8150b_typec {
+ vdd-pdphy-supply = <&vreg_l2a_3p1>;
+ status = "okay";
+
+ connector {
+ compatible = "usb-c-connector";
+
+ power-role = "source";
+ data-role = "dual";
+ self-powered;
+
+ source-pdos = <PDO_FIXED(5000, 3000,
+ PDO_FIXED_DUAL_ROLE |
+ PDO_FIXED_USB_COMM |
+ PDO_FIXED_DATA_SWAP)>;
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+
+ pm8150b_role_switch_in: endpoint {
+ remote-endpoint = <&usb_1_role_switch_out>;
+ };
+ };
+ };
+ };
+};
+
&pon_pwrkey {
status = "okay";
};
@@ -694,6 +726,10 @@ &usb_1_hsphy {
status = "okay";
};
+&usb_1_role_switch_out {
+ remote-endpoint = <&pm8150b_role_switch_in>;
+};
+
&venus {
firmware-name = "qcom/sm8250/xiaomi/elish/venus.mbn";
status = "okay";
--
2.41.0
On 24/11/2023 14:57, Jianhua Lu wrote:
> ufs node isn't in a right place, 'f' is front of 's', so move it to
> above usb node.
Please not.
If we change the order to match DTSI, then this patch would be wrong.
Best regards,
Krzysztof
On Fri, Nov 24, 2023 at 04:54:20PM +0100, Krzysztof Kozlowski wrote:
> On 24/11/2023 14:57, Jianhua Lu wrote:
> > ufs node isn't in a right place, 'f' is front of 's', so move it to
> > above usb node.
>
> Please not.
>
> If we change the order to match DTSI, then this patch would be wrong.
>
Acked. I will drop this patch.
> Best regards,
> Krzysztof
>