diff options
author | Manuel Lauss <manuel.lauss@gmail.com> | 2014-08-18 11:10:32 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2014-08-25 20:18:53 -0400 |
commit | c6c7d7c343d97720f4e12678f661d262dafec6f7 (patch) | |
tree | 4e4a2088afd962f445fe2e5975ddbbecfad970fe /arch | |
parent | 4588b58d95c08880d5c67ad277ba534ffb37e7ba (diff) |
MIPS: Alchemy: Fix db1200 PSC clock enablement
Enable PSC0 (I2C/SPI) clock and leave PSC1 (Audio) alone. This patch
restores functionality to both Audio and I2C/SPI.
Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
Cc: Linux-MIPS <linux-mips@linux-mips.org>
Patchwork: https://patchwork.linux-mips.org/patch/7544/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/mips/alchemy/devboards/db1200.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/mips/alchemy/devboards/db1200.c b/arch/mips/alchemy/devboards/db1200.c index 776188908dfc..8c13675a12e7 100644 --- a/arch/mips/alchemy/devboards/db1200.c +++ b/arch/mips/alchemy/devboards/db1200.c | |||
@@ -847,6 +847,7 @@ int __init db1200_dev_setup(void) | |||
847 | pr_warn("DB1200: cant get I2C close to 50MHz\n"); | 847 | pr_warn("DB1200: cant get I2C close to 50MHz\n"); |
848 | else | 848 | else |
849 | clk_set_rate(c, pfc); | 849 | clk_set_rate(c, pfc); |
850 | clk_prepare_enable(c); | ||
850 | clk_put(c); | 851 | clk_put(c); |
851 | } | 852 | } |
852 | 853 | ||
@@ -922,11 +923,6 @@ int __init db1200_dev_setup(void) | |||
922 | } | 923 | } |
923 | 924 | ||
924 | /* Audio PSC clock is supplied externally. (FIXME: platdata!!) */ | 925 | /* Audio PSC clock is supplied externally. (FIXME: platdata!!) */ |
925 | c = clk_get(NULL, "psc1_intclk"); | ||
926 | if (!IS_ERR(c)) { | ||
927 | clk_prepare_enable(c); | ||
928 | clk_put(c); | ||
929 | } | ||
930 | __raw_writel(PSC_SEL_CLK_SERCLK, | 926 | __raw_writel(PSC_SEL_CLK_SERCLK, |
931 | (void __iomem *)KSEG1ADDR(AU1550_PSC1_PHYS_ADDR) + PSC_SEL_OFFSET); | 927 | (void __iomem *)KSEG1ADDR(AU1550_PSC1_PHYS_ADDR) + PSC_SEL_OFFSET); |
932 | wmb(); | 928 | wmb(); |