Update kernel to 5.5.2
Between 5.4 and 5.5, apparently in commit 0e4a459f56c32d3e ("tracing:
Remove unnecessary DEBUG_FS dependency"), CONFIG_DEBUG_FS is no longer
auto-enabled. We're using that interface for obtaining an old-school
GPIO number because, well, that's what the LED GPIO trigger expects.
It would be nice to fix this upstream so that the LED GPIO trigger
accepts, say, a (chipname, gpio number) pair, but ENOTIME.
Change-Id: Ie4e3b37729389f03d7a294d0bc3cecc589ae5ed0
diff --git a/board/czechlight/beaglebone/linux.fragment b/board/czechlight/beaglebone/linux.fragment
index d4b75f3..d797963 100644
--- a/board/czechlight/beaglebone/linux.fragment
+++ b/board/czechlight/beaglebone/linux.fragment
@@ -2,3 +2,5 @@
# calibration device
CONFIG_PINCTRL_MCP23S08=y
+
+CONFIG_LOCALVERSION="-cla-bbb"
diff --git a/board/czechlight/clearfog/linux.fragment b/board/czechlight/clearfog/linux.fragment
index 08a0352..744e96d 100644
--- a/board/czechlight/clearfog/linux.fragment
+++ b/board/czechlight/clearfog/linux.fragment
@@ -44,4 +44,4 @@
CONFIG_KEYBOARD_ATKBD=N
CONFIG_INPUT_MOUSE=N
-CONFIG_LOCALVERSION="-120-ga6f372bbd6fd"
+CONFIG_LOCALVERSION="-cla-cfb"
diff --git a/board/czechlight/clearfog/patches/linux.patch b/board/czechlight/clearfog/patches/linux.patch
index 7fda40a..f8cc23e 100644
--- a/board/czechlight/clearfog/patches/linux.patch
+++ b/board/czechlight/clearfog/patches/linux.patch
@@ -42,10 +42,10 @@
+ };
+};
diff --git a/drivers/leds/leds-tlc591xx.c b/drivers/leds/leds-tlc591xx.c
-index 59ff088c7d75..c7c6f753b0d3 100644
+index a8911ebd30e5..c51268788770 100644
--- a/drivers/leds/leds-tlc591xx.c
+++ b/drivers/leds/leds-tlc591xx.c
-@@ -39,6 +39,9 @@
+@@ -40,6 +40,9 @@
#define ldev_to_led(c) container_of(c, struct tlc591xx_led, ldev)
@@ -55,7 +55,7 @@
struct tlc591xx_led {
bool active;
unsigned int led_no;
-@@ -50,21 +53,25 @@ struct tlc591xx_priv {
+@@ -51,21 +54,25 @@ struct tlc591xx_priv {
struct tlc591xx_led leds[TLC591XX_MAX_LEDS];
struct regmap *regmap;
unsigned int reg_ledout_offset;
@@ -81,21 +81,11 @@
};
static int
-@@ -137,6 +144,8 @@ tlc591xx_destroy_devices(struct tlc591xx_priv *priv, unsigned int j)
- if (priv->leds[i].active)
- led_classdev_unregister(&priv->leds[i].ldev);
- }
-+
-+ i2c_unregister_device(priv->swrst_client);
- }
+@@ -185,6 +192,18 @@ tlc591xx_probe(struct i2c_client *client,
+ if (err < 0)
+ return err;
- static int
-@@ -242,6 +251,19 @@ tlc591xx_probe(struct i2c_client *client,
- priv->leds[reg].ldev.default_trigger =
- of_get_property(child, "linux,default-trigger", NULL);
- }
-+
-+ priv->swrst_client = i2c_new_dummy(client->adapter, tlc591xx->swrst_addr);
++ priv->swrst_client = devm_i2c_new_dummy_device(dev, client->adapter, tlc591xx->swrst_addr);
+ if (priv->swrst_client) {
+ err = i2c_smbus_write_byte_data(priv->swrst_client,
+ TLC591XX_RESET_BYTE_0, TLC591XX_RESET_BYTE_1);
@@ -107,9 +97,9 @@
+ tlc591xx->swrst_addr);
+ }
+
- return tlc591xx_configure(dev, priv, tlc591xx);
- }
-
+ for_each_child_of_node(np, child) {
+ struct tlc591xx_led *led;
+ struct led_init_data init_data = {};
diff --git a/drivers/pinctrl/pinctrl-mcp23s08.c b/drivers/pinctrl/pinctrl-mcp23s08.c
index 3a235487e38d..3358891b3ea2 100644
--- a/drivers/pinctrl/pinctrl-mcp23s08.c
@@ -140,7 +130,7 @@
data->ngpio = ngpio;
diff --git a/drivers/spi/spi-orion.c b/drivers/spi/spi-orion.c
-index 6643ccdc2508..d7ec35233d7e 100644
+index c7266ef295fd..576bce155456 100644
--- a/drivers/spi/spi-orion.c
+++ b/drivers/spi/spi-orion.c
@@ -88,10 +88,6 @@ struct orion_direct_acc {
@@ -181,7 +171,7 @@
if (vaddr && xfer->tx_buf && word_len == 8) {
unsigned int cnt = count / 4;
-@@ -684,7 +680,6 @@ static int orion_spi_probe(struct platform_device *pdev)
+@@ -682,7 +678,6 @@ static int orion_spi_probe(struct platform_device *pdev)
}
for_each_available_child_of_node(pdev->dev.of_node, np) {
@@ -189,7 +179,7 @@
u32 cs;
int cs_gpio;
-@@ -752,13 +747,14 @@ static int orion_spi_probe(struct platform_device *pdev)
+@@ -750,13 +745,14 @@ static int orion_spi_probe(struct platform_device *pdev)
* This needs to get extended for the direct SPI-NOR / SPI-NAND
* support, once this gets implemented.
*/
diff --git a/board/czechlight/common/linux.fragment b/board/czechlight/common/linux.fragment
index b5f86f2..2948be1 100644
--- a/board/czechlight/common/linux.fragment
+++ b/board/czechlight/common/linux.fragment
@@ -70,6 +70,9 @@
CONFIG_LEDS_TRIGGER_NETDEV=y
CONFIG_LEDS_TRIGGER_GPIO=y
+# this is used for EDFA GPIO mapping for LED triggers (I know, I know), bot just general debugging
+CONFIG_DEBUG_FS=y
+
# network functionality for the OSC
CONFIG_BRIDGE=y
CONFIG_BRIDGE_VLAN_FILTERING=y
diff --git a/configs/czechlight_beaglebone_defconfig b/configs/czechlight_beaglebone_defconfig
index 7a5fd22..d0a1a1f 100644
--- a/configs/czechlight_beaglebone_defconfig
+++ b/configs/czechlight_beaglebone_defconfig
@@ -22,7 +22,7 @@
BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/beaglebone/genimage.cfg"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.5.2"
BR2_LINUX_KERNEL_DEFCONFIG="omap2plus"
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/common/linux.fragment $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/beaglebone/linux.fragment"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
diff --git a/configs/czechlight_clearfog_defconfig b/configs/czechlight_clearfog_defconfig
index 9c24c20..083aad3 100644
--- a/configs/czechlight_clearfog_defconfig
+++ b/configs/czechlight_clearfog_defconfig
@@ -25,7 +25,7 @@
BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/genimage.cfg"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.5.2"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/patches/linux.patch"
BR2_LINUX_KERNEL_DEFCONFIG="mvebu_v7"
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/linux.fragment $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/common/linux.fragment"