From b22da3d8526a935aa31e086e63f60ff3246cb61c Mon Sep 17 00:00:00 2001 From: hc <hc@nodka.com> Date: Sat, 09 Dec 2023 07:24:11 +0000 Subject: [PATCH] add stmac read mac form eeprom --- kernel/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dtsi | 51 +++++++++++++-------------------------------------- 1 files changed, 13 insertions(+), 38 deletions(-) diff --git a/kernel/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dtsi b/kernel/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dtsi index a527f3d..c7b435a 100644 --- a/kernel/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dtsi +++ b/kernel/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dtsi @@ -83,29 +83,13 @@ }; 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>; + rockchip,format = "i2s"; + rockchip,mclk-fs = <256>; + rockchip,cpu = <&i2s1_2ch>; + rockchip,codec = <&rk817_codec>; pinctrl-names = "default"; pinctrl-0 = <&hp_det>; }; @@ -245,10 +229,6 @@ status = "okay"; }; -&dsi_in_vopl { - status = "disabled"; -}; - &route_dsi { connect = <&vopb_out_dsi>; status = "okay"; @@ -298,7 +278,8 @@ bus-width = <8>; cap-mmc-highspeed; mmc-hs200-1_8v; - supports-emmc; + no-sdio; + no-sd; disable-wp; non-removable; num-slots = <1>; @@ -730,7 +711,8 @@ bus-width = <4>; cap-mmc-highspeed; cap-sd-highspeed; - supports-sd; + no-sdio; + no-mmc; card-detect-delay = <800>; ignore-pm-notify; sd-uhs-sdr12; @@ -745,7 +727,8 @@ &sdio { bus-width = <4>; cap-sd-highspeed; - supports-sdio; + no-sd; + no-mmc; ignore-pm-notify; keep-power-in-suspend; non-removable; @@ -794,14 +777,6 @@ }; &vopb_mmu { - status = "okay"; -}; - -&vopl { - status = "okay"; -}; - -&vopl_mmu { status = "okay"; }; -- Gitblit v1.6.2