|
|
@@ -156,12 +156,6 @@ static struct clock_event_device clockevent_gpt = {
|
|
|
.tick_resume = omap2_gp_timer_shutdown,
|
|
|
};
|
|
|
|
|
|
-static struct property device_disabled = {
|
|
|
- .name = "status",
|
|
|
- .length = sizeof("disabled"),
|
|
|
- .value = "disabled",
|
|
|
-};
|
|
|
-
|
|
|
static const struct of_device_id omap_timer_match[] __initconst = {
|
|
|
{ .compatible = "ti,omap2420-timer", },
|
|
|
{ .compatible = "ti,omap3430-timer", },
|
|
|
@@ -203,8 +197,17 @@ static struct device_node * __init omap_get_timer_dt(const struct of_device_id *
|
|
|
of_get_property(np, "ti,timer-secure", NULL)))
|
|
|
continue;
|
|
|
|
|
|
- if (!of_device_is_compatible(np, "ti,omap-counter32k"))
|
|
|
- of_add_property(np, &device_disabled);
|
|
|
+ if (!of_device_is_compatible(np, "ti,omap-counter32k")) {
|
|
|
+ struct property *prop;
|
|
|
+
|
|
|
+ prop = kzalloc(sizeof(*prop), GFP_KERNEL);
|
|
|
+ if (!prop)
|
|
|
+ return NULL;
|
|
|
+ prop->name = "status";
|
|
|
+ prop->value = "disabled";
|
|
|
+ prop->length = strlen(prop->value);
|
|
|
+ of_add_property(np, prop);
|
|
|
+ }
|
|
|
return np;
|
|
|
}
|
|
|
|