aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/sysdev/fsl_soc.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc/sysdev/fsl_soc.c')
-rw-r--r--arch/powerpc/sysdev/fsl_soc.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index ef10bcf2d943..92ba378b7990 100644
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -41,7 +41,7 @@ phys_addr_t get_immrbase(void)
41 soc = of_find_node_by_type(NULL, "soc"); 41 soc = of_find_node_by_type(NULL, "soc");
42 if (soc) { 42 if (soc) {
43 unsigned int size; 43 unsigned int size;
44 void *prop = get_property(soc, "reg", &size); 44 const void *prop = get_property(soc, "reg", &size);
45 immrbase = of_translate_address(soc, prop); 45 immrbase = of_translate_address(soc, prop);
46 of_node_put(soc); 46 of_node_put(soc);
47 }; 47 };
@@ -85,7 +85,7 @@ static int __init gfar_mdio_of_init(void)
85 mdio_data.irq[k] = -1; 85 mdio_data.irq[k] = -1;
86 86
87 while ((child = of_get_next_child(np, child)) != NULL) { 87 while ((child = of_get_next_child(np, child)) != NULL) {
88 u32 *id = get_property(child, "reg", NULL); 88 const u32 *id = get_property(child, "reg", NULL);
89 mdio_data.irq[*id] = irq_of_parse_and_map(child, 0); 89 mdio_data.irq[*id] = irq_of_parse_and_map(child, 0);
90 } 90 }
91 91
@@ -124,10 +124,10 @@ static int __init gfar_of_init(void)
124 struct resource r[4]; 124 struct resource r[4];
125 struct device_node *phy, *mdio; 125 struct device_node *phy, *mdio;
126 struct gianfar_platform_data gfar_data; 126 struct gianfar_platform_data gfar_data;
127 unsigned int *id; 127 const unsigned int *id;
128 char *model; 128 const char *model;
129 void *mac_addr; 129 const void *mac_addr;
130 phandle *ph; 130 const phandle *ph;
131 int n_res = 1; 131 int n_res = 1;
132 132
133 memset(r, 0, sizeof(r)); 133 memset(r, 0, sizeof(r));
@@ -193,7 +193,7 @@ static int __init gfar_of_init(void)
193 FSL_GIANFAR_DEV_HAS_VLAN | 193 FSL_GIANFAR_DEV_HAS_VLAN |
194 FSL_GIANFAR_DEV_HAS_EXTENDED_HASH; 194 FSL_GIANFAR_DEV_HAS_EXTENDED_HASH;
195 195
196 ph = (phandle *) get_property(np, "phy-handle", NULL); 196 ph = get_property(np, "phy-handle", NULL);
197 phy = of_find_node_by_phandle(*ph); 197 phy = of_find_node_by_phandle(*ph);
198 198
199 if (phy == NULL) { 199 if (phy == NULL) {
@@ -203,7 +203,7 @@ static int __init gfar_of_init(void)
203 203
204 mdio = of_get_parent(phy); 204 mdio = of_get_parent(phy);
205 205
206 id = (u32 *) get_property(phy, "reg", NULL); 206 id = get_property(phy, "reg", NULL);
207 ret = of_address_to_resource(mdio, 0, &res); 207 ret = of_address_to_resource(mdio, 0, &res);
208 if (ret) { 208 if (ret) {
209 of_node_put(phy); 209 of_node_put(phy);
@@ -247,7 +247,7 @@ static int __init fsl_i2c_of_init(void)
247 i++) { 247 i++) {
248 struct resource r[2]; 248 struct resource r[2];
249 struct fsl_i2c_platform_data i2c_data; 249 struct fsl_i2c_platform_data i2c_data;
250 unsigned char *flags = NULL; 250 const unsigned char *flags = NULL;
251 251
252 memset(&r, 0, sizeof(r)); 252 memset(&r, 0, sizeof(r));
253 memset(&i2c_data, 0, sizeof(i2c_data)); 253 memset(&i2c_data, 0, sizeof(i2c_data));
@@ -298,7 +298,7 @@ static int __init mpc83xx_wdt_init(void)
298 struct resource r; 298 struct resource r;
299 struct device_node *soc, *np; 299 struct device_node *soc, *np;
300 struct platform_device *dev; 300 struct platform_device *dev;
301 unsigned int *freq; 301 const unsigned int *freq;
302 int ret; 302 int ret;
303 303
304 np = of_find_compatible_node(NULL, "watchdog", "mpc83xx_wdt"); 304 np = of_find_compatible_node(NULL, "watchdog", "mpc83xx_wdt");
@@ -315,7 +315,7 @@ static int __init mpc83xx_wdt_init(void)
315 goto nosoc; 315 goto nosoc;
316 } 316 }
317 317
318 freq = (unsigned int *)get_property(soc, "bus-frequency", NULL); 318 freq = get_property(soc, "bus-frequency", NULL);
319 if (!freq) { 319 if (!freq) {
320 ret = -ENODEV; 320 ret = -ENODEV;
321 goto err; 321 goto err;
@@ -355,7 +355,7 @@ nodev:
355arch_initcall(mpc83xx_wdt_init); 355arch_initcall(mpc83xx_wdt_init);
356#endif 356#endif
357 357
358static enum fsl_usb2_phy_modes determine_usb_phy(char * phy_type) 358static enum fsl_usb2_phy_modes determine_usb_phy(const char *phy_type)
359{ 359{
360 if (!phy_type) 360 if (!phy_type)
361 return FSL_USB2_PHY_NONE; 361 return FSL_USB2_PHY_NONE;
@@ -383,7 +383,7 @@ static int __init fsl_usb_of_init(void)
383 i++) { 383 i++) {
384 struct resource r[2]; 384 struct resource r[2];
385 struct fsl_usb2_platform_data usb_data; 385 struct fsl_usb2_platform_data usb_data;
386 unsigned char *prop = NULL; 386 const unsigned char *prop = NULL;
387 387
388 memset(&r, 0, sizeof(r)); 388 memset(&r, 0, sizeof(r));
389 memset(&usb_data, 0, sizeof(usb_data)); 389 memset(&usb_data, 0, sizeof(usb_data));
@@ -431,7 +431,7 @@ static int __init fsl_usb_of_init(void)
431 i++) { 431 i++) {
432 struct resource r[2]; 432 struct resource r[2];
433 struct fsl_usb2_platform_data usb_data; 433 struct fsl_usb2_platform_data usb_data;
434 unsigned char *prop = NULL; 434 const unsigned char *prop = NULL;
435 435
436 memset(&r, 0, sizeof(r)); 436 memset(&r, 0, sizeof(r));
437 memset(&usb_data, 0, sizeof(usb_data)); 437 memset(&usb_data, 0, sizeof(usb_data));