Merge tag 'u-boot-imx-20200825' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[platform/kernel/u-boot.git] / arch / arm / dts / uniphier-pxs2-gentil.dts

diff --git a/arch/arm/dts/uniphier-pxs2-gentil.dts b/arch/arm/dts/uniphier-pxs2-gentil.dts
index 7f0f972..759384b 100644 (file)
--- a/arch/arm/dts/uniphier-pxs2-gentil.dts
+++ b/arch/arm/dts/uniphier-pxs2-gentil.dts
@@ -1,11 +1,9 @@
-/*
- * Device Tree Source for UniPhier PXs2 Gentil Board
- *
- * Copyright (C) 2015-2016 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
- */
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+//
+// Device Tree Source for UniPhier PXs2 Gentil Board
+//
+// Copyright (C) 2015-2016 Socionext Inc.
+//   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 
 /dts-v1/;
 #include "uniphier-pxs2.dtsi"
@@ -28,12 +26,19 @@
                i2c4 = &i2c4;
                i2c5 = &i2c5;
                i2c6 = &i2c6;
+               ethernet0 = &eth;
        };
 
        memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x80000000>;
        };
+
+       sound {
+               compatible = "audio-graph-card";
+               label = "UniPhier PXs2";
+               dais = <&i2s_port2>;
+       };
 };
 
 &serial2 {
@@ -44,46 +49,53 @@
        status = "okay";
 
        eeprom@54 {
-               compatible = "st,24c64", "atmel,24c64", "i2c-eeprom";
+               compatible = "st,24c64", "atmel,24c64";
                reg = <0x54>;
                pagesize = <32>;
-               u-boot,i2c-offset-len = <2>;
        };
 };
 
-&i2c2 {
-       status = "okay";
+&i2s_aux {
+       dai-format = "i2s";
+       remote-endpoint = <&wm_speaker>;
 };
 
-&emmc {
+&i2c2 {
        status = "okay";
-};
 
-&usb0 {
-       status = "okay";
+       wm8960@1a {
+               compatible = "wlf,wm8960";
+               reg = <0x1a>;
+               #sound-dai-cells = <0>;
+
+               port@0 {
+                       wm_speaker: endpoint {
+                               dai-format = "i2s";
+                               remote-endpoint = <&i2s_aux>;
+                       };
+               };
+       };
 };
 
-&usb1 {
+&emmc {
        status = "okay";
 };
 
-/* for U-Boot only */
-&serial2 {
-       u-boot,dm-pre-reloc;
-};
-
-&sd_clk {
-       u-boot,dm-pre-reloc;
+&eth {
+       status = "okay";
+       phy-handle = <&ethphy>;
 };
 
-&emmc {
-       u-boot,dm-pre-reloc;
+&mdio {
+       ethphy: ethernet-phy@1 {
+               reg = <1>;
+       };
 };
 
-&pinctrl_uart2 {
-       u-boot,dm-pre-reloc;
+&usb0 {
+       status = "okay";
 };
 
-&pinctrl_emmc {
-       u-boot,dm-pre-reloc;
+&usb1 {
+       status = "okay";
 };