linux-spi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
To: Brian Norris <computersforpeace-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: linux-mtd-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
	Huang Shijie <b32955-KZfg59tc24xl57MIdRCFDg@public.gmane.org>,
	linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	Marek Vasut <marex-ynQEQJNshbs@public.gmane.org>
Subject: Re: [PATCH 7/9] mtd: st_spi_fsm: kill duplicate CMD definitions
Date: Thu, 10 Apr 2014 08:56:53 +0100	[thread overview]
Message-ID: <20140410075653.GI4214@lee--X1> (raw)
In-Reply-To: <1397064774-31784-7-git-send-email-computersforpeace-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>

> These are also in serial_flash_cmds.h. (FWIW, I didn't know the C
> preprocessor allowed redefinitions without warning like this.)

Right, I would have expected that too. I'll investigate.

JOOI, have you build tested your changes?

Non-tested:
  Acked-by: Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>

> Signed-off-by: Brian Norris <computersforpeace-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> ---
>  drivers/mtd/devices/st_spi_fsm.c | 36 ------------------------------------
>  1 file changed, 36 deletions(-)
> 
> diff --git a/drivers/mtd/devices/st_spi_fsm.c b/drivers/mtd/devices/st_spi_fsm.c
> index 30082a09f68b..122a8a14ef84 100644
> --- a/drivers/mtd/devices/st_spi_fsm.c
> +++ b/drivers/mtd/devices/st_spi_fsm.c
> @@ -201,42 +201,6 @@
>  
>  #define STFSM_MAX_WAIT_SEQ_MS  1000     /* FSM execution time */
>  
> -/* Flash Commands */
> -#define FLASH_CMD_WREN         0x06
> -#define FLASH_CMD_WRDI         0x04
> -#define FLASH_CMD_RDID         0x9f
> -#define FLASH_CMD_RDSR         0x05
> -#define FLASH_CMD_RDSR2                0x35
> -#define FLASH_CMD_WRSR         0x01
> -#define FLASH_CMD_SE_4K                0x20
> -#define FLASH_CMD_SE_32K       0x52
> -#define FLASH_CMD_SE           0xd8
> -#define FLASH_CMD_CHIPERASE    0xc7
> -
> -#define FLASH_CMD_READ         0x03    /* READ */
> -#define FLASH_CMD_READ_FAST    0x0b    /* FAST READ */
> -#define FLASH_CMD_READ_1_1_2   0x3b    /* DUAL OUTPUT READ */
> -#define FLASH_CMD_READ_1_2_2   0xbb    /* DUAL I/O READ */
> -#define FLASH_CMD_READ_1_1_4   0x6b    /* QUAD OUTPUT READ */
> -#define FLASH_CMD_READ_1_4_4   0xeb    /* QUAD I/O READ */
> -
> -#define FLASH_CMD_WRITE                0x02    /* PAGE PROGRAM */
> -#define FLASH_CMD_WRITE_1_1_2  0xa2    /* DUAL INPUT PROGRAM */
> -#define FLASH_CMD_WRITE_1_2_2  0xd2    /* DUAL INPUT EXT PROGRAM */
> -#define FLASH_CMD_WRITE_1_1_4  0x32    /* QUAD INPUT PROGRAM */
> -#define FLASH_CMD_WRITE_1_4_4  0x12    /* QUAD INPUT EXT PROGRAM */
> -
> -#define FLASH_CMD_EN4B_ADDR    0xb7    /* Enter 4-byte address mode */
> -#define FLASH_CMD_EX4B_ADDR    0xe9    /* Exit 4-byte address mode */
> -
> -/* READ commands with 32-bit addressing (N25Q256 and S25FLxxxS) */
> -#define FLASH_CMD_READ4                0x13
> -#define FLASH_CMD_READ4_FAST   0x0c
> -#define FLASH_CMD_READ4_1_1_2  0x3c
> -#define FLASH_CMD_READ4_1_2_2  0xbc
> -#define FLASH_CMD_READ4_1_1_4  0x6c
> -#define FLASH_CMD_READ4_1_4_4  0xec
> -
>  /* S25FLxxxS commands */
>  #define S25FL_CMD_WRITE4_1_1_4 0x34
>  #define S25FL_CMD_SE4          0xdc

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

  parent reply	other threads:[~2014-04-10  7:56 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-09 17:32 [PATCH 1/9] mtd: spi-nor: drop \t after #define Brian Norris
     [not found] ` <1397064774-31784-1-git-send-email-computersforpeace-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-04-09 17:32   ` [PATCH 2/9] mtd: spi-nor: re-name OPCODE_* to SPINOR_OP_* Brian Norris
     [not found]     ` <1397064774-31784-2-git-send-email-computersforpeace-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-04-09 17:41       ` Marek Vasut
2014-04-10  7:42       ` Huang Shijie
2014-04-09 17:32   ` [PATCH 3/9] mtd: spi-nor: unify read opcode variants with ST SPI FSM Brian Norris
     [not found]     ` <1397064774-31784-3-git-send-email-computersforpeace-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-04-09 17:41       ` Marek Vasut
2014-04-10  7:43       ` Huang Shijie
2014-04-10  7:47       ` Huang Shijie
2014-04-10 19:34         ` Brian Norris
2014-04-09 17:32   ` [PATCH 4/9] Documentation: spi-nor: rewrite some portions Brian Norris
     [not found]     ` <1397064774-31784-4-git-send-email-computersforpeace-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-04-09 17:44       ` Marek Vasut
     [not found]         ` <201404091944.15631.marex-ynQEQJNshbs@public.gmane.org>
2014-04-09 18:14           ` Brian Norris
2014-04-09 17:32   ` [PATCH 5/9] mtd: spi-nor: shorten Kconfig naming Brian Norris
     [not found]     ` <1397064774-31784-5-git-send-email-computersforpeace-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-04-09 17:44       ` Marek Vasut
2014-04-10  7:39       ` Huang Shijie
2014-04-09 17:32   ` [PATCH 6/9] mtd: st_spi_fsm: fixup Kconfig dependency Brian Norris
     [not found]     ` <1397064774-31784-6-git-send-email-computersforpeace-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-04-10  7:57       ` Lee Jones
2014-04-09 17:32   ` [PATCH 7/9] mtd: st_spi_fsm: kill duplicate CMD definitions Brian Norris
     [not found]     ` <1397064774-31784-7-git-send-email-computersforpeace-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-04-10  7:56       ` Lee Jones [this message]
2014-04-10 18:58         ` Brian Norris
2014-04-10 18:01       ` Geert Uytterhoeven
     [not found]         ` <CAMuHMdWu7YVO_RD-SUfaTw1Jp97i5bm8iX5TzKeqgWAk_iN5qQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-04-10 18:59           ` Brian Norris
2014-04-09 17:32   ` [PATCH 8/9] mtd: st_spi_fsm: replace FLACH_CMD_* with SPINOR_OP_* Brian Norris
     [not found]     ` <1397064774-31784-8-git-send-email-computersforpeace-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-04-10  7:52       ` Lee Jones
2014-04-09 17:32   ` [PATCH 9/9] mtd: st_spi_fsm: begin using spi-nor.h opcodes Brian Norris
     [not found]     ` <1397064774-31784-9-git-send-email-computersforpeace-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-04-10  7:50       ` Lee Jones
2014-04-09 17:40   ` [PATCH 1/9] mtd: spi-nor: drop \t after #define Marek Vasut
     [not found]     ` <201404091940.14392.marex-ynQEQJNshbs@public.gmane.org>
2014-04-09 17:56       ` Brian Norris
2014-04-10  7:34   ` Huang Shijie

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140410075653.GI4214@lee--X1 \
    --to=lee.jones-qsej5fyqhm4dnm+yrofe0a@public.gmane.org \
    --cc=b32955-KZfg59tc24xl57MIdRCFDg@public.gmane.org \
    --cc=computersforpeace-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
    --cc=linux-mtd-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
    --cc=linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=marex-ynQEQJNshbs@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).