diff --git a/config/kernel/linux-rockchip-edge.config b/config/kernel/linux-rockchip-edge.config index 03d738ced..312332355 100644 --- a/config/kernel/linux-rockchip-edge.config +++ b/config/kernel/linux-rockchip-edge.config @@ -86,7 +86,6 @@ CONFIG_ZSWAP=y CONFIG_ZSWAP_DEFAULT_ON=y CONFIG_ZSWAP_SHRINKER_DEFAULT_ON=y CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD=y -CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y # CONFIG_COMPAT_BRK is not set CONFIG_KSM=y CONFIG_CMA=y @@ -777,10 +776,11 @@ CONFIG_RTL8XXXU=m CONFIG_RTW88=m CONFIG_RTW88_8822BU=m CONFIG_RTW88_8822CU=m +CONFIG_RTW88_8723DS=m +CONFIG_RTW88_8723CS=m CONFIG_RTW88_8723DU=m CONFIG_RTW88_8821CU=m CONFIG_RTW89=m -CONFIG_RTL8723DS=m CONFIG_RTL8192EU=m CONFIG_RTL8189ES=m CONFIG_ZD1211RW=m @@ -1245,11 +1245,6 @@ CONFIG_HID_ICADE=m CONFIG_HID_TWINHAN=m CONFIG_HID_KENSINGTON=m CONFIG_HID_LCPOWER=m -CONFIG_HID_LOGITECH=m -CONFIG_HID_LOGITECH_DJ=m -CONFIG_LOGITECH_FF=y -CONFIG_LOGIRUMBLEPAD2_FF=y -CONFIG_LOGIG940_FF=y CONFIG_HID_MAGICMOUSE=m CONFIG_HID_MALTRON=m CONFIG_HID_MICROSOFT=m @@ -1535,7 +1530,6 @@ CONFIG_FB_TFT_TLS8204=m CONFIG_FB_TFT_UC1611=m CONFIG_FB_TFT_UC1701=m CONFIG_FB_TFT_UPD161704=m -CONFIG_RTL8723CS=m CONFIG_COMMON_CLK_MAX9485=m CONFIG_COMMON_CLK_RK808=y CONFIG_COMMON_CLK_SCMI=m @@ -1692,7 +1686,6 @@ CONFIG_SQUASHFS_EMBEDDED=y CONFIG_PSTORE=y CONFIG_PSTORE_CONSOLE=y CONFIG_PSTORE_RAM=y -CONFIG_SYSV_FS=m CONFIG_UFS_FS=m CONFIG_EROFS_FS=m # CONFIG_EROFS_FS_ZIP is not set @@ -1726,7 +1719,6 @@ CONFIG_CIFS_POSIX=y CONFIG_CIFS_FSCACHE=y CONFIG_CIFS_COMPRESSION=y CONFIG_SMB_SERVER=m -CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_NLS_DEFAULT="utf8" CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_CODEPAGE_850=y @@ -1799,8 +1791,6 @@ CONFIG_CRYPTO_DEV_ROCKCHIP_DEBUG=y CONFIG_CRYPTO_DEV_VIRTIO=m CONFIG_CRYPTO_DEV_SAFEXCEL=m CONFIG_CRYPTO_DEV_CCREE=m -CONFIG_CRC4=m -CONFIG_CRC7=m CONFIG_DMA_CMA=y CONFIG_IRQ_POLL=y CONFIG_PRINTK_TIME=y @@ -1812,7 +1802,6 @@ CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0 # CONFIG_SLUB_DEBUG is not set CONFIG_DETECT_HUNG_TASK=y CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y -# CONFIG_SCHED_DEBUG is not set CONFIG_SCHEDSTATS=y CONFIG_STACKTRACE=y CONFIG_RCU_CPU_STALL_TIMEOUT=60 diff --git a/config/sources/families/rockchip.conf b/config/sources/families/rockchip.conf index d3923093f..498dd1c03 100644 --- a/config/sources/families/rockchip.conf +++ b/config/sources/families/rockchip.conf @@ -56,7 +56,7 @@ case $BRANCH in edge) - declare -g KERNEL_MAJOR_MINOR="6.14" # Major and minor versions of this kernel. + declare -g KERNEL_MAJOR_MINOR="6.15" # Major and minor versions of this kernel. ;; esac diff --git a/patch/kernel/archive/rockchip-6.14/0000.patching_config.yaml b/patch/kernel/archive/rockchip-6.15/0000.patching_config.yaml similarity index 95% rename from patch/kernel/archive/rockchip-6.14/0000.patching_config.yaml rename to patch/kernel/archive/rockchip-6.15/0000.patching_config.yaml index 852001494..51feb9599 100644 --- a/patch/kernel/archive/rockchip-6.14/0000.patching_config.yaml +++ b/patch/kernel/archive/rockchip-6.15/0000.patching_config.yaml @@ -1,10 +1,10 @@ config: # Just some info stuff; not used by the patching scripts - name: rockchip-6.14 + name: rockchip-6.15 kind: kernel type: mainline # or: vendor - branch: linux-6.14.y - last-known-good-tag: v6.14 + branch: linux-6.15.y + last-known-good-tag: v6.15.0 maintainers: - { github: paolo.sabatino, name: Paolo Sabatino, email: paolo.sabatino@gmail.com, armbian-forum: jock } diff --git a/patch/kernel/archive/rockchip-6.14/armbian.series b/patch/kernel/archive/rockchip-6.15/armbian.series similarity index 100% rename from patch/kernel/archive/rockchip-6.14/armbian.series rename to patch/kernel/archive/rockchip-6.15/armbian.series diff --git a/patch/kernel/archive/rockchip-6.14/dt/rk322x-box.dts b/patch/kernel/archive/rockchip-6.15/dt/rk322x-box.dts similarity index 100% rename from patch/kernel/archive/rockchip-6.14/dt/rk322x-box.dts rename to patch/kernel/archive/rockchip-6.15/dt/rk322x-box.dts diff --git a/patch/kernel/archive/rockchip-6.14/dt/rk3288-xt-q8l-v10.dts b/patch/kernel/archive/rockchip-6.15/dt/rk3288-xt-q8l-v10.dts similarity index 100% rename from patch/kernel/archive/rockchip-6.14/dt/rk3288-xt-q8l-v10.dts rename to patch/kernel/archive/rockchip-6.15/dt/rk3288-xt-q8l-v10.dts diff --git a/patch/kernel/archive/rockchip-6.14/kernel-6.8-tools-cgroup-makefile.patch b/patch/kernel/archive/rockchip-6.15/kernel-6.8-tools-cgroup-makefile.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/kernel-6.8-tools-cgroup-makefile.patch rename to patch/kernel/archive/rockchip-6.15/kernel-6.8-tools-cgroup-makefile.patch diff --git a/patch/kernel/archive/rockchip-6.14/libreelec.series b/patch/kernel/archive/rockchip-6.15/libreelec.series similarity index 100% rename from patch/kernel/archive/rockchip-6.14/libreelec.series rename to patch/kernel/archive/rockchip-6.15/libreelec.series diff --git a/patch/kernel/archive/rockchip-6.14/overlay/Makefile b/patch/kernel/archive/rockchip-6.15/overlay/Makefile similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/Makefile rename to patch/kernel/archive/rockchip-6.15/overlay/Makefile diff --git a/patch/kernel/archive/rockchip-6.14/overlay/README.rk322x-overlays b/patch/kernel/archive/rockchip-6.15/overlay/README.rk322x-overlays similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/README.rk322x-overlays rename to patch/kernel/archive/rockchip-6.15/overlay/README.rk322x-overlays diff --git a/patch/kernel/archive/rockchip-6.14/overlay/README.rockchip-overlays b/patch/kernel/archive/rockchip-6.15/overlay/README.rockchip-overlays similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/README.rockchip-overlays rename to patch/kernel/archive/rockchip-6.15/overlay/README.rockchip-overlays diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rk322x-bt-8723cs.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rk322x-bt-8723cs.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rk322x-bt-8723cs.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rk322x-bt-8723cs.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rk322x-cpu-hs-lv.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rk322x-cpu-hs-lv.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rk322x-cpu-hs-lv.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rk322x-cpu-hs-lv.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rk322x-cpu-hs.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rk322x-cpu-hs.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rk322x-cpu-hs.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rk322x-cpu-hs.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rk322x-cpu-stability.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rk322x-cpu-stability.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rk322x-cpu-stability.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rk322x-cpu-stability.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rk322x-ddr3-330.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rk322x-ddr3-330.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rk322x-ddr3-330.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rk322x-ddr3-330.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rk322x-ddr3-528.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rk322x-ddr3-528.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rk322x-ddr3-528.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rk322x-ddr3-528.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rk322x-ddr3-660.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rk322x-ddr3-660.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rk322x-ddr3-660.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rk322x-ddr3-660.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rk322x-ddr3-800.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rk322x-ddr3-800.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rk322x-ddr3-800.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rk322x-ddr3-800.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rk322x-emmc-ddr-ph180.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rk322x-emmc-ddr-ph180.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rk322x-emmc-ddr-ph180.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rk322x-emmc-ddr-ph180.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rk322x-emmc-ddr-ph45.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rk322x-emmc-ddr-ph45.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rk322x-emmc-ddr-ph45.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rk322x-emmc-ddr-ph45.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rk322x-emmc-hs200.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rk322x-emmc-hs200.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rk322x-emmc-hs200.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rk322x-emmc-hs200.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rk322x-emmc-pins.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rk322x-emmc-pins.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rk322x-emmc-pins.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rk322x-emmc-pins.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rk322x-emmc.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rk322x-emmc.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rk322x-emmc.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rk322x-emmc.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rk322x-fixup.scr-cmd b/patch/kernel/archive/rockchip-6.15/overlay/rk322x-fixup.scr-cmd similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rk322x-fixup.scr-cmd rename to patch/kernel/archive/rockchip-6.15/overlay/rk322x-fixup.scr-cmd diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rk322x-ir-wakeup.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rk322x-ir-wakeup.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rk322x-ir-wakeup.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rk322x-ir-wakeup.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rk322x-led-conf-default.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rk322x-led-conf-default.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rk322x-led-conf-default.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rk322x-led-conf-default.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rk322x-led-conf1.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rk322x-led-conf1.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rk322x-led-conf1.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rk322x-led-conf1.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rk322x-led-conf2.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rk322x-led-conf2.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rk322x-led-conf2.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rk322x-led-conf2.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rk322x-led-conf3.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rk322x-led-conf3.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rk322x-led-conf3.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rk322x-led-conf3.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rk322x-led-conf4.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rk322x-led-conf4.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rk322x-led-conf4.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rk322x-led-conf4.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rk322x-led-conf5.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rk322x-led-conf5.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rk322x-led-conf5.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rk322x-led-conf5.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rk322x-led-conf6.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rk322x-led-conf6.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rk322x-led-conf6.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rk322x-led-conf6.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rk322x-led-conf7.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rk322x-led-conf7.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rk322x-led-conf7.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rk322x-led-conf7.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rk322x-led-conf8.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rk322x-led-conf8.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rk322x-led-conf8.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rk322x-led-conf8.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rk322x-nand.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rk322x-nand.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rk322x-nand.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rk322x-nand.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rk322x-usb-otg-peripheral.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rk322x-usb-otg-peripheral.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rk322x-usb-otg-peripheral.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rk322x-usb-otg-peripheral.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rk322x-wlan-alt-wiring.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rk322x-wlan-alt-wiring.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rk322x-wlan-alt-wiring.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rk322x-wlan-alt-wiring.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rockchip-ds1307.dtbo b/patch/kernel/archive/rockchip-6.15/overlay/rockchip-ds1307.dtbo similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rockchip-ds1307.dtbo rename to patch/kernel/archive/rockchip-6.15/overlay/rockchip-ds1307.dtbo diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rockchip-ds1307.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rockchip-ds1307.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rockchip-ds1307.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rockchip-ds1307.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rockchip-fixup.scr-cmd b/patch/kernel/archive/rockchip-6.15/overlay/rockchip-fixup.scr-cmd similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rockchip-fixup.scr-cmd rename to patch/kernel/archive/rockchip-6.15/overlay/rockchip-fixup.scr-cmd diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rockchip-i2c1.dtbo b/patch/kernel/archive/rockchip-6.15/overlay/rockchip-i2c1.dtbo similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rockchip-i2c1.dtbo rename to patch/kernel/archive/rockchip-6.15/overlay/rockchip-i2c1.dtbo diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rockchip-i2c1.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rockchip-i2c1.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rockchip-i2c1.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rockchip-i2c1.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rockchip-i2c4.dtbo b/patch/kernel/archive/rockchip-6.15/overlay/rockchip-i2c4.dtbo similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rockchip-i2c4.dtbo rename to patch/kernel/archive/rockchip-6.15/overlay/rockchip-i2c4.dtbo diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rockchip-i2c4.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rockchip-i2c4.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rockchip-i2c4.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rockchip-i2c4.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rockchip-pwm1.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rockchip-pwm1.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rockchip-pwm1.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rockchip-pwm1.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rockchip-pwm2.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rockchip-pwm2.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rockchip-pwm2.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rockchip-pwm2.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rockchip-pwm3.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rockchip-pwm3.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rockchip-pwm3.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rockchip-pwm3.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rockchip-spi0.dtbo b/patch/kernel/archive/rockchip-6.15/overlay/rockchip-spi0.dtbo similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rockchip-spi0.dtbo rename to patch/kernel/archive/rockchip-6.15/overlay/rockchip-spi0.dtbo diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rockchip-spi0.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rockchip-spi0.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rockchip-spi0.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rockchip-spi0.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rockchip-spi2.dtbo b/patch/kernel/archive/rockchip-6.15/overlay/rockchip-spi2.dtbo similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rockchip-spi2.dtbo rename to patch/kernel/archive/rockchip-6.15/overlay/rockchip-spi2.dtbo diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rockchip-spi2.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rockchip-spi2.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rockchip-spi2.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rockchip-spi2.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rockchip-spidev0.dtbo b/patch/kernel/archive/rockchip-6.15/overlay/rockchip-spidev0.dtbo similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rockchip-spidev0.dtbo rename to patch/kernel/archive/rockchip-6.15/overlay/rockchip-spidev0.dtbo diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rockchip-spidev0.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rockchip-spidev0.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rockchip-spidev0.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rockchip-spidev0.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rockchip-spidev2.dtbo b/patch/kernel/archive/rockchip-6.15/overlay/rockchip-spidev2.dtbo similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rockchip-spidev2.dtbo rename to patch/kernel/archive/rockchip-6.15/overlay/rockchip-spidev2.dtbo diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rockchip-spidev2.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rockchip-spidev2.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rockchip-spidev2.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rockchip-spidev2.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rockchip-uart1.dtbo b/patch/kernel/archive/rockchip-6.15/overlay/rockchip-uart1.dtbo similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rockchip-uart1.dtbo rename to patch/kernel/archive/rockchip-6.15/overlay/rockchip-uart1.dtbo diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rockchip-uart1.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rockchip-uart1.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rockchip-uart1.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rockchip-uart1.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rockchip-uart2.dtbo b/patch/kernel/archive/rockchip-6.15/overlay/rockchip-uart2.dtbo similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rockchip-uart2.dtbo rename to patch/kernel/archive/rockchip-6.15/overlay/rockchip-uart2.dtbo diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rockchip-uart2.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rockchip-uart2.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rockchip-uart2.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rockchip-uart2.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rockchip-uart3.dtbo b/patch/kernel/archive/rockchip-6.15/overlay/rockchip-uart3.dtbo similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rockchip-uart3.dtbo rename to patch/kernel/archive/rockchip-6.15/overlay/rockchip-uart3.dtbo diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rockchip-uart3.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rockchip-uart3.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rockchip-uart3.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rockchip-uart3.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rockchip-uart4.dtbo b/patch/kernel/archive/rockchip-6.15/overlay/rockchip-uart4.dtbo similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rockchip-uart4.dtbo rename to patch/kernel/archive/rockchip-6.15/overlay/rockchip-uart4.dtbo diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rockchip-uart4.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rockchip-uart4.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rockchip-uart4.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rockchip-uart4.dtso diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rockchip-w1-gpio.dtbo b/patch/kernel/archive/rockchip-6.15/overlay/rockchip-w1-gpio.dtbo similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rockchip-w1-gpio.dtbo rename to patch/kernel/archive/rockchip-6.15/overlay/rockchip-w1-gpio.dtbo diff --git a/patch/kernel/archive/rockchip-6.14/overlay/rockchip-w1-gpio.dtso b/patch/kernel/archive/rockchip-6.15/overlay/rockchip-w1-gpio.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.14/overlay/rockchip-w1-gpio.dtso rename to patch/kernel/archive/rockchip-6.15/overlay/rockchip-w1-gpio.dtso diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/bt-broadcom-serdev-workaround.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/bt-broadcom-serdev-workaround.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/bt-broadcom-serdev-workaround.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/bt-broadcom-serdev-workaround.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/clk-rk322x-composite-mmc-clk.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/clk-rk322x-composite-mmc-clk.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/clk-rk322x-composite-mmc-clk.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/clk-rk322x-composite-mmc-clk.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/clk-rockchip-max-frac-divider.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/clk-rockchip-max-frac-divider.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/clk-rockchip-max-frac-divider.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/clk-rockchip-max-frac-divider.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/driver-rk322x-audio-codec.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/driver-rk322x-audio-codec.patch similarity index 99% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/driver-rk322x-audio-codec.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/driver-rk322x-audio-codec.patch index a3c56bcf1..a4492b9d3 100644 --- a/patch/kernel/archive/rockchip-6.14/patches.armbian/driver-rk322x-audio-codec.patch +++ b/patch/kernel/archive/rockchip-6.15/patches.armbian/driver-rk322x-audio-codec.patch @@ -212,10 +212,10 @@ index 000000000000..197e7e2e0d8b + unsigned int val = 0; + + switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { -+ case SND_SOC_DAIFMT_CBS_CFS: ++ case SND_SOC_DAIFMT_CBC_CFC: + val |= PIN_DIRECTION_IN | DAC_I2S_MODE_SLAVE; + break; -+ case SND_SOC_DAIFMT_CBM_CFM: ++ case SND_SOC_DAIFMT_CBP_CFP: + val |= PIN_DIRECTION_OUT | DAC_I2S_MODE_MASTER; + break; + default: diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/driver-rk3288-gpiomem.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/driver-rk3288-gpiomem.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/driver-rk3288-gpiomem.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/driver-rk3288-gpiomem.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/driver-tinkerboard-alc4040-codec.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/driver-tinkerboard-alc4040-codec.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/driver-tinkerboard-alc4040-codec.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/driver-tinkerboard-alc4040-codec.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/drm-rk322x-plane-overlay.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/drm-rk322x-plane-overlay.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/drm-rk322x-plane-overlay.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/drm-rk322x-plane-overlay.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/drm-rk322x-yuv-10bit-modes.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/drm-rk322x-yuv-10bit-modes.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/drm-rk322x-yuv-10bit-modes.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/drm-rk322x-yuv-10bit-modes.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/drm-rockchip-hardware-cursor.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/drm-rockchip-hardware-cursor.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/drm-rockchip-hardware-cursor.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/drm-rockchip-hardware-cursor.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/dts-miqi-fan.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/dts-miqi-fan.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/dts-miqi-fan.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/dts-miqi-fan.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/dts-miqi-hevc-rga.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/dts-miqi-hevc-rga.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/dts-miqi-hevc-rga.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/dts-miqi-hevc-rga.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/dts-miqi-mali-gpu.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/dts-miqi-mali-gpu.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/dts-miqi-mali-gpu.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/dts-miqi-mali-gpu.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/dts-miqi-regulator-fix.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/dts-miqi-regulator-fix.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/dts-miqi-regulator-fix.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/dts-miqi-regulator-fix.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/dts-rk322x-iep-node.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/dts-rk322x-iep-node.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/dts-rk322x-iep-node.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/dts-rk322x-iep-node.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/dts-rk322x-pinctrl-nand.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/dts-rk322x-pinctrl-nand.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/dts-rk322x-pinctrl-nand.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/dts-rk322x-pinctrl-nand.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/dts-rk3288-disable-serial-dma.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/dts-rk3288-disable-serial-dma.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/dts-rk3288-disable-serial-dma.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/dts-rk3288-disable-serial-dma.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/dts-rk3288-fix-mmc-aliases.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/dts-rk3288-fix-mmc-aliases.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/dts-rk3288-fix-mmc-aliases.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/dts-rk3288-fix-mmc-aliases.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/dts-rk3288-gpu-500mhz-opp.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/dts-rk3288-gpu-500mhz-opp.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/dts-rk3288-gpu-500mhz-opp.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/dts-rk3288-gpu-500mhz-opp.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/dts-rk3288-pinctrl-spi2.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/dts-rk3288-pinctrl-spi2.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/dts-rk3288-pinctrl-spi2.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/dts-rk3288-pinctrl-spi2.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/dts-rk3288-thermal-rearrange-zones.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/dts-rk3288-thermal-rearrange-zones.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/dts-rk3288-thermal-rearrange-zones.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/dts-rk3288-thermal-rearrange-zones.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/dts-tinkerboard-bt-rtl8723bs.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/dts-tinkerboard-bt-rtl8723bs.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/dts-tinkerboard-bt-rtl8723bs.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/dts-tinkerboard-bt-rtl8723bs.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/dts-tinkerboard-bt-uart-pins.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/dts-tinkerboard-bt-uart-pins.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/dts-tinkerboard-bt-uart-pins.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/dts-tinkerboard-bt-uart-pins.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/dts-tinkerboard-hevc-rga.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/dts-tinkerboard-hevc-rga.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/dts-tinkerboard-hevc-rga.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/dts-tinkerboard-hevc-rga.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/dts-tinkerboard-sdio-wifi.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/dts-tinkerboard-sdio-wifi.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/dts-tinkerboard-sdio-wifi.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/dts-tinkerboard-sdio-wifi.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/dts-tinkerboard-sdmmc-properties.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/dts-tinkerboard-sdmmc-properties.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/dts-tinkerboard-sdmmc-properties.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/dts-tinkerboard-sdmmc-properties.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/dts-tinkerboard-spi-interface.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/dts-tinkerboard-spi-interface.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/dts-tinkerboard-spi-interface.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/dts-tinkerboard-spi-interface.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/dts-veyron-flag-cache-flush.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/dts-veyron-flag-cache-flush.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/dts-veyron-flag-cache-flush.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/dts-veyron-flag-cache-flush.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/general-add-overlay-compilation-support.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/general-add-overlay-compilation-support.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/general-add-overlay-compilation-support.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/general-add-overlay-compilation-support.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/general-add-overlay-configfs.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/general-add-overlay-configfs.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/general-add-overlay-configfs.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/general-add-overlay-configfs.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/general-add-restart-handler-for-act8846.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/general-add-restart-handler-for-act8846.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/general-add-restart-handler-for-act8846.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/general-add-restart-handler-for-act8846.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/general-dwc2-fix-rk3288-reset-on-wake-quirk.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/general-dwc2-fix-rk3288-reset-on-wake-quirk.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/general-dwc2-fix-rk3288-reset-on-wake-quirk.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/general-dwc2-fix-rk3288-reset-on-wake-quirk.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/general-dwc2-fix-wait-peripheral.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/general-dwc2-fix-wait-peripheral.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/general-dwc2-fix-wait-peripheral.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/general-dwc2-fix-wait-peripheral.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/general-dwc2-fix-wait-time.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/general-dwc2-fix-wait-time.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/general-dwc2-fix-wait-time.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/general-dwc2-fix-wait-time.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/general-dwc2-nak-gadget.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/general-dwc2-nak-gadget.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/general-dwc2-nak-gadget.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/general-dwc2-nak-gadget.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/general-fix-reboot-from-kwiboo.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/general-fix-reboot-from-kwiboo.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/general-fix-reboot-from-kwiboo.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/general-fix-reboot-from-kwiboo.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/general-increase-spdif-dma-burst.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/general-increase-spdif-dma-burst.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/general-increase-spdif-dma-burst.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/general-increase-spdif-dma-burst.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/general-linux-export-mm-trace-rss-stats.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/general-linux-export-mm-trace-rss-stats.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/general-linux-export-mm-trace-rss-stats.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/general-linux-export-mm-trace-rss-stats.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/general-pl330-01-fix-periodic-transfers.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/general-pl330-01-fix-periodic-transfers.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/general-pl330-01-fix-periodic-transfers.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/general-pl330-01-fix-periodic-transfers.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/general-pl330-02-add-support-for-interleaved-transfers.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/general-pl330-02-add-support-for-interleaved-transfers.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/general-pl330-02-add-support-for-interleaved-transfers.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/general-pl330-02-add-support-for-interleaved-transfers.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/general-pl330-04-bigger-mcode-buffer.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/general-pl330-04-bigger-mcode-buffer.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/general-pl330-04-bigger-mcode-buffer.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/general-pl330-04-bigger-mcode-buffer.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/general-pl330-05-fix-unbalanced-power-down.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/general-pl330-05-fix-unbalanced-power-down.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/general-pl330-05-fix-unbalanced-power-down.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/general-pl330-05-fix-unbalanced-power-down.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/general-pl330-06-fix-buffer-underruns.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/general-pl330-06-fix-buffer-underruns.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/general-pl330-06-fix-buffer-underruns.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/general-pl330-06-fix-buffer-underruns.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/general-rk322x-gpio-ir-driver.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/general-rk322x-gpio-ir-driver.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/general-rk322x-gpio-ir-driver.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/general-rk322x-gpio-ir-driver.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/general-rockchip-various-fixes.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/general-rockchip-various-fixes.patch similarity index 96% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/general-rockchip-various-fixes.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/general-rockchip-various-fixes.patch index 00d644bde..4eaa12cec 100644 --- a/patch/kernel/archive/rockchip-6.14/patches.armbian/general-rockchip-various-fixes.patch +++ b/patch/kernel/archive/rockchip-6.15/patches.armbian/general-rockchip-various-fixes.patch @@ -599,41 +599,42 @@ index 1889e78e1..6209f51b3 100644 cell = nvmem_cell_get(inno->dev, "cpu-version"); if (IS_ERR(cell)) { if (PTR_ERR(cell) == -EPROBE_DEFER) + diff --git a/drivers/pmdomain/rockchip/pm-domains.c b/drivers/pmdomain/rockchip/pm-domains.c -index fddb4022c..9583c76b4 100644 +index 03bcf79a461f..200047473d59 100644 --- a/drivers/pmdomain/rockchip/pm-domains.c +++ b/drivers/pmdomain/rockchip/pm-domains.c -@@ -73,6 +73,7 @@ struct rockchip_pm_domain { +@@ -95,6 +95,7 @@ struct rockchip_pm_domain { struct regmap **qos_regmap; u32 *qos_save_regs[MAX_QOS_REGS_NUM]; int num_clks; + bool is_ignore_pwr; struct clk_bulk_data *clks; - }; - -@@ -361,6 +362,9 @@ static int rockchip_pd_power_on(struct generic_pm_domain *domain) - { + struct device_node *node; + struct regulator *supply; +@@ -664,6 +665,9 @@ static int rockchip_pd_power_on(struct generic_pm_domain *domain) struct rockchip_pm_domain *pd = to_rockchip_pd(domain); + int ret; + if (pd->is_ignore_pwr) + return 0; + - return rockchip_pd_power(pd, true); - } - -@@ -368,6 +372,9 @@ static int rockchip_pd_power_off(struct generic_pm_domain *domain) - { + ret = rockchip_pd_regulator_enable(pd); + if (ret) { + dev_err(pd->pmu->dev, "Failed to enable supply: %d\n", ret); +@@ -682,6 +686,9 @@ static int rockchip_pd_power_off(struct generic_pm_domain *domain) struct rockchip_pm_domain *pd = to_rockchip_pd(domain); + int ret; + if (pd->is_ignore_pwr) + return 0; + - return rockchip_pd_power(pd, false); - } - -@@ -447,6 +454,9 @@ static int rockchip_pm_add_one_domain(struct rockchip_pmu *pmu, - pd->info = pd_info; + ret = rockchip_pd_power(pd, false); + if (ret) + return ret; +@@ -770,6 +777,9 @@ static int rockchip_pm_add_one_domain(struct rockchip_pmu *pmu, pd->pmu = pmu; + pd->node = node; + if (!pd_info->pwr_mask) + pd->is_ignore_pwr = true; @@ -641,15 +642,15 @@ index fddb4022c..9583c76b4 100644 pd->num_clks = of_clk_get_parent_count(node); if (pd->num_clks > 0) { pd->clks = devm_kcalloc(pmu->dev, pd->num_clks, -@@ -600,6 +610,7 @@ static int rockchip_pm_add_subdomain(struct rockchip_pmu *pmu, +@@ -915,6 +925,7 @@ static int rockchip_pm_add_subdomain(struct rockchip_pmu *pmu, + struct device_node *parent) { - struct device_node *np; struct generic_pm_domain *child_domain, *parent_domain; + struct rockchip_pm_domain *child_pd, *parent_pd; int error; - for_each_child_of_node(parent, np) { -@@ -640,6 +651,18 @@ static int rockchip_pm_add_subdomain(struct rockchip_pmu *pmu, + for_each_child_of_node_scoped(parent, np) { +@@ -955,6 +966,18 @@ static int rockchip_pm_add_subdomain(struct rockchip_pmu *pmu, parent_domain->name, child_domain->name); } @@ -667,8 +668,7 @@ index fddb4022c..9583c76b4 100644 + rockchip_pm_add_subdomain(pmu, np); } - + -- 2.25.1 - diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/ir-keymap-rk322x-box.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/ir-keymap-rk322x-box.patch similarity index 91% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/ir-keymap-rk322x-box.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/ir-keymap-rk322x-box.patch index 2c10b95bc..c451a3648 100644 --- a/patch/kernel/archive/rockchip-6.14/patches.armbian/ir-keymap-rk322x-box.patch +++ b/patch/kernel/archive/rockchip-6.15/patches.armbian/ir-keymap-rk322x-box.patch @@ -11,17 +11,17 @@ Subject: [PATCH] add generic rk322x tv box remote controller keymap create mode 100644 drivers/media/rc/keymaps/rc-rk322x-tvbox.c diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile -index 5fe5c9e1a46..1aa49b78a65 100644 +index d04572627cdd..a543bb3ef864 100644 --- a/drivers/media/rc/keymaps/Makefile +++ b/drivers/media/rc/keymaps/Makefile -@@ -99,6 +99,7 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \ +@@ -106,6 +106,7 @@ obj-$(CONFIG_RC_MAP) += \ rc-rc6-mce.o \ rc-real-audio-220-32-keys.o \ rc-reddo.o \ + rc-rk322x-tvbox.o \ + rc-siemens-gigaset-rc20.o \ rc-snapstream-firefly.o \ rc-streamzap.o \ - rc-tanix-tx3mini.o \ diff --git a/drivers/media/rc/keymaps/rc-rk322x-tvbox.c b/drivers/media/rc/keymaps/rc-rk322x-tvbox.c new file mode 100644 index 00000000000..91e24ee52ee @@ -103,17 +103,17 @@ index 00000000000..91e24ee52ee +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Paolo Sabatino"); diff --git a/include/media/rc-map.h b/include/media/rc-map.h -index 793b54342df..35aba84be9f 100644 +index d90e4611b066..14d6a50defed 100644 --- a/include/media/rc-map.h +++ b/include/media/rc-map.h -@@ -310,6 +310,7 @@ struct rc_map *rc_map_get(const char *name); +@@ -313,6 +313,7 @@ struct rc_map *rc_map_get(const char *name); #define RC_MAP_RC6_MCE "rc-rc6-mce" #define RC_MAP_REAL_AUDIO_220_32_KEYS "rc-real-audio-220-32-keys" #define RC_MAP_REDDO "rc-reddo" +#define RC_MAP_RK322X_TVBOX "rc-rk322x-tvbox" + #define RC_MAP_SIEMENS_GIGASET_RC20 "rc-siemens-gigaset-rc20" #define RC_MAP_SNAPSTREAM_FIREFLY "rc-snapstream-firefly" #define RC_MAP_STREAMZAP "rc-streamzap" - #define RC_MAP_SU3000 "rc-su3000" -- 2.30.2 diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/ir-keymap-xt-q8l-v10.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/ir-keymap-xt-q8l-v10.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/ir-keymap-xt-q8l-v10.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/ir-keymap-xt-q8l-v10.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/misc-tinkerboard-spi-interface.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/misc-tinkerboard-spi-interface.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/misc-tinkerboard-spi-interface.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/misc-tinkerboard-spi-interface.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/mmc-tinkerboard-sdmmc-reboot-fix.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/mmc-tinkerboard-sdmmc-reboot-fix.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/mmc-tinkerboard-sdmmc-reboot-fix.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/mmc-tinkerboard-sdmmc-reboot-fix.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/rk322x-dmc-driver-01-sipv2-calls.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/rk322x-dmc-driver-01-sipv2-calls.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/rk322x-dmc-driver-01-sipv2-calls.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/rk322x-dmc-driver-01-sipv2-calls.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/rk322x-dmc-driver-02-sip-constants.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/rk322x-dmc-driver-02-sip-constants.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/rk322x-dmc-driver-02-sip-constants.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/rk322x-dmc-driver-02-sip-constants.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/rk322x-dmc-driver-03-dfi-driver.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/rk322x-dmc-driver-03-dfi-driver.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/rk322x-dmc-driver-03-dfi-driver.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/rk322x-dmc-driver-03-dfi-driver.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/rk322x-dmc-driver-04-driver.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/rk322x-dmc-driver-04-driver.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/rk322x-dmc-driver-04-driver.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/rk322x-dmc-driver-04-driver.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/rk322x-dwc2-no-clock-gating.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/rk322x-dwc2-no-clock-gating.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/rk322x-dwc2-no-clock-gating.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/rk322x-dwc2-no-clock-gating.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/rk322x-usb-reset-props.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/rk322x-usb-reset-props.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/rk322x-usb-reset-props.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/rk322x-usb-reset-props.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/wifi-ath9k-no-bulk-EP3-EP4.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/wifi-ath9k-no-bulk-EP3-EP4.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/wifi-ath9k-no-bulk-EP3-EP4.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/wifi-ath9k-no-bulk-EP3-EP4.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/wifi-brcmfmac-add-bcm43342.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/wifi-brcmfmac-add-bcm43342.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/wifi-brcmfmac-add-bcm43342.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/wifi-brcmfmac-add-bcm43342.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/wifi-brcmfmac-ap6330-firmware.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/wifi-brcmfmac-ap6330-firmware.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/wifi-brcmfmac-ap6330-firmware.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/wifi-brcmfmac-ap6330-firmware.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/wifi-driver-esp8089.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/wifi-driver-esp8089.patch similarity index 99% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/wifi-driver-esp8089.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/wifi-driver-esp8089.patch index 727afc1b8..a8e34e49f 100644 --- a/patch/kernel/archive/rockchip-6.14/patches.armbian/wifi-driver-esp8089.patch +++ b/patch/kernel/archive/rockchip-6.15/patches.armbian/wifi-driver-esp8089.patch @@ -3858,7 +3858,7 @@ index 000000000000..14186365fdd4 + + if (evif->ap_up) { + evif->beacon_interval = 0; -+ del_timer_sync(&evif->beacon_timer); ++ timer_delete_sync(&evif->beacon_timer); + evif->ap_up = false; + } + epub->vif = NULL; @@ -4101,7 +4101,7 @@ index 000000000000..14186365fdd4 + __func__, + info->beacon_int); + evif->beacon_interval = 0; -+ del_timer_sync(&evif->beacon_timer); ++ timer_delete_sync(&evif->beacon_timer); + sip_send_bss_info_update(epub, evif, + (u8 *) info-> + bssid, 2); @@ -6324,7 +6324,7 @@ index 000000000000..6602a1e22ab1 + + if (atomic_read(&sip->credit_status) == RECALC_CREDIT_ENABLE) { + atomic_set(&sip->credit_status, RECALC_CREDIT_DISABLE); -+ del_timer_sync(&sip->credit_timer); ++ timer_delete_sync(&sip->credit_timer); + } else + esp_dbg(ESP_SHOW, "maybe bogus credit"); +} diff --git a/patch/kernel/archive/rockchip-6.14/patches.armbian/wifi-driver-ssv6051.patch b/patch/kernel/archive/rockchip-6.15/patches.armbian/wifi-driver-ssv6051.patch similarity index 99% rename from patch/kernel/archive/rockchip-6.14/patches.armbian/wifi-driver-ssv6051.patch rename to patch/kernel/archive/rockchip-6.15/patches.armbian/wifi-driver-ssv6051.patch index 669c07b57..24dbdd59e 100644 --- a/patch/kernel/archive/rockchip-6.14/patches.armbian/wifi-driver-ssv6051.patch +++ b/patch/kernel/archive/rockchip-6.15/patches.armbian/wifi-driver-ssv6051.patch @@ -1,131 +1,73 @@ -From 3f30a652fb3e6ead83f65312d0240d5c9ea8c340 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Wed, 2 Nov 2022 15:40:06 +0000 -Subject: [PATCH] add ssv6xxx wifi driver +Subject: add ssv6xxx wifi driver --- - drivers/net/wireless/Kconfig | 1 + - drivers/net/wireless/Makefile | 1 + - drivers/net/wireless/ssv6051/Kconfig | 11 + - drivers/net/wireless/ssv6051/Makefile | 26 + - drivers/net/wireless/ssv6051/Makefile.bak | 107 + - .../ssv6051/firmware/ssv6051-wifi.cfg | 91 + - drivers/net/wireless/ssv6051/hci/hctrl.h | 178 + - drivers/net/wireless/ssv6051/hci/ssv_hci.c | 967 + - drivers/net/wireless/ssv6051/hci/ssv_hci.h | 77 + - drivers/net/wireless/ssv6051/hwif/hwif.h | 84 + - drivers/net/wireless/ssv6051/hwif/sdio/sdio.c | 1254 ++ - .../net/wireless/ssv6051/hwif/sdio/sdio_def.h | 80 + - drivers/net/wireless/ssv6051/include/cabrio.h | 28 + - .../net/wireless/ssv6051/include/ssv6200.h | 76 + - .../wireless/ssv6051/include/ssv6200_aux.h | 18221 ++++++++++++++++ - .../wireless/ssv6051/include/ssv6200_common.h | 452 + - .../ssv6051/include/ssv6200_configuration.h | 317 + - .../wireless/ssv6051/include/ssv6200_reg.h | 9694 ++++++++ - .../ssv6051/include/ssv6200_reg_sim.h | 176 + - .../net/wireless/ssv6051/include/ssv_cfg.h | 60 + - .../ssv6051/include/ssv_firmware_version.h | 25 + - .../wireless/ssv6051/include/ssv_version.h | 12 + - .../net/wireless/ssv6051/platform-config.mak | 97 + - drivers/net/wireless/ssv6051/rules.mak | 19 + - drivers/net/wireless/ssv6051/smac/ampdu.c | 2111 ++ - drivers/net/wireless/ssv6051/smac/ampdu.h | 215 + - drivers/net/wireless/ssv6051/smac/ap.c | 598 + - drivers/net/wireless/ssv6051/smac/ap.h | 41 + - drivers/net/wireless/ssv6051/smac/dev.c | 3880 ++++ - drivers/net/wireless/ssv6051/smac/dev.h | 445 + - drivers/net/wireless/ssv6051/smac/dev_tbl.h | 141 + - drivers/net/wireless/ssv6051/smac/drv_comm.h | 61 + - drivers/net/wireless/ssv6051/smac/efuse.c | 334 + - drivers/net/wireless/ssv6051/smac/efuse.h | 40 + - drivers/net/wireless/ssv6051/smac/init.c | 1347 ++ - drivers/net/wireless/ssv6051/smac/init.h | 23 + - drivers/net/wireless/ssv6051/smac/lib.c | 33 + - drivers/net/wireless/ssv6051/smac/lib.h | 23 + - .../net/wireless/ssv6051/smac/linux_80211.h | 24 + - drivers/net/wireless/ssv6051/smac/p2p.c | 305 + - drivers/net/wireless/ssv6051/smac/p2p.h | 58 + - drivers/net/wireless/ssv6051/smac/sar.c | 208 + - drivers/net/wireless/ssv6051/smac/sar.h | 63 + - drivers/net/wireless/ssv6051/smac/sec.h | 52 + - drivers/net/wireless/ssv6051/smac/smartlink.c | 340 + - .../wireless/ssv6051/smac/ssv6xxx_debugfs.c | 223 + - .../wireless/ssv6051/smac/ssv6xxx_debugfs.h | 27 + - .../net/wireless/ssv6051/smac/ssv_cfgvendor.c | 1384 ++ - .../net/wireless/ssv6051/smac/ssv_cfgvendor.h | 247 + - drivers/net/wireless/ssv6051/smac/ssv_ht_rc.c | 546 + - drivers/net/wireless/ssv6051/smac/ssv_ht_rc.h | 31 + - drivers/net/wireless/ssv6051/smac/ssv_pm.c | 19 + - drivers/net/wireless/ssv6051/smac/ssv_pm.h | 20 + - drivers/net/wireless/ssv6051/smac/ssv_rc.c | 1716 ++ - drivers/net/wireless/ssv6051/smac/ssv_rc.h | 50 + - .../net/wireless/ssv6051/smac/ssv_rc_common.h | 175 + - .../wireless/ssv6051/ssv6051-generic-wlan.c | 76 + - .../net/wireless/ssv6051/ssvdevice/ssv_cmd.c | 1765 ++ - .../net/wireless/ssv6051/ssvdevice/ssv_cmd.h | 50 + - .../wireless/ssv6051/ssvdevice/ssvdevice.c | 256 + - 60 files changed, 48983 insertions(+) - create mode 100644 drivers/net/wireless/ssv6051/Kconfig - create mode 100644 drivers/net/wireless/ssv6051/Makefile - create mode 100644 drivers/net/wireless/ssv6051/Makefile.bak - create mode 100644 drivers/net/wireless/ssv6051/firmware/ssv6051-wifi.cfg - create mode 100644 drivers/net/wireless/ssv6051/hci/hctrl.h - create mode 100644 drivers/net/wireless/ssv6051/hci/ssv_hci.c - create mode 100644 drivers/net/wireless/ssv6051/hci/ssv_hci.h - create mode 100644 drivers/net/wireless/ssv6051/hwif/hwif.h - create mode 100644 drivers/net/wireless/ssv6051/hwif/sdio/sdio.c - create mode 100644 drivers/net/wireless/ssv6051/hwif/sdio/sdio_def.h - create mode 100644 drivers/net/wireless/ssv6051/include/cabrio.h - create mode 100644 drivers/net/wireless/ssv6051/include/ssv6200.h - create mode 100644 drivers/net/wireless/ssv6051/include/ssv6200_aux.h - create mode 100644 drivers/net/wireless/ssv6051/include/ssv6200_common.h - create mode 100644 drivers/net/wireless/ssv6051/include/ssv6200_configuration.h - create mode 100644 drivers/net/wireless/ssv6051/include/ssv6200_reg.h - create mode 100644 drivers/net/wireless/ssv6051/include/ssv6200_reg_sim.h - create mode 100644 drivers/net/wireless/ssv6051/include/ssv_cfg.h - create mode 100644 drivers/net/wireless/ssv6051/include/ssv_firmware_version.h - create mode 100644 drivers/net/wireless/ssv6051/include/ssv_version.h - create mode 100644 drivers/net/wireless/ssv6051/platform-config.mak - create mode 100644 drivers/net/wireless/ssv6051/rules.mak - create mode 100644 drivers/net/wireless/ssv6051/smac/ampdu.c - create mode 100644 drivers/net/wireless/ssv6051/smac/ampdu.h - create mode 100644 drivers/net/wireless/ssv6051/smac/ap.c - create mode 100644 drivers/net/wireless/ssv6051/smac/ap.h - create mode 100644 drivers/net/wireless/ssv6051/smac/dev.c - create mode 100644 drivers/net/wireless/ssv6051/smac/dev.h - create mode 100644 drivers/net/wireless/ssv6051/smac/dev_tbl.h - create mode 100644 drivers/net/wireless/ssv6051/smac/drv_comm.h - create mode 100644 drivers/net/wireless/ssv6051/smac/efuse.c - create mode 100644 drivers/net/wireless/ssv6051/smac/efuse.h - create mode 100644 drivers/net/wireless/ssv6051/smac/init.c - create mode 100644 drivers/net/wireless/ssv6051/smac/init.h - create mode 100644 drivers/net/wireless/ssv6051/smac/lib.c - create mode 100644 drivers/net/wireless/ssv6051/smac/lib.h - create mode 100644 drivers/net/wireless/ssv6051/smac/linux_80211.h - create mode 100644 drivers/net/wireless/ssv6051/smac/p2p.c - create mode 100644 drivers/net/wireless/ssv6051/smac/p2p.h - create mode 100644 drivers/net/wireless/ssv6051/smac/sar.c - create mode 100644 drivers/net/wireless/ssv6051/smac/sar.h - create mode 100644 drivers/net/wireless/ssv6051/smac/sec.h - create mode 100644 drivers/net/wireless/ssv6051/smac/smartlink.c - create mode 100644 drivers/net/wireless/ssv6051/smac/ssv6xxx_debugfs.c - create mode 100644 drivers/net/wireless/ssv6051/smac/ssv6xxx_debugfs.h - create mode 100644 drivers/net/wireless/ssv6051/smac/ssv_cfgvendor.c - create mode 100644 drivers/net/wireless/ssv6051/smac/ssv_cfgvendor.h - create mode 100644 drivers/net/wireless/ssv6051/smac/ssv_ht_rc.c - create mode 100644 drivers/net/wireless/ssv6051/smac/ssv_ht_rc.h - create mode 100644 drivers/net/wireless/ssv6051/smac/ssv_pm.c - create mode 100644 drivers/net/wireless/ssv6051/smac/ssv_pm.h - create mode 100644 drivers/net/wireless/ssv6051/smac/ssv_rc.c - create mode 100644 drivers/net/wireless/ssv6051/smac/ssv_rc.h - create mode 100644 drivers/net/wireless/ssv6051/smac/ssv_rc_common.h - create mode 100644 drivers/net/wireless/ssv6051/ssv6051-generic-wlan.c - create mode 100644 drivers/net/wireless/ssv6051/ssvdevice/ssv_cmd.c - create mode 100644 drivers/net/wireless/ssv6051/ssvdevice/ssv_cmd.h - create mode 100644 drivers/net/wireless/ssv6051/ssvdevice/ssvdevice.c + drivers/net/wireless/Kconfig | 1 + + drivers/net/wireless/Makefile | 1 + + drivers/net/wireless/ssv6051/Kconfig | 11 + + drivers/net/wireless/ssv6051/Makefile | 26 + + drivers/net/wireless/ssv6051/Makefile.bak | 107 + + drivers/net/wireless/ssv6051/firmware/ssv6051-wifi.cfg | 91 + + drivers/net/wireless/ssv6051/hci/hctrl.h | 178 + + drivers/net/wireless/ssv6051/hci/ssv_hci.c | 967 + + drivers/net/wireless/ssv6051/hci/ssv_hci.h | 77 + + drivers/net/wireless/ssv6051/hwif/hwif.h | 84 + + drivers/net/wireless/ssv6051/hwif/sdio/sdio.c | 1254 + + drivers/net/wireless/ssv6051/hwif/sdio/sdio_def.h | 80 + + drivers/net/wireless/ssv6051/include/cabrio.h | 28 + + drivers/net/wireless/ssv6051/include/ssv6200.h | 76 + + drivers/net/wireless/ssv6051/include/ssv6200_aux.h | 18221 ++++++++++ + drivers/net/wireless/ssv6051/include/ssv6200_common.h | 452 + + drivers/net/wireless/ssv6051/include/ssv6200_configuration.h | 317 + + drivers/net/wireless/ssv6051/include/ssv6200_reg.h | 9694 +++++ + drivers/net/wireless/ssv6051/include/ssv6200_reg_sim.h | 176 + + drivers/net/wireless/ssv6051/include/ssv_cfg.h | 60 + + drivers/net/wireless/ssv6051/include/ssv_firmware_version.h | 25 + + drivers/net/wireless/ssv6051/include/ssv_version.h | 12 + + drivers/net/wireless/ssv6051/platform-config.mak | 97 + + drivers/net/wireless/ssv6051/rules.mak | 19 + + drivers/net/wireless/ssv6051/smac/ampdu.c | 2111 ++ + drivers/net/wireless/ssv6051/smac/ampdu.h | 215 + + drivers/net/wireless/ssv6051/smac/ap.c | 598 + + drivers/net/wireless/ssv6051/smac/ap.h | 41 + + drivers/net/wireless/ssv6051/smac/dev.c | 3881 ++ + drivers/net/wireless/ssv6051/smac/dev.h | 445 + + drivers/net/wireless/ssv6051/smac/dev_tbl.h | 141 + + drivers/net/wireless/ssv6051/smac/drv_comm.h | 61 + + drivers/net/wireless/ssv6051/smac/efuse.c | 334 + + drivers/net/wireless/ssv6051/smac/efuse.h | 40 + + drivers/net/wireless/ssv6051/smac/init.c | 1347 + + drivers/net/wireless/ssv6051/smac/init.h | 23 + + drivers/net/wireless/ssv6051/smac/lib.c | 33 + + drivers/net/wireless/ssv6051/smac/lib.h | 23 + + drivers/net/wireless/ssv6051/smac/linux_80211.h | 24 + + drivers/net/wireless/ssv6051/smac/p2p.c | 305 + + drivers/net/wireless/ssv6051/smac/p2p.h | 58 + + drivers/net/wireless/ssv6051/smac/sar.c | 208 + + drivers/net/wireless/ssv6051/smac/sar.h | 63 + + drivers/net/wireless/ssv6051/smac/sec.h | 52 + + drivers/net/wireless/ssv6051/smac/smartlink.c | 340 + + drivers/net/wireless/ssv6051/smac/ssv6xxx_debugfs.c | 223 + + drivers/net/wireless/ssv6051/smac/ssv6xxx_debugfs.h | 27 + + drivers/net/wireless/ssv6051/smac/ssv_cfgvendor.c | 1384 + + drivers/net/wireless/ssv6051/smac/ssv_cfgvendor.h | 247 + + drivers/net/wireless/ssv6051/smac/ssv_ht_rc.c | 546 + + drivers/net/wireless/ssv6051/smac/ssv_ht_rc.h | 31 + + drivers/net/wireless/ssv6051/smac/ssv_pm.c | 19 + + drivers/net/wireless/ssv6051/smac/ssv_pm.h | 20 + + drivers/net/wireless/ssv6051/smac/ssv_rc.c | 1716 + + drivers/net/wireless/ssv6051/smac/ssv_rc.h | 50 + + drivers/net/wireless/ssv6051/smac/ssv_rc_common.h | 175 + + drivers/net/wireless/ssv6051/ssv6051-generic-wlan.c | 76 + + drivers/net/wireless/ssv6051/ssvdevice/ssv_cmd.c | 1765 + + drivers/net/wireless/ssv6051/ssvdevice/ssv_cmd.h | 50 + + drivers/net/wireless/ssv6051/ssvdevice/ssvdevice.c | 256 + + 60 files changed, 48982 insertions(+) diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig -index de5e37846397..aa2cac9abdd3 100644 +index 111111111111..222222222222 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -18,6 +18,7 @@ menuconfig WLAN @@ -137,7 +79,7 @@ index de5e37846397..aa2cac9abdd3 100644 source "drivers/net/wireless/ath/Kconfig" source "drivers/net/wireless/atmel/Kconfig" diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile -index 92ffd2cef51c..8b56a42e97a6 100644 +index 111111111111..222222222222 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -3,6 +3,7 @@ @@ -150,7 +92,7 @@ index 92ffd2cef51c..8b56a42e97a6 100644 obj-$(CONFIG_WLAN_VENDOR_ATMEL) += atmel/ diff --git a/drivers/net/wireless/ssv6051/Kconfig b/drivers/net/wireless/ssv6051/Kconfig new file mode 100644 -index 000000000000..7706ad52ed7b +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/Kconfig @@ -0,0 +1,11 @@ @@ -167,7 +109,7 @@ index 000000000000..7706ad52ed7b + diff --git a/drivers/net/wireless/ssv6051/Makefile b/drivers/net/wireless/ssv6051/Makefile new file mode 100644 -index 000000000000..985d730f3d50 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/Makefile @@ -0,0 +1,26 @@ @@ -176,8 +118,8 @@ index 000000000000..985d730f3d50 +include $(src)/platform-config.mak + +ccflags-y += \ -+ -I $(srctree)/$(src) \ -+ -I $(srctree)/$(src)/include ++ -I $(src) \ ++ -I $(src)/include + +obj-$(CONFIG_SSV6051) += ssv6051.o +ssv6051-objs += \ @@ -199,7 +141,7 @@ index 000000000000..985d730f3d50 + diff --git a/drivers/net/wireless/ssv6051/Makefile.bak b/drivers/net/wireless/ssv6051/Makefile.bak new file mode 100644 -index 000000000000..2733fa4dd3b7 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/Makefile.bak @@ -0,0 +1,107 @@ @@ -312,7 +254,7 @@ index 000000000000..2733fa4dd3b7 +.PHONY: all modules clean install diff --git a/drivers/net/wireless/ssv6051/firmware/ssv6051-wifi.cfg b/drivers/net/wireless/ssv6051/firmware/ssv6051-wifi.cfg new file mode 100644 -index 000000000000..c072960f6dea +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/firmware/ssv6051-wifi.cfg @@ -0,0 +1,91 @@ @@ -409,7 +351,7 @@ index 000000000000..c072960f6dea +################################################## diff --git a/drivers/net/wireless/ssv6051/hci/hctrl.h b/drivers/net/wireless/ssv6051/hci/hctrl.h new file mode 100644 -index 000000000000..95218c8040e7 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/hci/hctrl.h @@ -0,0 +1,178 @@ @@ -593,7 +535,7 @@ index 000000000000..95218c8040e7 +#endif diff --git a/drivers/net/wireless/ssv6051/hci/ssv_hci.c b/drivers/net/wireless/ssv6051/hci/ssv_hci.c new file mode 100644 -index 000000000000..9fedbeb55754 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/hci/ssv_hci.c @@ -0,0 +1,967 @@ @@ -1566,7 +1508,7 @@ index 000000000000..9fedbeb55754 +EXPORT_SYMBOL(ssv6xxx_hci_exit); diff --git a/drivers/net/wireless/ssv6051/hci/ssv_hci.h b/drivers/net/wireless/ssv6051/hci/ssv_hci.h new file mode 100644 -index 000000000000..dd166c607d5d +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/hci/ssv_hci.h @@ -0,0 +1,77 @@ @@ -1649,7 +1591,7 @@ index 000000000000..dd166c607d5d +#endif diff --git a/drivers/net/wireless/ssv6051/hwif/hwif.h b/drivers/net/wireless/ssv6051/hwif/hwif.h new file mode 100644 -index 000000000000..6b5263d157d8 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/hwif/hwif.h @@ -0,0 +1,84 @@ @@ -1739,7 +1681,7 @@ index 000000000000..6b5263d157d8 +#endif diff --git a/drivers/net/wireless/ssv6051/hwif/sdio/sdio.c b/drivers/net/wireless/ssv6051/hwif/sdio/sdio.c new file mode 100644 -index 000000000000..273777cd0485 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/hwif/sdio/sdio.c @@ -0,0 +1,1254 @@ @@ -2999,7 +2941,7 @@ index 000000000000..273777cd0485 +EXPORT_SYMBOL(ssv6xxx_sdio_exit); diff --git a/drivers/net/wireless/ssv6051/hwif/sdio/sdio_def.h b/drivers/net/wireless/ssv6051/hwif/sdio/sdio_def.h new file mode 100644 -index 000000000000..57aefd3bf9fa +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/hwif/sdio/sdio_def.h @@ -0,0 +1,80 @@ @@ -3085,7 +3027,7 @@ index 000000000000..57aefd3bf9fa +#endif diff --git a/drivers/net/wireless/ssv6051/include/cabrio.h b/drivers/net/wireless/ssv6051/include/cabrio.h new file mode 100644 -index 000000000000..0b1327865c6b +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/include/cabrio.h @@ -0,0 +1,28 @@ @@ -3119,7 +3061,7 @@ index 000000000000..0b1327865c6b +#endif diff --git a/drivers/net/wireless/ssv6051/include/ssv6200.h b/drivers/net/wireless/ssv6051/include/ssv6200.h new file mode 100644 -index 000000000000..22eaceaf285d +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/include/ssv6200.h @@ -0,0 +1,76 @@ @@ -3201,7 +3143,7 @@ index 000000000000..22eaceaf285d +#endif diff --git a/drivers/net/wireless/ssv6051/include/ssv6200_aux.h b/drivers/net/wireless/ssv6051/include/ssv6200_aux.h new file mode 100644 -index 000000000000..03ec3f07d330 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/include/ssv6200_aux.h @@ -0,0 +1,18221 @@ @@ -21428,7 +21370,7 @@ index 000000000000..03ec3f07d330 +#define SRAM_TAG_15_SZ 16 diff --git a/drivers/net/wireless/ssv6051/include/ssv6200_common.h b/drivers/net/wireless/ssv6051/include/ssv6200_common.h new file mode 100644 -index 000000000000..e6d30f3714f7 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/include/ssv6200_common.h @@ -0,0 +1,452 @@ @@ -21886,7 +21828,7 @@ index 000000000000..e6d30f3714f7 +#endif diff --git a/drivers/net/wireless/ssv6051/include/ssv6200_configuration.h b/drivers/net/wireless/ssv6051/include/ssv6200_configuration.h new file mode 100644 -index 000000000000..0327393de3f5 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/include/ssv6200_configuration.h @@ -0,0 +1,317 @@ @@ -22209,7 +22151,7 @@ index 000000000000..0327393de3f5 +}; diff --git a/drivers/net/wireless/ssv6051/include/ssv6200_reg.h b/drivers/net/wireless/ssv6051/include/ssv6200_reg.h new file mode 100644 -index 000000000000..d4a99b25d61f +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/include/ssv6200_reg.h @@ -0,0 +1,9694 @@ @@ -31909,7 +31851,7 @@ index 000000000000..d4a99b25d61f +#define DEF_TAG_SRAM0_F_STATUS_7() (REG32(ADR_TAG_SRAM0_F_STATUS_7)) = (0x00000000) diff --git a/drivers/net/wireless/ssv6051/include/ssv6200_reg_sim.h b/drivers/net/wireless/ssv6051/include/ssv6200_reg_sim.h new file mode 100644 -index 000000000000..e15a481ba300 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/include/ssv6200_reg_sim.h @@ -0,0 +1,176 @@ @@ -32091,7 +32033,7 @@ index 000000000000..e15a481ba300 +}; diff --git a/drivers/net/wireless/ssv6051/include/ssv_cfg.h b/drivers/net/wireless/ssv6051/include/ssv_cfg.h new file mode 100644 -index 000000000000..79b75619936e +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/include/ssv_cfg.h @@ -0,0 +1,60 @@ @@ -32157,7 +32099,7 @@ index 000000000000..79b75619936e +#endif diff --git a/drivers/net/wireless/ssv6051/include/ssv_firmware_version.h b/drivers/net/wireless/ssv6051/include/ssv_firmware_version.h new file mode 100644 -index 000000000000..7fabbe308f9d +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/include/ssv_firmware_version.h @@ -0,0 +1,25 @@ @@ -32188,7 +32130,7 @@ index 000000000000..7fabbe308f9d +#endif diff --git a/drivers/net/wireless/ssv6051/include/ssv_version.h b/drivers/net/wireless/ssv6051/include/ssv_version.h new file mode 100644 -index 000000000000..99be5354f783 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/include/ssv_version.h @@ -0,0 +1,12 @@ @@ -32206,7 +32148,7 @@ index 000000000000..99be5354f783 +#endif diff --git a/drivers/net/wireless/ssv6051/platform-config.mak b/drivers/net/wireless/ssv6051/platform-config.mak new file mode 100644 -index 000000000000..b1b6f0510d28 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/platform-config.mak @@ -0,0 +1,97 @@ @@ -32310,7 +32252,7 @@ index 000000000000..b1b6f0510d28 \ No newline at end of file diff --git a/drivers/net/wireless/ssv6051/rules.mak b/drivers/net/wireless/ssv6051/rules.mak new file mode 100644 -index 000000000000..b3262852249c +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/rules.mak @@ -0,0 +1,19 @@ @@ -32335,7 +32277,7 @@ index 000000000000..b3262852249c + M=$(KBUILD_DIR) modules_install diff --git a/drivers/net/wireless/ssv6051/smac/ampdu.c b/drivers/net/wireless/ssv6051/smac/ampdu.c new file mode 100644 -index 000000000000..846830f3d209 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/ampdu.c @@ -0,0 +1,2111 @@ @@ -34452,7 +34394,7 @@ index 000000000000..846830f3d209 +} diff --git a/drivers/net/wireless/ssv6051/smac/ampdu.h b/drivers/net/wireless/ssv6051/smac/ampdu.h new file mode 100644 -index 000000000000..faa61c4f9297 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/ampdu.h @@ -0,0 +1,215 @@ @@ -34673,7 +34615,7 @@ index 000000000000..faa61c4f9297 +#endif diff --git a/drivers/net/wireless/ssv6051/smac/ap.c b/drivers/net/wireless/ssv6051/smac/ap.c new file mode 100644 -index 000000000000..0f2ba6a31a05 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/ap.c @@ -0,0 +1,598 @@ @@ -35277,7 +35219,7 @@ index 000000000000..0f2ba6a31a05 +} diff --git a/drivers/net/wireless/ssv6051/smac/ap.h b/drivers/net/wireless/ssv6051/smac/ap.h new file mode 100644 -index 000000000000..93b5275715b5 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/ap.h @@ -0,0 +1,41 @@ @@ -35324,10 +35266,10 @@ index 000000000000..93b5275715b5 +#endif diff --git a/drivers/net/wireless/ssv6051/smac/dev.c b/drivers/net/wireless/ssv6051/smac/dev.c new file mode 100644 -index 000000000000..cd93fa42648b +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/dev.c -@@ -0,0 +1,3884 @@ +@@ -0,0 +1,3881 @@ +/* + * Copyright (c) 2015 South Silicon Valley Microelectronics Inc. + * Copyright (c) 2015 iComm Corporation @@ -37520,7 +37462,7 @@ index 000000000000..cd93fa42648b + } + sc->watchdog_flag = WD_SLEEP; + mutex_unlock(&sc->mutex); -+ del_timer_sync(&sc->watchdog_timeout); ++ timer_delete_sync(&sc->watchdog_timeout); +#ifdef CONFIG_SSV_SMARTLINK + { + extern void ksmartlink_exit(void); @@ -38511,9 +38453,6 @@ index 000000000000..cd93fa42648b + .conf_tx = ssv6200_conf_tx, + .ampdu_action = ssv6200_ampdu_action, + .wake_tx_queue = ieee80211_handle_wake_tx_queue, -+ .add_chanctx = ieee80211_emulate_add_chanctx, -+ .remove_chanctx = ieee80211_emulate_remove_chanctx, -+ .change_chanctx = ieee80211_emulate_change_chanctx, +#ifdef CONFIG_PM + .suspend = ssv6xxx_suspend, + .resume = ssv6xxx_resume, @@ -39214,7 +39153,7 @@ index 000000000000..cd93fa42648b +#endif diff --git a/drivers/net/wireless/ssv6051/smac/dev.h b/drivers/net/wireless/ssv6051/smac/dev.h new file mode 100644 -index 000000000000..0a6357624b1c +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/dev.h @@ -0,0 +1,445 @@ @@ -39665,7 +39604,7 @@ index 000000000000..0a6357624b1c +#endif diff --git a/drivers/net/wireless/ssv6051/smac/dev_tbl.h b/drivers/net/wireless/ssv6051/smac/dev_tbl.h new file mode 100644 -index 000000000000..5c49d0bde6a6 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/dev_tbl.h @@ -0,0 +1,141 @@ @@ -39812,7 +39751,7 @@ index 000000000000..5c49d0bde6a6 +#endif diff --git a/drivers/net/wireless/ssv6051/smac/drv_comm.h b/drivers/net/wireless/ssv6051/smac/drv_comm.h new file mode 100644 -index 000000000000..f04fbae004c3 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/drv_comm.h @@ -0,0 +1,61 @@ @@ -39879,7 +39818,7 @@ index 000000000000..f04fbae004c3 +#endif diff --git a/drivers/net/wireless/ssv6051/smac/efuse.c b/drivers/net/wireless/ssv6051/smac/efuse.c new file mode 100644 -index 000000000000..9a1f3f5488f2 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/efuse.c @@ -0,0 +1,334 @@ @@ -40219,7 +40158,7 @@ index 000000000000..9a1f3f5488f2 +} diff --git a/drivers/net/wireless/ssv6051/smac/efuse.h b/drivers/net/wireless/ssv6051/smac/efuse.h new file mode 100644 -index 000000000000..c25280c5abad +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/efuse.h @@ -0,0 +1,40 @@ @@ -40265,7 +40204,7 @@ index 000000000000..c25280c5abad +#endif diff --git a/drivers/net/wireless/ssv6051/smac/init.c b/drivers/net/wireless/ssv6051/smac/init.c new file mode 100644 -index 000000000000..592c52a28381 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/init.c @@ -0,0 +1,1347 @@ @@ -40732,7 +40671,7 @@ index 000000000000..592c52a28381 + ssv6xxx_rate_control_unregister(); + cancel_delayed_work_sync(&sc->bcast_tx_work); + //ssv6xxx_watchdog_controller(sc->sh ,(u8)SSV6XXX_HOST_CMD_WATCHDOG_STOP); -+ del_timer_sync(&sc->watchdog_timeout); ++ timer_delete_sync(&sc->watchdog_timeout); + cancel_delayed_work(&sc->thermal_monitor_work); + sc->ps_status = PWRSV_PREPARE; + flush_workqueue(sc->thermal_wq); @@ -41618,7 +41557,7 @@ index 000000000000..592c52a28381 +EXPORT_SYMBOL(ssv6xxx_exit); diff --git a/drivers/net/wireless/ssv6051/smac/init.h b/drivers/net/wireless/ssv6051/smac/init.h new file mode 100644 -index 000000000000..97994d00d4da +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/init.h @@ -0,0 +1,23 @@ @@ -41647,7 +41586,7 @@ index 000000000000..97994d00d4da +#endif diff --git a/drivers/net/wireless/ssv6051/smac/lib.c b/drivers/net/wireless/ssv6051/smac/lib.c new file mode 100644 -index 000000000000..ccf0974b0f20 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/lib.c @@ -0,0 +1,33 @@ @@ -41686,7 +41625,7 @@ index 000000000000..ccf0974b0f20 +} diff --git a/drivers/net/wireless/ssv6051/smac/lib.h b/drivers/net/wireless/ssv6051/smac/lib.h new file mode 100644 -index 000000000000..266cf7afac95 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/lib.h @@ -0,0 +1,23 @@ @@ -41715,7 +41654,7 @@ index 000000000000..266cf7afac95 +#endif diff --git a/drivers/net/wireless/ssv6051/smac/linux_80211.h b/drivers/net/wireless/ssv6051/smac/linux_80211.h new file mode 100644 -index 000000000000..e268808e3c93 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/linux_80211.h @@ -0,0 +1,24 @@ @@ -41745,7 +41684,7 @@ index 000000000000..e268808e3c93 +#endif diff --git a/drivers/net/wireless/ssv6051/smac/p2p.c b/drivers/net/wireless/ssv6051/smac/p2p.c new file mode 100644 -index 000000000000..60fd8effd6ec +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/p2p.c @@ -0,0 +1,305 @@ @@ -42056,7 +41995,7 @@ index 000000000000..60fd8effd6ec +#endif diff --git a/drivers/net/wireless/ssv6051/smac/p2p.h b/drivers/net/wireless/ssv6051/smac/p2p.h new file mode 100644 -index 000000000000..a5bb99c61bb0 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/p2p.h @@ -0,0 +1,58 @@ @@ -42120,7 +42059,7 @@ index 000000000000..a5bb99c61bb0 +#endif diff --git a/drivers/net/wireless/ssv6051/smac/sar.c b/drivers/net/wireless/ssv6051/smac/sar.c new file mode 100644 -index 000000000000..44a47a5c7a0f +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/sar.c @@ -0,0 +1,208 @@ @@ -42334,7 +42273,7 @@ index 000000000000..44a47a5c7a0f +} diff --git a/drivers/net/wireless/ssv6051/smac/sar.h b/drivers/net/wireless/ssv6051/smac/sar.h new file mode 100644 -index 000000000000..291d58f236eb +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/sar.h @@ -0,0 +1,63 @@ @@ -42403,7 +42342,7 @@ index 000000000000..291d58f236eb +#endif diff --git a/drivers/net/wireless/ssv6051/smac/sec.h b/drivers/net/wireless/ssv6051/smac/sec.h new file mode 100644 -index 000000000000..04a0f47c8ce2 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/sec.h @@ -0,0 +1,52 @@ @@ -42461,7 +42400,7 @@ index 000000000000..04a0f47c8ce2 +#endif diff --git a/drivers/net/wireless/ssv6051/smac/smartlink.c b/drivers/net/wireless/ssv6051/smac/smartlink.c new file mode 100644 -index 000000000000..69e8d5118e09 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/smartlink.c @@ -0,0 +1,340 @@ @@ -42807,7 +42746,7 @@ index 000000000000..69e8d5118e09 +EXPORT_SYMBOL(ksmartlink_exit); diff --git a/drivers/net/wireless/ssv6051/smac/ssv6xxx_debugfs.c b/drivers/net/wireless/ssv6051/smac/ssv6xxx_debugfs.c new file mode 100644 -index 000000000000..9be5ea96e7f9 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/ssv6xxx_debugfs.c @@ -0,0 +1,223 @@ @@ -43036,7 +42975,7 @@ index 000000000000..9be5ea96e7f9 +}; diff --git a/drivers/net/wireless/ssv6051/smac/ssv6xxx_debugfs.h b/drivers/net/wireless/ssv6051/smac/ssv6xxx_debugfs.h new file mode 100644 -index 000000000000..39caceadda4a +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/ssv6xxx_debugfs.h @@ -0,0 +1,27 @@ @@ -43069,7 +43008,7 @@ index 000000000000..39caceadda4a +#endif diff --git a/drivers/net/wireless/ssv6051/smac/ssv_cfgvendor.c b/drivers/net/wireless/ssv6051/smac/ssv_cfgvendor.c new file mode 100644 -index 000000000000..f0135447b1f3 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/ssv_cfgvendor.c @@ -0,0 +1,1384 @@ @@ -44459,7 +44398,7 @@ index 000000000000..f0135447b1f3 +#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)) || defined(SSV_VENDOR_EXT_SUPPORT) */ diff --git a/drivers/net/wireless/ssv6051/smac/ssv_cfgvendor.h b/drivers/net/wireless/ssv6051/smac/ssv_cfgvendor.h new file mode 100644 -index 000000000000..6d8696fcd220 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/ssv_cfgvendor.h @@ -0,0 +1,247 @@ @@ -44712,7 +44651,7 @@ index 000000000000..6d8696fcd220 +#endif /* _RTW_CFGVENDOR_H_ */ diff --git a/drivers/net/wireless/ssv6051/smac/ssv_ht_rc.c b/drivers/net/wireless/ssv6051/smac/ssv_ht_rc.c new file mode 100644 -index 000000000000..fae819c43400 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/ssv_ht_rc.c @@ -0,0 +1,546 @@ @@ -45264,7 +45203,7 @@ index 000000000000..fae819c43400 +} diff --git a/drivers/net/wireless/ssv6051/smac/ssv_ht_rc.h b/drivers/net/wireless/ssv6051/smac/ssv_ht_rc.h new file mode 100644 -index 000000000000..275c3356e036 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/ssv_ht_rc.h @@ -0,0 +1,31 @@ @@ -45301,7 +45240,7 @@ index 000000000000..275c3356e036 +#endif diff --git a/drivers/net/wireless/ssv6051/smac/ssv_pm.c b/drivers/net/wireless/ssv6051/smac/ssv_pm.c new file mode 100644 -index 000000000000..fc3be2013f61 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/ssv_pm.c @@ -0,0 +1,19 @@ @@ -45326,7 +45265,7 @@ index 000000000000..fc3be2013f61 +#include "sar.h" diff --git a/drivers/net/wireless/ssv6051/smac/ssv_pm.h b/drivers/net/wireless/ssv6051/smac/ssv_pm.h new file mode 100644 -index 000000000000..9be260dd904e +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/ssv_pm.h @@ -0,0 +1,20 @@ @@ -45352,7 +45291,7 @@ index 000000000000..9be260dd904e +#endif diff --git a/drivers/net/wireless/ssv6051/smac/ssv_rc.c b/drivers/net/wireless/ssv6051/smac/ssv_rc.c new file mode 100644 -index 000000000000..9c3574285364 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/ssv_rc.c @@ -0,0 +1,1716 @@ @@ -47074,7 +47013,7 @@ index 000000000000..9c3574285364 +} diff --git a/drivers/net/wireless/ssv6051/smac/ssv_rc.h b/drivers/net/wireless/ssv6051/smac/ssv_rc.h new file mode 100644 -index 000000000000..911c182897fa +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/ssv_rc.h @@ -0,0 +1,50 @@ @@ -47130,7 +47069,7 @@ index 000000000000..911c182897fa +#endif diff --git a/drivers/net/wireless/ssv6051/smac/ssv_rc_common.h b/drivers/net/wireless/ssv6051/smac/ssv_rc_common.h new file mode 100644 -index 000000000000..13f3fdd8072b +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/ssv_rc_common.h @@ -0,0 +1,175 @@ @@ -47311,7 +47250,7 @@ index 000000000000..13f3fdd8072b +#endif diff --git a/drivers/net/wireless/ssv6051/ssv6051-generic-wlan.c b/drivers/net/wireless/ssv6051/ssv6051-generic-wlan.c new file mode 100644 -index 000000000000..10a9a77081db +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/ssv6051-generic-wlan.c @@ -0,0 +1,76 @@ @@ -47393,7 +47332,7 @@ index 000000000000..10a9a77081db + diff --git a/drivers/net/wireless/ssv6051/ssvdevice/ssv_cmd.c b/drivers/net/wireless/ssv6051/ssvdevice/ssv_cmd.c new file mode 100644 -index 000000000000..503df1ea6dc3 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/ssvdevice/ssv_cmd.c @@ -0,0 +1,1765 @@ @@ -49164,7 +49103,7 @@ index 000000000000..503df1ea6dc3 +} diff --git a/drivers/net/wireless/ssv6051/ssvdevice/ssv_cmd.h b/drivers/net/wireless/ssv6051/ssvdevice/ssv_cmd.h new file mode 100644 -index 000000000000..d96bfcc54954 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/ssvdevice/ssv_cmd.h @@ -0,0 +1,50 @@ @@ -49220,7 +49159,7 @@ index 000000000000..d96bfcc54954 +#endif diff --git a/drivers/net/wireless/ssv6051/ssvdevice/ssvdevice.c b/drivers/net/wireless/ssv6051/ssvdevice/ssvdevice.c new file mode 100644 -index 000000000000..eb848553798f +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/ssvdevice/ssvdevice.c @@ -0,0 +1,256 @@ @@ -49481,5 +49420,5 @@ index 000000000000..eb848553798f +EXPORT_SYMBOL(ssvdevice_init); +EXPORT_SYMBOL(ssvdevice_exit); -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip-6.14/patches.libreelec/linux-0002-rockchip-from-list.patch b/patch/kernel/archive/rockchip-6.15/patches.libreelec/linux-0002-rockchip-from-list.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.libreelec/linux-0002-rockchip-from-list.patch rename to patch/kernel/archive/rockchip-6.15/patches.libreelec/linux-0002-rockchip-from-list.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.libreelec/linux-0011-v4l2-from-list.patch b/patch/kernel/archive/rockchip-6.15/patches.libreelec/linux-0011-v4l2-from-list.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.libreelec/linux-0011-v4l2-from-list.patch rename to patch/kernel/archive/rockchip-6.15/patches.libreelec/linux-0011-v4l2-from-list.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.libreelec/linux-1000-drm-rockchip.patch b/patch/kernel/archive/rockchip-6.15/patches.libreelec/linux-1000-drm-rockchip.patch similarity index 99% rename from patch/kernel/archive/rockchip-6.14/patches.libreelec/linux-1000-drm-rockchip.patch rename to patch/kernel/archive/rockchip-6.15/patches.libreelec/linux-1000-drm-rockchip.patch index a38ea8bbf..6cf71cac0 100644 --- a/patch/kernel/archive/rockchip-6.14/patches.libreelec/linux-1000-drm-rockchip.patch +++ b/patch/kernel/archive/rockchip-6.15/patches.libreelec/linux-1000-drm-rockchip.patch @@ -2514,3 +2514,4 @@ index 49619f794061..9915bf124374 100644 } port = of_get_child_by_name(dev->of_node, "port"); + diff --git a/patch/kernel/archive/rockchip-6.14/patches.libreelec/linux-1001-v4l2-rockchip.patch b/patch/kernel/archive/rockchip-6.15/patches.libreelec/linux-1001-v4l2-rockchip.patch similarity index 99% rename from patch/kernel/archive/rockchip-6.14/patches.libreelec/linux-1001-v4l2-rockchip.patch rename to patch/kernel/archive/rockchip-6.15/patches.libreelec/linux-1001-v4l2-rockchip.patch index 0875e0412..631c4ea7e 100644 --- a/patch/kernel/archive/rockchip-6.14/patches.libreelec/linux-1001-v4l2-rockchip.patch +++ b/patch/kernel/archive/rockchip-6.15/patches.libreelec/linux-1001-v4l2-rockchip.patch @@ -9,7 +9,7 @@ Signed-off-by: Jonas Karlman drivers/staging/media/rkvdec/rkvdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/dfrivers/staging/media/rkvdec/rkvdec.c +diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c index 4f5436c89e08..eaf2f133a264 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c diff --git a/patch/kernel/archive/rockchip-6.14/patches.libreelec/linux-1002-for-libreelec.patch b/patch/kernel/archive/rockchip-6.15/patches.libreelec/linux-1002-for-libreelec.patch similarity index 90% rename from patch/kernel/archive/rockchip-6.14/patches.libreelec/linux-1002-for-libreelec.patch rename to patch/kernel/archive/rockchip-6.15/patches.libreelec/linux-1002-for-libreelec.patch index a69442fbf..8a7de931e 100644 --- a/patch/kernel/archive/rockchip-6.14/patches.libreelec/linux-1002-for-libreelec.patch +++ b/patch/kernel/archive/rockchip-6.15/patches.libreelec/linux-1002-for-libreelec.patch @@ -11,11 +11,26 @@ is running at the same time (voltage to high) Signed-off-by: Alex Bee --- - .../arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 4 +++ + .../arm64/boot/dts/rockchip/rk3328-roc.dtsi | 4 +++ .../arm64/boot/dts/rockchip/rk3328-rock64.dts | 4 +++ arch/arm64/boot/dts/rockchip/rk3328.dtsi | 35 +++++++++++++++++++ 3 files changed, 43 insertions(+) +diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi +index aa22a0c22265..51c7723d6762 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi +@@ -166,6 +166,10 @@ &gmac2io { + status = "okay"; + }; + ++&gpu { ++ mali-supply = <&vdd_logic>; ++}; ++ + &hdmi { + status = "okay"; + }; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts index f69a38f42d2d..c198a8a7f95a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts @@ -232,6 +247,49 @@ index 40bf808642b9..27a1799027c2 100644 rockchip,hw-tshut-mode = <0>; rockchip,hw-tshut-polarity = <0>; +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Alex Bee +Date: Sat, 27 Feb 2021 18:01:13 +0100 +Subject: [PATCH] arm64: dts: rockchip: Add ir-receiver node for RK3328 ROC CC + +Signed-off-by: Alex Bee +--- + arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi +index 51c7723d6762..cf321302daec 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi +@@ -88,6 +88,13 @@ vcc_phy: vcc-phy-regulator { + regulator-boot-on; + }; + ++ ir-receiver { ++ compatible = "gpio-ir-receiver"; ++ gpios = <&gpio2 RK_PA2 GPIO_ACTIVE_LOW>; ++ pinctrl-0 = <&ir_int>; ++ pinctrl-names = "default"; ++ }; ++ + leds { + compatible = "gpio-leds"; + +@@ -312,6 +319,13 @@ &io_domains { + }; + + &pinctrl { ++ ++ ir { ++ ir_int: ir-int { ++ rockchip,pins = <2 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ }; ++ + pmic { + pmic_int_l: pmic-int-l { + rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_up>; + From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alex Bee Date: Mon, 1 Mar 2021 21:24:15 +0100 diff --git a/patch/kernel/archive/rockchip-6.14/patches.libreelec/linux-2000-v4l2-wip-rkvdec-hevc.patch b/patch/kernel/archive/rockchip-6.15/patches.libreelec/linux-2000-v4l2-wip-rkvdec-hevc.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.libreelec/linux-2000-v4l2-wip-rkvdec-hevc.patch rename to patch/kernel/archive/rockchip-6.15/patches.libreelec/linux-2000-v4l2-wip-rkvdec-hevc.patch diff --git a/patch/kernel/archive/rockchip-6.14/patches.libreelec/linux-2001-v4l2-wip-iep-driver.patch b/patch/kernel/archive/rockchip-6.15/patches.libreelec/linux-2001-v4l2-wip-iep-driver.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.14/patches.libreelec/linux-2001-v4l2-wip-iep-driver.patch rename to patch/kernel/archive/rockchip-6.15/patches.libreelec/linux-2001-v4l2-wip-iep-driver.patch diff --git a/patch/kernel/archive/rockchip-6.14/series.conf b/patch/kernel/archive/rockchip-6.15/series.conf similarity index 100% rename from patch/kernel/archive/rockchip-6.14/series.conf rename to patch/kernel/archive/rockchip-6.15/series.conf