Skip to contentSkip to conversation

arm64: dts: rockchip: add SPDIF node for rk3399-firefly

PATCH Applied Peter Robinson 2 participants 5 messages Jun 13, 2021 – Jun 19, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/4 arm64: dts: rockchip: add SPDIF node for rk3399-firefly

This patch adds the SPDIF sound node and related settings for rk3399-firefly.

---
 .../boot/dts/rockchip/rk3399-firefly.dts      | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
arch/arm64/boot/dts/rockchip/rk3399-firefly.dts +28 -0
index 45254be1350d..6bbf79a370df 100644
@@ -151,6 +151,23 @@ sdio_pwrseq: sdio-pwrseq {
 		reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
 	};
 
+	sound-dit {
+		compatible = "audio-graph-card";
+		label = "SPDIF";
+		dais = <&spdif_p0>;
+	};
+
+	spdif-dit {
+		compatible = "linux,spdif-dit";
+		#sound-dai-cells = <0>;
+
+		port {
+			dit_p0_0: endpoint {
+				remote-endpoint = <&spdif_p0_0>;
+			};
+		};
+	};
+
 	/* switched by pmic_sleep */
 	vcc1v8_s3: vcca1v8_s3: vcc1v8-s3 {
 		compatible = "regulator-fixed";
@@ -710,6 +727,17 @@ &sdhci {
 	status = "okay";
 };
 
+&spdif {
+	pinctrl-0 = <&spdif_bus_1>;
+	status = "okay";
+
+	spdif_p0: port {
+		spdif_p0_0: endpoint {
+			remote-endpoint = <&dit_p0_0>;
+		};
+	};
+};
+
 &tcphy0 {
 	status = "okay";
 };
Signature · 7 lines
2.31.1


_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
#1 lore raw

PATCH 2/4 arm64: dts: rockchip: add infrared receiver node to RK3399 Firefly

This adds the RK3399 Firefly’s infrared receiver to its dts.

---
 arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 13 +++++++++++++
 1 file changed, 13 insertions(+)
arch/arm64/boot/dts/rockchip/rk3399-firefly.dts +13 -0
index 6bbf79a370df..a5c2cdaa7798 100644
@@ -94,6 +94,13 @@ power {
 		};
 	};
 
+        ir-receiver {
+                compatible = "gpio-ir-receiver";
+                gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_LOW>;
+                pinctrl-0 = <&ir_int>;
+                pinctrl-names = "default";
+        };
+
 	leds {
 		compatible = "gpio-leds";
 		pinctrl-names = "default";
@@ -595,6 +602,12 @@ pwrbtn: pwrbtn {
 		};
 	};
 
+        ir {
+                ir_int: ir-int {
+                        rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
+                };
+        };
+
 	lcd-panel {
 		lcd_panel_reset: lcd-panel-reset {
 			rockchip,pins = <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up>;
Signature · 7 lines
2.31.1


_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
#2 lore raw

PATCH 3/4 arm64: dts: rockchip: Sort rk3399 firefly pinmux entries

In reply to Peter Robinson

Sort the rk3399 firefly pinmux entries in alphabetical order and de-dupe the pmic entries.

---
 .../boot/dts/rockchip/rk3399-firefly.dts      | 36 +++++++++----------
 1 file changed, 17 insertions(+), 19 deletions(-)
arch/arm64/boot/dts/rockchip/rk3399-firefly.dts +17 -19
index a5c2cdaa7798..e56d47040868 100644
@@ -614,6 +614,16 @@ lcd_panel_reset: lcd-panel-reset {
 		};
 	};
 
+	leds {
+		work_led_pin: work-led-pin {
+			rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+
+		diy_led_pin: diy-led-pin {
+			rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
 	pcie {
 		pcie_pwr_en: pcie-pwr-en {
 			rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -625,6 +635,10 @@ pcie_3g_drv: pcie-3g-drv {
 	};
 
 	pmic {
+		pmic_int_l: pmic-int-l {
+			rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+
 		vsel1_pin: vsel1-pin {
 			rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
@@ -634,21 +648,15 @@ vsel2_pin: vsel2-pin {
 		};
 	};
 
-	sdio-pwrseq {
-		wifi_enable_h: wifi-enable-h {
-			rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
-		};
-	};
-
 	rt5640 {
 		rt5640_hpcon: rt5640-hpcon {
 			rockchip,pins = <4 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
-	pmic {
-		pmic_int_l: pmic-int-l {
-			rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
+	sdio-pwrseq {
+		wifi_enable_h: wifi-enable-h {
+			rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
@@ -663,16 +671,6 @@ wifi_host_wake_l: wifi-host-wake-l {
 			rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
-
-	leds {
-		work_led_pin: work-led-pin {
-			rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
-		};
-
-		diy_led_pin: diy-led-pin {
-			rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
-		};
-	};
 };
 
 &pwm0 {
Signature · 7 lines
2.31.1


_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
#3 lore raw

PATCH 4/4 arm64: dts: rockchip: Add USB-C port details for rk3399 Firefly

In reply to Peter Robinson

Add the initial details for the USB-C port.

---
 .../boot/dts/rockchip/rk3399-firefly.dts      | 85 +++++++++++++++++++
 1 file changed, 85 insertions(+)
arch/arm64/boot/dts/rockchip/rk3399-firefly.dts +85 -0
index e56d47040868..4a427beab1c7 100644
@@ -6,6 +6,7 @@
 /dts-v1/;
 #include <dt-bindings/input/linux-event-codes.h>
 #include <dt-bindings/pwm/pwm.h>
+#include <dt-bindings/usb/pd.h>
 #include "rk3399.dtsi"
 #include "rk3399-opp.dtsi"
 
@@ -220,6 +221,17 @@ vcc5v0_host: vcc5v0-host-regulator {
 		vin-supply = <&vcc_sys>;
 	};
 
+	vcc5v0_typec: vcc5v0-typec-regulator {
+		compatible = "regulator-fixed";
+		enable-active-high;
+		gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&vcc5v0_typec_en>;
+		regulator-name = "vcc5v0_typec";
+		regulator-always-on;
+		vin-supply = <&vcc_sys>;
+	};
+
 	vcc_sys: vcc-sys {
 		compatible = "regulator-fixed";
 		regulator-name = "vcc_sys";
@@ -551,6 +563,53 @@ accelerometer@68 {
 		interrupt-parent = <&gpio1>;
 		interrupts = <RK_PC6 IRQ_TYPE_EDGE_RISING>;
 	};
+
+	fusb0: typec-portc@22 {
+		compatible = "fcs,fusb302";
+		reg = <0x22>;
+		interrupt-parent = <&gpio1>;
+		interrupts = <RK_PA2 IRQ_TYPE_LEVEL_LOW>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&fusb0_int>;
+		vbus-supply = <&vcc5v0_typec>;
+		status = "okay";
+
+		connector {
+			compatible = "usb-c-connector";
+			data-role = "host";
+			label = "USB-C";
+			op-sink-microwatt = <1000000>;
+			power-role = "dual";
+			sink-pdos =
+				<PDO_FIXED(5000, 2500, PDO_FIXED_USB_COMM)>;
+			source-pdos =
+				<PDO_FIXED(5000, 1400, PDO_FIXED_USB_COMM)>;
+			try-power-role = "sink";
+
+			ports {
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				port@0 {
+					reg = <0>;
+
+					usbc_hs: endpoint {
+						remote-endpoint =
+							<&u2phy0_typec_hs>;
+					};
+				};
+
+				port@1 {
+					reg = <1>;
+
+					usbc_ss: endpoint {
+						remote-endpoint =
+							<&tcphy0_typec_ss>;
+					};
+				};
+			};
+		};
+	};
 };
 
 &i2s0 {
@@ -602,6 +661,12 @@ pwrbtn: pwrbtn {
 		};
 	};
 
+	fusb302x {
+		fusb0_int: fusb0-int {
+			rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	};
+
         ir {
                 ir_int: ir-int {
                         rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -660,6 +725,12 @@ wifi_enable_h: wifi-enable-h {
 		};
 	};
 
+	usb-typec {
+		vcc5v0_typec_en: vcc5v0_typec_en {
+			rockchip,pins = <1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	};
+
 	usb2 {
 		vcc5v0_host_en: vcc5v0-host-en {
 			rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -753,6 +824,14 @@ &tcphy0 {
 	status = "okay";
 };
 
+&tcphy0_usb3 {
+	port {
+		tcphy0_typec_ss: endpoint {
+			remote-endpoint = <&usbc_ss>;
+		};
+	};
+};
+
 &tcphy1 {
 	status = "okay";
 };
@@ -776,6 +855,12 @@ u2phy0_host: host-port {
 		phy-supply = <&vcc5v0_host>;
 		status = "okay";
 	};
+
+	port {
+		u2phy0_typec_hs: endpoint {
+			remote-endpoint = <&usbc_hs>;
+		};
+	};
 };
 
 &u2phy1 {
Signature · 7 lines
2.31.1


_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
maintainer Applied
#4 lore raw
In reply to Peter Robinson
Quoted 2 lines · Peter Robinson

This patch adds the SPDIF sound node and related settings for rk3399-firefly.

Applied, thanks!

[1/4] arm64: dts: rockchip: add SPDIF node for rk3399-firefly

      commit: ba2401ab87bc2049a49d45f75013f6faebd120f1
[2/4] arm64: dts: rockchip: add infrared receiver node to RK3399 Firefly
      commit: 4fab8e3655e476170281884d999c4d758d405fac
[3/4] arm64: dts: rockchip: Sort rk3399 firefly pinmux entries
      commit: 5768c5ff0709aeea40fbdc8e362733f5a99fc458
[4/4] arm64: dts: rockchip: Add USB-C port details for rk3399 Firefly
      commit: a406bfda89c78a75327f8b6a0281b5d3bed493a1

Best regards,

Signature · 6 lines
Heiko Stuebner <[email protected]>

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip