phy: ralink-usb: add driver for Mediatek/Ralink
Subsystems (2)
PATCH 1/1 phy: ralink-usb: add driver for Mediatek/Ralink
Add a driver to setup the USB phy on Mediatek/Ralink SoCs. The driver is trivial and only sets the power and host/device mode.
--- .../devicetree/bindings/phy/ralink-usb-phy.txt | 17 ++ drivers/phy/Kconfig | 7 + drivers/phy/Makefile | 1 + drivers/phy/phy-ralink-usb.c | 183 ++++++++++++++++++++ 4 files changed, 208 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/ralink-usb-phy.txt create mode 100644 drivers/phy/phy-ralink-usb.c
Documentation/devicetree/bindings/phy/ralink-usb-phy.txt new file +17 -0
@@ -0,0 +1,17 @@ +Mediatek/Ralink USB PHY + +Required properties: + - compatible: ralink,rt3xxx-usbphy or ralink,mt7620-usbphy + - #phy-cells: should be 0 + - resets: the two reset controllers for host and device + - reset-names: the names of the 2 reset controllers + +Example: + +usbphy: phy { + compatible = "ralink,mt7620a-usbphy"; + #phy-cells = <0>; + + resets = <&rstctrl 22 &rstctrl 25>; + reset-names = "host", "device"; +};
drivers/phy/Kconfig +7 -0
@@ -331,6 +331,13 @@ config PHY_XGENE help This option enables support for APM X-Gene SoC multi-purpose PHY. +config PHY_RALINK_USB + tristate "Ralink USB PHY driver" + select GENERIC_PHY + depends on RALINK + help + This option enables support for Ralink SoC USB PHY. + config PHY_STIH407_USB tristate "STMicroelectronics USB2 picoPHY driver for STiH407 family" depends on RESET_CONTROLLER
drivers/phy/Makefile +1 -0
@@ -46,3 +46,4 @@ obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs-qmp-14nm.o obj-$(CONFIG_PHY_TUSB1210) += phy-tusb1210.o obj-$(CONFIG_PHY_BRCMSTB_SATA) += phy-brcmstb-sata.o obj-$(CONFIG_PHY_PISTACHIO_USB) += phy-pistachio-usb.o +obj-$(CONFIG_PHY_RALINK_USB) += phy-ralink-usb.o
drivers/phy/phy-ralink-usb.c new file +183 -0
183 lines not on this page · raw message
Signature · 1 line
1.7.10.4
Hi John,
Quoted 12 lines · John Crispin
Add a driver to setup the USB phy on Mediatek/Ralink SoCs. The driver is trivial and only sets the power and host/device mode.
Signed-off-by John Crispin <[email protected]>--- .../devicetree/bindings/phy/ralink-usb-phy.txt | 17 ++ drivers/phy/Kconfig | 7 + drivers/phy/Makefile | 1 + drivers/phy/phy-ralink-usb.c | 183 ++++++++++++++++++++ 4 files changed, 208 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/ralink-usb-phy.txt create mode 100644 drivers/phy/phy-ralink-usb.c
[..]
Quoted 5 lines
drivers/phy/phy-ralink-usb.c new file +5
-0+static int ralink_usb_phy_exit (struct phy *_phy) +{ +return 0 ; +} +
drivers/phy/phy-ralink-usb.c line 82
Quoted 10 lines
drivers/phy/phy-ralink-usb.c new file +9
-0+static int ralink_usb_phy_power_on (struct phy *_phy) +{ +if (atomic_inc_return (&usb_pwr_ref) ==1 ) { +int host =1 ; +u32 t; + +usb_phy_enable (1 ); + +if (host) {
Could you please check how it's supposed to work with host var always initialized with 1?
Do you want to drop if-else check here or ..?
Quoted 25 lines
drivers/phy/phy-ralink-usb.c new file +25
-0+rt_sysc_m32 (0 ,RT_SYSCFG1_USB0_HOST_MODE , +RT_SYSC_REG_SYSCFG1 ); +if (!IS_ERR (rsthost)) +reset_control_deassert (rsthost); +if (!IS_ERR (rstdev)) +reset_control_deassert (rstdev); + }else { +rt_sysc_m32 (RT_SYSCFG1_USB0_HOST_MODE ,0 , +RT_SYSC_REG_SYSCFG1 ); +if (!IS_ERR (rstdev)) +reset_control_deassert (rstdev); + } +mdelay (100 ); + + t =rt_sysc_r32 (RT_SYSC_REG_USB_PHY_CFG ); +dev_info (&_phy->dev,"remote usb device wakeup %s\n" , + (t &UDEV_WAKEUP ) ? ("enabbled" ) : ("disabled" )); +if (t &USB_PHY_UTMI_8B60M ) +dev_info (&_phy->dev,"UTMI 8bit 60MHz\n" ); +else +dev_info (&_phy->dev,"UTMI 16bit 30MHz\n" ); + } + +return 0 ; +}
Signature · 2 lines
Best regards, Alexey
Quoted 54 lines · John Crispin
Add a driver to setup the USB phy on Mediatek/Ralink SoCs. The driver is trivial and only sets the power and host/device mode.
drivers/phy/phy-ralink-usb.c new file +51
-0+/* +* Ralink USB phy driver +* +* Copyright (C) 2014 John Crispin <[email protected]> +* +* Based on code from +* Allwinner Technology Co., Ltd. <www.allwinnertech.com> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ + +#include <linux/delay.h> +#include <linux/err.h> +#include <linux/io.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/mutex.h> +#include <linux/phy/phy.h> +#include <linux/platform_device.h> +#include <linux/reset.h> +#include <linux/of_platform.h> + +#include <asm/mach-ralink/ralink_regs.h> + +#define RT_SYSC_REG_SYSCFG1 0x014 +#define RT_SYSC_REG_CLKCFG1 0x030 +#define RT_SYSC_REG_USB_PHY_CFG 0x05c + +#define RT_RSTCTRL_UDEV BIT(25) +#define RT_RSTCTRL_UHST BIT(22) +#define RT_SYSCFG1_USB0_HOST_MODE BIT(10) + +#define MT7620_CLKCFG1_UPHY0_CLK_EN BIT(25) +#define MT7620_CLKCFG1_UPHY1_CLK_EN BIT(22) +#define RT_CLKCFG1_UPHY1_CLK_EN BIT(20) +#define RT_CLKCFG1_UPHY0_CLK_EN BIT(18) + +#define USB_PHY_UTMI_8B60M BIT(1) +#define UDEV_WAKEUP BIT(0) + +static atomic_t usb_pwr_ref =ATOMIC_INIT (0 ); +static struct reset_control *rstdev; +static struct reset_control *rsthost;
drivers/phy/phy-ralink-usb.c line 61
Quoted 10 lines
drivers/phy/phy-ralink-usb.c new file +10
-0+static u32 phy_clk; +static struct phy *rt_phy; + +static void usb_phy_enable (int state) +{ +if (state) +rt_sysc_m32 (0 , phy_clk,RT_SYSC_REG_CLKCFG1 ); +else +rt_sysc_m32 (phy_clk,0 ,RT_SYSC_REG_CLKCFG1 ); +mdelay (100 );
Where 100 comes from? Perhaps comment line?
drivers/phy/phy-ralink-usb.c line 74
Quoted 13 lines
drivers/phy/phy-ralink-usb.c new file +13
-0+} + +static int ralink_usb_phy_init (struct phy *_phy) +{ +return 0 ; +} + +static int ralink_usb_phy_exit (struct phy *_phy) +{ +return 0 ; +} + +static int ralink_usb_phy_power_on (struct phy *_phy)
_phy -> phy ?
Review
Quoted 2 lines
(quoted diff) +2
-0+{ + if (atomic_inc_return(&usb_pwr_ref) == 1) {
if (!atomic_… != 1)
return 0;
?
Quoted 9 lines
drivers/phy/phy-ralink-usb.c new file +9
-0+int host =1 ; +u32 t; + +usb_phy_enable (1 ); + +if (host) { +rt_sysc_m32 (0 ,RT_SYSCFG1_USB0_HOST_MODE , +RT_SYSC_REG_SYSCFG1 ); +if (!IS_ERR (rsthost))
drivers/phy/phy-ralink-usb.c line 95
Quoted 10 lines
drivers/phy/phy-ralink-usb.c new file +10
-0+reset_control_deassert (rsthost); +if (!IS_ERR (rstdev)) +reset_control_deassert (rstdev); + }else { +rt_sysc_m32 (RT_SYSCFG1_USB0_HOST_MODE ,0 , +RT_SYSC_REG_SYSCFG1 ); +if (!IS_ERR (rstdev)) +reset_control_deassert (rstdev); + } +mdelay (100 );
Same question about 100 as above.
Aha, what about
usb_phy_enable(host);
if (host && !IS_ERR(rsthost))
…;
if (!IS_ERR(rstdev))
…;
?
Quoted 7 lines
drivers/phy/phy-ralink-usb.c new file +7
-0+ + t =rt_sysc_r32 (RT_SYSC_REG_USB_PHY_CFG ); +dev_info (&_phy->dev,"remote usb device wakeup %s\n" , + (t &UDEV_WAKEUP ) ? ("enabbled" ) : ("disabled" )); +if (t &USB_PHY_UTMI_8B60M ) +dev_info (&_phy->dev,"UTMI 8bit 60MHz\n" ); +else
drivers/phy/phy-ralink-usb.c line 112
Quoted 10 lines
drivers/phy/phy-ralink-usb.c new file +10
-0+dev_info (&_phy->dev,"UTMI 16bit 30MHz\n" ); + } + +return 0 ; +} + +static int ralink_usb_phy_power_off (struct phy *_phy) +{ +if (atomic_dec_return (&usb_pwr_ref) ==0 ) { +usb_phy_enable (0 );
Okay, it seems you have to use atomic variable result as parameter to off() / on(). Can you refactor them to have a common code together?
Quoted 33 lines
drivers/phy/phy-ralink-usb.c new file +33
-0+if (!IS_ERR (rstdev)) +reset_control_assert (rstdev); +if (!IS_ERR (rsthost)) +reset_control_assert (rsthost); + } + +return 0 ; +} + +static struct phy_ops ralink_usb_phy_ops = { + .init = ralink_usb_phy_init, + .exit = ralink_usb_phy_exit, + .power_on = ralink_usb_phy_power_on, + .power_off = ralink_usb_phy_power_off, + .owner =THIS_MODULE , +}; + +static struct phy *ralink_usb_phy_xlate (struct device *dev, +struct of_phandle_args *args) +{ +return rt_phy; +} + +static const struct of_device_id ralink_usb_phy_of_match[] = { + { + .compatible ="ralink,rt3xxx-usbphy" , + .data = (void *) (RT_CLKCFG1_UPHY1_CLK_EN | +RT_CLKCFG1_UPHY0_CLK_EN ) + }, { + .compatible ="ralink,mt7620a-usbphy" , + .data = (void *) (MT7620_CLKCFG1_UPHY1_CLK_EN | +MT7620_CLKCFG1_UPHY0_CLK_EN ) }, + { },
drivers/phy/phy-ralink-usb.c line 155
Quoted 10 lines
drivers/phy/phy-ralink-usb.c new file +10
-0+}; +MODULE_DEVICE_TABLE (of, ralink_usb_phy_of_match); + +static int ralink_usb_phy_probe (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +struct phy_provider *phy_provider; +const struct of_device_id *match; + + match =of_match_device (ralink_usb_phy_of_match, &pdev->dev);
if (!match)
return -ENODEV;
Quoted 35 lines
drivers/phy/phy-ralink-usb.c new file +28
-1+ phy_clk = (int ) match->data; + + rsthost =devm_reset_control_get (&pdev->dev,"host" ); + rstdev =devm_reset_control_get (&pdev->dev,"device" ); + + rt_phy =devm_phy_create (dev,NULL , &ralink_usb_phy_ops,NULL ); +if (IS_ERR (rt_phy)) { +dev_err (dev,"failed to create PHY\n" ); +return PTR_ERR (rt_phy); + } + + phy_provider =devm_of_phy_provider_register (dev, ralink_usb_phy_xlate); + +return PTR_ERR_OR_ZERO (phy_provider); +} + +static struct platform_driver ralink_usb_phy_driver = { + .probe = ralink_usb_phy_probe, + .driver = { + .of_match_table = ralink_usb_phy_of_match, + .name ="ralink-usb-phy" , + } +}; +module_platform_driver (ralink_usb_phy_driver); + +MODULE_DESCRIPTION ("Ralink USB phy driver" ); +MODULE_AUTHOR ("John Crispin <[email protected]>" ); +MODULE_LICENSE ("GPL v2" ); --1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Signature · 2 lines
With Best Regards, Andy Shevchenko
Hi,
Quoted 19 lines · John Crispin
Add a driver to setup the USB phy on Mediatek/Ralink SoCs. The driver is trivial and only sets the power and host/device mode.
Signed-off-by John Crispin <[email protected]>--- .../devicetree/bindings/phy/ralink-usb-phy.txt | 17 ++ drivers/phy/Kconfig | 7 + drivers/phy/Makefile | 1 + drivers/phy/phy-ralink-usb.c | 183 ++++++++++++++++++++ 4 files changed, 208 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/ralink-usb-phy.txt create mode 100644 drivers/phy/phy-ralink-usb.cDocumentation/devicetree/bindings/phy/ralink-usb-phy.txt new file +0
-0
Documentation/devicetree/bindings/phy/ralink-usb-phy.txt line 4
Quoted 4 lines
Documentation/devicetree/bindings/phy/ralink-usb-phy.txt new file +4
-0@@ -0,0 +1,17 @@ +Mediatek/Ralink USB PHY + +Required properties: + - compatible: ralink,rt3xxx-usbphy or ralink,mt7620-usbphy
is *ralink,rt3xxx-usbphy* really needed.
Quoted 46 lines
Documentation/devicetree/bindings/phy/ralink-usb-phy.txt new file +13
-0+ - #phy-cells: should be 0 + - resets: the two reset controllers for host and device + - reset-names: the names of the 2 reset controllers + +Example: + +usbphy: phy { + compatible = "ralink,mt7620a-usbphy"; + #phy-cells = <0>; + + resets = <&rstctrl 22 &rstctrl 25>; + reset-names = "host", "device"; +};drivers/phy/Kconfig +7
-0@@ -331,6 +331,13 @@ config PHY_XGENE help This option enables support for APM X-Gene SoC multi-purpose PHY. +config PHY_RALINK_USB + tristate "Ralink USB PHY driver" + select GENERIC_PHY + depends on RALINK + help + This option enables support for Ralink SoC USB PHY. + config PHY_STIH407_USB tristate "STMicroelectronics USB2 picoPHY driver for STiH407 family" depends on RESET_CONTROLLERdrivers/phy/Makefile +1
-0@@ -46,3 +46,4 @@ obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs-qmp-14nm.o obj-$(CONFIG_PHY_TUSB1210) += phy-tusb1210.o obj-$(CONFIG_PHY_BRCMSTB_SATA) += phy-brcmstb-sata.o obj-$(CONFIG_PHY_PISTACHIO_USB) += phy-pistachio-usb.o +obj-$(CONFIG_PHY_RALINK_USB) += phy-ralink-usb.odrivers/phy/phy-ralink-usb.c new file +0
-0
drivers/phy/phy-ralink-usb.c line 4
Quoted 4 lines
drivers/phy/phy-ralink-usb.c new file +4
-0@@ -0,0 +1,183 @@ +/* +* Ralink USB phy driver +* +* Copyright (C) 2014 John Crispin <[email protected]>
2015..
Quoted 39 lines
drivers/phy/phy-ralink-usb.c new file +39
-0+* +* Based on code from +* Allwinner Technology Co., Ltd. <www.allwinnertech.com> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ + +#include <linux/delay.h> +#include <linux/err.h> +#include <linux/io.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/mutex.h> +#include <linux/phy/phy.h> +#include <linux/platform_device.h> +#include <linux/reset.h> +#include <linux/of_platform.h> + +#include <asm/mach-ralink/ralink_regs.h> + +#define RT_SYSC_REG_SYSCFG1 0x014 +#define RT_SYSC_REG_CLKCFG1 0x030 +#define RT_SYSC_REG_USB_PHY_CFG 0x05c + +#define RT_RSTCTRL_UDEV BIT(25) +#define RT_RSTCTRL_UHST BIT(22) +#define RT_SYSCFG1_USB0_HOST_MODE BIT(10) + +#define MT7620_CLKCFG1_UPHY0_CLK_EN BIT(25) +#define MT7620_CLKCFG1_UPHY1_CLK_EN BIT(22) +#define RT_CLKCFG1_UPHY1_CLK_EN BIT(20)
drivers/phy/phy-ralink-usb.c line 53
Quoted 10 lines
drivers/phy/phy-ralink-usb.c new file +10
-0+#define RT_CLKCFG1_UPHY0_CLK_EN BIT(18) + +#define USB_PHY_UTMI_8B60M BIT(1) +#define UDEV_WAKEUP BIT(0) + +static atomic_t usb_pwr_ref =ATOMIC_INIT (0 ); +static struct reset_control *rstdev; +static struct reset_control *rsthost; +static u32 phy_clk; +static struct phy *rt_phy;
Avoid using global variable. These are not required to be global at all.
Quoted 9 lines
drivers/phy/phy-ralink-usb.c new file +9
-0+ +static void usb_phy_enable (int state) +{ +if (state) +rt_sysc_m32 (0 , phy_clk,RT_SYSC_REG_CLKCFG1 ); +else +rt_sysc_m32 (phy_clk,0 ,RT_SYSC_REG_CLKCFG1 ); +mdelay (100 ); +}
drivers/phy/phy-ralink-usb.c line 72
Quoted 10 lines
drivers/phy/phy-ralink-usb.c new file +10
-0+ +static int ralink_usb_phy_init (struct phy *_phy) +{ +return 0 ; +} + +static int ralink_usb_phy_exit (struct phy *_phy) +{ +return 0 ; +}
These empty functions are not required.
drivers/phy/phy-ralink-usb.c line 76
Quoted 4 lines
drivers/phy/phy-ralink-usb.c new file +4
-0+ +static int ralink_usb_phy_power_on (struct phy *_phy) +{ +if (atomic_inc_return (&usb_pwr_ref) ==1 ) {
Why do you need this? Is the reference counting provided in phy-core not enough?
Quoted 48 lines
drivers/phy/phy-ralink-usb.c new file +48
-0+int host =1 ; +u32 t; + +usb_phy_enable (1 ); + +if (host) { +rt_sysc_m32 (0 ,RT_SYSCFG1_USB0_HOST_MODE , +RT_SYSC_REG_SYSCFG1 ); +if (!IS_ERR (rsthost)) +reset_control_deassert (rsthost); +if (!IS_ERR (rstdev)) +reset_control_deassert (rstdev); + }else { +rt_sysc_m32 (RT_SYSCFG1_USB0_HOST_MODE ,0 , +RT_SYSC_REG_SYSCFG1 ); +if (!IS_ERR (rstdev)) +reset_control_deassert (rstdev); + } +mdelay (100 ); + + t =rt_sysc_r32 (RT_SYSC_REG_USB_PHY_CFG ); +dev_info (&_phy->dev,"remote usb device wakeup %s\n" , + (t &UDEV_WAKEUP ) ? ("enabbled" ) : ("disabled" )); +if (t &USB_PHY_UTMI_8B60M ) +dev_info (&_phy->dev,"UTMI 8bit 60MHz\n" ); +else +dev_info (&_phy->dev,"UTMI 16bit 30MHz\n" ); + } + +return 0 ; +} + +static int ralink_usb_phy_power_off (struct phy *_phy) +{ +if (atomic_dec_return (&usb_pwr_ref) ==0 ) { +usb_phy_enable (0 ); +if (!IS_ERR (rstdev)) +reset_control_assert (rstdev); +if (!IS_ERR (rsthost)) +reset_control_assert (rsthost); + } + +return 0 ; +} + +static struct phy_ops ralink_usb_phy_ops = { + .init = ralink_usb_phy_init, + .exit = ralink_usb_phy_exit,
drivers/phy/phy-ralink-usb.c line 134
Quoted 10 lines
drivers/phy/phy-ralink-usb.c new file +10
-0+ .power_on = ralink_usb_phy_power_on, + .power_off = ralink_usb_phy_power_off, + .owner = THIS_MODULE, +}; + +static struct phy *ralink_usb_phy_xlate (struct device *dev, +struct of_phandle_args *args) +{ +return rt_phy; +}
weird.. why do you need empty xlate function? use of_phy_simple_xlate.
drivers/phy/phy-ralink-usb.c line 138
Quoted 4 lines
drivers/phy/phy-ralink-usb.c new file +4
-0+ +static const struct of_device_id ralink_usb_phy_of_match[] = { + { + .compatible ="ralink,rt3xxx-usbphy" ,
Use a specific compatible string. Which SoC's should use "ralink,rt3xxx-usbphy"?
Thanks
Kishon