Merge tag 'u300-for-arm-soc-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/fixes-non-critical

From Linus Walleij:
Misc U300 development for the v3.14 series:

- Timekeeping patch from Uwe.
- DT 0x0 cleanup from Lee.
- Return value check from Wei.

* tag 'u300-for-arm-soc-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: u300: fix timekeeping when periodic mode is used
  ARM: u300: Remove '0x's from U300 DTS file
  ARM: u300: fix return value check in __u300_init_boardpower()

Signed-off-by: Olof Johansson <olof@lixom.net>

3 files changed, 29 insertions, 19 deletions

diff --git a/arch/arm/boot/dts/ste-u300.dts b/arch/arm/boot/dts/ste-u300.dts
index 8a1032c1ffc9..a9da4800daf0 100644
--- a/arch/arm/boot/dts/ste-u300.dts
+++ b/arch/arm/boot/dts/ste-u300.dts
@@ -307,7 +307,7 @@
                 clocks = <&i2c0_clk>;
                 #address-cells = <1>;
                 #size-cells = <0>;
-                ab3100: ab3100@0x48 {
+                ab3100: ab3100@48 {
                         compatible = "stericsson,ab3100";
                         reg = <0x48>;
                         interrupt-parent = <&vica>;
@@ -385,10 +385,10 @@
                 clocks = <&i2c1_clk>;
                 #address-cells = <1>;
                 #size-cells = <0>;
-                fwcam0: fwcam@0x10 {
+                fwcam0: fwcam@10 {
                         reg = <0x10>;
                 };
-                fwcam1: fwcam@0x5d {
+                fwcam1: fwcam@5d {
                         reg = <0x5d>;
                 };
         };
diff --git a/arch/arm/mach-u300/regulator.c b/arch/arm/mach-u300/regulator.c
index bf40cd478fe9..0493a845b6bc 100644
--- a/arch/arm/mach-u300/regulator.c
+++ b/arch/arm/mach-u300/regulator.c
@@ -69,9 +69,9 @@ static int __init __u300_init_boardpower(struct platform_device *pdev)
                 return -ENODEV;
         }
         regmap = syscon_node_to_regmap(syscon_np);
-        if (!regmap) {
+        if (IS_ERR(regmap)) {
                 pr_crit("U300: could not locate syscon regmap\n");
-                return -ENODEV;
+                return PTR_ERR(regmap);
         }
 
         main_power_15 = regulator_get(&pdev->dev, "vana15");
diff --git a/arch/arm/mach-u300/timer.c b/arch/arm/mach-u300/timer.c
index 9a5f9fb352ce..5226162fac69 100644
--- a/arch/arm/mach-u300/timer.c
+++ b/arch/arm/mach-u300/timer.c
@@ -184,11 +184,13 @@
 #define U300_TIMER_APP_CRC                                      (0x100)
 #define U300_TIMER_APP_CRC_CLOCK_REQUEST_ENABLE                 (0x00000001)
 
-#define TICKS_PER_JIFFY ((CLOCK_TICK_RATE + (HZ/2)) / HZ)
-#define US_PER_TICK ((1000000 + (HZ/2)) / HZ)
-
 static void __iomem *u300_timer_base;
 
+struct u300_clockevent_data {
+        struct clock_event_device cevd;
+        unsigned ticks_per_jiffy;
+};
+
 /*
  * The u300_set_mode() function is always called first, if we
  * have oneshot timer active, the oneshot scheduling function
@@ -197,6 +199,9 @@ static void __iomem *u300_timer_base;
 static void u300_set_mode(enum clock_event_mode mode,
                           struct clock_event_device *evt)
 {
+        struct u300_clockevent_data *cevdata =
+                container_of(evt, struct u300_clockevent_data, cevd);
+
         switch (mode) {
         case CLOCK_EVT_MODE_PERIODIC:
                 /* Disable interrupts on GPT1 */
@@ -209,7 +214,7 @@ static void u300_set_mode(enum clock_event_mode mode,
                  * Set the periodic mode to a certain number of ticks per
                  * jiffy.
                  */
-                writel(TICKS_PER_JIFFY,
+                writel(cevdata->ticks_per_jiffy,
                        u300_timer_base + U300_TIMER_APP_GPT1TC);
                 /*
                  * Set continuous mode, so the timer keeps triggering
@@ -305,20 +310,23 @@ static int u300_set_next_event(unsigned long cycles,
         return 0;
 }
 
-
-/* Use general purpose timer 1 as clock event */
-static struct clock_event_device clockevent_u300_1mhz = {
-        .name           = "GPT1",
-        .rating         = 300, /* Reasonably fast and accurate clock event */
-        .features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
-        .set_next_event = u300_set_next_event,
-        .set_mode       = u300_set_mode,
+static struct u300_clockevent_data u300_clockevent_data = {
+        /* Use general purpose timer 1 as clock event */
+        .cevd = {
+                .name           = "GPT1",
+                /* Reasonably fast and accurate clock event */
+                .rating         = 300,
+                .features       = CLOCK_EVT_FEAT_PERIODIC |
+                        CLOCK_EVT_FEAT_ONESHOT,
+                .set_next_event = u300_set_next_event,
+                .set_mode       = u300_set_mode,
+        },
 };
 
 /* Clock event timer interrupt handler */
 static irqreturn_t u300_timer_interrupt(int irq, void *dev_id)
 {
-        struct clock_event_device *evt = &clockevent_u300_1mhz;
+        struct clock_event_device *evt = &u300_clockevent_data.cevd;
         /* ACK/Clear timer IRQ for the APP GPT1 Timer */
 
         writel(U300_TIMER_APP_GPT1IA_IRQ_ACK,
@@ -379,6 +387,8 @@ static void __init u300_timer_init_of(struct device_node *np)
         clk_prepare_enable(clk);
         rate = clk_get_rate(clk);
 
+        u300_clockevent_data.ticks_per_jiffy = DIV_ROUND_CLOSEST(rate, HZ);
+
         setup_sched_clock(u300_read_sched_clock, 32, rate);
 
         u300_delay_timer.read_current_timer = &u300_read_current_timer;
@@ -428,7 +438,7 @@ static void __init u300_timer_init_of(struct device_node *np)
                 pr_err("timer: failed to initialize U300 clock source\n");
 
         /* Configure and register the clockevent */
-        clockevents_config_and_register(&clockevent_u300_1mhz, rate,
+        clockevents_config_and_register(&u300_clockevent_data.cevd, rate,
                                         1, 0xffffffff);
 
         /*