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

Commit 5de0b52e authored by Huang Shijie's avatar Huang Shijie Committed by Artem Bityutskiy
Browse files

mtd: gpmi: remove unneccessary header 



The whole gpmi-nand driver has turned to pure devicetree supported.
So the linux/mtd/gpmi-nand.h is not neccessary now. Just remove it,
and move some macros to the gpmi-nand driver itself.

Signed-off-by: default avatarHuang Shijie <shijie8@gmail.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
parent 18afbc54

drivers/mtd/nand/gpmi-nand/gpmi-lib.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,6 @@ 
 * with this program; if not, write to the Free Software Foundation, Inc.,

 * with this program; if not, write to the Free Software Foundation, Inc.,

 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 */

 */

#include <linux/mtd/gpmi-nand.h>

#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/clk.h>

#include <linux/clk.h>

drivers/mtd/nand/gpmi-nand/gpmi-nand.c

+6 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/interrupt.h>

#include <linux/interrupt.h>

#include <linux/module.h>

#include <linux/module.h>

#include <linux/mtd/gpmi-nand.h>

#include <linux/mtd/partitions.h>

#include <linux/mtd/partitions.h>

#include <linux/pinctrl/consumer.h>

#include <linux/pinctrl/consumer.h>

#include <linux/of.h>

#include <linux/of.h>
@@ -33,6 +32,12 @@ 
#include <linux/of_mtd.h>

#include <linux/of_mtd.h>

#include "gpmi-nand.h"

#include "gpmi-nand.h"





/* Resource names for the GPMI NAND driver. */

#define GPMI_NAND_GPMI_REGS_ADDR_RES_NAME  "gpmi-nand"

#define GPMI_NAND_BCH_REGS_ADDR_RES_NAME   "bch"

#define GPMI_NAND_BCH_INTERRUPT_RES_NAME   "bch"

#define GPMI_NAND_DMA_INTERRUPT_RES_NAME   "gpmi-dma"



/* add our owner bbt descriptor */

/* add our owner bbt descriptor */

static uint8_t scan_ff_pattern[] = { 0xff };

static uint8_t scan_ff_pattern[] = { 0xff };

static struct nand_bbt_descr gpmi_bbt_descr = {

static struct nand_bbt_descr gpmi_bbt_descr = {

drivers/mtd/nand/gpmi-nand/gpmi-nand.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -130,7 +130,6 @@ struct gpmi_nand_data { 
	/* System Interface */

	/* System Interface */

	struct device		*dev;

	struct device		*dev;

	struct platform_device	*pdev;

	struct platform_device	*pdev;

	struct gpmi_nand_platform_data	*pdata;





	/* Resources */

	/* Resources */

	struct resources	resources;

	struct resources	resources;

include/linux/mtd/gpmi-nand.h

deleted100644 → 0
+0 −68
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved.

 *

 * 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.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License along

 * with this program; if not, write to the Free Software Foundation, Inc.,

 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 */



#ifndef __MACH_MXS_GPMI_NAND_H__

#define __MACH_MXS_GPMI_NAND_H__



/* The size of the resources is fixed. */

#define GPMI_NAND_RES_SIZE	6



/* Resource names for the GPMI NAND driver. */

#define GPMI_NAND_GPMI_REGS_ADDR_RES_NAME  "gpmi-nand"

#define GPMI_NAND_GPMI_INTERRUPT_RES_NAME  "GPMI NAND GPMI Interrupt"

#define GPMI_NAND_BCH_REGS_ADDR_RES_NAME   "bch"

#define GPMI_NAND_BCH_INTERRUPT_RES_NAME   "bch"

#define GPMI_NAND_DMA_CHANNELS_RES_NAME    "GPMI NAND DMA Channels"

#define GPMI_NAND_DMA_INTERRUPT_RES_NAME   "gpmi-dma"



/**

 * struct gpmi_nand_platform_data - GPMI NAND driver platform data.

 *

 * This structure communicates platform-specific information to the GPMI NAND

 * driver that can't be expressed as resources.

 *

 * @platform_init:           A pointer to a function the driver will call to

 *                           initialize the platform (e.g., set up the pin mux).

 * @min_prop_delay_in_ns:    Minimum propagation delay of GPMI signals to and

 *                           from the NAND Flash device, in nanoseconds.

 * @max_prop_delay_in_ns:    Maximum propagation delay of GPMI signals to and

 *                           from the NAND Flash device, in nanoseconds.

 * @max_chip_count:          The maximum number of chips for which the driver

 *                           should configure the hardware. This value most

 *                           likely reflects the number of pins that are

 *                           connected to a NAND Flash device. If this is

 *                           greater than the SoC hardware can support, the

 *                           driver will print a message and fail to initialize.

 * @partitions:              An optional pointer to an array of partition

 *                           descriptions.

 * @partition_count:         The number of elements in the partitions array.

 */

struct gpmi_nand_platform_data {

	/* SoC hardware information. */

	int		(*platform_init)(void);



	/* NAND Flash information. */

	unsigned int	min_prop_delay_in_ns;

	unsigned int	max_prop_delay_in_ns;

	unsigned int	max_chip_count;



	/* Medium information. */

	struct		mtd_partition *partitions;

	unsigned	partition_count;

};

#endif