X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=arch%2Farm%2Fdts%2Funiphier-pxs2-gentil.dts;h=e27fd4f2a5690802fb317eb5e9359c3804acbeaa;hb=d32cbefc8ac82bd0206f806efb07df82c4b92d5b;hp=aac478175fe57dc0db5d488235673c48bd87d80d;hpb=f16eda968cc21da1ddbe5ad8d7ba54d6247cb300;p=oweals%2Fu-boot.git

diff --git a/arch/arm/dts/uniphier-pxs2-gentil.dts b/arch/arm/dts/uniphier-pxs2-gentil.dts
index aac478175f..e27fd4f2a5 100644
--- a/arch/arm/dts/uniphier-pxs2-gentil.dts
+++ b/arch/arm/dts/uniphier-pxs2-gentil.dts
@@ -1,14 +1,12 @@
-/*
- * 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+
- */
+// 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"
+#include "uniphier-pxs2.dtsi"
 
 / {
 	model = "UniPhier PXs2 Gentil Board";
@@ -30,10 +28,16 @@
 		i2c6 = &i2c6;
 	};
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0x80000000 0x80000000>;
 	};
+
+	sound {
+		compatible = "audio-graph-card";
+		label = "UniPhier PXs2";
+		dais = <&i2s_port2>;
+	};
 };
 
 &serial2 {
@@ -44,45 +48,53 @@
 	status = "okay";
 
 	eeprom@54 {
-		compatible = "st,24c64", "i2c-eeprom";
+		compatible = "st,24c64", "atmel,24c64";
 		reg = <0x54>;
-		u-boot,i2c-offset-len = <2>;
+		pagesize = <32>;
 	};
 };
 
-&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: ethphy@1 {
+		reg = <1>;
+	};
 };
 
-&pinctrl_uart2 {
-	u-boot,dm-pre-reloc;
+&usb0 {
+	status = "okay";
 };
 
-&pinctrl_emmc {
-	u-boot,dm-pre-reloc;
+&usb1 {
+	status = "okay";
 };