usb: sunxi: access ahb_reset0_cfg in CCM using its offset
Subsystems (4)
PATCH v2 1/1 usb: sunxi: access ahb_reset0_cfg in CCM using its offset
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")
--- drivers/usb/host/ehci-sunxi.c | 21 ++++++++++++++++++--- drivers/usb/host/ohci-sunxi.c | 22 +++++++++++++++++++--- 2 files changed, 37 insertions(+), 6 deletions(-)
drivers/usb/host/ehci-sunxi.c +18 -3
@@ -22,14 +22,19 @@#define AHB_CLK_DIST 1#endif +#define SUN6I_AHB_RESET0_CFG_OFFSET 0x2c0 +#define SUN9I_AHB_RESET0_CFG_OFFSET 0x5a0 +struct ehci_sunxi_cfg {bool has_reset;u32 extra_ahb_gate_mask; +u32 reset0_cfg_offset; };struct ehci_sunxi_priv {struct ehci_ctrl ehci;struct sunxi_ccm_reg *ccm; +u32 *reset0_cfg;int ahb_gate_mask;/* Mask of ahb_gate0 clk gate bits for this hcd */ struct phy phy;const struct ehci_sunxi_cfg *cfg;
@@ -49,6 +54,9 @@ static int ehci_usb_probe(struct udevice *dev)if (IS_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" );if (phys <0 ) { phys =0 ;
@@ -86,7 +94,7 @@ no_phy:setbits_le32 (&priv->ccm->ahb_gate0, priv->ahb_gate_mask | extra_ahb_gate_mask);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); hcor = (struct ehci_hcor *)((uintptr_t)hccr +
@@ -113,7 +121,7 @@ static int ehci_usb_remove(struct udevice *dev)return ret;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);return 0 ;
@@ -125,11 +133,18 @@ static const struct ehci_sunxi_cfg sun4i_a10_cfg = {static const struct ehci_sunxi_cfg sun6i_a31_cfg = { .has_reset = true, + .reset0_cfg_offset =SUN6I_AHB_RESET0_CFG_OFFSET , };static const struct ehci_sunxi_cfg sun8i_h3_cfg = { .has_reset = true, .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[] = {
@@ -163,7 +178,7 @@ static const struct udevice_id ehci_usb_ids[] = { }, { .compatible = "allwinner,sun9i-a80-ehci", - .data = (ulong)&sun6i_a31_cfg, + .data = (ulong)&sun9i_a80_cfg, }, { .compatible = "allwinner,sun50i-a64-ehci",
drivers/usb/host/ohci-sunxi.c +19 -3
@@ -22,14 +22,19 @@#define AHB_CLK_DIST 1#endif +#define SUN6I_AHB_RESET0_CFG_OFFSET 0x2c0 +#define SUN9I_AHB_RESET0_CFG_OFFSET 0x5a0 +struct ohci_sunxi_cfg {bool has_reset;u32 extra_ahb_gate_mask;u32 extra_usb_gate_mask; +u32 reset0_cfg_offset; };struct ohci_sunxi_priv {struct sunxi_ccm_reg *ccm; +u32 *reset0_cfg;ohci_t ohci;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 */
@@ -50,6 +55,9 @@ static int ohci_usb_probe(struct udevice *dev)if (IS_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" );if (phys <0 ) { phys =0 ;
@@ -93,7 +101,7 @@ no_phy:setbits_le32 (&priv->ccm->usb_clk_cfg, priv->usb_gate_mask | priv->cfg->extra_usb_gate_mask);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);return ohci_register (dev, regs);
@@ -117,7 +125,7 @@ static int ohci_usb_remove(struct udevice *dev)return ret;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->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 = { .has_reset = true, + .reset0_cfg_offset =SUN6I_AHB_RESET0_CFG_OFFSET , };static const struct ohci_sunxi_cfg sun8i_h3_cfg = { .has_reset = true, .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 = { .has_reset = true, .extra_ahb_gate_mask =1 <<AHB_GATE_OFFSET_USB_EHCI0 , .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[] = {
@@ -174,7 +190,7 @@ static const struct udevice_id ohci_usb_ids[] = { }, { .compatible = "allwinner,sun9i-a80-ohci", - .data = (ulong)&sun6i_a31_cfg, + .data = (ulong)&sun9i_a80_cfg, }, { .compatible = "allwinner,sun50i-a64-ohci",
Signature · 1 line
2.17.1
PATCH v2 1/1 usb: sunxi: access ahb_reset0_cfg in CCM using its offset
Quoted 6 lines · Vasily Khoruzhick
struct
sunxi_ccm_regdoesn't haveahb_reset0_cfgon sun4i and sun5i, thus compilation fails with:
drivers/usb/host/ohci-sunxi.c:96:26: error: 'structsunxi_ccm_reg' has no member named 'ahb_reset0_cfg'
Quoted 6 lines
Access this reg using its offset to fix this issue.
Fixes commit
1ed9c1118("usb: sunxi: ehci: get rid of ifdefs") and commit56830cee3("usb: sunxi: ohci: get rid of ifdefs")Signed-off-by Vasily Khoruzhick <[email protected]>
Any feedback?
Quoted 175 lines
--- drivers/usb/host/ehci-sunxi.c | 21 ++++++++++++++++++--- drivers/usb/host/ohci-sunxi.c | 22 +++++++++++++++++++--- 2 files changed, 37 insertions(+), 6 deletions(-)drivers/usb/host/ehci-sunxi.c +18
-3@@ -22,14 +22,19 @@#define AHB_CLK_DIST 1#endif +#define SUN6I_AHB_RESET0_CFG_OFFSET 0x2c0 +#define SUN9I_AHB_RESET0_CFG_OFFSET 0x5a0 +struct ehci_sunxi_cfg {bool has_reset;u32 extra_ahb_gate_mask; +u32 reset0_cfg_offset; };struct ehci_sunxi_priv {struct ehci_ctrl ehci;struct sunxi_ccm_reg *ccm; +u32 *reset0_cfg;int ahb_gate_mask;/* Mask of ahb_gate0 clk gate bits for this hcd */ struct phy phy;const struct ehci_sunxi_cfg *cfg;@@ -49,6 +54,9 @@ static int ehci_usb_probe(struct udevice *dev)if (IS_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" );if (phys <0 ) { phys =0 ;@@ -86,7 +94,7 @@ no_phy:setbits_le32 (&priv->ccm->ahb_gate0, priv->ahb_gate_mask | extra_ahb_gate_mask);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); hcor = (struct ehci_hcor *)((uintptr_t)hccr +@@ -113,7 +121,7 @@ static int ehci_usb_remove(struct udevice *dev)return ret;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);return 0 ;@@ -125,11 +133,18 @@ static const struct ehci_sunxi_cfg sun4i_a10_cfg = {static const struct ehci_sunxi_cfg sun6i_a31_cfg = { .has_reset = true, + .reset0_cfg_offset =SUN6I_AHB_RESET0_CFG_OFFSET , };static const struct ehci_sunxi_cfg sun8i_h3_cfg = { .has_reset = true, .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[] = {@@ -163,7 +178,7 @@ static const struct udevice_id ehci_usb_ids[] = { }, { .compatible = "allwinner,sun9i-a80-ehci", - .data = (ulong)&sun6i_a31_cfg, + .data = (ulong)&sun9i_a80_cfg, }, { .compatible = "allwinner,sun50i-a64-ehci",drivers/usb/host/ohci-sunxi.c +19
-4@@ -22,14 +22,19 @@#define AHB_CLK_DIST 1#endif +#define SUN6I_AHB_RESET0_CFG_OFFSET 0x2c0 +#define SUN9I_AHB_RESET0_CFG_OFFSET 0x5a0 +struct ohci_sunxi_cfg {bool has_reset;u32 extra_ahb_gate_mask;u32 extra_usb_gate_mask; +u32 reset0_cfg_offset; };struct ohci_sunxi_priv {struct sunxi_ccm_reg *ccm; +u32 *reset0_cfg;ohci_t ohci;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 */ @@ -50,6 +55,9 @@ static int ohci_usb_probe(struct udevice *dev)if (IS_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" );if (phys <0 ) { phys =0 ;@@ -93,7 +101,7 @@ no_phy:setbits_le32 (&priv->ccm->usb_clk_cfg, priv->usb_gate_mask | priv->cfg->extra_usb_gate_mask);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);return ohci_register (dev, regs);@@ -117,7 +125,7 @@ static int ohci_usb_remove(struct udevice *dev)return ret;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->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 = { .has_reset = true, + .reset0_cfg_offset =SUN6I_AHB_RESET0_CFG_OFFSET , };static const struct ohci_sunxi_cfg sun8i_h3_cfg = { .has_reset = true, .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 = { .has_reset = true, .extra_ahb_gate_mask =1 <<AHB_GATE_OFFSET_USB_EHCI0 , .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[] = {@@ -174,7 +190,7 @@ static const struct udevice_id ohci_usb_ids[] = { }, { .compatible = "allwinner,sun9i-a80-ohci", - .data = (ulong)&sun6i_a31_cfg, + .data = (ulong)&sun9i_a80_cfg, }, { .compatible = "allwinner,sun50i-a64-ohci", --2.17.1
PATCH v2 1/1 usb: sunxi: access ahb_reset0_cfg in CCM using its offset
Quoted 7 lines · Vasily Khoruzhick
Quoted 6 lines · Vasily Khoruzhick
struct
sunxi_ccm_regdoesn't haveahb_reset0_cfgon sun4i and sun5i, thus compilation fails with:
drivers/usb/host/ohci-sunxi.c:96:26: error: 'structsunxi_ccm_reg' has no member named 'ahb_reset0_cfg'
Quoted 8 lines
Quoted 6 lines
Access this reg using its offset to fix this issue.
Fixes commit
1ed9c1118("usb: sunxi: ehci: get rid of ifdefs") and commit56830cee3("usb: sunxi: ohci: get rid of ifdefs")Signed-off-by Vasily Khoruzhick <[email protected]>Any feedback?
I'll just apply this.
Signature · 2 lines
Best regards, Marek Vasut