diff --git a/patch.sh b/patch.sh index acb45861c8484372f441f91ef622e693a59f587a..99a9edee15fc78829133ce0f24b6cadd3169d376 100644 --- a/patch.sh +++ b/patch.sh @@ -351,6 +351,7 @@ ti_pm_firmware () { next_dtbs () { dir 'dts/omap' dir 'dts/omap_pruss' + dir 'dts/omap_sancloud' } cleanup_dts_builds () { @@ -539,7 +540,7 @@ dir 'le9' packaging () { #do_backport="enable" if [ "x${do_backport}" = "xenable" ] ; then - backport_tag="v5.10.55" + backport_tag="v5.10.57" subsystem="bindeb-pkg" #regenerate="enable" diff --git a/patches/defconfig b/patches/defconfig index 88fbc9f543c32bff8f880ebdaae92e96a637ca3e..f687072089fa95979141111e352b60ea2c345a92 100644 --- a/patches/defconfig +++ b/patches/defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.14.0-rc4 Kernel Configuration +# Linux/arm 5.14.0-rc5 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabi-gcc (GCC) 11.1.0" CONFIG_CC_IS_GCC=y diff --git a/patches/dts/omap_sancloud/0001-ARM-dts-am335x-sancloud-bbe-Fix-missing-pinctrl-refs.patch b/patches/dts/omap_sancloud/0001-ARM-dts-am335x-sancloud-bbe-Fix-missing-pinctrl-refs.patch new file mode 100644 index 0000000000000000000000000000000000000000..392b2730499b4c48eb6a6b3c8ad10504465ea573 --- /dev/null +++ b/patches/dts/omap_sancloud/0001-ARM-dts-am335x-sancloud-bbe-Fix-missing-pinctrl-refs.patch @@ -0,0 +1,52 @@ +From fda013ac3fdb43645cb92baea492440eae3a163d Mon Sep 17 00:00:00 2001 +From: Paul Barker <paul.barker@sancloud.com> +Date: Fri, 6 Aug 2021 09:59:06 +0100 +Subject: [PATCH 1/2] ARM: dts: am335x-sancloud-bbe: Fix missing pinctrl refs + +pinctrl settings for the USB hub, barometer & accelerometer need to be +referenced from the relevant nodes to work. + +Signed-off-by: Paul Barker <paul.barker@sancloud.com> +--- + arch/arm/boot/dts/am335x-sancloud-bbe-common.dtsi | 2 ++ + arch/arm/boot/dts/am335x-sancloud-bbe.dts | 4 ++++ + 2 files changed, 6 insertions(+) + +diff --git a/arch/arm/boot/dts/am335x-sancloud-bbe-common.dtsi b/arch/arm/boot/dts/am335x-sancloud-bbe-common.dtsi +index bd9c21813192..1d6fdd9de759 100644 +--- a/arch/arm/boot/dts/am335x-sancloud-bbe-common.dtsi ++++ b/arch/arm/boot/dts/am335x-sancloud-bbe-common.dtsi +@@ -88,6 +88,8 @@ &cpsw_emac0 { + + &i2c0 { + usb2512b: usb-hub@2c { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&usb_hub_ctrl>; + compatible = "microchip,usb2512b"; + reg = <0x2c>; + reset-gpios = <&gpio0 29 GPIO_ACTIVE_LOW>; +diff --git a/arch/arm/boot/dts/am335x-sancloud-bbe.dts b/arch/arm/boot/dts/am335x-sancloud-bbe.dts +index 2a0ac9f5dda7..efbe93135dbe 100644 +--- a/arch/arm/boot/dts/am335x-sancloud-bbe.dts ++++ b/arch/arm/boot/dts/am335x-sancloud-bbe.dts +@@ -32,6 +32,8 @@ AM33XX_PADCONF(AM335X_PIN_GPMC_A10, PIN_INPUT, MUX_MODE7) /* gpmc_a10.gpio1_ + + &i2c0 { + lps331ap: barometer@5c { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&lps3331ap_pins>; + compatible = "st,lps331ap-press"; + st,drdy-int-pin = <1>; + reg = <0x5c>; +@@ -40,6 +42,8 @@ lps331ap: barometer@5c { + }; + + mpu6050: accelerometer@68 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&mpu6050_pins>; + compatible = "invensense,mpu6050"; + reg = <0x68>; + interrupt-parent = <&gpio0>; +-- +2.30.2 + diff --git a/patches/dts/omap_sancloud/0002-ARM-dts-am335x-sancloud-bbe-Drop-usb-wifi-comment.patch b/patches/dts/omap_sancloud/0002-ARM-dts-am335x-sancloud-bbe-Drop-usb-wifi-comment.patch new file mode 100644 index 0000000000000000000000000000000000000000..ab1376e39407f5cc8855043e3795cce5c94f0a63 --- /dev/null +++ b/patches/dts/omap_sancloud/0002-ARM-dts-am335x-sancloud-bbe-Drop-usb-wifi-comment.patch @@ -0,0 +1,26 @@ +From 1aa678f383102e4295cfe09611eb210840d45f6f Mon Sep 17 00:00:00 2001 +From: Paul Barker <paul.barker@sancloud.com> +Date: Fri, 6 Aug 2021 09:59:07 +0100 +Subject: [PATCH 2/2] ARM: dts: am335x-sancloud-bbe: Drop usb wifi comment + +The wifi chip on USB port 4 may not be present on all BBE variants. + +Signed-off-by: Paul Barker <paul.barker@sancloud.com> +--- + arch/arm/boot/dts/am335x-sancloud-bbe-common.dtsi | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/arch/arm/boot/dts/am335x-sancloud-bbe-common.dtsi b/arch/arm/boot/dts/am335x-sancloud-bbe-common.dtsi +index 1d6fdd9de759..8fc869afbd25 100644 +--- a/arch/arm/boot/dts/am335x-sancloud-bbe-common.dtsi ++++ b/arch/arm/boot/dts/am335x-sancloud-bbe-common.dtsi +@@ -93,6 +93,5 @@ usb2512b: usb-hub@2c { + compatible = "microchip,usb2512b"; + reg = <0x2c>; + reset-gpios = <&gpio0 29 GPIO_ACTIVE_LOW>; +- /* wifi on port 4 */ + }; + }; +-- +2.30.2 + diff --git a/patches/git/BBDTBS b/patches/git/BBDTBS index 288361dc7dd72c3d993e5cf96f31a9b6380b61d0..caa286d08c30b9c38aadb6cc33d3ad74254685b8 100644 --- a/patches/git/BBDTBS +++ b/patches/git/BBDTBS @@ -1 +1 @@ -BBDTBS: https://github.com/beagleboard/BeagleBoard-DeviceTrees/commit/a12b122929eeb34d8f59ff44c6f3f77a7472f536 +BBDTBS: https://github.com/beagleboard/BeagleBoard-DeviceTrees/commit/29d17c0f12f3273633df37dc5b8ccb9d5a01a93d diff --git a/patches/git/WIRELESS_REGDB b/patches/git/WIRELESS_REGDB index 29adab5861fd06c1451a09a2fdfddf278013c96d..3ba5ed8ec469ac22309bb82ec900cb6413c5d40e 100644 --- a/patches/git/WIRELESS_REGDB +++ b/patches/git/WIRELESS_REGDB @@ -1 +1 @@ -WIRELESS_REGDB: https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git/commit/?id=cdf854d2ddca01bf126ac138a8ee3e5d6320086f +WIRELESS_REGDB: https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git/commit/?id=a0bcb88f614b58e708a4f456c3cb594a1bd1b00d diff --git a/patches/ref_omap2plus_defconfig b/patches/ref_omap2plus_defconfig index ae6b60883d791f77948fa5e06ecaa34f8694f788..8397dcb26e918151bb1de2fc99b9539b21962929 100644 --- a/patches/ref_omap2plus_defconfig +++ b/patches/ref_omap2plus_defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.14.0-rc4 Kernel Configuration +# Linux/arm 5.14.0-rc5 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabi-gcc (GCC) 11.1.0" CONFIG_CC_IS_GCC=y diff --git a/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-Device-Tree-Changes.patch b/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-Device-Tree-Changes.patch index 87bbc7eb55542abbae48f35da9341078a09f234a..ca77f09bcada8976ccefcad7d24c1003220c5175 100644 --- a/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-Device-Tree-Changes.patch +++ b/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-Device-Tree-Changes.patch @@ -1,11 +1,11 @@ -From 66e1d5e28a13eedeba0ac0df36fd1d47d8254e5b Mon Sep 17 00:00:00 2001 +From 8ccb5b9afea7154eee86b3b9f10b07017a5b0671 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Wed, 4 Aug 2021 18:29:38 -0500 +Date: Mon, 9 Aug 2021 17:16:08 -0500 Subject: [PATCH] Add BeagleBoard.org Device Tree Changes https://github.com/beagleboard/BeagleBoard-DeviceTrees/tree/v5.14.x -https://github.com/beagleboard/BeagleBoard-DeviceTrees/commit/a12b122929eeb34d8f59ff44c6f3f77a7472f536 +https://github.com/beagleboard/BeagleBoard-DeviceTrees/commit/29d17c0f12f3273633df37dc5b8ccb9d5a01a93d Signed-off-by: Robert Nelson <robertcnelson@gmail.com> --- arch/arm/boot/dts/Makefile | 2 + @@ -978,7 +978,7 @@ index d6ef19311a91..4ad64675b84d 100644 reg = <0>; spi-max-frequency = <16000000>; diff --git a/arch/arm/boot/dts/am335x-sancloud-bbe.dts b/arch/arm/boot/dts/am335x-sancloud-bbe.dts -index 2a0ac9f5dda7..a0f3ccfb8579 100644 +index efbe93135dbe..5df4fc464e45 100644 --- a/arch/arm/boot/dts/am335x-sancloud-bbe.dts +++ b/arch/arm/boot/dts/am335x-sancloud-bbe.dts @@ -14,6 +14,11 @@ diff --git a/patches/wireless_regdb/0001-Add-wireless-regdb-regulatory-database-file.patch b/patches/wireless_regdb/0001-Add-wireless-regdb-regulatory-database-file.patch index 018e9bcfdbecd9713637180d78d2321fe381aad9..a0cfa54783a00bbb1e3cae0ac0eed5fed18ac024 100644 --- a/patches/wireless_regdb/0001-Add-wireless-regdb-regulatory-database-file.patch +++ b/patches/wireless_regdb/0001-Add-wireless-regdb-regulatory-database-file.patch @@ -1,9 +1,9 @@ -From 1e11e01a1af21ca83e03beaa63609e0a3f05bdf0 Mon Sep 17 00:00:00 2001 +From abc319c76fc18ded95578781bd055110a3714bf2 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Tue, 3 Aug 2021 09:22:39 -0500 +Date: Mon, 9 Aug 2021 17:06:51 -0500 Subject: [PATCH] Add wireless-regdb regulatory database file -https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git/commit/?id=cdf854d2ddca01bf126ac138a8ee3e5d6320086f +https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git/commit/?id=a0bcb88f614b58e708a4f456c3cb594a1bd1b00d Signed-off-by: Robert Nelson <robertcnelson@gmail.com> --- firmware/regulatory.db | Bin 0 -> 4036 bytes diff --git a/patches/wpanusb/0001-merge-wpanusb-https-github.com-statropy-wpanusb.patch b/patches/wpanusb/0001-merge-wpanusb-https-github.com-statropy-wpanusb.patch index 3d6b90a2f0717369a0122c1d6dadd8d6f915f761..0b911260ac6315c776a7487c6ca4acf6716044ed 100644 --- a/patches/wpanusb/0001-merge-wpanusb-https-github.com-statropy-wpanusb.patch +++ b/patches/wpanusb/0001-merge-wpanusb-https-github.com-statropy-wpanusb.patch @@ -1,6 +1,6 @@ -From 6cf0fbc2d1c6fe6c7d6e491f5d84c905f0b2f119 Mon Sep 17 00:00:00 2001 +From 6ff22b0cf5cf8b43a85ad441129e29d32e240064 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Tue, 3 Aug 2021 09:22:26 -0500 +Date: Mon, 9 Aug 2021 17:06:36 -0500 Subject: [PATCH] merge: wpanusb: https://github.com/statropy/wpanusb https://github.com/statropy/wpanusb/commit/251f0167545bf2dcaa3cad991a59dbf5ab05490a diff --git a/version.sh b/version.sh index bef381c4ec8b4dbb22dace06906423fe41ecc18a..28c0012647362466a6d97ba450b839b687fb6211 100644 --- a/version.sh +++ b/version.sh @@ -38,10 +38,10 @@ toolchain="gcc_11_arm" #Kernel KERNEL_REL=5.14 -KERNEL_TAG=${KERNEL_REL}-rc4 +KERNEL_TAG=${KERNEL_REL}-rc5 kernel_rt=".X-rtY" #Kernel Build -BUILD=${build_prefix}6 +BUILD=${build_prefix}6.1 #v5.X-rcX + upto SHA #prev_KERNEL_SHA=""