diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-01-27 12:14:45 -0500 |
---|---|---|
committer | Jean Delvare <khali@hyperion.delvare> | 2008-01-27 12:14:45 -0500 |
commit | eee87d3196c9a7ac3422f4298e2250ca68d791c1 (patch) | |
tree | 754fb40d3684b55cc4a30729511e2fa8a59bab25 /arch/ppc | |
parent | 569be443e3c1329fc6725988004f5d8a32fe3be5 (diff) |
i2c: the scheduled I2C RTC driver removal
This patch contains the scheduled removal of legacy I2C RTC drivers with
replacement drivers.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'arch/ppc')
-rw-r--r-- | arch/ppc/platforms/83xx/mpc834x_sys.c | 20 | ||||
-rw-r--r-- | arch/ppc/platforms/85xx/tqm85xx.c | 21 | ||||
-rw-r--r-- | arch/ppc/platforms/katana.c | 21 |
3 files changed, 0 insertions, 62 deletions
diff --git a/arch/ppc/platforms/83xx/mpc834x_sys.c b/arch/ppc/platforms/83xx/mpc834x_sys.c index b84f8df325c4..cb0a7493ff64 100644 --- a/arch/ppc/platforms/83xx/mpc834x_sys.c +++ b/arch/ppc/platforms/83xx/mpc834x_sys.c | |||
@@ -224,26 +224,6 @@ mpc834x_sys_init_IRQ(void) | |||
224 | ipic_set_default_priority(); | 224 | ipic_set_default_priority(); |
225 | } | 225 | } |
226 | 226 | ||
227 | #if defined(CONFIG_I2C_MPC) && defined(CONFIG_SENSORS_DS1374) | ||
228 | extern ulong ds1374_get_rtc_time(void); | ||
229 | extern int ds1374_set_rtc_time(ulong); | ||
230 | |||
231 | static int __init | ||
232 | mpc834x_rtc_hookup(void) | ||
233 | { | ||
234 | struct timespec tv; | ||
235 | |||
236 | ppc_md.get_rtc_time = ds1374_get_rtc_time; | ||
237 | ppc_md.set_rtc_time = ds1374_set_rtc_time; | ||
238 | |||
239 | tv.tv_nsec = 0; | ||
240 | tv.tv_sec = (ppc_md.get_rtc_time)(); | ||
241 | do_settimeofday(&tv); | ||
242 | |||
243 | return 0; | ||
244 | } | ||
245 | late_initcall(mpc834x_rtc_hookup); | ||
246 | #endif | ||
247 | static __inline__ void | 227 | static __inline__ void |
248 | mpc834x_sys_set_bat(void) | 228 | mpc834x_sys_set_bat(void) |
249 | { | 229 | { |
diff --git a/arch/ppc/platforms/85xx/tqm85xx.c b/arch/ppc/platforms/85xx/tqm85xx.c index 4ee2bd156dc5..27ce389c1224 100644 --- a/arch/ppc/platforms/85xx/tqm85xx.c +++ b/arch/ppc/platforms/85xx/tqm85xx.c | |||
@@ -258,27 +258,6 @@ int tqm85xx_show_cpuinfo(struct seq_file *m) | |||
258 | return 0; | 258 | return 0; |
259 | } | 259 | } |
260 | 260 | ||
261 | #if defined(CONFIG_I2C) && defined(CONFIG_SENSORS_DS1337) | ||
262 | extern ulong ds1337_get_rtc_time(void); | ||
263 | extern int ds1337_set_rtc_time(unsigned long nowtime); | ||
264 | |||
265 | static int __init | ||
266 | tqm85xx_rtc_hookup(void) | ||
267 | { | ||
268 | struct timespec tv; | ||
269 | |||
270 | ppc_md.set_rtc_time = ds1337_set_rtc_time; | ||
271 | ppc_md.get_rtc_time = ds1337_get_rtc_time; | ||
272 | |||
273 | tv.tv_nsec = 0; | ||
274 | tv.tv_sec = (ppc_md.get_rtc_time)(); | ||
275 | do_settimeofday(&tv); | ||
276 | |||
277 | return 0; | ||
278 | } | ||
279 | late_initcall(tqm85xx_rtc_hookup); | ||
280 | #endif | ||
281 | |||
282 | #ifdef CONFIG_PCI | 261 | #ifdef CONFIG_PCI |
283 | /* | 262 | /* |
284 | * interrupt routing | 263 | * interrupt routing |
diff --git a/arch/ppc/platforms/katana.c b/arch/ppc/platforms/katana.c index 52f63e6f0856..fe6e88cdb1cd 100644 --- a/arch/ppc/platforms/katana.c +++ b/arch/ppc/platforms/katana.c | |||
@@ -838,27 +838,6 @@ katana_find_end_of_memory(void) | |||
838 | return bdp->bi_memsize; | 838 | return bdp->bi_memsize; |
839 | } | 839 | } |
840 | 840 | ||
841 | #if defined(CONFIG_I2C_MV64XXX) && defined(CONFIG_SENSORS_M41T00) | ||
842 | extern ulong m41t00_get_rtc_time(void); | ||
843 | extern int m41t00_set_rtc_time(ulong); | ||
844 | |||
845 | static int __init | ||
846 | katana_rtc_hookup(void) | ||
847 | { | ||
848 | struct timespec tv; | ||
849 | |||
850 | ppc_md.get_rtc_time = m41t00_get_rtc_time; | ||
851 | ppc_md.set_rtc_time = m41t00_set_rtc_time; | ||
852 | |||
853 | tv.tv_nsec = 0; | ||
854 | tv.tv_sec = (ppc_md.get_rtc_time)(); | ||
855 | do_settimeofday(&tv); | ||
856 | |||
857 | return 0; | ||
858 | } | ||
859 | late_initcall(katana_rtc_hookup); | ||
860 | #endif | ||
861 | |||
862 | #if defined(CONFIG_SERIAL_TEXT_DEBUG) && defined(CONFIG_SERIAL_MPSC_CONSOLE) | 841 | #if defined(CONFIG_SERIAL_TEXT_DEBUG) && defined(CONFIG_SERIAL_MPSC_CONSOLE) |
863 | static void __init | 842 | static void __init |
864 | katana_map_io(void) | 843 | katana_map_io(void) |