Merge branch 'next_pxa_dma' into next (2fb166e5) · Commits · e / devices / android_kernel_oneplus_sm7250

arch/arm/mach-pxa/devices.c

+3 −145

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@
		#include <linux/init.h>
		#include <linux/platform_device.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 +60,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 +397,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 = {
		@@ -544,18 +525,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 +551,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 +577,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 +695,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 +721,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 +747,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 +803,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 +832,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 +909,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 +942,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 +1067,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 +1093,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/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));

arch/arm/mach-pxa/pxa27x.c

+38 −1

Original line number	Diff line number	Diff line
		@@ -11,6 +11,8 @@
		* it under the terms of the GNU General Public License version 2 as
		* published by the Free Software Foundation.
		*/
		#include <linux/dmaengine.h>
		#include <linux/dma/pxa-dma.h>
		#include <linux/gpio.h>
		#include <linux/gpio-pxa.h>
		#include <linux/module.h>
		@@ -23,6 +25,7 @@
		#include <linux/io.h>
		#include <linux/irq.h>
		#include <linux/platform_data/i2c-pxa.h>
		#include <linux/platform_data/mmp_dma.h>

		#include <asm/mach/map.h>
		#include <mach/hardware.h>
		@@ -297,6 +300,40 @@ static struct platform_device *devices[] __initdata = {
		&pxa27x_device_pwm1,
		};

		static const struct dma_slave_map pxa27x_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.0", "rx", PDMA_FILTER_PARAM(LOWEST, 13) },
		{ "pxa-ssp-dai.0", "tx", PDMA_FILTER_PARAM(LOWEST, 14) },
		{ "pxa-ssp-dai.1", "rx", PDMA_FILTER_PARAM(LOWEST, 15) },
		{ "pxa-ssp-dai.1", "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) },
		{ "pxa-ssp-dai.2", "rx", PDMA_FILTER_PARAM(LOWEST, 66) },
		{ "pxa-ssp-dai.2", "tx", PDMA_FILTER_PARAM(LOWEST, 67) },

		/* PXA27x specific map */
		{ "pxa2xx-i2s", "rx", PDMA_FILTER_PARAM(LOWEST, 2) },
		{ "pxa2xx-i2s", "tx", PDMA_FILTER_PARAM(LOWEST, 3) },
		{ "pxa27x-camera.0", "CI_Y", PDMA_FILTER_PARAM(HIGHEST, 68) },
		{ "pxa27x-camera.0", "CI_U", PDMA_FILTER_PARAM(HIGHEST, 69) },
		{ "pxa27x-camera.0", "CI_V", PDMA_FILTER_PARAM(HIGHEST, 70) },
		};

		static struct mmp_dma_platdata pxa27x_dma_pdata = {
		.dma_channels = 32,
		.nb_requestors = 75,
		.slave_map = pxa27x_slave_map,
		.slave_map_cnt = ARRAY_SIZE(pxa27x_slave_map),
		};

		static int __init pxa27x_init(void)
		{
		int ret = 0;
		@@ -313,7 +350,7 @@ static int __init pxa27x_init(void)
		if (!of_have_populated_dt()) {
		pxa_register_device(&pxa27x_device_gpio,
		&pxa27x_gpio_info);
		pxa2xx_set_dmac_info(32, 75);
		pxa2xx_set_dmac_info(&pxa27x_dma_pdata);
		ret = platform_add_devices(devices,
		ARRAY_SIZE(devices));
		}

arch/arm/mach-pxa/pxa3xx.c

+40 −1

Original line number	Diff line number	Diff line
		@@ -12,6 +12,8 @@
		* it under the terms of the GNU General Public License version 2 as
		* published by the Free Software Foundation.
		*/
		#include <linux/dmaengine.h>
		#include <linux/dma/pxa-dma.h>
		#include <linux/module.h>
		#include <linux/kernel.h>
		#include <linux/init.h>
		@@ -24,6 +26,7 @@
		#include <linux/of.h>
		#include <linux/syscore_ops.h>
		#include <linux/platform_data/i2c-pxa.h>
		#include <linux/platform_data/mmp_dma.h>

		#include <asm/mach/map.h>
		#include <asm/suspend.h>
		@@ -421,6 +424,42 @@ static struct platform_device *devices[] __initdata = {
		&pxa27x_device_pwm1,
		};

		static const struct dma_slave_map pxa3xx_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.0", "rx", PDMA_FILTER_PARAM(LOWEST, 13) },
		{ "pxa-ssp-dai.0", "tx", PDMA_FILTER_PARAM(LOWEST, 14) },
		{ "pxa-ssp-dai.1", "rx", PDMA_FILTER_PARAM(LOWEST, 15) },
		{ "pxa-ssp-dai.1", "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) },
		{ "pxa-ssp-dai.2", "rx", PDMA_FILTER_PARAM(LOWEST, 66) },
		{ "pxa-ssp-dai.2", "tx", PDMA_FILTER_PARAM(LOWEST, 67) },

		/* PXA3xx specific map */
		{ "pxa-ssp-dai.3", "rx", PDMA_FILTER_PARAM(LOWEST, 2) },
		{ "pxa-ssp-dai.3", "tx", PDMA_FILTER_PARAM(LOWEST, 3) },
		{ "pxa2xx-mci.1", "rx", PDMA_FILTER_PARAM(LOWEST, 93) },
		{ "pxa2xx-mci.1", "tx", PDMA_FILTER_PARAM(LOWEST, 94) },
		{ "pxa3xx-nand", "data", PDMA_FILTER_PARAM(LOWEST, 97) },
		{ "pxa2xx-mci.2", "rx", PDMA_FILTER_PARAM(LOWEST, 100) },
		{ "pxa2xx-mci.2", "tx", PDMA_FILTER_PARAM(LOWEST, 101) },
		};

		static struct mmp_dma_platdata pxa3xx_dma_pdata = {
		.dma_channels = 32,
		.nb_requestors = 100,
		.slave_map = pxa3xx_slave_map,
		.slave_map_cnt = ARRAY_SIZE(pxa3xx_slave_map),
		};

		static int __init pxa3xx_init(void)
		{
		int ret = 0;
		@@ -456,7 +495,7 @@ static int __init pxa3xx_init(void)
		if (of_have_populated_dt())
		return 0;

		pxa2xx_set_dmac_info(32, 100);
		pxa2xx_set_dmac_info(&pxa3xx_dma_pdata);
		ret = platform_add_devices(devices, ARRAY_SIZE(devices));
		if (ret)
		return ret;