Enable IPQ5332 USB2
Subsystems (5)
v4 cover Enable IPQ5332 USB2
This patch series adds the relevant phy and controller configurations for enabling USB2 on IPQ5332
v4:
Binding and dts:-
Change node name (bindings & dts)
Driver:-
Remove unused enum
static const for '.data' Error handling for devm_clk_get
v3:
Fix bindings file based on review comments
v1:
Cleanup DTS
Combine driver, kconfig and makefile patches Remove unused functions from M31 driver Drop the clock driver changes
Varadarajan Narayanan (6):
dt-bindings: usb: dwc3: Add IPQ5332 compatible
dt-bindings: phy: qcom,m31: Document qcom,m31 USB phy
phy: qcom-m31: Introduce qcom,m31 USB phy driver
arm64: dts: qcom: ipq5332: Add USB related nodes
arm64: dts: qcom: ipq5332: Enable USB
arm64: defconfig: Enable M31 USB phy driver
.../bindings/phy/qcom,ipq5332-usb-hsphy.yaml | 48 ++++ .../devicetree/bindings/usb/qcom,dwc3.yaml | 3 + arch/arm64/boot/dts/qcom/ipq5332-rdp468.dts | 12 + arch/arm64/boot/dts/qcom/ipq5332.dtsi | 53 +++++ arch/arm64/configs/defconfig | 1 + drivers/phy/qualcomm/Kconfig | 11 + drivers/phy/qualcomm/Makefile | 1 + drivers/phy/qualcomm/phy-qcom-m31.c | 256 +++++++++++++++++++++ 8 files changed, 385 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/qcom,ipq5332-usb-hsphy.yaml create mode 100644 drivers/phy/qualcomm/phy-qcom-m31.c
Signature · 7 lines
2.7.4 -- linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
PATCH v4 1/6 dt-bindings: usb: dwc3: Add IPQ5332 compatible
Document the IPQ5332 dwc3 compatible.
---
v1:
Add ipq5332 to interrupts sections
--- Documentation/devicetree/bindings/usb/qcom,dwc3.yaml | 3 +++ 1 file changed, 3 insertions(+)
Documentation/devicetree/bindings/usb/qcom,dwc3.yaml +3 -0
@@ -14,6 +14,7 @@ properties: items: - enum: - qcom,ipq4019-dwc3 + - qcom,ipq5332-dwc3 - qcom,ipq6018-dwc3 - qcom,ipq8064-dwc3 - qcom,ipq8074-dwc3
@@ -246,6 +247,7 @@ allOf: compatible: contains: enum: + - qcom,ipq5332-dwc3 - qcom,msm8994-dwc3 - qcom,qcs404-dwc3 then:
@@ -410,6 +412,7 @@ allOf: compatible: contains: enum: + - qcom,ipq5332-dwc3 - qcom,sdm660-dwc3 then: properties:
Signature · 7 lines
2.7.4 -- linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
PATCH v4 3/6 phy: qcom-m31: Introduce qcom,m31 USB phy driver
In reply to Varadarajan NarayananAdd the M31 USB2 phy driver.
---
v4:
Remove unused enum
Error handling for devm_clk_get
v1:
Combine driver, makefile and kconfig into 1 patch
Remove 'qscratch' region and its usage. The controller driver takes care of those settings
Use compatible/data to handle ipq5332 init
Drop the default case
Get resources by index instead of name as there is only one resource Add clock
Fix review comments in the driver
--- drivers/phy/qualcomm/Kconfig | 11 ++ drivers/phy/qualcomm/Makefile | 1 + drivers/phy/qualcomm/phy-qcom-m31.c | 256 ++++++++++++++++++++++++++++++++++++ 3 files changed, 268 insertions(+) create mode 100644 drivers/phy/qualcomm/phy-qcom-m31.c
drivers/phy/qualcomm/Kconfig +11 -0
@@ -197,3 +197,14 @@ config PHY_QCOM_SGMII_ETH help Enable this to support the internal SerDes/SGMII PHY on various Qualcomm chipsets. + +config PHY_QCOM_M31_USB + tristate "Qualcomm M31 HS PHY driver support" + depends on (USB || USB_GADGET) && ARCH_QCOM + select USB_PHY + help + Enable this to support M31 HS PHY transceivers on Qualcomm chips + with DWC3 USB core. It handles PHY initialization, clock + management required after resetting the hardware and power + management. This driver is required even for peripheral only or + host only mode configurations.
drivers/phy/qualcomm/Makefile +1 -0
@@ -22,3 +22,4 @@ obj-$(CONFIG_PHY_QCOM_USB_SS) += phy-qcom-usb-ss.o obj-$(CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2)+= phy-qcom-snps-femto-v2.o obj-$(CONFIG_PHY_QCOM_IPQ806X_USB) += phy-qcom-ipq806x-usb.o obj-$(CONFIG_PHY_QCOM_SGMII_ETH) += phy-qcom-sgmii-eth.o +obj-$(CONFIG_PHY_QCOM_M31_USB) += phy-qcom-m31.o
drivers/phy/qualcomm/phy-qcom-m31.c new file +256 -0
256 lines not on this page · raw message
Signature · 7 lines
2.7.4 -- linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
PATCH v4 6/6 arm64: defconfig: Enable M31 USB phy driver
In reply to Varadarajan NarayananEnable M31 USB phy driver present in IPQ5332.
---
v2:
Add full stop to commit log.
--- arch/arm64/configs/defconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm64/configs/defconfig +1 -0
@@ -1386,6 +1386,7 @@ CONFIG_PHY_QCOM_USB_HS=m CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2=m CONFIG_PHY_QCOM_USB_HS_28NM=m CONFIG_PHY_QCOM_USB_SS=m +CONFIG_PHY_QCOM_M31_USB=m CONFIG_PHY_R8A779F0_ETHERNET_SERDES=y CONFIG_PHY_RCAR_GEN3_PCIE=y CONFIG_PHY_RCAR_GEN3_USB2=y
Signature · 7 lines
2.7.4 -- linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
PATCH v4 2/6 dt-bindings: phy: qcom,m31: Document qcom,m31 USB phy
In reply to Varadarajan NarayananDocument the M31 USB2 phy present in IPQ5332.
---
v4:
Move M31 URL to description
Remove maxItems and relevant content from clock-names Change node name to generic name
'make dt_binding_check DT_SCHEMA_FILES=qcom' passed
v3:
Incorporate review comments. Will bring in ipq5018 compatible string while posting ipq5018 usb patchset.
v1:
Rename qcom,m31.yaml -> qcom,ipq5332-usb-hsphy.yaml Drop default binding "m31,usb-hsphy"
Add clock
Remove 'oneOf' from compatible
Remove 'qscratch' region from register space as it is not needed Remove reset-names
Fix the example definition
--- .../bindings/phy/qcom,ipq5332-usb-hsphy.yaml | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/qcom,ipq5332-usb-hsphy.yaml
Documentation/devicetree/bindings/phy/qcom,ipq5332-usb-hsphy.yaml new file +48 -0
@@ -0,0 +1,48 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/phy/qcom,ipq5332-usb-hsphy.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: M31 USB PHY + +maintainers: + - Sricharan Ramabadhran <[email protected]> + - Varadarajan Narayanan <[email protected]> + +description: + USB M31 PHY (https://www.m31tech.com) found in Qualcomm + IPQ5018, IPQ5332 SoCs. + +properties: + compatible: + enum: + - qcom,ipq5332-usb-hsphy + + reg: + maxItems: 1 + + clocks: + maxItems: 1 + + clock-names: + items: + - const: cfg_ahb + + resets: + maxItems: 1 + +additionalProperties: false + +examples: + - | + #include <dt-bindings/clock/qcom,ipq5332-gcc.h> + usbphy0: usb-phy@7b000 { + compatible = "qcom,ipq5332-usb-hsphy"; + reg = <0x0007b000 0x12c>; + + clocks = <&gcc GCC_USB0_PHY_CFG_AHB_CLK>; + clock-names = "cfg_ahb"; + + resets = <&gcc GCC_QUSB2_0_PHY_BCR>; + };
Signature · 7 lines
2.7.4 -- linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
PATCH v4 5/6 arm64: dts: qcom: ipq5332: Enable USB
In reply to Varadarajan NarayananEnable USB2 in host mode.
---
v1:
Enable usb-phy node
--- arch/arm64/boot/dts/qcom/ipq5332-rdp468.dts | 12 ++++++++++++ 1 file changed, 12 insertions(+)
arch/arm64/boot/dts/qcom/ipq5332-rdp468.dts +12 -0
@@ -79,3 +79,15 @@ bias-pull-up; }; }; + +&usbphy0 { + status = "okay"; +}; + +&usb2 { + status = "okay"; +}; + +&usb2_0_dwc { + dr_mode = "host"; +};
Signature · 7 lines
2.7.4 -- linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
PATCH v4 4/6 arm64: dts: qcom: ipq5332: Add USB related nodes
In reply to Varadarajan NarayananAdd USB phy and controller nodes.
---
v4:
Change node name
Remove blank line
'make CHECK_DTBS=y DT_SCHEMA_FILES=qcom qcom/ipq5332-rdp441.dtb' passed
v1:
Rename phy node
Change compatible from m31,ipq5332-usb-hsphy -> qcom,ipq5332-usb-hsphy Remove 'qscratch' from phy node
Fix alignment and upper-case hex no.s
Add clock definition for the phy
Remove snps,ref-clock-period-ns as it is not used. dwc3_ref_clk_period() in dwc3/core.c takes the frequency from ref clock and calculates fladj as appropriate.
--- arch/arm64/boot/dts/qcom/ipq5332.dtsi | 53 +++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+)
arch/arm64/boot/dts/qcom/ipq5332.dtsi +53 -0
@@ -405,6 +405,59 @@ status = "disabled"; }; }; + + usbphy0: usb-phy@7b000 { + compatible = "qcom,ipq5332-usb-hsphy"; + reg = <0x0007b000 0x12c>; + + clocks = <&gcc GCC_USB0_PHY_CFG_AHB_CLK>; + clock-names = "cfg_ahb"; + + resets = <&gcc GCC_QUSB2_0_PHY_BCR>; + + status = "disabled"; + }; + + usb2: usb2@8a00000 { + compatible = "qcom,ipq5332-dwc3", "qcom,dwc3"; + reg = <0x08af8800 0x400>; + + interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "hs_phy_irq"; + + clocks = <&gcc GCC_USB0_MASTER_CLK>, + <&gcc GCC_SNOC_USB_CLK>, + <&gcc GCC_USB0_SLEEP_CLK>, + <&gcc GCC_USB0_MOCK_UTMI_CLK>; + clock-names = "core", + "iface", + "sleep", + "mock_utmi"; + + resets = <&gcc GCC_USB_BCR>; + + qcom,select-utmi-as-pipe-clk; + + #address-cells = <1>; + #size-cells = <1>; + ranges; + + status = "disabled"; + + usb2_0_dwc: usb@8a00000 { + compatible = "snps,dwc3"; + reg = <0x08a00000 0xe000>; + clocks = <&gcc GCC_USB0_MOCK_UTMI_CLK>; + clock-names = "ref"; + interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>; + usb-phy = <&usbphy0>; + tx-fifo-resize; + snps,is-utmi-l1-suspend; + snps,hird-threshold = /bits/ 8 <0x0>; + snps,dis_u2_susphy_quirk; + snps,dis_u3_susphy_quirk; + }; + }; }; timer {
Signature · 7 lines
2.7.4 -- linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
Re: [PATCH v4 4/6] arm64: dts: qcom: ipq5332: Add USB related nodes
Quoted 33 lines · Varadarajan Narayanan
Add USB phy and controller nodes.
Signed-off-by Varadarajan Narayanan <[email protected]>---
v4:
Change node name
Remove blank line
'make CHECK_DTBS=y DT_SCHEMA_FILES=qcom qcom/ipq5332-rdp441.dtb' passed
v1:
Rename phy node
Change compatible from m31,ipq5332-usb-hsphy -> qcom,ipq5332-usb-hsphy Remove 'qscratch' from phy node
Fix alignment and upper-case hex no.s
Add clock definition for the phy
Remove snps,ref-clock-period-ns as it is not used.dwc3_ref_clk_period()indwc3/core.ctakes the frequency from ref clock and calculates fladj as appropriate.--- arch/arm64/boot/dts/qcom/ipq5332.dtsi | 53 +++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+)arch/arm64/boot/dts/qcom/ipq5332.dtsi +4
-0@@ -405,6 +405,59 @@ status = "disabled"; }; }; + + usbphy0: usb-phy@7b000 { + compatible = "qcom,ipq5332-usb-hsphy"; + reg = <0x0007b000 0x12c>;
arch/arm64/boot/dts/qcom/ipq5332.dtsi line 421
Quoted 10 lines
arch/arm64/boot/dts/qcom/ipq5332.dtsi +10
-0+ + clocks = <&gcc GCC_USB0_PHY_CFG_AHB_CLK>; + clock-names = "cfg_ahb"; + + resets = <&gcc GCC_QUSB2_0_PHY_BCR>; + + status = "disabled"; + }; + + usb2: usb2@8a00000 {
So you responded to my comments, wait ten minutes and send v2? No need to wait for my feedback, right?
No, it's not ok. This is "usb", not "usb2". Are you saying you have second device with the same address?
Best regards,
Krzysztof
Signature · 3 lines
linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
Re: [PATCH v4 4/6] arm64: dts: qcom: ipq5332: Add USB related nodes
Quoted 48 lines · Krzysztof Kozlowski
Quoted 33 lines · Varadarajan Narayanan
Add USB phy and controller nodes.
Signed-off-by Varadarajan Narayanan <[email protected]>---
v4:
Change node name
Remove blank line
'make CHECK_DTBS=y DT_SCHEMA_FILES=qcom qcom/ipq5332-rdp441.dtb' passed
v1:
Rename phy node
Change compatible from m31,ipq5332-usb-hsphy -> qcom,ipq5332-usb-hsphy Remove 'qscratch' from phy node
Fix alignment and upper-case hex no.s
Add clock definition for the phy
Remove snps,ref-clock-period-ns as it is not used.dwc3_ref_clk_period()indwc3/core.ctakes the frequency from ref clock and calculates fladj as appropriate.--- arch/arm64/boot/dts/qcom/ipq5332.dtsi | 53 +++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+)arch/arm64/boot/dts/qcom/ipq5332.dtsi +4
-0@@ -405,6 +405,59 @@ status = "disabled"; }; }; + + usbphy0: usb-phy@7b000 { + compatible = "qcom,ipq5332-usb-hsphy"; + reg = <0x0007b000 0x12c>;arch/arm64/boot/dts/qcom/ipq5332.dtsi line 421
Quoted 10 lines
arch/arm64/boot/dts/qcom/ipq5332.dtsi +10
-0+ + clocks = <&gcc GCC_USB0_PHY_CFG_AHB_CLK>; + clock-names = "cfg_ahb"; + + resets = <&gcc GCC_QUSB2_0_PHY_BCR>; + + status = "disabled"; + }; + + usb2: usb2@8a00000 {So you responded to my comments, wait ten minutes and send v2? No need to wait for my feedback, right?
Quoted 2 lines
No, it's not ok. This is "usb", not "usb2". Are you saying you have second device with the same address?
Just to emphasise, it's the node name usb2', which is not fine. DT label usb2' is (hopefully) fine.
Signature · 8 lines
With best wishes Dmitry -- linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
Re: [PATCH v4 2/6] dt-bindings: phy: qcom,m31: Document qcom,m31 USB phy
In reply to Varadarajan NarayananQuoted 5 lines · Varadarajan Narayanan
Document the M31 USB2 phy present in IPQ5332.
Signed-off-by Sricharan Ramabadhran <[email protected]>Signed-off-by Varadarajan Narayanan <[email protected]>---
Best regards,
Krzysztof
Re: [PATCH v4 4/6] arm64: dts: qcom: ipq5332: Add USB related nodes
In reply to Dmitry BaryshkovQuoted 49 lines · Dmitry Baryshkov
Quoted 48 lines · Krzysztof Kozlowski
Quoted 33 lines · Varadarajan Narayanan
Add USB phy and controller nodes.
Signed-off-by Varadarajan Narayanan <[email protected]>---
v4:
Change node name
Remove blank line
'make CHECK_DTBS=y DT_SCHEMA_FILES=qcom qcom/ipq5332-rdp441.dtb' passed
v1:
Rename phy node
Change compatible from m31,ipq5332-usb-hsphy -> qcom,ipq5332-usb-hsphy Remove 'qscratch' from phy node
Fix alignment and upper-case hex no.s
Add clock definition for the phy
Remove snps,ref-clock-period-ns as it is not used.dwc3_ref_clk_period()indwc3/core.ctakes the frequency from ref clock and calculates fladj as appropriate.--- arch/arm64/boot/dts/qcom/ipq5332.dtsi | 53 +++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+)arch/arm64/boot/dts/qcom/ipq5332.dtsi +4
-0@@ -405,6 +405,59 @@ status = "disabled"; }; }; + + usbphy0: usb-phy@7b000 { + compatible = "qcom,ipq5332-usb-hsphy"; + reg = <0x0007b000 0x12c>;arch/arm64/boot/dts/qcom/ipq5332.dtsi line 421
Quoted 10 lines
arch/arm64/boot/dts/qcom/ipq5332.dtsi +10
-0+ + clocks = <&gcc GCC_USB0_PHY_CFG_AHB_CLK>; + clock-names = "cfg_ahb"; + + resets = <&gcc GCC_QUSB2_0_PHY_BCR>; + + status = "disabled"; + }; + + usb2: usb2@8a00000 {So you responded to my comments, wait ten minutes and send v2? No need to wait for my feedback, right?
Quoted 5 lines
Quoted 2 lines
No, it's not ok. This is "usb", not "usb2". Are you saying you have second device with the same address?
Just to emphasise, it's the node name
usb2', which is not fine. DT labelusb2' is (hopefully) fine.
Thanks for the clarification. Will post a new patch.
-Varada
Signature · 3 lines
linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
Re: [PATCH v4 2/6] dt-bindings: phy: qcom,m31: Document qcom,m31 USB phy
In reply to Varadarajan NarayananDocumentation/devicetree/bindings/phy/qcom,ipq5332-usb-hsphy.yaml line 11
Quoted 13 lines · Varadarajan Narayanan
+++
b/Documentation/devicetree/bindings/phy/qcom,ipq5332-usb-hsphy.yamlDocumentation/devicetree/bindings/phy/qcom,ipq5332-usb-hsphy.yaml new file +11
-0@@ -0,0 +1,48 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/phy/qcom,ipq5332-usb-hsphy.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: M31 USB PHY + +maintainers: + - Sricharan Ramabadhran <[email protected]> + - Varadarajan Narayanan <[email protected]>
Still wrong email. You should also receive the bounces, didn't you?
Best regards,
Krzysztof
Signature · 3 lines
linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
Vinod Koul
maintainerRe: [PATCH v4 3/6] phy: qcom-m31: Introduce qcom,m31 USB phy driver
In reply to Varadarajan NarayananQuoted 28 lines · Varadarajan Narayanan
Add the M31 USB2 phy driver.
Signed-off-by Varadarajan Narayanan <[email protected]>---
v4:
Remove unused enum
Error handling fordevm_clk_get
v1:
Combine driver, makefile and kconfig into 1 patch
Remove 'qscratch' region and its usage. The controller driver takes care of those settings
Use compatible/data to handle ipq5332 init
Drop the default case
Get resources by index instead of name as there is only one resource Add clock
Fix review comments in the driver--- drivers/phy/qualcomm/Kconfig | 11 ++ drivers/phy/qualcomm/Makefile | 1 + drivers/phy/qualcomm/phy-qcom-m31.c | 256 ++++++++++++++++++++++++++++++++++++ 3 files changed, 268 insertions(+) create mode 100644 drivers/phy/qualcomm/phy-qcom-m31.cdrivers/phy/qualcomm/Kconfig +0
-0
drivers/phy/qualcomm/Kconfig config PHY_QCOM_SGMII_ETH · line 201
Quoted 5 lines
drivers/phy/qualcomm/Kconfig +2
-0@@ -197,3 +197,14 @@ config PHY_QCOM_SGMII_ETH help Enable this to support the internal SerDes/SGMII PHY on various Qualcomm chipsets. + +config PHY_QCOM_M31_USB
Sorted alphabetically please
Quoted 14 lines
drivers/phy/qualcomm/Kconfig +9
-0+ tristate "Qualcomm M31 HS PHY driver support" + depends on (USB || USB_GADGET) && ARCH_QCOM + select USB_PHY + help + Enable this to support M31 HS PHY transceivers on Qualcomm chips + with DWC3 USB core. It handles PHY initialization, clock + management required after resetting the hardware and power + management. This driver is required even for peripheral only or + host only mode configurations.drivers/phy/qualcomm/Makefile +0
-0
drivers/phy/qualcomm/Makefile obj-$(CONFIG_PHY_QCOM_USB_SS) += phy-qcom-usb-ss.o · line 25
Quoted 4 lines
drivers/phy/qualcomm/Makefile +1
-0@@ -22,3 +22,4 @@ obj-$(CONFIG_PHY_QCOM_USB_SS) += phy-qcom-usb-ss.o obj-$(CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2)+= phy-qcom-snps-femto-v2.o obj-$(CONFIG_PHY_QCOM_IPQ806X_USB) += phy-qcom-ipq806x-usb.o obj-$(CONFIG_PHY_QCOM_SGMII_ETH) += phy-qcom-sgmii-eth.o +obj-$(CONFIG_PHY_QCOM_M31_USB) += phy-qcom-m31.o
this one too
drivers/phy/qualcomm/phy-qcom-m31.c line 4
Quoted 10 lines
drivers/phy/qualcomm/phy-qcom-m31.c new file +4
-0@@ -0,0 +1,256 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (c) 2014-2016, 2020, The Linux Foundation. All rights reserved. +*/
we are in 2023
Quoted 20 lines
drivers/phy/qualcomm/phy-qcom-m31.c new file +20
-0+ +#include <linux/clk.h> +#include <linux/delay.h> +#include <linux/err.h> +#include <linux/io.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/of_device.h> +#include <linux/of.h> +#include <linux/platform_device.h> +#include <linux/reset.h> +#include <linux/slab.h> +#include <linux/usb/of.h> +#include <linux/usb/phy.h> + +#define USB2PHY_PORT_UTMI_CTRL1 0x40 + +#define USB2PHY_PORT_UTMI_CTRL2 0x44 +#define UTMI_ULPI_SEL BIT(7) +#define UTMI_TEST_MUX_SEL BIT(6)
drivers/phy/qualcomm/phy-qcom-m31.c line 34
Quoted 10 lines
drivers/phy/qualcomm/phy-qcom-m31.c new file +10
-0+ +#define HS_PHY_CTRL_REG 0x10 +#define UTMI_OTG_VBUS_VALID BIT(20) +#define SW_SESSVLD_SEL BIT(28) + +#define USB_PHY_UTMI_CTRL0 0x3c + +#define USB_PHY_UTMI_CTRL5 0x50 +#define POR_EN BIT(1) +#define ATERESET ~BIT(0)
??
drivers/phy/qualcomm/phy-qcom-m31.c line 40
Quoted 6 lines
drivers/phy/qualcomm/phy-qcom-m31.c new file +6
-0+ +#define USB_PHY_HS_PHY_CTRL_COMMON0 0x54 +#define COMMONONN BIT(7) +#define FSEL BIT(4) +#define RETENABLEN BIT(3) +#define FREQ_24MHZ (5 << 4)
Use GENMASK for these
Quoted 81 lines
drivers/phy/qualcomm/phy-qcom-m31.c new file +81
-0+ +#define USB_PHY_HS_PHY_CTRL2 0x64 +#define USB2_SUSPEND_N_SEL BIT(3) +#define USB2_SUSPEND_N BIT(2) +#define USB2_UTMI_CLK_EN BIT(1) + +#define USB_PHY_CFG0 0x94 +#define UTMI_PHY_OVERRIDE_EN BIT(1) + +#define USB_PHY_REFCLK_CTRL 0xa0 +#define CLKCORE BIT(1) + +#define USB2PHY_PORT_POWERDOWN 0xa4 +#define POWER_UP BIT(0) +#define POWER_DOWN 0 + +#define USB_PHY_FSEL_SEL 0xb8 +#define FREQ_SEL BIT(0) + +#define USB2PHY_USB_PHY_M31_XCFGI_1 0xbc +#define USB2_0_TX_ENABLE BIT(2) + +#define USB2PHY_USB_PHY_M31_XCFGI_4 0xc8 +#define HSTX_SLEW_RATE_565PS GENMASK(1, 0) +#define PLL_CHARGING_PUMP_CURRENT_35UA GENMASK(4, 3) +#define ODT_VALUE_38_02_OHM GENMASK(7, 6) + +#define USB2PHY_USB_PHY_M31_XCFGI_5 0xcc +#define ODT_VALUE_45_02_OHM BIT(2) +#define HSTX_PRE_EMPHASIS_LEVEL_0_55MA BIT(0) + +#define USB2PHY_USB_PHY_M31_XCFGI_11 0xe4 +#define XCFG_COARSE_TUNE_NUM BIT(1) +#define XCFG_FINE_TUNE_NUM BIT(3) + +struct m31_phy_regs { +u32 off; +u32 val; +u32 delay; +}; + +struct m31_priv_data { +bool ulpi_mode; +const struct m31_phy_regs *regs; +}; + +#define M31_REG (__o, __v, __d) \ + { .off = __o, .val = __v, .delay = __d } + +#define M31_REG_INVALID 0xffffffffu + +struct m31_phy_regs m31_ipq5332_regs[] = { +M31_REG (USB_PHY_CFG0 ,UTMI_PHY_OVERRIDE_EN ,0 ), +M31_REG (USB_PHY_UTMI_CTRL5 ,POR_EN ,15 ), +M31_REG (USB_PHY_FSEL_SEL ,FREQ_SEL ,0 ), +M31_REG (USB_PHY_HS_PHY_CTRL_COMMON0 , +COMMONONN |FREQ_24MHZ |RETENABLEN ,0 ), +M31_REG (USB_PHY_UTMI_CTRL5 ,POR_EN &ATERESET ,0 ), +M31_REG (USB_PHY_HS_PHY_CTRL2 , +USB2_SUSPEND_N_SEL |USB2_SUSPEND_N |USB2_UTMI_CLK_EN ,0 ), +M31_REG (USB2PHY_USB_PHY_M31_XCFGI_11 , +XCFG_COARSE_TUNE_NUM |XCFG_FINE_TUNE_NUM ,0 ), +M31_REG (USB2PHY_USB_PHY_M31_XCFGI_4 , +HSTX_SLEW_RATE_565PS |PLL_CHARGING_PUMP_CURRENT_35UA | +ODT_VALUE_38_02_OHM ,0 ), +M31_REG (USB2PHY_USB_PHY_M31_XCFGI_1 ,USB2_0_TX_ENABLE ,0 ), +M31_REG (USB2PHY_USB_PHY_M31_XCFGI_5 , +ODT_VALUE_45_02_OHM |HSTX_PRE_EMPHASIS_LEVEL_0_55MA ,4 ), +M31_REG (USB_PHY_UTMI_CTRL5 ,0x0 ,0 ), +M31_REG (USB_PHY_HS_PHY_CTRL2 ,USB2_SUSPEND_N |USB2_UTMI_CLK_EN ,0 ), +M31_REG (M31_REG_INVALID ,0 ,0 ), +}; + +struct m31usb_phy { +struct usb_phy phy; +void __iomem *base; +const struct m31_phy_regs *regs; + +struct clk *cfg_ahb_clk; +struct reset_control *phy_reset; +
drivers/phy/qualcomm/phy-qcom-m31.c line 131
Quoted 10 lines
drivers/phy/qualcomm/phy-qcom-m31.c new file +10
-0+bool cable_connected; +bool suspended; +bool ulpi_mode; +}; + +static void m31usb_phy_enable_clock (struct m31usb_phy *qphy) +{ +const struct m31_phy_regs *regs = qphy->regs; + +for (; regs->off !=M31_REG_INVALID ; regs++) {
why have last entry as invalid and check that, this is an array so you can use ARRAY_SIZE to define the count of regs
Quoted 80 lines
drivers/phy/qualcomm/phy-qcom-m31.c new file +80
-0+writel (regs->val, qphy->base + regs->off); +if (regs->delay) +udelay (regs->delay); + } +} + +static int m31usb_phy_init (struct usb_phy *phy) +{ +int ret; + struct m31usb_phy *qphy = container_of(phy, struct m31usb_phy, phy); + + ret =clk_prepare_enable (qphy->cfg_ahb_clk); +if (ret) { +dev_err (phy->dev,"failed to enable cfg ahb clock, %d\n" , ret); +return ret; + } + +/* Perform phy reset */ +reset_control_assert (qphy->phy_reset); +udelay (5 ); +reset_control_deassert (qphy->phy_reset); + +/* configure for ULPI mode if requested */ +if (qphy->ulpi_mode) +writel (0x0 , qphy->base +USB2PHY_PORT_UTMI_CTRL2 ); + +/* Enable the PHY */ +writel (POWER_UP , qphy->base +USB2PHY_PORT_POWERDOWN ); + +/* Make sure above write completed */ +wmb (); + +/* Turn on phy ref clock */ +m31usb_phy_enable_clock (qphy); + +return 0 ; +} + +static void m31usb_phy_shutdown (struct usb_phy *phy) +{ + struct m31usb_phy *qphy = container_of(phy, struct m31usb_phy, phy); + +/* Disable the PHY */ +writel_relaxed (POWER_DOWN , qphy->base +USB2PHY_PORT_POWERDOWN ); +/* Make sure above write completed */ +wmb (); + +clk_disable_unprepare (qphy->cfg_ahb_clk); +} + +static int m31usb_phy_probe (struct platform_device *pdev) +{ +const struct m31_priv_data *data; +struct device *dev = &pdev->dev; +struct m31usb_phy *qphy; +int ret; + + qphy =devm_kzalloc (dev,sizeof (*qphy),GFP_KERNEL ); +if (!qphy) +return -ENOMEM ; + + qphy->phy.dev = dev; + + qphy->base =devm_platform_ioremap_resource (pdev,0 ); +if (IS_ERR (qphy->base)) +return PTR_ERR (qphy->base); + + qphy->phy_reset =devm_reset_control_get_exclusive_by_index (dev,0 ); +if (IS_ERR (qphy->phy_reset)) +return PTR_ERR (qphy->phy_reset); + + qphy->cfg_ahb_clk =devm_clk_get (dev,"cfg_ahb" ); +if (IS_ERR (qphy->cfg_ahb_clk)) { + ret =PTR_ERR (qphy->cfg_ahb_clk); +dev_err (dev,"failed to get cfg_ahb clock, %d\n" , ret); +return ret; + } + +platform_set_drvdata (pdev, qphy); +
drivers/phy/qualcomm/phy-qcom-m31.c line 221
Quoted 10 lines
drivers/phy/qualcomm/phy-qcom-m31.c new file +10
-0+ data =of_device_get_match_data (dev); + qphy->regs = data->regs; + qphy->ulpi_mode = data->ulpi_mode; + + qphy->phy.label ="m31-usb-phy" ; + qphy->phy.init = m31usb_phy_init; + qphy->phy.shutdown = m31usb_phy_shutdown; + qphy->phy.type =USB_PHY_TYPE_USB2 ; + + ret =usb_add_phy_dev (&qphy->phy);
why usb and not devm_phy_create()? It should be generic phy here
Signature · 1 line
~Vinod
Re: [PATCH v4 4/6] arm64: dts: qcom: ipq5332: Add USB related nodes
In reply to Varadarajan NarayananQuoted 8 lines · Varadarajan Narayanan
Add USB phy and controller nodes.
Signed-off-by Varadarajan Narayanan <[email protected]>---
v4:
Change node name
Remove blank line
'make CHECK_DTBS=y DT_SCHEMA_FILES=qcom qcom/ipq5332-rdp441.dtb' passed
DT_SCHEMA_FILES accepts yaml files
Konrad
Quoted 77 lines
v1:
Rename phy node
Change compatible from m31,ipq5332-usb-hsphy -> qcom,ipq5332-usb-hsphy Remove 'qscratch' from phy node
Fix alignment and upper-case hex no.s
Add clock definition for the phy
Remove snps,ref-clock-period-ns as it is not used.dwc3_ref_clk_period()indwc3/core.ctakes the frequency from ref clock and calculates fladj as appropriate.--- arch/arm64/boot/dts/qcom/ipq5332.dtsi | 53 +++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+)arch/arm64/boot/dts/qcom/ipq5332.dtsi +53
-0@@ -405,6 +405,59 @@ status = "disabled"; }; }; + + usbphy0: usb-phy@7b000 { + compatible = "qcom,ipq5332-usb-hsphy"; + reg = <0x0007b000 0x12c>; + + clocks = <&gcc GCC_USB0_PHY_CFG_AHB_CLK>; + clock-names = "cfg_ahb"; + + resets = <&gcc GCC_QUSB2_0_PHY_BCR>; + + status = "disabled"; + }; + + usb2: usb2@8a00000 { + compatible = "qcom,ipq5332-dwc3", "qcom,dwc3"; + reg = <0x08af8800 0x400>; + + interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "hs_phy_irq"; + + clocks = <&gcc GCC_USB0_MASTER_CLK>, + <&gcc GCC_SNOC_USB_CLK>, + <&gcc GCC_USB0_SLEEP_CLK>, + <&gcc GCC_USB0_MOCK_UTMI_CLK>; + clock-names = "core", + "iface", + "sleep", + "mock_utmi"; + + resets = <&gcc GCC_USB_BCR>; + + qcom,select-utmi-as-pipe-clk; + + #address-cells = <1>; + #size-cells = <1>; + ranges; + + status = "disabled"; + + usb2_0_dwc: usb@8a00000 { + compatible = "snps,dwc3"; + reg = <0x08a00000 0xe000>; + clocks = <&gcc GCC_USB0_MOCK_UTMI_CLK>; + clock-names = "ref"; + interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>; + usb-phy = <&usbphy0>; + tx-fifo-resize; + snps,is-utmi-l1-suspend; + snps,hird-threshold = /bits/ 8 <0x0>; + snps,dis_u2_susphy_quirk; + snps,dis_u3_susphy_quirk; + }; + }; }; timer {
Re: [PATCH v4 4/6] arm64: dts: qcom: ipq5332: Add USB related nodes
Quoted 10 lines · Konrad Dybcio
Quoted 8 lines · Varadarajan Narayanan
Add USB phy and controller nodes.
Signed-off-by Varadarajan Narayanan <[email protected]>---
v4:
Change node name
Remove blank line
'make CHECK_DTBS=y DT_SCHEMA_FILES=qcom qcom/ipq5332-rdp441.dtb' passed
DT_SCHEMA_FILESaccepts yaml files
I followed the example given in https://www.linaro.org/blog/tips-and-tricks-for-validating-devicetree-sources-with-the-devicetree-schema/
make CHECK_DTBS=y DT_SCHEMA_FILES=trivial-devices.yaml qcom/sm8450-hdk.dtb make CHECK_DTBS=y DT_SCHEMA_FILES=/gpio/ qcom/sm8450-hdk.dtb
----> make CHECK_DTBS=y DT_SCHEMA_FILES=qcom qcom/sm8450-hdk.dtb
Will include the yaml from next time.
Thanks
Varada
Quoted 78 lines
Konrad
Quoted 77 lines
v1:
Rename phy node
Change compatible from m31,ipq5332-usb-hsphy -> qcom,ipq5332-usb-hsphy Remove 'qscratch' from phy node
Fix alignment and upper-case hex no.s
Add clock definition for the phy
Remove snps,ref-clock-period-ns as it is not used.dwc3_ref_clk_period()indwc3/core.ctakes the frequency from ref clock and calculates fladj as appropriate.--- arch/arm64/boot/dts/qcom/ipq5332.dtsi | 53 +++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+)arch/arm64/boot/dts/qcom/ipq5332.dtsi +53
-0@@ -405,6 +405,59 @@ status = "disabled"; }; }; + + usbphy0: usb-phy@7b000 { + compatible = "qcom,ipq5332-usb-hsphy"; + reg = <0x0007b000 0x12c>; + + clocks = <&gcc GCC_USB0_PHY_CFG_AHB_CLK>; + clock-names = "cfg_ahb"; + + resets = <&gcc GCC_QUSB2_0_PHY_BCR>; + + status = "disabled"; + }; + + usb2: usb2@8a00000 { + compatible = "qcom,ipq5332-dwc3", "qcom,dwc3"; + reg = <0x08af8800 0x400>; + + interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "hs_phy_irq"; + + clocks = <&gcc GCC_USB0_MASTER_CLK>, + <&gcc GCC_SNOC_USB_CLK>, + <&gcc GCC_USB0_SLEEP_CLK>, + <&gcc GCC_USB0_MOCK_UTMI_CLK>; + clock-names = "core", + "iface", + "sleep", + "mock_utmi"; + + resets = <&gcc GCC_USB_BCR>; + + qcom,select-utmi-as-pipe-clk; + + #address-cells = <1>; + #size-cells = <1>; + ranges; + + status = "disabled"; + + usb2_0_dwc: usb@8a00000 { + compatible = "snps,dwc3"; + reg = <0x08a00000 0xe000>; + clocks = <&gcc GCC_USB0_MOCK_UTMI_CLK>; + clock-names = "ref"; + interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>; + usb-phy = <&usbphy0>; + tx-fifo-resize; + snps,is-utmi-l1-suspend; + snps,hird-threshold = /bits/ 8 <0x0>; + snps,dis_u2_susphy_quirk; + snps,dis_u3_susphy_quirk; + }; + }; }; timer {