aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@iki.fi>2013-10-14 14:30:45 -0400
committerTony Lindgren <tony@atomide.com>2013-10-18 13:24:33 -0400
commitdfcc11ad4a4e620440475e25cf75d10c9d3bf7c2 (patch)
treee06049a4f9b667c0f626853ffbee53de5cb001bd
parentdf01318850d5c687533c6e2460d1df65944d0d4b (diff)
ARM: OMAP2: delete board-rm680
Delete board file for Nokia RM-680/RM-696 (N950/N9). DT-based booting should be used for further development on this HW. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat
-rw-r--r--arch/arm/mach-omap2/Kconfig7
-rw-r--r--arch/arm/mach-omap2/Makefile1
-rw-r--r--arch/arm/mach-omap2/board-rm680.c167
3 files changed, 0 insertions, 175 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index f6a1db112168..6850bf9f8f18 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -310,13 +310,6 @@ config MACH_NOKIA_N8X0
310 select MACH_NOKIA_N810_WIMAX 310 select MACH_NOKIA_N810_WIMAX
311 select OMAP_PACKAGE_ZAC 311 select OMAP_PACKAGE_ZAC
312 312
313config MACH_NOKIA_RM680
314 bool "Nokia N950 (RM-680) / N9 (RM-696) phones"
315 depends on ARCH_OMAP3
316 default y
317 select MACH_NOKIA_RM696
318 select OMAP_PACKAGE_CBB
319
320config MACH_NOKIA_RX51 313config MACH_NOKIA_RX51
321 bool "Nokia N900 (RX-51) phone" 314 bool "Nokia N900 (RX-51) phone"
322 depends on ARCH_OMAP3 315 depends on ARCH_OMAP3
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index f8d4a1b83864..1d2917b16a96 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -246,7 +246,6 @@ obj-$(CONFIG_MACH_OMAP3EVM) += board-omap3evm.o
246obj-$(CONFIG_MACH_OMAP3_PANDORA) += board-omap3pandora.o 246obj-$(CONFIG_MACH_OMAP3_PANDORA) += board-omap3pandora.o
247obj-$(CONFIG_MACH_OMAP_3430SDP) += board-3430sdp.o 247obj-$(CONFIG_MACH_OMAP_3430SDP) += board-3430sdp.o
248obj-$(CONFIG_MACH_NOKIA_N8X0) += board-n8x0.o 248obj-$(CONFIG_MACH_NOKIA_N8X0) += board-n8x0.o
249obj-$(CONFIG_MACH_NOKIA_RM680) += board-rm680.o sdram-nokia.o
250obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o sdram-nokia.o 249obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o sdram-nokia.o
251obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51-peripherals.o 250obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51-peripherals.o
252obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51-video.o 251obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51-video.o
diff --git a/arch/arm/mach-omap2/board-rm680.c b/arch/arm/mach-omap2/board-rm680.c
deleted file mode 100644
index 345e8c4b8731..000000000000
--- a/arch/arm/mach-omap2/board-rm680.c
+++ /dev/null
@@ -1,167 +0,0 @@
1/*
2 * Board support file for Nokia N950 (RM-680) / N9 (RM-696).
3 *
4 * Copyright (C) 2010 Nokia
5 *
6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License version 2 as
8 * published by the Free Software Foundation.
9 */
10
11#include <linux/io.h>
12#include <linux/i2c.h>
13#include <linux/gpio.h>
14#include <linux/init.h>
15#include <linux/i2c/twl.h>
16#include <linux/platform_device.h>
17#include <linux/regulator/fixed.h>
18#include <linux/regulator/machine.h>
19#include <linux/regulator/consumer.h>
20#include <linux/platform_data/mtd-onenand-omap2.h>
21#include <linux/usb/phy.h>
22
23#include <asm/mach/arch.h>
24#include <asm/mach-types.h>
25
26#include "common.h"
27#include "mux.h"
28#include "gpmc.h"
29#include "mmc.h"
30#include "hsmmc.h"
31#include "sdram-nokia.h"
32#include "common-board-devices.h"
33#include "gpmc-onenand.h"
34
35static struct regulator_consumer_supply rm680_vemmc_consumers[] = {
36 REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1"),
37};
38
39/* Fixed regulator for internal eMMC */
40static struct regulator_init_data rm680_vemmc = {
41 .constraints = {
42 .name = "rm680_vemmc",
43 .valid_modes_mask = REGULATOR_MODE_NORMAL
44 | REGULATOR_MODE_STANDBY,
45 .valid_ops_mask = REGULATOR_CHANGE_STATUS
46 | REGULATOR_CHANGE_MODE,
47 },
48 .num_consumer_supplies = ARRAY_SIZE(rm680_vemmc_consumers),
49 .consumer_supplies = rm680_vemmc_consumers,
50};
51
52static struct fixed_voltage_config rm680_vemmc_config = {
53 .supply_name = "VEMMC",
54 .microvolts = 2900000,
55 .gpio = 157,
56 .startup_delay = 150,
57 .enable_high = 1,
58 .init_data = &rm680_vemmc,
59};
60
61static struct platform_device rm680_vemmc_device = {
62 .name = "reg-fixed-voltage",
63 .dev = {
64 .platform_data = &rm680_vemmc_config,
65 },
66};
67
68static struct platform_device *rm680_peripherals_devices[] __initdata = {
69 &rm680_vemmc_device,
70};
71
72/* TWL */
73static struct twl4030_gpio_platform_data rm680_gpio_data = {
74 .pullups = BIT(0),
75 .pulldowns = BIT(1) | BIT(2) | BIT(8) | BIT(15),
76};
77
78static struct twl4030_platform_data rm680_twl_data = {
79 .gpio = &rm680_gpio_data,
80 /* add rest of the children here */
81};
82
83static void __init rm680_i2c_init(void)
84{
85 omap3_pmic_get_config(&rm680_twl_data, TWL_COMMON_PDATA_USB, 0);
86 omap_pmic_init(1, 2900, "twl5031", 7 + OMAP_INTC_START, &rm680_twl_data);
87 omap_register_i2c_bus(2, 400, NULL, 0);
88 omap_register_i2c_bus(3, 400, NULL, 0);
89}
90
91#if defined(CONFIG_MTD_ONENAND_OMAP2) || \
92 defined(CONFIG_MTD_ONENAND_OMAP2_MODULE)
93static struct omap_onenand_platform_data board_onenand_data[] = {
94 {
95 .gpio_irq = 65,
96 .flags = ONENAND_SYNC_READWRITE,
97 }
98};
99#endif
100
101/* eMMC */
102static struct omap2_hsmmc_info mmc[] __initdata = {
103 {
104 .name = "internal",
105 .mmc = 2,
106 .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_MMC_HIGHSPEED,
107 .gpio_cd = -EINVAL,
108 .gpio_wp = -EINVAL,
109 },
110 { /* Terminator */ }
111};
112
113static void __init rm680_peripherals_init(void)
114{
115 platform_add_devices(rm680_peripherals_devices,
116 ARRAY_SIZE(rm680_peripherals_devices));
117 rm680_i2c_init();
118 gpmc_onenand_init(board_onenand_data);
119 omap_hsmmc_init(mmc);
120}
121
122#ifdef CONFIG_OMAP_MUX
123static struct omap_board_mux board_mux[] __initdata = {
124 { .reg_offset = OMAP_MUX_TERMINATOR },
125};
126#endif
127
128static void __init rm680_init(void)
129{
130 struct omap_sdrc_params *sdrc_params;
131
132 omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
133 omap_serial_init();
134
135 sdrc_params = nokia_get_sdram_timings();
136 omap_sdrc_init(sdrc_params, sdrc_params);
137
138 usb_bind_phy("musb-hdrc.0.auto", 0, "twl4030_usb");
139 usb_musb_init(NULL);
140 rm680_peripherals_init();
141}
142
143MACHINE_START(NOKIA_RM680, "Nokia RM-680 board")
144 .atag_offset = 0x100,
145 .reserve = omap_reserve,
146 .map_io = omap3_map_io,
147 .init_early = omap3630_init_early,
148 .init_irq = omap3_init_irq,
149 .handle_irq = omap3_intc_handle_irq,
150 .init_machine = rm680_init,
151 .init_late = omap3630_init_late,
152 .init_time = omap3_sync32k_timer_init,
153 .restart = omap3xxx_restart,
154MACHINE_END
155
156MACHINE_START(NOKIA_RM696, "Nokia RM-696 board")
157 .atag_offset = 0x100,
158 .reserve = omap_reserve,
159 .map_io = omap3_map_io,
160 .init_early = omap3630_init_early,
161 .init_irq = omap3_init_irq,
162 .handle_irq = omap3_intc_handle_irq,
163 .init_machine = rm680_init,
164 .init_late = omap3630_init_late,
165 .init_time = omap3_sync32k_timer_init,
166 .restart = omap3xxx_restart,
167MACHINE_END
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-19 02:48:20 -0400