Skip to content

Commit 37b156e

Browse files
tmlindtmlind
committed
ARM: OMAP2+: Drop legacy platform data for sdma
We can now probe devices with ti-sysc interconnect driver and dts data. Let's drop the related platform data and custom ti,hwmods dts property. As we're just dropping data, and the early platform data init is based on the custom ti,hwmods property, we want to drop both the platform data and ti,hwmods property in a single patch. Cc: Aaro Koskinen <[email protected]> Cc: Arnd Bergmann <[email protected]> Cc: Peter Ujfalusi <[email protected]> Cc: Russell King <[email protected]> Cc: Vinod Koul <[email protected]> Acked-by: Peter Ujfalusi <[email protected]> Tested-by: Peter Ujfalusi <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
1 parent 82f12e6 commit 37b156e

13 files changed

+0
-296
lines changed

‎arch/arm/boot/dts/dra7-l4.dtsi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@
186186

187187
target-module@56000 { /* 0x4a056000, ap 9 02.0 */
188188
compatible = "ti,sysc-omap2", "ti,sysc";
189-
ti,hwmods = "dma_system";
190189
reg = <0x56000 0x4>,
191190
<0x5602c 0x4>,
192191
<0x56028 0x4>;

‎arch/arm/boot/dts/omap2.dtsi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@
8282

8383
target-module@48056000 {
8484
compatible = "ti,sysc-omap2", "ti,sysc";
85-
ti,hwmods = "dma";
8685
reg = <0x48056000 0x4>,
8786
<0x4805602c 0x4>,
8887
<0x48056028 0x4>;

‎arch/arm/boot/dts/omap3.dtsi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,6 @@
208208

209209
target-module@48056000 {
210210
compatible = "ti,sysc-omap2", "ti,sysc";
211-
ti,hwmods = "dma";
212211
reg = <0x48056000 0x4>,
213212
<0x4805602c 0x4>,
214213
<0x48056028 0x4>;

‎arch/arm/boot/dts/omap4-l4.dtsi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@
136136

137137
target-module@56000 { /* 0x4a056000, ap 7 0a.0 */
138138
compatible = "ti,sysc-omap2", "ti,sysc";
139-
ti,hwmods = "dma_system";
140139
reg = <0x56000 0x4>,
141140
<0x5602c 0x4>,
142141
<0x56028 0x4>;

‎arch/arm/boot/dts/omap5-l4.dtsi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,6 @@
213213

214214
target-module@56000 { /* 0x4a056000, ap 7 02.0 */
215215
compatible = "ti,sysc-omap2", "ti,sysc";
216-
ti,hwmods = "dma_system";
217216
reg = <0x56000 0x4>,
218217
<0x5602c 0x4>,
219218
<0x56028 0x4>;

‎arch/arm/mach-omap2/omap_hwmod_2420_data.c

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
*/
1212

1313
#include <linux/platform_data/i2c-omap.h>
14-
#include <linux/omap-dma.h>
1514

1615
#include "omap_hwmod.h"
1716
#include "l3_2xxx.h"
@@ -126,13 +125,6 @@ static struct omap_hwmod omap2420_i2c2_hwmod = {
126125
.flags = HWMOD_16BIT_REG,
127126
};
128127

129-
static struct omap_hwmod omap2420_dma_system_hwmod = {
130-
.name = "dma",
131-
.class = &omap2xxx_dma_hwmod_class,
132-
.main_clk = "core_l3_ck",
133-
.flags = HWMOD_NO_IDLEST,
134-
};
135-
136128
/* mailbox */
137129
static struct omap_hwmod omap2420_mailbox_hwmod = {
138130
.name = "mailbox",
@@ -320,22 +312,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_wkup__gpio4 = {
320312
.user = OCP_USER_MPU | OCP_USER_SDMA,
321313
};
322314

323-
/* dma_system -> L3 */
324-
static struct omap_hwmod_ocp_if omap2420_dma_system__l3 = {
325-
.master = &omap2420_dma_system_hwmod,
326-
.slave = &omap2xxx_l3_main_hwmod,
327-
.clk = "core_l3_ck",
328-
.user = OCP_USER_MPU | OCP_USER_SDMA,
329-
};
330-
331-
/* l4_core -> dma_system */
332-
static struct omap_hwmod_ocp_if omap2420_l4_core__dma_system = {
333-
.master = &omap2xxx_l4_core_hwmod,
334-
.slave = &omap2420_dma_system_hwmod,
335-
.clk = "sdma_ick",
336-
.user = OCP_USER_MPU | OCP_USER_SDMA,
337-
};
338-
339315
/* l4_core -> mailbox */
340316
static struct omap_hwmod_ocp_if omap2420_l4_core__mailbox = {
341317
.master = &omap2xxx_l4_core_hwmod,
@@ -427,8 +403,6 @@ static struct omap_hwmod_ocp_if *omap2420_hwmod_ocp_ifs[] __initdata = {
427403
&omap2420_l4_wkup__gpio2,
428404
&omap2420_l4_wkup__gpio3,
429405
&omap2420_l4_wkup__gpio4,
430-
&omap2420_dma_system__l3,
431-
&omap2420_l4_core__dma_system,
432406
&omap2420_l4_core__mailbox,
433407
&omap2420_l4_core__mcbsp1,
434408
&omap2420_l4_core__mcbsp2,

‎arch/arm/mach-omap2/omap_hwmod_2430_data.c

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
#include <linux/platform_data/i2c-omap.h>
1414
#include <linux/platform_data/hsmmc-omap.h>
15-
#include <linux/omap-dma.h>
1615

1716
#include "omap_hwmod.h"
1817
#include "l3_2xxx.h"
@@ -121,13 +120,6 @@ static struct omap_hwmod omap2430_gpio5_hwmod = {
121120
.class = &omap2xxx_gpio_hwmod_class,
122121
};
123122

124-
static struct omap_hwmod omap2430_dma_system_hwmod = {
125-
.name = "dma",
126-
.class = &omap2xxx_dma_hwmod_class,
127-
.main_clk = "core_l3_ck",
128-
.flags = HWMOD_NO_IDLEST,
129-
};
130-
131123
/* mailbox */
132124
static struct omap_hwmod omap2430_mailbox_hwmod = {
133125
.name = "mailbox",
@@ -500,22 +492,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__gpio5 = {
500492
.user = OCP_USER_MPU | OCP_USER_SDMA,
501493
};
502494

503-
/* dma_system -> L3 */
504-
static struct omap_hwmod_ocp_if omap2430_dma_system__l3 = {
505-
.master = &omap2430_dma_system_hwmod,
506-
.slave = &omap2xxx_l3_main_hwmod,
507-
.clk = "core_l3_ck",
508-
.user = OCP_USER_MPU | OCP_USER_SDMA,
509-
};
510-
511-
/* l4_core -> dma_system */
512-
static struct omap_hwmod_ocp_if omap2430_l4_core__dma_system = {
513-
.master = &omap2xxx_l4_core_hwmod,
514-
.slave = &omap2430_dma_system_hwmod,
515-
.clk = "sdma_ick",
516-
.user = OCP_USER_MPU | OCP_USER_SDMA,
517-
};
518-
519495
/* l4_core -> mailbox */
520496
static struct omap_hwmod_ocp_if omap2430_l4_core__mailbox = {
521497
.master = &omap2xxx_l4_core_hwmod,
@@ -627,8 +603,6 @@ static struct omap_hwmod_ocp_if *omap2430_hwmod_ocp_ifs[] __initdata = {
627603
&omap2430_l4_wkup__gpio3,
628604
&omap2430_l4_wkup__gpio4,
629605
&omap2430_l4_core__gpio5,
630-
&omap2430_dma_system__l3,
631-
&omap2430_l4_core__dma_system,
632606
&omap2430_l4_core__mailbox,
633607
&omap2430_l4_core__mcbsp1,
634608
&omap2430_l4_core__mcbsp2,

‎arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
*/
88

99
#include <linux/types.h>
10-
#include <linux/omap-dma.h>
1110

1211
#include "omap_hwmod.h"
1312
#include "omap_hwmod_common_data.h"
@@ -95,23 +94,6 @@ struct omap_hwmod_class omap2xxx_gpio_hwmod_class = {
9594
.sysc = &omap2xxx_gpio_sysc,
9695
};
9796

98-
/* system dma */
99-
static struct omap_hwmod_class_sysconfig omap2xxx_dma_sysc = {
100-
.rev_offs = 0x0000,
101-
.sysc_offs = 0x002c,
102-
.syss_offs = 0x0028,
103-
.sysc_flags = (SYSC_HAS_SOFTRESET | SYSC_HAS_MIDLEMODE |
104-
SYSC_HAS_CLOCKACTIVITY | SYSC_HAS_EMUFREE |
105-
SYSC_HAS_AUTOIDLE | SYSS_HAS_RESET_STATUS),
106-
.idlemodes = (MSTANDBY_FORCE | MSTANDBY_NO | MSTANDBY_SMART),
107-
.sysc_fields = &omap_hwmod_sysc_type1,
108-
};
109-
110-
struct omap_hwmod_class omap2xxx_dma_hwmod_class = {
111-
.name = "dma",
112-
.sysc = &omap2xxx_dma_sysc,
113-
};
114-
11597
/*
11698
* 'mailbox' class
11799
* mailbox module allowing communication between the on-chip processors

‎arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include <linux/power/smartreflex.h>
1717
#include <linux/platform_data/hsmmc-omap.h>
1818

19-
#include <linux/omap-dma.h>
2019
#include "l3_3xxx.h"
2120
#include "l4_3xxx.h"
2221

@@ -833,39 +832,6 @@ static struct omap_hwmod omap3xxx_gpio6_hwmod = {
833832
.class = &omap3xxx_gpio_hwmod_class,
834833
};
835834

836-
static struct omap_hwmod_class_sysconfig omap3xxx_dma_sysc = {
837-
.rev_offs = 0x0000,
838-
.sysc_offs = 0x002c,
839-
.syss_offs = 0x0028,
840-
.sysc_flags = (SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET |
841-
SYSC_HAS_MIDLEMODE | SYSC_HAS_CLOCKACTIVITY |
842-
SYSC_HAS_EMUFREE | SYSC_HAS_AUTOIDLE |
843-
SYSS_HAS_RESET_STATUS),
844-
.idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
845-
MSTANDBY_FORCE | MSTANDBY_NO | MSTANDBY_SMART),
846-
.sysc_fields = &omap_hwmod_sysc_type1,
847-
};
848-
849-
static struct omap_hwmod_class omap3xxx_dma_hwmod_class = {
850-
.name = "dma",
851-
.sysc = &omap3xxx_dma_sysc,
852-
};
853-
854-
/* dma_system */
855-
static struct omap_hwmod omap3xxx_dma_system_hwmod = {
856-
.name = "dma",
857-
.class = &omap3xxx_dma_hwmod_class,
858-
.main_clk = "core_l3_ick",
859-
.prcm = {
860-
.omap2 = {
861-
.module_offs = CORE_MOD,
862-
.idlest_reg_id = 1,
863-
.idlest_idle_bit = OMAP3430_ST_SDMA_SHIFT,
864-
},
865-
},
866-
.flags = HWMOD_NO_IDLEST,
867-
};
868-
869835
/*
870836
* 'mcbsp' class
871837
* multi channel buffered serial port controller
@@ -2225,23 +2191,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_per__gpio6 = {
22252191
.user = OCP_USER_MPU | OCP_USER_SDMA,
22262192
};
22272193

2228-
/* dma_system -> L3 */
2229-
static struct omap_hwmod_ocp_if omap3xxx_dma_system__l3 = {
2230-
.master = &omap3xxx_dma_system_hwmod,
2231-
.slave = &omap3xxx_l3_main_hwmod,
2232-
.clk = "core_l3_ick",
2233-
.user = OCP_USER_MPU | OCP_USER_SDMA,
2234-
};
2235-
2236-
/* l4_cfg -> dma_system */
2237-
static struct omap_hwmod_ocp_if omap3xxx_l4_core__dma_system = {
2238-
.master = &omap3xxx_l4_core_hwmod,
2239-
.slave = &omap3xxx_dma_system_hwmod,
2240-
.clk = "core_l4_ick",
2241-
.user = OCP_USER_MPU | OCP_USER_SDMA,
2242-
};
2243-
2244-
22452194
/* l4_core -> mcbsp1 */
22462195
static struct omap_hwmod_ocp_if omap3xxx_l4_core__mcbsp1 = {
22472196
.master = &omap3xxx_l4_core_hwmod,
@@ -2620,8 +2569,6 @@ static struct omap_hwmod_ocp_if *omap3xxx_hwmod_ocp_ifs[] __initdata = {
26202569
&omap3xxx_l4_per__gpio4,
26212570
&omap3xxx_l4_per__gpio5,
26222571
&omap3xxx_l4_per__gpio6,
2623-
&omap3xxx_dma_system__l3,
2624-
&omap3xxx_l4_core__dma_system,
26252572
&omap3xxx_l4_core__mcbsp1,
26262573
&omap3xxx_l4_per__mcbsp2,
26272574
&omap3xxx_l4_per__mcbsp3,

‎arch/arm/mach-omap2/omap_hwmod_44xx_data.c

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
#include <linux/io.h>
2121
#include <linux/power/smartreflex.h>
2222

23-
#include <linux/omap-dma.h>
24-
2523
#include "omap_hwmod.h"
2624
#include "omap_hwmod_common_data.h"
2725
#include "cm1_44xx.h"
@@ -32,9 +30,6 @@
3230
/* Base offset for all OMAP4 interrupts external to MPUSS */
3331
#define OMAP44XX_IRQ_GIC_START 32
3432

35-
/* Base offset for all OMAP4 dma requests */
36-
#define OMAP44XX_DMA_REQ_START 1
37-
3833
/*
3934
* IP blocks
4035
*/
@@ -398,44 +393,6 @@ static struct omap_hwmod omap44xx_debugss_hwmod = {
398393
},
399394
};
400395

401-
/*
402-
* 'dma' class
403-
* dma controller for data exchange between memory to memory (i.e. internal or
404-
* external memory) and gp peripherals to memory or memory to gp peripherals
405-
*/
406-
407-
static struct omap_hwmod_class_sysconfig omap44xx_dma_sysc = {
408-
.rev_offs = 0x0000,
409-
.sysc_offs = 0x002c,
410-
.syss_offs = 0x0028,
411-
.sysc_flags = (SYSC_HAS_AUTOIDLE | SYSC_HAS_CLOCKACTIVITY |
412-
SYSC_HAS_EMUFREE | SYSC_HAS_MIDLEMODE |
413-
SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET |
414-
SYSS_HAS_RESET_STATUS),
415-
.idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
416-
MSTANDBY_FORCE | MSTANDBY_NO | MSTANDBY_SMART),
417-
.sysc_fields = &omap_hwmod_sysc_type1,
418-
};
419-
420-
static struct omap_hwmod_class omap44xx_dma_hwmod_class = {
421-
.name = "dma",
422-
.sysc = &omap44xx_dma_sysc,
423-
};
424-
425-
/* dma_system */
426-
static struct omap_hwmod omap44xx_dma_system_hwmod = {
427-
.name = "dma_system",
428-
.class = &omap44xx_dma_hwmod_class,
429-
.clkdm_name = "l3_dma_clkdm",
430-
.main_clk = "l3_div_ck",
431-
.prcm = {
432-
.omap4 = {
433-
.clkctrl_offs = OMAP4_CM_SDMA_SDMA_CLKCTRL_OFFSET,
434-
.context_offs = OMAP4_RM_SDMA_SDMA_CONTEXT_OFFSET,
435-
},
436-
},
437-
};
438-
439396
/*
440397
* 'dmic' class
441398
* digital microphone controller
@@ -2205,14 +2162,6 @@ static struct omap_hwmod_ocp_if omap44xx_debugss__l3_main_2 = {
22052162
.user = OCP_USER_MPU | OCP_USER_SDMA,
22062163
};
22072164

2208-
/* dma_system -> l3_main_2 */
2209-
static struct omap_hwmod_ocp_if omap44xx_dma_system__l3_main_2 = {
2210-
.master = &omap44xx_dma_system_hwmod,
2211-
.slave = &omap44xx_l3_main_2_hwmod,
2212-
.clk = "l3_div_ck",
2213-
.user = OCP_USER_MPU | OCP_USER_SDMA,
2214-
};
2215-
22162165
/* fdif -> l3_main_2 */
22172166
static struct omap_hwmod_ocp_if omap44xx_fdif__l3_main_2 = {
22182167
.master = &omap44xx_fdif_hwmod,
@@ -2445,14 +2394,6 @@ static struct omap_hwmod_ocp_if omap44xx_l3_instr__debugss = {
24452394
.user = OCP_USER_MPU | OCP_USER_SDMA,
24462395
};
24472396

2448-
/* l4_cfg -> dma_system */
2449-
static struct omap_hwmod_ocp_if omap44xx_l4_cfg__dma_system = {
2450-
.master = &omap44xx_l4_cfg_hwmod,
2451-
.slave = &omap44xx_dma_system_hwmod,
2452-
.clk = "l4_div_ck",
2453-
.user = OCP_USER_MPU | OCP_USER_SDMA,
2454-
};
2455-
24562397
/* l4_abe -> dmic */
24572398
static struct omap_hwmod_ocp_if omap44xx_l4_abe__dmic = {
24582399
.master = &omap44xx_l4_abe_hwmod,
@@ -2945,7 +2886,6 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = {
29452886
&omap44xx_l4_cfg__l3_main_1,
29462887
&omap44xx_mpu__l3_main_1,
29472888
&omap44xx_debugss__l3_main_2,
2948-
&omap44xx_dma_system__l3_main_2,
29492889
&omap44xx_fdif__l3_main_2,
29502890
&omap44xx_hsi__l3_main_2,
29512891
&omap44xx_ipu__l3_main_2,
@@ -2975,7 +2915,6 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = {
29752915
&omap44xx_l4_wkup__ctrl_module_wkup,
29762916
&omap44xx_l4_wkup__ctrl_module_pad_wkup,
29772917
&omap44xx_l3_instr__debugss,
2978-
&omap44xx_l4_cfg__dma_system,
29792918
&omap44xx_l4_abe__dmic,
29802919
&omap44xx_dsp__iva,
29812920
/* &omap44xx_dsp__sl2if, */

0 commit comments

Comments
 (0)