Skip to contentSkip to conversation

ARM: OMAP: fix build error in arch/arm/mach-omap2/timer.c

PATCH New Mugunthan V N 3 participants 3 messages Nov 27, 2012 – Dec 3, 2012

Subsystems (3)
Arm (32-bit) Arm sub-architectures OMAP2+ support
lore
Share & tools
lore

Mugunthan V N

author
#0 lore raw

PATCH 1/1 ARM: OMAP: fix build error in arch/arm/mach-omap2/timer.c

CC arch/arm/mach-omap2/timer.o
arch/arm/mach-omap2/timer.c: In function 'omap_get_timer_dt':
arch/arm/mach-omap2/timer.c:195:3: error: implicit declaration of function 'prom_add_property' make[1]: *** [arch/arm/mach-omap2/timer.o] Error 1
make: *** [arch/arm/mach-omap2] Error 2

fix for build break as the functions "prom_*_property" is renamed to of_*_property by the below patch

commit 79d1c712958f94372482ad74578b00f44e744c12

Author: Nathan Fontenot <[email protected]>
Date:   Tue Oct 2 16:58:46 2012 +0000

powerpc+of: Rename the drivers/of prom_* functions to of_*

Rename the prom_*_property routines of the generic OF code to of_*_property. This brings them in line with the naming used by the rest of the OF code.

Signed-off-by Mugunthan V N <[email protected]>
---
 arch/arm/mach-omap2/timer.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/timer.c +1 -1
index 099e406..5fd5e23 100644
@@ -192,7 +192,7 @@ static struct device_node * __init omap_get_timer_dt(struct of_device_id *match,
 			continue;
 		}
 
-		prom_add_property(np, &device_disabled);
+		of_add_property(np, &device_disabled);
 		return np;
 	}
Signature · 1 line
1.7.0.4
#1 lore raw

PATCH 1/1 ARM: OMAP: fix build error in arch/arm/mach-omap2/timer.c

Quoted 5 lines · Mugunthan V N

CC arch/arm/mach-omap2/timer.o
arch/arm/mach-omap2/timer.c: In function 'omap_get_timer_dt':
arch/arm/mach-omap2/timer.c:195:3: error: implicit declaration of function 'prom_add_property' make[1]: *** [arch/arm/mach-omap2/timer.o] Error 1
make: *** [arch/arm/mach-omap2] Error 2

Thanks for sending. You may wish to mentioned that this is seen on today's linux-next (I am seeing the same problem).

Quoted 22 lines

fix for build break as the functions "prom_*_property" is renamed to of_*_property by the below patch

commit 79d1c712958f94372482ad74578b00f44e744c12

Author: Nathan Fontenot <[email protected]>
Date:   Tue Oct 2 16:58:46 2012 +0000

powerpc+of: Rename the drivers/of prom_* functions to of_*

Rename the prom_*_property routines of the generic OF code to of_*_property. This brings them in line with the naming used by the rest of the OF code.

Signed-off-by Mugunthan V N <[email protected]>
---
 arch/arm/mach-omap2/timer.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/timer.c +0 -0
index 099e406..5fd5e23 100644

arch/arm/mach-omap2/timer.c static struct device_node * __init omap_get_timer_dt(struct of_device_id *match, · line 197

Quoted 7 lines
arch/arm/mach-omap2/timer.c +1 -1
@@ -192,7 +192,7 @@ static struct device_node * __init omap_get_timer_dt(struct of_device_id *match,
 			continue;
 		}
 
-		prom_add_property(np, &device_disabled);
+		of_add_property(np, &device_disabled);
 		return np;
 	}

I tested this on the AM335x device and it is working fine. So ...

Acked-by Jon Hunter <[email protected]>
Tested-by Jon Hunter <[email protected]>

Cheers
Jon

#2 lore raw

PATCH 1/1 ARM: OMAP: fix build error in arch/arm/mach-omap2/timer.c

Quoted 43 lines · Jon Hunter
Quoted 5 lines · Mugunthan V N

CC arch/arm/mach-omap2/timer.o
arch/arm/mach-omap2/timer.c: In function 'omap_get_timer_dt':
arch/arm/mach-omap2/timer.c:195:3: error: implicit declaration of function 'prom_add_property' make[1]: *** [arch/arm/mach-omap2/timer.o] Error 1
make: *** [arch/arm/mach-omap2] Error 2

Thanks for sending. You may wish to mentioned that this is seen on today's linux-next (I am seeing the same problem).

Quoted 22 lines

fix for build break as the functions "prom_*_property" is renamed to of_*_property by the below patch

commit 79d1c712958f94372482ad74578b00f44e744c12

Author: Nathan Fontenot <[email protected]>
Date:   Tue Oct 2 16:58:46 2012 +0000

powerpc+of: Rename the drivers/of prom_* functions to of_*

Rename the prom_*_property routines of the generic OF code to of_*_property. This brings them in line with the naming used by the rest of the OF code.

Signed-off-by Mugunthan V N <[email protected]>
---
 arch/arm/mach-omap2/timer.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/timer.c +0 -0
index 099e406..5fd5e23 100644

arch/arm/mach-omap2/timer.c static struct device_node * __init omap_get_timer_dt(struct of_device_id *match, · line 197

Quoted 7 lines
arch/arm/mach-omap2/timer.c +1 -1
@@ -192,7 +192,7 @@ static struct device_node * __init omap_get_timer_dt(struct of_device_id *match,
 			continue;
 		}
 
-		prom_add_property(np, &device_disabled);
+		of_add_property(np, &device_disabled);
 		return np;
 	}

I tested this on the AM335x device and it is working fine. So ...

Quoted 3 lines
Acked-by Jon Hunter <[email protected]>
Tested-by Jon Hunter <[email protected]>

This patch still not made its way to linux-next, so still build is broken for all OMAP platforms.

Thanks,
Vaibhav

Quoted 7 lines

Cheers
Jon
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html