From c0fd27ae720f08b264115b8cfbce414662a96c89 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Mon, 10 Nov 2014 22:51:30 +0000 Subject: kernel: update kernel 3.18 to rc4 Signed-off-by: Hauke Mehrtens git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43229 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/bcm53xx/config-3.18 | 13 --------- ...-allow-NULL-as-spi_device_id-in-spi_nor_s.patch | 6 ++-- .../403-mtd-spi-nor-refactor-wait-till-ready.patch | 32 +++++++++++----------- ...spiflash-new-driver-for-SPI-flahes-on-Bro.patch | 12 ++++---- ...spiflash-try-using-JEDEC-as-one-of-method.patch | 8 +++--- 5 files changed, 29 insertions(+), 42 deletions(-) (limited to 'target/linux/bcm53xx') diff --git a/target/linux/bcm53xx/config-3.18 b/target/linux/bcm53xx/config-3.18 index e31a24f0da..3d6f3cdef7 100644 --- a/target/linux/bcm53xx/config-3.18 +++ b/target/linux/bcm53xx/config-3.18 @@ -50,7 +50,6 @@ CONFIG_ARM_THUMB=y # CONFIG_ARM_THUMBEE is not set CONFIG_ARM_VIRT_EXT=y CONFIG_ATAGS=y -# CONFIG_ATMEL_PIT is not set # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set CONFIG_AUTO_ZRELADDR=y CONFIG_B53=y @@ -68,7 +67,6 @@ CONFIG_BCMA_HOST_PCI=y CONFIG_BCMA_HOST_PCI_POSSIBLE=y CONFIG_BCMA_HOST_SOC=y CONFIG_BGMAC=y -# CONFIG_BUILD_BIN2C is not set CONFIG_CACHE_L2X0=y CONFIG_CACHE_PL310=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y @@ -97,7 +95,6 @@ CONFIG_CRC16=y CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_LZO=y CONFIG_CRYPTO_XZ=y -# CONFIG_CXL_BASE is not set CONFIG_DCACHE_WORD_ACCESS=y CONFIG_DEBUG_BCM_5301X=y CONFIG_DEBUG_INFO=y @@ -116,7 +113,6 @@ CONFIG_DEBUG_UNCOMPRESS=y CONFIG_DEBUG_USER=y CONFIG_DTC=y CONFIG_EARLY_PRINTK=y -# CONFIG_EM_TIMER_STI is not set CONFIG_FRAME_POINTER=y CONFIG_GENERIC_ALLOCATOR=y CONFIG_GENERIC_BUG=y @@ -201,14 +197,11 @@ CONFIG_MDIO_BOARDINFO=y CONFIG_MIGHT_HAVE_CACHE_L2X0=y CONFIG_MIGHT_HAVE_PCI=y CONFIG_MODULES_USE_ELF_REL=y -# CONFIG_MODULE_COMPRESS is not set CONFIG_MTD_BCM47XX_PARTS=y CONFIG_MTD_NAND=y CONFIG_MTD_NAND_BCM=y CONFIG_MTD_NAND_ECC=y -# CONFIG_MTD_NAND_OMAP_BCH_BUILD is not set # CONFIG_MTD_PHYSMAP_OF is not set -# CONFIG_MTD_SM_COMMON is not set CONFIG_MTD_SPI_BCM53XXSPIFLASH=y CONFIG_MTD_SPI_NOR=y # CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set @@ -222,8 +215,6 @@ CONFIG_MULTI_IRQ_HANDLER=y CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NET_FLOW_LIMIT=y -# CONFIG_NET_PTP_CLASSIFY is not set -# CONFIG_NET_UDP_TUNNEL is not set CONFIG_NO_BOOTMEM=y CONFIG_NR_CPUS=4 CONFIG_OF=y @@ -264,9 +255,6 @@ CONFIG_SCHED_HRTICK=y # CONFIG_SCSI_DMA is not set CONFIG_SERIAL_EARLYCON=y CONFIG_SERIAL_OF_PLATFORM=y -# CONFIG_SH_TIMER_CMT is not set -# CONFIG_SH_TIMER_MTU2 is not set -# CONFIG_SH_TIMER_TMU is not set CONFIG_SMP=y CONFIG_SMP_ON_UP=y CONFIG_SPARSE_IRQ=y @@ -288,7 +276,6 @@ CONFIG_UBIFS_FS_XZ=y CONFIG_UBIFS_FS_ZLIB=y CONFIG_UID16=y CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" -# CONFIG_UPROBES is not set CONFIG_USB_SUPPORT=y CONFIG_USE_OF=y CONFIG_VECTORS_BASE=0xffff0000 diff --git a/target/linux/bcm53xx/patches-3.18/402-mtd-spi-nor-allow-NULL-as-spi_device_id-in-spi_nor_s.patch b/target/linux/bcm53xx/patches-3.18/402-mtd-spi-nor-allow-NULL-as-spi_device_id-in-spi_nor_s.patch index de1e506255..b72e2e2613 100644 --- a/target/linux/bcm53xx/patches-3.18/402-mtd-spi-nor-allow-NULL-as-spi_device_id-in-spi_nor_s.patch +++ b/target/linux/bcm53xx/patches-3.18/402-mtd-spi-nor-allow-NULL-as-spi_device_id-in-spi_nor_s.patch @@ -1,8 +1,8 @@ --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -926,29 +926,23 @@ int spi_nor_scan(struct spi_nor *nor, co - if (ret) - return ret; +@@ -931,29 +931,23 @@ int spi_nor_scan(struct spi_nor *nor, co + if (!id) + return -ENOENT; - info = (void *)id->driver_data; - diff --git a/target/linux/bcm53xx/patches-3.18/403-mtd-spi-nor-refactor-wait-till-ready.patch b/target/linux/bcm53xx/patches-3.18/403-mtd-spi-nor-refactor-wait-till-ready.patch index c274a7e80c..08e53a7418 100644 --- a/target/linux/bcm53xx/patches-3.18/403-mtd-spi-nor-refactor-wait-till-ready.patch +++ b/target/linux/bcm53xx/patches-3.18/403-mtd-spi-nor-refactor-wait-till-ready.patch @@ -36,7 +36,7 @@ return ret; --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -163,81 +163,69 @@ static inline int set_4byte(struct spi_n +@@ -165,81 +165,69 @@ static inline int set_4byte(struct spi_n return nor->write_reg(nor, SPINOR_OP_BRWR, nor->cmd_buf, 1, 0); } } @@ -154,7 +154,7 @@ return nor->write_reg(nor, SPINOR_OP_CHIP_ERASE, NULL, 0, 0); } -@@ -290,6 +278,8 @@ static int spi_nor_erase(struct mtd_info +@@ -292,6 +280,8 @@ static int spi_nor_erase(struct mtd_info if (ret) return ret; @@ -163,7 +163,7 @@ /* whole-chip erase? */ if (len == mtd->size) { if (erase_chip(nor)) { -@@ -297,6 +287,10 @@ static int spi_nor_erase(struct mtd_info +@@ -299,6 +289,10 @@ static int spi_nor_erase(struct mtd_info goto erase_err; } @@ -174,7 +174,7 @@ /* REVISIT in some cases we could speed up erasing large regions * by using SPINOR_OP_SE instead of SPINOR_OP_BE_4K. We may have set up * to use "small sector erase", but that's not always optimal. -@@ -312,9 +306,15 @@ static int spi_nor_erase(struct mtd_info +@@ -314,9 +308,15 @@ static int spi_nor_erase(struct mtd_info addr += mtd->erasesize; len -= mtd->erasesize; @@ -190,7 +190,7 @@ spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_ERASE); instr->state = MTD_ERASE_DONE; -@@ -339,11 +339,6 @@ static int spi_nor_lock(struct mtd_info +@@ -341,11 +341,6 @@ static int spi_nor_lock(struct mtd_info if (ret) return ret; @@ -202,7 +202,7 @@ status_old = read_sr(nor); if (offset < mtd->size - (mtd->size / 2)) -@@ -386,11 +381,6 @@ static int spi_nor_unlock(struct mtd_inf +@@ -388,11 +383,6 @@ static int spi_nor_unlock(struct mtd_inf if (ret) return ret; @@ -214,7 +214,7 @@ status_old = read_sr(nor); if (offset+len > mtd->size - (mtd->size / 64)) -@@ -703,11 +693,6 @@ static int sst_write(struct mtd_info *mt +@@ -704,11 +694,6 @@ static int sst_write(struct mtd_info *mt if (ret) return ret; @@ -226,7 +226,7 @@ write_enable(nor); nor->sst_write_second = false; -@@ -719,7 +704,7 @@ static int sst_write(struct mtd_info *mt +@@ -720,7 +705,7 @@ static int sst_write(struct mtd_info *mt /* write one byte. */ nor->write(nor, to, 1, retlen, buf); @@ -235,7 +235,7 @@ if (ret) goto time_out; } -@@ -731,7 +716,7 @@ static int sst_write(struct mtd_info *mt +@@ -732,7 +717,7 @@ static int sst_write(struct mtd_info *mt /* write two bytes. */ nor->write(nor, to, 2, retlen, buf + actual); @@ -244,7 +244,7 @@ if (ret) goto time_out; to += 2; -@@ -740,7 +725,7 @@ static int sst_write(struct mtd_info *mt +@@ -741,7 +726,7 @@ static int sst_write(struct mtd_info *mt nor->sst_write_second = false; write_disable(nor); @@ -253,7 +253,7 @@ if (ret) goto time_out; -@@ -751,7 +736,7 @@ static int sst_write(struct mtd_info *mt +@@ -752,7 +737,7 @@ static int sst_write(struct mtd_info *mt nor->program_opcode = SPINOR_OP_BP; nor->write(nor, to, 1, retlen, buf + actual); @@ -262,7 +262,7 @@ if (ret) goto time_out; write_disable(nor); -@@ -779,11 +764,6 @@ static int spi_nor_write(struct mtd_info +@@ -780,11 +765,6 @@ static int spi_nor_write(struct mtd_info if (ret) return ret; @@ -274,7 +274,7 @@ write_enable(nor); page_offset = to & (nor->page_size - 1); -@@ -802,16 +782,20 @@ static int spi_nor_write(struct mtd_info +@@ -803,16 +783,20 @@ static int spi_nor_write(struct mtd_info if (page_size > nor->page_size) page_size = nor->page_size; @@ -297,7 +297,7 @@ } static int macronix_quad_enable(struct spi_nor *nor) -@@ -824,7 +808,7 @@ static int macronix_quad_enable(struct s +@@ -825,7 +809,7 @@ static int macronix_quad_enable(struct s nor->cmd_buf[0] = val | SR_QUAD_EN_MX; nor->write_reg(nor, SPINOR_OP_WRSR, nor->cmd_buf, 1, 0); @@ -306,7 +306,7 @@ return 1; ret = read_sr(nor); -@@ -906,8 +890,6 @@ static int spi_nor_check(struct spi_nor +@@ -907,8 +891,6 @@ static int spi_nor_check(struct spi_nor if (!nor->read_id) nor->read_id = spi_nor_read_id; @@ -315,7 +315,7 @@ return 0; } -@@ -978,9 +960,8 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -983,9 +965,8 @@ int spi_nor_scan(struct spi_nor *nor, co else mtd->_write = spi_nor_write; diff --git a/target/linux/bcm53xx/patches-3.18/404-mtd-bcm53xxspiflash-new-driver-for-SPI-flahes-on-Bro.patch b/target/linux/bcm53xx/patches-3.18/404-mtd-bcm53xxspiflash-new-driver-for-SPI-flahes-on-Bro.patch index 9a9d903f82..80e1d324d7 100644 --- a/target/linux/bcm53xx/patches-3.18/404-mtd-bcm53xxspiflash-new-driver-for-SPI-flahes-on-Bro.patch +++ b/target/linux/bcm53xx/patches-3.18/404-mtd-bcm53xxspiflash-new-driver-for-SPI-flahes-on-Bro.patch @@ -198,11 +198,11 @@ + return ERR_PTR(-ENODEV); + +found_name: -+ id = spi_nor_match_id(name); -+ if (!id) { -+ dev_err(dev, "No matching entry for %s flash\n", name); -+ return ERR_PTR(-ENOENT); -+ } ++// id = spi_nor_match_id(name); ++// if (!id) { ++// dev_err(dev, "No matching entry for %s flash\n", name); ++// return ERR_PTR(-ENOENT); ++// } + + return id; +} @@ -235,7 +235,7 @@ + b53sf->nor.read_id = bcm53xxspiflash_read_id; + b53sf->nor.priv = b53sf; + -+ err = spi_nor_scan(&b53sf->nor, NULL, SPI_NOR_NORMAL); ++ err = spi_nor_scan(&b53sf->nor, "w25q128", SPI_NOR_NORMAL); + if (err) + return err; + diff --git a/target/linux/bcm53xx/patches-3.18/405-mtd-bcm53xxspiflash-try-using-JEDEC-as-one-of-method.patch b/target/linux/bcm53xx/patches-3.18/405-mtd-bcm53xxspiflash-try-using-JEDEC-as-one-of-method.patch index 04d0058d75..d97441f586 100644 --- a/target/linux/bcm53xx/patches-3.18/405-mtd-bcm53xxspiflash-try-using-JEDEC-as-one-of-method.patch +++ b/target/linux/bcm53xx/patches-3.18/405-mtd-bcm53xxspiflash-try-using-JEDEC-as-one-of-method.patch @@ -9,19 +9,19 @@ + return spi_nor_read_id(nor); found_name: - id = spi_nor_match_id(name); + // id = spi_nor_match_id(name); --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -630,7 +630,7 @@ const struct spi_device_id spi_nor_ids[] +@@ -631,7 +631,7 @@ static const struct spi_device_id spi_no + { }, }; - EXPORT_SYMBOL_GPL(spi_nor_ids); -static const struct spi_device_id *spi_nor_read_id(struct spi_nor *nor) +const struct spi_device_id *spi_nor_read_id(struct spi_nor *nor) { int tmp; u8 id[5]; -@@ -661,6 +661,7 @@ static const struct spi_device_id *spi_n +@@ -662,6 +662,7 @@ static const struct spi_device_id *spi_n dev_err(nor->dev, "unrecognized JEDEC id %06x\n", jedec); return ERR_PTR(-ENODEV); } -- cgit v1.2.3