USB: ehci-fsl: Turn on cache snooping on MPC8xxx

If a MPC8xxx was being used, 'have_sysif_regs' should be set and
it should setup cache snooping for all the 4GB space on both PPC32
and PPC64.

Signed-off-by: Pan Jiafei <Jiafei.Pan@freescale.com>
Acked-by: Li Yang <leoli@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 11 insertions, 14 deletions

diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index 10e008a730a5..cd30ea4416a6 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -252,21 +252,18 @@ static int ehci_fsl_usb_setup(struct ehci_hcd *ehci)
         if (pdata->have_sysif_regs) {
                 temp = in_be32(non_ehci + FSL_SOC_USB_CTRL);
                 out_be32(non_ehci + FSL_SOC_USB_CTRL, temp | 0x00000004);
-                out_be32(non_ehci + FSL_SOC_USB_SNOOP1, 0x0000001b);
-        }
-
-#if defined(CONFIG_PPC32) && !defined(CONFIG_NOT_COHERENT_CACHE)
-        /*
-         * Turn on cache snooping hardware, since some PowerPC platforms
-         * wholly rely on hardware to deal with cache coherent
-         */
 
-        /* Setup Snooping for all the 4GB space */
-        /* SNOOP1 starts from 0x0, size 2G */
-        out_be32(non_ehci + FSL_SOC_USB_SNOOP1, 0x0 | SNOOP_SIZE_2GB);
-        /* SNOOP2 starts from 0x80000000, size 2G */
-        out_be32(non_ehci + FSL_SOC_USB_SNOOP2, 0x80000000 | SNOOP_SIZE_2GB);
-#endif
+                /*
+                * Turn on cache snooping hardware, since some PowerPC platforms
+                * wholly rely on hardware to deal with cache coherent
+                */
+
+                /* Setup Snooping for all the 4GB space */
+                /* SNOOP1 starts from 0x0, size 2G */
+                out_be32(non_ehci + FSL_SOC_USB_SNOOP1, 0x0 | SNOOP_SIZE_2GB);
+                /* SNOOP2 starts from 0x80000000, size 2G */
+                out_be32(non_ehci + FSL_SOC_USB_SNOOP2, 0x80000000 | SNOOP_SIZE_2GB);
+        }
 
         if ((pdata->operating_mode == FSL_USB2_DR_HOST) ||
                         (pdata->operating_mode == FSL_USB2_DR_OTG))