Amlogic ARM64 DT changes for v5.17:

- Add missing cec nodes for Odroid-C4 & HC4 - Fix thermal-zones indent for G12/SM1 SoCs dtsi - Fix GPU OPP table node name for G12/SM1 SoCs dtsi - Fix SPI NOR Flash node name for Odroid-N2/N2+ - Fixes for GXBB Wetek boards: - Fix HDMI supply - Add missing gpio bindings include - Switch to new LED bindings - P241 additions: - Add VCC 5v regulator - Add sound nodes -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEPVPGJshWBf4d9CyLd9zb2sjISdEFAmG3Sg0ACgkQd9zb2sjI SdHF2A//ZZFoJYUDWmHutRV57oCWbSNyX43z+6HiJe01jHn5x3wUR5DZNIPm3PAr yttWQtzAGBronEtCbWykMsxpbNWtHuLnfIb0sYMI7bg2DtJUYh08i+AF+Kqxjw6P UTwiebetLP5pFhFlHFHOBCC5MNVL4oS/dbrB1wCX3D3hYAY5XSHK4mnjdeYV+3/u oJCD87h/a0EUA7jU8bjiuAiPADlh+cQ8EPTptGU3JsVCT85el2VTBACNHu14so35 lM9ikc68SA30/BVc87jytVCdydIx7WHYXVnagporvu3IOpUwd6qBhbP851J69I7V ZZDdMRm9XWh7QySzhuW+E1r5J5T1/YWuPgGSYU5kRsKbcNfyQaWFWAKp4+0b97Iu BzXfgp3HHBg83ntBiBgWQUEilGypq0QKDfdZJd7PhRgtSCjsD2+ZM7Jokg1d3Q7R YX0woVv818k3vEOfuq2O6gPR3mx8Of1vtBR0gqKscAIu0GdEGcm+mRqtemH177DZ UuIJp1FFGxajftscZZO3qfPZIWjO76fBJHywqax64J5aZx1f6kbMNGDwwYU218nv RtUzGcKOCZZfcExjtQb/FYc6WsMSenr1clz2EXx6S5CN8oNJ9vrAt+x5rMrm4fGr /NZtFCi8UytziDFyRVv/OR6JNLMDSFmwDpiFNYRNMsZUKrvKRFc= =j3KZ -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmG30/EACgkQmmx57+YA GNlGARAAwYcCt9IbAZE/qj7TbgZBLuCAukM67WIohTbcFqY886HctKNBnEm/D+1h xBuR0ct+lj+Wfv+5LaztDxVDmjzr3o+aamKWK9zRJbGrjC5mC4C9k0VCJEdqxn+e 8gfeN+gtI8l54U4SpC2Ah5FrC0Ww5uHrCA2tAseM5ww0IaE5h2sIw859GLKijO14 CnzFzFpQDiBCKZDm0j6r0Ztxs+O0X2FwiAaWlV8JsQUUKOWVZNrUzxSiCinbdVPl zO/vBDsYcfMI/v+5y96DZB3cw66835lkxRAQ59lpTx5Xj8EJQ33OiEvjZUvRHb+e 2t6AumEkSQe54XJfbCrnZpvjWb00YItujIYfOdeRDNf7v3vqU+FJzgzY6RVIyVuZ w65HF3+/+OyrVosF9gVSSAF+rmWL1vGOQ7sIrVQSB2+8KuGDxWCzjcBlWxlyrpRB PmxNPTkHtz2FK4G0ZIVLFslMeIczYbyw649LoiUWQX4tiAoYp+HMMaUM99Jcy0ao t6TiYv1dNNS/DYOXsx94oqUx1o6P/FJHw3wpyPJ1j/pTuAt8iGhBl5ixB52LBQ6h mHp3sZ6ppOJI7YmIZjgPpM1DrQ9Q5IgkyY3sEaWuiFCJE5/SOocYIMb7/5wOF45w Tjmv+w0Qt401Eym8v0cmtRsHYRlN0gW3GzADPTLHipG84dT3BZQ= =jMrR -----END PGP SIGNATURE----- Merge tag 'amlogic-arm64-dt-for-v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into arm/dt Amlogic ARM64 DT changes for v5.17: - Add missing cec nodes for Odroid-C4 & HC4 - Fix thermal-zones indent for G12/SM1 SoCs dtsi - Fix GPU OPP table node name for G12/SM1 SoCs dtsi - Fix SPI NOR Flash node name for Odroid-N2/N2+ - Fixes for GXBB Wetek boards: - Fix HDMI supply - Add missing gpio bindings include - Switch to new LED bindings - P241 additions: - Add VCC 5v regulator - Add sound nodes * tag 'amlogic-arm64-dt-for-v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux: arm64: dts: meson: p241: add sound support arm64: dts: meson: p241: add vcc_5v regulator arm64: dts: meson-gxbb-wetek: use updated LED bindings arm64: dts: meson-gxbb-wetek: fix missing GPIO binding arm64: dts: meson-gxbb-wetek: fix HDMI in early boot arm64: dts: amlogic: Fix SPI NOR flash node name for ODROID N2/N2+ arm64: dts: amlogic: meson-g12: Fix GPU operating point table node name arm64: dts: amlogic: meson-g12: Fix thermal-zones indent arm64: dts: meson-sm1-odroid: add cec nodes Link: https://lore.kernel.org/r/f47b9b95-6cde-d2f8-eb36-78777d449920@baylibre.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2021-12-14 00:14:56 +01:00 · 2021-12-14 00:14:56 +01:00 · 1c8e994f16
--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
@ -58,7 +58,7 @@
 		secure-monitor = <&sm>;
 	};

-	gpu_opp_table: gpu-opp-table {
+	gpu_opp_table: opp-table-gpu {
 		compatible = "operating-points-v2";

 		opp-124999998 {
@ -159,61 +159,6 @@
 			status = "disabled";
 		};

-		thermal-zones {
-			cpu_thermal: cpu-thermal {
-				polling-delay = <1000>;
-				polling-delay-passive = <100>;
-				thermal-sensors = <&cpu_temp>;
-
-				trips {
-					cpu_passive: cpu-passive {
-						temperature = <85000>; /* millicelsius */
-						hysteresis = <2000>; /* millicelsius */
-						type = "passive";
-					};
-
-					cpu_hot: cpu-hot {
-						temperature = <95000>; /* millicelsius */
-						hysteresis = <2000>; /* millicelsius */
-						type = "hot";
-					};
-
-					cpu_critical: cpu-critical {
-						temperature = <110000>; /* millicelsius */
-						hysteresis = <2000>; /* millicelsius */
-						type = "critical";
-					};
-				};
-			};
-
-			ddr_thermal: ddr-thermal {
-				polling-delay = <1000>;
-				polling-delay-passive = <100>;
-				thermal-sensors = <&ddr_temp>;
-
-				trips {
-					ddr_passive: ddr-passive {
-						temperature = <85000>; /* millicelsius */
-						hysteresis = <2000>; /* millicelsius */
-						type = "passive";
-					};
-
-					ddr_critical: ddr-critical {
-						temperature = <110000>; /* millicelsius */
-						hysteresis = <2000>; /* millicelsius */
-						type = "critical";
-					};
-				};
-
-				cooling-maps {
-					map {
-						trip = <&ddr_passive>;
-						cooling-device = <&mali THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-					};
-				};
-			};
-		};
-
 		ethmac: ethernet@ff3f0000 {
 			compatible = "amlogic,meson-g12a-dwmac",
 				     "snps,dwmac-3.70a",
@ -2415,6 +2360,61 @@
 		};
 	};

+	thermal-zones {
+		cpu_thermal: cpu-thermal {
+			polling-delay = <1000>;
+			polling-delay-passive = <100>;
+			thermal-sensors = <&cpu_temp>;
+
+			trips {
+				cpu_passive: cpu-passive {
+					temperature = <85000>; /* millicelsius */
+					hysteresis = <2000>; /* millicelsius */
+					type = "passive";
+				};
+
+				cpu_hot: cpu-hot {
+					temperature = <95000>; /* millicelsius */
+					hysteresis = <2000>; /* millicelsius */
+					type = "hot";
+				};
+
+				cpu_critical: cpu-critical {
+					temperature = <110000>; /* millicelsius */
+					hysteresis = <2000>; /* millicelsius */
+					type = "critical";
+				};
+			};
+		};
+
+		ddr_thermal: ddr-thermal {
+			polling-delay = <1000>;
+			polling-delay-passive = <100>;
+			thermal-sensors = <&ddr_temp>;
+
+			trips {
+				ddr_passive: ddr-passive {
+					temperature = <85000>; /* millicelsius */
+					hysteresis = <2000>; /* millicelsius */
+					type = "passive";
+				};
+
+				ddr_critical: ddr-critical {
+					temperature = <110000>; /* millicelsius */
+					hysteresis = <2000>; /* millicelsius */
+					type = "critical";
+				};
+			};
+
+			cooling-maps {
+				map {
+					trip = <&ddr_passive>;
+					cooling-device = <&mali THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+				};
+			};
+		};
+	};
+
 	timer {
 		compatible = "arm,armv8-timer";
 		interrupts = <GIC_PPI 13
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
@ -609,7 +609,7 @@
 	pinctrl-0 = <&nor_pins>;
 	pinctrl-names = "default";

-	mx25u64: spi-flash@0 {
+	mx25u64: flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "mxicy,mx25u6435f", "jedec,spi-nor";
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
@ -6,6 +6,8 @@
 */

 #include "meson-gxbb.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/leds/common.h>

 / {
 	aliases {
@ -25,8 +27,10 @@
 	leds {
 		compatible = "gpio-leds";

-		led-system {
-			label = "wetek-play:system-status";
+		led-power {
+			/* red in suspend or power-off */
+			color = <LED_COLOR_ID_BLUE>;
+			function = LED_FUNCTION_POWER;
 			gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_HIGH>;
 			default-state = "on";
 			panic-indicator;
@ -64,6 +68,7 @@
 		regulator-name = "VDDIO_AO18";
 		regulator-min-microvolt = <1800000>;
 		regulator-max-microvolt = <1800000>;
+		regulator-always-on;
 	};

 	vcc_3v3: regulator-vcc_3v3 {
@ -161,6 +166,7 @@
 	status = "okay";
 	pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
 	pinctrl-names = "default";
+	hdmi-supply = <&vddio_ao18>;
 };

 &hdmi_tx_tmds_port {
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts
@ -8,6 +8,7 @@
 /dts-v1/;

 #include <dt-bindings/input/input.h>
+#include <dt-bindings/sound/meson-aiu.h>

 #include "meson-gxl-s805x.dtsi"

@ -21,6 +22,13 @@
 		ethernet0 = &ethmac;
 	};

+	au2: analog-amplifier {
+		compatible = "simple-audio-amplifier";
+		sound-name-prefix = "AU2";
+		VCC-supply = <&vcc_5v>;
+		enable-gpios = <&gpio GPIOH_5 GPIO_ACTIVE_HIGH>;
+	};
+
 	chosen {
 		stdout-path = "serial0:115200n8";
 	};
@ -84,6 +92,14 @@
 		regulator-max-microvolt = <3300000>;
 	};

+	vcc_5v: regulator-vcc-5v {
+		compatible = "regulator-fixed";
+		regulator-name = "VCC_5V";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+	};
+
+
 	emmc_pwrseq: emmc-pwrseq {
 		compatible = "mmc-pwrseq-emmc";
 		reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>;
@ -102,6 +118,68 @@
 		clocks = <&wifi32k>;
 		clock-names = "ext_clock";
 	};
+
+	sound {
+		compatible = "amlogic,gx-sound-card";
+		model = "GXL-P241";
+		audio-aux-devs = <&au2>;
+		audio-widgets = "Line", "Lineout";
+		audio-routing = "AU2 INL", "ACODEC LOLN",
+				"AU2 INR", "ACODEC LORN",
+				"Lineout", "AU2 OUTL",
+				"Lineout", "AU2 OUTR";
+		assigned-clocks = <&clkc CLKID_MPLL0>,
+				  <&clkc CLKID_MPLL1>,
+				  <&clkc CLKID_MPLL2>;
+		assigned-clock-parents = <0>, <0>, <0>;
+		assigned-clock-rates = <294912000>,
+				       <270950400>,
+				       <393216000>;
+		status = "okay";
+
+		dai-link-0 {
+			sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>;
+		};
+
+		dai-link-1 {
+			sound-dai = <&aiu AIU_CPU CPU_I2S_ENCODER>;
+			dai-format = "i2s";
+			mclk-fs = <256>;
+
+			codec-0 {
+				sound-dai = <&aiu AIU_HDMI CTRL_I2S>;
+			};
+
+			codec-1 {
+				sound-dai = <&aiu AIU_ACODEC CTRL_I2S>;
+			};
+		};
+
+		dai-link-2 {
+			sound-dai = <&aiu AIU_HDMI CTRL_OUT>;
+
+			codec-0 {
+				sound-dai = <&hdmi_tx>;
+			};
+		};
+
+		dai-link-3 {
+			sound-dai = <&aiu AIU_ACODEC CTRL_OUT>;
+
+			codec-0 {
+				sound-dai = <&acodec>;
+			};
+		};
+	};
+};
+
+&acodec {
+	AVDD-supply = <&vddio_ao18>;
+	status = "okay";
+};
+
+&aiu {
+	status = "okay";
 };

 &cec_AO {
@ -136,6 +214,7 @@
 	status = "okay";
 	pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
 	pinctrl-names = "default";
+	hdmi-supply = <&vcc_5v>;
 };

 &hdmi_tx_tmds_port {
@ -220,3 +299,7 @@
 	status = "okay";
 	dr_mode = "host";
 };
+
+&usb2_phy0 {
+	phy-supply = <&vcc_5v>;
+};
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
@ -225,6 +225,20 @@
 	status = "okay";
 };

+&cec_AO {
+	pinctrl-0 = <&cec_ao_a_h_pins>;
+	pinctrl-names = "default";
+	status = "disabled";
+	hdmi-phandle = <&hdmi_tx>;
+};
+
+&cecb_AO {
+	pinctrl-0 = <&cec_ao_b_h_pins>;
+	pinctrl-names = "default";
+	status = "okay";
+	hdmi-phandle = <&hdmi_tx>;
+};
+
 &clkc_audio {
 	status = "okay";
 };