aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2017-01-31 16:08:32 -0500
committerArnd Bergmann <arnd@arndb.de>2017-02-07 10:01:04 -0500
commit4b483ed0be8b4aa8006300d502148aa4548fb261 (patch)
treebadf6632522c033869770671478321638c36c072
parent1564dd1d2f876dcc288fae94a5179baccc89de8f (diff)
ARM: ux500: cut some platform data
This platform data is revoked: the drivers are getting the DMA configuration from the device tree, it has been done like that since the DMA support was merged and this data has not been used since. The remaining auxdata is also unused. Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat
-rw-r--r--arch/arm/mach-ux500/board-mop500-audio.c77
-rw-r--r--arch/arm/mach-ux500/board-mop500.h17
-rw-r--r--arch/arm/mach-ux500/cpu-db8500.c16
-rw-r--r--arch/arm/mach-ux500/ste-dma40-db8500.h85
4 files changed, 0 insertions, 195 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-audio.c b/arch/arm/mach-ux500/board-mop500-audio.c
deleted file mode 100644
index b2a0899e7453..000000000000
--- a/arch/arm/mach-ux500/board-mop500-audio.c
+++ /dev/null
@@ -1,77 +0,0 @@
1/*
2 * Copyright (C) ST-Ericsson SA 2010
3 *
4 * License terms: GNU General Public License (GPL), version 2
5 */
6
7#include <linux/platform_device.h>
8#include <linux/init.h>
9#include <linux/gpio.h>
10#include <linux/platform_data/dma-ste-dma40.h>
11
12#include <linux/platform_data/asoc-ux500-msp.h>
13
14#include "ste-dma40-db8500.h"
15#include "board-mop500.h"
16
17static struct stedma40_chan_cfg msp0_dma_rx = {
18 .high_priority = true,
19 .dir = DMA_DEV_TO_MEM,
20 .dev_type = DB8500_DMA_DEV31_MSP0_SLIM0_CH0,
21};
22
23static struct stedma40_chan_cfg msp0_dma_tx = {
24 .high_priority = true,
25 .dir = DMA_MEM_TO_DEV,
26 .dev_type = DB8500_DMA_DEV31_MSP0_SLIM0_CH0,
27};
28
29struct msp_i2s_platform_data msp0_platform_data = {
30 .id = 0,
31 .msp_i2s_dma_rx = &msp0_dma_rx,
32 .msp_i2s_dma_tx = &msp0_dma_tx,
33};
34
35static struct stedma40_chan_cfg msp1_dma_rx = {
36 .high_priority = true,
37 .dir = DMA_DEV_TO_MEM,
38 .dev_type = DB8500_DMA_DEV30_MSP3,
39};
40
41static struct stedma40_chan_cfg msp1_dma_tx = {
42 .high_priority = true,
43 .dir = DMA_MEM_TO_DEV,
44 .dev_type = DB8500_DMA_DEV30_MSP1,
45};
46
47struct msp_i2s_platform_data msp1_platform_data = {
48 .id = 1,
49 .msp_i2s_dma_rx = NULL,
50 .msp_i2s_dma_tx = &msp1_dma_tx,
51};
52
53static struct stedma40_chan_cfg msp2_dma_rx = {
54 .high_priority = true,
55 .dir = DMA_DEV_TO_MEM,
56 .dev_type = DB8500_DMA_DEV14_MSP2,
57};
58
59static struct stedma40_chan_cfg msp2_dma_tx = {
60 .high_priority = true,
61 .dir = DMA_MEM_TO_DEV,
62 .dev_type = DB8500_DMA_DEV14_MSP2,
63 .use_fixed_channel = true,
64 .phy_channel = 1,
65};
66
67struct msp_i2s_platform_data msp2_platform_data = {
68 .id = 2,
69 .msp_i2s_dma_rx = &msp2_dma_rx,
70 .msp_i2s_dma_tx = &msp2_dma_tx,
71};
72
73struct msp_i2s_platform_data msp3_platform_data = {
74 .id = 3,
75 .msp_i2s_dma_rx = &msp1_dma_rx,
76 .msp_i2s_dma_tx = NULL,
77};
diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h
deleted file mode 100644
index 7c7b0adca582..000000000000
--- a/arch/arm/mach-ux500/board-mop500.h
+++ /dev/null
@@ -1,17 +0,0 @@
1/*
2 * Copyright (C) ST-Ericsson SA 2010
3 *
4 * License terms: GNU General Public License (GPL) version 2
5 */
6
7#ifndef __BOARD_MOP500_H
8#define __BOARD_MOP500_H
9
10#include <linux/platform_data/asoc-ux500-msp.h>
11
12extern struct msp_i2s_platform_data msp0_platform_data;
13extern struct msp_i2s_platform_data msp1_platform_data;
14extern struct msp_i2s_platform_data msp2_platform_data;
15extern struct msp_i2s_platform_data msp3_platform_data;
16
17#endif
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index c0c36b978cba..24529cf58df6 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -33,7 +33,6 @@
33 33
34#include "setup.h" 34#include "setup.h"
35 35
36#include "board-mop500.h"
37#include "db8500-regs.h" 36#include "db8500-regs.h"
38 37
39static int __init ux500_l2x0_unlock(void) 38static int __init ux500_l2x0_unlock(void)
@@ -141,21 +140,6 @@ static struct arm_pmu_platdata db8500_pmu_platdata = {
141static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { 140static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = {
142 /* Requires call-back bindings. */ 141 /* Requires call-back bindings. */
143 OF_DEV_AUXDATA("arm,cortex-a9-pmu", 0, "arm-pmu", &db8500_pmu_platdata), 142 OF_DEV_AUXDATA("arm,cortex-a9-pmu", 0, "arm-pmu", &db8500_pmu_platdata),
144 /* Requires DMA bindings. */
145 OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80123000,
146 "ux500-msp-i2s.0", &msp0_platform_data),
147 OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80124000,
148 "ux500-msp-i2s.1", &msp1_platform_data),
149 OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80117000,
150 "ux500-msp-i2s.2", &msp2_platform_data),
151 OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80125000,
152 "ux500-msp-i2s.3", &msp3_platform_data),
153 /* Requires non-DT:able platform data. */
154 OF_DEV_AUXDATA("stericsson,db8500-prcmu", 0x80157000, "db8500-prcmu", NULL),
155 OF_DEV_AUXDATA("stericsson,ux500-cryp", 0xa03cb000, "cryp1", NULL),
156 OF_DEV_AUXDATA("stericsson,ux500-hash", 0xa03c2000, "hash1", NULL),
157 OF_DEV_AUXDATA("stericsson,snd-soc-mop500", 0, "snd-soc-mop500.0",
158 NULL),
159 {}, 143 {},
160}; 144};
161 145
diff --git a/arch/arm/mach-ux500/ste-dma40-db8500.h b/arch/arm/mach-ux500/ste-dma40-db8500.h
deleted file mode 100644
index 0296ae5b0fd9..000000000000
--- a/arch/arm/mach-ux500/ste-dma40-db8500.h
+++ /dev/null
@@ -1,85 +0,0 @@
1/*
2 * arch/arm/mach-ux500/ste_dma40_db8500.h
3 * DB8500-SoC-specific configuration for DMA40
4 *
5 * Copyright (C) ST-Ericsson 2007-2010
6 * License terms: GNU General Public License (GPL) version 2
7 * Author: Per Friden <per.friden@stericsson.com>
8 * Author: Jonas Aaberg <jonas.aberg@stericsson.com>
9 */
10#ifndef STE_DMA40_DB8500_H
11#define STE_DMA40_DB8500_H
12
13#define DB8500_DMA_NR_DEV 64
14
15/*
16 * Unless otherwise specified, all channels numbers are used for
17 * TX & RX, and can be used for either source or destination
18 * channels.
19 */
20enum dma_dev_type {
21 DB8500_DMA_DEV0_SPI0 = 0,
22 DB8500_DMA_DEV1_SD_MMC0 = 1,
23 DB8500_DMA_DEV2_SD_MMC1 = 2,
24 DB8500_DMA_DEV3_SD_MMC2 = 3,
25 DB8500_DMA_DEV4_I2C1 = 4,
26 DB8500_DMA_DEV5_I2C3 = 5,
27 DB8500_DMA_DEV6_I2C2 = 6,
28 DB8500_DMA_DEV7_I2C4 = 7, /* Only on V1 and later */
29 DB8500_DMA_DEV8_SSP0 = 8,
30 DB8500_DMA_DEV9_SSP1 = 9,
31 DB8500_DMA_DEV10_MCDE_RX = 10, /* RX only */
32 DB8500_DMA_DEV11_UART2 = 11,
33 DB8500_DMA_DEV12_UART1 = 12,
34 DB8500_DMA_DEV13_UART0 = 13,
35 DB8500_DMA_DEV14_MSP2 = 14,
36 DB8500_DMA_DEV15_I2C0 = 15,
37 DB8500_DMA_DEV16_USB_OTG_IEP_AND_OEP_7_15 = 16,
38 DB8500_DMA_DEV17_USB_OTG_IEP_AND_OEP_6_14 = 17,
39 DB8500_DMA_DEV18_USB_OTG_IEP_AND_OEP_5_13 = 18,
40 DB8500_DMA_DEV19_USB_OTG_IEP_AND_OEP_4_12 = 19,
41 DB8500_DMA_DEV20_SLIM0_CH0_HSI_CH0 = 20,
42 DB8500_DMA_DEV21_SLIM0_CH1_HSI_CH1 = 21,
43 DB8500_DMA_DEV22_SLIM0_CH2_HSI_CH2 = 22,
44 DB8500_DMA_DEV23_SLIM0_CH3_HSI_CH3 = 23,
45 DB8500_DMA_DEV24_SXA0 = 24,
46 DB8500_DMA_DEV25_SXA1 = 25,
47 DB8500_DMA_DEV26_SXA2 = 26,
48 DB8500_DMA_DEV27_SXA3 = 27,
49 DB8500_DMA_DEV28_SD_MM2 = 28,
50 DB8500_DMA_DEV29_SD_MM0 = 29,
51 DB8500_DMA_DEV30_MSP1 = 30,
52 /* On DB8500v2, MSP3 RX replaces MSP1 RX */
53 DB8500_DMA_DEV30_MSP3 = 30,
54 DB8500_DMA_DEV31_MSP0_SLIM0_CH0 = 31,
55 DB8500_DMA_DEV32_SD_MM1 = 32,
56 DB8500_DMA_DEV33_SPI2 = 33,
57 DB8500_DMA_DEV34_I2C3_RX2_TX2 = 34,
58 DB8500_DMA_DEV35_SPI1 = 35,
59 DB8500_DMA_DEV36_USB_OTG_IEP_AND_OEP_3_11 = 36,
60 DB8500_DMA_DEV37_USB_OTG_IEP_AND_OEP_2_10 = 37,
61 DB8500_DMA_DEV38_USB_OTG_IEP_AND_OEP_1_9 = 38,
62 DB8500_DMA_DEV39_USB_OTG_IEP_AND_OEP_8 = 39,
63 DB8500_DMA_DEV40_SPI3 = 40,
64 DB8500_DMA_DEV41_SD_MM3 = 41,
65 DB8500_DMA_DEV42_SD_MM4 = 42,
66 DB8500_DMA_DEV43_SD_MM5 = 43,
67 DB8500_DMA_DEV44_SXA4 = 44,
68 DB8500_DMA_DEV45_SXA5 = 45,
69 DB8500_DMA_DEV46_SLIM0_CH8_SRC_SXA6 = 46,
70 DB8500_DMA_DEV47_SLIM0_CH9_SRC_SXA7 = 47,
71 DB8500_DMA_DEV48_CAC1 = 48,
72 DB8500_DMA_DEV49_CAC1_TX_HAC1_TX = 49, /* TX only */
73 DB8500_DMA_DEV50_HAC1_TX = 50, /* TX only */
74 DB8500_DMA_MEMCPY_TX_0 = 51, /* TX only */
75 DB8500_DMA_DEV52_SLIM0_CH4_HSI_CH4 = 52,
76 DB8500_DMA_DEV53_SLIM0_CH5_HSI_CH5 = 53,
77 DB8500_DMA_DEV54_SLIM0_CH6_HSI_CH6 = 54,
78 DB8500_DMA_DEV55_SLIM0_CH7_HSI_CH7 = 55,
79 /* 56 -> 60 are channels reserved for memcpy only */
80 DB8500_DMA_DEV61_CAC0 = 61,
81 DB8500_DMA_DEV62_CAC0_TX_HAC0_TX = 62, /* TX only */
82 DB8500_DMA_DEV63_HAC0_TX = 63, /* TX only */
83};
84
85#endif
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-26 21:23:14 -0400