Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31cde044 authored by Paul Walmsley's avatar Paul Walmsley
Browse files

ARM: OMAP1: board files: deduplicate and clean some NAND-related code 



The H2, H3, Perseus2, and FSample board files all contain the same
duplicated code to handle NAND commands.  That code is missing
some casts around conversions from unsigned long to void __iomem *.

Consolidate the duplicated code into a new file,
arch/arm/mach-omap1/board-nand.c.  Resolve the sparse warnings by
adding appropriate casts:

arch/arm/mach-omap1/board-h2.c:193:9: warning: incorrect type in argument 1 (different base types)
arch/arm/mach-omap1/board-h2.c:193:9:    expected void const volatile [noderef] <asn:2>*<noident>
arch/arm/mach-omap1/board-h2.c:193:9:    got unsigned long
arch/arm/mach-omap1/board-perseus2.c:157:9: warning: incorrect type in argument 1 (different base types)
arch/arm/mach-omap1/board-perseus2.c:157:9:    expected void const volatile [noderef] <asn:2>*<noident>
arch/arm/mach-omap1/board-perseus2.c:157:9:    got unsigned long
arch/arm/mach-omap1/board-fsample.c:199:9: warning: incorrect type in argument 1 (different base types)
arch/arm/mach-omap1/board-fsample.c:199:9:    expected void const volatile [noderef] <asn:2>*<noident>
arch/arm/mach-omap1/board-fsample.c:199:9:    got unsigned long
arch/arm/mach-omap1/board-h3.c:195:9: warning: incorrect type in argument 1 (different base types)
arch/arm/mach-omap1/board-h3.c:195:9:    expected void const volatile [noderef] <asn:2>*<noident>
arch/arm/mach-omap1/board-h3.c:195:9:    got unsigned long

Thanks to Arnd Bergmann <arnd@arndb.de> for suggesting a cleaner
implementation of omap1_nand_cmd_ctl(), avoiding some casts.

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
Cc: Brian Swetland <swetland@google.com>
Cc: Imre Deak <imre.deak@nokia.com>
Cc: Greg Lonnon <glonnon@ridgerun.com>
Cc: Kevin Hilman <kjh@hilman.org>
Cc: Kevin Hilman <khilman@ti.com>
Cc: Arnd Bergmann <arnd@arndb.de>
parent 6cc1a738

arch/arm/mach-omap1/Makefile

+6 −4
Original line number Diff line number Diff line
@@ -31,13 +31,15 @@ usb-fs-$(CONFIG_USB) := usb.o 
obj-y					+= $(usb-fs-m) $(usb-fs-y)



# Specific board support

obj-$(CONFIG_MACH_OMAP_H2)		+= board-h2.o board-h2-mmc.o

obj-$(CONFIG_MACH_OMAP_H2)		+= board-h2.o board-h2-mmc.o \

					   board-nand.o

obj-$(CONFIG_MACH_OMAP_INNOVATOR)	+= board-innovator.o

obj-$(CONFIG_MACH_OMAP_GENERIC)		+= board-generic.o

obj-$(CONFIG_MACH_OMAP_PERSEUS2)	+= board-perseus2.o

obj-$(CONFIG_MACH_OMAP_FSAMPLE)		+= board-fsample.o

obj-$(CONFIG_MACH_OMAP_PERSEUS2)	+= board-perseus2.o board-nand.o

obj-$(CONFIG_MACH_OMAP_FSAMPLE)		+= board-fsample.o board-nand.o

obj-$(CONFIG_MACH_OMAP_OSK)		+= board-osk.o

obj-$(CONFIG_MACH_OMAP_H3)		+= board-h3.o board-h3-mmc.o

obj-$(CONFIG_MACH_OMAP_H3)		+= board-h3.o board-h3-mmc.o \

					   board-nand.o

obj-$(CONFIG_MACH_VOICEBLUE)		+= board-voiceblue.o

obj-$(CONFIG_MACH_OMAP_PALMTE)		+= board-palmte.o

obj-$(CONFIG_MACH_OMAP_PALMZ71)		+= board-palmz71.o

arch/arm/mach-omap1/board-fsample.c

+1 −15
Original line number Diff line number Diff line
@@ -185,20 +185,6 @@ static struct platform_device nor_device = { 
	.resource	= &nor_resource,

};



static void nand_cmd_ctl(struct mtd_info *mtd, int cmd,	unsigned int ctrl)

{

	struct nand_chip *this = mtd->priv;

	unsigned long mask;



	if (cmd == NAND_CMD_NONE)

		return;



	mask = (ctrl & NAND_CLE) ? 0x02 : 0;

	if (ctrl & NAND_ALE)

		mask |= 0x04;

	writeb(cmd, (unsigned long)this->IO_ADDR_W | mask);

}



#define FSAMPLE_NAND_RB_GPIO_PIN	62



static int nand_dev_ready(struct mtd_info *mtd)
@@ -216,7 +202,7 @@ static struct platform_nand_data nand_data = { 
		.part_probe_types	= part_probes,

	},

	.ctrl	= {

		.cmd_ctrl	= nand_cmd_ctl,

		.cmd_ctrl	= omap1_nand_cmd_ctl,

		.dev_ready	= nand_dev_ready,

	},

};

arch/arm/mach-omap1/board-h2.c

+1 −16
Original line number Diff line number Diff line
@@ -179,20 +179,6 @@ static struct mtd_partition h2_nand_partitions[] = { 
	},

};



static void h2_nand_cmd_ctl(struct mtd_info *mtd, int cmd, unsigned int ctrl)

{

	struct nand_chip *this = mtd->priv;

	unsigned long mask;



	if (cmd == NAND_CMD_NONE)

		return;



	mask = (ctrl & NAND_CLE) ? 0x02 : 0;

	if (ctrl & NAND_ALE)

		mask |= 0x04;

	writeb(cmd, (unsigned long)this->IO_ADDR_W | mask);

}



#define H2_NAND_RB_GPIO_PIN	62



static int h2_nand_dev_ready(struct mtd_info *mtd)
@@ -212,9 +198,8 @@ static struct platform_nand_data h2_nand_platdata = { 
		.part_probe_types	= h2_part_probes,

	},

	.ctrl	= {

		.cmd_ctrl	= h2_nand_cmd_ctl,

		.cmd_ctrl	= omap1_nand_cmd_ctl,

		.dev_ready	= h2_nand_dev_ready,



	},

};

arch/arm/mach-omap1/board-h3.c

+1 −15
Original line number Diff line number Diff line
@@ -181,20 +181,6 @@ static struct mtd_partition nand_partitions[] = { 
	},

};



static void nand_cmd_ctl(struct mtd_info *mtd, int cmd, unsigned int ctrl)

{

	struct nand_chip *this = mtd->priv;

	unsigned long mask;



	if (cmd == NAND_CMD_NONE)

		return;



	mask = (ctrl & NAND_CLE) ? 0x02 : 0;

	if (ctrl & NAND_ALE)

		mask |= 0x04;

	writeb(cmd, (unsigned long)this->IO_ADDR_W | mask);

}



#define H3_NAND_RB_GPIO_PIN	10



static int nand_dev_ready(struct mtd_info *mtd)
@@ -214,7 +200,7 @@ static struct platform_nand_data nand_platdata = { 
		.part_probe_types	= part_probes,

	},

	.ctrl	= {

		.cmd_ctrl	= nand_cmd_ctl,

		.cmd_ctrl	= omap1_nand_cmd_ctl,

		.dev_ready	= nand_dev_ready,



	},

arch/arm/mach-omap1/board-nand.c

0 → 100644
+37 −0
Original line number Diff line number Diff line 
/*

 * linux/arch/arm/mach-omap1/board-nand.c

 *

 * Common OMAP1 board NAND code

 *

 * Copyright (C) 2004, 2012 Texas Instruments, Inc.

 * Copyright (C) 2002 MontaVista Software, Inc.

 * Copyright (C) 2001 RidgeRun, Inc.

 * Author: RidgeRun, Inc.

 *         Greg Lonnon (glonnon@ridgerun.com) or info@ridgerun.com

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

#include <linux/kernel.h>

#include <linux/io.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/nand.h>



#include "common.h"



void omap1_nand_cmd_ctl(struct mtd_info *mtd, int cmd, unsigned int ctrl)

{

	struct nand_chip *this = mtd->priv;

	unsigned long mask;



	if (cmd == NAND_CMD_NONE)

		return;



	mask = (ctrl & NAND_CLE) ? 0x02 : 0;

	if (ctrl & NAND_ALE)

		mask |= 0x04;



	writeb(cmd, this->IO_ADDR_W + mask);

}