lkml.org 
[lkml]   [2018]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 080/496] arm64: dts: rockchip: Fix DWMMC clocks
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

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

    From: Robin Murphy <robin.murphy@arm.com>

    [ Upstream commit ca9eee95a2decc6f60bed65b5b836a26bff825c1 ]

    Trying to boot an RK3328 box with an HS200-capable eMMC, I see said eMMC
    fail to initialise as it can't run its tuning procedure, because the
    sample clock is missing. Upon closer inspection, whilst the clock is
    present in the DT, its name is subtly incorrect per the binding, so
    __of_clk_get_by_name() never finds it. By inspection, the drive clock
    suffers from a similar problem, so has never worked properly either.

    Fix up all instances of the incorrect clock names across the 64-bit DTs.

    Fixes: d717f7352ec6 ("arm64: dts: rockchip: add sdmmc/sdio/emmc nodes for RK3328 SoCs")
    Fixes: b790c2cab5ca ("arm64: dts: add Rockchip rk3368 core dtsi and board dts for the r88 board")
    Signed-off-by: Robin Murphy <robin.murphy@arm.com>
    Signed-off-by: Heiko Stuebner <heiko@sntech.de>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    arch/arm64/boot/dts/rockchip/rk3328.dtsi | 6 +++---
    arch/arm64/boot/dts/rockchip/rk3368.dtsi | 2 +-
    2 files changed, 4 insertions(+), 4 deletions(-)

    --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
    +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
    @@ -683,7 +683,7 @@
    interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
    clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>,
    <&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>;
    - clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
    + clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
    fifo-depth = <0x100>;
    status = "disabled";
    };
    @@ -694,7 +694,7 @@
    interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
    clocks = <&cru HCLK_SDIO>, <&cru SCLK_SDIO>,
    <&cru SCLK_SDIO_DRV>, <&cru SCLK_SDIO_SAMPLE>;
    - clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
    + clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
    fifo-depth = <0x100>;
    status = "disabled";
    };
    @@ -705,7 +705,7 @@
    interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
    clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>,
    <&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>;
    - clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
    + clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
    fifo-depth = <0x100>;
    status = "disabled";
    };
    --- a/arch/arm64/boot/dts/rockchip/rk3368.dtsi
    +++ b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
    @@ -257,7 +257,7 @@
    max-frequency = <150000000>;
    clocks = <&cru HCLK_SDIO0>, <&cru SCLK_SDIO0>,
    <&cru SCLK_SDIO0_DRV>, <&cru SCLK_SDIO0_SAMPLE>;
    - clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
    + clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
    fifo-depth = <0x100>;
    interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
    resets = <&cru SRST_SDIO0>;

    \
     
     \ /
      Last update: 2018-05-28 15:41    [W:4.024 / U:0.276 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site