diff --git a/linux/rk3588-mnt-pocket-reform.dts b/linux/rk3588-mnt-pocket-reform.dts index 85f7c1b116d23ae9fe3f3d1c49dad0eb23d002bd..8d418343a02dbec7b7528b2446ea3d8b9fcb11f7 100644 --- a/linux/rk3588-mnt-pocket-reform.dts +++ b/linux/rk3588-mnt-pocket-reform.dts @@ -15,8 +15,8 @@ #include "rk3588.dtsi" / { - model = "MNT Reform Next with RCORE RK3588 Module"; - compatible = "mntre,reform-next-rcore", "firefly,icore3588q", "rockchip,rk3588"; + model = "MNT Pocket Reform with RCORE RK3588 Module"; + compatible = "mntre,pocket-reform-rcore", "firefly,icore3588q", "rockchip,rk3588"; aliases { ethernet0 = &gmac0; @@ -48,14 +48,6 @@ dais = <&i2s0_8ch_p0>; }; - /*backlight: backlight { - compatible = "pwm-backlight"; - pwms = <&pwm8 0 10000 0>; - enable-gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>; - brightness-levels = <0 8 16 32 64 128 160 200 255>; - default-brightness-level = <128>; - };*/ - gmac0_clkin: external-gmac0-clock { compatible = "fixed-clock"; clock-frequency = <125000000>; @@ -195,8 +187,8 @@ }; &display_subsystem { - //clocks = <&hdptxphy_hdmi0>, <&hdptxphy_hdmi1>; - //clock-names = "hdmi0_phy_pll", "hdmi1_phy_pll"; + clocks = <&hdptxphy_hdmi0>, <&hdptxphy_hdmi1>; + clock-names = "hdmi0_phy_pll", "hdmi1_phy_pll"; }; &gmac0 { @@ -239,12 +231,12 @@ }; };*/ -/*&hdptxphy_hdmi0 { +&hdptxphy_hdmi0 { status = "okay"; -};*/ +}; -// external HDMI &hdmi1 { + // external HDMI enable-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>; // D-2 status = "okay"; }; @@ -340,9 +332,7 @@ reg = <0x18>; clocks = <&cru I2S0_8CH_MCLKOUT>; clock-names = "mclk"; - assigned-clocks = <&cru I2S0_8CH_MCLKOUT>; - assigned-clock-rates = <12288000>; - ai31xx-micbias-vg = <2>; // 2.5V + ai31xx-micbias-vg = <2>; #sound-dai-cells = <0>; HPVDD-supply = <&vcc_3v3_s3>; @@ -438,8 +428,7 @@ &sdmmc { bus-width = <4>; - //max-frequency = <48000000>; - max-frequency = <40000000>; + max-frequency = <20000000>; no-sdio; no-mmc; no-1-8-v; @@ -971,10 +960,9 @@ status = "okay"; }; -// FIXME: vop_mmu is currently broken with DSI -/*&vop_mmu { +&vop_mmu { status = "okay"; -};*/ +}; &vop { status = "okay"; @@ -987,10 +975,10 @@ }; }; -/*&vp1 { - vp1_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 { +/*&vp2 { + vp2_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 { reg = <ROCKCHIP_VOP2_EP_HDMI0>; - remote-endpoint = <&hdmi0_in_vp1>; + remote-endpoint = <&hdmi0_in_vp2>; }; };*/ @@ -1006,9 +994,7 @@ // reset is driven by rp2040 // dcdc en is also driven by rp2040 // actually backlight enable - //enable-gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; enable-gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>; - burst-mode; port { mipi_panel_in: endpoint {