Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge

3 files changed, 36 insertions, 10 deletions

diff --git a/arch/powerpc/platforms/83xx/mpc832x_mds.c b/arch/powerpc/platforms/83xx/mpc832x_mds.c
index 972fa8528a8c..9e3bfcca1cea 100644
--- a/arch/powerpc/platforms/83xx/mpc832x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc832x_mds.c
@@ -90,10 +90,11 @@ static void __init mpc832x_sys_setup_arch(void)
 
         if ((np = of_find_compatible_node(NULL, "network", "ucc_geth"))
                         != NULL){
-                /* Reset the Ethernet PHY */
-                bcsr_regs[9] &= ~0x20;
+                /* Reset the Ethernet PHYs */
+#define BCSR8_FETH_RST 0x50
+                bcsr_regs[8] &= ~BCSR8_FETH_RST;
                 udelay(1000);
-                bcsr_regs[9] |= 0x20;
+                bcsr_regs[8] |= BCSR8_FETH_RST;
                 iounmap(bcsr_regs);
                 of_node_put(np);
         }
diff --git a/arch/powerpc/platforms/83xx/mpc836x_mds.c b/arch/powerpc/platforms/83xx/mpc836x_mds.c
index 0f3855c95ff5..0a722601a2f0 100644
--- a/arch/powerpc/platforms/83xx/mpc836x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc836x_mds.c
@@ -96,14 +96,39 @@ static void __init mpc836x_mds_setup_arch(void)
 
         if ((np = of_find_compatible_node(NULL, "network", "ucc_geth"))
                         != NULL){
+                uint svid;
+
                 /* Reset the Ethernet PHY */
-                bcsr_regs[9] &= ~0x20;
+#define BCSR9_GETHRST 0x20
+                clrbits8(&bcsr_regs[9], BCSR9_GETHRST);
                 udelay(1000);
-                bcsr_regs[9] |= 0x20;
+                setbits8(&bcsr_regs[9], BCSR9_GETHRST);
+
+                /* handle mpc8360ea rev.2.1 erratum 2: RGMII Timing */
+                svid = mfspr(SPRN_SVR);
+                if (svid == 0x80480021) {
+                        void __iomem *immap;
+
+                        immap = ioremap(get_immrbase() + 0x14a8, 8);
+
+                        /*
+                         * IMMR + 0x14A8[4:5] = 11 (clk delay for UCC 2)
+                         * IMMR + 0x14A8[18:19] = 11 (clk delay for UCC 1)
+                         */
+                        setbits32(immap, 0x0c003000);
+
+                        /*
+                         * IMMR + 0x14AC[20:27] = 10101010
+                         * (data delay for both UCC's)
+                         */
+                        clrsetbits_be32(immap + 4, 0xff0, 0xaa0);
+
+                        iounmap(immap);
+                }
+
                 iounmap(bcsr_regs);
                 of_node_put(np);
         }
-
 #endif                          /* CONFIG_QUICC_ENGINE */
 }
 
diff --git a/arch/powerpc/platforms/83xx/usb.c b/arch/powerpc/platforms/83xx/usb.c
index eafe7605cdac..b45160f8d084 100644
--- a/arch/powerpc/platforms/83xx/usb.c
+++ b/arch/powerpc/platforms/83xx/usb.c
@@ -130,7 +130,7 @@ int mpc831x_usb_cfg(void)
         out_be32(immap + MPC83XX_SCCR_OFFS, temp);
 
         /* Configure pin mux for ULPI.  There is no pin mux for UTMI */
-        if (!strcmp(prop, "ulpi")) {
+        if (prop && !strcmp(prop, "ulpi")) {
                 temp = in_be32(immap + MPC83XX_SICRL_OFFS);
                 temp &= ~MPC831X_SICRL_USB_MASK;
                 temp |= MPC831X_SICRL_USB_ULPI;
@@ -153,13 +153,13 @@ int mpc831x_usb_cfg(void)
         usb_regs = ioremap(res.start, res.end - res.start + 1);
 
         /* Using on-chip PHY */
-        if (!strcmp(prop, "utmi_wide") ||
-                        !strcmp(prop, "utmi")) {
+        if (prop && (!strcmp(prop, "utmi_wide") ||
+                     !strcmp(prop, "utmi"))) {
                 /* Set UTMI_PHY_EN, REFSEL to 48MHZ */
                 out_be32(usb_regs + FSL_USB2_CONTROL_OFFS,
                                 CONTROL_UTMI_PHY_EN | CONTROL_REFSEL_48MHZ);
         /* Using external UPLI PHY */
-        } else if (!strcmp(prop, "ulpi")) {
+        } else if (prop && !strcmp(prop, "ulpi")) {
                 /* Set PHY_CLK_SEL to ULPI */
                 temp = CONTROL_PHY_CLK_SEL_ULPI;
 #ifdef CONFIG_USB_OTG