[U-Boot] [PATCH v2 6/6] sun50i: dts: update DTS to avoid warnings

Wed Feb 22 23:24:03 UTC 2017

> On 23 Feb 2017, at 00:20, Maxime Ripard <maxime.ripard at free-electrons.com> wrote:
> 
> On Wed, Feb 22, 2017 at 09:47:32PM +0100, Philipp Tomsich wrote:
>> +<<<<<<< HEAD
>> 				allwinner,drive = <SUN4I_PINCTRL_30_MA>;
>> 				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
>> +=======
>> +				drive-strength = < 30 >;
>> +				bias-pull-up;
>> 			};
>> 
>> -			i2c0_pins: i2c0_pins {
>> +			mmc2_8bit_pins: mmc2-8bit {
>> +				allwinner,pins = "PC5", "PC6", "PC8",
>> +						 "PC9", "PC10", "PC11",
>> +						 "PC12", "PC13", "PC14",
>> +						 "PC15", "PC16";
>> +				allwinner,function = "mmc2";
>> +				drive-strength = < 30 >;
>> +				bias-pull-up;
>> +>>>>>>> 20221b3... [f] dts warnings
> 
> Hmmm, are you sure about those ? :)

I can’t believe this slipped through. I think I need more sleep.
At least the patch-format wasn’t such a mess this time around…

Cheers,
Philipp.