Commit 380d6859 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'pxa-for-4.19-v2' of https://github.com/rjarzmik/linux into next/soc 

This is the pxa changes for 4.19 cycle :
 - the pxa architecture is ported to dma slavemap
 - some minor AC97 fixes
 - some minor board fixes

* tag 'pxa-for-4.19-v2' of https://github.com/rjarzmik/linux

:
  net: smc91x: remove the dmaengine compat need
  net: smc911x: remove the dmaengine compat need
  ARM: pxa: zylonite: use the new ac97 bus support
  ARM: pxa: add the missing AC97 clocks
  ARM: pxa: mioa701 convert to the new AC97 bus
  ARM: pxa: hx4700: fix the usb client
  ARM: pxa: change SSP DMA channels allocation
  ARM: pxa: remove the DMA IO resources
  dmaengine: pxa: document pxad_param
  ata: pata_pxa: remove the dmaengine compat need
  mtd: rawnand: marvell: remove the dmaengine compat need
  media: pxa_camera: remove the dmaengine compat need
  mmc: pxamci: remove the dmaengine compat need
  dmaengine: pxa: add a default requestor policy
  ARM: pxa: add dma slave map
  dmaengine: pxa: use a dma slave map

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents ce8403d4 cbc654c8

arch/arm/mach-pxa/devices.c

+16 −145
Original line number Diff line number Diff line
@@ -3,7 +3,9 @@ 
#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/clkdev.h>

#include <linux/dma-mapping.h>

#include <linux/dmaengine.h>

#include <linux/spi/pxa2xx_spi.h>

#include <linux/platform_data/i2c-pxa.h>
@@ -59,16 +61,6 @@ static struct resource pxamci_resources[] = { 
		.end	= IRQ_MMC,

		.flags	= IORESOURCE_IRQ,

	},

	[2] = {

		.start	= 21,

		.end	= 21,

		.flags	= IORESOURCE_DMA,

	},

	[3] = {

		.start	= 22,

		.end	= 22,

		.flags	= IORESOURCE_DMA,

	},

};



static u64 pxamci_dmamask = 0xffffffffUL;
@@ -406,16 +398,6 @@ static struct resource pxa_ir_resources[] = { 
		.end	= 0x40700023,

		.flags  = IORESOURCE_MEM,

	},

	[5] = {

		.start  = 17,

		.end	= 17,

		.flags  = IORESOURCE_DMA,

	},

	[6] = {

		.start  = 18,

		.end	= 18,

		.flags  = IORESOURCE_DMA,

	},

};



struct platform_device pxa_device_ficp = {
@@ -496,6 +478,18 @@ struct platform_device pxa_device_ac97 = { 


void __init pxa_set_ac97_info(pxa2xx_audio_ops_t *ops)

{

	int ret;



	ret = clk_add_alias("ac97_clk", "pxa2xx-ac97:0", "AC97CLK",

			   &pxa_device_ac97.dev);

	if (ret)

		pr_err("PXA AC97 clock1 alias error: %d\n", ret);



	ret = clk_add_alias("ac97_clk", "pxa2xx-ac97:1", "AC97CLK",

			    &pxa_device_ac97.dev);

	if (ret)

		pr_err("PXA AC97 clock2 alias error: %d\n", ret);



	pxa_register_device(&pxa_device_ac97, ops);

}
@@ -544,18 +538,6 @@ static struct resource pxa25x_resource_ssp[] = { 
		.end	= IRQ_SSP,

		.flags	= IORESOURCE_IRQ,

	},

	[2] = {

		/* DRCMR for RX */

		.start	= 13,

		.end	= 13,

		.flags	= IORESOURCE_DMA,

	},

	[3] = {

		/* DRCMR for TX */

		.start	= 14,

		.end	= 14,

		.flags	= IORESOURCE_DMA,

	},

};



struct platform_device pxa25x_device_ssp = {
@@ -582,18 +564,6 @@ static struct resource pxa25x_resource_nssp[] = { 
		.end	= IRQ_NSSP,

		.flags	= IORESOURCE_IRQ,

	},

	[2] = {

		/* DRCMR for RX */

		.start	= 15,

		.end	= 15,

		.flags	= IORESOURCE_DMA,

	},

	[3] = {

		/* DRCMR for TX */

		.start	= 16,

		.end	= 16,

		.flags	= IORESOURCE_DMA,

	},

};



struct platform_device pxa25x_device_nssp = {
@@ -620,18 +590,6 @@ static struct resource pxa25x_resource_assp[] = { 
		.end	= IRQ_ASSP,

		.flags	= IORESOURCE_IRQ,

	},

	[2] = {

		/* DRCMR for RX */

		.start	= 23,

		.end	= 23,

		.flags	= IORESOURCE_DMA,

	},

	[3] = {

		/* DRCMR for TX */

		.start	= 24,

		.end	= 24,

		.flags	= IORESOURCE_DMA,

	},

};



struct platform_device pxa25x_device_assp = {
@@ -750,18 +708,6 @@ static struct resource pxa27x_resource_ssp1[] = { 
		.end	= IRQ_SSP,

		.flags	= IORESOURCE_IRQ,

	},

	[2] = {

		/* DRCMR for RX */

		.start	= 13,

		.end	= 13,

		.flags	= IORESOURCE_DMA,

	},

	[3] = {

		/* DRCMR for TX */

		.start	= 14,

		.end	= 14,

		.flags	= IORESOURCE_DMA,

	},

};



struct platform_device pxa27x_device_ssp1 = {
@@ -788,18 +734,6 @@ static struct resource pxa27x_resource_ssp2[] = { 
		.end	= IRQ_SSP2,

		.flags	= IORESOURCE_IRQ,

	},

	[2] = {

		/* DRCMR for RX */

		.start	= 15,

		.end	= 15,

		.flags	= IORESOURCE_DMA,

	},

	[3] = {

		/* DRCMR for TX */

		.start	= 16,

		.end	= 16,

		.flags	= IORESOURCE_DMA,

	},

};



struct platform_device pxa27x_device_ssp2 = {
@@ -826,18 +760,6 @@ static struct resource pxa27x_resource_ssp3[] = { 
		.end	= IRQ_SSP3,

		.flags	= IORESOURCE_IRQ,

	},

	[2] = {

		/* DRCMR for RX */

		.start	= 66,

		.end	= 66,

		.flags	= IORESOURCE_DMA,

	},

	[3] = {

		/* DRCMR for TX */

		.start	= 67,

		.end	= 67,

		.flags	= IORESOURCE_DMA,

	},

};



struct platform_device pxa27x_device_ssp3 = {
@@ -894,16 +816,6 @@ static struct resource pxa3xx_resources_mci2[] = { 
		.end	= IRQ_MMC2,

		.flags	= IORESOURCE_IRQ,

	},

	[2] = {

		.start	= 93,

		.end	= 93,

		.flags	= IORESOURCE_DMA,

	},

	[3] = {

		.start	= 94,

		.end	= 94,

		.flags	= IORESOURCE_DMA,

	},

};



struct platform_device pxa3xx_device_mci2 = {
@@ -933,16 +845,6 @@ static struct resource pxa3xx_resources_mci3[] = { 
		.end	= IRQ_MMC3,

		.flags	= IORESOURCE_IRQ,

	},

	[2] = {

		.start	= 100,

		.end	= 100,

		.flags	= IORESOURCE_DMA,

	},

	[3] = {

		.start	= 101,

		.end	= 101,

		.flags	= IORESOURCE_DMA,

	},

};



struct platform_device pxa3xx_device_mci3 = {
@@ -1020,18 +922,6 @@ static struct resource pxa3xx_resources_nand[] = { 
		.end	= IRQ_NAND,

		.flags	= IORESOURCE_IRQ,

	},

	[2] = {

		/* DRCMR for Data DMA */

		.start	= 97,

		.end	= 97,

		.flags	= IORESOURCE_DMA,

	},

	[3] = {

		/* DRCMR for Command DMA */

		.start	= 99,

		.end	= 99,

		.flags	= IORESOURCE_DMA,

	},

};



static u64 pxa3xx_nand_dma_mask = DMA_BIT_MASK(32);
@@ -1065,18 +955,6 @@ static struct resource pxa3xx_resource_ssp4[] = { 
		.end	= IRQ_SSP4,

		.flags	= IORESOURCE_IRQ,

	},

	[2] = {

		/* DRCMR for RX */

		.start	= 2,

		.end	= 2,

		.flags	= IORESOURCE_DMA,

	},

	[3] = {

		/* DRCMR for TX */

		.start	= 3,

		.end	= 3,

		.flags	= IORESOURCE_DMA,

	},

};



/*
@@ -1202,11 +1080,6 @@ void __init pxa2xx_set_spi_info(unsigned id, struct pxa2xx_spi_master *info) 
	platform_device_add(pd);

}



static struct mmp_dma_platdata pxa_dma_pdata = {

	.dma_channels	= 0,

	.nb_requestors	= 0,

};



static struct resource pxa_dma_resource[] = {

	[0] = {

		.start	= 0x40000000,
@@ -1233,9 +1106,7 @@ static struct platform_device pxa2xx_pxa_dma = { 
	.resource	= pxa_dma_resource,

};



void __init pxa2xx_set_dmac_info(int nb_channels, int nb_requestors)

void __init pxa2xx_set_dmac_info(struct mmp_dma_platdata *dma_pdata)

{

	pxa_dma_pdata.dma_channels = nb_channels;

	pxa_dma_pdata.nb_requestors = nb_requestors;

	pxa_register_device(&pxa2xx_pxa_dma, &pxa_dma_pdata);

	pxa_register_device(&pxa2xx_pxa_dma, dma_pdata);

}

arch/arm/mach-pxa/devices.h

+5 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#define PDMA_FILTER_PARAM(_prio, _requestor) (&(struct pxad_param) { \

	.prio = PXAD_PRIO_##_prio, .drcmr = _requestor })

struct mmp_dma_platdata;



extern struct platform_device pxa_device_pmu;

extern struct platform_device pxa_device_mci;

extern struct platform_device pxa3xx_device_mci2;
@@ -55,7 +59,7 @@ extern struct platform_device pxa3xx_device_gpio; 
extern struct platform_device pxa93x_device_gpio;



void __init pxa_register_device(struct platform_device *dev, void *data);

void __init pxa2xx_set_dmac_info(int nb_channels, int nb_requestors);

void __init pxa2xx_set_dmac_info(struct mmp_dma_platdata *dma_pdata);



struct i2c_pxa_platform_data;

extern void pxa_set_i2c_info(struct i2c_pxa_platform_data *info);

arch/arm/mach-pxa/hx4700.c

+4 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ 


#include "devices.h"

#include "generic.h"

#include "udc.h"



/* Physical address space information */
@@ -594,6 +595,8 @@ static struct platform_device gpio_vbus = { 
	},

};



static struct pxa2xx_udc_mach_info hx4700_udc_info;



/*

 * Touchscreen - TSC2046 connected to SSP2

 */
@@ -891,6 +894,7 @@ static void __init hx4700_init(void) 
	gpio_set_value(GPIO71_HX4700_ASIC3_nRESET, 1);

	mdelay(10);



	pxa_set_udc_info(&hx4700_udc_info);

	regulator_has_full_constraints();

}

arch/arm/mach-pxa/mioa701.c

+0 −2
Original line number Diff line number Diff line
@@ -677,14 +677,12 @@ MIO_SIMPLE_DEV(mioa701_led, "leds-gpio", &gpio_led_info) 
MIO_SIMPLE_DEV(pxa2xx_pcm,	  "pxa2xx-pcm",	    NULL)

MIO_SIMPLE_DEV(mioa701_sound,	  "mioa701-wm9713", NULL)

MIO_SIMPLE_DEV(mioa701_board,	  "mioa701-board",  NULL)

MIO_SIMPLE_DEV(wm9713_acodec,	  "wm9713-codec",   NULL);

MIO_SIMPLE_DEV(gpio_vbus,	  "gpio-vbus",      &gpio_vbus_data);



static struct platform_device *devices[] __initdata = {

	&mioa701_gpio_keys,

	&mioa701_backlight,

	&mioa701_led,

	&wm9713_acodec,

	&pxa2xx_pcm,

	&mioa701_sound,

	&power_dev,

arch/arm/mach-pxa/pxa25x.c

+37 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
 * initialization stuff for PXA machines which can be overridden later if

 * need be.

 */

#include <linux/dmaengine.h>

#include <linux/dma/pxa-dma.h>

#include <linux/gpio.h>

#include <linux/gpio-pxa.h>

#include <linux/module.h>
@@ -26,6 +28,7 @@ 
#include <linux/syscore_ops.h>

#include <linux/irq.h>

#include <linux/irqchip.h>

#include <linux/platform_data/mmp_dma.h>



#include <asm/mach/map.h>

#include <asm/suspend.h>
@@ -201,6 +204,39 @@ static struct platform_device *pxa25x_devices[] __initdata = { 
	&pxa_device_asoc_platform,

};



static const struct dma_slave_map pxa25x_slave_map[] = {

	/* PXA25x, PXA27x and PXA3xx common entries */

	{ "pxa2xx-ac97", "pcm_pcm_mic_mono", PDMA_FILTER_PARAM(LOWEST, 8) },

	{ "pxa2xx-ac97", "pcm_pcm_aux_mono_in", PDMA_FILTER_PARAM(LOWEST, 9) },

	{ "pxa2xx-ac97", "pcm_pcm_aux_mono_out",

	  PDMA_FILTER_PARAM(LOWEST, 10) },

	{ "pxa2xx-ac97", "pcm_pcm_stereo_in", PDMA_FILTER_PARAM(LOWEST, 11) },

	{ "pxa2xx-ac97", "pcm_pcm_stereo_out", PDMA_FILTER_PARAM(LOWEST, 12) },

	{ "pxa-ssp-dai.1", "rx", PDMA_FILTER_PARAM(LOWEST, 13) },

	{ "pxa-ssp-dai.1", "tx", PDMA_FILTER_PARAM(LOWEST, 14) },

	{ "pxa-ssp-dai.2", "rx", PDMA_FILTER_PARAM(LOWEST, 15) },

	{ "pxa-ssp-dai.2", "tx", PDMA_FILTER_PARAM(LOWEST, 16) },

	{ "pxa2xx-ir", "rx", PDMA_FILTER_PARAM(LOWEST, 17) },

	{ "pxa2xx-ir", "tx", PDMA_FILTER_PARAM(LOWEST, 18) },

	{ "pxa2xx-mci.0", "rx", PDMA_FILTER_PARAM(LOWEST, 21) },

	{ "pxa2xx-mci.0", "tx", PDMA_FILTER_PARAM(LOWEST, 22) },



	/* PXA25x specific map */

	{ "pxa25x-ssp.0", "rx", PDMA_FILTER_PARAM(LOWEST, 13) },

	{ "pxa25x-ssp.0", "tx", PDMA_FILTER_PARAM(LOWEST, 14) },

	{ "pxa25x-nssp.1", "rx", PDMA_FILTER_PARAM(LOWEST, 15) },

	{ "pxa25x-nssp.1", "tx", PDMA_FILTER_PARAM(LOWEST, 16) },

	{ "pxa25x-nssp.2", "rx", PDMA_FILTER_PARAM(LOWEST, 23) },

	{ "pxa25x-nssp.2", "tx", PDMA_FILTER_PARAM(LOWEST, 24) },

};



static struct mmp_dma_platdata pxa25x_dma_pdata = {

	.dma_channels	= 16,

	.nb_requestors	= 40,

	.slave_map	= pxa25x_slave_map,

	.slave_map_cnt	= ARRAY_SIZE(pxa25x_slave_map),

};



static int __init pxa25x_init(void)

{

	int ret = 0;
@@ -215,7 +251,7 @@ static int __init pxa25x_init(void) 
		register_syscore_ops(&pxa2xx_mfp_syscore_ops);



		if (!of_have_populated_dt()) {

			pxa2xx_set_dmac_info(16, 40);

			pxa2xx_set_dmac_info(&pxa25x_dma_pdata);

			pxa_register_device(&pxa25x_device_gpio, &pxa25x_gpio_info);

			ret = platform_add_devices(pxa25x_devices,

						   ARRAY_SIZE(pxa25x_devices));

CRA Git | Maintained and supported by SUSTech CRA and CCSE