Provide clock toggling for the USB host and slave controller as well as for the Ethernet Switch. The bcm63xx_enetsw driver is changed not to use request_mem_region() as the Roboswitch register overlaps with the Roboswitch IUDMA channels, hence making the driver return -EBUSY. A future fix might be to use variable size RSET_ENETSW sizes depending on the chip we are targetting. Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 39282master
parent
7951993efd
commit
0ecdc42f60
@ -0,0 +1,50 @@ |
||||
--- a/arch/mips/bcm63xx/clk.c
|
||||
+++ b/arch/mips/bcm63xx/clk.c
|
||||
@@ -136,7 +136,11 @@ static struct clk clk_ephy = {
|
||||
*/
|
||||
static void enetsw_set(struct clk *clk, int enable)
|
||||
{
|
||||
- if (BCMCPU_IS_6328())
|
||||
+ if (BCMCPU_IS_6318()) {
|
||||
+ bcm_hwclock_set(CKCTL_6318_ROBOSW250_EN |
|
||||
+ CKCTL_6318_ROBOSW025_EN, enable);
|
||||
+ bcm_ub_hwclock_set(UB_CKCTL_6318_ROBOSW_EN, enable);
|
||||
+ } else if (BCMCPU_IS_6328())
|
||||
bcm_hwclock_set(CKCTL_6328_ROBOSW_EN, enable);
|
||||
else if (BCMCPU_IS_6362())
|
||||
bcm_hwclock_set(CKCTL_6362_ROBOSW_EN, enable);
|
||||
@@ -179,11 +183,22 @@ static struct clk clk_pcm = {
|
||||
};
|
||||
|
||||
/*
|
||||
+ * 6318 USB host & slave clock
|
||||
+ */
|
||||
+static void bcm_6318_usb_clock_set(int enable)
|
||||
+{
|
||||
+ bcm_hwclock_set(CKCTL_6318_USB_EN, enable);
|
||||
+ bcm_ub_hwclock_set(UB_CKCTL_6318_USB_EN, enable);
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
* USB host clock
|
||||
*/
|
||||
static void usbh_set(struct clk *clk, int enable)
|
||||
{
|
||||
- if (BCMCPU_IS_6328())
|
||||
+ if (BCMCPU_IS_6318())
|
||||
+ bcm_6318_usb_clock_set(enable);
|
||||
+ else if (BCMCPU_IS_6328())
|
||||
bcm_hwclock_set(CKCTL_6328_USBH_EN, enable);
|
||||
else if (BCMCPU_IS_6348())
|
||||
bcm_hwclock_set(CKCTL_6348_USBH_EN, enable);
|
||||
@@ -209,7 +224,9 @@ static struct clk clk_usbh = {
|
||||
*/
|
||||
static void usbd_set(struct clk *clk, int enable)
|
||||
{
|
||||
- if (BCMCPU_IS_6328())
|
||||
+ if (BCMCPU_IS_6318())
|
||||
+ bcm_6318_usb_clock_set(enable);
|
||||
+ else if (BCMCPU_IS_6328())
|
||||
bcm_hwclock_set(CKCTL_6328_USBD_EN, enable);
|
||||
else if (BCMCPU_IS_6362())
|
||||
bcm_hwclock_set(CKCTL_6362_USBD_EN, enable);
|
@ -0,0 +1,15 @@ |
||||
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
|
||||
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
|
||||
@@ -2787,12 +2787,6 @@ static int bcm_enetsw_probe(struct platf
|
||||
if (ret)
|
||||
goto out;
|
||||
|
||||
- if (!request_mem_region(res_mem->start, resource_size(res_mem),
|
||||
- "bcm63xx_enetsw")) {
|
||||
- ret = -EBUSY;
|
||||
- goto out;
|
||||
- }
|
||||
-
|
||||
priv->base = ioremap(res_mem->start, resource_size(res_mem));
|
||||
if (priv->base == NULL) {
|
||||
ret = -ENOMEM;
|
Loading…
Reference in new issue