[PATCH] nand/s3c2410: s3c2410_nand_setrate(): use correct macros for 2412/2440

[PATCH] nand/s3c2410: s3c2410_nand_setrate(): use correct macros for 2412/2440

[Peter Korsgaard]

Use the correct S3C2440_NFCONF_* macros for the mask for the 2412/2440
variants instead of the 2410 ones which use wrong bit positions.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 drivers/mtd/nand/s3c2410.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
index 89b7905..01a105e 100644
--- a/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
@@ -253,9 +253,9 @@ static int s3c2410_nand_setrate(struct s3c2410_nand_info *info)
 
 	case TYPE_S3C2440:
 	case TYPE_S3C2412:
-		mask = (S3C2410_NFCONF_TACLS(tacls_max - 1) |
-			S3C2410_NFCONF_TWRPH0(7) |
-			S3C2410_NFCONF_TWRPH1(7));
+		mask = (S3C2440_NFCONF_TACLS(tacls_max - 1) |
+			S3C2440_NFCONF_TWRPH0(7) |
+			S3C2440_NFCONF_TWRPH1(7));
 
 		set = S3C2440_NFCONF_TACLS(tacls - 1);
 		set |= S3C2440_NFCONF_TWRPH0(twrph0 - 1);
-- 
1.6.2

[PATCH] mtd/nand: s3c6400 support for s3c2410 driver

[Peter Korsgaard]

Add s3c6400 support to the s3c2410 driver. The nand controller in
the s3c64xx devices is compatible with the one in the s3c2412, so
simply reuse that code.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 drivers/mtd/nand/Kconfig   |   18 +++++++++---------
 drivers/mtd/nand/s3c2410.c |    3 +++
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 890936d..4d63d7b 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -139,27 +139,27 @@ config MTD_NAND_PPCHAMELEONEVB
 	  This enables the NAND flash driver on the PPChameleon EVB Board.
 
 config MTD_NAND_S3C2410
-	tristate "NAND Flash support for S3C2410/S3C2440 SoC"
-	depends on ARCH_S3C2410
+	tristate "NAND Flash support for Samsung S3C SoCs"
+	depends on ARCH_S3C2410 || ARCH_S3C64XX
 	help
-	  This enables the NAND flash controller on the S3C2410 and S3C2440
+	  This enables the NAND flash controller on the S3C24xx and S3C64xx
 	  SoCs
 
 	  No board specific support is done by this driver, each board
 	  must advertise a platform_device for the driver to attach.
 
 config MTD_NAND_S3C2410_DEBUG
-	bool "S3C2410 NAND driver debug"
+	bool "Samsung S3C NAND driver debug"
 	depends on MTD_NAND_S3C2410
 	help
-	  Enable debugging of the S3C2410 NAND driver
+	  Enable debugging of the S3C NAND driver
 
 config MTD_NAND_S3C2410_HWECC
-	bool "S3C2410 NAND Hardware ECC"
+	bool "Samsung S3C NAND Hardware ECC"
 	depends on MTD_NAND_S3C2410
 	help
-	  Enable the use of the S3C2410's internal ECC generator when
-	  using NAND. Early versions of the chip have had problems with
+	  Enable the use of the controller's internal ECC generator when
+	  using NAND. Early versions of the chips have had problems with
 	  incorrect ECC generation, and if using these, the default of
 	  software ECC is preferable.
 
@@ -171,7 +171,7 @@ config MTD_NAND_NDFC
 	 NDFC Nand Flash Controllers are integrated in IBM/AMCC's 4xx SoCs
 
 config MTD_NAND_S3C2410_CLKSTOP
-	bool "S3C2410 NAND IDLE clock stop"
+	bool "Samsung S3C NAND IDLE clock stop"
 	depends on MTD_NAND_S3C2410
 	default n
 	help
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
index 01a105e..11dc7e6 100644
--- a/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
@@ -1111,6 +1111,9 @@ static struct platform_device_id s3c24xx_driver_ids[] = {
 	}, {
 		.name		= "s3c2412-nand",
 		.driver_data	= TYPE_S3C2412,
+	}, {
+		.name		= "s3c6400-nand",
+		.driver_data	= TYPE_S3C2412, /* compatible with 2412 */
 	},
 	{ }
 };
-- 
1.6.2

Re: [PATCH] mtd/nand: s3c6400 support for s3c2410 driver

[Ben Dooks]

On Sun, Jun 07, 2009 at 03:04:23PM +0200, Peter Korsgaard wrote:
> Add s3c6400 support to the s3c2410 driver. The nand controller in
> the s3c64xx devices is compatible with the one in the s3c2412, so
> simply reuse that code.
> 
> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Acked-by: Ben Dooks <ben-linux@fluff.org>
> ---
>  drivers/mtd/nand/Kconfig   |   18 +++++++++---------
>  drivers/mtd/nand/s3c2410.c |    3 +++
>  2 files changed, 12 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
> index 890936d..4d63d7b 100644
> --- a/drivers/mtd/nand/Kconfig
> +++ b/drivers/mtd/nand/Kconfig
> @@ -139,27 +139,27 @@ config MTD_NAND_PPCHAMELEONEVB
>  	  This enables the NAND flash driver on the PPChameleon EVB Board.
>  
>  config MTD_NAND_S3C2410
> -	tristate "NAND Flash support for S3C2410/S3C2440 SoC"
> -	depends on ARCH_S3C2410
> +	tristate "NAND Flash support for Samsung S3C SoCs"
> +	depends on ARCH_S3C2410 || ARCH_S3C64XX
>  	help
> -	  This enables the NAND flash controller on the S3C2410 and S3C2440
> +	  This enables the NAND flash controller on the S3C24xx and S3C64xx
>  	  SoCs
>  
>  	  No board specific support is done by this driver, each board
>  	  must advertise a platform_device for the driver to attach.
>  
>  config MTD_NAND_S3C2410_DEBUG
> -	bool "S3C2410 NAND driver debug"
> +	bool "Samsung S3C NAND driver debug"
>  	depends on MTD_NAND_S3C2410
>  	help
> -	  Enable debugging of the S3C2410 NAND driver
> +	  Enable debugging of the S3C NAND driver
>  
>  config MTD_NAND_S3C2410_HWECC
> -	bool "S3C2410 NAND Hardware ECC"
> +	bool "Samsung S3C NAND Hardware ECC"
>  	depends on MTD_NAND_S3C2410
>  	help
> -	  Enable the use of the S3C2410's internal ECC generator when
> -	  using NAND. Early versions of the chip have had problems with
> +	  Enable the use of the controller's internal ECC generator when
> +	  using NAND. Early versions of the chips have had problems with
>  	  incorrect ECC generation, and if using these, the default of
>  	  software ECC is preferable.
>  
> @@ -171,7 +171,7 @@ config MTD_NAND_NDFC
>  	 NDFC Nand Flash Controllers are integrated in IBM/AMCC's 4xx SoCs
>  
>  config MTD_NAND_S3C2410_CLKSTOP
> -	bool "S3C2410 NAND IDLE clock stop"
> +	bool "Samsung S3C NAND IDLE clock stop"
>  	depends on MTD_NAND_S3C2410
>  	default n
>  	help
> diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
> index 01a105e..11dc7e6 100644
> --- a/drivers/mtd/nand/s3c2410.c
> +++ b/drivers/mtd/nand/s3c2410.c
> @@ -1111,6 +1111,9 @@ static struct platform_device_id s3c24xx_driver_ids[] = {
>  	}, {
>  		.name		= "s3c2412-nand",
>  		.driver_data	= TYPE_S3C2412,
> +	}, {
> +		.name		= "s3c6400-nand",
> +		.driver_data	= TYPE_S3C2412, /* compatible with 2412 */
>  	},
>  	{ }
>  };
> -- 
> 1.6.2
> 
> 
> ______________________________________________________
> Linux MTD discussion mailing list
> http://lists.infradead.org/mailman/listinfo/linux-mtd/

-- 
Ben (ben@fluff.org, http://www.fluff.org/)

  'a smiley only costs 4 bytes'

Re: [PATCH] mtd/nand: s3c6400 support for s3c2410 driver

[David Woodhouse]

On Sun, 2009-06-07 at 06:04 -0700, Peter Korsgaard wrote:
> Add s3c6400 support to the s3c2410 driver. The nand controller in
> the s3c64xx devices is compatible with the one in the s3c2412, so
> simply reuse that code.
> 
> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
> ---
>  drivers/mtd/nand/Kconfig   |   18 +++++++++---------
>  drivers/mtd/nand/s3c2410.c |    3 +++
>  2 files changed, 12 insertions(+), 9 deletions(-)

Applied; thanks.

-- 
David Woodhouse                            Open Source Technology Centre
David.Woodhouse@intel.com                              Intel Corporation

Re: [PATCH] nand/s3c2410: s3c2410_nand_setrate(): use correct macros for 2412/2440

[Artem Bityutskiy]

On Sun, 2009-06-07 at 15:04 +0200, Peter Korsgaard wrote:
> Use the correct S3C2440_NFCONF_* macros for the mask for the 2412/2440
> variants instead of the 2410 ones which use wrong bit positions.
> 
> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

Your patch is already in the mtd-2.6.git tree.

-- 
Best regards,
Artem Bityutskiy (Битюцкий Артём)

Re: [PATCH] nand/s3c2410: s3c2410_nand_setrate(): use correct macros for 2412/2440

[Peter Korsgaard]

>>>>> "Artem" == Artem Bityutskiy <dedekind@infradead.org> writes:

 Artem> On Sun, 2009-06-07 at 15:04 +0200, Peter Korsgaard wrote:
 >> Use the correct S3C2440_NFCONF_* macros for the mask for the 2412/2440
 >> variants instead of the 2410 ones which use wrong bit positions.
 >> 
 >> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

 Artem> Your patch is already in the mtd-2.6.git tree.

Ahh, sorry - Missed that. I resent it as it is a prerequisite to the
s3c64xx support to the driver I sent yesterday.

That patch seems to have never made it to the list though, so I will
resend.

-- 
Bye, Peter Korsgaard

Re: [PATCH] nand/s3c2410: s3c2410_nand_setrate(): use correct macros for 2412/2440

[Artem Bityutskiy]

On Mon, 2009-06-08 at 07:38 +0200, Peter Korsgaard wrote:
> >>>>> "Artem" == Artem Bityutskiy <dedekind@infradead.org> writes:
> 
>  Artem> On Sun, 2009-06-07 at 15:04 +0200, Peter Korsgaard wrote:
>  >> Use the correct S3C2440_NFCONF_* macros for the mask for the 2412/2440
>  >> variants instead of the 2410 ones which use wrong bit positions.
>  >> 
>  >> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
> 
>  Artem> Your patch is already in the mtd-2.6.git tree.
> 
> Ahh, sorry - Missed that. I resent it as it is a prerequisite to the
> s3c64xx support to the driver I sent yesterday.
> 
> That patch seems to have never made it to the list though, so I will
> resend.

It was trapped, but now approved.

-- 
Best regards,
Artem Bityutskiy (Битюцкий Артём)

Re: [PATCH] nand/s3c2410: s3c2410_nand_setrate(): use correct macros for 2412/2440

[Peter Korsgaard]

>>>>> "Artem" == Artem Bityutskiy <dedekind@infradead.org> writes:

Hi,

 >> That patch seems to have never made it to the list though, so I
 >> will resend.

 Artem> It was trapped, but now approved.

Thanks. What did I do wrong to get it trapped?

-- 
Bye, Peter Korsgaard

Re: [PATCH] nand/s3c2410: s3c2410_nand_setrate(): use correct macros for 2412/2440

[Artem Bityutskiy]

On Mon, 2009-06-08 at 08:32 +0200, Peter Korsgaard wrote:
> >>>>> "Artem" == Artem Bityutskiy <dedekind@infradead.org> writes:
> 
> Hi,
> 
>  >> That patch seems to have never made it to the list though, so I
>  >> will resend.
> 
>  Artem> It was trapped, but now approved.
> 
> Thanks. What did I do wrong to get it trapped?

"Re in subject but no in-reply-to". dwmw2 was going to fix this
few years ago :-)

-- 
Best regards,
Artem Bityutskiy (Битюцкий Артём)

Re: [PATCH] nand/s3c2410: s3c2410_nand_setrate(): use correct macros for 2412/2440

[David Woodhouse]

On Sun, 2009-06-07 at 23:41 -0700, Artem Bityutskiy wrote:
> 
> "Re in subject but no in-reply-to". dwmw2 was going to fix this
> few years ago :-)

Other way round, surely. It's the thread-hijack check, which checks for
messages with In-Reply-To: or References: headers indicating that
they're a reply to an existing thread, but without 'Re:' or 'Aw:' in the
Subject: header.

In the years since I implemented that basic netiquette check, it's
become acceptable to do exactly that for patch sequences. I thought I'd
fixed it to accept 'PATCH' as well as 'Re:' and 'Aw:', but on looking
closer I see I screwed it up -- it was trying to do a case-insensitive
compare by turning the subject header into lower case before the 
comparison.... and then comparing against 'PATCH' in upper case... :)

Fixed now:
http://git.infradead.org/users/dwmw2/eximconf.git?a=commitdiff;h=47505756

-- 
David Woodhouse                            Open Source Technology Centre
David.Woodhouse@intel.com                              Intel Corporation

Re: [PATCH] nand/s3c2410: s3c2410_nand_setrate(): use correct macros for 2412/2440

[Peter Korsgaard]

>>>>> "David" == David Woodhouse <dwmw2@infradead.org> writes:

Hi,

 David> In the years since I implemented that basic netiquette check,
 David> it's become acceptable to do exactly that for patch
 David> sequences. I thought I'd fixed it to accept 'PATCH' as well as
 David> 'Re:' and 'Aw:', but on looking closer I see I screwed it up
 David> -- it was trying to do a case-insensitive compare by turning
 David> the subject header into lower case before the
 David> comparison.... and then comparing against 'PATCH' in upper
 David> case... :)

Thanks!

-- 
Bye, Peter Korsgaard

Re: [PATCH] nand/s3c2410: s3c2410_nand_setrate(): use correct macros for 2412/2440

[Ben Dooks]

On Sun, Jun 07, 2009 at 03:04:22PM +0200, Peter Korsgaard wrote:
> Use the correct S3C2440_NFCONF_* macros for the mask for the 2412/2440
> variants instead of the 2410 ones which use wrong bit positions.
> 
> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Acked-by: Ben Dooks <ben-linux@fluff.org>
> ---
>  drivers/mtd/nand/s3c2410.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
> index 89b7905..01a105e 100644
> --- a/drivers/mtd/nand/s3c2410.c
> +++ b/drivers/mtd/nand/s3c2410.c
> @@ -253,9 +253,9 @@ static int s3c2410_nand_setrate(struct s3c2410_nand_info *info)
>  
>  	case TYPE_S3C2440:
>  	case TYPE_S3C2412:
> -		mask = (S3C2410_NFCONF_TACLS(tacls_max - 1) |
> -			S3C2410_NFCONF_TWRPH0(7) |
> -			S3C2410_NFCONF_TWRPH1(7));
> +		mask = (S3C2440_NFCONF_TACLS(tacls_max - 1) |
> +			S3C2440_NFCONF_TWRPH0(7) |
> +			S3C2440_NFCONF_TWRPH1(7));
>  
>  		set = S3C2440_NFCONF_TACLS(tacls - 1);
>  		set |= S3C2440_NFCONF_TWRPH0(twrph0 - 1);
> -- 
> 1.6.2
> 
> 
> ______________________________________________________
> Linux MTD discussion mailing list
> http://lists.infradead.org/mailman/listinfo/linux-mtd/

-- 
Ben (ben@fluff.org, http://www.fluff.org/)

  'a smiley only costs 4 bytes'

[PATCH] nand/s3c2410: s3c2410_nand_setrate(): use correct macros for 2412/2440

[Peter Korsgaard]

Use the correct S3C2440_NFCONF_* macros for the mask for the 2412/2440
variants instead of the 2410 ones which use wrong bit positions.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 drivers/mtd/nand/s3c2410.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
index 8e375d5..776756e 100644
--- a/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
@@ -215,9 +215,9 @@ static int s3c2410_nand_setrate(struct s3c2410_nand_info *info)
 
 	case TYPE_S3C2440:
 	case TYPE_S3C2412:
-		mask = (S3C2410_NFCONF_TACLS(tacls_max - 1) |
-			S3C2410_NFCONF_TWRPH0(7) |
-			S3C2410_NFCONF_TWRPH1(7));
+		mask = (S3C2440_NFCONF_TACLS(tacls_max - 1) |
+			S3C2440_NFCONF_TWRPH0(7) |
+			S3C2440_NFCONF_TWRPH1(7));
 
 		set = S3C2440_NFCONF_TACLS(tacls - 1);
 		set |= S3C2440_NFCONF_TWRPH0(twrph0 - 1);
-- 
1.6.2