From: marek.vasut@gmail.com (Marek Vasut)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/2 v2] ARM: Fix gen_nand probe structures contents
Date: Thu, 12 Aug 2010 04:57:25 +0200 [thread overview]
Message-ID: <201008120457.25635.marek.vasut@gmail.com> (raw)
In-Reply-To: <1281581635-26213-1-git-send-email-marek.vasut@gmail.com>
Dne ?t 12. srpna 2010 04:53:54 Marek Vasut napsal(a):
> These three platforms didn't properly fill nr_chips in gen_nand
> registration and therefore depended on gen_nand bug fixed by the following
> patch:
>
NOTE for bfin guys: I'm slightly concerned about overall code quality on the
BFIN architecture. Maybe someone should run it through checkpatch or something.
> "mtd: gen_nand: fix support for multiple chips"
>
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> ---
> v2: Added other broken boards outside arch-arm (mips and bfin)
> v1: Initial patch
>
> arch/arm/mach-ixp4xx/ixdp425-setup.c | 1 +
> arch/arm/mach-mx3/mach-qong.c | 1 +
> arch/arm/mach-orion5x/ts78xx-setup.c | 1 +
> arch/blackfin/mach-bf537/boards/stamp.c | 1 +
> arch/blackfin/mach-bf561/boards/acvilon.c | 1 +
> arch/mips/nxp/pnx833x/common/platform.c | 1 +
> 6 files changed, 6 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c
> b/arch/arm/mach-ixp4xx/ixdp425-setup.c index 827cbc4..ea9ee4e 100644
> --- a/arch/arm/mach-ixp4xx/ixdp425-setup.c
> +++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c
> @@ -100,6 +100,7 @@ ixdp425_flash_nand_cmd_ctrl(struct mtd_info *mtd, int
> cmd, unsigned int ctrl)
>
> static struct platform_nand_data ixdp425_flash_nand_data = {
> .chip = {
> + .nr_chips = 1,
> .chip_delay = 30,
> .options = NAND_NO_AUTOINCR,
> #ifdef CONFIG_MTD_PARTITIONS
> diff --git a/arch/arm/mach-mx3/mach-qong.c b/arch/arm/mach-mx3/mach-qong.c
> index e5b5b83..1f9363f 100644
> --- a/arch/arm/mach-mx3/mach-qong.c
> +++ b/arch/arm/mach-mx3/mach-qong.c
> @@ -169,6 +169,7 @@ static void qong_nand_select_chip(struct mtd_info *mtd,
> int chip)
>
> static struct platform_nand_data qong_nand_data = {
> .chip = {
> + .nr_chips = 1,
> .chip_delay = 20,
> .options = 0,
> },
> diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c
> b/arch/arm/mach-orion5x/ts78xx-setup.c index 5041d1b..696b1a9 100644
> --- a/arch/arm/mach-orion5x/ts78xx-setup.c
> +++ b/arch/arm/mach-orion5x/ts78xx-setup.c
> @@ -216,6 +216,7 @@ static struct mtd_partition ts78xx_ts_nand_parts[] = {
>
> static struct platform_nand_data ts78xx_ts_nand_data = {
> .chip = {
> + .nr_chips = 1,
> .part_probe_types = ts_nand_part_probes,
> .partitions = ts78xx_ts_nand_parts,
> .nr_partitions = ARRAY_SIZE(ts78xx_ts_nand_parts),
> diff --git a/arch/blackfin/mach-bf537/boards/stamp.c
> b/arch/blackfin/mach-bf537/boards/stamp.c index 9eaf5b0..68a27bc 100644
> --- a/arch/blackfin/mach-bf537/boards/stamp.c
> +++ b/arch/blackfin/mach-bf537/boards/stamp.c
> @@ -400,6 +400,7 @@ static int bfin_plat_nand_dev_ready(struct mtd_info
> *mtd)
>
> static struct platform_nand_data bfin_plat_nand_data = {
> .chip = {
> + .nr_chips = 1,
> .chip_delay = 30,
> #ifdef CONFIG_MTD_PARTITIONS
> .part_probe_types = part_probes,
> diff --git a/arch/blackfin/mach-bf561/boards/acvilon.c
> b/arch/blackfin/mach-bf561/boards/acvilon.c index bfcfa86..35b6d12 100644
> --- a/arch/blackfin/mach-bf561/boards/acvilon.c
> +++ b/arch/blackfin/mach-bf561/boards/acvilon.c
> @@ -284,6 +284,7 @@ static int bfin_plat_nand_dev_ready(struct mtd_info
> *mtd)
>
> static struct platform_nand_data bfin_plat_nand_data = {
> .chip = {
> + .nr_chips = 1,
> .chip_delay = 30,
> #ifdef CONFIG_MTD_PARTITIONS
> .part_probe_types = part_probes,
> diff --git a/arch/mips/nxp/pnx833x/common/platform.c
> b/arch/mips/nxp/pnx833x/common/platform.c index 01f8345..ce45df1 100644
> --- a/arch/mips/nxp/pnx833x/common/platform.c
> +++ b/arch/mips/nxp/pnx833x/common/platform.c
> @@ -266,6 +266,7 @@ pnx833x_flash_nand_cmd_ctrl(struct mtd_info *mtd, int
> cmd, unsigned int ctrl)
>
> static struct platform_nand_data pnx833x_flash_nand_data = {
> .chip = {
> + .nr_chips = 1,
> .chip_delay = 25,
> .part_probe_types = part_probes,
> },
next prev parent reply other threads:[~2010-08-12 2:57 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-12 2:53 [PATCH 1/2 v2] ARM: Fix gen_nand probe structures contents Marek Vasut
2010-08-12 2:53 ` [PATCH 2/2] gen_nand: Test if nr_chips field is valid Marek Vasut
2010-08-12 2:57 ` Marek Vasut [this message]
2010-08-12 3:36 ` [PATCH 1/2 v2] ARM: Fix gen_nand probe structures contents Mike Frysinger
2010-08-12 11:04 ` Marek Vasut
2010-08-12 12:47 ` Mike Frysinger
2010-08-12 13:48 ` Marek Vasut
2010-08-12 11:23 ` David Woodhouse
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=201008120457.25635.marek.vasut@gmail.com \
--to=marek.vasut@gmail.com \
--cc=linux-arm-kernel@lists.infradead.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).