Enable IPQ5332 USB2
Subsystems (4)
v7 cover Enable IPQ5332 USB2
This patch series adds the relevant phy and controller configurations for enabling USB2 on IPQ5332
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 (5):
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 | 59 +++++ 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/Kconfig | 11 + drivers/phy/qualcomm/Makefile | 1 + drivers/phy/qualcomm/phy-qcom-m31.c | 248 +++++++++++++++++++++ 7 files changed, 398 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 v7 1/5 dt-bindings: phy: qcom,m31: Document qcom,m31 USB phy
Document the M31 USB2 phy present in IPQ5332.
---
v7:
Move 'compatible' to be the first entry
In the example have 'usb-phy' instead of 'usb2-phy'
Add 'Reviewed-by: Krzysztof Kozlowski'
'make dt_binding_check DT_SCHEMA_FILES=qcom,ipq5332-usb-hsphy.yaml' passed 'make CHECK_DTBS=y DT_SCHEMA_FILES=qcom,ipq5332-usb-hsphy.yaml dtbs_check' passed
v6:
Add 'Co-developed-by: Sricharan'
Add 'const' to compatible, vdd-supply
Remove label and use usb2-phy for nodename in the example
v5:
Add '#phy-cells', to be able to use generic phy
Remove 'Reviewed-by: Krzysztof Kozlowski' due to above change
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 | 59 ++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/qcom,ipq5332-usb-hsphy.yaml
Documentation/devicetree/bindings/phy/qcom,ipq5332-usb-hsphy.yaml new file +59 -0
@@ -0,0 +1,59 @@ +# 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: + items: + - const: qcom,ipq5332-usb-hsphy + + "#phy-cells": + const: 0 + + reg: + maxItems: 1 + + clocks: + maxItems: 1 + + clock-names: + items: + - const: cfg_ahb + + resets: + maxItems: 1 + + vdd-supply: + description: + Phandle to 5V regulator supply to PHY digital circuit. + +additionalProperties: false + +examples: + - | + #include <dt-bindings/clock/qcom,ipq5332-gcc.h> + usb-phy@7b000 { + compatible = "qcom,ipq5332-usb-hsphy"; + reg = <0x0007b000 0x12c>; + + clocks = <&gcc GCC_USB0_PHY_CFG_AHB_CLK>; + clock-names = "cfg_ahb"; + + #phy-cells = <0>; + + resets = <&gcc GCC_QUSB2_0_PHY_BCR>; + + vdd-supply = <®ulator_fixed_5p0>; + };
Signature · 7 lines
2.7.4 -- linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
Rob Herring
maintainerRe: [PATCH v7 1/5] dt-bindings: phy: qcom,m31: Document qcom,m31 USB phy
Quoted 37 lines · Varadarajan Narayanan
Document the M31 USB2 phy present in IPQ5332.
Reviewed-by Krzysztof Kozlowski <[email protected]>Co-developed-by Sricharan Ramabadhran <[email protected]>Signed-off-by Sricharan Ramabadhran <[email protected]>Signed-off-by Varadarajan Narayanan <[email protected]>---
v7:
Move 'compatible' to be the first entry
In the example have 'usb-phy' instead of 'usb2-phy'
Add 'Reviewed-by: Krzysztof Kozlowski'
'makedt_binding_checkDT_SCHEMA_FILES=qcom,ipq5332-usb-hsphy.yaml' passed 'make CHECK_DTBS=y DT_SCHEMA_FILES=qcom,ipq5332-usb-hsphy.yamldtbs_check' passed
v6:
Add 'Co-developed-by: Sricharan'
Add 'const' to compatible, vdd-supply
Remove label and use usb2-phy for nodename in the example
v5:
Add '#phy-cells', to be able to use generic phy
Remove 'Reviewed-by: Krzysztof Kozlowski' due to above change
v4:
Move M31 URL to description
Remove maxItems and relevant content from clock-names
Change node name to generic name
'makedt_binding_checkDT_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
Quoted 5 lines
--- .../bindings/phy/qcom,ipq5332-usb-hsphy.yaml | 59 ++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/qcom,ipq5332-usb-hsphy.yaml
My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' on your patch (DT_CHECKER_FLAGS is new in v5.13):
yamllint warnings/errors:
dtschema/dtc warnings/errors:
doc reference errors (make refcheckdocs):
The base for the series is generally the latest rc1. A different dependency should be noted in *this* patch.
If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date:
pip3 install dtschema --upgrade
Please check and re-submit after running the above command yourself. Note that DT_SCHEMA_FILES can be set to your schema file to speed up checking your schema. However, it must be unset to test all examples with your schema.
Signature · 3 lines
linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
Rob Herring
maintainerRe: [PATCH v7 1/5] dt-bindings: phy: qcom,m31: Document qcom,m31 USB phy
Quoted 48 lines · Rob Herring
Quoted 37 lines · Varadarajan Narayanan
Document the M31 USB2 phy present in IPQ5332.
Reviewed-by Krzysztof Kozlowski <[email protected]>Co-developed-by Sricharan Ramabadhran <[email protected]>Signed-off-by Sricharan Ramabadhran <[email protected]>Signed-off-by Varadarajan Narayanan <[email protected]>---
v7:
Move 'compatible' to be the first entry
In the example have 'usb-phy' instead of 'usb2-phy'
Add 'Reviewed-by: Krzysztof Kozlowski'
'makedt_binding_checkDT_SCHEMA_FILES=qcom,ipq5332-usb-hsphy.yaml' passed 'make CHECK_DTBS=y DT_SCHEMA_FILES=qcom,ipq5332-usb-hsphy.yamldtbs_check' passed
v6:
Add 'Co-developed-by: Sricharan'
Add 'const' to compatible, vdd-supply
Remove label and use usb2-phy for nodename in the example
v5:
Add '#phy-cells', to be able to use generic phy
Remove 'Reviewed-by: Krzysztof Kozlowski' due to above change
v4:
Move M31 URL to description
Remove maxItems and relevant content from clock-names
Change node name to generic name
'makedt_binding_checkDT_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 definitionQuoted 5 lines
--- .../bindings/phy/qcom,ipq5332-usb-hsphy.yaml | 59 ++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/qcom,ipq5332-usb-hsphy.yamlMy bot found errors running 'make DT_CHECKER_FLAGS=-m
dt_binding_check' on your patch (DT_CHECKER_FLAGSis new in v5.13):
Quoted 8 lines
yamllint warnings/errors:
dtschema/dtc warnings/errors:
doc reference errors (make refcheckdocs):
The bot was having an issue. This can be ignored.
Rob
PATCH v7 2/5 phy: qcom-m31: Introduce qcom,m31 USB phy driver
In reply to Varadarajan NarayananAdd the M31 USB2 phy driver.
---
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/Kconfig | 11 ++ drivers/phy/qualcomm/Makefile | 1 + drivers/phy/qualcomm/phy-qcom-m31.c | 248 ++++++++++++++++++++++++++++++++++++ 3 files changed, 260 insertions(+) create mode 100644 drivers/phy/qualcomm/phy-qcom-m31.c
drivers/phy/qualcomm/Kconfig +11 -0
@@ -143,6 +143,17 @@ config PHY_QCOM_EUSB2_REPEATER PMICs. The repeater is paired with a Synopsys eUSB2 Phy on Qualcomm SOCs. +config PHY_QCOM_M31_USB + tristate "Qualcomm M31 HS PHY driver support" + depends on USB && (ARCH_QCOM || COMPILE_TEST) + select GENERIC_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. + config PHY_QCOM_USB_HS tristate "Qualcomm USB HS PHY module" depends on USB_ULPI_BUS
drivers/phy/qualcomm/Makefile +1 -0
@@ -4,6 +4,7 @@ obj-$(CONFIG_PHY_QCOM_APQ8064_SATA) += phy-qcom-apq8064-sata.o obj-$(CONFIG_PHY_QCOM_EDP) += phy-qcom-edp.o obj-$(CONFIG_PHY_QCOM_IPQ4019_USB) += phy-qcom-ipq4019-usb.o obj-$(CONFIG_PHY_QCOM_IPQ806X_SATA) += phy-qcom-ipq806x-sata.o +obj-$(CONFIG_PHY_QCOM_M31_USB) += phy-qcom-m31.o obj-$(CONFIG_PHY_QCOM_PCIE2) += phy-qcom-pcie2.o obj-$(CONFIG_PHY_QCOM_QMP_COMBO) += phy-qcom-qmp-combo.o
drivers/phy/qualcomm/phy-qcom-m31.c new file +248 -0
248 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
Re: [PATCH v7 2/5] phy: qcom-m31: Introduce qcom,m31 USB phy driver
Quoted 4 lines · Varadarajan Narayanan
Add the M31 USB2 phy driver.
Signed-off-by Varadarajan Narayanan <[email protected]>---
[...]
Quoted 3 lines
+ #define FSEL BIT(4)
+ #define RETENABLEN BIT(3)
+ #defineFREQ_24MHZ(GENMASK(6, 6)|GENMASK(4, 4))
GENMASK(x, x) is BIT(x)
Konrad
Re: [PATCH v7 2/5] phy: qcom-m31: Introduce qcom,m31 USB phy driver
In reply to Varadarajan NarayananOn Thu, Aug 10, 2023 at 03:26:05PM +0530, Varadarajan Narayanan wrote:
"qcom,m31" is quite DT-ish, how about:
"phy: qcom: Introduce M31 USB PHY driver"
Quoted 1 line
Add the M31 USB2 phy driver.
Please expand this. The documentation [1] says "describe your problem", so you can at least state what the M31 driver is and/or where this block is found.
[1] https://docs.kernel.org/process/submitting-patches.html#describe-your-changes
Thanks for addressing my previous feedback.
Regards,
Bjorn
Signature · 3 lines
linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
Vinod Koul
maintainerRe: [PATCH v7 2/5] phy: qcom-m31: Introduce qcom,m31 USB phy driver
In reply to Varadarajan NarayananQuoted 80 lines · Varadarajan Narayanan
Add the M31 USB2 phy driver.
Signed-off-by Varadarajan Narayanan <[email protected]>---
v6:
Kconfig:AddCOMPILE_TESTand removeUSB_GADGETfrom '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 Usedev_err_probein the error paths of driver probe
v5:
Kconfigand Makefile:- place snippet according to sorted order Use generic phy instead of usb-phy
UseARRAY_SIZEfor reg init instead of blank last entry Fix copyright yearv4:
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 | 248 ++++++++++++++++++++++++++++++++++++ 3 files changed, 260 insertions(+) create mode 100644 drivers/phy/qualcomm/phy-qcom-m31.cdrivers/phy/qualcomm/Kconfig +11
-0@@ -143,6 +143,17 @@ config PHY_QCOM_EUSB2_REPEATER PMICs. The repeater is paired with a Synopsys eUSB2 Phy on Qualcomm SOCs. +config PHY_QCOM_M31_USB + tristate "Qualcomm M31 HS PHY driver support" + depends on USB && (ARCH_QCOM || COMPILE_TEST) + select GENERIC_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. + config PHY_QCOM_USB_HS tristate "Qualcomm USB HS PHY module" depends on USB_ULPI_BUSdrivers/phy/qualcomm/Makefile +1
-0@@ -4,6 +4,7 @@ obj-$(CONFIG_PHY_QCOM_APQ8064_SATA) += phy-qcom-apq8064-sata.o obj-$(CONFIG_PHY_QCOM_EDP) += phy-qcom-edp.o obj-$(CONFIG_PHY_QCOM_IPQ4019_USB) += phy-qcom-ipq4019-usb.o obj-$(CONFIG_PHY_QCOM_IPQ806X_SATA) += phy-qcom-ipq806x-sata.o +obj-$(CONFIG_PHY_QCOM_M31_USB) += phy-qcom-m31.o obj-$(CONFIG_PHY_QCOM_PCIE2) += phy-qcom-pcie2.o obj-$(CONFIG_PHY_QCOM_QMP_COMBO) += phy-qcom-qmp-combo.odrivers/phy/qualcomm/phy-qcom-m31.c new file +3
-0@@ -0,0 +1,248 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (c) 2014-2023, The Linux Foundation. All rights reserved.
drivers/phy/qualcomm/phy-qcom-m31.c line 13
Quoted 10 lines
drivers/phy/qualcomm/phy-qcom-m31.c new file +10
-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_platform.h> +#include <linux/of.h>
do you need both headers..?
Quoted 15 lines
drivers/phy/qualcomm/phy-qcom-m31.c new file +15
-0+#include <linux/phy/phy.h> +#include <linux/platform_device.h> +#include <linux/reset.h> +#include <linux/slab.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) + +#define HS_PHY_CTRL_REG 0x10 +#define UTMI_OTG_VBUS_VALID BIT(20) +#define SW_SESSVLD_SEL BIT(28) +
drivers/phy/qualcomm/phy-qcom-m31.c line 38
Quoted 10 lines
drivers/phy/qualcomm/phy-qcom-m31.c new file +10
-0+#define USB_PHY_UTMI_CTRL0 0x3c + +#define USB_PHY_UTMI_CTRL5 0x50 +#define POR_EN BIT(1) + +#define USB_PHY_HS_PHY_CTRL_COMMON0 0x54 +#define COMMONONN BIT(7) +#define FSEL BIT(4) +#define RETENABLEN BIT(3) +#define FREQ_24MHZ (GENMASK(6, 6) | GENMASK(4, 4))
why not use bit :-)
Quoted 51 lines
drivers/phy/qualcomm/phy-qcom-m31.c new file +51
-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; +unsigned int nregs; +}; + +struct m31_phy_regs m31_ipq5332_regs[] = { + {USB_PHY_CFG0 ,UTMI_PHY_OVERRIDE_EN ,0 }, + {USB_PHY_UTMI_CTRL5 ,POR_EN ,15 }, + {USB_PHY_FSEL_SEL ,FREQ_SEL ,0 },
drivers/phy/qualcomm/phy-qcom-m31.c line 99
Quoted 10 lines
drivers/phy/qualcomm/phy-qcom-m31.c new file +10
-0+ { USB_PHY_HS_PHY_CTRL_COMMON0, COMMONONN | FREQ_24MHZ | RETENABLEN, 0 }, + { USB_PHY_UTMI_CTRL5, POR_EN, 0 }, + { USB_PHY_HS_PHY_CTRL2, USB2_SUSPEND_N_SEL | USB2_SUSPEND_N | USB2_UTMI_CLK_EN, 0 }, + { USB2PHY_USB_PHY_M31_XCFGI_11, XCFG_COARSE_TUNE_NUM | XCFG_FINE_TUNE_NUM, 0 }, + { USB2PHY_USB_PHY_M31_XCFGI_4, HSTX_SLEW_RATE_565PS | PLL_CHARGING_PUMP_CURRENT_35UA | + ODT_VALUE_38_02_OHM, 0 }, + { USB2PHY_USB_PHY_M31_XCFGI_1, USB2_0_TX_ENABLE, 0 }, + { USB2PHY_USB_PHY_M31_XCFGI_5, ODT_VALUE_45_02_OHM | HSTX_PRE_EMPHASIS_LEVEL_0_55MA, 4 }, + { USB_PHY_UTMI_CTRL5, 0x0, 0 }, + { USB_PHY_HS_PHY_CTRL2, USB2_SUSPEND_N | USB2_UTMI_CLK_EN, 0 },
More readable way to code
USB_PHY_CFG0,
UTMI_PHY_OVERRIDE_EN,
0and so on, makes a better read and check for errors, one line for off, one for val and one for delay
Signature · 1 line
`~Vinod
Re: [PATCH v7 2/5] phy: qcom-m31: Introduce qcom,m31 USB phy driver
Quoted 41 lines · Vinod Koul
Quoted 1 line · Varadarajan Narayanan
Add the M31 USB2 phy driver.
. . .drivers/phy/qualcomm/phy-qcom-m31.c line 13
Quoted 4 lines
drivers/phy/qualcomm/phy-qcom-m31.c new file +4
-0+#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/of_platform.h> +#include <linux/of.h> do you need both headers..?
. . .Quoted 1 line
+ #define
FREQ_24MHZ(GENMASK(6, 6)|GENMASK(4, 4))why not use bit :-)
. . .Quoted 4 lines
drivers/phy/qualcomm/phy-qcom-m31.c new file +4
-0+struct m31_phy_regs m31_ipq5332_regs[] = { + {USB_PHY_CFG0 ,UTMI_PHY_OVERRIDE_EN ,0 }, + {USB_PHY_UTMI_CTRL5 ,POR_EN ,15 }, + {USB_PHY_FSEL_SEL ,FREQ_SEL ,0 },drivers/phy/qualcomm/phy-qcom-m31.c line 99
Quoted 10 lines
drivers/phy/qualcomm/phy-qcom-m31.c new file +10
-0+ { USB_PHY_HS_PHY_CTRL_COMMON0, COMMONONN | FREQ_24MHZ | RETENABLEN, 0 }, + { USB_PHY_UTMI_CTRL5, POR_EN, 0 }, + { USB_PHY_HS_PHY_CTRL2, USB2_SUSPEND_N_SEL | USB2_SUSPEND_N | USB2_UTMI_CLK_EN, 0 }, + { USB2PHY_USB_PHY_M31_XCFGI_11, XCFG_COARSE_TUNE_NUM | XCFG_FINE_TUNE_NUM, 0 }, + { USB2PHY_USB_PHY_M31_XCFGI_4, HSTX_SLEW_RATE_565PS | PLL_CHARGING_PUMP_CURRENT_35UA | + ODT_VALUE_38_02_OHM, 0 }, + { USB2PHY_USB_PHY_M31_XCFGI_1, USB2_0_TX_ENABLE, 0 }, + { USB2PHY_USB_PHY_M31_XCFGI_5, ODT_VALUE_45_02_OHM | HSTX_PRE_EMPHASIS_LEVEL_0_55MA, 4 }, + { USB_PHY_UTMI_CTRL5, 0x0, 0 }, + { USB_PHY_HS_PHY_CTRL2, USB2_SUSPEND_N | USB2_UTMI_CLK_EN, 0 },More readable way to code
USB_PHY_CFG0, UTMI_PHY_OVERRIDE_EN, 0
Quoted 5 lines
and so on, makes a better read and check for errors, one line for off, one for val and one for delay
--
`~Vinod
Have posted a new version addressing these (and Konrad's and Bjorn's) issues. Please review.
Thanks
Varada
Signature · 3 lines
linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
Re: [PATCH v7 2/5] phy: qcom-m31: Introduce qcom,m31 USB phy driver
In reply to Varadarajan NarayananQuoted 4 lines · Varadarajan Narayanan
Add the M31 USB2 phy driver.
Signed-off-by Varadarajan Narayanan <[email protected]>---
...
Quoted 13 lines
drivers/phy/qualcomm/phy-qcom-m31.c new file +13
-0+static int m31usb_phy_probe (struct platform_device *pdev) +{ +struct phy_provider *phy_provider; +const struct m31_priv_data *data; +struct device *dev = &pdev->dev; +struct m31usb_phy *qphy; + + qphy =devm_kzalloc (dev,sizeof (*qphy),GFP_KERNEL ); +if (!qphy) +return -ENOMEM ; + + qphy->base =devm_platform_ioremap_resource (pdev,0 ); +if (IS_ERR (qphy->base))
drivers/phy/qualcomm/phy-qcom-m31.c line 199
Quoted 10 lines
drivers/phy/qualcomm/phy-qcom-m31.c new file +10
-0+return PTR_ERR (qphy->base); + + qphy->reset =devm_reset_control_get_exclusive_by_index (dev,0 ); +if (IS_ERR (qphy->reset)) +return PTR_ERR (qphy->reset); + + 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" );
This looks misaligned.
drivers/phy/qualcomm/phy-qcom-m31.c line 209
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->nregs = data->nregs; + qphy->ulpi_mode = data->ulpi_mode; + + 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" );
Ditto... and in other places.
drivers/phy/qualcomm/phy-qcom-m31.c line 220
Quoted 11 lines
drivers/phy/qualcomm/phy-qcom-m31.c new file +11
-0+ + qphy->vreg =devm_regulator_get (dev,"vdda-phy" ); +if (IS_ERR (qphy->vreg)) +return dev_err_probe (dev,PTR_ERR (qphy->phy), +"failed to get vreg\n" ); + +phy_set_drvdata (qphy->phy, qphy); + + phy_provider =devm_of_phy_provider_register (dev, of_phy_simple_xlate); +if (!IS_ERR (phy_provider)) +dev_info (dev,"Registered M31 USB phy\n" );
Drop simple success messages. Kernel has other means to do it.
Best regards,
Krzysztof
Signature · 3 lines
linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
PATCH v7 3/5 arm64: dts: qcom: ipq5332: Add USB related nodes
In reply to Varadarajan NarayananAdd USB phy and controller nodes.
---
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: 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>; + 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
Re: [PATCH v7 3/5] arm64: dts: qcom: ipq5332: Add USB related nodes
Quoted 53 lines · Varadarajan Narayanan
Add USB phy and controller nodes.
Signed-off-by Varadarajan Narayanan <[email protected]>---
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 +13
-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>;
arch/arm64/boot/dts/qcom/ipq5332.dtsi line 306
Quoted 4 lines
arch/arm64/boot/dts/qcom/ipq5332.dtsi +1
-0@@ -290,6 +303,48 @@ status = "disabled"; }; + usb: usb2@8a00000 {
usb@
Node names must be generic.
arch/arm64/boot/dts/qcom/ipq5332.dtsi line 308
Quoted 2 lines
arch/arm64/boot/dts/qcom/ipq5332.dtsi +2
-0+ compatible = "qcom,ipq5332-dwc3", "qcom,dwc3"; + reg = <0x08af8800 0x400>;
OK, so this was not really checked for any warnings.
It does not look like you tested the DTS against bindings. Please run make dtbs_check W=1 (see Documentation/devicetree/bindings/writing-schema.rst or
https://www.linaro.org/blog/tips-and-tricks-for-validating-devicetree-sources-with-the-devicetree-schema/
for instructions).
Best regards,
Krzysztof
Signature · 3 lines
linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
PATCH v7 4/5 arm64: dts: qcom: ipq5332: Enable USB
In reply to Varadarajan NarayananEnable USB2 in host mode.
---
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: 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; }; }; + +&usbphy0 { + vdd-supply = <®ulator_fixed_5p0>; + + status = "okay"; +}; + +&usb { + 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
Re: [PATCH v7 4/5] arm64: dts: qcom: ipq5332: Enable USB
Quoted 17 lines · Varadarajan Narayanan
Enable USB2 in host mode.
Signed-off-by Varadarajan Narayanan <[email protected]>---
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 +0
-0
arch/arm64/boot/dts/qcom/ipq5332-rdp468.dts line 16
Quoted 5 lines
arch/arm64/boot/dts/qcom/ipq5332-rdp468.dts +2
-0@@ -12,6 +12,15 @@ / { model = "Qualcomm Technologies, Inc. IPQ5332 MI01.6"; compatible = "qcom,ipq5332-ap-mi01.6", "qcom,ipq5332"; + + regulator_fixed_5p0: s0500 {
Generic node names, so at least generic regulator prefix or suffix.
arch/arm64/boot/dts/qcom/ipq5332-rdp468.dts line 23
Quoted 7 lines
arch/arm64/boot/dts/qcom/ipq5332-rdp468.dts +7
-0+ compatible = "regulator-fixed"; + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <500000>; + regulator-boot-on; + regulator-always-on; + regulator-name = "fixed_5p0"; + };
Best regards,
Krzysztof
Signature · 3 lines
linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
PATCH v7 5/5 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
@@ -1416,6 +1416,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