lkml.org 
[lkml]   [2015]   [Sep]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 009/130] ARM: dts: i.MX35: Fix can support.
    Date
    3.16.7-ckt17 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Denis Carikli <denis@eukrea.com>

    commit e053f96b1a00022b4e2c7ceb7ac0229646626507 upstream.

    Since commit 3d42a379b6fa5b46058e3302b1802b29f64865bb
    ("can: flexcan: add 2nd clock to support imx53 and newer")
    the can driver requires a dt nodes to have a second clock.
    Add them to imx35 to fix probing the flex can driver on the
    respective platforms.

    Signed-off-by: Denis Carikli <denis@eukrea.com>
    Signed-off-by: Shawn Guo <shawnguo@kernel.org>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    arch/arm/boot/dts/imx35.dtsi | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/arch/arm/boot/dts/imx35.dtsi b/arch/arm/boot/dts/imx35.dtsi
    index 4759abb49436..60988489faf1 100644
    --- a/arch/arm/boot/dts/imx35.dtsi
    +++ b/arch/arm/boot/dts/imx35.dtsi
    @@ -277,8 +277,8 @@
    can1: can@53fe4000 {
    compatible = "fsl,imx35-flexcan", "fsl,p1010-flexcan";
    reg = <0x53fe4000 0x1000>;
    - clocks = <&clks 33>;
    - clock-names = "ipg";
    + clocks = <&clks 33>, <&clks 33>;
    + clock-names = "ipg", "per";
    interrupts = <43>;
    status = "disabled";
    };
    @@ -286,8 +286,8 @@
    can2: can@53fe8000 {
    compatible = "fsl,imx35-flexcan", "fsl,p1010-flexcan";
    reg = <0x53fe8000 0x1000>;
    - clocks = <&clks 34>;
    - clock-names = "ipg";
    + clocks = <&clks 34>, <&clks 34>;
    + clock-names = "ipg", "per";
    interrupts = <44>;
    status = "disabled";
    };

    \
     
     \ /
      Last update: 2015-09-04 16:21    [W:4.327 / U:0.724 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site