lkml.org 
[lkml]   [2017]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 017/370] ARM: dts: imx31: move CCM device node to AIPS2 bus devices
    3.16.42-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Vladimir Zapolskiy <vz@mleia.com>

    commit 1f87aee6a2e55eda466a43ba6248a8b75eede153 upstream.

    i.MX31 Clock Control Module controller is found on AIPS2 bus, move it
    there from SPBA bus to avoid a conflict of device IO space mismatch.

    Fixes: ef0e4a606fb6 ("ARM: mx31: Replace clk_register_clkdev with clock DT lookup")
    Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
    Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Signed-off-by: Shawn Guo <shawnguo@kernel.org>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    arch/arm/boot/dts/imx31.dtsi | 14 +++++++-------
    1 file changed, 7 insertions(+), 7 deletions(-)

    --- a/arch/arm/boot/dts/imx31.dtsi
    +++ b/arch/arm/boot/dts/imx31.dtsi
    @@ -110,13 +110,6 @@
    interrupts = <19>;
    clocks = <&clks 25>;
    };
    -
    - clks: ccm@53f80000{
    - compatible = "fsl,imx31-ccm";
    - reg = <0x53f80000 0x4000>;
    - interrupts = <31>, <53>;
    - #clock-cells = <1>;
    - };
    };

    aips@53f00000 { /* AIPS2 */
    @@ -126,6 +119,13 @@
    reg = <0x53f00000 0x100000>;
    ranges;

    + clks: ccm@53f80000{
    + compatible = "fsl,imx31-ccm";
    + reg = <0x53f80000 0x4000>;
    + interrupts = <31>, <53>;
    + #clock-cells = <1>;
    + };
    +
    gpt: timer@53f90000 {
    compatible = "fsl,imx31-gpt";
    reg = <0x53f90000 0x4000>;
    \
     
     \ /
      Last update: 2017-03-10 15:31    [W:4.116 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site