openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

arm64: dts: amlogic: use the new USB control driver for GXL and GXM 

Add the correcly architectured USB Glue node and adapt all the Amlogic
GXL and GXM board to the new organization.

Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
Link: https://lore.kernel.org/r/20200326134507.4808-11-narmstrong@baylibre.com
This commit is contained in:
Martin Blumenstingl 2020-03-26 14:45:02 +01:00 committed by Kevin Hilman
parent 8f3d9f3542
commit 2f9139c260
16 changed files with 68 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi
View File

@ -360,8 +360,9 @@ &uart_AO {
status = "okay";
};
&usb0 {
&usb {
status = "okay";
dr_mode = "host";
};
&usb2_phy0 {

3
arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
View File

@ -223,6 +223,7 @@ &uart_AO {
pinctrl-names = "default";
};
&usb0 {
&usb {
status = "okay";
dr_mode = "otg";
};

3
arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts
View File

@ -243,6 +243,7 @@ &uart_AO {
pinctrl-names = "default";
};
&usb0 {
&usb {
status = "okay";
dr_mode = "host";
};

3
arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts
View File

@ -216,6 +216,7 @@ &uart_AO {
pinctrl-names = "default";
};
&usb0 {
&usb {
status = "okay";
dr_mode = "host";
};

4
arch/arm64/boot/dts/amlogic/meson-gxl-s905d-phicomm-n1.dts
View File

@ -29,3 +29,7 @@ status {
&cvbs_vdac_port {
status = "disabled";
};
&usb {
dr_mode = "host";
};

4
arch/arm64/boot/dts/amlogic/meson-gxl-s905w-p281.dts
View File

@ -20,3 +20,7 @@ memory@0 {
reg = <0x0 0x0 0x0 0x40000000>;
};
};
&usb {
dr_mode = "host";
};

4
arch/arm64/boot/dts/amlogic/meson-gxl-s905w-tx3-mini.dts
View File

@ -24,3 +24,7 @@ memory@0 {
&ir {
linux,rc-map-name = "rc-tanix-tx3mini";
};
&usb {
dr_mode = "host";
};

4
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
View File

@ -207,3 +207,7 @@ &uart_AO_B {
pinctrl-0 = <&uart_ao_b_pins>;
pinctrl-names = "default";
};
&usb {
dr_mode = "peripheral";
};

3
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
View File

@ -272,8 +272,9 @@ &uart_AO {
pinctrl-names = "default";
};
&usb0 {
&usb {
status = "okay";
dr_mode = "host";
};
&usb2_phy0 {

3
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts
View File

@ -218,6 +218,7 @@ &uart_AO {
pinctrl-names = "default";
};
&usb0 {
&usb {
status = "okay";
dr_mode = "host";
};

3
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi
View File

@ -195,8 +195,9 @@ &uart_AO {
pinctrl-names = "default";
};
&usb0 {
&usb {
status = "okay";
dr_mode = "host";
};
&usb2_phy0 {

45
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
View File

@ -14,26 +14,43 @@ / {
compatible = "amlogic,meson-gxl";
soc {
usb0: usb@c9000000 {
status = "disabled";
compatible = "amlogic,meson-gxl-dwc3";
usb: usb@d0078080 {
compatible = "amlogic,meson-gxl-usb-ctrl";
reg = <0x0 0xd0078080 0x0 0x20>;
interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <2>;
#size-cells = <2>;
ranges;
clocks = <&clkc CLKID_USB>;
clock-names = "usb_general";
clocks = <&clkc CLKID_USB>, <&clkc CLKID_USB1_DDR_BRIDGE>;
clock-names = "usb_ctrl", "ddr";
resets = <&reset RESET_USB_OTG>;
reset-names = "usb_otg";
dwc3: dwc3@c9000000 {
dr_mode = "otg";
phys = <&usb2_phy0>, <&usb2_phy1>;
phy-names = "usb2-phy0", "usb2-phy1";
dwc2: usb@c9100000 {
compatible = "amlogic,meson-g12a-usb", "snps,dwc2";
reg = <0x0 0xc9100000 0x0 0x40000>;
interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clkc CLKID_USB1>;
clock-names = "otg";
phys = <&usb2_phy1>;
dr_mode = "peripheral";
g-rx-fifo-size = <192>;
g-np-tx-fifo-size = <128>;
g-tx-fifo-size = <128 128 16 16 16>;
};
dwc3: usb@c9000000 {
compatible = "snps,dwc3";
reg = <0x0 0xc9000000 0x0 0x100000>;
interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
dr_mode = "host";
maximum-speed = "high-speed";
snps,dis_u2_susphy_quirk;
phys = <&usb3_phy>, <&usb2_phy0>, <&usb2_phy1>;
};
};
@ -71,18 +88,6 @@ usb2_phy1: phy@78020 {
reset-names = "phy";
status = "okay";
};
usb3_phy: phy@78080 {
compatible = "amlogic,meson-gxl-usb3-phy";
#phy-cells = <0>;
reg = <0x0 0x78080 0x0 0x20>;
interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clkc CLKID_USB>, <&clkc_AO CLKID_AO_CEC_32K>;
clock-names = "phy", "peripheral";
resets = <&reset RESET_USB_OTG>, <&reset RESET_USB_OTG>;
reset-names = "phy", "peripheral";
status = "okay";
};
};
&efuse {

3
arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
View File

@ -380,6 +380,7 @@ &saradc {
vref-supply = <&vddio_ao18>;
};
&usb0 {
&usb {
status = "okay";
dr_mode = "peripheral";
};

3
arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
View File

@ -179,6 +179,7 @@ &uart_AO {
pinctrl-names = "default";
};
&usb0 {
&usb {
status = "okay";
dr_mode = "host";
};

4
arch/arm64/boot/dts/amlogic/meson-gxm-vega-s96.dts
View File

@ -39,3 +39,7 @@ external_phy: ethernet-phy@0 {
&ir {
linux,rc-map-name = "rc-vega-s9x";
};
&usb {
dr_mode = "host";
};

7
arch/arm64/boot/dts/amlogic/meson-gxm.dtsi
View File

@ -169,8 +169,11 @@ &hdmi_tx {
compatible = "amlogic,meson-gxm-dw-hdmi", "amlogic,meson-gx-dw-hdmi";
};
&dwc3 {
phys = <&usb3_phy>, <&usb2_phy0>, <&usb2_phy1>, <&usb2_phy2>;
&usb {
compatible = "amlogic,meson-gxm-usb-ctrl";
phy-names = "usb2-phy0", "usb2-phy1", "usb2-phy2";
phys = <&usb2_phy0>, <&usb2_phy1>, <&usb2_phy2>;
};
&vdec {