Skip to content

Commit e78c637

Browse files
rmurphy-armmmind
authored andcommitted
ARM: dts: rockchip: Fix DWMMC clocks
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. This error has propagated across the 32-bit DTs too, so fix those up. Fixes: 187d796 ("ARM: dts: rockchip: add the sdio/sdmmc node for rk3036") Fixes: faea098 ("ARM: dts: rockchip: add core rk3036 dtsi") Fixes: 9848ebe ("ARM: dts: rockchip: add core rk3228 dtsi") Signed-off-by: Robin Murphy <[email protected]> Signed-off-by: Heiko Stuebner <[email protected]>
1 parent 5ce0bad commit e78c637

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

arch/arm/boot/dts/rk3036.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@
280280
max-frequency = <37500000>;
281281
clocks = <&cru HCLK_SDIO>, <&cru SCLK_SDIO>,
282282
<&cru SCLK_SDIO_DRV>, <&cru SCLK_SDIO_SAMPLE>;
283-
clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
283+
clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
284284
fifo-depth = <0x100>;
285285
interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
286286
resets = <&cru SRST_SDIO>;
@@ -298,7 +298,7 @@
298298
max-frequency = <37500000>;
299299
clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>,
300300
<&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>;
301-
clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
301+
clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
302302
default-sample-phase = <158>;
303303
disable-wp;
304304
dmas = <&pdma 12>;

arch/arm/boot/dts/rk322x.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@
621621
interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
622622
clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>,
623623
<&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>;
624-
clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
624+
clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
625625
fifo-depth = <0x100>;
626626
pinctrl-names = "default";
627627
pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_bus4>;
@@ -634,7 +634,7 @@
634634
interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
635635
clocks = <&cru HCLK_SDIO>, <&cru SCLK_SDIO>,
636636
<&cru SCLK_SDIO_DRV>, <&cru SCLK_SDIO_SAMPLE>;
637-
clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
637+
clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
638638
fifo-depth = <0x100>;
639639
pinctrl-names = "default";
640640
pinctrl-0 = <&sdio_clk &sdio_cmd &sdio_bus4>;
@@ -649,7 +649,7 @@
649649
max-frequency = <37500000>;
650650
clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>,
651651
<&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>;
652-
clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
652+
clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
653653
bus-width = <8>;
654654
default-sample-phase = <158>;
655655
fifo-depth = <0x100>;

0 commit comments

Comments
 (0)