Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 998b8ab3f61ba3a907a5694cedf81f4cf10b0b5a

Authored by Hans de Goede
1 parent e1abfa437a
Exists in v2017.01-smarct4x and in 34 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

sunxi: musb: Remove unused sunxi_musb_exit method 

Remove the unused sunxi_musb_exit method, there is no code in u-boot
calling the exit method, and our implementation was broken as it did
not disable the clocks and asserted reset.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>

Showing 1 changed file with 0 additions and 34 deletions Side-by-side Diff

drivers/usb/musb-new/sunxi.c
Diff comments   View file @ 998b8ab
... ... @@ -105,16 +105,6 @@
105 105 musb_writel(base, USBC_REG_o_ISCR, reg_val);
106 106 }
107 107  
108   -static void USBC_DisableIdPullUp(__iomem void *base)
109   -{
110   - u32 reg_val;
111   -
112   - reg_val = musb_readl(base, USBC_REG_o_ISCR);
113   - reg_val &= ~(1 << USBC_BP_ISCR_ID_PULLUP_EN);
114   - reg_val = USBC_WakeUp_ClearChangeDetect(reg_val);
115   - musb_writel(base, USBC_REG_o_ISCR, reg_val);
116   -}
117   -
118 108 static void USBC_EnableDpDmPullUp(__iomem void *base)
119 109 {
120 110 u32 reg_val;
... ... @@ -125,16 +115,6 @@
125 115 musb_writel(base, USBC_REG_o_ISCR, reg_val);
126 116 }
127 117  
128   -static void USBC_DisableDpDmPullUp(__iomem void *base)
129   -{
130   - u32 reg_val;
131   -
132   - reg_val = musb_readl(base, USBC_REG_o_ISCR);
133   - reg_val &= ~(1 << USBC_BP_ISCR_DPDM_PULLUP_EN);
134   - reg_val = USBC_WakeUp_ClearChangeDetect(reg_val);
135   - musb_writel(base, USBC_REG_o_ISCR, reg_val);
136   -}
137   -
138 118 static void USBC_ForceIdToLow(__iomem void *base)
139 119 {
140 120 u32 reg_val;
141 121  
... ... @@ -292,22 +272,8 @@
292 272 return 0;
293 273 }
294 274  
295   -static int sunxi_musb_exit(struct musb *musb)
296   -{
297   - pr_debug("%s():\n", __func__);
298   -
299   - USBC_DisableDpDmPullUp(musb->mregs);
300   - USBC_DisableIdPullUp(musb->mregs);
301   - sunxi_usb_phy_power_off(0);
302   - sunxi_usb_phy_exit(0);
303   -
304   - return 0;
305   -}
306   -
307 275 const struct musb_platform_ops sunxi_musb_ops = {
308 276 .init = sunxi_musb_init,
309   - .exit = sunxi_musb_exit,
310   -
311 277 .enable = sunxi_musb_enable,
312 278 .disable = sunxi_musb_disable,
313 279 };