Skip to content

Commit

Permalink
ARM: OMAP2+: onenand: header cleanup
Browse files Browse the repository at this point in the history
For common arm zImage existing onenand header file
in platform specific location was moved to generic
platform data location, but it contained more than
platform data, remove it. New local header has been
created for exposing functions.

Signed-off-by: Afzal Mohammed <afzal@ti.com>
  • Loading branch information
Afzal Mohammed committed Oct 15, 2012
1 parent b775445 commit b6ab13e
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 16 deletions.
1 change: 1 addition & 0 deletions arch/arm/mach-omap2/board-flash.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

#include "common.h"
#include "board-flash.h"
#include "gpmc-onenand.h"

#define REG_FPGA_REV 0x10
#define REG_FPGA_DIP_SWITCH_INPUT2 0x60
Expand Down
1 change: 1 addition & 0 deletions arch/arm/mach-omap2/board-igep0020.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
#include "common-board-devices.h"
#include "board-flash.h"
#include "control.h"
#include "gpmc-onenand.h"

#define IGEP2_SMSC911X_CS 5
#define IGEP2_SMSC911X_GPIO 176
Expand Down
1 change: 1 addition & 0 deletions arch/arm/mach-omap2/board-n8x0.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#include <plat/mmc.h>

#include "mux.h"
#include "gpmc-onenand.h"

#define TUSB6010_ASYNC_CS 1
#define TUSB6010_SYNC_CS 4
Expand Down
1 change: 1 addition & 0 deletions arch/arm/mach-omap2/board-rm680.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include "hsmmc.h"
#include "sdram-nokia.h"
#include "common-board-devices.h"
#include "gpmc-onenand.h"

static struct regulator_consumer_supply rm680_vemmc_consumers[] = {
REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1"),
Expand Down
1 change: 1 addition & 0 deletions arch/arm/mach-omap2/board-rx51-peripherals.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
#include "mux.h"
#include "hsmmc.h"
#include "common-board-devices.h"
#include "gpmc-onenand.h"

#define SYSTEM_REV_B_USES_VAUX3 0x1699
#define SYSTEM_REV_S_USES_VAUX3 0x8
Expand Down
1 change: 1 addition & 0 deletions arch/arm/mach-omap2/gpmc-onenand.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include <plat/gpmc.h>

#include "soc.h"
#include "gpmc-onenand.h"

#define ONENAND_IO_SIZE SZ_128K

Expand Down
24 changes: 24 additions & 0 deletions arch/arm/mach-omap2/gpmc-onenand.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/*
* arch/arm/mach-omap2/gpmc-onenand.h
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*/

#ifndef __OMAP2_GPMC_ONENAND_H
#define __OMAP2_GPMC_ONENAND_H

#include <linux/platform_data/mtd-onenand-omap2.h>

#if IS_ENABLED(CONFIG_MTD_ONENAND_OMAP2)
extern void gpmc_onenand_init(struct omap_onenand_platform_data *d);
#else
#define board_onenand_data NULL
static inline void gpmc_onenand_init(struct omap_onenand_platform_data *d)
{
}
#endif

#endif
19 changes: 3 additions & 16 deletions include/linux/platform_data/mtd-onenand-omap2.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
* published by the Free Software Foundation.
*/

#ifndef __MTD_ONENAND_OMAP2_H
#define __MTD_ONENAND_OMAP2_H

#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>

Expand All @@ -27,20 +30,4 @@ struct omap_onenand_platform_data {
u8 regulator_can_sleep;
u8 skip_initial_unlocking;
};

#define ONENAND_MAX_PARTITIONS 8

#if defined(CONFIG_MTD_ONENAND_OMAP2) || \
defined(CONFIG_MTD_ONENAND_OMAP2_MODULE)

extern void gpmc_onenand_init(struct omap_onenand_platform_data *d);

#else

#define board_onenand_data NULL

static inline void gpmc_onenand_init(struct omap_onenand_platform_data *d)
{
}

#endif

0 comments on commit b6ab13e

Please sign in to comment.