From 08f87f769b595151be1afeff53e144f543faa614 Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Wed, 06 Dec 2023 09:51:13 +0000
Subject: [PATCH] add dts config
---
kernel/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi | 68 ++++++++++++----------------------
1 files changed, 24 insertions(+), 44 deletions(-)
diff --git a/kernel/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi b/kernel/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi
index 28db3dd..676062d 100644
--- a/kernel/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi
+++ b/kernel/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi
@@ -3,15 +3,11 @@
* Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd
*/
-/dts-v1/;
#include <dt-bindings/display/drm_mipi_dsi.h>
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include <dt-bindings/pinctrl/rockchip.h>
#include <dt-bindings/sensor-dev.h>
-#include "rk3326.dtsi"
-#include "rk3326-863-cif-sensor.dtsi"
-#include "px30-android.dtsi"
/ {
adc-keys {
@@ -92,32 +88,24 @@
};
rk817-sound {
- compatible = "simple-audio-card";
- simple-audio-card,format = "i2s";
- simple-audio-card,name = "rockchip,rk817-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_2ch>;
- };
- simple-audio-card,codec {
- sound-dai = <&rk817_codec>;
- };
- };
-
- rk_headset: rk-headset {
- compatible = "rockchip_headset";
- headset_gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
+ compatible = "rockchip,multicodecs-card";
+ rockchip,card-name = "rockchip-rk817";
+ hp-det-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
+ io-channels = <&saradc 1>;
+ io-channel-names = "adc-detect";
+ keyup-threshold-microvolt = <1800000>;
+ poll-interval = <100>;
+ rockchip,format = "i2s";
+ rockchip,mclk-fs = <256>;
+ rockchip,cpu = <&i2s1_2ch>;
+ rockchip,codec = <&rk817_codec>;
pinctrl-names = "default";
pinctrl-0 = <&hp_det>;
- io-channels = <&saradc 1>;
+ play-pause-key {
+ label = "playpause";
+ linux,code = <KEY_PLAYPAUSE>;
+ press-threshold-microvolt = <2000>;
+ };
};
sdio_pwrseq: sdio-pwrseq {
@@ -153,6 +141,7 @@
compatible = "wlan-platdata";
wifi_chip_type = "AP6210";
WIFI,host_wake_irq = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>;
+ WIFI,poweren_gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
status = "okay";
};
@@ -316,10 +305,6 @@
status = "okay";
};
-&dsi_in_vopl {
- status = "disabled";
-};
-
&route_dsi {
connect = <&vopb_out_dsi>;
status = "okay";
@@ -338,7 +323,8 @@
bus-width = <8>;
cap-mmc-highspeed;
mmc-hs200-1_8v;
- supports-emmc;
+ no-sdio;
+ no-sd;
disable-wp;
non-removable;
num-slots = <1>;
@@ -793,7 +779,8 @@
bus-width = <4>;
cap-mmc-highspeed;
cap-sd-highspeed;
- supports-sd;
+ no-sdio;
+ no-mmc;
card-detect-delay = <800>;
ignore-pm-notify;
/*cd-gpios = <&gpio2 4 GPIO_ACTIVE_HIGH>; [> CD GPIO <]*/
@@ -809,7 +796,8 @@
&sdio {
bus-width = <4>;
cap-sd-highspeed;
- supports-sdio;
+ no-sd;
+ no-mmc;
ignore-pm-notify;
keep-power-in-suspend;
non-removable;
@@ -820,7 +808,7 @@
&tsadc {
pinctrl-names = "gpio", "otpout";
- pinctrl-0 = <&tsadc_otp_gpio>;
+ pinctrl-0 = <&tsadc_otp_pin>;
pinctrl-1 = <&tsadc_otp_out>;
status = "okay";
};
@@ -852,14 +840,6 @@
};
&vopb_mmu {
- status = "okay";
-};
-
-&vopl {
- status = "okay";
-};
-
-&vopl_mmu {
status = "okay";
};
--
Gitblit v1.6.2