Skip to content

Commit 3fb7eba

Browse files
sgaud-quicsgaud-quic
authored
Merge pull request #286 from akakum-qualcomm/my-feature
WORKAROUND: Change to enable USB type A ports on rb3gen2
2 parents 8f8218e + 8885e6e commit 3fb7eba

14 files changed

Lines changed: 1824 additions & 43 deletions

File tree

‎Documentation/devicetree/bindings/arm/qcom.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1046,6 +1046,7 @@ properties:
10461046

10471047
- items:
10481048
- enum:
1049+
- ayaneo,pocket-s2
10491050
- qcom,sm8650-hdk
10501051
- qcom,sm8650-mtp
10511052
- qcom,sm8650-qrd

‎Documentation/devicetree/bindings/usb/renesas,upd720201-pci.yaml‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/usb/renesas,upd720201-pci.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: UPD720201/UPD720202 USB 3.0 xHCI Host Controller (PCIe)
8+
9+
maintainers:
10+
- Neil Armstrong <neil.armstrong@linaro.org>
11+
12+
description:
13+
UPD720201 USB 3.0 xHCI Host Controller via PCIe x1 Gen2 interface.
14+
The UPD720202 supports up to two downstream ports, while UPD720201
15+
supports up to four downstream USB 3.0 rev1.0 ports.
16+
17+
properties:
18+
compatible:
19+
const: pci1912,0014
20+
21+
reg:
22+
maxItems: 1
23+
24+
avdd33-supply:
25+
description: +3.3 V power supply for analog circuit
26+
27+
vdd10-supply:
28+
description: +1.05 V power supply
29+
30+
vdd33-supply:
31+
description: +3.3 V power supply
32+
33+
required:
34+
- compatible
35+
- reg
36+
- avdd33-supply
37+
- vdd10-supply
38+
- vdd33-supply
39+
40+
allOf:
41+
- $ref: usb-xhci.yaml
42+
43+
additionalProperties: false
44+
45+
examples:
46+
- |
47+
pcie@0 {
48+
reg = <0x0 0x1000>;
49+
ranges = <0x02000000 0x0 0x100000 0x10000000 0x0 0x0>;
50+
#address-cells = <3>;
51+
#size-cells = <2>;
52+
device_type = "pci";
53+
54+
usb-controller@0 {
55+
compatible = "pci1912,0014";
56+
reg = <0x0 0x0 0x0 0x0 0x0>;
57+
avdd33-supply = <&avdd33_reg>;
58+
vdd10-supply = <&vdd10_reg>;
59+
vdd33-supply = <&vdd33_reg>;
60+
};
61+
};

‎Documentation/devicetree/bindings/vendor-prefixes.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,8 @@ patternProperties:
211211
description: Axiado Corporation
212212
"^axis,.*":
213213
description: Axis Communications AB
214+
"^ayaneo,.*":
215+
description: Anyun Intelligent Technology (Hong Kong) Co., Ltd
214216
"^azoteq,.*":
215217
description: Azoteq (Pty) Ltd
216218
"^azw,.*":

‎arch/arm64/boot/dts/qcom/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,7 @@ dtb-$(CONFIG_ARCH_QCOM) += sm8550-mtp.dtb
343343
dtb-$(CONFIG_ARCH_QCOM) += sm8550-qrd.dtb
344344
dtb-$(CONFIG_ARCH_QCOM) += sm8550-samsung-q5q.dtb
345345
dtb-$(CONFIG_ARCH_QCOM) += sm8550-sony-xperia-yodo-pdx234.dtb
346+
dtb-$(CONFIG_ARCH_QCOM) += sm8650-ayaneo-pocket-s2.dtb
346347

347348
sm8650-hdk-display-card-dtbs := sm8650-hdk.dtb sm8650-hdk-display-card.dtbo
348349

‎arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts‎

Lines changed: 161 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,28 @@
272272
regulator-max-microvolt = <3700000>;
273273
};
274274

275+
vreg_pcie0_1p05: regulator-pcie0-1p05v {
276+
compatible = "regulator-fixed";
277+
regulator-name = "PCIE0_1.05V";
278+
gpio = <&pm7250b_gpios 4 GPIO_ACTIVE_HIGH>;
279+
regulator-min-microvolt = <1050000>;
280+
regulator-max-microvolt = <1050000>;
281+
enable-active-high;
282+
pinctrl-0 = <&upd_pwr_en2_state>;
283+
pinctrl-names = "default";
284+
};
285+
286+
vreg_pcie0_3p3: regulator-pcie0-3p3v-dual {
287+
compatible = "regulator-fixed";
288+
regulator-name = "PCIE0_3.3V_Dual";
289+
gpio = <&pm7250b_gpios 1 GPIO_ACTIVE_HIGH>;
290+
regulator-min-microvolt = <3300000>;
291+
regulator-max-microvolt = <3300000>;
292+
enable-active-high;
293+
pinctrl-0 = <&upd_pwr_en1_state>;
294+
pinctrl-names = "default";
295+
};
296+
275297
vdd_ntn_0p9: regulator-vdd-ntn-0p9 {
276298
compatible = "regulator-fixed";
277299
regulator-name = "VDD_NTN_0P9";
@@ -823,6 +845,72 @@
823845
};
824846
};
825847
};
848+
849+
i2c-mux@71 {
850+
compatible = "nxp,pca9847";
851+
#address-cells = <1>;
852+
#size-cells = <0>;
853+
reg = <0x71>;
854+
855+
i2c@1 {
856+
#address-cells = <1>;
857+
#size-cells = <0>;
858+
859+
reg = <1>;
860+
861+
usb-hub@2d {
862+
compatible = "smsc,usb4604";
863+
reg = <0x2d>;
864+
};
865+
};
866+
867+
i2c@2 {
868+
#address-cells = <1>;
869+
#size-cells = <0>;
870+
871+
reg = <2>;
872+
873+
usb-hub@2d {
874+
compatible = "smsc,usb4604";
875+
reg = <0x2d>;
876+
};
877+
};
878+
879+
i2c@3 {
880+
#address-cells = <1>;
881+
#size-cells = <0>;
882+
883+
reg = <3>;
884+
};
885+
886+
i2c@4 {
887+
#address-cells = <1>;
888+
#size-cells = <0>;
889+
890+
reg = <4>;
891+
};
892+
893+
i2c@5 {
894+
#address-cells = <1>;
895+
#size-cells = <0>;
896+
897+
reg = <5>;
898+
};
899+
900+
i2c@6 {
901+
#address-cells = <1>;
902+
#size-cells = <0>;
903+
904+
reg = <6>;
905+
};
906+
907+
i2c@7 {
908+
#address-cells = <1>;
909+
#size-cells = <0>;
910+
911+
reg = <7>;
912+
};
913+
};
826914
};
827915

828916
&lpass_va_macro {
@@ -945,6 +1033,42 @@
9451033
device_type = "pci";
9461034
ranges;
9471035
bus-range = <0x4 0xff>;
1036+
1037+
/* Renesas μPD720201 PCIe USB3.0 Host Controller */
1038+
usb-controller@0,0 {
1039+
compatible = "pci1912,0014";
1040+
reg = <0x40000 0x0 0x0 0x0 0x0>;
1041+
1042+
avdd33-supply = <&vreg_pcie0_3p3>;
1043+
vdd10-supply = <&vreg_pcie0_1p05>;
1044+
vdd33-supply = <&vreg_pcie0_3p3>;
1045+
1046+
pinctrl-0 = <&upd_hub_rst_state>;
1047+
pinctrl-names = "default";
1048+
1049+
#address-cells = <1>;
1050+
#size-cells = <0>;
1051+
1052+
/* Genesys Logic GL3590 USB Hub Controller */
1053+
gl3590_2_0: hub@1 {
1054+
compatible = "usb5e3,610";
1055+
reg = <1>;
1056+
1057+
reset-gpios = <&tlmm 162 GPIO_ACTIVE_HIGH>;
1058+
1059+
pinctrl-0 = <&usb_hub_reset_state>;
1060+
pinctrl-names = "default";
1061+
1062+
peer-hub = <&gl3590_3_0>;
1063+
};
1064+
1065+
gl3590_3_0: hub@2 {
1066+
compatible = "usb5e3,625";
1067+
reg = <2>;
1068+
1069+
peer-hub = <&gl3590_2_0>;
1070+
};
1071+
};
9481072
};
9491073

9501074
pcie@3,0 {
@@ -1614,6 +1738,17 @@
16141738
power-source = <0>;
16151739
};
16161740

1741+
upd_hub_rst_state: upd-hub-rst-state {
1742+
pins = "gpio4";
1743+
function = "normal";
1744+
1745+
bias-disable;
1746+
input-disable;
1747+
output-enable;
1748+
output-high;
1749+
power-source = <0>;
1750+
};
1751+
16171752
tc9563_resx_n: tc9563-resx-state {
16181753
pins = "gpio1";
16191754
function = "normal";
@@ -1825,6 +1960,15 @@
18251960
};
18261961

18271962
&pm7250b_gpios {
1963+
upd_pwr_en1_state: upd-pwr-en1-state {
1964+
pins = "gpio1";
1965+
function = "normal";
1966+
1967+
output-enable;
1968+
input-disable;
1969+
power-source = <0>;
1970+
};
1971+
18281972
lt9611_rst_pin: lt9611-rst-state {
18291973
pins = "gpio2";
18301974
function = "normal";
@@ -1833,6 +1977,15 @@
18331977
input-disable;
18341978
power-source = <0>;
18351979
};
1980+
1981+
upd_pwr_en2_state: upd-pwr-en2-state {
1982+
pins = "gpio4";
1983+
function = "normal";
1984+
1985+
output-enable;
1986+
input-disable;
1987+
power-source = <0>;
1988+
};
18361989
};
18371990

18381991
&sdc2_clk {
@@ -1878,6 +2031,14 @@
18782031
function = "gpio";
18792032
bias-pull-up;
18802033
};
2034+
2035+
usb_hub_reset_state: usb-hub-reset-state {
2036+
pins = "gpio162";
2037+
function = "gpio";
2038+
2039+
drive-strength = <2>;
2040+
bias-disable;
2041+
};
18812042
};
18822043

18832044
&lpass_audiocc {

0 commit comments

Comments
 (0)