aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/sbus
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/sbus')
-rw-r--r--drivers/sbus/sbus.c18
1 files changed, 1 insertions, 17 deletions
diff --git a/drivers/sbus/sbus.c b/drivers/sbus/sbus.c
index 3b30f9995129..64c3e45875ff 100644
--- a/drivers/sbus/sbus.c
+++ b/drivers/sbus/sbus.c
@@ -51,9 +51,6 @@ static void __init fill_sbus_device(struct device_node *dp, struct sbus_dev *sde
51 struct dev_archdata *sd; 51 struct dev_archdata *sd;
52 int err; 52 int err;
53 53
54 sdev->prom_node = dp->node;
55 strcpy(sdev->prom_name, dp->name);
56
57 sd = &sdev->ofdev.dev.archdata; 54 sd = &sdev->ofdev.dev.archdata;
58 sd->prom_node = dp; 55 sd->prom_node = dp;
59 sd->op = &sdev->ofdev; 56 sd->op = &sdev->ofdev;
@@ -107,30 +104,17 @@ static void __init walk_children(struct device_node *dp, struct sbus_dev *parent
107 104
108static void __init build_one_sbus(struct device_node *dp, int num_sbus) 105static void __init build_one_sbus(struct device_node *dp, int num_sbus)
109{ 106{
110 struct sbus_bus *sbus;
111 unsigned int sbus_clock;
112 struct device_node *dev_dp; 107 struct device_node *dev_dp;
108 struct sbus_bus *sbus;
113 109
114 sbus = kzalloc(sizeof(struct sbus_bus), GFP_ATOMIC); 110 sbus = kzalloc(sizeof(struct sbus_bus), GFP_ATOMIC);
115 if (!sbus) 111 if (!sbus)
116 return; 112 return;
117 113
118 sbus->prom_node = dp->node;
119
120 sbus_setup_iommu(sbus, dp); 114 sbus_setup_iommu(sbus, dp);
121 115
122 printk("sbus%d: ", num_sbus); 116 printk("sbus%d: ", num_sbus);
123 117
124 sbus_clock = of_getintprop_default(dp, "clock-frequency",
125 (25*1000*1000));
126 sbus->clock_freq = sbus_clock;
127
128 printk("Clock %d.%d MHz\n", (int) ((sbus_clock/1000)/1000),
129 (int) (((sbus_clock/1000)%1000 != 0) ?
130 (((sbus_clock/1000)%1000) + 1000) : 0));
131
132 strcpy(sbus->prom_name, dp->name);
133
134 sbus->ofdev.node = dp; 118 sbus->ofdev.node = dp;
135 sbus->ofdev.dev.parent = NULL; 119 sbus->ofdev.dev.parent = NULL;
136 sbus->ofdev.dev.bus = &sbus_bus_type; 120 sbus->ofdev.dev.bus = &sbus_bus_type;