Hauke, I want to make certain I get the updated patch right; I should integrate target/linux/generic/patches-3.18/043-mtd_GD25Q128B_support_backport_from_3.19.patch patch (which, because of its order, results in pushes down in some other flash files) and adjust the target/linux/bcm53xx/patches-3.18/004-mtd-spi-nor-from-3.20.patch to avoid a conflict because of the change?
Please confirm and I'll make the appropriate adjustments. Thank you for taking the time to review my submission, -JohnF On Sun, Apr 17, 2016 at 9:04 AM, Hauke Mehrtens <[email protected]> wrote: > On 04/17/2016 01:55 PM, John Marrett wrote: >> Recent Archer C7 V2.0 units have changed flash chips to the gd25q128 >> chip, this is supported in trunk but not presently in 15.05. I would >> like stable support for this version so I've back ported the required >> fix [1] from the upstream kernel. I've tried to place this patch in >> order with the other flash support patches. I've tested it and I'm >> able to install a build of 15.05.1 on the device with this patch. >> Wireless and other functionality appears to be working properly. >> >> This is my first submitted patch for OpenWrt, please let me know on >> list or off if there are any issues. >> >> [1] >> https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/drivers/mtd/spi-nor/spi-nor.c?id=fcc87a95195236b0935183361a72e4a98bf577d8 >> >> Signed-off-by: John Marrett <[email protected]> >> >> diff --git a/target/linux/ar71xx/patches-3.18/414-mtd-gd25q128-support.patch >> b/target/linux/ar71xx/ >> new file mode 100644 >> index 0000000..c4a0a94 >> --- /dev/null >> +++ b/target/linux/ar71xx/patches-3.18/414-mtd-gd25q128-support.patch >> @@ -0,0 +1,12 @@ >> +Index: linux-3.18.29/drivers/mtd/spi-nor/spi-nor.c >> +=================================================================== >> +--- linux-3.18.29.orig/drivers/mtd/spi-nor/spi-nor.c 2016-04-15 >> 20:02:47.709062050 -0400 >> ++++ linux-3.18.29/drivers/mtd/spi-nor/spi-nor.c 2016-04-16 >> 07:41:06.071314788 -0400 >> +@@ -510,6 +510,7 @@ >> + /* GigaDevice */ >> + { "gd25q32", INFO(0xc84016, 0, 64 * 1024, 64, SECT_4K) }, >> + { "gd25q64", INFO(0xc84017, 0, 64 * 1024, 128, SECT_4K) }, >> ++ { "gd25q128", INFO(0xc84018, 0, 64 * 1024, 256, SECT_4K) }, >> + >> + /* Intel/Numonyx -- xxxs33b */ >> + { "160s33b", INFO(0x898911, 0, 64 * 1024, 32, 0) }, > > This patch is already in trunk at > target/linux/generic/patches-3.18/043-mtd_GD25Q128B_support_backport_from_3.19.patch > could you also place your change to the generic folder to keep it in > sync with trunk. > > There is already a patch in cc for the bcm53xx target which also adds > this line here: > target/linux/bcm53xx/patches-3.18/004-mtd-spi-nor-from-3.20.patch this > has to be modified when you add your patch to generic. > > Hauke > _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
