From 071106ecf68c401173c58808b1cf5f68cc50d390 Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Fri, 05 Jan 2024 08:39:27 +0000
Subject: [PATCH] change wifi driver to cypress
---
kernel/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dtsi | 207 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 147 insertions(+), 60 deletions(-)
diff --git a/kernel/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dtsi b/kernel/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dtsi
index ae44c42..ddd3dcd 100644
--- a/kernel/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dtsi
+++ b/kernel/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dtsi
@@ -9,6 +9,7 @@
#include <dt-bindings/sensor-dev.h>
#include "rk3399-vop-clk-set.dtsi"
#include <dt-bindings/input/input.h>
+#include "dt-bindings/usb/pd.h"
/ {
compatible = "rockchip,rk3399-evb-ind", "rockchip,rk3399";
@@ -87,23 +88,23 @@
};
rk809_sound: rk809-sound {
- compatible = "simple-audio-card";
- simple-audio-card,format = "i2s";
- simple-audio-card,name = "rockchip,rk809-codec";
- simple-audio-card,mclk-fs = <256>;
- simple-audio-card,widgets =
- "Microphone", "Mic Jack",
- "Headphone", "Headphone Jack";
- simple-audio-card,routing =
- "Mic Jack", "MICBIAS1",
- "IN1P", "Mic Jack",
- "Headphone Jack", "HPOL",
- "Headphone Jack", "HPOR";
- simple-audio-card,cpu {
- sound-dai = <&i2s1>;
- };
- simple-audio-card,codec {
- sound-dai = <&rk809_codec>;
+ compatible = "rockchip,multicodecs-card";
+ rockchip,card-name = "rockchip-rk809";
+ hp-det-gpio = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>;
+ io-channels = <&saradc 2>;
+ io-channel-names = "adc-detect";
+ keyup-threshold-microvolt = <1800000>;
+ poll-interval = <100>;
+ rockchip,format = "i2s";
+ rockchip,mclk-fs = <256>;
+ rockchip,cpu = <&i2s1>;
+ rockchip,codec = <&rk809_codec>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&hp_det>;
+ play-pause-key {
+ label = "playpause";
+ linux,code = <KEY_PLAYPAUSE>;
+ press-threshold-microvolt = <2000>;
};
};
@@ -116,20 +117,16 @@
hdmi_sound: hdmi-sound {
status = "disabled";
- compatible = "simple-audio-card";
- simple-audio-card,format = "i2s";
- simple-audio-card,mclk-fs = <256>;
- simple-audio-card,name = "rockchip,hdmi";
-
- simple-audio-card,cpu {
- sound-dai = <&i2s2>;
- };
- simple-audio-card,codec {
- sound-dai = <&hdmi>;
- };
+ compatible = "rockchip,hdmi";
+ rockchip,mclk-fs = <256>;
+ rockchip,card-name = "rockchip-hdmi0";
+ rockchip,cpu = <&i2s2>;
+ rockchip,codec = <&hdmi>;
+ rockchip,jack-det;
};
rk_headset: rk-headset {
+ status = "disabled";
compatible = "rockchip_headset";
headset_gpio = <&gpio0 11 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
@@ -141,6 +138,7 @@
status = "okay";
compatible = "simple-audio-card";
simple-audio-card,name = "ROCKCHIP,SPDIF";
+ simple-audio-card,mclk-fs = <128>;
simple-audio-card,cpu {
sound-dai = <&spdif>;
};
@@ -177,6 +175,7 @@
wifi_chip_type = "ap6354";
sdio_vref = <1800>;
WIFI,host_wake_irq = <&gpio0 3 GPIO_ACTIVE_HIGH>; /* GPIO0_a3 */
+ WIFI,poweren_gpio = <&gpio0 10 GPIO_ACTIVE_HIGH>;
status = "okay";
};
@@ -206,11 +205,6 @@
status = "okay";
};
- dummy_codec: dummy-codec {
- compatible = "rockchip,dummy-codec";
- #sound-dai-cells = <0>;
- };
-
tc358749x_sound:tc358749x-sound {
status = "okay";
compatible = "simple-audio-card";
@@ -219,10 +213,10 @@
simple-audio-card,bitclock-master = <&sound0_master>;
simple-audio-card,frame-master = <&sound0_master>;
simple-audio-card,cpu {
- sound-dai = <&i2s0>;
+ sound-dai = <&i2s0>;
};
sound0_master: simple-audio-card,codec {
- sound-dai = <&dummy_codec>;
+ sound-dai = <&tc358749x>;
};
};
@@ -261,6 +255,16 @@
regulator-boot-on;
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
+ };
+
+ vbus_typec: vbus-typec-regulator {
+ compatible = "regulator-fixed";
+ enable-active-high;
+ gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&vcc5v0_typec0_en>;
+ regulator-name = "vbus_typec";
+ vin-supply = <&vcc5v0_sys>;
};
vcc_phy: vcc-phy-regulator {
@@ -306,7 +310,6 @@
&cdn_dp {
status = "okay";
- extcon = <&fusb0>;
phys = <&tcphy0_dp>;
};
@@ -424,7 +427,7 @@
pinctrl-names = "default";
pinctrl-0 = <&rgmii_pins>;
tx_delay = <0x22>;
- rx_delay = <0x08>;
+ rx_delay = <0x23>;
status = "okay";
};
@@ -443,8 +446,8 @@
i2c-scl-falling-time-ns = <4>;
clock-frequency = <400000>;
- vdd_cpu_b: tcs452x@1c {
- compatible = "tcs,tcs452x";
+ vdd_cpu_b: tcs4525@1c {
+ compatible = "tcs,tcs4525";
reg = <0x1c>;
vin-supply = <&vcc5v0_sys>;
regulator-compatible = "fan53555-reg";
@@ -463,8 +466,8 @@
};
};
- vdd_gpu: tcs452x@10 {
- compatible = "tcs,tcs452x";
+ vdd_gpu: tcs4526@10 {
+ compatible = "tcs,tcs4526";
reg = <0x10>;
vin-supply = <&vcc5v0_sys>;
regulator-compatible = "fan53555-reg";
@@ -839,14 +842,71 @@
layout = <8>;
};
- fusb0: fusb30x@22 {
- compatible = "fairchild,fusb302";
+ usbc0: fusb302@22 {
+ compatible = "fcs,fusb302";
reg = <0x22>;
+ interrupt-parent = <&gpio1>;
+ interrupts = <RK_PA2 IRQ_TYPE_LEVEL_LOW>;
pinctrl-names = "default";
- pinctrl-0 = <&fusb0_int>;
- int-n-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
- vbus-5v-gpios = <&gpio1 18 GPIO_ACTIVE_HIGH>;
+ pinctrl-0 = <&usbc0_int>;
+ vbus-supply = <&vbus_typec>;
status = "okay";
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ usbc0_role_sw: endpoint@0 {
+ remote-endpoint = <&dwc3_0_role_switch>;
+ };
+ };
+ };
+
+ usb_con: connector {
+ compatible = "usb-c-connector";
+ label = "USB-C";
+ data-role = "dual";
+ power-role = "dual";
+ try-power-role = "sink";
+ op-sink-microwatt = <1000000>;
+ sink-pdos =
+ <PDO_FIXED(5000, 2500, PDO_FIXED_USB_COMM)>;
+ source-pdos =
+ <PDO_FIXED(5000, 1500, PDO_FIXED_USB_COMM)>;
+
+ displayport = <&cdn_dp>;
+
+ altmodes {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ altmode@0 {
+ reg = <0>;
+ svid = <0xff01>;
+ vdo = <0xffffffff>;
+ };
+ };
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ usbc0_orien_sw: endpoint {
+ remote-endpoint = <&tcphy0_orientation_switch>;
+ };
+ };
+ port@1 {
+ reg = <1>;
+ dp_mode_sw: endpoint {
+ remote-endpoint = <&tcphy_dp_altmode_switch>;
+ };
+ };
+ };
+ };
};
sensor@0d {
@@ -865,7 +925,6 @@
bq25700: bq25700@6b {//6a
compatible = "ti,bq25703";
reg = <0x6b>;
- extcon = <&fusb0>;
interrupt-parent = <&gpio0>;
interrupts = <5 IRQ_TYPE_LEVEL_LOW>;
@@ -1118,7 +1177,8 @@
&sdio0 {
clock-frequency = <150000000>;
clock-freq-min-max = <200000 150000000>;
- supports-sdio;
+ no-sd;
+ no-mmc;
bus-width = <4>;
disable-wp;
cap-sd-highspeed;
@@ -1136,7 +1196,8 @@
&sdmmc {
clock-frequency = <150000000>;
clock-freq-min-max = <100000 150000000>;
- supports-sd;
+ no-sdio;
+ no-mmc;
bus-width = <4>;
cap-mmc-highspeed;
cap-sd-highspeed;
@@ -1153,7 +1214,8 @@
&sdhci {
bus-width = <8>;
mmc-hs400-1_8v;
- supports-emmc;
+ no-sdio;
+ no-sd;
non-removable;
keep-power-in-suspend;
mmc-hs400-enhanced-strobe;
@@ -1166,8 +1228,22 @@
};
&tcphy0 {
- extcon = <&fusb0>;
status = "okay";
+
+ svid = <0xff01>;
+ orientation-switch;
+ port {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ tcphy0_orientation_switch: endpoint@0 {
+ reg = <0>;
+ remote-endpoint = <&usbc0_orien_sw>;
+ };
+ tcphy_dp_altmode_switch: endpoint@1 {
+ reg = <1>;
+ remote-endpoint = <&dp_mode_sw>;
+ };
+ };
};
&tcphy1 {
@@ -1194,7 +1270,6 @@
&u2phy0 {
status = "okay";
- extcon = <&fusb0>;
u2phy0_otg: otg-port {
status = "okay";
@@ -1228,7 +1303,15 @@
&usbdrd_dwc3_0 {
status = "okay";
- extcon = <&fusb0>;
+ usb-role-switch;
+ port {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ dwc3_0_role_switch: endpoint@0 {
+ reg = <0>;
+ remote-endpoint = <&usbc0_role_sw>;
+ };
+ };
};
&usbdrd_dwc3_1 {
@@ -1321,13 +1404,6 @@
};
};
- fusb30x {
- fusb0_int: fusb0-int {
- rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>,
- <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_up>;
- };
- };
-
mpu6500 {
mpu6500_irq_gpio: mpu6500-irq-gpio {
rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -1411,6 +1487,17 @@
};
};
+ usb-typec {
+ usbc0_int: usbc0-int {
+ rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
+ };
+
+ vcc5v0_typec0_en: vcc5v0-typec0-en {
+ rockchip,pins =
+ <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+ };
+
vcc_sd {
vcc_sd_h: vcc-sd-h {
rockchip,pins =
--
Gitblit v1.6.2