phy: for 4.3
*) Add new NXP USB OTG PHY driver *) Add vbus/id detection, extcon support and fixes in phy-sun4i-usb driver *) Add support to use phy-sun4i-usb driver for sun8i-a23 and sun8i-a33 SoCs *) Other trivial code cleanups, dropping .owner assignment and constify phy_ops Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJVyhKbAAoJEA5ceFyATYLZIRcP/ivt04ocgcZ7+kyTC55uUvoA I/YAQScDW+LWdCeEE11nWl5oDDecaMDFs/aIVAbuEt38lya6lIzU66gsFlJpJCHj LolnyE8DU8WhEkJRdMsDFVLX+oaNPHHfhIGEorm/FwdoJ6oT0TQ1NZbw7qh6o+T9 +Eb/T8nSTFIHWm24E0MN2pos9mvG4FtDeNp09j05y0F6L/AuLj/eBVJN5vNQ5YgZ onA0YuPNzEJOOdgPJp2WiG2U72evCsCXy5X95gBbz/Fk7uj+vvgy+rMNorOZik+H jLHGuV5kynHGehjn7+UaiPAU4zFfuqbVSyF07tMVqRdb5nGN9621DcfR9jieb2/g 3I0BQcHohwTjQvffdifCcDdF6YwzdLtZQwUEqjngafDoi5mfoolLupsTpLO9GOAO Dq5ZbvqHKoCdQ1h+LZ6KRrr+de9Lrp3P/Ys/9t22e+DF3Vhq0QW8KNMJtNVutrFx RZmiuf5AWPieZBwaVzWVI5AX8Y2KsoVX9BXiOsgkFuFhd3V6lkpI56UlV36IP+rD E8MZ1NblCD+zR19DeZByyl2q1jvK3APNsQQrF3YzIGw9/yaJvVsMvpHIlF9gQ3Z1 A8rvUn3nYW6Gnc9L3b7VQJM15n8K0bym4fPkCIRe5yimC+a5ztxddEajYynmpQGg 5C9QmBF7MH6HlXwVPF4R =97xz -----END PGP SIGNATURE----- Merge tag 'phy-for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-next Kishon writes: phy: for 4.3 *) Add new NXP USB OTG PHY driver *) Add vbus/id detection, extcon support and fixes in phy-sun4i-usb driver *) Add support to use phy-sun4i-usb driver for sun8i-a23 and sun8i-a33 SoCs *) Other trivial code cleanups, dropping .owner assignment and constify phy_ops Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
This commit is contained in:
commit
d50f14805e
|
@ -0,0 +1,26 @@
|
||||||
|
NXP LPC18xx/43xx internal USB OTG PHY binding
|
||||||
|
---------------------------------------------
|
||||||
|
|
||||||
|
This file contains documentation for the internal USB OTG PHY found
|
||||||
|
in NXP LPC18xx and LPC43xx SoCs.
|
||||||
|
|
||||||
|
Required properties:
|
||||||
|
- compatible : must be "nxp,lpc1850-usb-otg-phy"
|
||||||
|
- clocks : must be exactly one entry
|
||||||
|
See: Documentation/devicetree/bindings/clock/clock-bindings.txt
|
||||||
|
- #phy-cells : must be 0 for this phy
|
||||||
|
See: Documentation/devicetree/bindings/phy/phy-bindings.txt
|
||||||
|
|
||||||
|
The phy node must be a child of the creg syscon node.
|
||||||
|
|
||||||
|
Example:
|
||||||
|
creg: syscon@40043000 {
|
||||||
|
compatible = "nxp,lpc1850-creg", "syscon", "simple-mfd";
|
||||||
|
reg = <0x40043000 0x1000>;
|
||||||
|
|
||||||
|
usb0_otg_phy: phy@004 {
|
||||||
|
compatible = "nxp,lpc1850-usb-otg-phy";
|
||||||
|
clocks = <&ccu1 CLK_USB0>;
|
||||||
|
#phy-cells = <0>;
|
||||||
|
};
|
||||||
|
};
|
|
@ -7,6 +7,8 @@ Required properties:
|
||||||
* allwinner,sun5i-a13-usb-phy
|
* allwinner,sun5i-a13-usb-phy
|
||||||
* allwinner,sun6i-a31-usb-phy
|
* allwinner,sun6i-a31-usb-phy
|
||||||
* allwinner,sun7i-a20-usb-phy
|
* allwinner,sun7i-a20-usb-phy
|
||||||
|
* allwinner,sun8i-a23-usb-phy
|
||||||
|
* allwinner,sun8i-a33-usb-phy
|
||||||
- reg : a list of offset + length pairs
|
- reg : a list of offset + length pairs
|
||||||
- reg-names :
|
- reg-names :
|
||||||
* "phy_ctrl"
|
* "phy_ctrl"
|
||||||
|
@ -17,12 +19,21 @@ Required properties:
|
||||||
- clock-names :
|
- clock-names :
|
||||||
* "usb_phy" for sun4i, sun5i or sun7i
|
* "usb_phy" for sun4i, sun5i or sun7i
|
||||||
* "usb0_phy", "usb1_phy" and "usb2_phy" for sun6i
|
* "usb0_phy", "usb1_phy" and "usb2_phy" for sun6i
|
||||||
|
* "usb0_phy", "usb1_phy" for sun8i
|
||||||
- resets : a list of phandle + reset specifier pairs
|
- resets : a list of phandle + reset specifier pairs
|
||||||
- reset-names :
|
- reset-names :
|
||||||
* "usb0_reset"
|
* "usb0_reset"
|
||||||
* "usb1_reset"
|
* "usb1_reset"
|
||||||
* "usb2_reset" for sun4i, sun6i or sun7i
|
* "usb2_reset" for sun4i, sun6i or sun7i
|
||||||
|
|
||||||
|
Optional properties:
|
||||||
|
- usb0_id_det-gpios : gpio phandle for reading the otg id pin value
|
||||||
|
- usb0_vbus_det-gpios : gpio phandle for detecting the presence of usb0 vbus
|
||||||
|
- usb0_vbus_power-supply: power-supply phandle for usb0 vbus presence detect
|
||||||
|
- usb0_vbus-supply : regulator phandle for controller usb0 vbus
|
||||||
|
- usb1_vbus-supply : regulator phandle for controller usb1 vbus
|
||||||
|
- usb2_vbus-supply : regulator phandle for controller usb2 vbus
|
||||||
|
|
||||||
Example:
|
Example:
|
||||||
usbphy: phy@0x01c13400 {
|
usbphy: phy@0x01c13400 {
|
||||||
#phy-cells = <1>;
|
#phy-cells = <1>;
|
||||||
|
@ -32,6 +43,13 @@ Example:
|
||||||
reg-names = "phy_ctrl", "pmu1", "pmu2";
|
reg-names = "phy_ctrl", "pmu1", "pmu2";
|
||||||
clocks = <&usb_clk 8>;
|
clocks = <&usb_clk 8>;
|
||||||
clock-names = "usb_phy";
|
clock-names = "usb_phy";
|
||||||
resets = <&usb_clk 1>, <&usb_clk 2>;
|
resets = <&usb_clk 0>, <&usb_clk 1>, <&usb_clk 2>;
|
||||||
reset-names = "usb1_reset", "usb2_reset";
|
reset-names = "usb0_reset", "usb1_reset", "usb2_reset";
|
||||||
|
pinctrl-names = "default";
|
||||||
|
pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;
|
||||||
|
usb0_id_det-gpios = <&pio 7 19 GPIO_ACTIVE_HIGH>; /* PH19 */
|
||||||
|
usb0_vbus_det-gpios = <&pio 7 22 GPIO_ACTIVE_HIGH>; /* PH22 */
|
||||||
|
usb0_vbus-supply = <®_usb0_vbus>;
|
||||||
|
usb1_vbus-supply = <®_usb1_vbus>;
|
||||||
|
usb2_vbus-supply = <®_usb2_vbus>;
|
||||||
};
|
};
|
||||||
|
|
|
@ -54,6 +54,17 @@ config PHY_EXYNOS_MIPI_VIDEO
|
||||||
Support for MIPI CSI-2 and MIPI DSI DPHY found on Samsung S5P
|
Support for MIPI CSI-2 and MIPI DSI DPHY found on Samsung S5P
|
||||||
and EXYNOS SoCs.
|
and EXYNOS SoCs.
|
||||||
|
|
||||||
|
config PHY_LPC18XX_USB_OTG
|
||||||
|
tristate "NXP LPC18xx/43xx SoC USB OTG PHY driver"
|
||||||
|
depends on OF && (ARCH_LPC18XX || COMPILE_TEST)
|
||||||
|
depends on MFD_SYSCON
|
||||||
|
select GENERIC_PHY
|
||||||
|
help
|
||||||
|
Enable this to support NXP LPC18xx/43xx internal USB OTG PHY.
|
||||||
|
|
||||||
|
This driver is need for USB0 support on LPC18xx/43xx and takes
|
||||||
|
care of enabling and clock setup.
|
||||||
|
|
||||||
config PHY_PXA_28NM_HSIC
|
config PHY_PXA_28NM_HSIC
|
||||||
tristate "Marvell USB HSIC 28nm PHY Driver"
|
tristate "Marvell USB HSIC 28nm PHY Driver"
|
||||||
depends on HAS_IOMEM
|
depends on HAS_IOMEM
|
||||||
|
@ -199,6 +210,8 @@ config PHY_SUN4I_USB
|
||||||
tristate "Allwinner sunxi SoC USB PHY driver"
|
tristate "Allwinner sunxi SoC USB PHY driver"
|
||||||
depends on ARCH_SUNXI && HAS_IOMEM && OF
|
depends on ARCH_SUNXI && HAS_IOMEM && OF
|
||||||
depends on RESET_CONTROLLER
|
depends on RESET_CONTROLLER
|
||||||
|
depends on EXTCON
|
||||||
|
depends on POWER_SUPPLY
|
||||||
select GENERIC_PHY
|
select GENERIC_PHY
|
||||||
help
|
help
|
||||||
Enable this to support the transceiver that is part of Allwinner
|
Enable this to support the transceiver that is part of Allwinner
|
||||||
|
|
|
@ -10,6 +10,7 @@ obj-$(CONFIG_ARMADA375_USBCLUSTER_PHY) += phy-armada375-usb2.o
|
||||||
obj-$(CONFIG_BCM_KONA_USB2_PHY) += phy-bcm-kona-usb2.o
|
obj-$(CONFIG_BCM_KONA_USB2_PHY) += phy-bcm-kona-usb2.o
|
||||||
obj-$(CONFIG_PHY_EXYNOS_DP_VIDEO) += phy-exynos-dp-video.o
|
obj-$(CONFIG_PHY_EXYNOS_DP_VIDEO) += phy-exynos-dp-video.o
|
||||||
obj-$(CONFIG_PHY_EXYNOS_MIPI_VIDEO) += phy-exynos-mipi-video.o
|
obj-$(CONFIG_PHY_EXYNOS_MIPI_VIDEO) += phy-exynos-mipi-video.o
|
||||||
|
obj-$(CONFIG_PHY_LPC18XX_USB_OTG) += phy-lpc18xx-usb-otg.o
|
||||||
obj-$(CONFIG_PHY_PXA_28NM_USB2) += phy-pxa-28nm-usb2.o
|
obj-$(CONFIG_PHY_PXA_28NM_USB2) += phy-pxa-28nm-usb2.o
|
||||||
obj-$(CONFIG_PHY_PXA_28NM_HSIC) += phy-pxa-28nm-hsic.o
|
obj-$(CONFIG_PHY_PXA_28NM_HSIC) += phy-pxa-28nm-hsic.o
|
||||||
obj-$(CONFIG_PHY_MVEBU_SATA) += phy-mvebu-sata.o
|
obj-$(CONFIG_PHY_MVEBU_SATA) += phy-mvebu-sata.o
|
||||||
|
|
|
@ -51,7 +51,7 @@ static int armada375_usb_phy_init(struct phy *phy)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct phy_ops armada375_usb_phy_ops = {
|
static const struct phy_ops armada375_usb_phy_ops = {
|
||||||
.init = armada375_usb_phy_init,
|
.init = armada375_usb_phy_init,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
};
|
};
|
||||||
|
@ -149,7 +149,6 @@ static struct platform_driver armada375_usb_phy_driver = {
|
||||||
.driver = {
|
.driver = {
|
||||||
.of_match_table = of_usb_cluster_table,
|
.of_match_table = of_usb_cluster_table,
|
||||||
.name = "armada-375-usb-cluster",
|
.name = "armada-375-usb-cluster",
|
||||||
.owner = THIS_MODULE,
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
module_platform_driver(armada375_usb_phy_driver);
|
module_platform_driver(armada375_usb_phy_driver);
|
||||||
|
|
|
@ -91,7 +91,7 @@ static int bcm_kona_usb_phy_power_off(struct phy *gphy)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct phy_ops ops = {
|
static const struct phy_ops ops = {
|
||||||
.init = bcm_kona_usb_phy_init,
|
.init = bcm_kona_usb_phy_init,
|
||||||
.power_on = bcm_kona_usb_phy_power_on,
|
.power_on = bcm_kona_usb_phy_power_on,
|
||||||
.power_off = bcm_kona_usb_phy_power_off,
|
.power_off = bcm_kona_usb_phy_power_off,
|
||||||
|
|
|
@ -176,7 +176,7 @@ static struct phy *phy_berlin_sata_phy_xlate(struct device *dev,
|
||||||
return priv->phys[i]->phy;
|
return priv->phys[i]->phy;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct phy_ops phy_berlin_sata_ops = {
|
static const struct phy_ops phy_berlin_sata_ops = {
|
||||||
.power_on = phy_berlin_sata_power_on,
|
.power_on = phy_berlin_sata_power_on,
|
||||||
.power_off = phy_berlin_sata_power_off,
|
.power_off = phy_berlin_sata_power_off,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
|
|
|
@ -147,12 +147,12 @@ static int phy_berlin_usb_power_on(struct phy *phy)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct phy_ops phy_berlin_usb_ops = {
|
static const struct phy_ops phy_berlin_usb_ops = {
|
||||||
.power_on = phy_berlin_usb_power_on,
|
.power_on = phy_berlin_usb_power_on,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct of_device_id phy_berlin_sata_of_match[] = {
|
static const struct of_device_id phy_berlin_usb_of_match[] = {
|
||||||
{
|
{
|
||||||
.compatible = "marvell,berlin2-usb-phy",
|
.compatible = "marvell,berlin2-usb-phy",
|
||||||
.data = &phy_berlin_pll_dividers[0],
|
.data = &phy_berlin_pll_dividers[0],
|
||||||
|
@ -163,12 +163,12 @@ static const struct of_device_id phy_berlin_sata_of_match[] = {
|
||||||
},
|
},
|
||||||
{ },
|
{ },
|
||||||
};
|
};
|
||||||
MODULE_DEVICE_TABLE(of, phy_berlin_sata_of_match);
|
MODULE_DEVICE_TABLE(of, phy_berlin_usb_of_match);
|
||||||
|
|
||||||
static int phy_berlin_usb_probe(struct platform_device *pdev)
|
static int phy_berlin_usb_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
const struct of_device_id *match =
|
const struct of_device_id *match =
|
||||||
of_match_device(phy_berlin_sata_of_match, &pdev->dev);
|
of_match_device(phy_berlin_usb_of_match, &pdev->dev);
|
||||||
struct phy_berlin_usb_priv *priv;
|
struct phy_berlin_usb_priv *priv;
|
||||||
struct resource *res;
|
struct resource *res;
|
||||||
struct phy *phy;
|
struct phy *phy;
|
||||||
|
@ -207,9 +207,8 @@ static struct platform_driver phy_berlin_usb_driver = {
|
||||||
.probe = phy_berlin_usb_probe,
|
.probe = phy_berlin_usb_probe,
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "phy-berlin-usb",
|
.name = "phy-berlin-usb",
|
||||||
.owner = THIS_MODULE,
|
.of_match_table = phy_berlin_usb_of_match,
|
||||||
.of_match_table = phy_berlin_sata_of_match,
|
},
|
||||||
},
|
|
||||||
};
|
};
|
||||||
module_platform_driver(phy_berlin_usb_driver);
|
module_platform_driver(phy_berlin_usb_driver);
|
||||||
|
|
||||||
|
|
|
@ -122,7 +122,7 @@ static int brcm_sata_phy_init(struct phy *phy)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct phy_ops phy_ops_28nm = {
|
static const struct phy_ops phy_ops_28nm = {
|
||||||
.init = brcm_sata_phy_init,
|
.init = brcm_sata_phy_init,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
};
|
};
|
||||||
|
|
|
@ -113,7 +113,7 @@ static int dm816x_usb_phy_init(struct phy *x)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct phy_ops ops = {
|
static const struct phy_ops ops = {
|
||||||
.init = dm816x_usb_phy_init,
|
.init = dm816x_usb_phy_init,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
};
|
};
|
||||||
|
|
|
@ -48,7 +48,7 @@ static int exynos_dp_video_phy_power_off(struct phy *phy)
|
||||||
EXYNOS5_PHY_ENABLE, 0);
|
EXYNOS5_PHY_ENABLE, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct phy_ops exynos_dp_video_phy_ops = {
|
static const struct phy_ops exynos_dp_video_phy_ops = {
|
||||||
.power_on = exynos_dp_video_phy_power_on,
|
.power_on = exynos_dp_video_phy_power_on,
|
||||||
.power_off = exynos_dp_video_phy_power_off,
|
.power_off = exynos_dp_video_phy_power_off,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
|
|
|
@ -124,7 +124,7 @@ static struct phy *exynos_mipi_video_phy_xlate(struct device *dev,
|
||||||
return state->phys[args->args[0]].phy;
|
return state->phys[args->args[0]].phy;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct phy_ops exynos_mipi_video_phy_ops = {
|
static const struct phy_ops exynos_mipi_video_phy_ops = {
|
||||||
.power_on = exynos_mipi_video_phy_power_on,
|
.power_on = exynos_mipi_video_phy_power_on,
|
||||||
.power_off = exynos_mipi_video_phy_power_off,
|
.power_off = exynos_mipi_video_phy_power_off,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
|
|
|
@ -537,7 +537,7 @@ static struct phy *exynos5_usbdrd_phy_xlate(struct device *dev,
|
||||||
return phy_drd->phys[args->args[0]].phy;
|
return phy_drd->phys[args->args[0]].phy;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct phy_ops exynos5_usbdrd_phy_ops = {
|
static const struct phy_ops exynos5_usbdrd_phy_ops = {
|
||||||
.init = exynos5_usbdrd_phy_init,
|
.init = exynos5_usbdrd_phy_init,
|
||||||
.exit = exynos5_usbdrd_phy_exit,
|
.exit = exynos5_usbdrd_phy_exit,
|
||||||
.power_on = exynos5_usbdrd_phy_power_on,
|
.power_on = exynos5_usbdrd_phy_power_on,
|
||||||
|
|
|
@ -154,7 +154,7 @@ static int exynos_sata_phy_init(struct phy *phy)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct phy_ops exynos_sata_phy_ops = {
|
static const struct phy_ops exynos_sata_phy_ops = {
|
||||||
.init = exynos_sata_phy_init,
|
.init = exynos_sata_phy_init,
|
||||||
.power_on = exynos_sata_phy_power_on,
|
.power_on = exynos_sata_phy_power_on,
|
||||||
.power_off = exynos_sata_phy_power_off,
|
.power_off = exynos_sata_phy_power_off,
|
||||||
|
|
|
@ -129,7 +129,7 @@ static int hix5hd2_sata_phy_init(struct phy *phy)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct phy_ops hix5hd2_sata_phy_ops = {
|
static const struct phy_ops hix5hd2_sata_phy_ops = {
|
||||||
.init = hix5hd2_sata_phy_init,
|
.init = hix5hd2_sata_phy_init,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
};
|
};
|
||||||
|
|
|
@ -0,0 +1,143 @@
|
||||||
|
/*
|
||||||
|
* PHY driver for NXP LPC18xx/43xx internal USB OTG PHY
|
||||||
|
*
|
||||||
|
* Copyright (C) 2015 Joachim Eastwood <manabian@gmail.com>
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License version 2 as
|
||||||
|
* published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <linux/clk.h>
|
||||||
|
#include <linux/err.h>
|
||||||
|
#include <linux/mfd/syscon.h>
|
||||||
|
#include <linux/module.h>
|
||||||
|
#include <linux/of.h>
|
||||||
|
#include <linux/phy/phy.h>
|
||||||
|
#include <linux/platform_device.h>
|
||||||
|
#include <linux/regmap.h>
|
||||||
|
|
||||||
|
/* USB OTG PHY register offset and bit in CREG */
|
||||||
|
#define LPC18XX_CREG_CREG0 0x004
|
||||||
|
#define LPC18XX_CREG_CREG0_USB0PHY BIT(5)
|
||||||
|
|
||||||
|
struct lpc18xx_usb_otg_phy {
|
||||||
|
struct phy *phy;
|
||||||
|
struct clk *clk;
|
||||||
|
struct regmap *reg;
|
||||||
|
};
|
||||||
|
|
||||||
|
static int lpc18xx_usb_otg_phy_init(struct phy *phy)
|
||||||
|
{
|
||||||
|
struct lpc18xx_usb_otg_phy *lpc = phy_get_drvdata(phy);
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
/* The PHY must be clocked at 480 MHz */
|
||||||
|
ret = clk_set_rate(lpc->clk, 480000000);
|
||||||
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
return clk_prepare(lpc->clk);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int lpc18xx_usb_otg_phy_exit(struct phy *phy)
|
||||||
|
{
|
||||||
|
struct lpc18xx_usb_otg_phy *lpc = phy_get_drvdata(phy);
|
||||||
|
|
||||||
|
clk_unprepare(lpc->clk);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int lpc18xx_usb_otg_phy_power_on(struct phy *phy)
|
||||||
|
{
|
||||||
|
struct lpc18xx_usb_otg_phy *lpc = phy_get_drvdata(phy);
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
ret = clk_enable(lpc->clk);
|
||||||
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
/* The bit in CREG is cleared to enable the PHY */
|
||||||
|
return regmap_update_bits(lpc->reg, LPC18XX_CREG_CREG0,
|
||||||
|
LPC18XX_CREG_CREG0_USB0PHY, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int lpc18xx_usb_otg_phy_power_off(struct phy *phy)
|
||||||
|
{
|
||||||
|
struct lpc18xx_usb_otg_phy *lpc = phy_get_drvdata(phy);
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
ret = regmap_update_bits(lpc->reg, LPC18XX_CREG_CREG0,
|
||||||
|
LPC18XX_CREG_CREG0_USB0PHY,
|
||||||
|
LPC18XX_CREG_CREG0_USB0PHY);
|
||||||
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
clk_disable(lpc->clk);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static const struct phy_ops lpc18xx_usb_otg_phy_ops = {
|
||||||
|
.init = lpc18xx_usb_otg_phy_init,
|
||||||
|
.exit = lpc18xx_usb_otg_phy_exit,
|
||||||
|
.power_on = lpc18xx_usb_otg_phy_power_on,
|
||||||
|
.power_off = lpc18xx_usb_otg_phy_power_off,
|
||||||
|
.owner = THIS_MODULE,
|
||||||
|
};
|
||||||
|
|
||||||
|
static int lpc18xx_usb_otg_phy_probe(struct platform_device *pdev)
|
||||||
|
{
|
||||||
|
struct phy_provider *phy_provider;
|
||||||
|
struct lpc18xx_usb_otg_phy *lpc;
|
||||||
|
|
||||||
|
lpc = devm_kzalloc(&pdev->dev, sizeof(*lpc), GFP_KERNEL);
|
||||||
|
if (!lpc)
|
||||||
|
return -ENOMEM;
|
||||||
|
|
||||||
|
lpc->reg = syscon_node_to_regmap(pdev->dev.of_node->parent);
|
||||||
|
if (IS_ERR(lpc->reg)) {
|
||||||
|
dev_err(&pdev->dev, "failed to get syscon\n");
|
||||||
|
return PTR_ERR(lpc->reg);
|
||||||
|
}
|
||||||
|
|
||||||
|
lpc->clk = devm_clk_get(&pdev->dev, NULL);
|
||||||
|
if (IS_ERR(lpc->clk)) {
|
||||||
|
dev_err(&pdev->dev, "failed to get clock\n");
|
||||||
|
return PTR_ERR(lpc->clk);
|
||||||
|
}
|
||||||
|
|
||||||
|
lpc->phy = devm_phy_create(&pdev->dev, NULL, &lpc18xx_usb_otg_phy_ops);
|
||||||
|
if (IS_ERR(lpc->phy)) {
|
||||||
|
dev_err(&pdev->dev, "failed to create PHY\n");
|
||||||
|
return PTR_ERR(lpc->phy);
|
||||||
|
}
|
||||||
|
|
||||||
|
phy_set_drvdata(lpc->phy, lpc);
|
||||||
|
|
||||||
|
phy_provider = devm_of_phy_provider_register(&pdev->dev,
|
||||||
|
of_phy_simple_xlate);
|
||||||
|
|
||||||
|
return PTR_ERR_OR_ZERO(phy_provider);
|
||||||
|
}
|
||||||
|
|
||||||
|
static const struct of_device_id lpc18xx_usb_otg_phy_match[] = {
|
||||||
|
{ .compatible = "nxp,lpc1850-usb-otg-phy" },
|
||||||
|
{ }
|
||||||
|
};
|
||||||
|
MODULE_DEVICE_TABLE(of, lpc18xx_usb_otg_phy_match);
|
||||||
|
|
||||||
|
static struct platform_driver lpc18xx_usb_otg_phy_driver = {
|
||||||
|
.probe = lpc18xx_usb_otg_phy_probe,
|
||||||
|
.driver = {
|
||||||
|
.name = "lpc18xx-usb-otg-phy",
|
||||||
|
.of_match_table = lpc18xx_usb_otg_phy_match,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
module_platform_driver(lpc18xx_usb_otg_phy_driver);
|
||||||
|
|
||||||
|
MODULE_AUTHOR("Joachim Eastwood <manabian@gmail.com>");
|
||||||
|
MODULE_DESCRIPTION("NXP LPC18xx/43xx USB OTG PHY driver");
|
||||||
|
MODULE_LICENSE("GPL v2");
|
|
@ -1132,7 +1132,7 @@ static struct phy *miphy28lp_xlate(struct device *dev,
|
||||||
return miphy_phy->phy;
|
return miphy_phy->phy;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct phy_ops miphy28lp_ops = {
|
static const struct phy_ops miphy28lp_ops = {
|
||||||
.init = miphy28lp_init,
|
.init = miphy28lp_init,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
};
|
};
|
||||||
|
@ -1268,7 +1268,6 @@ static struct platform_driver miphy28lp_driver = {
|
||||||
.probe = miphy28lp_probe,
|
.probe = miphy28lp_probe,
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "miphy28lp-phy",
|
.name = "miphy28lp-phy",
|
||||||
.owner = THIS_MODULE,
|
|
||||||
.of_match_table = miphy28lp_of_match,
|
.of_match_table = miphy28lp_of_match,
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -510,7 +510,7 @@ static struct phy *miphy365x_xlate(struct device *dev,
|
||||||
return miphy_phy->phy;
|
return miphy_phy->phy;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct phy_ops miphy365x_ops = {
|
static const struct phy_ops miphy365x_ops = {
|
||||||
.init = miphy365x_init,
|
.init = miphy365x_init,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
};
|
};
|
||||||
|
|
|
@ -75,7 +75,7 @@ static int phy_mvebu_sata_power_off(struct phy *phy)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct phy_ops phy_mvebu_sata_ops = {
|
static const struct phy_ops phy_mvebu_sata_ops = {
|
||||||
.power_on = phy_mvebu_sata_power_on,
|
.power_on = phy_mvebu_sata_power_on,
|
||||||
.power_off = phy_mvebu_sata_power_off,
|
.power_off = phy_mvebu_sata_power_off,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
|
|
|
@ -137,7 +137,7 @@ static int omap_usb_init(struct phy *x)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct phy_ops ops = {
|
static const struct phy_ops ops = {
|
||||||
.init = omap_usb_init,
|
.init = omap_usb_init,
|
||||||
.power_on = omap_usb_power_on,
|
.power_on = omap_usb_power_on,
|
||||||
.power_off = omap_usb_power_off,
|
.power_off = omap_usb_power_off,
|
||||||
|
|
|
@ -204,7 +204,7 @@ static int qcom_apq8064_sata_phy_exit(struct phy *generic_phy)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct phy_ops qcom_apq8064_sata_phy_ops = {
|
static const struct phy_ops qcom_apq8064_sata_phy_ops = {
|
||||||
.init = qcom_apq8064_sata_phy_init,
|
.init = qcom_apq8064_sata_phy_init,
|
||||||
.exit = qcom_apq8064_sata_phy_exit,
|
.exit = qcom_apq8064_sata_phy_exit,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
|
|
|
@ -126,7 +126,7 @@ static int qcom_ipq806x_sata_phy_exit(struct phy *generic_phy)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct phy_ops qcom_ipq806x_sata_phy_ops = {
|
static const struct phy_ops qcom_ipq806x_sata_phy_ops = {
|
||||||
.init = qcom_ipq806x_sata_phy_init,
|
.init = qcom_ipq806x_sata_phy_init,
|
||||||
.exit = qcom_ipq806x_sata_phy_exit,
|
.exit = qcom_ipq806x_sata_phy_exit,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
|
|
|
@ -150,7 +150,7 @@ int ufs_qcom_phy_remove(struct phy *generic_phy,
|
||||||
struct ufs_qcom_phy *ufs_qcom_phy);
|
struct ufs_qcom_phy *ufs_qcom_phy);
|
||||||
struct phy *ufs_qcom_phy_generic_probe(struct platform_device *pdev,
|
struct phy *ufs_qcom_phy_generic_probe(struct platform_device *pdev,
|
||||||
struct ufs_qcom_phy *common_cfg,
|
struct ufs_qcom_phy *common_cfg,
|
||||||
struct phy_ops *ufs_qcom_phy_gen_ops,
|
const struct phy_ops *ufs_qcom_phy_gen_ops,
|
||||||
struct ufs_qcom_phy_specific_ops *phy_spec_ops);
|
struct ufs_qcom_phy_specific_ops *phy_spec_ops);
|
||||||
int ufs_qcom_phy_calibrate(struct ufs_qcom_phy *ufs_qcom_phy,
|
int ufs_qcom_phy_calibrate(struct ufs_qcom_phy *ufs_qcom_phy,
|
||||||
struct ufs_qcom_phy_calibration *tbl_A, int tbl_size_A,
|
struct ufs_qcom_phy_calibration *tbl_A, int tbl_size_A,
|
||||||
|
|
|
@ -115,7 +115,7 @@ static int ufs_qcom_phy_qmp_14nm_is_pcs_ready(struct ufs_qcom_phy *phy_common)
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct phy_ops ufs_qcom_phy_qmp_14nm_phy_ops = {
|
static const struct phy_ops ufs_qcom_phy_qmp_14nm_phy_ops = {
|
||||||
.init = ufs_qcom_phy_qmp_14nm_init,
|
.init = ufs_qcom_phy_qmp_14nm_init,
|
||||||
.exit = ufs_qcom_phy_exit,
|
.exit = ufs_qcom_phy_exit,
|
||||||
.power_on = ufs_qcom_phy_power_on,
|
.power_on = ufs_qcom_phy_power_on,
|
||||||
|
@ -191,7 +191,6 @@ static struct platform_driver ufs_qcom_phy_qmp_14nm_driver = {
|
||||||
.driver = {
|
.driver = {
|
||||||
.of_match_table = ufs_qcom_phy_qmp_14nm_of_match,
|
.of_match_table = ufs_qcom_phy_qmp_14nm_of_match,
|
||||||
.name = "ufs_qcom_phy_qmp_14nm",
|
.name = "ufs_qcom_phy_qmp_14nm",
|
||||||
.owner = THIS_MODULE,
|
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -171,7 +171,7 @@ static int ufs_qcom_phy_qmp_20nm_is_pcs_ready(struct ufs_qcom_phy *phy_common)
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct phy_ops ufs_qcom_phy_qmp_20nm_phy_ops = {
|
static const struct phy_ops ufs_qcom_phy_qmp_20nm_phy_ops = {
|
||||||
.init = ufs_qcom_phy_qmp_20nm_init,
|
.init = ufs_qcom_phy_qmp_20nm_init,
|
||||||
.exit = ufs_qcom_phy_exit,
|
.exit = ufs_qcom_phy_exit,
|
||||||
.power_on = ufs_qcom_phy_power_on,
|
.power_on = ufs_qcom_phy_power_on,
|
||||||
|
@ -247,7 +247,6 @@ static struct platform_driver ufs_qcom_phy_qmp_20nm_driver = {
|
||||||
.driver = {
|
.driver = {
|
||||||
.of_match_table = ufs_qcom_phy_qmp_20nm_of_match,
|
.of_match_table = ufs_qcom_phy_qmp_20nm_of_match,
|
||||||
.name = "ufs_qcom_phy_qmp_20nm",
|
.name = "ufs_qcom_phy_qmp_20nm",
|
||||||
.owner = THIS_MODULE,
|
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -77,7 +77,7 @@ EXPORT_SYMBOL_GPL(ufs_qcom_phy_calibrate);
|
||||||
|
|
||||||
struct phy *ufs_qcom_phy_generic_probe(struct platform_device *pdev,
|
struct phy *ufs_qcom_phy_generic_probe(struct platform_device *pdev,
|
||||||
struct ufs_qcom_phy *common_cfg,
|
struct ufs_qcom_phy *common_cfg,
|
||||||
struct phy_ops *ufs_qcom_phy_gen_ops,
|
const struct phy_ops *ufs_qcom_phy_gen_ops,
|
||||||
struct ufs_qcom_phy_specific_ops *phy_spec_ops)
|
struct ufs_qcom_phy_specific_ops *phy_spec_ops)
|
||||||
{
|
{
|
||||||
int err;
|
int err;
|
||||||
|
|
|
@ -184,7 +184,7 @@ static int rcar_gen2_phy_power_off(struct phy *p)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct phy_ops rcar_gen2_phy_ops = {
|
static const struct phy_ops rcar_gen2_phy_ops = {
|
||||||
.init = rcar_gen2_phy_init,
|
.init = rcar_gen2_phy_init,
|
||||||
.exit = rcar_gen2_phy_exit,
|
.exit = rcar_gen2_phy_exit,
|
||||||
.power_on = rcar_gen2_phy_power_on,
|
.power_on = rcar_gen2_phy_power_on,
|
||||||
|
|
|
@ -84,7 +84,7 @@ static int rockchip_usb_phy_power_on(struct phy *_phy)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct phy_ops ops = {
|
static const struct phy_ops ops = {
|
||||||
.power_on = rockchip_usb_phy_power_on,
|
.power_on = rockchip_usb_phy_power_on,
|
||||||
.power_off = rockchip_usb_phy_power_off,
|
.power_off = rockchip_usb_phy_power_off,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
|
@ -146,7 +146,6 @@ static struct platform_driver rockchip_usb_driver = {
|
||||||
.probe = rockchip_usb_phy_probe,
|
.probe = rockchip_usb_phy_probe,
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "rockchip-usb-phy",
|
.name = "rockchip-usb-phy",
|
||||||
.owner = THIS_MODULE,
|
|
||||||
.of_match_table = rockchip_usb_phy_dt_ids,
|
.of_match_table = rockchip_usb_phy_dt_ids,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
|
@ -71,7 +71,7 @@ static int samsung_usb2_phy_power_off(struct phy *phy)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct phy_ops samsung_usb2_phy_ops = {
|
static const struct phy_ops samsung_usb2_phy_ops = {
|
||||||
.power_on = samsung_usb2_phy_power_on,
|
.power_on = samsung_usb2_phy_power_on,
|
||||||
.power_off = samsung_usb2_phy_power_off,
|
.power_off = samsung_usb2_phy_power_off,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
|
|
|
@ -179,7 +179,7 @@ static const struct of_device_id spear1310_miphy_of_match[] = {
|
||||||
};
|
};
|
||||||
MODULE_DEVICE_TABLE(of, spear1310_miphy_of_match);
|
MODULE_DEVICE_TABLE(of, spear1310_miphy_of_match);
|
||||||
|
|
||||||
static struct phy_ops spear1310_miphy_ops = {
|
static const struct phy_ops spear1310_miphy_ops = {
|
||||||
.init = spear1310_miphy_init,
|
.init = spear1310_miphy_init,
|
||||||
.exit = spear1310_miphy_exit,
|
.exit = spear1310_miphy_exit,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
|
|
|
@ -189,7 +189,7 @@ static const struct of_device_id spear1340_miphy_of_match[] = {
|
||||||
};
|
};
|
||||||
MODULE_DEVICE_TABLE(of, spear1340_miphy_of_match);
|
MODULE_DEVICE_TABLE(of, spear1340_miphy_of_match);
|
||||||
|
|
||||||
static struct phy_ops spear1340_miphy_ops = {
|
static const struct phy_ops spear1340_miphy_ops = {
|
||||||
.init = spear1340_miphy_init,
|
.init = spear1340_miphy_init,
|
||||||
.exit = spear1340_miphy_exit,
|
.exit = spear1340_miphy_exit,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
|
|
|
@ -112,7 +112,7 @@ static int stih41x_usb_phy_power_off(struct phy *phy)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct phy_ops stih41x_usb_phy_ops = {
|
static const struct phy_ops stih41x_usb_phy_ops = {
|
||||||
.init = stih41x_usb_phy_init,
|
.init = stih41x_usb_phy_init,
|
||||||
.power_on = stih41x_usb_phy_power_on,
|
.power_on = stih41x_usb_phy_power_on,
|
||||||
.power_off = stih41x_usb_phy_power_off,
|
.power_off = stih41x_usb_phy_power_off,
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* Allwinner sun4i USB phy driver
|
* Allwinner sun4i USB phy driver
|
||||||
*
|
*
|
||||||
* Copyright (C) 2014 Hans de Goede <hdegoede@redhat.com>
|
* Copyright (C) 2014-2015 Hans de Goede <hdegoede@redhat.com>
|
||||||
*
|
*
|
||||||
* Based on code from
|
* Based on code from
|
||||||
* Allwinner Technology Co., Ltd. <www.allwinnertech.com>
|
* Allwinner Technology Co., Ltd. <www.allwinnertech.com>
|
||||||
|
@ -22,23 +22,30 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <linux/clk.h>
|
#include <linux/clk.h>
|
||||||
|
#include <linux/delay.h>
|
||||||
#include <linux/err.h>
|
#include <linux/err.h>
|
||||||
|
#include <linux/extcon.h>
|
||||||
#include <linux/io.h>
|
#include <linux/io.h>
|
||||||
|
#include <linux/interrupt.h>
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/mutex.h>
|
#include <linux/mutex.h>
|
||||||
#include <linux/of.h>
|
#include <linux/of.h>
|
||||||
#include <linux/of_address.h>
|
#include <linux/of_address.h>
|
||||||
|
#include <linux/of_gpio.h>
|
||||||
#include <linux/phy/phy.h>
|
#include <linux/phy/phy.h>
|
||||||
#include <linux/phy/phy-sun4i-usb.h>
|
#include <linux/phy/phy-sun4i-usb.h>
|
||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
|
#include <linux/power_supply.h>
|
||||||
#include <linux/regulator/consumer.h>
|
#include <linux/regulator/consumer.h>
|
||||||
#include <linux/reset.h>
|
#include <linux/reset.h>
|
||||||
|
#include <linux/workqueue.h>
|
||||||
|
|
||||||
#define REG_ISCR 0x00
|
#define REG_ISCR 0x00
|
||||||
#define REG_PHYCTL 0x04
|
#define REG_PHYCTL_A10 0x04
|
||||||
#define REG_PHYBIST 0x08
|
#define REG_PHYBIST 0x08
|
||||||
#define REG_PHYTUNE 0x0c
|
#define REG_PHYTUNE 0x0c
|
||||||
|
#define REG_PHYCTL_A33 0x10
|
||||||
|
|
||||||
#define PHYCTL_DATA BIT(7)
|
#define PHYCTL_DATA BIT(7)
|
||||||
|
|
||||||
|
@ -47,6 +54,17 @@
|
||||||
#define SUNXI_AHB_INCRX_ALIGN_EN BIT(8)
|
#define SUNXI_AHB_INCRX_ALIGN_EN BIT(8)
|
||||||
#define SUNXI_ULPI_BYPASS_EN BIT(0)
|
#define SUNXI_ULPI_BYPASS_EN BIT(0)
|
||||||
|
|
||||||
|
/* ISCR, Interface Status and Control bits */
|
||||||
|
#define ISCR_ID_PULLUP_EN (1 << 17)
|
||||||
|
#define ISCR_DPDM_PULLUP_EN (1 << 16)
|
||||||
|
/* sunxi has the phy id/vbus pins not connected, so we use the force bits */
|
||||||
|
#define ISCR_FORCE_ID_MASK (3 << 14)
|
||||||
|
#define ISCR_FORCE_ID_LOW (2 << 14)
|
||||||
|
#define ISCR_FORCE_ID_HIGH (3 << 14)
|
||||||
|
#define ISCR_FORCE_VBUS_MASK (3 << 12)
|
||||||
|
#define ISCR_FORCE_VBUS_LOW (2 << 12)
|
||||||
|
#define ISCR_FORCE_VBUS_HIGH (3 << 12)
|
||||||
|
|
||||||
/* Common Control Bits for Both PHYs */
|
/* Common Control Bits for Both PHYs */
|
||||||
#define PHY_PLL_BW 0x03
|
#define PHY_PLL_BW 0x03
|
||||||
#define PHY_RES45_CAL_EN 0x0c
|
#define PHY_RES45_CAL_EN 0x0c
|
||||||
|
@ -63,60 +81,124 @@
|
||||||
|
|
||||||
#define MAX_PHYS 3
|
#define MAX_PHYS 3
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Note do not raise the debounce time, we must report Vusb high within 100ms
|
||||||
|
* otherwise we get Vbus errors
|
||||||
|
*/
|
||||||
|
#define DEBOUNCE_TIME msecs_to_jiffies(50)
|
||||||
|
#define POLL_TIME msecs_to_jiffies(250)
|
||||||
|
|
||||||
struct sun4i_usb_phy_data {
|
struct sun4i_usb_phy_data {
|
||||||
void __iomem *base;
|
void __iomem *base;
|
||||||
struct mutex mutex;
|
struct mutex mutex;
|
||||||
int num_phys;
|
int num_phys;
|
||||||
u32 disc_thresh;
|
u32 disc_thresh;
|
||||||
|
bool has_a33_phyctl;
|
||||||
struct sun4i_usb_phy {
|
struct sun4i_usb_phy {
|
||||||
struct phy *phy;
|
struct phy *phy;
|
||||||
void __iomem *pmu;
|
void __iomem *pmu;
|
||||||
struct regulator *vbus;
|
struct regulator *vbus;
|
||||||
struct reset_control *reset;
|
struct reset_control *reset;
|
||||||
struct clk *clk;
|
struct clk *clk;
|
||||||
|
bool regulator_on;
|
||||||
int index;
|
int index;
|
||||||
} phys[MAX_PHYS];
|
} phys[MAX_PHYS];
|
||||||
|
/* phy0 / otg related variables */
|
||||||
|
struct extcon_dev *extcon;
|
||||||
|
bool phy0_init;
|
||||||
|
bool phy0_poll;
|
||||||
|
struct gpio_desc *id_det_gpio;
|
||||||
|
struct gpio_desc *vbus_det_gpio;
|
||||||
|
struct power_supply *vbus_power_supply;
|
||||||
|
struct notifier_block vbus_power_nb;
|
||||||
|
bool vbus_power_nb_registered;
|
||||||
|
int id_det_irq;
|
||||||
|
int vbus_det_irq;
|
||||||
|
int id_det;
|
||||||
|
int vbus_det;
|
||||||
|
struct delayed_work detect;
|
||||||
};
|
};
|
||||||
|
|
||||||
#define to_sun4i_usb_phy_data(phy) \
|
#define to_sun4i_usb_phy_data(phy) \
|
||||||
container_of((phy), struct sun4i_usb_phy_data, phys[(phy)->index])
|
container_of((phy), struct sun4i_usb_phy_data, phys[(phy)->index])
|
||||||
|
|
||||||
|
static void sun4i_usb_phy0_update_iscr(struct phy *_phy, u32 clr, u32 set)
|
||||||
|
{
|
||||||
|
struct sun4i_usb_phy *phy = phy_get_drvdata(_phy);
|
||||||
|
struct sun4i_usb_phy_data *data = to_sun4i_usb_phy_data(phy);
|
||||||
|
u32 iscr;
|
||||||
|
|
||||||
|
iscr = readl(data->base + REG_ISCR);
|
||||||
|
iscr &= ~clr;
|
||||||
|
iscr |= set;
|
||||||
|
writel(iscr, data->base + REG_ISCR);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void sun4i_usb_phy0_set_id_detect(struct phy *phy, u32 val)
|
||||||
|
{
|
||||||
|
if (val)
|
||||||
|
val = ISCR_FORCE_ID_HIGH;
|
||||||
|
else
|
||||||
|
val = ISCR_FORCE_ID_LOW;
|
||||||
|
|
||||||
|
sun4i_usb_phy0_update_iscr(phy, ISCR_FORCE_ID_MASK, val);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void sun4i_usb_phy0_set_vbus_detect(struct phy *phy, u32 val)
|
||||||
|
{
|
||||||
|
if (val)
|
||||||
|
val = ISCR_FORCE_VBUS_HIGH;
|
||||||
|
else
|
||||||
|
val = ISCR_FORCE_VBUS_LOW;
|
||||||
|
|
||||||
|
sun4i_usb_phy0_update_iscr(phy, ISCR_FORCE_VBUS_MASK, val);
|
||||||
|
}
|
||||||
|
|
||||||
static void sun4i_usb_phy_write(struct sun4i_usb_phy *phy, u32 addr, u32 data,
|
static void sun4i_usb_phy_write(struct sun4i_usb_phy *phy, u32 addr, u32 data,
|
||||||
int len)
|
int len)
|
||||||
{
|
{
|
||||||
struct sun4i_usb_phy_data *phy_data = to_sun4i_usb_phy_data(phy);
|
struct sun4i_usb_phy_data *phy_data = to_sun4i_usb_phy_data(phy);
|
||||||
u32 temp, usbc_bit = BIT(phy->index * 2);
|
u32 temp, usbc_bit = BIT(phy->index * 2);
|
||||||
|
void *phyctl;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
mutex_lock(&phy_data->mutex);
|
mutex_lock(&phy_data->mutex);
|
||||||
|
|
||||||
|
if (phy_data->has_a33_phyctl) {
|
||||||
|
phyctl = phy_data->base + REG_PHYCTL_A33;
|
||||||
|
/* A33 needs us to set phyctl to 0 explicitly */
|
||||||
|
writel(0, phyctl);
|
||||||
|
} else {
|
||||||
|
phyctl = phy_data->base + REG_PHYCTL_A10;
|
||||||
|
}
|
||||||
|
|
||||||
for (i = 0; i < len; i++) {
|
for (i = 0; i < len; i++) {
|
||||||
temp = readl(phy_data->base + REG_PHYCTL);
|
temp = readl(phyctl);
|
||||||
|
|
||||||
/* clear the address portion */
|
/* clear the address portion */
|
||||||
temp &= ~(0xff << 8);
|
temp &= ~(0xff << 8);
|
||||||
|
|
||||||
/* set the address */
|
/* set the address */
|
||||||
temp |= ((addr + i) << 8);
|
temp |= ((addr + i) << 8);
|
||||||
writel(temp, phy_data->base + REG_PHYCTL);
|
writel(temp, phyctl);
|
||||||
|
|
||||||
/* set the data bit and clear usbc bit*/
|
/* set the data bit and clear usbc bit*/
|
||||||
temp = readb(phy_data->base + REG_PHYCTL);
|
temp = readb(phyctl);
|
||||||
if (data & 0x1)
|
if (data & 0x1)
|
||||||
temp |= PHYCTL_DATA;
|
temp |= PHYCTL_DATA;
|
||||||
else
|
else
|
||||||
temp &= ~PHYCTL_DATA;
|
temp &= ~PHYCTL_DATA;
|
||||||
temp &= ~usbc_bit;
|
temp &= ~usbc_bit;
|
||||||
writeb(temp, phy_data->base + REG_PHYCTL);
|
writeb(temp, phyctl);
|
||||||
|
|
||||||
/* pulse usbc_bit */
|
/* pulse usbc_bit */
|
||||||
temp = readb(phy_data->base + REG_PHYCTL);
|
temp = readb(phyctl);
|
||||||
temp |= usbc_bit;
|
temp |= usbc_bit;
|
||||||
writeb(temp, phy_data->base + REG_PHYCTL);
|
writeb(temp, phyctl);
|
||||||
|
|
||||||
temp = readb(phy_data->base + REG_PHYCTL);
|
temp = readb(phyctl);
|
||||||
temp &= ~usbc_bit;
|
temp &= ~usbc_bit;
|
||||||
writeb(temp, phy_data->base + REG_PHYCTL);
|
writeb(temp, phyctl);
|
||||||
|
|
||||||
data >>= 1;
|
data >>= 1;
|
||||||
}
|
}
|
||||||
|
@ -171,12 +253,39 @@ static int sun4i_usb_phy_init(struct phy *_phy)
|
||||||
|
|
||||||
sun4i_usb_phy_passby(phy, 1);
|
sun4i_usb_phy_passby(phy, 1);
|
||||||
|
|
||||||
|
if (phy->index == 0) {
|
||||||
|
data->phy0_init = true;
|
||||||
|
|
||||||
|
/* Enable pull-ups */
|
||||||
|
sun4i_usb_phy0_update_iscr(_phy, 0, ISCR_DPDM_PULLUP_EN);
|
||||||
|
sun4i_usb_phy0_update_iscr(_phy, 0, ISCR_ID_PULLUP_EN);
|
||||||
|
|
||||||
|
if (data->id_det_gpio) {
|
||||||
|
/* OTG mode, force ISCR and cable state updates */
|
||||||
|
data->id_det = -1;
|
||||||
|
data->vbus_det = -1;
|
||||||
|
queue_delayed_work(system_wq, &data->detect, 0);
|
||||||
|
} else {
|
||||||
|
/* Host only mode */
|
||||||
|
sun4i_usb_phy0_set_id_detect(_phy, 0);
|
||||||
|
sun4i_usb_phy0_set_vbus_detect(_phy, 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int sun4i_usb_phy_exit(struct phy *_phy)
|
static int sun4i_usb_phy_exit(struct phy *_phy)
|
||||||
{
|
{
|
||||||
struct sun4i_usb_phy *phy = phy_get_drvdata(_phy);
|
struct sun4i_usb_phy *phy = phy_get_drvdata(_phy);
|
||||||
|
struct sun4i_usb_phy_data *data = to_sun4i_usb_phy_data(phy);
|
||||||
|
|
||||||
|
if (phy->index == 0) {
|
||||||
|
/* Disable pull-ups */
|
||||||
|
sun4i_usb_phy0_update_iscr(_phy, ISCR_DPDM_PULLUP_EN, 0);
|
||||||
|
sun4i_usb_phy0_update_iscr(_phy, ISCR_ID_PULLUP_EN, 0);
|
||||||
|
data->phy0_init = false;
|
||||||
|
}
|
||||||
|
|
||||||
sun4i_usb_phy_passby(phy, 0);
|
sun4i_usb_phy_passby(phy, 0);
|
||||||
reset_control_assert(phy->reset);
|
reset_control_assert(phy->reset);
|
||||||
|
@ -185,23 +294,74 @@ static int sun4i_usb_phy_exit(struct phy *_phy)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int sun4i_usb_phy0_get_vbus_det(struct sun4i_usb_phy_data *data)
|
||||||
|
{
|
||||||
|
if (data->vbus_det_gpio)
|
||||||
|
return gpiod_get_value_cansleep(data->vbus_det_gpio);
|
||||||
|
|
||||||
|
if (data->vbus_power_supply) {
|
||||||
|
union power_supply_propval val;
|
||||||
|
int r;
|
||||||
|
|
||||||
|
r = power_supply_get_property(data->vbus_power_supply,
|
||||||
|
POWER_SUPPLY_PROP_PRESENT, &val);
|
||||||
|
if (r == 0)
|
||||||
|
return val.intval;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Fallback: report vbus as high */
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool sun4i_usb_phy0_have_vbus_det(struct sun4i_usb_phy_data *data)
|
||||||
|
{
|
||||||
|
return data->vbus_det_gpio || data->vbus_power_supply;
|
||||||
|
}
|
||||||
|
|
||||||
static int sun4i_usb_phy_power_on(struct phy *_phy)
|
static int sun4i_usb_phy_power_on(struct phy *_phy)
|
||||||
{
|
{
|
||||||
struct sun4i_usb_phy *phy = phy_get_drvdata(_phy);
|
struct sun4i_usb_phy *phy = phy_get_drvdata(_phy);
|
||||||
int ret = 0;
|
struct sun4i_usb_phy_data *data = to_sun4i_usb_phy_data(phy);
|
||||||
|
int ret;
|
||||||
|
|
||||||
if (phy->vbus)
|
if (!phy->vbus || phy->regulator_on)
|
||||||
ret = regulator_enable(phy->vbus);
|
return 0;
|
||||||
|
|
||||||
return ret;
|
/* For phy0 only turn on Vbus if we don't have an ext. Vbus */
|
||||||
|
if (phy->index == 0 && sun4i_usb_phy0_have_vbus_det(data) &&
|
||||||
|
data->vbus_det)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
ret = regulator_enable(phy->vbus);
|
||||||
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
phy->regulator_on = true;
|
||||||
|
|
||||||
|
/* We must report Vbus high within OTG_TIME_A_WAIT_VRISE msec. */
|
||||||
|
if (phy->index == 0 && data->vbus_det_gpio && data->phy0_poll)
|
||||||
|
mod_delayed_work(system_wq, &data->detect, DEBOUNCE_TIME);
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int sun4i_usb_phy_power_off(struct phy *_phy)
|
static int sun4i_usb_phy_power_off(struct phy *_phy)
|
||||||
{
|
{
|
||||||
struct sun4i_usb_phy *phy = phy_get_drvdata(_phy);
|
struct sun4i_usb_phy *phy = phy_get_drvdata(_phy);
|
||||||
|
struct sun4i_usb_phy_data *data = to_sun4i_usb_phy_data(phy);
|
||||||
|
|
||||||
if (phy->vbus)
|
if (!phy->vbus || !phy->regulator_on)
|
||||||
regulator_disable(phy->vbus);
|
return 0;
|
||||||
|
|
||||||
|
regulator_disable(phy->vbus);
|
||||||
|
phy->regulator_on = false;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* phy0 vbus typically slowly discharges, sometimes this causes the
|
||||||
|
* Vbus gpio to not trigger an edge irq on Vbus off, so force a rescan.
|
||||||
|
*/
|
||||||
|
if (phy->index == 0 && data->vbus_det_gpio && !data->phy0_poll)
|
||||||
|
mod_delayed_work(system_wq, &data->detect, POLL_TIME);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -214,7 +374,7 @@ void sun4i_usb_phy_set_squelch_detect(struct phy *_phy, bool enabled)
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(sun4i_usb_phy_set_squelch_detect);
|
EXPORT_SYMBOL_GPL(sun4i_usb_phy_set_squelch_detect);
|
||||||
|
|
||||||
static struct phy_ops sun4i_usb_phy_ops = {
|
static const struct phy_ops sun4i_usb_phy_ops = {
|
||||||
.init = sun4i_usb_phy_init,
|
.init = sun4i_usb_phy_init,
|
||||||
.exit = sun4i_usb_phy_exit,
|
.exit = sun4i_usb_phy_exit,
|
||||||
.power_on = sun4i_usb_phy_power_on,
|
.power_on = sun4i_usb_phy_power_on,
|
||||||
|
@ -222,6 +382,95 @@ static struct phy_ops sun4i_usb_phy_ops = {
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static void sun4i_usb_phy0_id_vbus_det_scan(struct work_struct *work)
|
||||||
|
{
|
||||||
|
struct sun4i_usb_phy_data *data =
|
||||||
|
container_of(work, struct sun4i_usb_phy_data, detect.work);
|
||||||
|
struct phy *phy0 = data->phys[0].phy;
|
||||||
|
int id_det, vbus_det, id_notify = 0, vbus_notify = 0;
|
||||||
|
|
||||||
|
id_det = gpiod_get_value_cansleep(data->id_det_gpio);
|
||||||
|
vbus_det = sun4i_usb_phy0_get_vbus_det(data);
|
||||||
|
|
||||||
|
mutex_lock(&phy0->mutex);
|
||||||
|
|
||||||
|
if (!data->phy0_init) {
|
||||||
|
mutex_unlock(&phy0->mutex);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (id_det != data->id_det) {
|
||||||
|
/*
|
||||||
|
* When a host cable (id == 0) gets plugged in on systems
|
||||||
|
* without vbus detection report vbus low for long enough for
|
||||||
|
* the musb-ip to end the current device session.
|
||||||
|
*/
|
||||||
|
if (!sun4i_usb_phy0_have_vbus_det(data) && id_det == 0) {
|
||||||
|
sun4i_usb_phy0_set_vbus_detect(phy0, 0);
|
||||||
|
msleep(200);
|
||||||
|
sun4i_usb_phy0_set_vbus_detect(phy0, 1);
|
||||||
|
}
|
||||||
|
sun4i_usb_phy0_set_id_detect(phy0, id_det);
|
||||||
|
data->id_det = id_det;
|
||||||
|
id_notify = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (vbus_det != data->vbus_det) {
|
||||||
|
sun4i_usb_phy0_set_vbus_detect(phy0, vbus_det);
|
||||||
|
data->vbus_det = vbus_det;
|
||||||
|
vbus_notify = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
mutex_unlock(&phy0->mutex);
|
||||||
|
|
||||||
|
if (id_notify) {
|
||||||
|
extcon_set_cable_state_(data->extcon, EXTCON_USB_HOST,
|
||||||
|
!id_det);
|
||||||
|
/*
|
||||||
|
* When a host cable gets unplugged (id == 1) on systems
|
||||||
|
* without vbus detection report vbus low for long enough to
|
||||||
|
* the musb-ip to end the current host session.
|
||||||
|
*/
|
||||||
|
if (!sun4i_usb_phy0_have_vbus_det(data) && id_det == 1) {
|
||||||
|
mutex_lock(&phy0->mutex);
|
||||||
|
sun4i_usb_phy0_set_vbus_detect(phy0, 0);
|
||||||
|
msleep(1000);
|
||||||
|
sun4i_usb_phy0_set_vbus_detect(phy0, 1);
|
||||||
|
mutex_unlock(&phy0->mutex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (vbus_notify)
|
||||||
|
extcon_set_cable_state_(data->extcon, EXTCON_USB, vbus_det);
|
||||||
|
|
||||||
|
if (data->phy0_poll)
|
||||||
|
queue_delayed_work(system_wq, &data->detect, POLL_TIME);
|
||||||
|
}
|
||||||
|
|
||||||
|
static irqreturn_t sun4i_usb_phy0_id_vbus_det_irq(int irq, void *dev_id)
|
||||||
|
{
|
||||||
|
struct sun4i_usb_phy_data *data = dev_id;
|
||||||
|
|
||||||
|
/* vbus or id changed, let the pins settle and then scan them */
|
||||||
|
mod_delayed_work(system_wq, &data->detect, DEBOUNCE_TIME);
|
||||||
|
|
||||||
|
return IRQ_HANDLED;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int sun4i_usb_phy0_vbus_notify(struct notifier_block *nb,
|
||||||
|
unsigned long val, void *v)
|
||||||
|
{
|
||||||
|
struct sun4i_usb_phy_data *data =
|
||||||
|
container_of(nb, struct sun4i_usb_phy_data, vbus_power_nb);
|
||||||
|
struct power_supply *psy = v;
|
||||||
|
|
||||||
|
/* Properties on the vbus_power_supply changed, scan vbus_det */
|
||||||
|
if (val == PSY_EVENT_PROP_CHANGED && psy == data->vbus_power_supply)
|
||||||
|
mod_delayed_work(system_wq, &data->detect, DEBOUNCE_TIME);
|
||||||
|
|
||||||
|
return NOTIFY_OK;
|
||||||
|
}
|
||||||
|
|
||||||
static struct phy *sun4i_usb_phy_xlate(struct device *dev,
|
static struct phy *sun4i_usb_phy_xlate(struct device *dev,
|
||||||
struct of_phandle_args *args)
|
struct of_phandle_args *args)
|
||||||
{
|
{
|
||||||
|
@ -233,6 +482,29 @@ static struct phy *sun4i_usb_phy_xlate(struct device *dev,
|
||||||
return data->phys[args->args[0]].phy;
|
return data->phys[args->args[0]].phy;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int sun4i_usb_phy_remove(struct platform_device *pdev)
|
||||||
|
{
|
||||||
|
struct device *dev = &pdev->dev;
|
||||||
|
struct sun4i_usb_phy_data *data = dev_get_drvdata(dev);
|
||||||
|
|
||||||
|
if (data->vbus_power_nb_registered)
|
||||||
|
power_supply_unreg_notifier(&data->vbus_power_nb);
|
||||||
|
if (data->id_det_irq >= 0)
|
||||||
|
devm_free_irq(dev, data->id_det_irq, data);
|
||||||
|
if (data->vbus_det_irq >= 0)
|
||||||
|
devm_free_irq(dev, data->vbus_det_irq, data);
|
||||||
|
|
||||||
|
cancel_delayed_work_sync(&data->detect);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static const unsigned int sun4i_usb_phy0_cable[] = {
|
||||||
|
EXTCON_USB,
|
||||||
|
EXTCON_USB_HOST,
|
||||||
|
EXTCON_NONE,
|
||||||
|
};
|
||||||
|
|
||||||
static int sun4i_usb_phy_probe(struct platform_device *pdev)
|
static int sun4i_usb_phy_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct sun4i_usb_phy_data *data;
|
struct sun4i_usb_phy_data *data;
|
||||||
|
@ -241,35 +513,87 @@ static int sun4i_usb_phy_probe(struct platform_device *pdev)
|
||||||
struct phy_provider *phy_provider;
|
struct phy_provider *phy_provider;
|
||||||
bool dedicated_clocks;
|
bool dedicated_clocks;
|
||||||
struct resource *res;
|
struct resource *res;
|
||||||
int i;
|
int i, ret;
|
||||||
|
|
||||||
data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
|
data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
|
||||||
if (!data)
|
if (!data)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
mutex_init(&data->mutex);
|
mutex_init(&data->mutex);
|
||||||
|
INIT_DELAYED_WORK(&data->detect, sun4i_usb_phy0_id_vbus_det_scan);
|
||||||
|
dev_set_drvdata(dev, data);
|
||||||
|
|
||||||
if (of_device_is_compatible(np, "allwinner,sun5i-a13-usb-phy"))
|
if (of_device_is_compatible(np, "allwinner,sun5i-a13-usb-phy") ||
|
||||||
|
of_device_is_compatible(np, "allwinner,sun8i-a23-usb-phy") ||
|
||||||
|
of_device_is_compatible(np, "allwinner,sun8i-a33-usb-phy"))
|
||||||
data->num_phys = 2;
|
data->num_phys = 2;
|
||||||
else
|
else
|
||||||
data->num_phys = 3;
|
data->num_phys = 3;
|
||||||
|
|
||||||
if (of_device_is_compatible(np, "allwinner,sun4i-a10-usb-phy") ||
|
if (of_device_is_compatible(np, "allwinner,sun5i-a13-usb-phy") ||
|
||||||
of_device_is_compatible(np, "allwinner,sun6i-a31-usb-phy"))
|
of_device_is_compatible(np, "allwinner,sun7i-a20-usb-phy"))
|
||||||
data->disc_thresh = 3;
|
|
||||||
else
|
|
||||||
data->disc_thresh = 2;
|
data->disc_thresh = 2;
|
||||||
|
else
|
||||||
|
data->disc_thresh = 3;
|
||||||
|
|
||||||
if (of_device_is_compatible(np, "allwinner,sun6i-a31-usb-phy"))
|
if (of_device_is_compatible(np, "allwinner,sun6i-a31-usb-phy") ||
|
||||||
|
of_device_is_compatible(np, "allwinner,sun8i-a23-usb-phy") ||
|
||||||
|
of_device_is_compatible(np, "allwinner,sun8i-a33-usb-phy"))
|
||||||
dedicated_clocks = true;
|
dedicated_clocks = true;
|
||||||
else
|
else
|
||||||
dedicated_clocks = false;
|
dedicated_clocks = false;
|
||||||
|
|
||||||
|
if (of_device_is_compatible(np, "allwinner,sun8i-a33-usb-phy"))
|
||||||
|
data->has_a33_phyctl = true;
|
||||||
|
|
||||||
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phy_ctrl");
|
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phy_ctrl");
|
||||||
data->base = devm_ioremap_resource(dev, res);
|
data->base = devm_ioremap_resource(dev, res);
|
||||||
if (IS_ERR(data->base))
|
if (IS_ERR(data->base))
|
||||||
return PTR_ERR(data->base);
|
return PTR_ERR(data->base);
|
||||||
|
|
||||||
|
data->id_det_gpio = devm_gpiod_get(dev, "usb0_id_det", GPIOD_IN);
|
||||||
|
if (IS_ERR(data->id_det_gpio)) {
|
||||||
|
if (PTR_ERR(data->id_det_gpio) == -EPROBE_DEFER)
|
||||||
|
return -EPROBE_DEFER;
|
||||||
|
data->id_det_gpio = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
data->vbus_det_gpio = devm_gpiod_get(dev, "usb0_vbus_det", GPIOD_IN);
|
||||||
|
if (IS_ERR(data->vbus_det_gpio)) {
|
||||||
|
if (PTR_ERR(data->vbus_det_gpio) == -EPROBE_DEFER)
|
||||||
|
return -EPROBE_DEFER;
|
||||||
|
data->vbus_det_gpio = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (of_find_property(np, "usb0_vbus_power-supply", NULL)) {
|
||||||
|
data->vbus_power_supply = devm_power_supply_get_by_phandle(dev,
|
||||||
|
"usb0_vbus_power-supply");
|
||||||
|
if (IS_ERR(data->vbus_power_supply))
|
||||||
|
return PTR_ERR(data->vbus_power_supply);
|
||||||
|
|
||||||
|
if (!data->vbus_power_supply)
|
||||||
|
return -EPROBE_DEFER;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* vbus_det without id_det makes no sense, and is not supported */
|
||||||
|
if (sun4i_usb_phy0_have_vbus_det(data) && !data->id_det_gpio) {
|
||||||
|
dev_err(dev, "usb0_id_det missing or invalid\n");
|
||||||
|
return -ENODEV;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (data->id_det_gpio) {
|
||||||
|
data->extcon = devm_extcon_dev_allocate(dev,
|
||||||
|
sun4i_usb_phy0_cable);
|
||||||
|
if (IS_ERR(data->extcon))
|
||||||
|
return PTR_ERR(data->extcon);
|
||||||
|
|
||||||
|
ret = devm_extcon_dev_register(dev, data->extcon);
|
||||||
|
if (ret) {
|
||||||
|
dev_err(dev, "failed to register extcon: %d\n", ret);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
for (i = 0; i < data->num_phys; i++) {
|
for (i = 0; i < data->num_phys; i++) {
|
||||||
struct sun4i_usb_phy *phy = data->phys + i;
|
struct sun4i_usb_phy *phy = data->phys + i;
|
||||||
char name[16];
|
char name[16];
|
||||||
|
@ -319,10 +643,54 @@ static int sun4i_usb_phy_probe(struct platform_device *pdev)
|
||||||
phy_set_drvdata(phy->phy, &data->phys[i]);
|
phy_set_drvdata(phy->phy, &data->phys[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
dev_set_drvdata(dev, data);
|
data->id_det_irq = gpiod_to_irq(data->id_det_gpio);
|
||||||
phy_provider = devm_of_phy_provider_register(dev, sun4i_usb_phy_xlate);
|
data->vbus_det_irq = gpiod_to_irq(data->vbus_det_gpio);
|
||||||
|
if ((data->id_det_gpio && data->id_det_irq < 0) ||
|
||||||
|
(data->vbus_det_gpio && data->vbus_det_irq < 0))
|
||||||
|
data->phy0_poll = true;
|
||||||
|
|
||||||
return PTR_ERR_OR_ZERO(phy_provider);
|
if (data->id_det_irq >= 0) {
|
||||||
|
ret = devm_request_irq(dev, data->id_det_irq,
|
||||||
|
sun4i_usb_phy0_id_vbus_det_irq,
|
||||||
|
IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
|
||||||
|
"usb0-id-det", data);
|
||||||
|
if (ret) {
|
||||||
|
dev_err(dev, "Err requesting id-det-irq: %d\n", ret);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (data->vbus_det_irq >= 0) {
|
||||||
|
ret = devm_request_irq(dev, data->vbus_det_irq,
|
||||||
|
sun4i_usb_phy0_id_vbus_det_irq,
|
||||||
|
IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
|
||||||
|
"usb0-vbus-det", data);
|
||||||
|
if (ret) {
|
||||||
|
dev_err(dev, "Err requesting vbus-det-irq: %d\n", ret);
|
||||||
|
data->vbus_det_irq = -1;
|
||||||
|
sun4i_usb_phy_remove(pdev); /* Stop detect work */
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (data->vbus_power_supply) {
|
||||||
|
data->vbus_power_nb.notifier_call = sun4i_usb_phy0_vbus_notify;
|
||||||
|
data->vbus_power_nb.priority = 0;
|
||||||
|
ret = power_supply_reg_notifier(&data->vbus_power_nb);
|
||||||
|
if (ret) {
|
||||||
|
sun4i_usb_phy_remove(pdev); /* Stop detect work */
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
data->vbus_power_nb_registered = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
phy_provider = devm_of_phy_provider_register(dev, sun4i_usb_phy_xlate);
|
||||||
|
if (IS_ERR(phy_provider)) {
|
||||||
|
sun4i_usb_phy_remove(pdev); /* Stop detect work */
|
||||||
|
return PTR_ERR(phy_provider);
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct of_device_id sun4i_usb_phy_of_match[] = {
|
static const struct of_device_id sun4i_usb_phy_of_match[] = {
|
||||||
|
@ -330,12 +698,15 @@ static const struct of_device_id sun4i_usb_phy_of_match[] = {
|
||||||
{ .compatible = "allwinner,sun5i-a13-usb-phy" },
|
{ .compatible = "allwinner,sun5i-a13-usb-phy" },
|
||||||
{ .compatible = "allwinner,sun6i-a31-usb-phy" },
|
{ .compatible = "allwinner,sun6i-a31-usb-phy" },
|
||||||
{ .compatible = "allwinner,sun7i-a20-usb-phy" },
|
{ .compatible = "allwinner,sun7i-a20-usb-phy" },
|
||||||
|
{ .compatible = "allwinner,sun8i-a23-usb-phy" },
|
||||||
|
{ .compatible = "allwinner,sun8i-a33-usb-phy" },
|
||||||
{ },
|
{ },
|
||||||
};
|
};
|
||||||
MODULE_DEVICE_TABLE(of, sun4i_usb_phy_of_match);
|
MODULE_DEVICE_TABLE(of, sun4i_usb_phy_of_match);
|
||||||
|
|
||||||
static struct platform_driver sun4i_usb_phy_driver = {
|
static struct platform_driver sun4i_usb_phy_driver = {
|
||||||
.probe = sun4i_usb_phy_probe,
|
.probe = sun4i_usb_phy_probe,
|
||||||
|
.remove = sun4i_usb_phy_remove,
|
||||||
.driver = {
|
.driver = {
|
||||||
.of_match_table = sun4i_usb_phy_of_match,
|
.of_match_table = sun4i_usb_phy_of_match,
|
||||||
.name = "sun4i-usb-phy",
|
.name = "sun4i-usb-phy",
|
||||||
|
|
|
@ -114,7 +114,7 @@ static int sun9i_usb_phy_exit(struct phy *_phy)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct phy_ops sun9i_usb_phy_ops = {
|
static const struct phy_ops sun9i_usb_phy_ops = {
|
||||||
.init = sun9i_usb_phy_init,
|
.init = sun9i_usb_phy_init,
|
||||||
.exit = sun9i_usb_phy_exit,
|
.exit = sun9i_usb_phy_exit,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
|
|
|
@ -298,7 +298,7 @@ static int ti_pipe3_exit(struct phy *x)
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
static struct phy_ops ops = {
|
static const struct phy_ops ops = {
|
||||||
.init = ti_pipe3_init,
|
.init = ti_pipe3_init,
|
||||||
.exit = ti_pipe3_exit,
|
.exit = ti_pipe3_exit,
|
||||||
.power_on = ti_pipe3_power_on,
|
.power_on = ti_pipe3_power_on,
|
||||||
|
|
|
@ -53,7 +53,7 @@ static int tusb1210_power_off(struct phy *phy)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct phy_ops phy_ops = {
|
static const struct phy_ops phy_ops = {
|
||||||
.power_on = tusb1210_power_on,
|
.power_on = tusb1210_power_on,
|
||||||
.power_off = tusb1210_power_off,
|
.power_off = tusb1210_power_off,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
* and it's controller, which is always the parent.
|
* and it's controller, which is always the parent.
|
||||||
*/
|
*/
|
||||||
static inline struct phy
|
static inline struct phy
|
||||||
*ulpi_phy_create(struct ulpi *ulpi, struct phy_ops *ops)
|
*ulpi_phy_create(struct ulpi *ulpi, const struct phy_ops *ops)
|
||||||
{
|
{
|
||||||
struct phy *phy;
|
struct phy *phy;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
Loading…
Reference in New Issue