kernel: fix DMA error when BCM4331 is connected to BCM4706

[openwrt/svn-archive/archive.git] / target / linux / generic / patches-3.9 / 863-gpiommc.patch

diff --git a/target/linux/generic/patches-3.9/863-gpiommc.patch b/target/linux/generic/patches-3.9/863-gpiommc.patch
index 6c3dce21c556f205ec51497df4d9211647d2cc1d..8dd546d1b0be5ad39bd2287df3eaed75d81a42b1 100644 (file)
--- a/target/linux/generic/patches-3.9/863-gpiommc.patch
+++ b/target/linux/generic/patches-3.9/863-gpiommc.patch
@@ -357,7 +357,7 @@
 +      unsigned long data;
 +
 +      if (attr == &gpiommc_attr_register) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -378,7 +378,7 @@
 +      }
 +
 +      if (attr == &gpiommc_attr_DI) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -389,7 +389,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_DO) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -400,7 +400,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_CLK) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -411,7 +411,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_CS) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -422,7 +422,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_CS_activelow) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -433,7 +433,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_spimode) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -457,7 +457,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_spidelay) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -468,7 +468,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_max_bus_speed) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -612,7 +612,7 @@
 +module_exit(gpiommc_modexit);
 --- a/drivers/mmc/host/Kconfig
 +++ b/drivers/mmc/host/Kconfig
-@@ -473,6 +473,31 @@ config MMC_SDHI
+@@ -463,6 +463,31 @@ config MMC_SDHI
          This provides support for the SDHI SD/SDIO controller found in
          SuperH and ARM SH-Mobile SoCs
  
@@ -830,7 +830,7 @@
 +be done automatically.
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -3600,6 +3600,11 @@ L:      linuxppc-dev@lists.ozlabs.org
+@@ -3606,6 +3606,11 @@ L:      linuxppc-dev@lists.ozlabs.org
  S:    Odd Fixes
  F:    drivers/tty/hvc/