leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: pxa: use pdev resource for palmld mmio

Browse Source 
The palmld header is almost unused in drivers, the only
remaining thing now is the PATA device address, which should
really be passed as a resource.

Cc: linux-ide@vger.kernel.org
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Acked-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2019-09-11 09:36:03 +02:00
parent 225b5d376e
commit 57bf0f5a16
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mach-pxa/palmld-pcmcia.c
View File

@ -13,9 +13,10 @@
#include <linux/gpio.h>
#include <asm/mach-types.h>
#include <mach/palmld.h>
#include <pcmcia/soc_common.h>
#include "palmld.h"
static struct gpio palmld_pcmcia_gpios[] = {
{ GPIO_NR_PALMLD_PCMCIA_POWER, GPIOF_INIT_LOW, "PCMCIA Power" },
{ GPIO_NR_PALMLD_PCMCIA_RESET, GPIOF_INIT_HIGH,"PCMCIA Reset" },

12
arch/arm/mach-pxa/palmld.c
View File

@ -29,8 +29,8 @@
#include <asm/mach/map.h>
#include "pxa27x.h"
#include "palmld.h"
#include <linux/platform_data/asoc-pxa.h>
#include <mach/palmld.h>
#include <linux/platform_data/mmc-pxamci.h>
#include <linux/platform_data/video-pxafb.h>
#include <linux/platform_data/irda-pxaficp.h>
@ -279,9 +279,15 @@ static inline void palmld_leds_init(void) {}
* HDD
******************************************************************************/
#if defined(CONFIG_PATA_PALMLD) || defined(CONFIG_PATA_PALMLD_MODULE)
static struct resource palmld_ide_resources[] = {
DEFINE_RES_MEM(PALMLD_IDE_PHYS, 0x1000),
};
static struct platform_device palmld_ide_device = {
.name = "pata_palmld",
.id = -1,
.name = "pata_palmld",
.id = -1,
.resource = palmld_ide_resources,
.num_resources = ARRAY_SIZE(palmld_ide_resources),
};
static struct gpiod_lookup_table palmld_ide_gpio_table = {

2
arch/arm/mach-pxa/include/mach/palmld.h → arch/arm/mach-pxa/palmld.h
View File

@ -9,7 +9,7 @@
#ifndef _INCLUDE_PALMLD_H_
#define _INCLUDE_PALMLD_H_
#include "irqs.h" /* PXA_GPIO_TO_IRQ */
#include <mach/irqs.h> /* PXA_GPIO_TO_IRQ */
/** HERE ARE GPIOs **/

3
drivers/ata/pata_palmld.c
View File

@ -25,7 +25,6 @@
#include <linux/gpio/consumer.h>
#include <scsi/scsi_host.h>
#include <mach/palmld.h>
#define DRV_NAME "pata_palmld"
@ -63,7 +62,7 @@ static int palmld_pata_probe(struct platform_device *pdev)
return -ENOMEM;
/* remap drive's physical memory address */
mem = devm_ioremap(dev, PALMLD_IDE_PHYS, 0x1000);
mem = devm_platform_ioremap_resource(pdev, 0);
if (!mem)
return -ENOMEM;