[WiP] 6.18-rcX bump collab (uefi-*/rockchip64/meson64/wifi/etc)

config/kernel/linux-rockchip64-edge.config

@@ -2108,6 +2108,8 @@ CONFIG_BACKLIGHT_RAVE_SP=m
 CONFIG_BACKLIGHT_LED=m
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_LOGO=y
+CONFIG_DRM_ACCEL=y
+CONFIG_DRM_ACCEL_ROCKET=m
 CONFIG_SOUND=y
 CONFIG_SND=y
 # CONFIG_SND_SUPPORT_OLD_API is not set

config/sources/families/include/meson64_common.inc

@@ -41,7 +41,7 @@ case $BRANCH in
 		declare -g KERNEL_MAJOR_MINOR="6.12"
 		;;
 	edge)
-		declare -g KERNEL_MAJOR_MINOR="6.17"
+		declare -g KERNEL_MAJOR_MINOR="6.18"
 		;;
 
 esac

config/sources/families/include/rockchip64_common.inc

@@ -33,7 +33,7 @@ case $BRANCH in
 		;;
 
 	edge)
-		declare -g KERNEL_MAJOR_MINOR="6.17"
+		declare -g KERNEL_MAJOR_MINOR="6.18"
 		declare -g LINUXFAMILY=rockchip64
 		declare -g LINUXCONFIG='linux-rockchip64-'$BRANCH
 		;;

config/sources/families/include/uefi_common.inc

@@ -41,7 +41,7 @@ case "${BRANCH}" in
 		;;
 
 	edge)
-		declare -g KERNEL_MAJOR_MINOR="6.17"
+		declare -g KERNEL_MAJOR_MINOR="6.18"
 		;;
 esac
 

lib/functions/compilation/patch/drivers_network.sh

@@ -373,6 +373,8 @@ driver_rtw88() {
 
 driver_rtl8852bs() {
 
+	return 0 # broken 6.18: int hmac_sha256(const u8 *key, size_t key_len, const u8 *data
+
 	# Wireless driver for Realtek 8852BS SDIO Wireless driver used in BananaPi F3 and Armsom Sige5
 
 	if linux-version compare "${version}" ge 6.1 && [[ "${LINUXFAMILY}" == spacemit || "${LINUXFAMILY}" == rk35xx || "${LINUXFAMILY}" == rockchip64 ]]; then
@@ -436,6 +438,8 @@ driver_rtl8852bs() {
 
 driver_rtl88x2cs() {
 
+	return 0 # broken 6.18 meson64: error: conflicting types for 'hmac_sha256'; have 'int(const u8 *, size_t,  const u8 *, size_t,  u8 *)' {aka 'int(const unsigned char *, long unsigned int,  const unsigned char *, long unsigned int,  unsigned char *)'}
+
 	# Wireless drivers for Realtek 88x2cs chipsets
 	# Only used for meson64 family boards, use mainline rtw88 driver for all other boards
 
@@ -665,6 +669,8 @@ driver_rtl8723cs() {
 ###  the RTW88 driver for the chip configures its RF gains incorrectly
 driver_rtl8723DS() {
 
+	return 0 # TODO: Broken 6.18: static void sha256_init(struct rtl_sha256_state *md)
+
 	# Wireless drivers for Realtek 8723DS chipsets
 
 	if linux-version compare "${version}" ge 5.0; then

patch/kernel/archive/meson64-6.17/board-bananapim5-001-sd-use-270-mmc-clock-phase-via-dt.patch → patch/kernel/archive/meson64-6.18/board-bananapim5-001-sd-use-270-mmc-clock-phase-via-dt.patch

@@ -22,7 +22,7 @@ index 111111111111..222222222222 100644
 
  / {
  	adc-keys {
-@@ -388,6 +389,8 @@ &sd_emmc_b {
+@@ -387,6 +388,8 @@ &sd_emmc_b {
  	cd-gpios = <&gpio GPIOC_6 GPIO_ACTIVE_LOW>;
  	vmmc-supply = <&tflash_vdd>;
  	vqmmc-supply = <&vddio_c>;
@@ -31,7 +31,7 @@ index 111111111111..222222222222 100644
  };
 
  /* eMMC */
-@@ -407,6 +410,8 @@ &sd_emmc_c {
+@@ -406,6 +409,8 @@ &sd_emmc_c {
  	mmc-pwrseq = <&emmc_pwrseq>;
  	vmmc-supply = <&vddao_3v3>;
  	vqmmc-supply = <&emmc_1v8>;

patch/kernel/archive/meson64-6.17/board-bananapism1-add-uart_A-and-AO_B.patch → patch/kernel/archive/meson64-6.18/board-bananapism1-add-uart_A-and-AO_B.patch

@@ -69,7 +69,7 @@ index 111111111111..222222222222 100644
  		ethernet0 = &ethmac;
  	};
 
-@@ -420,6 +421,12 @@ &uart_AO {
+@@ -419,6 +420,12 @@ &uart_AO {
  	pinctrl-names = "default";
  };
 

patch/kernel/archive/meson64-6.17/board-odroidc2-add-uartA-uartC.patch → patch/kernel/archive/meson64-6.18/board-odroidc2-add-uartA-uartC.patch

@@ -26,7 +26,7 @@ index 111111111111..222222222222 100644
  		ethernet0 = &ethmac;
  	};
 
-@@ -387,6 +389,18 @@ &uart_AO {
+@@ -383,6 +385,18 @@ &uart_AO {
  	pinctrl-names = "default";
  };
 

patch/kernel/archive/meson64-6.17/board-t95z-add-rc-remote-keymap.patch → patch/kernel/archive/meson64-6.18/board-t95z-add-rc-remote-keymap.patch

@@ -34,7 +34,7 @@ diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentat
 index 111111111111..222222222222 100644
 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
 +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
-@@ -1504,6 +1504,8 @@ patternProperties:
+@@ -1560,6 +1560,8 @@ patternProperties:
      description: Sundance DSP Inc.
    "^sunplus,.*":
      description: Sunplus Technology Co., Ltd.

patch/kernel/archive/meson64-6.17/general-add-overlay-compilation-support.patch → patch/kernel/archive/meson64-6.18/general-add-overlay-compilation-support.patch

@@ -36,7 +36,7 @@ diff --git a/scripts/Makefile.dtbs b/scripts/Makefile.dtbs
 index 111111111111..222222222222 100644
 --- a/scripts/Makefile.dtbs
 +++ b/scripts/Makefile.dtbs
-@@ -122,17 +122,23 @@ dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
+@@ -123,17 +123,23 @@ dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
  quiet_cmd_dtc = DTC $(quiet_dtb_check_tag) $@
        cmd_dtc = \
  	$(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \

patch/kernel/archive/meson64-6.17/general-fix-Kodi-sysinfo-CPU-information.patch → patch/kernel/archive/meson64-6.18/general-fix-Kodi-sysinfo-CPU-information.patch

@@ -16,7 +16,7 @@ diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c
 index 111111111111..222222222222 100644
 --- a/arch/arm64/kernel/cpuinfo.c
 +++ b/arch/arm64/kernel/cpuinfo.c
-@@ -223,9 +223,8 @@ static int c_show(struct seq_file *m, void *v)
+@@ -224,9 +224,8 @@ static int c_show(struct seq_file *m, void *v)
  	 * "processor".  Give glibc what it expects.
  	 */
  	seq_printf(m, "processor\t: %d\n", cpu);

patch/kernel/archive/meson64-6.17/general-input-touchscreen-Add-D-WAV-Multitouch.patch → patch/kernel/archive/meson64-6.18/general-input-touchscreen-Add-D-WAV-Multitouch.patch

@@ -16,7 +16,7 @@ diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
 index 111111111111..222222222222 100644
 --- a/drivers/hid/hid-ids.h
 +++ b/drivers/hid/hid-ids.h
-@@ -1540,4 +1540,10 @@
+@@ -1542,4 +1542,10 @@
  #define USB_VENDOR_ID_SMARTLINKTECHNOLOGY              0x4c4a
  #define USB_DEVICE_ID_SMARTLINKTECHNOLOGY_4155         0x4155
 
@@ -31,7 +31,7 @@ diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
 index 111111111111..222222222222 100644
 --- a/drivers/hid/hid-quirks.c
 +++ b/drivers/hid/hid-quirks.c
-@@ -912,6 +912,8 @@ static const struct hid_device_id hid_ignore_list[] = {
+@@ -914,6 +914,8 @@ static const struct hid_device_id hid_ignore_list[] = {
  	{ HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_HP_5MP_CAMERA_5473) },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_SMARTLINKTECHNOLOGY, USB_DEVICE_ID_SMARTLINKTECHNOLOGY_4155) },
@@ -44,7 +44,7 @@ diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconf
 index 111111111111..222222222222 100644
 --- a/drivers/input/touchscreen/Kconfig
 +++ b/drivers/input/touchscreen/Kconfig
-@@ -1402,4 +1402,14 @@ config TOUCHSCREEN_HIMAX_HX83112B
+@@ -1424,4 +1424,14 @@ config TOUCHSCREEN_HIMAX_HX83112B
  	  To compile this driver as a module, choose M here: the
  	  module will be called himax_hx83112b.
 
@@ -63,7 +63,7 @@ diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Make
 index 111111111111..222222222222 100644
 --- a/drivers/input/touchscreen/Makefile
 +++ b/drivers/input/touchscreen/Makefile
-@@ -117,4 +117,5 @@ obj-$(CONFIG_TOUCHSCREEN_RASPBERRYPI_FW)	+= raspberrypi-ts.o
+@@ -119,4 +119,5 @@ obj-$(CONFIG_TOUCHSCREEN_RASPBERRYPI_FW)	+= raspberrypi-ts.o
  obj-$(CONFIG_TOUCHSCREEN_IQS5XX)	+= iqs5xx.o
  obj-$(CONFIG_TOUCHSCREEN_IQS7211)	+= iqs7211.o
  obj-$(CONFIG_TOUCHSCREEN_ZINITIX)	+= zinitix.o

patch/kernel/archive/meson64-6.17/general-meson-mmc-2-arm64-amlogic-dts-meson-update-meson-axg-device-tree.patch → patch/kernel/archive/meson64-6.18/general-meson-mmc-2-arm64-amlogic-dts-meson-update-meson-axg-device-tree.patch

@@ -23,15 +23,15 @@ index 111111111111..222222222222 100644
 
  / {
  	compatible = "amlogic,meson-axg";
-@@ -1938,6 +1939,7 @@ sd_emmc_b: mmc@5000 {
+@@ -1959,6 +1960,7 @@ sd_emmc_b: mmc@5000 {
  					<&clkc CLKID_SD_EMMC_B_CLK0>,
  					<&clkc CLKID_FCLK_DIV2>;
  				clock-names = "core", "clkin0", "clkin1";
 +				amlogic,mmc-phase = <CLK_PHASE_270 CLK_PHASE_0 CLK_PHASE_0>;
  				resets = <&reset RESET_SD_EMMC_B>;
  			};
 
-@@ -1951,6 +1953,7 @@ sd_emmc_c: mmc@7000 {
+@@ -1972,6 +1974,7 @@ sd_emmc_c: mmc@7000 {
  					<&clkc CLKID_FCLK_DIV2>;
  				clock-names = "core", "clkin0", "clkin1";
  				resets = <&reset RESET_SD_EMMC_C>;

patch/kernel/archive/meson64-6.17/general-soc-0004-arm64-dts-meson-add-dts-links-to-secure-monitor-for-.patch → patch/kernel/archive/meson64-6.18/general-soc-0004-arm64-dts-meson-add-dts-links-to-secure-monitor-for-.patch

@@ -19,7 +19,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-a1.dtsi b/arch/arm64/boot/dts/aml
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-a1.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-a1.dtsi
-@@ -626,6 +626,7 @@ hwrng: rng@5118 {
+@@ -641,6 +641,7 @@ hwrng: rng@5118 {
  			sec_AO: ao-secure@5a20 {
  				compatible = "amlogic,meson-gx-ao-secure", "syscon";
  				reg = <0x0 0x5a20 0x0 0x140>;
@@ -31,7 +31,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/am
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
-@@ -1690,6 +1690,7 @@ mux {
+@@ -1711,6 +1711,7 @@ mux {
  			sec_AO: ao-secure@140 {
  				compatible = "amlogic,meson-gx-ao-secure", "syscon";
  				reg = <0x0 0x140 0x0 0x140>;
@@ -55,7 +55,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/aml
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
-@@ -471,6 +471,7 @@ cec_AO: cec@100 {
+@@ -498,6 +498,7 @@ cec_AO: cec@100 {
  			sec_AO: ao-secure@140 {
  				compatible = "amlogic,meson-gx-ao-secure", "syscon";
  				reg = <0x0 0x140 0x0 0x140>;

patch/kernel/archive/meson64-6.17/meson-g12a-pinctrl-add-missing-ir-options.patch → patch/kernel/archive/meson64-6.18/meson-g12a-pinctrl-add-missing-ir-options.patch

@@ -59,15 +59,15 @@ index 111111111111..222222222222 100644
  /* uart_a */
  static const unsigned int uart_a_tx_pins[]		= { GPIOX_12 };
  static const unsigned int uart_a_rx_pins[]		= { GPIOX_13 };
-@@ -753,6 +756,7 @@ static const struct meson_pmx_group meson_g12a_periphs_groups[] = {
+@@ -756,6 +759,7 @@ static const struct meson_pmx_group meson_g12a_periphs_groups[] = {
  	/* bank GPIOA */
  	GROUP(i2c3_sda_a,		2),
  	GROUP(i2c3_sck_a,		2),
 +	GROUP(remote_input,		1),
  	GROUP(pdm_din0_a,		1),
  	GROUP(pdm_din1_a,		1),
  	GROUP(pdm_din2_a,		1),
-@@ -1038,6 +1042,10 @@ static const char * const i2c3_groups[] = {
+@@ -1041,6 +1045,10 @@ static const char * const i2c3_groups[] = {
  	"i2c3_sda_a", "i2c3_sck_a",
  };
 
@@ -78,7 +78,7 @@ index 111111111111..222222222222 100644
  static const char * const uart_a_groups[] = {
  	"uart_a_tx", "uart_a_rx", "uart_a_cts", "uart_a_rts",
  };
-@@ -1282,6 +1290,7 @@ static const struct meson_pmx_func meson_g12a_periphs_functions[] = {
+@@ -1289,6 +1297,7 @@ static const struct meson_pmx_func meson_g12a_periphs_functions[] = {
  	FUNCTION(i2c1),
  	FUNCTION(i2c2),
  	FUNCTION(i2c3),

patch/kernel/archive/meson64-6.17/meson-g12b-dt-Add-missing-pinmux-node-for-pwm.patch → patch/kernel/archive/meson64-6.18/meson-g12b-dt-Add-missing-pinmux-node-for-pwm.patch

@@ -13,7 +13,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi b/arch/arm64/boot/dts/a
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
-@@ -149,3 +149,45 @@ &pmu {
+@@ -197,3 +197,45 @@ &pmu {
  &npu {
  	power-domains = <&pwrc PWRC_G12A_NNA_ID>;
  };

patch/kernel/archive/meson64-6.17/meson-gx-dts-add-support-for-GX-PM-and-VRTC.patch → patch/kernel/archive/meson64-6.18/meson-gx-dts-add-support-for-GX-PM-and-VRTC.patch

@@ -12,7 +12,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/aml
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
-@@ -223,6 +223,10 @@ sm: secure-monitor {
+@@ -250,6 +250,10 @@ sm: secure-monitor {
  		};
  	};
 
@@ -23,7 +23,7 @@ index 111111111111..222222222222 100644
  	efuse: efuse {
  		compatible = "amlogic,meson-gx-efuse", "amlogic,meson-gxbb-efuse";
  		#address-cells = <1>;
-@@ -461,6 +465,11 @@ clkc_AO: clock-controller {
+@@ -488,6 +492,11 @@ clkc_AO: clock-controller {
  				};
  			};
 

patch/kernel/archive/meson64-6.17/meson-sm1-dts-add-higher-clocks.patch → patch/kernel/archive/meson64-6.18/meson-sm1-dts-add-higher-clocks.patch

@@ -12,7 +12,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi b/arch/arm64/boot/dts/am
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
-@@ -137,6 +137,16 @@ opp-1908000000 {
+@@ -164,6 +164,16 @@ opp-1908000000 {
  			opp-hz = /bits/ 64 <1908000000>;
  			opp-microvolt = <950000>;
  		};