remove broken asoc-nau8825-fix-bug-in-fll-parameter.patch

diff --git a/queue-4.4/asoc-nau8825-fix-bug-in-fll-parameter.patch b/queue-4.4/asoc-nau8825-fix-bug-in-fll-parameter.patch
deleted file mode 100644 (file)
index 0e44c63..0000000
--- a/queue-4.4/asoc-nau8825-fix-bug-in-fll-parameter.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From a8961cae29c38e225120c40c3340dbde2f552e60 Mon Sep 17 00:00:00 2001
-From: John Hsu <KCHSU0@nuvoton.com>
-Date: Tue, 13 Sep 2016 11:56:03 +0800
-Subject: ASoC: nau8825: fix bug in FLL parameter
-
-From: John Hsu <KCHSU0@nuvoton.com>
-
-commit a8961cae29c38e225120c40c3340dbde2f552e60 upstream.
-
-In the FLL parameter calculation, the FVCO should choose the maximum one.
-The patch is to fix the bug about the wrong FVCO chosen.
-
-Signed-off-by: John Hsu <KCHSU0@nuvoton.com>
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- sound/soc/codecs/nau8825.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/sound/soc/codecs/nau8825.c
-+++ b/sound/soc/codecs/nau8825.c
-@@ -916,7 +916,7 @@ static int nau8825_calc_fll_param(unsign
-       /* Calculate the FLL 10-bit integer input and the FLL 16-bit fractional
-        * input based on FDCO, FREF and FLL ratio.
-        */
--      fvco = div_u64(fvco << 16, fref * fll_param->ratio);
-+      fvco = div_u64(fvco_max << 16, fref * fll_param->ratio);
-       fll_param->fll_int = (fvco >> 16) & 0x3FF;
-       fll_param->fll_frac = fvco & 0xFFFF;
-       return 0;

diff --git a/queue-4.4/series b/queue-4.4/series
index 1261969bb2bb1c47513bd59e11ff386754e22d07..efc3af2190ae3652a0467decc46de1231b822de2 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -6,7 +6,6 @@ fuse-invalidate-dir-dentry-after-chmod.patch
 fuse-fix-killing-sid-in-setattr.patch
 i40e-avoid-null-pointer-dereference-and-recursive-errors-on-early-pci-error.patch
 brcmfmac-fix-memory-leak-in-brcmf_fill_bss_param.patch
-asoc-nau8825-fix-bug-in-fll-parameter.patch
 asoc-intel-atom-add-a-missing-star-in-a-memcpy-call.patch
 reiserfs-unlock-superblock-before-calling-reiserfs_quota_on_mount.patch
 reiserfs-switch-to-generic_-get-set-remove-xattr.patch

diff --git a/queue-4.7/asoc-nau8825-fix-bug-in-fll-parameter.patch b/queue-4.7/asoc-nau8825-fix-bug-in-fll-parameter.patch
deleted file mode 100644 (file)
index 786240b..0000000
--- a/queue-4.7/asoc-nau8825-fix-bug-in-fll-parameter.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From a8961cae29c38e225120c40c3340dbde2f552e60 Mon Sep 17 00:00:00 2001
-From: John Hsu <KCHSU0@nuvoton.com>
-Date: Tue, 13 Sep 2016 11:56:03 +0800
-Subject: ASoC: nau8825: fix bug in FLL parameter
-
-From: John Hsu <KCHSU0@nuvoton.com>
-
-commit a8961cae29c38e225120c40c3340dbde2f552e60 upstream.
-
-In the FLL parameter calculation, the FVCO should choose the maximum one.
-The patch is to fix the bug about the wrong FVCO chosen.
-
-Signed-off-by: John Hsu <KCHSU0@nuvoton.com>
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- sound/soc/codecs/nau8825.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/sound/soc/codecs/nau8825.c
-+++ b/sound/soc/codecs/nau8825.c
-@@ -1015,7 +1015,7 @@ static int nau8825_calc_fll_param(unsign
-       /* Calculate the FLL 10-bit integer input and the FLL 16-bit fractional
-        * input based on FDCO, FREF and FLL ratio.
-        */
--      fvco = div_u64(fvco << 16, fref * fll_param->ratio);
-+      fvco = div_u64(fvco_max << 16, fref * fll_param->ratio);
-       fll_param->fll_int = (fvco >> 16) & 0x3FF;
-       fll_param->fll_frac = fvco & 0xFFFF;
-       return 0;

diff --git a/queue-4.7/series b/queue-4.7/series
index 9ee64ae2d212bc08dff0a90faba5909d02ced2bb..8a163e4cc610b9635a65bc86888a6b1e2c6539d5 100644 (file)
--- a/queue-4.7/series
+++ b/queue-4.7/series
@@ -23,7 +23,6 @@ xfs-change-mailing-list-address.patch
 brcmfmac-fix-pmksa-bssid-usage.patch
 brcmfmac-fix-memory-leak-in-brcmf_fill_bss_param.patch
 brcmfmac-use-correct-skb-freeing-helper-when-deleting-flowring.patch
-asoc-nau8825-fix-bug-in-fll-parameter.patch
 asoc-intel-atom-add-a-missing-star-in-a-memcpy-call.patch
 reiserfs-unlock-superblock-before-calling-reiserfs_quota_on_mount.patch
 async_pq_val-fix-dma-memory-leak.patch