BigTreeTech: Bump edge to 6.5

It was kept back at 6.2 because ws2812 driver was not compiling. Fixed
the compilation issue and hence moving it up to 6.5 kernel
This commit is contained in:
Gunjan Gupta 2023-09-22 05:40:24 +05:30
parent 462ec7c431
commit d2962b071d
3 changed files with 6 additions and 26 deletions

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 6.5.3 Kernel Configuration
# Linux/arm64 6.5.4 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0"
CONFIG_CC_IS_GCC=y
@ -6252,7 +6252,7 @@ CONFIG_LEDS_AXP20X=m
# CONFIG_LEDS_PWM_MULTICOLOR is not set
# CONFIG_LEDS_QCOM_LPG is not set
# CONFIG_LEDS_MT6370_RGB is not set
# CONFIG_LEDS_WS2812 is not set
CONFIG_LEDS_WS2812=m
#
# LED Triggers

View File

@ -41,28 +41,9 @@ case $BRANCH in
ATF_TARGET_MAP='PLAT=sun50i_h616 DEBUG=1 bl31;;build/sun50i_h616/debug/bl31.bin'
BOOTSCRIPT='boot-sun50i-next.cmd:boot.cmd'
# Stick to 6.2.16 kernel for edge until ws2812 driver is fixed
if [[ "$BRANCH" == "edge" ]]; then
LINUXFAMILY="sun50iw9-btt" # Use a separate kernel deb
LINUXCONFIG="linux-sunxi64-edge" # But the same kernel config, will be modified below in armbian_kernel_config__enable_ws2812_driver
KERNEL_MAJOR_MINOR="6.2"
KERNELBRANCH="tag:v6.2.16"
KERNELPATCHDIR="archive/sunxi-${KERNEL_MAJOR_MINOR}"
fi
;;
esac
# Enable ws2812 driver for edge kernel
function armbian_kernel_config__enable_ws2812_driver() {
if [[ "$BRANCH" == "edge" ]]; then
kernel_config_modifying_hashes+=("CONFIG_LEDS_WS2812=m")
if [[ -f .config ]]; then
kernel_config_set_m CONFIG_LEDS_WS2812
fi
fi
}
# This build requires busybox (and dos2unix)
function add_host_dependencies__sun50iw9_add_busybox_hostdep() {
display_alert "Adding busybox dep" "for ${BOARD} bootloader compile" "debug"

View File

@ -6,8 +6,8 @@ Subject: [PATCH] Add: ws2812 RGB driver for allwinner H616
---
drivers/leds/rgb/Kconfig | 7 +
drivers/leds/rgb/Makefile | 1 +
drivers/leds/rgb/leds-ws2812.c | 230 +++++++++++++++++++++++++++++++++
3 files changed, 238 insertions(+)
drivers/leds/rgb/leds-ws2812.c | 229 +++++++++++++++++++++++++++++++++
3 files changed, 237 insertions(+)
create mode 100644 drivers/leds/rgb/leds-ws2812.c
diff --git a/drivers/leds/rgb/Kconfig b/drivers/leds/rgb/Kconfig
@ -40,7 +40,7 @@ new file mode 100644
index 000000000000..a89030fe815e
--- /dev/null
+++ b/drivers/leds/rgb/leds-ws2812.c
@@ -0,0 +1,230 @@
@@ -0,0 +1,229 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2023, The Linux Foundation. All rights reserved.
@ -206,7 +206,6 @@ index 000000000000..a89030fe815e
+static int ws2812_probe(struct platform_device *pdev)
+{
+ int ret;
+ enum of_gpio_flags flag;
+ struct device_node *ws2812_gpio_node = pdev->dev.of_node;
+ uint32_t rgb_cnt = 0;
+ uint32_t rgb[255];
@ -216,7 +215,7 @@ index 000000000000..a89030fe815e
+ rgb_cnt = 255;
+
+ of_property_read_u32_array(ws2812_gpio_node, "rgb_value", rgb, rgb_cnt);
+ ws2812_pin = of_get_named_gpio_flags(ws2812_gpio_node, "gpios", 0, &flag);
+ ws2812_pin = of_get_named_gpio(ws2812_gpio_node, "gpios", 0);
+ if (!gpio_is_valid(ws2812_pin))
+ {
+ printk(KERN_ERR "ws2812: gpio: %d is invalid\n", ws2812_pin);