diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-22 15:04:56 +0200 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-22 15:04:56 +0200 |
| commit | b99374450c03bf5081b88995d91d34fb9b2fd040 (patch) | |
| tree | b6f525d915504ad8bd99bdb2dadcca345a4ad3a3 /sound/soc/samsung/audss.c | |
| parent | a39819e88ea4546218b581d7f061a99ca91d825b (diff) | |
| parent | e2f984e707f517f24041b70018770b20b71cb6a6 (diff) | |
| download | kernel_samsung_smdk4412-b99374450c03bf5081b88995d91d34fb9b2fd040.zip kernel_samsung_smdk4412-b99374450c03bf5081b88995d91d34fb9b2fd040.tar.gz kernel_samsung_smdk4412-b99374450c03bf5081b88995d91d34fb9b2fd040.tar.bz2 | |
Merge remote-tracking branch 'github/cm-11.0'
Conflicts:
firmware/Makefile
firmware/epen/W9001_B713.bin.ihex
firmware/epen/W9001_B746.bin.ihex
firmware/epen/W9001_B746JD.bin.ihex
firmware/epen/W9001_B746L.bin.ihex
firmware/epen/W9001_B746S.bin.ihex
Diffstat (limited to 'sound/soc/samsung/audss.c')
| -rw-r--r-- | sound/soc/samsung/audss.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/samsung/audss.c b/sound/soc/samsung/audss.c index a5300de..d0da54c 100644 --- a/sound/soc/samsung/audss.c +++ b/sound/soc/samsung/audss.c @@ -138,9 +138,9 @@ void audss_reg_restore(void) if (!audss.reg_saved) return; - writel(audss.suspend_audss_clksrc, S5P_CLKSRC_AUDSS); - writel(audss.suspend_audss_clkdiv, S5P_CLKDIV_AUDSS); writel(audss.suspend_audss_clkgate, S5P_CLKGATE_AUDSS); + writel(audss.suspend_audss_clkdiv, S5P_CLKDIV_AUDSS); + writel(audss.suspend_audss_clksrc, S5P_CLKSRC_AUDSS); audss.reg_saved = false; pr_debug("%s: Successfully restored audss reg\n", __func__); |