[PATCH 1/4] ARM: dts: sun8i: Extend Orange Pi PC dt to also handle the PC Plus

[Hans de Goede]

Hi,

On 13-07-16 10:45, Maxime Ripard wrote:
> On Sat, Jul 09, 2016 at 10:21:55PM +0200, Hans de Goede wrote:
>> There is a new Orange Pi PC Plus available now, rather then adding
>> yet another dts file for this variant, extend the existing
>> Orange Pi PC to support the sdio wifi and emmc found on this variant.
>>
>> Downside of this approach is the following messages in dmesg when run
>> on the non Plus Orange Pi PC:
>>
>> sunxi-mmc 1c10000.mmc: fatal err update clk timeout
>> sunxi-mmc 1c11000.mmc: smc 2 err, cmd 8, RTO !!
>> sunxi-mmc 1c11000.mmc: smc 2 err, cmd 55, RTO !!
>> sunxi-mmc 1c11000.mmc: smc 2 err, cmd 55, RTO !!
>> sunxi-mmc 1c11000.mmc: smc 2 err, cmd 55, RTO !!
>> sunxi-mmc 1c11000.mmc: smc 2 err, cmd 55, RTO !!
>> sunxi-mmc 1c11000.mmc: smc 2 err, cmd 1, RTO !!
>>
>> Note these are completely harmless and there is no adverse effect
>> to the functioning of the non Plus Orange Pi PC.
>>
>> Signed-off-by: Hans de Goede <hdegoede at redhat.com>
>> ---
>>  arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 40 +++++++++++++++++++++++++++++-
>>  1 file changed, 39 insertions(+), 1 deletion(-)
>>
>> diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts
>> index b8340f7..f9bf260 100644
>> --- a/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts
>> +++ b/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts
>> @@ -49,11 +49,13 @@
>>  #include <dt-bindings/pinctrl/sun4i-a10.h>
>>
>>  / {
>> -	model = "Xunlong Orange Pi PC";
>> +	model = "Xunlong Orange Pi PC / PC Plus";
>>  	compatible = "xunlong,orangepi-pc", "allwinner,sun8i-h3";
>>
>>  	aliases {
>>  		serial0 = &uart0;
>> +		/* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */
>> +		ethernet1 = &rtl8189ftv;
>>  	};
>>
>>  	chosen {
>> @@ -118,6 +120,42 @@
>>  	status = "okay";
>>  };
>>
>> +/* Note only present on orangepi pc *plus* */
>> +&mmc1 {
>> +	pinctrl-names = "default";
>> +	pinctrl-0 = <&mmc1_pins_a>;
>> +	vmmc-supply = <&reg_vcc3v3>;
>> +	bus-width = <4>;
>> +	non-removable;
>> +	status = "okay";
>> +
>> +	/*
>> +	 * Explicitly define the sdio device, so that we can add an ethernet
>> +	 * alias for it (which e.g. makes u-boot set a mac-address).
>> +	 */
>> +	rtl8189ftv: sdio_wifi at 1 {
>> +		reg = <1>;
>> +	};
>> +};
>
> Nothing prevents you from including the orange pi pc dts, from the
> orange pi plus dts.
>
> It prevents the duplication you were trying to avoid, and it doesn't
> create all those spurious errors and devices.

That would solve the copy paste problem on the kernel side, but that
would still mean adding a new u-boot defconfig for this, which means that
all the distro's which ship with prebuild u-boot binaries need to build
for yet another board, something which I would like to avoid.

Regards,

Hans