[PATCH v2 4/6] arm64: dts: meson: sync dt and bindings from v5.6-rc2

[Neil Armstrong]

On 02/03/2020 10:33, Neil Armstrong wrote:
> On 27/02/2020 12:27, Jerome Brunet wrote:
>> Sync the device tree and dt-bindings from Linux v5.6-rc2
>> 11a48a5a18c6 ("Linux 5.6-rc2")
>>
>> The only exception to this is the mmc pinctrl pin bias of gxl SoC family.
>> This is a fix which found its way to u-boot but not Linux yet.
>>
>> Signed-off-by: Jerome Brunet <jbrunet at baylibre.com>
>> ---
>>  arch/arm/dts/meson-axg-s400.dts               |  70 ++-
>>  arch/arm/dts/meson-axg.dtsi                   | 273 ++++++++--
>>  arch/arm/dts/meson-g12-common.dtsi            | 478 ++++++------------
>>  arch/arm/dts/meson-g12.dtsi                   | 398 +++++++++++++++
>>  arch/arm/dts/meson-g12a-sei510.dts            |  64 +++
>>  arch/arm/dts/meson-g12a-u200.dts              |  54 ++
>>  arch/arm/dts/meson-g12a.dtsi                  |  33 +-
>>  arch/arm/dts/meson-g12b-a311d-khadas-vim3.dts |  25 +
>>  arch/arm/dts/meson-g12b-odroid-n2.dts         |   2 +-
>>  arch/arm/dts/meson-g12b.dtsi                  |  26 +-
>>  arch/arm/dts/meson-gx.dtsi                    |  87 +++-
>>  arch/arm/dts/meson-gxbb-nanopi-k2.dts         |  26 +-
>>  arch/arm/dts/meson-gxbb-odroidc2.dts          | 100 +++-
>>  arch/arm/dts/meson-gxbb-p200.dts              |   9 +-
>>  arch/arm/dts/meson-gxbb-p201.dts              |   2 +-
>>  arch/arm/dts/meson-gxbb-p20x.dtsi             |   9 +-
>>  arch/arm/dts/meson-gxbb.dtsi                  | 118 ++++-
>>  arch/arm/dts/meson-gxl-s805x-libretech-ac.dts |   2 +-
>>  arch/arm/dts/meson-gxl-s905x-khadas-vim.dts   |  20 +-
>>  arch/arm/dts/meson-gxl-s905x-libretech-cc.dts |  26 +-
>>  arch/arm/dts/meson-gxl-s905x-p212.dtsi        |  10 +-
>>  arch/arm/dts/meson-gxl.dtsi                   |  76 ++-
>>  arch/arm/dts/meson-gxm-khadas-vim2.dts        |  71 +--
>>  arch/arm/dts/meson-gxm.dtsi                   |  39 +-
>>  arch/arm/dts/meson-khadas-vim3.dtsi           |   7 +
>>  arch/arm/dts/meson-sm1-khadas-vim3l.dts       |  95 ++++
>>  arch/arm/dts/meson-sm1-sei610.dts             | 236 ++++++++-
>>  arch/arm/dts/meson-sm1.dtsi                   | 356 +++++++++++++
>>  include/dt-bindings/clock/axg-audio-clkc.h    |  10 +
>>  include/dt-bindings/clock/gxbb-aoclkc.h       |   7 +
>>  include/dt-bindings/clock/gxbb-clkc.h         |  21 +
>>  include/dt-bindings/gpio/meson-gxbb-gpio.h    |   8 +-
>>  include/dt-bindings/gpio/meson-gxl-gpio.h     |   8 +-
>>  .../reset/amlogic,meson-axg-audio-arb.h       |   2 +
>>  .../reset/amlogic,meson-axg-reset.h           |   3 +-
>>  .../reset/amlogic,meson-g12a-audio-reset.h    |  15 +
>>  .../reset/amlogic,meson-gxbb-reset.h          |  51 +-
>>  37 files changed, 2214 insertions(+), 623 deletions(-)
>>  create mode 100644 arch/arm/dts/meson-g12.dtsi
>>  create mode 100644 arch/arm/dts/meson-sm1-khadas-vim3l.dts
>>
>> diff --git a/arch/arm/dts/meson-axg-s400.dts b/arch/arm/dts/meson-axg-s400.dts
>> index 18778ada7bd3..4cd2d5951822 100644
>> --- a/arch/arm/dts/meson-axg-s400.dts
>> +++ b/arch/arm/dts/meson-axg-s400.dts
>> @@ -60,7 +60,7 @@
>>  		serial1 = &uart_A;
>>  	};
>>  
>> -	linein: audio-codec at 0 {
>> +	linein: audio-codec-0 {
>>  		#sound-dai-cells = <0>;
>>  		compatible = "everest,es7241";
>>  		VDDA-supply = <&vcc_3v3>;
>> @@ -70,7 +70,7 @@
>>  		sound-name-prefix = "Linein";
>>  	};
>>  
>> -	lineout: audio-codec at 1 {
>> +	lineout: audio-codec-1 {
>>  		#sound-dai-cells = <0>;
>>  		compatible = "everest,es7154";
>>  		VDD-supply = <&vcc_3v3>;
>> @@ -79,14 +79,14 @@
>>  		sound-name-prefix = "Lineout";
>>  	};
>>  
>> -	spdif_dit: audio-codec at 2 {
>> +	spdif_dit: audio-codec-2 {
>>  		#sound-dai-cells = <0>;
>>  		compatible = "linux,spdif-dit";
>>  		status = "okay";
>>  		sound-name-prefix = "DIT";
>>  	};
>>  
>> -	dmics: audio-codec at 3 {
>> +	dmics: audio-codec-3 {
>>  		#sound-dai-cells = <0>;
>>  		compatible = "dmic-codec";
>>  		num-channels = <7>;
>> @@ -95,6 +95,13 @@
>>  		sound-name-prefix = "MIC";
>>  	};
>>  
>> +	spdif_dir: audio-codec-4 {
>> +		#sound-dai-cells = <0>;
>> +		compatible = "linux,spdif-dir";
> 
> [...]
> 
>> - * are met:
>> - *
>> - *   * Redistributions of source code must retain the above copyright
>> - *     notice, this list of conditions and the following disclaimer.
>> - *   * Redistributions in binary form must reproduce the above copyright
>> - *     notice, this list of conditions and the following disclaimer in
>> - *     the documentation and/or other materials provided with the
>> - *     distribution.
>> - *   * Neither the name of Intel Corporation nor the names of its
>> - *     contributors may be used to endorse or promote products derived
>> - *     from this software without specific prior written permission.
>> - *
>> - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>> - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>> - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>> - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>> - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>> - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>> - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>> - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>> - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>> - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>> - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>>   */Linux 5.5-rc1
>>  #ifndef _DT_BINDINGS_AMLOGIC_MESON_GXBB_RESET_H
>>  #define _DT_BINDINGS_AMLOGIC_MESON_GXBB_RESET_H
>>
> 
> Acked-by: Neil Armstrong <narmstrong at baylibre.com>
> 

This doesn't apply on master, arch/arm/dts/meson-sm1-khadas-vim3l.dts has already been synced from Linux 5.5-rc1.

Neil