diff --git a/arch/arm64/boot/dts/rockchip/.rk3568-lubancat2-io.dtb.dts.tmp.domain b/arch/arm64/boot/dts/rockchip/.rk3568-lubancat2-io.dtb.dts.tmp.domain new file mode 100644 index 000000000000..9469ef46f185 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/.rk3568-lubancat2-io.dtb.dts.tmp.domain @@ -0,0 +1,7 @@ +PMUIO2 Supply Power Voltage1:3300000 +VCCIO1 Supply Power Voltage1:3300000 +VCCIO3 Supply Power Voltage1:3300000 +VCCIO4 Supply Power Voltage1:1800000 +VCCIO5 Supply Power Voltage1:3300000 +VCCIO6 Supply Power Voltage1:1800000 +VCCIO7 Supply Power Voltage1:3300000 diff --git a/arch/arm64/boot/dts/rockchip/.rk3568-lubancat2.dtb.dts.tmp.domain b/arch/arm64/boot/dts/rockchip/.rk3568-lubancat2.dtb.dts.tmp.domain new file mode 100644 index 000000000000..9469ef46f185 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/.rk3568-lubancat2.dtb.dts.tmp.domain @@ -0,0 +1,7 @@ +PMUIO2 Supply Power Voltage1:3300000 +VCCIO1 Supply Power Voltage1:3300000 +VCCIO3 Supply Power Voltage1:3300000 +VCCIO4 Supply Power Voltage1:1800000 +VCCIO5 Supply Power Voltage1:3300000 +VCCIO6 Supply Power Voltage1:1800000 +VCCIO7 Supply Power Voltage1:3300000 diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile index 049a08a406d9..7bb0c665a6e9 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile @@ -111,4 +111,5 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-nvr-demo-v10-linux.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-nvr-demo-v10-linux-spi-nand.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-nvr-demo-v12-linux.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-nvr-demo-v12-linux-spi-nand.dtb -dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-ebf-lubancat.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-lubancat2.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-lubancat2-io.dtb diff --git a/arch/arm64/boot/dts/rockchip/rk3568-lubancat-dev-cam.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-lubancat2-io-cam.dtsi similarity index 100% rename from arch/arm64/boot/dts/rockchip/rk3568-lubancat-dev-cam.dtsi rename to arch/arm64/boot/dts/rockchip/rk3568-lubancat2-io-cam.dtsi diff --git a/arch/arm64/boot/dts/rockchip/rk3568-lubancat-edp.dts b/arch/arm64/boot/dts/rockchip/rk3568-lubancat2-io-edp.dts similarity index 95% rename from arch/arm64/boot/dts/rockchip/rk3568-lubancat-edp.dts rename to arch/arm64/boot/dts/rockchip/rk3568-lubancat2-io-edp.dts index 81141ab4f476..e1aa02d3aa04 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-lubancat-edp.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-lubancat2-io-edp.dts @@ -7,11 +7,11 @@ /dts-v1/; -#include "rk3568-lubancat-dev.dtsi" +#include "rk3568-lubancat2-io.dtsi" / { - model = "LubanCat-RK3568 HDMI+EDP (Linux)"; - compatible = "rockchip,rk3568-lubancat-edp", "rockchip,rk3568"; + model = "LubanCat2-IO HDMI+EDP"; + compatible = "rockchip,rk3568-lubancat2-io-edp", "rockchip,rk3568"; vcc3v3_lcd_edp: vcc3v3-lcd-edp { compatible = "regulator-fixed"; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-lubancat-mipi.dts b/arch/arm64/boot/dts/rockchip/rk3568-lubancat2-io-mipi.dts similarity index 99% rename from arch/arm64/boot/dts/rockchip/rk3568-lubancat-mipi.dts rename to arch/arm64/boot/dts/rockchip/rk3568-lubancat2-io-mipi.dts index 4b2413c385b4..ce0b3195e658 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-lubancat-mipi.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-lubancat2-io-mipi.dts @@ -6,11 +6,11 @@ /dts-v1/; -#include "rk3568-lubancat-dev.dtsi" +#include "rk3568-lubancat2-io.dtsi" / { - model = "LubanCat-RK3568 HDMI (Linux)"; - compatible = "rockchip,rk3568-lubancat-dev", "rockchip,rk3568"; + model = "LubanCat2-IO HDMI"; + compatible = "rockchip,rk3568-lubancat2-io", "rockchip,rk3568"; backlight: backlight { status = "okay"; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-lubancat-mipi_lcd.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-lubancat2-io-mipi_lcd.dtsi similarity index 97% rename from arch/arm64/boot/dts/rockchip/rk3568-lubancat-mipi_lcd.dtsi rename to arch/arm64/boot/dts/rockchip/rk3568-lubancat2-io-mipi_lcd.dtsi index dc1f7ec75929..d298ad2c488b 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-lubancat-mipi_lcd.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-lubancat2-io-mipi_lcd.dtsi @@ -5,11 +5,11 @@ */ -#include "rk3568-lubancat-dev.dtsi" +#include "rk3568-lubancat2-io.dtsi" / { - model = "LubanCat-RK3568 MIPI (Linux)"; - compatible = "rockchip,rk3568-lubancat-dev", "rockchip,rk3568"; + model = "LubanCat2-IO MIPI"; + compatible = "rockchip,rk3568-lubancat2-io", "rockchip,rk3568"; backlight: backlight { status = "okay"; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-lubancat-dev.dts b/arch/arm64/boot/dts/rockchip/rk3568-lubancat2-io.dts similarity index 53% rename from arch/arm64/boot/dts/rockchip/rk3568-lubancat-dev.dts rename to arch/arm64/boot/dts/rockchip/rk3568-lubancat2-io.dts index 72cbbc4a4d82..b6a9c21955d3 100755 --- a/arch/arm64/boot/dts/rockchip/rk3568-lubancat-dev.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-lubancat2-io.dts @@ -6,12 +6,12 @@ /dts-v1/; -#include "rk3568-lubancat-dev.dtsi" -#include "rk3568-lubancat-dev-cam.dtsi" +#include "rk3568-lubancat2-io.dtsi" +#include "rk3568-lubancat2-io-cam.dtsi" / { - model = "LubanCat-RK3568 HDMI"; - compatible = "rockchip,rk3568-lubancat-dev", "rockchip,rk3568"; + model = "LubanCat2-IO HDMI"; + compatible = "rockchip,rk3568-lubancat2-io", "rockchip,rk3568"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-lubancat-dev.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-lubancat2-io.dtsi similarity index 99% rename from arch/arm64/boot/dts/rockchip/rk3568-lubancat-dev.dtsi rename to arch/arm64/boot/dts/rockchip/rk3568-lubancat2-io.dtsi index 6970adefb9f2..80a40ce94853 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-lubancat-dev.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-lubancat2-io.dtsi @@ -4,7 +4,7 @@ * */ -#include "rk3568-lubancat-port.dtsi" +#include "rk3568-lubancat2-m-port.dtsi" / { diff --git a/arch/arm64/boot/dts/rockchip/rk3568-lubancat-port.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-lubancat2-m-port.dtsi similarity index 99% rename from arch/arm64/boot/dts/rockchip/rk3568-lubancat-port.dtsi rename to arch/arm64/boot/dts/rockchip/rk3568-lubancat2-m-port.dtsi index 9d6653af7421..4b6edf340912 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-lubancat-port.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-lubancat2-m-port.dtsi @@ -8,11 +8,11 @@ #include #include -#include "rk3568-lubancat-core.dtsi" +#include "rk3568-lubancat2-m.dtsi" #include "rk3568-linux.dtsi" / { - compatible = "rockchip,rk3568-lubancat-port", "rockchip,rk3568"; + compatible = "rockchip,lubancat2-m-port", "rockchip,rk3568"; adc_keys: adc-keys { compatible = "adc-keys"; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-lubancat-core.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-lubancat2-m.dtsi similarity index 99% rename from arch/arm64/boot/dts/rockchip/rk3568-lubancat-core.dtsi rename to arch/arm64/boot/dts/rockchip/rk3568-lubancat2-m.dtsi index 68940a90091a..1e3eaac85c7b 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-lubancat-core.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-lubancat2-m.dtsi @@ -16,7 +16,7 @@ / { - compatible = "rockchip,rk3568-lubancat-core", "rockchip,rk3568"; + compatible = "rockchip,lubancat2-m", "rockchip,rk3568"; audiopwmout_diff: audiopwmout-diff { status = "disabled"; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-lubancat-lbc.dts b/arch/arm64/boot/dts/rockchip/rk3568-lubancat2.dts similarity index 99% rename from arch/arm64/boot/dts/rockchip/rk3568-lubancat-lbc.dts rename to arch/arm64/boot/dts/rockchip/rk3568-lubancat2.dts index 89f8b4a95c99..611b3a8bdf74 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-lubancat-lbc.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-lubancat2.dts @@ -15,8 +15,8 @@ #include "rk3568.dtsi" / { - model = "EmbedFire LubanCat-RK3568"; - compatible = "embedfire,lubancat-rk3568", "rockchip,rk3568"; + model = "EmbedFire LubanCat2"; + compatible = "embedfire,lubancat2", "rockchip,rk3568"; chosen: chosen { bootargs = "earlycon=uart8250,mmio32,0xfe660000 console=ttyFIQ0 root=PARTUUID=614e0000-0000 rw rootwait"; @@ -50,7 +50,7 @@ <0x0 0xfd90e000 0x0 0x1000>, <0x0 0xfd90f000 0x0 0x1000>; }; - + reserved-memory { #address-cells = <2>; #size-cells = <2>; @@ -68,7 +68,7 @@ reg = <0x0 0x80900000 0x0 0x100000>; }; }; - + dc_5v: dc-5v { compatible = "regulator-fixed"; regulator-name = "dc_5v"; @@ -77,7 +77,7 @@ regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; }; - + vcc5v0_sys: vcc5v0-sys { compatible = "regulator-fixed"; regulator-name = "vcc5v0_sys"; @@ -1092,7 +1092,7 @@ status = "disabled"; }; -&dsi0 { +&dsi0 { status = "okay"; dsi0_panel: panel@0 { status = "okay"; @@ -1100,7 +1100,7 @@ reg = <0>; backlight = <&backlight>; reset-gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_LOW>; - + enable-delay-ms = <35>; prepare-delay-ms = <6>; reset-delay-ms = <0>; @@ -1114,7 +1114,7 @@ dsi,flags = <(MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST | MIPI_DSI_MODE_LPM | MIPI_DSI_MODE_EOT_PACKET)>; dsi,format = ; dsi,lanes = <4>; - + panel-init-sequence = [ 15 00 04 FF 98 81 03 15 00 02 01 00 @@ -1255,7 +1255,7 @@ 15 00 02 26 76 15 00 02 B2 D1 15 00 02 B5 06 - + 15 00 04 FF 98 81 01 15 00 02 22 0A 15 00 02 31 00 @@ -1307,17 +1307,17 @@ 15 00 02 D1 52 15 00 02 D2 65 15 00 02 D3 3F - + 15 00 04 FF 98 81 00 15 00 02 35 00 15 00 02 3A 70 - 15 78 01 11 + 15 78 01 11 15 19 01 29 - ]; - + ]; + panel-exit-sequence = [ 05 78 01 11 - 05 00 01 29 + 05 00 01 29 ]; disp_timings0: display-timings { @@ -1338,7 +1338,7 @@ pixelclk-active = <0>; }; }; - + ports { #address-cells = <1>; #size-cells = <0>; diff --git a/arch/arm64/configs/lubancat_rk3568_lbc_defconfig b/arch/arm64/configs/rk3568_lubancat2_defconfig similarity index 100% rename from arch/arm64/configs/lubancat_rk3568_lbc_defconfig rename to arch/arm64/configs/rk3568_lubancat2_defconfig diff --git a/arch/arm64/configs/lubancat_rk3568_dev_defconfig b/arch/arm64/configs/rk3568_lubancat2_io_defconfig similarity index 100% rename from arch/arm64/configs/lubancat_rk3568_dev_defconfig rename to arch/arm64/configs/rk3568_lubancat2_io_defconfig