lkml.org 
[lkml]   [2019]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 034/280] ARM: dts: Configure clock parent for pwm vibra
    Date
    4.19-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit 0840242e887586268f665bf58d5e1a7d6ebf35ed ]

    Commit 84badc5ec5fc ("ARM: dts: omap4: Move l4 child devices to probe
    them with ti-sysc") moved some omap4 timers to probe with ti-sysc
    interconnect target module. Turns out this broke pwm-omap-dmtimer
    for reparenting of the timer clock.

    With ti-sysc, we can now configure the clock sources in the dts with
    assigned-clocks and assigned-clock-parents.

    Fixes: 84badc5ec5fc ("ARM: dts: omap4: Move l4 child devices to probe them with ti-sysc")
    Cc: Bartosz Golaszewski <bgolaszewski@baylibre.com>
    Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
    Cc: H. Nikolaus Schaller <hns@goldelico.com>
    Cc: Keerthy <j-keerthy@ti.com>
    Cc: Ladislav Michl <ladis@linux-mips.org>
    Cc: Pavel Machek <pavel@ucw.cz>
    Cc: Sebastian Reichel <sre@kernel.org>
    Cc: Tero Kristo <t-kristo@ti.com>
    Cc: Thierry Reding <thierry.reding@gmail.com>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Reported-by: H. Nikolaus Schaller <hns@goldelico.com>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm/boot/dts/omap4-droid4-xt894.dts | 11 +++++++++++
    1 file changed, 11 insertions(+)

    diff --git a/arch/arm/boot/dts/omap4-droid4-xt894.dts b/arch/arm/boot/dts/omap4-droid4-xt894.dts
    index 04758a2a87f0..67d77eee9433 100644
    --- a/arch/arm/boot/dts/omap4-droid4-xt894.dts
    +++ b/arch/arm/boot/dts/omap4-droid4-xt894.dts
    @@ -644,6 +644,17 @@
    };
    };

    +/* Configure pwm clock source for timers 8 & 9 */
    +&timer8 {
    + assigned-clocks = <&abe_clkctrl OMAP4_TIMER8_CLKCTRL 24>;
    + assigned-clock-parents = <&sys_clkin_ck>;
    +};
    +
    +&timer9 {
    + assigned-clocks = <&l4_per_clkctrl OMAP4_TIMER9_CLKCTRL 24>;
    + assigned-clock-parents = <&sys_clkin_ck>;
    +};
    +
    /*
    * As uart1 is wired to mdm6600 with rts and cts, we can use the cts pin for
    * uart1 wakeirq.
    --
    2.19.1


    \
     
     \ /
      Last update: 2019-03-22 13:49    [W:5.226 / U:0.388 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site