Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc

Browse source 
* 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Fix ucc_geth of_device discovery on mpc832x
  [POWERPC] Revert "[POWERPC] Add powerpc get/set_rtc_time interface to new generic rtc class"
  [POWERPC] Revert "[POWERPC] Enable generic rtc hook for the MPC8349 mITX"
This commit is contained in:
Linus Torvalds 2006-11-21 18:42:44 -08:00
commit 0f9005a6f7
4 changed files with 19 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
arch/powerpc/kernel/time.c
View file

@ -1014,48 +1014,6 @@ void __init time_init(void)
set_dec(tb_ticks_per_jiffy); set_dec(tb_ticks_per_jiffy);
} }
#ifdef CONFIG_RTC_CLASS
static int set_rtc_class_time(struct rtc_time *tm)
{
int err;
struct class_device *class_dev =
rtc_class_open(CONFIG_RTC_HCTOSYS_DEVICE);
if (class_dev == NULL)
return -ENODEV;
err = rtc_set_time(class_dev, tm);
rtc_class_close(class_dev);
return 0;
}
static void get_rtc_class_time(struct rtc_time *tm)
{
int err;
struct class_device *class_dev =
rtc_class_open(CONFIG_RTC_HCTOSYS_DEVICE);
if (class_dev == NULL)
return;
err = rtc_read_time(class_dev, tm);
rtc_class_close(class_dev);
return;
}
int __init rtc_class_hookup(void)
{
ppc_md.get_rtc_time = get_rtc_class_time;
ppc_md.set_rtc_time = set_rtc_class_time;
return 0;
}
#endif /* CONFIG_RTC_CLASS */
#define FEBRUARY 2 #define FEBRUARY 2
#define STARTOFTIME 1970 #define STARTOFTIME 1970

19
arch/powerpc/platforms/83xx/mpc832x_mds.c
View file

@ -24,6 +24,7 @@
#include <linux/root_dev.h> #include <linux/root_dev.h>
#include <linux/initrd.h> #include <linux/initrd.h>
#include <asm/of_device.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/atomic.h> #include <asm/atomic.h>
#include <asm/time.h> #include <asm/time.h>
@ -136,6 +137,24 @@ static void __init mpc832x_sys_setup_arch(void)
#endif #endif
} }
static int __init mpc832x_declare_of_platform_devices(void)
{
struct device_node *np;
for (np = NULL; (np = of_find_compatible_node(np, "network",
"ucc_geth")) != NULL;) {
int ucc_num;
char bus_id[BUS_ID_SIZE];
ucc_num = *((uint *) get_property(np, "device-id", NULL)) - 1;
snprintf(bus_id, BUS_ID_SIZE, "ucc_geth.%u", ucc_num);
of_platform_device_create(np, bus_id, NULL);
}
return 0;
}
device_initcall(mpc832x_declare_of_platform_devices);
void __init mpc832x_sys_init_IRQ(void) void __init mpc832x_sys_init_IRQ(void)
{ {

4
arch/powerpc/platforms/83xx/mpc834x_itx.c
View file

@ -108,10 +108,6 @@ static int __init mpc834x_itx_probe(void)
return 1; return 1;
} }
#ifdef CONFIG_RTC_CLASS
late_initcall(rtc_class_hookup);
#endif
define_machine(mpc834x_itx) { define_machine(mpc834x_itx) {
.name = "MPC834x ITX", .name = "MPC834x ITX",
.probe = mpc834x_itx_probe, .probe = mpc834x_itx_probe,

4
include/asm-powerpc/time.h
View file

@ -39,10 +39,6 @@ extern void generic_calibrate_decr(void);
extern void wakeup_decrementer(void); extern void wakeup_decrementer(void);
extern void snapshot_timebase(void); extern void snapshot_timebase(void);
#ifdef CONFIG_RTC_CLASS
extern int __init rtc_class_hookup(void);
#endif
/* Some sane defaults: 125 MHz timebase, 1GHz processor */ /* Some sane defaults: 125 MHz timebase, 1GHz processor */
extern unsigned long ppc_proc_freq; extern unsigned long ppc_proc_freq;
#define DEFAULT_PROC_FREQ (DEFAULT_TB_FREQ * 8) #define DEFAULT_PROC_FREQ (DEFAULT_TB_FREQ * 8)