[OpenWrt-Devel] [PATCHv2] [kernel] Support for new Archer C7 with gd25q128 chip in 15.05.1

Hauke Mehrtens hauke at hauke-m.de
Tue Apr 19 16:24:49 EDT 2016


On 04/18/2016 09:45 PM, John Marrett wrote:
> I've updated the patch based on Hauke's feedback. I'm removing the
> update info from existing patch
> target/linux/bcm53xx/patches-3.18/004-mtd-spi-nor-from-3.20.patch and
> using the name target/linux/generic/patches-3.18/043-mtd_GD25Q128B_support
> matching the patch from trunk.

Please use a better description like in the first version.

> Signed-off-by: John Marrett <johnf at zioncluster.ca>
>
> diff --git a/target/linux/bcm53xx/patches-3.18/004-mtd-spi-nor-from-3.20.patch
> b/target/linux/bcm53xx/patches-3.18/004-mtd-spi-nor-from-3.20.patch
> index ab7b0bb..acdbb1f 100644
> --- a/target/linux/bcm53xx/patches-3.18/004-mtd-spi-nor-from-3.20.patch
> +++ b/target/linux/bcm53xx/patches-3.18/004-mtd-spi-nor-from-3.20.patch
> @@ -1,13 +1,5 @@
>  --- a/drivers/mtd/spi-nor/spi-nor.c
>  +++ b/drivers/mtd/spi-nor/spi-nor.c
> -@@ -538,6 +538,7 @@ static const struct spi_device_id spi_no
> -       /* 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) },
>  @@ -564,14 +565,14 @@ static const struct spi_device_id spi_no
>         { "mx66l1g55g",  INFO(0xc2261b, 0, 64 * 1024, 2048,
> SPI_NOR_QUAD_READ) },

This is whitespace broken here and does not apply for me with "git am".
I would suggest to use "git format-patch" and then "git send-email" and
try to send it to you first and try to apply it with "git am", when that
works send it to the list.

> diff --git a/target/linux/generic/patches-3.18/043-mtd_GD25Q128B_support_backport_from_3.19.patch
> b/target/linux/generic/patches-3.18/043-mtd_GD25Q128B_support
> new file mode 100644
> index 0000000..2f0fc18
> --- /dev/null
> +++ b/target/linux/generic/patches-3.18/043-mtd_GD25Q128B_support_backport_from_3.19.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-18
> 11:31:18.970916900 -0400
> ++++ linux-3.18.29/drivers/mtd/spi-nor/spi-nor.c        2016-04-18
> 11:40:17.401622014 -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) },
> _______________________________________________
> openwrt-devel mailing list
> openwrt-devel at lists.openwrt.org
> https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
> 
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


More information about the openwrt-devel mailing list