[U-Boot] [PATCH] ARM: dts: am335x: disable mmc3

[Jean-Jacques Hiblot]

On 17/05/2017 18:01, Tom Rini wrote:
> On Wed, May 17, 2017 at 04:46:29PM +0200, Jean-Jacques Hiblot wrote:
>>
>> On 17/05/2017 15:04, Tom Rini wrote:
>>> On Wed, May 17, 2017 at 01:55:56PM +0200, Jean-Jacques Hiblot wrote:
>>>
>>>> SDIO is not supported in u-boot, there is no point in enabling mmc3.
>>>>
>>>> Signed-off-by: Jean-Jacques Hiblot <jjhiblot at ti.com>
>>>> ---
>>>>
>>>> Tom,
>>>>
>>>> this will fix the problem youreported with commit b5511d6cb8dc601efc14b8cf60755
>>>> on am335x-evm. For the record, the problem is that the clock of mmc 3 is not
>>>> enbled by the arch code. With DM_MMC enabled, mmc3 gets probed and u-boot crashes
>>>> when mmc3's registers are accessed for the first time.
>>>>
>>>> Jean-Jacques
>>>>
>>>>
>>>>   arch/arm/dts/am335x-evm.dts | 4 +++-
>>>>   1 file changed, 3 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/arch/arm/dts/am335x-evm.dts b/arch/arm/dts/am335x-evm.dts
>>>> index a6f20af..e94fcad 100644
>>>> --- a/arch/arm/dts/am335x-evm.dts
>>>> +++ b/arch/arm/dts/am335x-evm.dts
>>>> @@ -721,12 +721,14 @@
>>>>   };
>>>>   &mmc3 {
>>>> +	/* disable MMC3 as SDIO is not supported in U-Boot */
>>>> +	status = "disabled";
>>>> +
>>>>   	/* these are on the crossbar and are outlined in the
>>>>   	   xbar-event-map element */
>>>>   	dmas = <&edma 12
>>>>   		&edma 13>;
>>>>   	dma-names = "tx", "rx";
>>>> -	status = "okay";
>>>>   	vmmc-supply = <&wlan_en_reg>;
>>>>   	bus-width = <4>;
>>>>   	pinctrl-names = "default";
>>> Please put this into arch/arm/dts/am335x-evm-u-boot.dtsi instead,
>> I tried and it doesn't work. The XXX-u-boot.dtsi being included at
>> the beginning of the DTS, it cannot override the
>> 'status = "okay"' present in am335x-evm.dts.
> OK, I've manually confirmed that
> https://patchwork.ozlabs.org/patch/763654/ does what I expect (and you
> were suggesting too), can you please test that with a patch that adds
> am335x-evm-u-boot.dtsi?  Thanks again!
The dependency on the *-u-boot.dtsi is broken. including is better than 
concatenating in that sense.
Other than that, it does the job.
>