From 455f1356c9b70110dafcce4f937d80e57b2e5279 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Tue, 18 Jul 2023 16:59:09 -0500
Subject: [PATCH] Merge TI Branch;
https://github.com/RobertCNelson/ti-linux-kernel/compare/f6f812cfa29f7a8136ebf62c604b1d7fefbcee8e...8f7f371be250809e9c4af879cfa31d5f1839257d
TI SDK: 09.00.00.007 BBDTBS:
https://git.beagleboard.org/beagleboard/BeagleBoard-DeviceTrees/-/commit/f4588a770ab8fa0038c85b85af3ac41b14540153
RT: patch-6.1.33-rt11.patch.xz WIRELESS_REGDB:
https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git/commit/?id=9dc0800cdd7aeeae273b983973a1749f73008291
KSMBD:
https://github.com/cifsd-team/ksmbd/commit/11aa06fbc7307b3ff68ebbdb96d42484d9b5ae6a
TI_AMX3_CM3:
http://git.ti.com/gitweb/?p=processor-firmware/ti-amx3-cm3-pm-firmware.git;a=commit;h=fb484c5e54f2e31cf0a338d2927a06a2870bcc2c
WPANUSB:
https://git.beagleboard.org/beagleconnect/linux/wpanusb/-/commit/6aa9bf65b9d88a2c9a111e7b4aed03de2be9413d
BCFSERIAL:
https://git.beagleboard.org/beagleconnect/linux/bcfserial/-/commit/db467023bd136c97c2e13c3a8b9e41dbdfafbc66
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
patches/external/git/BBDTBS | 2 +-
...-BeagleBoard.org-Device-Tree-Changes.patch | 69 ++-----------------
version.sh | 8 +--
3 files changed, 9 insertions(+), 70 deletions(-)
diff --git a/patches/external/git/BBDTBS b/patches/external/git/BBDTBS
index 5bd24a9b8..da7fca5c5 100644
--- a/patches/external/git/BBDTBS
+++ b/patches/external/git/BBDTBS
@@ -1 +1 @@
-BBDTBS: https://git.beagleboard.org/beagleboard/BeagleBoard-DeviceTrees/-/commit/51f0e9ebb723252b8a5920873997fa4879c04291
+BBDTBS: https://git.beagleboard.org/beagleboard/BeagleBoard-DeviceTrees/-/commit/f4588a770ab8fa0038c85b85af3ac41b14540153
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 d5d41708d..9ee32435e 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 0d1e8811f978117e159c94832fbcad3bc40f033c Mon Sep 17 00:00:00 2001
+From d3ad6db217ed5ee4aac2e96a0392169dd550ff07 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Thu, 29 Jun 2023 16:16:43 -0500
+Date: Tue, 18 Jul 2023 16:56:41 -0500
Subject: [PATCH] Add BeagleBoard.org Device Tree Changes
https://git.beagleboard.org/beagleboard/BeagleBoard-DeviceTrees/-/tree/v6.1.x-ti
-https://git.beagleboard.org/beagleboard/BeagleBoard-DeviceTrees/-/commit/51f0e9ebb723252b8a5920873997fa4879c04291
+https://git.beagleboard.org/beagleboard/BeagleBoard-DeviceTrees/-/commit/f4588a770ab8fa0038c85b85af3ac41b14540153
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
arch/arm/boot/dts/am335x-bbb-bone-buses.dtsi | 85 +
@@ -70,9 +70,8 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
arch/arm/boot/dts/overlays/PB-MIKROBUS-0.dts | 107 +
arch/arm/boot/dts/overlays/PB-MIKROBUS-1.dts | 108 +
include/dt-bindings/board/am335x-bone-pins.h | 253 ++
- include/dt-bindings/pinctrl/k3.h | 53 +
include/dt-bindings/pinctrl/omap.h | 4 +-
- 64 files changed, 10883 insertions(+), 324 deletions(-)
+ 63 files changed, 10830 insertions(+), 324 deletions(-)
create mode 100644 arch/arm/boot/dts/am335x-bbb-bone-buses.dtsi
create mode 100644 arch/arm/boot/dts/am335x-bone-common-univ.dtsi
create mode 100644 arch/arm/boot/dts/am335x-boneblack-uboot-univ.dts
@@ -116,7 +115,6 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
create mode 100644 arch/arm/boot/dts/overlays/PB-MIKROBUS-0.dts
create mode 100644 arch/arm/boot/dts/overlays/PB-MIKROBUS-1.dts
create mode 100644 include/dt-bindings/board/am335x-bone-pins.h
- create mode 100644 include/dt-bindings/pinctrl/k3.h
diff --git a/arch/arm/boot/dts/am335x-bbb-bone-buses.dtsi b/arch/arm/boot/dts/am335x-bbb-bone-buses.dtsi
new file mode 100644
@@ -11943,65 +11941,6 @@ index 000000000000..54e92664ba79
+#define P2_35(mode) AM33XX_IOPAD(0x08e0, mode) /* U5: lcd_vsync */
+
+#endif
-diff --git a/include/dt-bindings/pinctrl/k3.h b/include/dt-bindings/pinctrl/k3.h
-new file mode 100644
-index 000000000000..6bb9df1a264d
---- /dev/null
-+++ b/include/dt-bindings/pinctrl/k3.h
-@@ -0,0 +1,53 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*
-+ * This header provides constants for pinctrl bindings for TI's K3 SoC
-+ * family.
-+ *
-+ * Copyright (C) 2018-2021 Texas Instruments Incorporated - https://www.ti.com/
-+ */
-+#ifndef _DT_BINDINGS_PINCTRL_TI_K3_H
-+#define _DT_BINDINGS_PINCTRL_TI_K3_H
-+
-+#define PULLUDEN_SHIFT (16)
-+#define PULLTYPESEL_SHIFT (17)
-+#define RXACTIVE_SHIFT (18)
-+
-+#define PULL_DISABLE (1 << PULLUDEN_SHIFT)
-+#define PULL_ENABLE (0 << PULLUDEN_SHIFT)
-+
-+#define PULL_UP (1 << PULLTYPESEL_SHIFT | PULL_ENABLE)
-+#define PULL_DOWN (0 << PULLTYPESEL_SHIFT | PULL_ENABLE)
-+
-+#define INPUT_EN (1 << RXACTIVE_SHIFT)
-+#define INPUT_DISABLE (0 << RXACTIVE_SHIFT)
-+
-+/* Only these macros are expected be used directly in device tree files */
-+#define PIN_OUTPUT (INPUT_DISABLE | PULL_DISABLE)
-+#define PIN_OUTPUT_PULLUP (INPUT_DISABLE | PULL_UP)
-+#define PIN_OUTPUT_PULLDOWN (INPUT_DISABLE | PULL_DOWN)
-+#define PIN_INPUT (INPUT_EN | PULL_DISABLE)
-+#define PIN_INPUT_PULLUP (INPUT_EN | PULL_UP)
-+#define PIN_INPUT_PULLDOWN (INPUT_EN | PULL_DOWN)
-+
-+#define AM62AX_IOPAD(pa, val, muxmode) (((pa) & 0x1fff)) ((val) | (muxmode))
-+#define AM62AX_MCU_IOPAD(pa, val, muxmode) (((pa) & 0x1fff)) ((val) | (muxmode))
-+
-+#define AM62X_IOPAD(pa, val, muxmode) (((pa) & 0x1fff)) ((val) | (muxmode))
-+#define AM62X_MCU_IOPAD(pa, val, muxmode) (((pa) & 0x1fff)) ((val) | (muxmode))
-+
-+#define AM64X_IOPAD(pa, val, muxmode) (((pa) & 0x1fff)) ((val) | (muxmode))
-+#define AM64X_MCU_IOPAD(pa, val, muxmode) (((pa) & 0x1fff)) ((val) | (muxmode))
-+
-+#define AM65X_IOPAD(pa, val, muxmode) (((pa) & 0x1fff)) ((val) | (muxmode))
-+#define AM65X_WKUP_IOPAD(pa, val, muxmode) (((pa) & 0x1fff)) ((val) | (muxmode))
-+
-+#define J721E_IOPAD(pa, val, muxmode) (((pa) & 0x1fff)) ((val) | (muxmode))
-+#define J721E_WKUP_IOPAD(pa, val, muxmode) (((pa) & 0x1fff)) ((val) | (muxmode))
-+
-+#define J721S2_IOPAD(pa, val, muxmode) (((pa) & 0x1fff)) ((val) | (muxmode))
-+#define J721S2_WKUP_IOPAD(pa, val, muxmode) (((pa) & 0x1fff)) ((val) | (muxmode))
-+
-+#define J784S4_IOPAD(pa, val, muxmode) (((pa) & 0x1fff)) ((val) | (muxmode))
-+#define J784S4_WKUP_IOPAD(pa, val, muxmode) (((pa) & 0x1fff)) ((val) | (muxmode))
-+
-+#endif
diff --git a/include/dt-bindings/pinctrl/omap.h b/include/dt-bindings/pinctrl/omap.h
index f48245ff87e5..625718042413 100644
--- a/include/dt-bindings/pinctrl/omap.h
diff --git a/version.sh b/version.sh
index e233267c6..5361a0c27 100644
--- a/version.sh
+++ b/version.sh
@@ -48,7 +48,7 @@ KERNEL_REL=6.1
KERNEL_TAG=${KERNEL_REL}.33
kernel_rt=".33-rt11"
#Kernel Build
-BUILD=${build_prefix}6.2
+BUILD=${build_prefix}6.3
#v6.X-rcX + upto SHA
#prev_KERNEL_SHA=""
@@ -59,8 +59,8 @@ BRANCH="${branch_prefix}${KERNEL_REL}${branch_postfix}"
DISTRO=xross
-ti_git_old_release="2b6f5746de558d954e42749b898fcdb4227dce5a"
-ti_git_new_release="f6f812cfa29f7a8136ebf62c604b1d7fefbcee8e"
-TISDK="09.00.00.005"
+ti_git_old_release="f6f812cfa29f7a8136ebf62c604b1d7fefbcee8e"
+ti_git_new_release="8f7f371be250809e9c4af879cfa31d5f1839257d"
+TISDK="09.00.00.007"
#
--
GitLab