kernel: update linux 3.8 to 3.8.3

[openwrt/svn-archive/archive.git] / target / linux / lantiq / patches-3.8 / 0033-MTD-lantiq-xway-make-nand-actually-work.patch

diff --git a/target/linux/lantiq/patches-3.8/0033-MTD-lantiq-xway-make-nand-actually-work.patch b/target/linux/lantiq/patches-3.8/0033-MTD-lantiq-xway-make-nand-actually-work.patch
index 89044d57709f48cb62523cf4c15b76869a6dde01..92da4235b25a2edcac2da5f08f97ee65ed804cc1 100644 (file)
--- a/target/linux/lantiq/patches-3.8/0033-MTD-lantiq-xway-make-nand-actually-work.patch
+++ b/target/linux/lantiq/patches-3.8/0033-MTD-lantiq-xway-make-nand-actually-work.patch
@@ -10,8 +10,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  drivers/mtd/nand/xway_nand.c |   54 +++++++++++++++++++++++++++++++++++-------
  1 file changed, 45 insertions(+), 9 deletions(-)
 
-diff --git a/drivers/mtd/nand/xway_nand.c b/drivers/mtd/nand/xway_nand.c
-index 3f81dc8..49b2e47 100644
 --- a/drivers/mtd/nand/xway_nand.c
 +++ b/drivers/mtd/nand/xway_nand.c
 @@ -54,19 +54,29 @@
@@ -46,7 +44,7 @@ index 3f81dc8..49b2e47 100644
        spin_unlock_irqrestore(&ebu_lock, flags);
  }
  
-@@ -94,17 +104,15 @@ static void xway_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
+@@ -94,17 +104,15 @@ static void xway_cmd_ctrl(struct mtd_inf
        unsigned long flags;
  
        if (ctrl & NAND_CTRL_CHANGE) {
@@ -68,7 +66,7 @@ index 3f81dc8..49b2e47 100644
                while ((ltq_ebu_r32(EBU_NAND_WAIT) & NAND_WAIT_WR_C) == 0)
                        ;
                spin_unlock_irqrestore(&ebu_lock, flags);
-@@ -124,12 +132,38 @@ static unsigned char xway_read_byte(struct mtd_info *mtd)
+@@ -124,12 +132,38 @@ static unsigned char xway_read_byte(stru
        int ret;
  
        spin_lock_irqsave(&ebu_lock, flags);
@@ -108,7 +106,7 @@ index 3f81dc8..49b2e47 100644
  static int xway_nand_probe(struct platform_device *pdev)
  {
        struct nand_chip *this = platform_get_drvdata(pdev);
-@@ -175,6 +209,8 @@ static struct platform_nand_data xway_nand_data = {
+@@ -175,6 +209,8 @@ static struct platform_nand_data xway_na
                .dev_ready      = xway_dev_ready,
                .select_chip    = xway_select_chip,
                .read_byte      = xway_read_byte,
@@ -117,6 +115,3 @@ index 3f81dc8..49b2e47 100644
        }
  };
  
--- 
-1.7.10.4
-