aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2013-08-23 04:19:01 -0400
committerLinus Walleij <linus.walleij@linaro.org>2013-09-26 05:08:30 -0400
commit791ffcdebf7a9553bfc46b39689e26531b1e1f02 (patch)
tree9b3462d63cafc55d693896793c790fa94cbad352
parent254a40783d353528fce527d1f512189255b4b40c (diff)
ARM: ux500: Purge DB8500 PRCMU registration when not booting with DT
It's time to remove all ATAG support from ux500 and rely solely on Device Tree booting. This patch is part of that endeavour. Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--arch/arm/mach-ux500/board-mop500.c6
-rw-r--r--arch/arm/mach-ux500/devices-db8500.c36
-rw-r--r--arch/arm/mach-ux500/devices-db8500.h1
3 files changed, 0 insertions, 43 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 8f6c1ea7b216..b37bcbc1c7b7 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -79,8 +79,6 @@ struct pl022_ssp_controller ssp0_plat = {
79 79
80static void __init mop500_init_machine(void) 80static void __init mop500_init_machine(void)
81{ 81{
82 platform_device_register(&db8500_prcmu_device);
83
84 /* This board has full regulator constraints */ 82 /* This board has full regulator constraints */
85 regulator_has_full_constraints(); 83 regulator_has_full_constraints();
86} 84}
@@ -88,16 +86,12 @@ static void __init mop500_init_machine(void)
88 86
89static void __init snowball_init_machine(void) 87static void __init snowball_init_machine(void)
90{ 88{
91 platform_device_register(&db8500_prcmu_device);
92
93 /* This board has full regulator constraints */ 89 /* This board has full regulator constraints */
94 regulator_has_full_constraints(); 90 regulator_has_full_constraints();
95} 91}
96 92
97static void __init hrefv60_init_machine(void) 93static void __init hrefv60_init_machine(void)
98{ 94{
99 platform_device_register(&db8500_prcmu_device);
100
101 /* This board has full regulator constraints */ 95 /* This board has full regulator constraints */
102 regulator_has_full_constraints(); 96 regulator_has_full_constraints();
103} 97}
diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c
index 1b2fabaee3ce..c59f89d058ff 100644
--- a/arch/arm/mach-ux500/devices-db8500.c
+++ b/arch/arm/mach-ux500/devices-db8500.c
@@ -26,39 +26,3 @@ struct prcmu_pdata db8500_prcmu_pdata = {
26 .version_offset = DB8500_PRCMU_FW_VERSION_OFFSET, 26 .version_offset = DB8500_PRCMU_FW_VERSION_OFFSET,
27 .legacy_offset = DB8500_PRCMU_LEGACY_OFFSET, 27 .legacy_offset = DB8500_PRCMU_LEGACY_OFFSET,
28}; 28};
29
30static struct resource db8500_prcmu_res[] = {
31 {
32 .name = "prcmu",
33 .start = U8500_PRCMU_BASE,
34 .end = U8500_PRCMU_BASE + SZ_8K - 1,
35 .flags = IORESOURCE_MEM,
36 },
37 {
38 .name = "prcmu-tcdm",
39 .start = U8500_PRCMU_TCDM_BASE,
40 .end = U8500_PRCMU_TCDM_BASE + SZ_4K - 1,
41 .flags = IORESOURCE_MEM,
42 },
43 {
44 .name = "irq",
45 .start = IRQ_DB8500_PRCMU1,
46 .end = IRQ_DB8500_PRCMU1,
47 .flags = IORESOURCE_IRQ,
48 },
49 {
50 .name = "prcmu-tcpm",
51 .start = U8500_PRCMU_TCPM_BASE,
52 .end = U8500_PRCMU_TCPM_BASE + SZ_32K - 1,
53 .flags = IORESOURCE_MEM,
54 },
55};
56
57struct platform_device db8500_prcmu_device = {
58 .name = "db8500-prcmu",
59 .resource = db8500_prcmu_res,
60 .num_resources = ARRAY_SIZE(db8500_prcmu_res),
61 .dev = {
62 .platform_data = &db8500_prcmu_pdata,
63 },
64};
diff --git a/arch/arm/mach-ux500/devices-db8500.h b/arch/arm/mach-ux500/devices-db8500.h
index fc4048f0432c..6d592185e71c 100644
--- a/arch/arm/mach-ux500/devices-db8500.h
+++ b/arch/arm/mach-ux500/devices-db8500.h
@@ -16,6 +16,5 @@ struct platform_device;
16 16
17extern struct ab8500_platform_data ab8500_platdata; 17extern struct ab8500_platform_data ab8500_platdata;
18extern struct prcmu_pdata db8500_prcmu_pdata; 18extern struct prcmu_pdata db8500_prcmu_pdata;
19extern struct platform_device db8500_prcmu_device;
20 19
21#endif 20#endif