[PATCH 1/2] arm64: dts: armada-3720-espressobin: sync with downstream

[Andre Heider]

On 31/08/2020 09:53, Pali Rohár wrote:
> On Monday 31 August 2020 05:34:07 Andre Heider wrote:
>> This adds the disabled eMMC node.
>>
>> Signed-off-by: Andre Heider <a.heider at gmail.com>
>> ---
>>   arch/arm/dts/armada-3720-espressobin.dts | 63 +++++++++---------------
>>   1 file changed, 23 insertions(+), 40 deletions(-)
>>
>> diff --git a/arch/arm/dts/armada-3720-espressobin.dts b/arch/arm/dts/armada-3720-espressobin.dts
>> index 4534f5ff29..a66ab814eb 100644
>> --- a/arch/arm/dts/armada-3720-espressobin.dts
>> +++ b/arch/arm/dts/armada-3720-espressobin.dts
>> @@ -1,3 +1,4 @@
>> +// SPDX-License-Identifier: GPL-2.0+
>>   /*
>>    * Device Tree file for Marvell Armada 3720 community board
>>    * (ESPRESSOBin)
>> @@ -5,53 +6,15 @@
>>    *
>>    * Gregory CLEMENT <gregory.clement at free-electrons.com>
>>    * Konstantin Porotchkin <kostap at marvell.com>
>> - *
>> - * This file is dual-licensed: you can use it either under the terms
>> - * of the GPL or the X11 license, at your option. Note that this dual
>> - * licensing only applies to this file, and not this project as a
>> - * whole.
>> - *
>> - *  a) This file is free software; you can redistribute it and/or
>> - *     modify it under the terms of the GNU General Public License as
>> - *     published by the Free Software Foundation; either version 2 of the
>> - *     License, or (at your option) any later version.
>> - *
>> - *     This file is distributed in the hope that it will be useful
>> - *     but WITHOUT ANY WARRANTY; without even the implied warranty of
>> - *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>> - *     GNU General Public License for more details.
>> - *
>> - * Or, alternatively
>> - *
>> - *  b) Permission is hereby granted, free of charge, to any person
>> - *     obtaining a copy of this software and associated documentation
>> - *     files (the "Software"), to deal in the Software without
>> - *     restriction, including without limitation the rights to use
>> - *     copy, modify, merge, publish, distribute, sublicense, and/or
>> - *     sell copies of the Software, and to permit persons to whom the
>> - *     Software is furnished to do so, subject to the following
>> - *     conditions:
>> - *
>> - *     The above copyright notice and this permission notice shall be
>> - *     included in all copies or substantial portions of the Software.
>> - *
>> - *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
>> - *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
>> - *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
>> - *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
>> - *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
>> - *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
>> - *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
>> - *     OTHER DEALINGS IN THE SOFTWARE.
>>    */
> 
> You are changing license of whole file. Have all contributors and
> copyright holders agreed with it?

These are all downstream changes, I haven't added any additional changes!

> 
>> -
>>   /dts-v1/;
>>   
>>   #include "armada-372x.dtsi"
>>   
>>   / {
>>   	model = "Marvell Armada 3720 Community Board ESPRESSOBin";
>> -	compatible = "marvell,armada-3720-espressobin", "marvell,armada3720", "marvell,armada3710";
>> +	compatible = "marvell,armada-3720-espressobin",
>> +		     "marvell,armada3720", "marvell,armada3710";
> 
> There is no change on these two lines, right?

Right, just white spaces.

> 
>>   
>>   	chosen {
>>   		stdout-path = "serial0:115200n8";
>> @@ -121,6 +84,7 @@
>>   	status = "okay";
>>   };
>>   
>> +/* J1 */
>>   &sdhci0 {
>>   	pinctrl-names = "default";
>>   	pinctrl-0 = <&sdio_pins>;
>> @@ -130,6 +94,25 @@
>>   	status = "okay";
>>   };
>>   
>> +/* U11 */
>> +&sdhci1 {
>> +	non-removable;
>> +	bus-width = <8>;
>> +	mmc-ddr-1_8v;
>> +	mmc-hs400-1_8v;
>> +	marvell,pad-type = "fixed-1-8v";
>> +	pinctrl-names = "default";
>> +	pinctrl-0 = <&mmc_pins>;
>> +	status = "disabled";
>> +
>> +	#address-cells = <1>;
>> +	#size-cells = <0>;
>> +	mmccard: mmccard at 0 {
>> +		compatible = "mmc-card";
>> +		reg = <0>;
>> +	};
>> +};
>> +
>>   &spi0 {
>>   	status = "okay";
>>   	pinctrl-names = "default";
>> -- 
>> 2.28.0
>>