clearfog: Upgrade kernel
Let's move the I2C recovery into a kernel patch for upstreaming.
Also make sure that the version number is correctly set -- the relevant
branch in our kernel fork is cesnet/2022-02-17.
Change-Id: I6c2dcda4dfbccf4fe67c9536f8158c06e5c1cd27
Fixes: a12acd9 Update kernel
Fixes: f281b0c clearfog: implement I2C bus recovery
diff --git a/board/czechlight/clearfog/linux.fragment b/board/czechlight/clearfog/linux.fragment
index d939b71..f0fae65 100644
--- a/board/czechlight/clearfog/linux.fragment
+++ b/board/czechlight/clearfog/linux.fragment
@@ -51,4 +51,4 @@
CONFIG_KEYBOARD_ATKBD=N
CONFIG_INPUT_MOUSE=N
-CONFIG_LOCALVERSION="-14-gad5a3c2ef4a2"
+CONFIG_LOCALVERSION="-6-gfc198736eda4"
diff --git a/board/czechlight/clearfog/patches/linux.patch b/board/czechlight/clearfog/patches/linux.patch
index ae58a70..934e3e5 100644
--- a/board/czechlight/clearfog/patches/linux.patch
+++ b/board/czechlight/clearfog/patches/linux.patch
@@ -41,6 +41,35 @@
+ gpio-line-names = ...
+ };
+};
+diff --git a/arch/arm/boot/dts/armada-388-clearfog.dtsi b/arch/arm/boot/dts/armada-388-clearfog.dtsi
+index f8a06ae4a3c9..8f32e05b6d87 100644
+--- a/arch/arm/boot/dts/armada-388-clearfog.dtsi
++++ b/arch/arm/boot/dts/armada-388-clearfog.dtsi
+@@ -196,8 +196,12 @@ &i2c1 {
+ */
+ clock-frequency = <100000>;
+ pinctrl-0 = <&clearfog_i2c1_pins>;
+- pinctrl-names = "default";
++ pinctrl-1 = <&clearfog_i2c1_recovery_pins>;
++ pinctrl-names = "default", "gpio";
+ status = "okay";
++ single-master;
++ scl-gpios = <&gpio0 26 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
++ sda-gpios = <&gpio0 27 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+ };
+
+ &pinctrl {
+@@ -206,6 +210,10 @@ clearfog_i2c1_pins: i2c1-pins {
+ marvell,pins = "mpp26", "mpp27";
+ marvell,function = "i2c1";
+ };
++ clearfog_i2c1_recovery_pins: i2c1-recovery-pins {
++ marvell,pins = "mpp26", "mpp27";
++ marvell,function = "gpio";
++ };
+ clearfog_sdhci_cd_pins: clearfog-sdhci-cd-pins {
+ marvell,pins = "mpp20";
+ marvell,function = "gpio";
diff --git a/drivers/leds/leds-tlc591xx.c b/drivers/leds/leds-tlc591xx.c
index cb7bd1353f9f..85865f1628d7 100644
--- a/drivers/leds/leds-tlc591xx.c
diff --git a/board/czechlight/clearfog/sdn-roadm-clearfog.dtsi b/board/czechlight/clearfog/sdn-roadm-clearfog.dtsi
index c502435..6a8715a 100644
--- a/board/czechlight/clearfog/sdn-roadm-clearfog.dtsi
+++ b/board/czechlight/clearfog/sdn-roadm-clearfog.dtsi
@@ -46,11 +46,6 @@
marvell,pins = "mpp24", "mpp25";
marvell,function = "gpio";
};
-
- clearfog_i2c1_recovery_pins: clearfog-i2c1-recovery-pins {
- marvell,pins = "mpp26", "mpp27";
- marvell,function = "gpio";
- };
};
&mikro_uart_pins {
@@ -229,12 +224,6 @@
};
&i2c1 {
- pinctrl-names = "default", "gpio";
- pinctrl-1 = <&clearfog_i2c1_recovery_pins>;
- single-master;
- scl-gpios = <&gpio0 26 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
- sda-gpios = <&gpio0 27 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
-
#ifdef CLEARFOG_REV1
eeprom@53 {
compatible = "atmel,24c128";
diff --git a/configs/czechlight_clearfog_defconfig b/configs/czechlight_clearfog_defconfig
index 287138a..e4b4bd4 100644
--- a/configs/czechlight_clearfog_defconfig
+++ b/configs/czechlight_clearfog_defconfig
@@ -27,7 +27,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.16"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.10"
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"