GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-19 21:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

usb: sunxi: access ahb_reset0_cfg in CCM using its offset

Browse source 
struct sunxi_ccm_reg doesn't have ahb_reset0_cfg on sun4i and sun5i,
thus compilation fails with:

drivers/usb/host/ohci-sunxi.c:96:26: error: 'struct sunxi_ccm_reg' has
no member named 'ahb_reset0_cfg'

Access this reg using its offset to fix this issue.

Fixes commit 1ed9c1118 ("usb: sunxi: ehci: get rid of ifdefs")
and commit 56830cee3 ("usb: sunxi: ohci: get rid of ifdefs")

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
This commit is contained in:
Vasily Khoruzhick 2018-06-13 23:19:34 -07:00 • committed by Marek Vasut
parent 11bb62768d
commit b9f34757db
2 changed files with 37 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/usb/host/ehci-sunxi.c
View file

@ -22,14 +22,19 @@
#define AHB_CLK_DIST 1 #define AHB_CLK_DIST 1
#endif #endif
#define SUN6I_AHB_RESET0_CFG_OFFSET 0x2c0
#define SUN9I_AHB_RESET0_CFG_OFFSET 0x5a0
struct ehci_sunxi_cfg { struct ehci_sunxi_cfg {
bool has_reset; bool has_reset;
u32 extra_ahb_gate_mask; u32 extra_ahb_gate_mask;
u32 reset0_cfg_offset;
}; };
struct ehci_sunxi_priv { struct ehci_sunxi_priv {
struct ehci_ctrl ehci; struct ehci_ctrl ehci;
struct sunxi_ccm_reg *ccm; struct sunxi_ccm_reg *ccm;
u32 *reset0_cfg;
int ahb_gate_mask; /* Mask of ahb_gate0 clk gate bits for this hcd */ int ahb_gate_mask; /* Mask of ahb_gate0 clk gate bits for this hcd */
struct phy phy; struct phy phy;
const struct ehci_sunxi_cfg *cfg; const struct ehci_sunxi_cfg *cfg;
@ -49,6 +54,9 @@ static int ehci_usb_probe(struct udevice *dev)
if (IS_ERR(priv->ccm)) if (IS_ERR(priv->ccm))
return PTR_ERR(priv->ccm); return PTR_ERR(priv->ccm);
priv->reset0_cfg = (void *)priv->ccm +
priv->cfg->reset0_cfg_offset;
phys = dev_count_phandle_with_args(dev, "phys", "#phy-cells"); phys = dev_count_phandle_with_args(dev, "phys", "#phy-cells");
if (phys < 0) { if (phys < 0) {
phys = 0; phys = 0;
@ -86,7 +94,7 @@ no_phy:
setbits_le32(&priv->ccm->ahb_gate0, setbits_le32(&priv->ccm->ahb_gate0,
priv->ahb_gate_mask | extra_ahb_gate_mask); priv->ahb_gate_mask | extra_ahb_gate_mask);
if (priv->cfg->has_reset) if (priv->cfg->has_reset)
setbits_le32(&priv->ccm->ahb_reset0_cfg, setbits_le32(priv->reset0_cfg,
priv->ahb_gate_mask | extra_ahb_gate_mask); priv->ahb_gate_mask | extra_ahb_gate_mask);
hcor = (struct ehci_hcor *)((uintptr_t)hccr + hcor = (struct ehci_hcor *)((uintptr_t)hccr +
@ -113,7 +121,7 @@ static int ehci_usb_remove(struct udevice *dev)
return ret; return ret;
if (priv->cfg->has_reset) if (priv->cfg->has_reset)
clrbits_le32(&priv->ccm->ahb_reset0_cfg, priv->ahb_gate_mask); clrbits_le32(priv->reset0_cfg, priv->ahb_gate_mask);
clrbits_le32(&priv->ccm->ahb_gate0, priv->ahb_gate_mask); clrbits_le32(&priv->ccm->ahb_gate0, priv->ahb_gate_mask);
return 0; return 0;
@ -125,11 +133,18 @@ static const struct ehci_sunxi_cfg sun4i_a10_cfg = {
static const struct ehci_sunxi_cfg sun6i_a31_cfg = { static const struct ehci_sunxi_cfg sun6i_a31_cfg = {
.has_reset = true, .has_reset = true,
.reset0_cfg_offset = SUN6I_AHB_RESET0_CFG_OFFSET,
}; };
static const struct ehci_sunxi_cfg sun8i_h3_cfg = { static const struct ehci_sunxi_cfg sun8i_h3_cfg = {
.has_reset = true, .has_reset = true,
.extra_ahb_gate_mask = 1 << AHB_GATE_OFFSET_USB_OHCI0, .extra_ahb_gate_mask = 1 << AHB_GATE_OFFSET_USB_OHCI0,
.reset0_cfg_offset = SUN6I_AHB_RESET0_CFG_OFFSET,
};
static const struct ehci_sunxi_cfg sun9i_a80_cfg = {
.has_reset = true,
.reset0_cfg_offset = SUN9I_AHB_RESET0_CFG_OFFSET,
}; };
static const struct udevice_id ehci_usb_ids[] = { static const struct udevice_id ehci_usb_ids[] = {
@ -163,7 +178,7 @@ static const struct udevice_id ehci_usb_ids[] = {
}, },
{ {
.compatible = "allwinner,sun9i-a80-ehci", .compatible = "allwinner,sun9i-a80-ehci",
.data = (ulong)&sun6i_a31_cfg, .data = (ulong)&sun9i_a80_cfg,
}, },
{ {
.compatible = "allwinner,sun50i-a64-ehci", .compatible = "allwinner,sun50i-a64-ehci",

22
drivers/usb/host/ohci-sunxi.c
View file

@ -22,14 +22,19 @@
#define AHB_CLK_DIST 1 #define AHB_CLK_DIST 1
#endif #endif
#define SUN6I_AHB_RESET0_CFG_OFFSET 0x2c0
#define SUN9I_AHB_RESET0_CFG_OFFSET 0x5a0
struct ohci_sunxi_cfg { struct ohci_sunxi_cfg {
bool has_reset; bool has_reset;
u32 extra_ahb_gate_mask; u32 extra_ahb_gate_mask;
u32 extra_usb_gate_mask; u32 extra_usb_gate_mask;
u32 reset0_cfg_offset;
}; };
struct ohci_sunxi_priv { struct ohci_sunxi_priv {
struct sunxi_ccm_reg *ccm; struct sunxi_ccm_reg *ccm;
u32 *reset0_cfg;
ohci_t ohci; ohci_t ohci;
int ahb_gate_mask; /* Mask of ahb_gate0 clk gate bits for this hcd */ int ahb_gate_mask; /* Mask of ahb_gate0 clk gate bits for this hcd */
int usb_gate_mask; /* Mask of usb_clk_cfg clk gate bits for this hcd */ int usb_gate_mask; /* Mask of usb_clk_cfg clk gate bits for this hcd */
@ -50,6 +55,9 @@ static int ohci_usb_probe(struct udevice *dev)
if (IS_ERR(priv->ccm)) if (IS_ERR(priv->ccm))
return PTR_ERR(priv->ccm); return PTR_ERR(priv->ccm);
priv->reset0_cfg = (void *)priv->ccm +
priv->cfg->reset0_cfg_offset;
phys = dev_count_phandle_with_args(dev, "phys", "#phy-cells"); phys = dev_count_phandle_with_args(dev, "phys", "#phy-cells");
if (phys < 0) { if (phys < 0) {
phys = 0; phys = 0;
@ -93,7 +101,7 @@ no_phy:
setbits_le32(&priv->ccm->usb_clk_cfg, setbits_le32(&priv->ccm->usb_clk_cfg,
priv->usb_gate_mask | priv->cfg->extra_usb_gate_mask); priv->usb_gate_mask | priv->cfg->extra_usb_gate_mask);
if (priv->cfg->has_reset) if (priv->cfg->has_reset)
setbits_le32(&priv->ccm->ahb_reset0_cfg, setbits_le32(priv->reset0_cfg,
priv->ahb_gate_mask | extra_ahb_gate_mask); priv->ahb_gate_mask | extra_ahb_gate_mask);
return ohci_register(dev, regs); return ohci_register(dev, regs);
@ -117,7 +125,7 @@ static int ohci_usb_remove(struct udevice *dev)
return ret; return ret;
if (priv->cfg->has_reset) if (priv->cfg->has_reset)
clrbits_le32(&priv->ccm->ahb_reset0_cfg, priv->ahb_gate_mask); clrbits_le32(priv->reset0_cfg, priv->ahb_gate_mask);
clrbits_le32(&priv->ccm->usb_clk_cfg, priv->usb_gate_mask); clrbits_le32(&priv->ccm->usb_clk_cfg, priv->usb_gate_mask);
clrbits_le32(&priv->ccm->ahb_gate0, priv->ahb_gate_mask); clrbits_le32(&priv->ccm->ahb_gate0, priv->ahb_gate_mask);
@ -130,17 +138,25 @@ static const struct ohci_sunxi_cfg sun4i_a10_cfg = {
static const struct ohci_sunxi_cfg sun6i_a31_cfg = { static const struct ohci_sunxi_cfg sun6i_a31_cfg = {
.has_reset = true, .has_reset = true,
.reset0_cfg_offset = SUN6I_AHB_RESET0_CFG_OFFSET,
}; };
static const struct ohci_sunxi_cfg sun8i_h3_cfg = { static const struct ohci_sunxi_cfg sun8i_h3_cfg = {
.has_reset = true, .has_reset = true,
.extra_ahb_gate_mask = 1 << AHB_GATE_OFFSET_USB_EHCI0, .extra_ahb_gate_mask = 1 << AHB_GATE_OFFSET_USB_EHCI0,
.reset0_cfg_offset = SUN6I_AHB_RESET0_CFG_OFFSET,
};
static const struct ohci_sunxi_cfg sun9i_a80_cfg = {
.has_reset = true,
.reset0_cfg_offset = SUN9I_AHB_RESET0_CFG_OFFSET,
}; };
static const struct ohci_sunxi_cfg sun50i_a64_cfg = { static const struct ohci_sunxi_cfg sun50i_a64_cfg = {
.has_reset = true, .has_reset = true,
.extra_ahb_gate_mask = 1 << AHB_GATE_OFFSET_USB_EHCI0, .extra_ahb_gate_mask = 1 << AHB_GATE_OFFSET_USB_EHCI0,
.extra_usb_gate_mask = CCM_USB_CTRL_OHCI0_CLK, .extra_usb_gate_mask = CCM_USB_CTRL_OHCI0_CLK,
.reset0_cfg_offset = SUN6I_AHB_RESET0_CFG_OFFSET,
}; };
static const struct udevice_id ohci_usb_ids[] = { static const struct udevice_id ohci_usb_ids[] = {
@ -174,7 +190,7 @@ static const struct udevice_id ohci_usb_ids[] = {
}, },
{ {
.compatible = "allwinner,sun9i-a80-ohci", .compatible = "allwinner,sun9i-a80-ohci",
.data = (ulong)&sun6i_a31_cfg, .data = (ulong)&sun9i_a80_cfg,
}, },
{ {
.compatible = "allwinner,sun50i-a64-ohci", .compatible = "allwinner,sun50i-a64-ohci",