diff --git a/patch/kernel/archive/spacemit-6.18/dt/x1_orangepi-r2s.dts b/patch/kernel/archive/spacemit-6.18/dt/x1_orangepi-r2s.dts index aff46c8e44..d22ec4d2d6 100644 --- a/patch/kernel/archive/spacemit-6.18/dt/x1_orangepi-r2s.dts +++ b/patch/kernel/archive/spacemit-6.18/dt/x1_orangepi-r2s.dts @@ -15,7 +15,7 @@ / { model = "ky x1 orangepi-r2s board"; - compatible = "spacemit,orangepi-r2s", "spacemit,k1x"; + compatible = "spacemit,orangepi-r2s", "spacemit,k1-x"; cpus: cpus { #address-cells = <1>; diff --git a/patch/kernel/archive/spacemit-6.18/dt/x1_orangepi-rv2.dts b/patch/kernel/archive/spacemit-6.18/dt/x1_orangepi-rv2.dts index e770fbdc74..9df7207b4c 100644 --- a/patch/kernel/archive/spacemit-6.18/dt/x1_orangepi-rv2.dts +++ b/patch/kernel/archive/spacemit-6.18/dt/x1_orangepi-rv2.dts @@ -15,7 +15,7 @@ / { model = "ky x1 orangepi-rv2 board"; - compatible = "spacemit,orangepi-rv2", "spacemit,k1x"; + compatible = "spacemit,orangepi-rv2", "spacemit,k1-x"; cpus: cpus { #address-cells = <1>; diff --git a/patch/kernel/archive/spacemit-6.18/overlay/Makefile b/patch/kernel/archive/spacemit-6.18/overlay/Makefile index 4988b7122e..5d0b7bdac7 100644 --- a/patch/kernel/archive/spacemit-6.18/overlay/Makefile +++ b/patch/kernel/archive/spacemit-6.18/overlay/Makefile @@ -1,5 +1,15 @@ # SPDX-License-Identifier: GPL-2.0 dtbo-$(CONFIG_SOC_SPACEMIT_K1X) += \ + k1-can0.dtbo \ + k1-i2c3.dtbo \ + k1-i2c4.dtbo \ + k1-lcd.dtbo \ + k1-pwm7.dtbo \ + k1-pwm9.dtbo \ + k1-spi3-cs0-spidev.dtbo \ + k1-uart5.dtbo \ + k1-uart8.dtbo \ + k1-uart9.dtbo \ k1-spacemit-disable-qspi.dtbo \ k1-spacemit-i2c4-pwm7-spi3-uart5.dtbo diff --git a/patch/kernel/archive/spacemit-6.18/overlay/k1-can0.dts b/patch/kernel/archive/spacemit-6.18/overlay/k1-can0.dts new file mode 100644 index 0000000000..ee8cda155e --- /dev/null +++ b/patch/kernel/archive/spacemit-6.18/overlay/k1-can0.dts @@ -0,0 +1,17 @@ +/dts-v1/; +/plugin/; + +// For Orange Pi RV2, but may work on other devices. Origin: +// https://github.com/orangepi-xunlong/linux-orangepi/tree/orange-pi-6.6-ky/arch/riscv/boot/dts/ky/overlay + +/ { + compatible = "spacemit,k1-x"; + + fragment@0 { + target = <&flexcan0>; + + __overlay__ { + status = "okay"; + }; + }; +}; diff --git a/patch/kernel/archive/spacemit-6.18/overlay/k1-i2c3.dts b/patch/kernel/archive/spacemit-6.18/overlay/k1-i2c3.dts new file mode 100644 index 0000000000..1782faad8d --- /dev/null +++ b/patch/kernel/archive/spacemit-6.18/overlay/k1-i2c3.dts @@ -0,0 +1,17 @@ +/dts-v1/; +/plugin/; + +// For Orange Pi RV2, but may work on other devices. Origin: +// https://github.com/orangepi-xunlong/linux-orangepi/tree/orange-pi-6.6-ky/arch/riscv/boot/dts/ky/overlay + +/ { + compatible = "spacemit,k1-x"; + + fragment@0 { + target = <&i2c3>; + + __overlay__ { + status = "okay"; + }; + }; +}; diff --git a/patch/kernel/archive/spacemit-6.18/overlay/k1-i2c4.dts b/patch/kernel/archive/spacemit-6.18/overlay/k1-i2c4.dts new file mode 100644 index 0000000000..e7634813a0 --- /dev/null +++ b/patch/kernel/archive/spacemit-6.18/overlay/k1-i2c4.dts @@ -0,0 +1,17 @@ +/dts-v1/; +/plugin/; + +// For Orange Pi RV2, but may work on other devices. Origin: +// https://github.com/orangepi-xunlong/linux-orangepi/tree/orange-pi-6.6-ky/arch/riscv/boot/dts/ky/overlay + +/ { + compatible = "spacemit,k1-x"; + + fragment@0 { + target = <&i2c4>; + + __overlay__ { + status = "okay"; + }; + }; +}; diff --git a/patch/kernel/archive/spacemit-6.18/overlay/k1-lcd.dts b/patch/kernel/archive/spacemit-6.18/overlay/k1-lcd.dts new file mode 100644 index 0000000000..81aa16062d --- /dev/null +++ b/patch/kernel/archive/spacemit-6.18/overlay/k1-lcd.dts @@ -0,0 +1,33 @@ +/dts-v1/; +/plugin/; + +// For Orange Pi RV2, but may work on other devices. Origin: +// https://github.com/orangepi-xunlong/linux-orangepi/tree/orange-pi-6.6-ky/arch/riscv/boot/dts/ky/overlay + +/ { + compatible = "spacemit,k1-x"; + + fragment@0 { + target = <&dpu_online2_dsi>; + + __overlay__ { + status = "okay"; + }; + }; + + fragment@1 { + target = <&dsi2>; + + __overlay__ { + status = "okay"; + }; + }; + + fragment@2 { + target = <&touchscreen>; + + __overlay__ { + status = "okay"; + }; + }; +}; diff --git a/patch/kernel/archive/spacemit-6.18/overlay/k1-pwm7.dts b/patch/kernel/archive/spacemit-6.18/overlay/k1-pwm7.dts new file mode 100644 index 0000000000..7d86ab7519 --- /dev/null +++ b/patch/kernel/archive/spacemit-6.18/overlay/k1-pwm7.dts @@ -0,0 +1,17 @@ +/dts-v1/; +/plugin/; + +// For Orange Pi RV2, but may work on other devices. Origin: +// https://github.com/orangepi-xunlong/linux-orangepi/tree/orange-pi-6.6-ky/arch/riscv/boot/dts/ky/overlay + +/ { + compatible = "spacemit,k1-x"; + + fragment@0 { + target = <&pwm7>; + + __overlay__ { + status = "okay"; + }; + }; +}; diff --git a/patch/kernel/archive/spacemit-6.18/overlay/k1-pwm9.dts b/patch/kernel/archive/spacemit-6.18/overlay/k1-pwm9.dts new file mode 100644 index 0000000000..e0746c2300 --- /dev/null +++ b/patch/kernel/archive/spacemit-6.18/overlay/k1-pwm9.dts @@ -0,0 +1,17 @@ +/dts-v1/; +/plugin/; + +// For Orange Pi RV2, but may work on other devices. Origin: +// https://github.com/orangepi-xunlong/linux-orangepi/tree/orange-pi-6.6-ky/arch/riscv/boot/dts/ky/overlay + +/ { + compatible = "spacemit,k1-x"; + + fragment@0 { + target = <&rpwm9>; + + __overlay__ { + status = "okay"; + }; + }; +}; diff --git a/patch/kernel/archive/spacemit-6.18/overlay/k1-spi3-cs0-spidev.dts b/patch/kernel/archive/spacemit-6.18/overlay/k1-spi3-cs0-spidev.dts new file mode 100644 index 0000000000..582c6ae0bd --- /dev/null +++ b/patch/kernel/archive/spacemit-6.18/overlay/k1-spi3-cs0-spidev.dts @@ -0,0 +1,17 @@ +/dts-v1/; +/plugin/; + +// For Orange Pi RV2, but may work on other devices. Origin: +// https://github.com/orangepi-xunlong/linux-orangepi/tree/orange-pi-6.6-ky/arch/riscv/boot/dts/ky/overlay + +/ { + compatible = "spacemit,k1-x"; + + fragment@0 { + target = <&spi3>; + + __overlay__ { + status = "okay"; + }; + }; +}; diff --git a/patch/kernel/archive/spacemit-6.18/overlay/k1-uart5.dts b/patch/kernel/archive/spacemit-6.18/overlay/k1-uart5.dts new file mode 100644 index 0000000000..e0bbd2f96a --- /dev/null +++ b/patch/kernel/archive/spacemit-6.18/overlay/k1-uart5.dts @@ -0,0 +1,17 @@ +/dts-v1/; +/plugin/; + +// For Orange Pi RV2, but may work on other devices. Origin: +// https://github.com/orangepi-xunlong/linux-orangepi/tree/orange-pi-6.6-ky/arch/riscv/boot/dts/ky/overlay + +/ { + compatible = "spacemit,k1-x"; + + fragment@0 { + target = <&uart5>; + + __overlay__ { + status = "okay"; + }; + }; +}; diff --git a/patch/kernel/archive/spacemit-6.18/overlay/k1-uart8.dts b/patch/kernel/archive/spacemit-6.18/overlay/k1-uart8.dts new file mode 100644 index 0000000000..5fbc0827c9 --- /dev/null +++ b/patch/kernel/archive/spacemit-6.18/overlay/k1-uart8.dts @@ -0,0 +1,17 @@ +/dts-v1/; +/plugin/; + +// For Orange Pi RV2, but may work on other devices. Origin: +// https://github.com/orangepi-xunlong/linux-orangepi/tree/orange-pi-6.6-ky/arch/riscv/boot/dts/ky/overlay + +/ { + compatible = "spacemit,k1-x"; + + fragment@0 { + target = <&uart8>; + + __overlay__ { + status = "okay"; + }; + }; +}; diff --git a/patch/kernel/archive/spacemit-6.18/overlay/k1-uart9.dts b/patch/kernel/archive/spacemit-6.18/overlay/k1-uart9.dts new file mode 100644 index 0000000000..d210b82322 --- /dev/null +++ b/patch/kernel/archive/spacemit-6.18/overlay/k1-uart9.dts @@ -0,0 +1,17 @@ +/dts-v1/; +/plugin/; + +// For Orange Pi RV2, but may work on other devices. Origin: +// https://github.com/orangepi-xunlong/linux-orangepi/tree/orange-pi-6.6-ky/arch/riscv/boot/dts/ky/overlay + +/ { + compatible = "spacemit,k1-x"; + + fragment@0 { + target = <&uart9>; + + __overlay__ { + status = "okay"; + }; + }; +}; diff --git a/patch/kernel/archive/spacemit-6.6/dt/x1_orangepi-r2s.dts b/patch/kernel/archive/spacemit-6.6/dt/x1_orangepi-r2s.dts index aff46c8e44..d22ec4d2d6 100644 --- a/patch/kernel/archive/spacemit-6.6/dt/x1_orangepi-r2s.dts +++ b/patch/kernel/archive/spacemit-6.6/dt/x1_orangepi-r2s.dts @@ -15,7 +15,7 @@ / { model = "ky x1 orangepi-r2s board"; - compatible = "spacemit,orangepi-r2s", "spacemit,k1x"; + compatible = "spacemit,orangepi-r2s", "spacemit,k1-x"; cpus: cpus { #address-cells = <1>; diff --git a/patch/kernel/archive/spacemit-6.6/dt/x1_orangepi-rv2.dts b/patch/kernel/archive/spacemit-6.6/dt/x1_orangepi-rv2.dts index c3c916571b..a90202024d 100644 --- a/patch/kernel/archive/spacemit-6.6/dt/x1_orangepi-rv2.dts +++ b/patch/kernel/archive/spacemit-6.6/dt/x1_orangepi-rv2.dts @@ -15,7 +15,7 @@ / { model = "ky x1 orangepi-rv2 board"; - compatible = "spacemit,orangepi-rv2", "spacemit,k1x"; + compatible = "spacemit,orangepi-rv2", "spacemit,k1-x"; cpus: cpus { #address-cells = <1>; diff --git a/patch/kernel/archive/spacemit-6.6/overlay/Makefile b/patch/kernel/archive/spacemit-6.6/overlay/Makefile index 0bbe8a6b94..de119f7b84 100644 --- a/patch/kernel/archive/spacemit-6.6/overlay/Makefile +++ b/patch/kernel/archive/spacemit-6.6/overlay/Makefile @@ -1,5 +1,15 @@ # SPDX-License-Identifier: GPL-2.0 dtbo-$(CONFIG_ARCH_RV64I) += \ + k1-can0.dtbo \ + k1-i2c3.dtbo \ + k1-i2c4.dtbo \ + k1-lcd.dtbo \ + k1-pwm7.dtbo \ + k1-pwm9.dtbo \ + k1-spi3-cs0-spidev.dtbo \ + k1-uart5.dtbo \ + k1-uart8.dtbo \ + k1-uart9.dtbo \ k1-spacemit-disable-qspi.dtbo \ k1-spacemit-i2c4-pwm7-spi3-uart5.dtbo diff --git a/patch/kernel/archive/spacemit-6.6/overlay/k1-can0.dts b/patch/kernel/archive/spacemit-6.6/overlay/k1-can0.dts new file mode 100644 index 0000000000..ee8cda155e --- /dev/null +++ b/patch/kernel/archive/spacemit-6.6/overlay/k1-can0.dts @@ -0,0 +1,17 @@ +/dts-v1/; +/plugin/; + +// For Orange Pi RV2, but may work on other devices. Origin: +// https://github.com/orangepi-xunlong/linux-orangepi/tree/orange-pi-6.6-ky/arch/riscv/boot/dts/ky/overlay + +/ { + compatible = "spacemit,k1-x"; + + fragment@0 { + target = <&flexcan0>; + + __overlay__ { + status = "okay"; + }; + }; +}; diff --git a/patch/kernel/archive/spacemit-6.6/overlay/k1-i2c3.dts b/patch/kernel/archive/spacemit-6.6/overlay/k1-i2c3.dts new file mode 100644 index 0000000000..1782faad8d --- /dev/null +++ b/patch/kernel/archive/spacemit-6.6/overlay/k1-i2c3.dts @@ -0,0 +1,17 @@ +/dts-v1/; +/plugin/; + +// For Orange Pi RV2, but may work on other devices. Origin: +// https://github.com/orangepi-xunlong/linux-orangepi/tree/orange-pi-6.6-ky/arch/riscv/boot/dts/ky/overlay + +/ { + compatible = "spacemit,k1-x"; + + fragment@0 { + target = <&i2c3>; + + __overlay__ { + status = "okay"; + }; + }; +}; diff --git a/patch/kernel/archive/spacemit-6.6/overlay/k1-i2c4.dts b/patch/kernel/archive/spacemit-6.6/overlay/k1-i2c4.dts new file mode 100644 index 0000000000..e7634813a0 --- /dev/null +++ b/patch/kernel/archive/spacemit-6.6/overlay/k1-i2c4.dts @@ -0,0 +1,17 @@ +/dts-v1/; +/plugin/; + +// For Orange Pi RV2, but may work on other devices. Origin: +// https://github.com/orangepi-xunlong/linux-orangepi/tree/orange-pi-6.6-ky/arch/riscv/boot/dts/ky/overlay + +/ { + compatible = "spacemit,k1-x"; + + fragment@0 { + target = <&i2c4>; + + __overlay__ { + status = "okay"; + }; + }; +}; diff --git a/patch/kernel/archive/spacemit-6.6/overlay/k1-lcd.dts b/patch/kernel/archive/spacemit-6.6/overlay/k1-lcd.dts new file mode 100644 index 0000000000..81aa16062d --- /dev/null +++ b/patch/kernel/archive/spacemit-6.6/overlay/k1-lcd.dts @@ -0,0 +1,33 @@ +/dts-v1/; +/plugin/; + +// For Orange Pi RV2, but may work on other devices. Origin: +// https://github.com/orangepi-xunlong/linux-orangepi/tree/orange-pi-6.6-ky/arch/riscv/boot/dts/ky/overlay + +/ { + compatible = "spacemit,k1-x"; + + fragment@0 { + target = <&dpu_online2_dsi>; + + __overlay__ { + status = "okay"; + }; + }; + + fragment@1 { + target = <&dsi2>; + + __overlay__ { + status = "okay"; + }; + }; + + fragment@2 { + target = <&touchscreen>; + + __overlay__ { + status = "okay"; + }; + }; +}; diff --git a/patch/kernel/archive/spacemit-6.6/overlay/k1-pwm7.dts b/patch/kernel/archive/spacemit-6.6/overlay/k1-pwm7.dts new file mode 100644 index 0000000000..7d86ab7519 --- /dev/null +++ b/patch/kernel/archive/spacemit-6.6/overlay/k1-pwm7.dts @@ -0,0 +1,17 @@ +/dts-v1/; +/plugin/; + +// For Orange Pi RV2, but may work on other devices. Origin: +// https://github.com/orangepi-xunlong/linux-orangepi/tree/orange-pi-6.6-ky/arch/riscv/boot/dts/ky/overlay + +/ { + compatible = "spacemit,k1-x"; + + fragment@0 { + target = <&pwm7>; + + __overlay__ { + status = "okay"; + }; + }; +}; diff --git a/patch/kernel/archive/spacemit-6.6/overlay/k1-pwm9.dts b/patch/kernel/archive/spacemit-6.6/overlay/k1-pwm9.dts new file mode 100644 index 0000000000..e0746c2300 --- /dev/null +++ b/patch/kernel/archive/spacemit-6.6/overlay/k1-pwm9.dts @@ -0,0 +1,17 @@ +/dts-v1/; +/plugin/; + +// For Orange Pi RV2, but may work on other devices. Origin: +// https://github.com/orangepi-xunlong/linux-orangepi/tree/orange-pi-6.6-ky/arch/riscv/boot/dts/ky/overlay + +/ { + compatible = "spacemit,k1-x"; + + fragment@0 { + target = <&rpwm9>; + + __overlay__ { + status = "okay"; + }; + }; +}; diff --git a/patch/kernel/archive/spacemit-6.6/overlay/k1-spi3-cs0-spidev.dts b/patch/kernel/archive/spacemit-6.6/overlay/k1-spi3-cs0-spidev.dts new file mode 100644 index 0000000000..582c6ae0bd --- /dev/null +++ b/patch/kernel/archive/spacemit-6.6/overlay/k1-spi3-cs0-spidev.dts @@ -0,0 +1,17 @@ +/dts-v1/; +/plugin/; + +// For Orange Pi RV2, but may work on other devices. Origin: +// https://github.com/orangepi-xunlong/linux-orangepi/tree/orange-pi-6.6-ky/arch/riscv/boot/dts/ky/overlay + +/ { + compatible = "spacemit,k1-x"; + + fragment@0 { + target = <&spi3>; + + __overlay__ { + status = "okay"; + }; + }; +}; diff --git a/patch/kernel/archive/spacemit-6.6/overlay/k1-uart5.dts b/patch/kernel/archive/spacemit-6.6/overlay/k1-uart5.dts new file mode 100644 index 0000000000..e0bbd2f96a --- /dev/null +++ b/patch/kernel/archive/spacemit-6.6/overlay/k1-uart5.dts @@ -0,0 +1,17 @@ +/dts-v1/; +/plugin/; + +// For Orange Pi RV2, but may work on other devices. Origin: +// https://github.com/orangepi-xunlong/linux-orangepi/tree/orange-pi-6.6-ky/arch/riscv/boot/dts/ky/overlay + +/ { + compatible = "spacemit,k1-x"; + + fragment@0 { + target = <&uart5>; + + __overlay__ { + status = "okay"; + }; + }; +}; diff --git a/patch/kernel/archive/spacemit-6.6/overlay/k1-uart8.dts b/patch/kernel/archive/spacemit-6.6/overlay/k1-uart8.dts new file mode 100644 index 0000000000..5fbc0827c9 --- /dev/null +++ b/patch/kernel/archive/spacemit-6.6/overlay/k1-uart8.dts @@ -0,0 +1,17 @@ +/dts-v1/; +/plugin/; + +// For Orange Pi RV2, but may work on other devices. Origin: +// https://github.com/orangepi-xunlong/linux-orangepi/tree/orange-pi-6.6-ky/arch/riscv/boot/dts/ky/overlay + +/ { + compatible = "spacemit,k1-x"; + + fragment@0 { + target = <&uart8>; + + __overlay__ { + status = "okay"; + }; + }; +}; diff --git a/patch/kernel/archive/spacemit-6.6/overlay/k1-uart9.dts b/patch/kernel/archive/spacemit-6.6/overlay/k1-uart9.dts new file mode 100644 index 0000000000..d210b82322 --- /dev/null +++ b/patch/kernel/archive/spacemit-6.6/overlay/k1-uart9.dts @@ -0,0 +1,17 @@ +/dts-v1/; +/plugin/; + +// For Orange Pi RV2, but may work on other devices. Origin: +// https://github.com/orangepi-xunlong/linux-orangepi/tree/orange-pi-6.6-ky/arch/riscv/boot/dts/ky/overlay + +/ { + compatible = "spacemit,k1-x"; + + fragment@0 { + target = <&uart9>; + + __overlay__ { + status = "okay"; + }; + }; +};