1 files changed, 34 insertions, 9 deletions

diff --git a/arch/mips/bcm63xx/clk.c b/arch/mips/bcm63xx/clk.c
index b9e948d59430..c726a97fc798 100644
--- a/arch/mips/bcm63xx/clk.c
+++ b/arch/mips/bcm63xx/clk.c
@@ -15,7 +15,13 @@
 #include <bcm63xx_io.h>
 #include <bcm63xx_regs.h>
 #include <bcm63xx_reset.h>
-#include <bcm63xx_clk.h>
+
+struct clk {
+        void            (*set)(struct clk *, int);
+        unsigned int    rate;
+        unsigned int    usage;
+        int             id;
+};
 
 static DEFINE_MUTEX(clocks_mutex);
 
@@ -119,11 +125,18 @@ static struct clk clk_ephy = {
  */
 static void enetsw_set(struct clk *clk, int enable)
 {
-        if (!BCMCPU_IS_6368())
+        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);
+        else if (BCMCPU_IS_6368())
+                bcm_hwclock_set(CKCTL_6368_ROBOSW_EN |
+                                CKCTL_6368_SWPKT_USB_EN |
+                                CKCTL_6368_SWPKT_SAR_EN,
+                                enable);
+        else
                 return;
-        bcm_hwclock_set(CKCTL_6368_ROBOSW_EN |
-                        CKCTL_6368_SWPKT_USB_EN |
-                        CKCTL_6368_SWPKT_SAR_EN, enable);
+
         if (enable) {
                 /* reset switch core afer clock change */
                 bcm63xx_core_set_reset(BCM63XX_RESET_ENETSW, 1);
@@ -160,6 +173,8 @@ static void usbh_set(struct clk *clk, int enable)
                 bcm_hwclock_set(CKCTL_6328_USBH_EN, enable);
         else if (BCMCPU_IS_6348())
                 bcm_hwclock_set(CKCTL_6348_USBH_EN, enable);
+        else if (BCMCPU_IS_6362())
+                bcm_hwclock_set(CKCTL_6362_USBH_EN, enable);
         else if (BCMCPU_IS_6368())
                 bcm_hwclock_set(CKCTL_6368_USBH_EN, enable);
 }
@@ -175,6 +190,8 @@ static void usbd_set(struct clk *clk, int enable)
 {
         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);
         else if (BCMCPU_IS_6368())
                 bcm_hwclock_set(CKCTL_6368_USBD_EN, enable);
 }
@@ -196,6 +213,8 @@ static void spi_set(struct clk *clk, int enable)
                 mask = CKCTL_6348_SPI_EN;
         else if (BCMCPU_IS_6358())
                 mask = CKCTL_6358_SPI_EN;
+        else if (BCMCPU_IS_6362())
+                mask = CKCTL_6362_SPI_EN;
         else
                 /* BCMCPU_IS_6368 */
                 mask = CKCTL_6368_SPI_EN;
@@ -236,7 +255,10 @@ static struct clk clk_xtm = {
  */
 static void ipsec_set(struct clk *clk, int enable)
 {
-        bcm_hwclock_set(CKCTL_6368_IPSEC_EN, enable);
+        if (BCMCPU_IS_6362())
+                bcm_hwclock_set(CKCTL_6362_IPSEC_EN, enable);
+        else if (BCMCPU_IS_6368())
+                bcm_hwclock_set(CKCTL_6368_IPSEC_EN, enable);
 }
 
 static struct clk clk_ipsec = {
@@ -249,7 +271,10 @@ static struct clk clk_ipsec = {
 
 static void pcie_set(struct clk *clk, int enable)
 {
-        bcm_hwclock_set(CKCTL_6328_PCIE_EN, enable);
+        if (BCMCPU_IS_6328())
+                bcm_hwclock_set(CKCTL_6328_PCIE_EN, enable);
+        else if (BCMCPU_IS_6362())
+                bcm_hwclock_set(CKCTL_6362_PCIE_EN, enable);
 }
 
 static struct clk clk_pcie = {
@@ -315,9 +340,9 @@ struct clk *clk_get(struct device *dev, const char *id)
                 return &clk_periph;
         if (BCMCPU_IS_6358() && !strcmp(id, "pcm"))
                 return &clk_pcm;
-        if (BCMCPU_IS_6368() && !strcmp(id, "ipsec"))
+        if ((BCMCPU_IS_6362() || BCMCPU_IS_6368()) && !strcmp(id, "ipsec"))
                 return &clk_ipsec;
-        if (BCMCPU_IS_6328() && !strcmp(id, "pcie"))
+        if ((BCMCPU_IS_6328() || BCMCPU_IS_6362()) && !strcmp(id, "pcie"))
                 return &clk_pcie;
         return ERR_PTR(-ENOENT);
 }