On Wed, Jan 09, 2019 at 05:58:23PM +0100, Simon Horman wrote: > On Wed, Jan 09, 2019 at 04:26:25PM +0100, Geert Uytterhoeven wrote: > > On Wed, Jan 9, 2019 at 3:01 PM <[email protected]> wrote: > > > From: Marek Vasut <[email protected]> > > > > > > There are two regulator1 nodes in the Ebisu DTS right now, one 3.3V for > > > the eMMC and one 12V for the backlight. This causes one to be overwritten > > > by the other, ultimatelly resulting in inoperable eMMC, which depends on > > > the former. Fix this by renumbering the backlight regulator to regulator2. > > > > > > Signed-off-by: Marek Vasut <[email protected]> > > > Cc: Laurent Pinchart <[email protected]> > > > Cc: Simon Horman <[email protected]> > > > Cc: Wolfram Sang <[email protected]> > > > Cc: [email protected] > > > Reported-by: Simon Horman <[email protected]> > > > Fixes: 9d16c4a10e07 ("arm64: dts: renesas: r8a77990: ebisu: Add > > > backlight") > > > > Reviewed-by: Geert Uytterhoeven <[email protected]> > > > > > --- a/arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts > > > +++ b/arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts > > > @@ -191,7 +191,7 @@ > > > clock-frequency = <24576000>; > > > }; > > > > > > - reg_12p0v: regulator1 { > > > + reg_12p0v: regulator2 { > > > compatible = "regulator-fixed"; > > > regulator-name = "D12.0V"; > > > regulator-min-microvolt = <12000000>; > > > > Perhaps the node name should get a more descriptive suffix > > (e.g. "regulator-12p0v"), like is already done for some of the other > > regulators? > > I think I would prefer that addressed in a follow-up patch.
Thanks for this patch. I have now tested it and it looks good to me. I can now access eMMC as a block device. Tested-by: Simon Horman <[email protected]> I plan to apply this for v5.1 as the problem appears to be introduced in a patch queued-up for v5.1. # dmesg | egrep "(ee160000.sd|mmc0|mmcblk0|backlight)" [ 0.893760] pwm-backlight backlight: Linked as a consumer to regulator.3 [ 2.901953] renesas_sdhi_internal_dmac ee160000.sd: Linked as a consumer to regulator.2 [ 2.910262] renesas_sdhi_internal_dmac ee160000.sd: Linked as a consumer to regulator.1 [ 2.967591] renesas_sdhi_internal_dmac ee160000.sd: mmc0 base at 0xee160000 max clock rate 200 MHz [ 3.049943] mmc0: new HS200 MMC card at address 0001 [ 3.055843] mmcblk0: mmc0:0001 BGSD3R 29.1 GiB [ 3.064414] mmcblk0boot0: mmc0:0001 BGSD3R partition 1 16.0 MiB [ 3.074888] mmcblk0boot1: mmc0:0001 BGSD3R partition 2 16.0 MiB [ 3.081522] mmcblk0rpmb: mmc0:0001 BGSD3R partition 3 4.00 MiB, chardev (243:0) # dd if=/dev/mmcblk0 of=/dev/null bs=1M count=512 iflag=direct 512+0 records in 512+0 records out 536870912 bytes (537 MB) copied, 14.7343 s, 36.4 MB/s # dd if=/dev/mmcblk0 of=/dev/null bs=1M count=512 iflag=direct 512+0 records in 512+0 records out 536870912 bytes (537 MB) copied, 8.46809 s, 63.4 MB/s # dd if=/dev/mmcblk0 of=/dev/null bs=1M count=512 iflag=direct 512+0 records in 512+0 records out 536870912 bytes (537 MB) copied, 14.6945 s, 36.5 MB/s # dd of=/dev/mmcblk0 if=/dev/zero bs=1M count=512 oflag=direct 512+0 records in 512+0 records out 536870912 bytes (537 MB) copied, 19.1677 s, 28.0 MB/s # dd of=/dev/mmcblk0 if=/dev/zero bs=1M count=512 oflag=direct 512+0 records in 512+0 records out 536870912 bytes (537 MB) copied, 21.3139 s, 25.2 MB/s # dd of=/dev/mmcblk0 if=/dev/zero bs=1M count=512 oflag=direct 512+0 records in 512+0 records out 536870912 bytes (537 MB) copied, 19.9205 s, 27.0 MB/s
