[package] base-files: disable ipv6 on bridge ports, this prevents stray RA assigned...

[openwrt.git] / target / linux / xburst / patches-2.6.35 / 054-mmc.patch

diff --git a/target/linux/xburst/patches-2.6.35/054-mmc.patch b/target/linux/xburst/patches-2.6.35/054-mmc.patch
index 842dcac..1a07655 100644 (file)
--- a/target/linux/xburst/patches-2.6.35/054-mmc.patch
+++ b/target/linux/xburst/patches-2.6.35/054-mmc.patch
@@ -1,4 +1,4 @@
-From 34e75141dfd8edae48030b61741c294fd0f952b1 Mon Sep 17 00:00:00 2001
+From 11bc6d97096ab89da31f628c89b19ff37dfdd526 Mon Sep 17 00:00:00 2001

 From: Lars-Peter Clausen <lars@metafoo.de>
 Date: Thu, 15 Jul 2010 20:06:04 +0000
 Subject: [PATCH] MMC: Add support for the controller on JZ4740 SoCs.
 From: Lars-Peter Clausen <lars@metafoo.de>
 Date: Thu, 15 Jul 2010 20:06:04 +0000
 Subject: [PATCH] MMC: Add support for the controller on JZ4740 SoCs.


@@ -16,8 +16,8 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  arch/mips/include/asm/mach-jz4740/jz4740_mmc.h |   15 +
  drivers/mmc/host/Kconfig                       |    9 +
  drivers/mmc/host/Makefile                      |    1 +
  arch/mips/include/asm/mach-jz4740/jz4740_mmc.h |   15 +
  drivers/mmc/host/Kconfig                       |    9 +
  drivers/mmc/host/Makefile                      |    1 +

- drivers/mmc/host/jz4740_mmc.c                  | 1033 ++++++++++++++++++++++++
- 4 files changed, 1058 insertions(+), 0 deletions(-)
+ drivers/mmc/host/jz4740_mmc.c                  | 1029 ++++++++++++++++++++++++
+ 4 files changed, 1054 insertions(+), 0 deletions(-)

  create mode 100644 arch/mips/include/asm/mach-jz4740/jz4740_mmc.h
  create mode 100644 drivers/mmc/host/jz4740_mmc.c
 
  create mode 100644 arch/mips/include/asm/mach-jz4740/jz4740_mmc.h
  create mode 100644 drivers/mmc/host/jz4740_mmc.c
 


@@ -66,7 +66,7 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  sdhci-of-y                            := sdhci-of-core.o
 --- /dev/null
 +++ b/drivers/mmc/host/jz4740_mmc.c
  sdhci-of-y                            := sdhci-of-core.o
 --- /dev/null
 +++ b/drivers/mmc/host/jz4740_mmc.c

-@@ -0,0 +1,1033 @@
+@@ -0,0 +1,1029 @@

 +/*
 + *  Copyright (C) 2009-2010, Lars-Peter Clausen <lars@metafoo.de>
 + *  JZ4740 SD/MMC controller driver
 +/*
 + *  Copyright (C) 2009-2010, Lars-Peter Clausen <lars@metafoo.de>
 + *  JZ4740 SD/MMC controller driver


@@ -830,24 +830,20 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
 +static int __devinit jz4740_mmc_request_cd_irq(struct platform_device *pdev,
 +      struct jz4740_mmc_host *host)
 +{
 +static int __devinit jz4740_mmc_request_cd_irq(struct platform_device *pdev,
 +      struct jz4740_mmc_host *host)
 +{

-+      int ret;

 +      struct jz4740_mmc_platform_data *pdata = pdev->dev.platform_data;
 +
 +      struct jz4740_mmc_platform_data *pdata = pdev->dev.platform_data;
 +

-+      if (gpio_is_valid(pdata->gpio_card_detect))
++      if (!gpio_is_valid(pdata->gpio_card_detect))

 +              return 0;
 +
 +      host->card_detect_irq = gpio_to_irq(pdata->gpio_card_detect);
 +              return 0;
 +
 +      host->card_detect_irq = gpio_to_irq(pdata->gpio_card_detect);

-+

 +      if (host->card_detect_irq < 0) {
 +              dev_warn(&pdev->dev, "Failed to get card detect irq\n");
 +              return 0;
 +      }
 +      if (host->card_detect_irq < 0) {
 +              dev_warn(&pdev->dev, "Failed to get card detect irq\n");
 +              return 0;
 +      }

++

 +      return request_irq(host->card_detect_irq, jz4740_mmc_card_detect_irq,
 +                      IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
 +                      "MMC card detect", host);
 +      return request_irq(host->card_detect_irq, jz4740_mmc_card_detect_irq,
 +                      IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
 +                      "MMC card detect", host);

-+
-+
-+      return ret;

 +}
 +
 +static void jz4740_mmc_free_gpios(struct platform_device *pdev)
 +}
 +
 +static void jz4740_mmc_free_gpios(struct platform_device *pdev)