Author: manu
Date: Sat Sep 16 15:58:20 2017
New Revision: 323641
URL: https://svnweb.freebsd.org/changeset/base/323641
Log:
Allwinner usb phy: Rework resource allocation
The usbphy node for allwinner have two kind of resources, one for the
phy_ctrl and one per phy. Instead of blindy allocating resources, alloc
the phy_ctrl and pmu ones separately.
Also add a configuration struct for all different phy that hold the difference
between them (number of phys, unknow needed register write etc ...).
While here remove A83T code as upstream and FreeBSD dts don't have
nodes for USB.
This (plus 323640) re-enable OHCI on Pine64 on the bottom USB port.
The top USB port is routed to the OHCI0/EHCI0 which is by default in OTG mode.
While the phy code can handle the re-route to standard OHCI/EHCI we still need
a driver for musb to probe and configure it in host mode.
EHCI is still buggy on Pine64 (hang the board) so do not enable it for now.
Tested On: Bananapi (A20), BananapiM2 (A31S), OrangePi One (H3) Pine64
(A64)
Modified:
head/sys/arm/allwinner/aw_usbphy.c
Modified: head/sys/arm/allwinner/aw_usbphy.c
==============================================================================
--- head/sys/arm/allwinner/aw_usbphy.c Sat Sep 16 15:50:31 2017
(r323640)
+++ head/sys/arm/allwinner/aw_usbphy.c Sat Sep 16 15:58:20 2017
(r323641)
@@ -53,53 +53,90 @@ __FBSDID("$FreeBSD$");
#include "phy_if.h"
-#define USBPHY_NPHYS 4
-#define USBPHY_NRES USBPHY_NPHYS
-
enum awusbphy_type {
AWUSBPHY_TYPE_A10 = 1,
AWUSBPHY_TYPE_A13,
AWUSBPHY_TYPE_A20,
AWUSBPHY_TYPE_A31,
- AWUSBPHY_TYPE_A83T,
AWUSBPHY_TYPE_H3,
AWUSBPHY_TYPE_A64
};
+struct aw_usbphy_conf {
+ int num_phys;
+ enum awusbphy_type phy_type;
+ bool pmu_unk1;
+ bool phy0_route;
+};
+
+static const struct aw_usbphy_conf a10_usbphy_conf = {
+ .num_phys = 3,
+ .phy_type = AWUSBPHY_TYPE_A10,
+ .pmu_unk1 = false,
+ .phy0_route = false,
+};
+
+static const struct aw_usbphy_conf a13_usbphy_conf = {
+ .num_phys = 2,
+ .phy_type = AWUSBPHY_TYPE_A13,
+ .pmu_unk1 = false,
+ .phy0_route = false,
+};
+
+static const struct aw_usbphy_conf a20_usbphy_conf = {
+ .num_phys = 3,
+ .phy_type = AWUSBPHY_TYPE_A20,
+ .pmu_unk1 = false,
+ .phy0_route = false,
+};
+
+static const struct aw_usbphy_conf a31_usbphy_conf = {
+ .num_phys = 3,
+ .phy_type = AWUSBPHY_TYPE_A31,
+ .pmu_unk1 = false,
+ .phy0_route = false,
+};
+
+static const struct aw_usbphy_conf h3_usbphy_conf = {
+ .num_phys = 4,
+ .phy_type = AWUSBPHY_TYPE_H3,
+ .pmu_unk1 = true,
+ .phy0_route = false,
+};
+
+static const struct aw_usbphy_conf a64_usbphy_conf = {
+ .num_phys = 2,
+ .phy_type = AWUSBPHY_TYPE_A64,
+ .pmu_unk1 = true,
+ .phy0_route = true,
+};
+
static struct ofw_compat_data compat_data[] = {
- { "allwinner,sun4i-a10-usb-phy", AWUSBPHY_TYPE_A10 },
- { "allwinner,sun5i-a13-usb-phy", AWUSBPHY_TYPE_A13 },
- { "allwinner,sun6i-a31-usb-phy", AWUSBPHY_TYPE_A31 },
- { "allwinner,sun7i-a20-usb-phy", AWUSBPHY_TYPE_A20 },
- { "allwinner,sun8i-a83t-usb-phy", AWUSBPHY_TYPE_A83T },
- { "allwinner,sun8i-h3-usb-phy", AWUSBPHY_TYPE_H3 },
- { "allwinner,sun50i-a64-usb-phy", AWUSBPHY_TYPE_A64 },
+ { "allwinner,sun4i-a10-usb-phy", (uintptr_t)&a10_usbphy_conf },
+ { "allwinner,sun5i-a13-usb-phy", (uintptr_t)&a13_usbphy_conf },
+ { "allwinner,sun6i-a31-usb-phy", (uintptr_t)&a31_usbphy_conf },
+ { "allwinner,sun7i-a20-usb-phy", (uintptr_t)&a20_usbphy_conf },
+ { "allwinner,sun8i-h3-usb-phy", (uintptr_t)&h3_usbphy_conf },
+ { "allwinner,sun50i-a64-usb-phy", (uintptr_t)&a64_usbphy_conf },
{ NULL, 0 }
};
struct awusbphy_softc {
- struct resource * res[USBPHY_NRES];
- regulator_t reg[USBPHY_NPHYS];
+ struct resource * phy_ctrl;
+ struct resource ** pmu;
+ regulator_t * reg;
gpio_pin_t id_det_pin;
int id_det_valid;
gpio_pin_t vbus_det_pin;
int vbus_det_valid;
- enum awusbphy_type phy_type;
+ struct aw_usbphy_conf *phy_conf;
};
-static struct resource_spec awusbphy_spec[] = {
- { SYS_RES_MEMORY, 0, RF_ACTIVE },
- { SYS_RES_MEMORY, 1, RF_ACTIVE },
- { SYS_RES_MEMORY, 2, RF_ACTIVE | RF_OPTIONAL },
- { SYS_RES_MEMORY, 3, RF_ACTIVE | RF_OPTIONAL },
- { -1, 0 }
-};
+#define RD4(res, o) bus_read_4(res, (o))
+#define WR4(res, o, v) bus_write_4(res, (o), (v))
+#define CLR4(res, o, m) WR4(res, o, RD4(res, o) & ~(m))
+#define SET4(res, o, m) WR4(res, o, RD4(res, o) | (m))
-#define RD4(sc, i, o) bus_read_4((sc)->res[(i)], (o))
-#define WR4(sc, i, o, v) bus_write_4((sc)->res[(i)], (o), (v))
-#define CLR4(sc, i, o, m) WR4(sc, i, o, RD4(sc, i, o) & ~(m))
-#define SET4(sc, i, o, m) WR4(sc, i, o, RD4(sc, i, o) | (m))
-
#define OTG_PHY_CFG 0x20
#define OTG_PHY_ROUTE_OTG (1 << 0)
#define PMU_IRQ_ENABLE 0x00
@@ -117,24 +154,21 @@ awusbphy_configure(device_t dev, int phyno)
sc = device_get_softc(dev);
- if (sc->res[phyno] == NULL)
+ if (sc->pmu[phyno] == NULL)
return;
- if (sc->phy_type == AWUSBPHY_TYPE_A64) {
- CLR4(sc, phyno, PMU_UNK_H3, PMU_UNK_H3_CLR);
+ if (sc->phy_conf->pmu_unk1 == true)
+ CLR4(sc->phy_ctrl, PMU_UNK_H3, PMU_UNK_H3_CLR);
- /* EHCI0 and OTG share a PHY */
+ if (sc->phy_conf->phy0_route == true) {
if (phyno == 0)
- SET4(sc, 0, OTG_PHY_CFG, OTG_PHY_ROUTE_OTG);
- else if (phyno == 1)
- CLR4(sc, 0, OTG_PHY_CFG, OTG_PHY_ROUTE_OTG);
+ SET4(sc->phy_ctrl, OTG_PHY_CFG, OTG_PHY_ROUTE_OTG);
+ else
+ CLR4(sc->phy_ctrl, OTG_PHY_CFG, OTG_PHY_ROUTE_OTG);
}
- if (phyno > 0) {
- /* Enable passby */
- SET4(sc, phyno, PMU_IRQ_ENABLE, PMU_ULPI_BYPASS |
- PMU_AHB_INCR8 | PMU_AHB_INCR4 | PMU_AHB_INCRX_ALIGN);
- }
+ SET4(sc->pmu[phyno], PMU_IRQ_ENABLE, PMU_ULPI_BYPASS |
+ PMU_AHB_INCR8 | PMU_AHB_INCR4 | PMU_AHB_INCRX_ALIGN);
}
static int
@@ -143,7 +177,7 @@ awusbphy_init(device_t dev)
struct awusbphy_softc *sc;
phandle_t node;
char pname[20];
- int error, off;
+ int error, off, rid;
regulator_t reg;
hwreset_t rst;
clk_t clk;
@@ -151,8 +185,20 @@ awusbphy_init(device_t dev)
sc = device_get_softc(dev);
node = ofw_bus_get_node(dev);
- sc->phy_type = ofw_bus_search_compatible(dev, compat_data)->ocd_data;
+ sc->phy_conf = (struct aw_usbphy_conf *)ofw_bus_search_compatible(dev,
compat_data)->ocd_data;
+ /* Get phy_ctrl region */
+ if (ofw_bus_find_string_index(node, "reg-names", "phy_ctrl", &rid) !=
0) {
+ device_printf(dev, "Cannot locate phy control resource\n");
+ return (ENXIO);
+ }
+ sc->phy_ctrl = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
+ RF_ACTIVE);
+ if (sc->phy_ctrl == NULL) {
+ device_printf(dev, "Cannot allocate resource\n");
+ return (ENXIO);
+ }
+
/* Enable clocks */
for (off = 0; clk_get_by_ofw_index(dev, 0, off, &clk) == 0; off++) {
error = clk_enable(clk);
@@ -173,13 +219,6 @@ awusbphy_init(device_t dev)
}
}
- /* Get regulators */
- for (off = 0; off < USBPHY_NPHYS; off++) {
- snprintf(pname, sizeof(pname), "usb%d_vbus-supply", off);
- if (regulator_get_by_ofw_property(dev, 0, pname, ®) == 0)
- sc->reg[off] = reg;
- }
-
/* Get GPIOs */
error = gpio_pin_get_by_ofw_property(dev, node, "usb0_id_det-gpios",
&sc->id_det_pin);
@@ -190,10 +229,29 @@ awusbphy_init(device_t dev)
if (error == 0)
sc->vbus_det_valid = 1;
- /* Allocate resources */
- if (bus_alloc_resources(dev, awusbphy_spec, sc->res) != 0)
- device_printf(dev, "couldn't allocate resources\n");
+ sc->reg = malloc(sizeof(*(sc->reg)) * sc->phy_conf->num_phys, M_DEVBUF,
+ M_WAITOK | M_ZERO);
+ sc->pmu = malloc(sizeof(*(sc->pmu)) * sc->phy_conf->num_phys, M_DEVBUF,
+ M_WAITOK | M_ZERO);
+ /* Get regulators */
+ for (off = 0; off < sc->phy_conf->num_phys; off++) {
+ snprintf(pname, sizeof(pname), "usb%d_vbus-supply", off);
+ if (regulator_get_by_ofw_property(dev, 0, pname, ®) == 0)
+ sc->reg[off] = reg;
+ snprintf(pname, sizeof(pname), "pmu%d", off);
+ if (ofw_bus_find_string_index(node, "reg-names",
+ pname, &rid) != 0)
+ continue;
+
+ sc->pmu[off] = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
+ RF_ACTIVE);
+ if (sc->pmu[off] == NULL) {
+ device_printf(dev, "Cannot allocate resource\n");
+ return (ENXIO);
+ }
+ }
+
return (0);
}
@@ -225,10 +283,10 @@ awusbphy_phy_enable(device_t dev, intptr_t phy, bool e
regulator_t reg;
int error, vbus_det;
- if (phy < 0 || phy >= USBPHY_NPHYS)
- return (ERANGE);
-
sc = device_get_softc(dev);
+
+ if (phy < 0 || phy >= sc->phy_conf->num_phys)
+ return (ERANGE);
/* Configure PHY */
awusbphy_configure(dev, phy);
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
