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

usb: sunxi: Simplify ccm reg base code

Browse source 
Move struct sunxi_ccm_reg pointer to private structure
so-that accessing ccm reg base become more proper way
and avoid local initialization in each function.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Acked-by: Jun Nie <jun.nie@linaro.org>
This commit is contained in:
Jagan Teki 2018-05-07 13:03:17 +05:30
parent 3def2f8dbb
commit 831cc98b1f
3 changed files with 43 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -26,19 +26,23 @@
struct ehci_sunxi_priv { struct ehci_sunxi_priv {
struct ehci_ctrl ehci; struct ehci_ctrl ehci;
struct sunxi_ccm_reg *ccm;
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 phy_index; /* Index of the usb-phy attached to this hcd */ int phy_index; /* Index of the usb-phy attached to this hcd */
}; };
static int ehci_usb_probe(struct udevice *dev) static int ehci_usb_probe(struct udevice *dev)
{ {
struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
struct usb_platdata *plat = dev_get_platdata(dev); struct usb_platdata *plat = dev_get_platdata(dev);
struct ehci_sunxi_priv *priv = dev_get_priv(dev); struct ehci_sunxi_priv *priv = dev_get_priv(dev);
struct ehci_hccr *hccr = (struct ehci_hccr *)devfdt_get_addr(dev); struct ehci_hccr *hccr = (struct ehci_hccr *)devfdt_get_addr(dev);
struct ehci_hcor *hcor; struct ehci_hcor *hcor;
int extra_ahb_gate_mask = 0; int extra_ahb_gate_mask = 0;
priv->ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
if (IS_ERR(priv->ccm))
return PTR_ERR(priv->ccm);
/* /*
* This should go away once we've moved to the driver model for * This should go away once we've moved to the driver model for
* clocks resp. phys. * clocks resp. phys.
@ -52,10 +56,10 @@ static int ehci_usb_probe(struct udevice *dev)
extra_ahb_gate_mask <<= priv->phy_index * AHB_CLK_DIST; extra_ahb_gate_mask <<= priv->phy_index * AHB_CLK_DIST;
priv->phy_index++; /* Non otg phys start at 1 */ priv->phy_index++; /* Non otg phys start at 1 */
setbits_le32(&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);
#ifdef CONFIG_SUNXI_GEN_SUN6I #ifdef CONFIG_SUNXI_GEN_SUN6I
setbits_le32(&ccm->ahb_reset0_cfg, setbits_le32(&priv->ccm->ahb_reset0_cfg,
priv->ahb_gate_mask | extra_ahb_gate_mask); priv->ahb_gate_mask | extra_ahb_gate_mask);
#endif #endif
@ -70,7 +74,6 @@ static int ehci_usb_probe(struct udevice *dev)
static int ehci_usb_remove(struct udevice *dev) static int ehci_usb_remove(struct udevice *dev)
{ {
struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
struct ehci_sunxi_priv *priv = dev_get_priv(dev); struct ehci_sunxi_priv *priv = dev_get_priv(dev);
int ret; int ret;
@ -81,9 +84,9 @@ static int ehci_usb_remove(struct udevice *dev)
sunxi_usb_phy_exit(priv->phy_index); sunxi_usb_phy_exit(priv->phy_index);
#ifdef CONFIG_SUNXI_GEN_SUN6I #ifdef CONFIG_SUNXI_GEN_SUN6I
clrbits_le32(&ccm->ahb_reset0_cfg, priv->ahb_gate_mask); clrbits_le32(&priv->ccm->ahb_reset0_cfg, priv->ahb_gate_mask);
#endif #endif
clrbits_le32(&ccm->ahb_gate0, priv->ahb_gate_mask); clrbits_le32(&priv->ccm->ahb_gate0, priv->ahb_gate_mask);
return 0; return 0;
} }

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

@ -25,6 +25,7 @@
#endif #endif
struct ohci_sunxi_priv { struct ohci_sunxi_priv {
struct sunxi_ccm_reg *ccm;
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 */
@ -33,12 +34,15 @@ struct ohci_sunxi_priv {
static int ohci_usb_probe(struct udevice *dev) static int ohci_usb_probe(struct udevice *dev)
{ {
struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
struct usb_bus_priv *bus_priv = dev_get_uclass_priv(dev); struct usb_bus_priv *bus_priv = dev_get_uclass_priv(dev);
struct ohci_sunxi_priv *priv = dev_get_priv(dev); struct ohci_sunxi_priv *priv = dev_get_priv(dev);
struct ohci_regs *regs = (struct ohci_regs *)devfdt_get_addr(dev); struct ohci_regs *regs = (struct ohci_regs *)devfdt_get_addr(dev);
int extra_ahb_gate_mask = 0; int extra_ahb_gate_mask = 0;
priv->ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
if (IS_ERR(priv->ccm))
return PTR_ERR(priv->ccm);
bus_priv->companion = true; bus_priv->companion = true;
/* /*
@ -56,11 +60,11 @@ static int ohci_usb_probe(struct udevice *dev)
priv->usb_gate_mask <<= priv->phy_index; priv->usb_gate_mask <<= priv->phy_index;
priv->phy_index++; /* Non otg phys start at 1 */ priv->phy_index++; /* Non otg phys start at 1 */
setbits_le32(&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);
setbits_le32(&ccm->usb_clk_cfg, priv->usb_gate_mask); setbits_le32(&priv->ccm->usb_clk_cfg, priv->usb_gate_mask);
#ifdef CONFIG_SUNXI_GEN_SUN6I #ifdef CONFIG_SUNXI_GEN_SUN6I
setbits_le32(&ccm->ahb_reset0_cfg, setbits_le32(&priv->ccm->ahb_reset0_cfg,
priv->ahb_gate_mask | extra_ahb_gate_mask); priv->ahb_gate_mask | extra_ahb_gate_mask);
#endif #endif
@ -72,7 +76,6 @@ static int ohci_usb_probe(struct udevice *dev)
static int ohci_usb_remove(struct udevice *dev) static int ohci_usb_remove(struct udevice *dev)
{ {
struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
struct ohci_sunxi_priv *priv = dev_get_priv(dev); struct ohci_sunxi_priv *priv = dev_get_priv(dev);
int ret; int ret;
@ -83,10 +86,10 @@ static int ohci_usb_remove(struct udevice *dev)
sunxi_usb_phy_exit(priv->phy_index); sunxi_usb_phy_exit(priv->phy_index);
#ifdef CONFIG_SUNXI_GEN_SUN6I #ifdef CONFIG_SUNXI_GEN_SUN6I
clrbits_le32(&ccm->ahb_reset0_cfg, priv->ahb_gate_mask); clrbits_le32(&priv->ccm->ahb_reset0_cfg, priv->ahb_gate_mask);
#endif #endif
clrbits_le32(&ccm->usb_clk_cfg, priv->usb_gate_mask); clrbits_le32(&priv->ccm->usb_clk_cfg, priv->usb_gate_mask);
clrbits_le32(&ccm->ahb_gate0, priv->ahb_gate_mask); clrbits_le32(&priv->ccm->ahb_gate0, priv->ahb_gate_mask);
return 0; return 0;
} }

34
drivers/usb/musb-new/sunxi.c
View file

@ -75,6 +75,13 @@
* From usbc/usbc.c * From usbc/usbc.c
******************************************************************************/ ******************************************************************************/
struct sunxi_glue {
struct musb_host_data mdata;
struct sunxi_ccm_reg *ccm;
struct device dev;
};
#define to_sunxi_glue(d) container_of(d, struct sunxi_glue, dev)
static u32 USBC_WakeUp_ClearChangeDetect(u32 reg_val) static u32 USBC_WakeUp_ClearChangeDetect(u32 reg_val)
{ {
u32 temp = reg_val; u32 temp = reg_val;
@ -255,15 +262,15 @@ static void sunxi_musb_disable(struct musb *musb)
static int sunxi_musb_init(struct musb *musb) static int sunxi_musb_init(struct musb *musb)
{ {
struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE; struct sunxi_glue *glue = to_sunxi_glue(musb->controller);
pr_debug("%s():\n", __func__); pr_debug("%s():\n", __func__);
musb->isr = sunxi_musb_interrupt; musb->isr = sunxi_musb_interrupt;
setbits_le32(&ccm->ahb_gate0, 1 << AHB_GATE_OFFSET_USB0); setbits_le32(&glue->ccm->ahb_gate0, 1 << AHB_GATE_OFFSET_USB0);
#ifdef CONFIG_SUNXI_GEN_SUN6I #ifdef CONFIG_SUNXI_GEN_SUN6I
setbits_le32(&ccm->ahb_reset0_cfg, 1 << AHB_GATE_OFFSET_USB0); setbits_le32(&glue->ccm->ahb_reset0_cfg, 1 << AHB_GATE_OFFSET_USB0);
#endif #endif
sunxi_usb_phy_init(0); sunxi_usb_phy_init(0);
@ -309,7 +316,8 @@ static struct musb_hdrc_platform_data musb_plat = {
static int musb_usb_probe(struct udevice *dev) static int musb_usb_probe(struct udevice *dev)
{ {
struct musb_host_data *host = dev_get_priv(dev); struct sunxi_glue *glue = dev_get_priv(dev);
struct musb_host_data *host = &glue->mdata;
struct usb_bus_priv *priv = dev_get_uclass_priv(dev); struct usb_bus_priv *priv = dev_get_uclass_priv(dev);
void *base = dev_read_addr_ptr(dev); void *base = dev_read_addr_ptr(dev);
int ret; int ret;
@ -317,10 +325,14 @@ static int musb_usb_probe(struct udevice *dev)
if (!base) if (!base)
return -EINVAL; return -EINVAL;
glue->ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
if (IS_ERR(glue->ccm))
return PTR_ERR(glue->ccm);
priv->desc_before_addr = true; priv->desc_before_addr = true;
#ifdef CONFIG_USB_MUSB_HOST #ifdef CONFIG_USB_MUSB_HOST
host->host = musb_init_controller(&musb_plat, NULL, base); host->host = musb_init_controller(&musb_plat, &glue->dev, base);
if (!host->host) if (!host->host)
return -EIO; return -EIO;
@ -328,7 +340,7 @@ static int musb_usb_probe(struct udevice *dev)
if (!ret) if (!ret)
printf("Allwinner mUSB OTG (Host)\n"); printf("Allwinner mUSB OTG (Host)\n");
#else #else
ret = musb_register(&musb_plat, NULL, base); ret = musb_register(&musb_plat, &glue->dev, base);
if (!ret) if (!ret)
printf("Allwinner mUSB OTG (Peripheral)\n"); printf("Allwinner mUSB OTG (Peripheral)\n");
#endif #endif
@ -338,16 +350,16 @@ static int musb_usb_probe(struct udevice *dev)
static int musb_usb_remove(struct udevice *dev) static int musb_usb_remove(struct udevice *dev)
{ {
struct musb_host_data *host = dev_get_priv(dev); struct sunxi_glue *glue = dev_get_priv(dev);
struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE; struct musb_host_data *host = &glue->mdata;
musb_stop(host->host); musb_stop(host->host);
sunxi_usb_phy_exit(0); sunxi_usb_phy_exit(0);
#ifdef CONFIG_SUNXI_GEN_SUN6I #ifdef CONFIG_SUNXI_GEN_SUN6I
clrbits_le32(&ccm->ahb_reset0_cfg, 1 << AHB_GATE_OFFSET_USB0); clrbits_le32(&glue->ccm->ahb_reset0_cfg, 1 << AHB_GATE_OFFSET_USB0);
#endif #endif
clrbits_le32(&ccm->ahb_gate0, 1 << AHB_GATE_OFFSET_USB0); clrbits_le32(&glue->ccm->ahb_gate0, 1 << AHB_GATE_OFFSET_USB0);
free(host->host); free(host->host);
host->host = NULL; host->host = NULL;
@ -377,5 +389,5 @@ U_BOOT_DRIVER(usb_musb) = {
.ops = &musb_usb_ops, .ops = &musb_usb_ops,
#endif #endif
.platdata_auto_alloc_size = sizeof(struct usb_platdata), .platdata_auto_alloc_size = sizeof(struct usb_platdata),
.priv_auto_alloc_size = sizeof(struct musb_host_data), .priv_auto_alloc_size = sizeof(struct sunxi_glue),
}; };