Enable IPQ5332 USB2
Subsystems (4)
v11 cover Enable IPQ5332 USB2
This patch series adds the relevant phy and controller DT configurations for enabling USB2 on IPQ5332
v11:
Driver: Rebased to accommodate https://lore.kernel.org/linux-arm-msm/[email protected]/ DTS: Sort nodes in alphanumeric order v10: Driver: Restore register success print per Dmitry's comment DTS: usb@8a00000 -> usb@8af8800 regulator_s0500 -> regulator-s0500
v9:
Driver: Since the driver code has been picked up for merge,
(https://lore.kernel.org/linux-arm-msm/[email protected]/)
adding the coding style fixes alone in this patch.
Fix line break alignment
Remove register success print
DTS: usb2@8a00000 -> usb@8a00000
regulator_fixed_5p0: s0500 -> regulator_fixed_5p0: regulator
v8:
Driver:-
Change commit subject and message per review comments
Don't include of_platform.h
Change struct initialization coding style
GENMASK -> BIT for one of the defines
v7:
Binding:-
Move 'compatible' to be the first entry
In the example have 'usb-phy' instead of 'usb2-phy'
Add 'Reviewed-by: Krzysztof Kozlowski'
v6:
Binding and dts:-
Dropped the qcom,dwc3.yaml patch as it has been picked up for linux-next Add const to compatible, vdd-supply
Move nodes per register address
Driver:-
Add vdd-supply
Cleanup error paths in probe with dev_err_probe
v5:
Binding and dts:-
Fix email id
Removed 'Reviewed-by: Krzysztof Kozlowski <[email protected]>' as had to change bindings file to be able to use generic phy instead of usb-phy
Driver:-
Remove unused definition Use generic phy instead of usb-phy
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 (4):
phy: qcom: m31: Fix indentation issues
arm64: dts: qcom: ipq5332: Add USB related nodes
arm64: dts: qcom: ipq5332: Enable USB
arm64: defconfig: Enable M31 USB phy driver
arch/arm64/boot/dts/qcom/ipq5332-rdp468.dts | 23 ++++++++++++ arch/arm64/boot/dts/qcom/ipq5332.dtsi | 55 +++++++++++++++++++++++++++++ arch/arm64/configs/defconfig | 1 + drivers/phy/qualcomm/phy-qcom-m31.c | 6 ++-- 4 files changed, 82 insertions(+), 3 deletions(-)
Signature · 7 lines
2.7.4 -- linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
PATCH v11 1/4 phy: qcom: m31: Fix indentation issues
Fix incorrect indentation
---
v11: Rebased to accomodate https://lore.kernel.org/linux-arm-msm/[email protected]/
v10:
Restore register success print per Dmitry's comment
v9:
Fix line break alignment
Remove register success print
v8 version of the driver has been picked up for merge.
(https://lore.kernel.org/linux-arm-msm/[email protected]/)
v8:
Change commit subject and message per review comments Don't include of_platform.h
Change struct init coding style
GENMASK -> BIT for one define
v6:
Kconfig:Add COMPILE_TEST and remove USB_GADGET from 'depends'
Change 'selects' USB_PHY -> GENERIC_PHY
Driver: Use correct headers
const int -> unsigned int for 'nregs' in private data Use generic names for clk, phy in m31 phy structure Init register details directly instead of using macro Use dev_err_probe in the error paths of driver probe
v5:
Kconfig and Makefile:- place snippet according to sorted order Use generic phy instead of usb-phy
Use ARRAY_SIZE for reg init instead of blank last entry Fix copyright year
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/phy-qcom-m31.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/phy/qualcomm/phy-qcom-m31.c +3 -3
@@ -242,7 +242,7 @@ static int m31usb_phy_probe(struct platform_device *pdev) qphy->clk =devm_clk_get (dev,NULL );if (IS_ERR (qphy->clk))return dev_err_probe (dev,PTR_ERR (qphy->clk), -"failed to get clk\n" ); +"failed to get clk\n" ); data =of_device_get_match_data (dev); qphy->regs = data->regs;
@@ -252,12 +252,12 @@ static int m31usb_phy_probe(struct platform_device *pdev) qphy->phy =devm_phy_create (dev,NULL , &m31usb_phy_gen_ops);if (IS_ERR (qphy->phy))return dev_err_probe (dev,PTR_ERR (qphy->phy), -"failed to create phy\n" ); +"failed to create phy\n" ); qphy->vreg =devm_regulator_get (dev,"vdda-phy" );if (IS_ERR (qphy->vreg))return dev_err_probe (dev,PTR_ERR (qphy->vreg), -"failed to get vreg\n" ); +"failed to get vreg\n" );phy_set_drvdata (qphy->phy, qphy);
Signature · 7 lines
2.7.4 -- linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
PATCH v11 2/4 arm64: dts: qcom: ipq5332: Add USB related nodes
In reply to Varadarajan NarayananAdd USB phy and controller nodes.
---
v10:
usb@8a00000 -> usb@8af8800 "make W=1 ARCH=arm64 -j 16 CHECK_DTBS=y DT_SCHEMA_FILES=qcom,ipq5332-usb-hsphy.yaml dtbs_check" passed v9: usb2@8a00000 -> usb@8a00000 "make ARCH=arm64 -j 16 CHECK_DTBS=y DT_SCHEMA_FILES=qcom,ipq5332-usb-hsphy.yaml dtbs_check" passed
v6:
Remove clock names
Move the nodes to address sorted location
v5:
Use generic phy instead of usb-phy
'make CHECK_DTBS=y DT_SCHEMA_FILES=qcom dtbs_check' passed 'DT_CHECKER_FLAGS='-v -m' DT_SCHEMA_FILES=qcom dt_binding_check' passed
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 | 55 +++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+)
arch/arm64/boot/dts/qcom/ipq5332.dtsi +55 -0
@@ -145,6 +145,19 @@ #size-cells = <1>; ranges = <0 0 0 0xffffffff>; + usbphy0: phy@7b000 { + compatible = "qcom,ipq5332-usb-hsphy"; + reg = <0x0007b000 0x12c>; + + clocks = <&gcc GCC_USB0_PHY_CFG_AHB_CLK>; + + resets = <&gcc GCC_QUSB2_0_PHY_BCR>; + + #phy-cells = <0>; + + status = "disabled"; + }; + qfprom: efuse@a4000 { compatible = "qcom,ipq5332-qfprom", "qcom,qfprom"; reg = <0x000a4000 0x721>;
@@ -290,6 +303,48 @@ status = "disabled"; }; + usb: usb@8af8800 { + 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>; + phy-names = "usb2-phy"; + phys = <&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; + }; + }; + intc: interrupt-controller@b000000 { compatible = "qcom,msm-qgic2"; reg = <0x0b000000 0x1000>, /* GICD */
Signature · 7 lines
2.7.4 -- linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
PATCH v11 3/4 arm64: dts: qcom: ipq5332: Enable USB
In reply to Varadarajan NarayananEnable USB2 in host mode.
---
v11:
Sort nodes in alphanumeric order
v10:
regulator_s0500 -> regulator-s0500 "make W=1 ARCH=arm64 -j 16 CHECK_DTBS=y DT_SCHEMA_FILES=qcom,ipq5332-usb-hsphy.yaml dtbs_check" passed v9: regulator_fixed_5p0: s0500 -> regulator_fixed_5p0: regulator_s0500 "make ARCH=arm64 -j 16 CHECK_DTBS=y DT_SCHEMA_FILES=qcom,ipq5332-usb-hsphy.yaml dtbs_check" passed
v6:
Add vdd-supply and corresponding regulator
v1:
Enable usb-phy node
--- arch/arm64/boot/dts/qcom/ipq5332-rdp468.dts | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
arch/arm64/boot/dts/qcom/ipq5332-rdp468.dts +23 -0
@@ -12,6 +12,15 @@ / { model = "Qualcomm Technologies, Inc. IPQ5332 MI01.6"; compatible = "qcom,ipq5332-ap-mi01.6", "qcom,ipq5332"; + + regulator_fixed_5p0: regulator-s0500 { + compatible = "regulator-fixed"; + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <500000>; + regulator-boot-on; + regulator-always-on; + regulator-name = "fixed_5p0"; + }; }; &blsp1_spi0 {
@@ -79,3 +88,17 @@ bias-pull-up; }; }; + +&usb { + status = "okay"; +}; + +&usb2_0_dwc { + dr_mode = "host"; +}; + +&usbphy0 { + vdd-supply = <®ulator_fixed_5p0>; + + status = "okay"; +};
Signature · 7 lines
2.7.4 -- linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
PATCH v11 4/4 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
@@ -1422,6 +1422,7 @@ CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2=m CONFIG_PHY_QCOM_USB_HS_28NM=m CONFIG_PHY_QCOM_USB_SS=m CONFIG_PHY_QCOM_SGMII_ETH=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
Re: [PATCH v11 2/4] arm64: dts: qcom: ipq5332: Add USB related nodes
In reply to Varadarajan NarayananQuoted 80 lines · Varadarajan Narayanan
Add USB phy and controller nodes.
Signed-off-by Varadarajan Narayanan <[email protected]>---
v10:
usb@8a00000 -> usb@8af8800
"make W=1 ARCH=arm64 -j 16 CHECK_DTBS=y DT_SCHEMA_FILES=qcom,ipq5332-usb-hsphy.yamldtbs_check" passed
v9:
usb2@8a00000 -> usb@8a00000
"make ARCH=arm64 -j 16 CHECK_DTBS=y DT_SCHEMA_FILES=qcom,ipq5332-usb-hsphy.yamldtbs_check" passed
v6:
Remove clock names
Move the nodes to address sorted location
v5:
Use generic phy instead of usb-phy
'make CHECK_DTBS=y DT_SCHEMA_FILES=qcomdtbs_check' passed
'DT_CHECKER_FLAGS='-v -m' DT_SCHEMA_FILES=qcomdt_binding_check' passed
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 | 55 +++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+)arch/arm64/boot/dts/qcom/ipq5332.dtsi +30
-0@@ -145,6 +145,19 @@ #size-cells = <1>; ranges = <0 0 0 0xffffffff>; + usbphy0: phy@7b000 { + compatible = "qcom,ipq5332-usb-hsphy"; + reg = <0x0007b000 0x12c>; + + clocks = <&gcc GCC_USB0_PHY_CFG_AHB_CLK>; + + resets = <&gcc GCC_QUSB2_0_PHY_BCR>; + + #phy-cells = <0>; + + status = "disabled"; + }; + qfprom: efuse@a4000 { compatible = "qcom,ipq5332-qfprom", "qcom,qfprom"; reg = <0x000a4000 0x721>;@@ -290,6 +303,48 @@ status = "disabled"; }; + usb: usb@8af8800 { + 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>;
arch/arm64/boot/dts/qcom/ipq5332.dtsi line 332
Quoted 10 lines
arch/arm64/boot/dts/qcom/ipq5332.dtsi +10
-0+ + qcom,select-utmi-as-pipe-clk; + + #address-cells = <1>; + #size-cells = <1>; + ranges; + + status = "disabled"; + + usb2_0_dwc: usb@8a00000 {
Since we have just seen a patch series adding USB 3 support to ipq5332, we know that the host is not 2.0-only. Thus the 2_0 part of the label doesn't make sense.
Could you please change the label to be just usb_dwc (or usb0_dwc)?
Quoted 21 lines
arch/arm64/boot/dts/qcom/ipq5332.dtsi +15
-1+ compatible = "snps,dwc3"; + reg = <0x08a00000 0xe000>; + clocks = <&gcc GCC_USB0_MOCK_UTMI_CLK>; + clock-names = "ref"; + interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>; + phy-names = "usb2-phy"; + phys = <&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; + }; + }; + intc: interrupt-controller@b000000 { compatible = "qcom,msm-qgic2"; reg = <0x0b000000 0x1000>, /* GICD */ --2.7.4
Signature · 2 lines
With best wishes Dmitry
Re: [PATCH v11 3/4] arm64: dts: qcom: ipq5332: Enable USB
In reply to Varadarajan NarayananQuoted 17 lines · Varadarajan Narayanan
Enable USB2 in host mode.
Signed-off-by Varadarajan Narayanan <[email protected]>---
v11:
Sort nodes in alphanumeric order
v10:
regulator_s0500-> regulator-s0500
"make W=1 ARCH=arm64 -j 16 CHECK_DTBS=y DT_SCHEMA_FILES=qcom,ipq5332-usb-hsphy.yamldtbs_check" passed
v9:
regulator_fixed_5p0: s0500 ->regulator_fixed_5p0:regulator_s0500
"make ARCH=arm64 -j 16 CHECK_DTBS=y DT_SCHEMA_FILES=qcom,ipq5332-usb-hsphy.yamldtbs_check" passed
v6:
Add vdd-supply and corresponding regulator
v1:
Enable usb-phy node
Quoted 3 lines
--- arch/arm64/boot/dts/qcom/ipq5332-rdp468.dts | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
--
With best wishes
Dmitry
Re: [PATCH v11 2/4] arm64: dts: qcom: ipq5332: Add USB related nodes
In reply to Dmitry BaryshkovQuoted 32 lines
Quoted 17 lines
arch/arm64/boot/dts/qcom/ipq5332.dtsi +17
-0+ usb: usb@8af8800 { + 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>;arch/arm64/boot/dts/qcom/ipq5332.dtsi line 332
Quoted 10 lines
arch/arm64/boot/dts/qcom/ipq5332.dtsi +10
-0+ + qcom,select-utmi-as-pipe-clk; + + #address-cells = <1>; + #size-cells = <1>; + ranges; + + status = "disabled"; + + usb2_0_dwc: usb@8a00000 {Since we have just seen a patch series adding USB 3 support to ipq5332, we know that the host is not 2.0-only. Thus the
2_0part of the label doesn't make sense.
Quoted 1 line
Could you please change the label to be just
usb_dwc(orusb0_dwc)?
Have posted v12 addressing this. Please take a look.
Thanks
Varada
Signature · 3 lines
linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy