Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[sfrench/cifs-2.6.git] / arch / mips / alchemy / devboards / db1550.c

diff --git a/arch/mips/alchemy/devboards/db1550.c b/arch/mips/alchemy/devboards/db1550.c
index 7e89936f763e9a9c4e5a4c6572a416e6dcd8c547..0fd5177e35ab27bf2fa86dcbdf7e20c58073ddf0 100644 (file)
--- a/arch/mips/alchemy/devboards/db1550.c
+++ b/arch/mips/alchemy/devboards/db1550.c
@@ -34,12 +34,9 @@ static void __init db1550_hw_setup(void)
        void __iomem *base;
        unsigned long v;
 
-       /* complete SPI setup: link psc0_intclk to a 48MHz source,
-        * and assign GPIO16 to PSC0_SYNC1 (SPI cs# line) as well as PSC1_SYNC
-        * for AC97 on PB1550.
+       /* complete pin setup: assign GPIO16 to PSC0_SYNC1 (SPI cs# line)
+        * as well as PSC1_SYNC for AC97 on PB1550.
         */
-       v = alchemy_rdsys(AU1000_SYS_CLKSRC);
-       alchemy_wrsys(v | 0x000001e0, AU1000_SYS_CLKSRC);
        v = alchemy_rdsys(AU1000_SYS_PINFUNC);
        alchemy_wrsys(v | 1 | SYS_PF_PSC1_S1, AU1000_SYS_PINFUNC);
 
@@ -586,11 +583,13 @@ int __init db1550_dev_setup(void)
 
        c = clk_get(NULL, "psc0_intclk");
        if (!IS_ERR(c)) {
+               clk_set_rate(c, 50000000);
                clk_prepare_enable(c);
                clk_put(c);
        }
        c = clk_get(NULL, "psc2_intclk");
        if (!IS_ERR(c)) {
+               clk_set_rate(c, db1550_spi_platdata.mainclk_hz);
                clk_prepare_enable(c);
                clk_put(c);
        }