Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next

[mirror_ubuntu-bionic-kernel.git] / drivers / clocksource / jcore-pit.c

diff --git a/drivers/clocksource/jcore-pit.c b/drivers/clocksource/jcore-pit.c
index 54e1665aa03c26c20b5e6236e1d3aac4be6871f3..7c61226f435918ca3a66d64a4c9f195ae8129994 100644 (file)
--- a/drivers/clocksource/jcore-pit.c
+++ b/drivers/clocksource/jcore-pit.c
@@ -57,7 +57,7 @@ static notrace u64 jcore_sched_clock_read(void)
        return seclo * NSEC_PER_SEC + nsec;
 }
 
-static cycle_t jcore_clocksource_read(struct clocksource *cs)
+static u64 jcore_clocksource_read(struct clocksource *cs)
 {
        return jcore_sched_clock_read();
 }
@@ -240,7 +240,7 @@ static int __init jcore_pit_init(struct device_node *node)
        }
 
        cpuhp_setup_state(CPUHP_AP_JCORE_TIMER_STARTING,
-                         "AP_JCORE_TIMER_STARTING",
+                         "clockevents/jcore:starting",
                          jcore_pit_local_init, NULL);
 
        return 0;