On 4/20/22 01:37, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@xxxxxxxx>
>
> 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: Jens Axboe <axboe@xxxxxxxxx>
> Cc: linux-ide@xxxxxxxxxxxxxxx
> Acked-by: Robert Jarzmik <robert.jarzmik@xxxxxxx>
> Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@xxxxxxxxxxx>
> Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
> ---
> arch/arm/mach-pxa/palmld-pcmcia.c | 3 ++-
> arch/arm/mach-pxa/palmld.c | 12 +++++++++---
> arch/arm/mach-pxa/{include/mach => }/palmld.h | 2 +-
> drivers/ata/pata_palmld.c | 3 +--
> 4 files changed, 13 insertions(+), 7 deletions(-)
> rename arch/arm/mach-pxa/{include/mach => }/palmld.h (98%)
>
> diff --git a/arch/arm/mach-pxa/palmld-pcmcia.c b/arch/arm/mach-pxa/palmld-pcmcia.c
> index 07e0f7438db1..720294a50864 100644
> --- a/arch/arm/mach-pxa/palmld-pcmcia.c
> +++ b/arch/arm/mach-pxa/palmld-pcmcia.c
> @@ -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" },
> diff --git a/arch/arm/mach-pxa/palmld.c b/arch/arm/mach-pxa/palmld.c
> index d85146957004..d821606ce0b5 100644
> --- a/arch/arm/mach-pxa/palmld.c
> +++ b/arch/arm/mach-pxa/palmld.c
> @@ -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 = {
> diff --git a/arch/arm/mach-pxa/include/mach/palmld.h b/arch/arm/mach-pxa/palmld.h
> similarity index 98%
> rename from arch/arm/mach-pxa/include/mach/palmld.h
> rename to arch/arm/mach-pxa/palmld.h
> index 99a6d8b3a1e3..ee3bc15b71a2 100644
> --- a/arch/arm/mach-pxa/include/mach/palmld.h
> +++ b/arch/arm/mach-pxa/palmld.h
> @@ -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 **/
>
> diff --git a/drivers/ata/pata_palmld.c b/drivers/ata/pata_palmld.c
> index 2448441571ed..400e65190904 100644
> --- a/drivers/ata/pata_palmld.c
> +++ b/drivers/ata/pata_palmld.c
> @@ -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;
>
Acked-by: Damien Le Moal <damien.lemoal@xxxxxxxxxxxxxxxxxx>
--
Damien Le Moal
Western Digital Research
