diff --git a/patch.sh b/patch.sh
index 5f47ebd20da8c76f14c14a634c2236f8ed6edb84..91d4074a62e40ee973db38862b9a92b9d9a4c17a 100644
--- a/patch.sh
+++ b/patch.sh
@@ -306,6 +306,10 @@ dtb_makefile_append_omap4 () {
sed -i -e 's:omap4-panda.dtb \\:omap4-panda.dtb \\\n\t'$device' \\:g' arch/arm/boot/dts/Makefile
}
+dtb_makefile_append_am5 () {
+ sed -i -e 's:am57xx-beagle-x15.dtb \\:am57xx-beagle-x15.dtb \\\n\t'$device' \\:g' arch/arm/boot/dts/Makefile
+}
+
dtb_makefile_append () {
sed -i -e 's:am335x-boneblack.dtb \\:am335x-boneblack.dtb \\\n\t'$device' \\:g' arch/arm/boot/dts/Makefile
}
@@ -340,11 +344,13 @@ beagleboard_dtbs () {
#device="am335x-abbbi.dtb" ; dtb_makefile_append
device="am335x-bonegreen-gateway.dtb" ; dtb_makefile_append
- #device="am335x-boneblack-uboot.dtb" ; dtb_makefile_append
+ device="am335x-boneblack-uboot.dtb" ; dtb_makefile_append
+ device="am335x-sancloud-bbe-uboot.dtb" ; dtb_makefile_append
#device="am335x-bone-uboot-univ.dtb" ; dtb_makefile_append
#device="am335x-boneblack-uboot-univ.dtb" ; dtb_makefile_append
#device="am335x-bonegreen-wireless-uboot-univ.dtb" ; dtb_makefile_append
+ #device="am335x-sancloud-bbe-uboot-univ.dtb" ; dtb_makefile_append
${git_bin} add -f arch/arm/boot/dts/
${git_bin} add -f include/dt-bindings/
@@ -474,7 +480,7 @@ soc () {
# dir 'soc/imx/udoo'
# dir 'soc/imx/imx7'
- dir 'soc/ti/panda'
+# dir 'soc/ti/panda'
dir 'bootup_hacks'
}
@@ -487,7 +493,7 @@ soc
packaging () {
#do_backport="enable"
if [ "x${do_backport}" = "xenable" ] ; then
- backport_tag="v5.10"
+ backport_tag="v5.10.11"
subsystem="bindeb-pkg"
#regenerate="enable"
diff --git a/patches/defconfig b/patches/defconfig
index 2ae33b8bcca897a597f79a6e1365a2772e59bb9b..bce1f90d3984ca7ceeb90c91243c879bd0965238 100644
--- a/patches/defconfig
+++ b/patches/defconfig
@@ -2177,7 +2177,7 @@ CONFIG_MD_RAID10=m
# CONFIG_MD_RAID456 is not set
CONFIG_MD_MULTIPATH=m
CONFIG_MD_FAULTY=m
-# CONFIG_MD_CLUSTER is not set
+CONFIG_MD_CLUSTER=m
CONFIG_BCACHE=m
# CONFIG_BCACHE_DEBUG is not set
# CONFIG_BCACHE_CLOSURES_DEBUG is not set
@@ -2213,7 +2213,7 @@ CONFIG_DM_DELAY=m
CONFIG_DM_UEVENT=y
CONFIG_DM_FLAKEY=m
CONFIG_DM_VERITY=m
-# CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG is not set
+CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
# CONFIG_DM_VERITY_FEC is not set
CONFIG_DM_SWITCH=m
CONFIG_DM_LOG_WRITES=m
@@ -4931,7 +4931,7 @@ CONFIG_SND_SOC_ES8328_SPI=m
# CONFIG_SND_SOC_PCM3060_SPI is not set
# CONFIG_SND_SOC_PCM3168A_I2C is not set
# CONFIG_SND_SOC_PCM3168A_SPI is not set
-# CONFIG_SND_SOC_PCM5102A is not set
+CONFIG_SND_SOC_PCM5102A=m
CONFIG_SND_SOC_PCM512x=m
CONFIG_SND_SOC_PCM512x_I2C=m
# CONFIG_SND_SOC_PCM512x_SPI is not set
diff --git a/patches/disabled/0002-ti-omap5-etnaviv-2d-acceleration.patch b/patches/disabled/0002-ti-omap5-etnaviv-2d-acceleration.patch
deleted file mode 100644
index 0bcacbbd756758c02498346955451bbeefe65f9d..0000000000000000000000000000000000000000
--- a/patches/disabled/0002-ti-omap5-etnaviv-2d-acceleration.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From 12e65c1c72d80abf761c7266faedfc89bbdf44d8 Mon Sep 17 00:00:00 2001
-From: Robert Nelson <robertcnelson@gmail.com>
-Date: Wed, 23 Nov 2016 14:47:07 -0600
-Subject: [PATCH 2/2] ti: omap5: etnaviv: 2d acceleration
-
-Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
----
- arch/arm/boot/dts/omap5-board-common.dtsi | 4 ++++
- arch/arm/boot/dts/omap5.dtsi | 16 ++++++++++++++
- arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 34 ++++++++++++++++++++++++++++++
- 3 files changed, 54 insertions(+)
-
-diff --git a/arch/arm/boot/dts/omap5-board-common.dtsi b/arch/arm/boot/dts/omap5-board-common.dtsi
-index 4caadb2..574aeb5 100644
---- a/arch/arm/boot/dts/omap5-board-common.dtsi
-+++ b/arch/arm/boot/dts/omap5-board-common.dtsi
-@@ -144,6 +144,10 @@
- };
- };
-
-+&bb2d {
-+ status = "okay";
-+};
-+
- &gpio8 {
- /* TI trees use GPIO instead of msecure, see also muxing */
- p234 {
-diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
-index 2526211..f4a4eae70 100644
---- a/arch/arm/boot/dts/omap5.dtsi
-+++ b/arch/arm/boot/dts/omap5.dtsi
-@@ -830,6 +830,16 @@
- ti,hwmods = "dmm";
- };
-
-+ bb2d: bb2d@59000000 {
-+ compatible = "ti,omap5-bb2d","vivante,gc";
-+ reg = <0x59000000 0x0700>;
-+ interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
-+ ti,hwmods = "bb2d";
-+ clocks = <&dpll_core_h24x2_ck>;
-+ clock-names = "fclk";
-+ status = "disabled";
-+ };
-+
- emif1: emif@4c000000 {
- compatible = "ti,emif-4d5";
- ti,hwmods = "emif1";
-@@ -1119,6 +1129,12 @@
- >;
- };
- };
-+
-+ gpu-subsystem {
-+ compatible = "vivante,gc-gpu-subsystem";
-+ cores = <&bb2d>;
-+ status = "okay";
-+ };
- };
-
- &cpu_thermal {
-diff --git a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
-index 8cdfd9b..02911e5 100644
---- a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
-+++ b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
-@@ -211,6 +211,30 @@ static struct omap_hwmod omap54xx_mpu_private_hwmod = {
- };
-
- /*
-+ * 'bb2d' class
-+ *
-+ */
-+
-+static struct omap_hwmod_class omap54xx_bb2d_hwmod_class = {
-+ .name = "bb2d",
-+};
-+
-+/* bb2d */
-+static struct omap_hwmod omap54xx_bb2d_hwmod = {
-+ .name = "bb2d",
-+ .class = &omap54xx_bb2d_hwmod_class,
-+ .clkdm_name = "dss_clkdm",
-+ .main_clk = "dpll_core_h24x2_ck",
-+ .prcm = {
-+ .omap4 = {
-+ .clkctrl_offs = OMAP54XX_CM_DSS_BB2D_CLKCTRL_OFFSET,
-+ .context_offs = OMAP54XX_RM_DSS_BB2D_CONTEXT_OFFSET,
-+ .modulemode = MODULEMODE_SWCTRL,
-+ },
-+ },
-+};
-+
-+/*
- * 'counter' class
- * 32-bit ordinary counter, clocked by the falling edge of the 32 khz clock
- */
-@@ -2245,6 +2269,15 @@ static struct omap_hwmod_ocp_if omap54xx_mpu__mpu_private = {
- .user = OCP_USER_MPU | OCP_USER_SDMA,
- };
-
-+/* l3_main_1 -> bb2d */
-+static struct omap_hwmod_ocp_if omap54xx_l3_main_1__bb2d = {
-+ .master = &omap54xx_l3_main_1_hwmod,
-+ .slave = &omap54xx_bb2d_hwmod,
-+ .clk = "l3_iclk_div",
-+ .user = OCP_USER_MPU | OCP_USER_SDMA,
-+};
-+
-+
- /* l4_wkup -> counter_32k */
- static struct omap_hwmod_ocp_if omap54xx_l4_wkup__counter_32k = {
- .master = &omap54xx_l4_wkup_hwmod,
-@@ -2776,6 +2809,7 @@ static struct omap_hwmod_ocp_if *omap54xx_hwmod_ocp_ifs[] __initdata = {
- &omap54xx_l3_main_2__l4_per,
- &omap54xx_l3_main_1__l4_wkup,
- &omap54xx_mpu__mpu_private,
-+ &omap54xx_l3_main_1__bb2d,
- &omap54xx_l4_wkup__counter_32k,
- &omap54xx_l4_cfg__dma_system,
- &omap54xx_l4_abe__dmic,
---
-2.10.2
-
diff --git a/patches/git/BBDTBS b/patches/git/BBDTBS
index 0eb45640eb231358800ca2bb3f7c49c9730c8d39..51a063c19a382bd08a9e182dbdffcb280b32f121 100644
--- a/patches/git/BBDTBS
+++ b/patches/git/BBDTBS
@@ -1 +1 @@
-BBDTBS: https://github.com/beagleboard/BeagleBoard-DeviceTrees/commit/8d72d665348fb952ba34ed506837fd169739b873
+BBDTBS: https://github.com/beagleboard/BeagleBoard-DeviceTrees/commit/1cf468f6b6de0a2916d0a0b692feb682de4ca97a
diff --git a/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-DTBS-v5.11.x.patch b/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-DTBS-v5.11.x.patch
index 9b0314d7f3c1ddb98c3e13599b9d629577f7c655..2d33895531fafc8cba33c87c25884596c25e457e 100644
--- a/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-DTBS-v5.11.x.patch
+++ b/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-DTBS-v5.11.x.patch
@@ -1,30 +1,33 @@
-From 6cf42291ca1512085b2548e0c6d4cf137250c8e2 Mon Sep 17 00:00:00 2001
+From 79528d760845e38bac2d2ce7bb6faecc8a900970 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Wed, 27 Jan 2021 12:20:13 -0600
+Date: Thu, 28 Jan 2021 19:40:05 -0600
Subject: [PATCH] Add BeagleBoard.org DTBS: v5.11.x
https://github.com/beagleboard/BeagleBoard-DeviceTrees/tree/v5.11.x
-https://github.com/beagleboard/BeagleBoard-DeviceTrees/commit/8d72d665348fb952ba34ed506837fd169739b873
+https://github.com/beagleboard/BeagleBoard-DeviceTrees/commit/1cf468f6b6de0a2916d0a0b692feb682de4ca97a
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
- arch/arm/boot/dts/Makefile | 2 +
- arch/arm/boot/dts/am335x-bone.dts | 5 +
- .../boot/dts/am335x-boneblack-wireless.dts | 5 +
- arch/arm/boot/dts/am335x-boneblack.dts | 5 +
- arch/arm/boot/dts/am335x-boneblue.dts | 2 +
- .../arm/boot/dts/am335x-bonegreen-gateway.dts | 208 ++++++++++++++++++
- .../boot/dts/am335x-bonegreen-wireless.dts | 5 +
- arch/arm/boot/dts/am335x-bonegreen.dts | 5 +
- arch/arm/boot/dts/am335x-osd3358-sm-red.dts | 5 +
+ arch/arm/boot/dts/Makefile | 4 +
+ arch/arm/boot/dts/am335x-bone-common.dtsi | 13 +-
+ arch/arm/boot/dts/am335x-bone-jtag.dtsi | 15 ++
+ arch/arm/boot/dts/am335x-bone.dts | 6 +
+ .../arm/boot/dts/am335x-boneblack-common.dtsi | 10 +-
+ arch/arm/boot/dts/am335x-boneblack-uboot.dts | 184 +++++++++++++++
+ .../boot/dts/am335x-boneblack-wireless.dts | 6 +
+ arch/arm/boot/dts/am335x-boneblack.dts | 6 +
+ arch/arm/boot/dts/am335x-boneblue.dts | 3 +-
+ .../arm/boot/dts/am335x-bonegreen-gateway.dts | 209 ++++++++++++++++++
+ .../boot/dts/am335x-bonegreen-wireless.dts | 6 +
+ arch/arm/boot/dts/am335x-bonegreen.dts | 6 +
+ arch/arm/boot/dts/am335x-osd3358-sm-red.dts | 32 +--
arch/arm/boot/dts/am335x-pocketbeagle.dts | 2 +
+ .../boot/dts/am335x-sancloud-bbe-uboot.dts | 151 +++++++++++++
arch/arm/boot/dts/am335x-sancloud-bbe.dts | 5 +
arch/arm/boot/dts/am5729-beagleboneai.dts | 2 +
- .../boot/dts/am57xx-beagle-x15-common.dtsi | 4 +
arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts | 5 +
arch/arm/boot/dts/am57xx-beagle-x15-revc.dts | 5 +
arch/arm/boot/dts/am57xx-beagle-x15.dts | 5 +
- arch/arm/boot/dts/dra7.dtsi | 10 +
arch/arm/boot/dts/omap3-beagle-xm.dts | 2 +
arch/arm/boot/dts/omap3-beagle.dts | 2 +
arch/arm/boot/dts/omap4-panda-a4.dts | 12 +
@@ -35,26 +38,33 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
arch/arm/boot/dts/omap4-sdp.dts | 2 +
arch/arm/boot/dts/overlays/BBORG_FAN-A000.dts | 29 +++
arch/arm/boot/dts/overlays/Makefile | 10 +
- arch/arm/boot/dts/twl6030.dtsi | 5 +
- 28 files changed, 480 insertions(+), 10 deletions(-)
+ arch/arm/boot/dts/tps65217.dtsi | 2 +-
+ arch/arm/boot/dts/twl4030.dtsi | 2 +-
+ arch/arm/boot/dts/twl6030.dtsi | 7 +-
+ 33 files changed, 834 insertions(+), 57 deletions(-)
+ create mode 100644 arch/arm/boot/dts/am335x-bone-jtag.dtsi
+ create mode 100644 arch/arm/boot/dts/am335x-boneblack-uboot.dts
create mode 100644 arch/arm/boot/dts/am335x-bonegreen-gateway.dts
+ create mode 100644 arch/arm/boot/dts/am335x-sancloud-bbe-uboot.dts
create mode 100644 arch/arm/boot/dts/omap4-panda-es-b3.dts
create mode 100644 arch/arm/boot/dts/overlays/BBORG_FAN-A000.dts
create mode 100644 arch/arm/boot/dts/overlays/Makefile
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 3d1ea0b25168..f2cecc5b89c7 100644
+index 3d1ea0b25168..b146ce79c29d 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
-@@ -804,6 +804,7 @@ dtb-$(CONFIG_SOC_AM33XX) += \
+@@ -804,6 +804,9 @@ dtb-$(CONFIG_SOC_AM33XX) += \
am335x-base0033.dtb \
am335x-bone.dtb \
am335x-boneblack.dtb \
++ am335x-sancloud-bbe-uboot.dtb \
++ am335x-boneblack-uboot.dtb \
+ am335x-bonegreen-gateway.dtb \
am335x-boneblack-wireless.dtb \
am335x-boneblue.dtb \
am335x-bonegreen.dtb \
-@@ -838,6 +839,7 @@ dtb-$(CONFIG_ARCH_OMAP4) += \
+@@ -838,6 +841,7 @@ dtb-$(CONFIG_ARCH_OMAP4) += \
omap4-duovero-parlor.dtb \
omap4-kc1.dtb \
omap4-panda.dtb \
@@ -62,11 +72,81 @@ index 3d1ea0b25168..f2cecc5b89c7 100644
omap4-panda-a4.dtb \
omap4-panda-es.dtb \
omap4-sdp.dtb \
+diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
+index 2d51d4bba6d4..353401aae1e3 100644
+--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
++++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
+@@ -26,14 +26,14 @@ leds {
+ compatible = "gpio-leds";
+
+ led2 {
+- label = "beaglebone:green:heartbeat";
++ label = "beaglebone:green:usr0";
+ gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "heartbeat";
+ default-state = "off";
+ };
+
+ led3 {
+- label = "beaglebone:green:mmc0";
++ label = "beaglebone:green:usr1";
+ gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "mmc0";
+ default-state = "off";
+@@ -63,9 +63,6 @@ vmmcsd_fixed: fixedregulator0 {
+ };
+
+ &am33xx_pinmux {
+- pinctrl-names = "default";
+- pinctrl-0 = <&clkout2_pin>;
+-
+ user_leds_s0: user_leds_s0 {
+ pinctrl-single,pins = <
+ AM33XX_PADCONF(AM335X_PIN_GPMC_A5, PIN_OUTPUT_PULLDOWN, MUX_MODE7) /* gpmc_a5.gpio1_21 */
+@@ -96,12 +93,6 @@ AM33XX_PADCONF(AM335X_PIN_UART0_TXD, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
+ >;
+ };
+
+- clkout2_pin: pinmux_clkout2_pin {
+- pinctrl-single,pins = <
+- AM33XX_PADCONF(AM335X_PIN_XDMA_EVENT_INTR1, PIN_OUTPUT_PULLDOWN, MUX_MODE3) /* xdma_event_intr1.clkout2 */
+- >;
+- };
+-
+ cpsw_default: cpsw_default {
+ pinctrl-single,pins = <
+ /* Slave 1 */
+diff --git a/arch/arm/boot/dts/am335x-bone-jtag.dtsi b/arch/arm/boot/dts/am335x-bone-jtag.dtsi
+new file mode 100644
+index 000000000000..19c8bcf4b485
+--- /dev/null
++++ b/arch/arm/boot/dts/am335x-bone-jtag.dtsi
+@@ -0,0 +1,15 @@
++// SPDX-License-Identifier: GPL-2.0-only
++/*
++ * Copyright (C) 2012 Texas Instruments Incorporated - https://www.ti.com/
++ */
++
++&am33xx_pinmux {
++ pinctrl-names = "default";
++ pinctrl-0 = <&clkout2_pin>;
++
++ clkout2_pin: pinmux_clkout2_pin {
++ pinctrl-single,pins = <
++ AM33XX_PADCONF(AM335X_PIN_XDMA_EVENT_INTR1, PIN_OUTPUT_PULLDOWN, MUX_MODE3) /* xdma_event_intr1.clkout2 */
++ >;
++ };
++};
diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts
-index b5d85ef51a02..ea138cb34091 100644
+index b5d85ef51a02..90a248a8ee92 100644
--- a/arch/arm/boot/dts/am335x-bone.dts
+++ b/arch/arm/boot/dts/am335x-bone.dts
-@@ -10,6 +10,11 @@
+@@ -6,10 +6,16 @@
+
+ #include "am33xx.dtsi"
+ #include "am335x-bone-common.dtsi"
++/* #include "am335x-bone-jtag.dtsi" */
+
/ {
model = "TI AM335x BeagleBone";
compatible = "ti,am335x-bone", "ti,am33xx";
@@ -78,11 +158,243 @@ index b5d85ef51a02..ea138cb34091 100644
};
&ldo3_reg {
+diff --git a/arch/arm/boot/dts/am335x-boneblack-common.dtsi b/arch/arm/boot/dts/am335x-boneblack-common.dtsi
+index 64c3e9269f40..b3cba07a607d 100644
+--- a/arch/arm/boot/dts/am335x-boneblack-common.dtsi
++++ b/arch/arm/boot/dts/am335x-boneblack-common.dtsi
+@@ -28,7 +28,6 @@ &mmc2 {
+ &am33xx_pinmux {
+ nxp_hdmi_bonelt_pins: nxp_hdmi_bonelt_pins {
+ pinctrl-single,pins = <
+- AM33XX_PADCONF(AM335X_PIN_XDMA_EVENT_INTR0, PIN_OUTPUT_PULLDOWN, MUX_MODE3)
+ AM33XX_PADCONF(AM335X_PIN_LCD_DATA0, PIN_OUTPUT, MUX_MODE0)
+ AM33XX_PADCONF(AM335X_PIN_LCD_DATA1, PIN_OUTPUT, MUX_MODE0)
+ AM33XX_PADCONF(AM335X_PIN_LCD_DATA2, PIN_OUTPUT, MUX_MODE0)
+@@ -52,12 +51,6 @@ AM33XX_PADCONF(AM335X_PIN_LCD_AC_BIAS_EN, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
+ >;
+ };
+
+- nxp_hdmi_bonelt_off_pins: nxp_hdmi_bonelt_off_pins {
+- pinctrl-single,pins = <
+- AM33XX_PADCONF(AM335X_PIN_XDMA_EVENT_INTR0, PIN_OUTPUT_PULLDOWN, MUX_MODE3)
+- >;
+- };
+-
+ mcasp0_pins: mcasp0_pins {
+ pinctrl-single,pins = <
+ AM33XX_PADCONF(AM335X_PIN_MCASP0_AHCLKX, PIN_INPUT_PULLUP, MUX_MODE0) /* mcasp0_ahcklx.mcasp0_ahclkx */
+@@ -93,9 +86,8 @@ tda19988: tda19988@70 {
+ nxp,calib-gpios = <&gpio1 25 0>;
+ interrupts-extended = <&gpio1 25 IRQ_TYPE_LEVEL_LOW>;
+
+- pinctrl-names = "default", "off";
++ pinctrl-names = "default";
+ pinctrl-0 = <&nxp_hdmi_bonelt_pins>;
+- pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>;
+
+ /* Convert 24bit BGR to RGB, e.g. cross red and blue wiring */
+ /* video-ports = <0x234501>; */
+diff --git a/arch/arm/boot/dts/am335x-boneblack-uboot.dts b/arch/arm/boot/dts/am335x-boneblack-uboot.dts
+new file mode 100644
+index 000000000000..80751b08832b
+--- /dev/null
++++ b/arch/arm/boot/dts/am335x-boneblack-uboot.dts
+@@ -0,0 +1,184 @@
++// SPDX-License-Identifier: GPL-2.0-only
++/*
++ * Copyright (C) 2012 Texas Instruments Incorporated - https://www.ti.com/
++ */
++/dts-v1/;
++
++#include "am33xx.dtsi"
++#include "am335x-bone-common.dtsi"
++/* #include "am335x-bone-jtag.dtsi" */
++
++/ {
++ model = "TI AM335x BeagleBone Black";
++ compatible = "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";
++
++ chosen {
++ base_dtb = "am335x-boneblack-uboot.dts";
++ base_dtb_timestamp = __TIMESTAMP__;
++ };
++};
++
++&cpu0_opp_table {
++ /*
++ * All PG 2.0 silicon may not support 1GHz but some of the early
++ * BeagleBone Blacks have PG 2.0 silicon which is guaranteed
++ * to support 1GHz OPP so enable it for PG 2.0 on this board.
++ */
++ oppnitro-1000000000 {
++ opp-supported-hw = <0x06 0x0100>;
++ };
++};
++
++&ldo3_reg {
++ regulator-min-microvolt = <1800000>;
++ regulator-max-microvolt = <1800000>;
++ regulator-always-on;
++};
++
++&mmc1 {
++ vmmc-supply = <&vmmcsd_fixed>;
++};
++
++&gpio0 {
++ gpio-line-names =
++ "[ethernet]",
++ "[ethernet]",
++ "P9_22 [spi0_sclk]",
++ "P9_21 [spi0_d0]",
++ "P9_18 [spi0_d1]",
++ "P9_17 [spi0_cs0]",
++ "[sd card]",
++ "P9_42A [ecappwm0]",
++ "P8_35 [hdmi]",
++ "P8_33 [hdmi]",
++ "P8_31 [hdmi]",
++ "P8_32 [hdmi]",
++ "P9_20 [i2c2_sda]",
++ "P9_19 [i2c2_scl]",
++ "P9_26 [uart1_rxd]",
++ "P9_24 [uart1_txd]",
++ "[ethernet]",
++ "[ethernet]",
++ "[usb]",
++ "[hdmi]",
++ "P9_41B",
++ "[ethernet]",
++ "P8_19 [ehrpwm2a]",
++ "P8_13 [ehrpwm2b]",
++ "[NC]",
++ "[NC]",
++ "P8_14",
++ "P8_17",
++ "[ethernet]",
++ "[ethernet]",
++ "P9_11 [uart4_rxd]",
++ "P9_13 [uart4_txd]";
++};
++
++&gpio1 {
++ gpio-line-names =
++ "P8_25 [emmc]",
++ "[emmc]",
++ "P8_5 [emmc]",
++ "P8_6 [emmc]",
++ "P8_23 [emmc]",
++ "P8_22 [emmc]",
++ "P8_3 [emmc]",
++ "P8_4 [emmc]",
++ "[NC]",
++ "[NC]",
++ "[NC]",
++ "[NC]",
++ "P8_12",
++ "P8_11",
++ "P8_16",
++ "P8_15",
++ "P9_15A",
++ "P9_23",
++ "P9_14 [ehrpwm1a]",
++ "P9_16 [ehrpwm1b]",
++ "[emmc]",
++ "[usr0 led]",
++ "[usr1 led]",
++ "[usr2 led]",
++ "[usr3 led]",
++ "[hdmi]",
++ "[usb]",
++ "[hdmi audio]",
++ "P9_12",
++ "P8_26",
++ "P8_21 [emmc]",
++ "P8_20 [emmc]";
++};
++
++&gpio2 {
++ gpio-line-names =
++ "P9_15B",
++ "P8_18",
++ "P8_7",
++ "P8_8",
++ "P8_10",
++ "P8_9",
++ "P8_45 [hdmi]",
++ "P8_46 [hdmi]",
++ "P8_43 [hdmi]",
++ "P8_44 [hdmi]",
++ "P8_41 [hdmi]",
++ "P8_42 [hdmi]",
++ "P8_39 [hdmi]",
++ "P8_40 [hdmi]",
++ "P8_37 [hdmi]",
++ "P8_38 [hdmi]",
++ "P8_36 [hdmi]",
++ "P8_34 [hdmi]",
++ "[ethernet]",
++ "[ethernet]",
++ "[ethernet]",
++ "[ethernet]",
++ "P8_27 [hdmi]",
++ "P8_29 [hdmi]",
++ "P8_28 [hdmi]",
++ "P8_30 [hdmi]",
++ "[emmc]",
++ "[emmc]",
++ "[emmc]",
++ "[emmc]",
++ "[emmc]",
++ "[emmc]";
++};
++
++&gpio3 {
++ gpio-line-names =
++ "[ethernet]",
++ "[ethernet]",
++ "[ethernet]",
++ "[ethernet]",
++ "[ethernet]",
++ "[i2c0]",
++ "[i2c0]",
++ "[emu]",
++ "[emu]",
++ "[ethernet]",
++ "[ethernet]",
++ "[NC]",
++ "[NC]",
++ "[usb]",
++ "P9_31 [spi1_sclk]",
++ "P9_29 [spi1_d0]",
++ "P9_30 [spi1_d1]",
++ "P9_28 [spi1_cs0]",
++ "P9_42B [ecappwm0]",
++ "P9_27",
++ "P9_41A",
++ "P9_25",
++ "[NC]",
++ "[NC]",
++ "[NC]",
++ "[NC]",
++ "[NC]",
++ "[NC]",
++ "[NC]",
++ "[NC]",
++ "[NC]",
++ "[NC]";
++};
diff --git a/arch/arm/boot/dts/am335x-boneblack-wireless.dts b/arch/arm/boot/dts/am335x-boneblack-wireless.dts
-index 86cad9912906..4c8bb364ee68 100644
+index 86cad9912906..31215d47597a 100644
--- a/arch/arm/boot/dts/am335x-boneblack-wireless.dts
+++ b/arch/arm/boot/dts/am335x-boneblack-wireless.dts
-@@ -13,6 +13,11 @@ / {
+@@ -8,11 +8,17 @@
+ #include "am335x-bone-common.dtsi"
+ #include "am335x-boneblack-common.dtsi"
+ #include <dt-bindings/interrupt-controller/irq.h>
++/* #include "am335x-bone-jtag.dtsi" */
+
+ / {
model = "TI AM335x BeagleBone Black Wireless";
compatible = "ti,am335x-bone-black-wireless", "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";
@@ -95,10 +407,15 @@ index 86cad9912906..4c8bb364ee68 100644
compatible = "regulator-fixed";
regulator-name = "wlan-en-regulator";
diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
-index b4feb85e171a..1bc3479fca9e 100644
+index b4feb85e171a..d1b97cb7dda7 100644
--- a/arch/arm/boot/dts/am335x-boneblack.dts
+++ b/arch/arm/boot/dts/am335x-boneblack.dts
-@@ -11,6 +11,11 @@
+@@ -7,10 +7,16 @@
+ #include "am33xx.dtsi"
+ #include "am335x-bone-common.dtsi"
+ #include "am335x-boneblack-common.dtsi"
++/* #include "am335x-bone-jtag.dtsi" */
+
/ {
model = "TI AM335x BeagleBone Black";
compatible = "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";
@@ -111,7 +428,7 @@ index b4feb85e171a..1bc3479fca9e 100644
&cpu0_opp_table {
diff --git a/arch/arm/boot/dts/am335x-boneblue.dts b/arch/arm/boot/dts/am335x-boneblue.dts
-index 69acaf4ea0f3..5538322b9218 100644
+index 69acaf4ea0f3..313841fd0459 100644
--- a/arch/arm/boot/dts/am335x-boneblue.dts
+++ b/arch/arm/boot/dts/am335x-boneblue.dts
@@ -14,6 +14,8 @@ / {
@@ -123,12 +440,20 @@ index 69acaf4ea0f3..5538322b9218 100644
};
leds {
+@@ -128,7 +130,6 @@ AM33XX_PADCONF(AM335X_PIN_GPMC_AD11, PIN_OUTPUT, MUX_MODE7) /* (U12) gpmc_ad11.g
+ AM33XX_PADCONF(AM335X_PIN_LCD_DATA15, PIN_OUTPUT, MUX_MODE7) /* (T5) lcd_data15.gpio0[11] - P8.32, BATT_LED_2 */
+ AM33XX_PADCONF(AM335X_PIN_GPMC_CSN0, PIN_OUTPUT, MUX_MODE7) /* (V6) gpmc_csn0.gpio1[29] - P8.26, BATT_LED_3 */
+ AM33XX_PADCONF(AM335X_PIN_GPMC_AD10, PIN_OUTPUT, MUX_MODE7) /* (T11) gpmc_ad10.gpio0[26] - P8.14, BATT_LED_4 */
+-
+ >;
+ };
+
diff --git a/arch/arm/boot/dts/am335x-bonegreen-gateway.dts b/arch/arm/boot/dts/am335x-bonegreen-gateway.dts
new file mode 100644
-index 000000000000..f9d5e02a73b3
+index 000000000000..1c181799642e
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-bonegreen-gateway.dts
-@@ -0,0 +1,208 @@
+@@ -0,0 +1,209 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (C) 2012 Texas Instruments Incorporated - https://www.ti.com/
@@ -139,6 +464,7 @@ index 000000000000..f9d5e02a73b3
+#include "am335x-bone-common.dtsi"
+#include "am335x-bonegreen-common.dtsi"
+#include <dt-bindings/interrupt-controller/irq.h>
++/* #include "am335x-bone-jtag.dtsi" */
+
+/ {
+ model = "SeeedStudio BeagleBone Green Gateway";
@@ -338,10 +664,16 @@ index 000000000000..f9d5e02a73b3
+ };
+};
diff --git a/arch/arm/boot/dts/am335x-bonegreen-wireless.dts b/arch/arm/boot/dts/am335x-bonegreen-wireless.dts
-index 7615327d906a..467475855fd5 100644
+index 7615327d906a..f75ae32798a8 100644
--- a/arch/arm/boot/dts/am335x-bonegreen-wireless.dts
+++ b/arch/arm/boot/dts/am335x-bonegreen-wireless.dts
-@@ -13,6 +13,11 @@ / {
+@@ -8,11 +8,17 @@
+ #include "am335x-bone-common.dtsi"
+ #include "am335x-bonegreen-common.dtsi"
+ #include <dt-bindings/interrupt-controller/irq.h>
++/* #include "am335x-bone-jtag.dtsi" */
+
+ / {
model = "TI AM335x BeagleBone Green Wireless";
compatible = "ti,am335x-bone-green-wireless", "ti,am335x-bone-green", "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";
@@ -354,10 +686,15 @@ index 7615327d906a..467475855fd5 100644
compatible = "regulator-fixed";
regulator-name = "wlan-en-regulator";
diff --git a/arch/arm/boot/dts/am335x-bonegreen.dts b/arch/arm/boot/dts/am335x-bonegreen.dts
-index 18cc0f49e999..62ca9c8764bd 100644
+index 18cc0f49e999..277983fcdf6d 100644
--- a/arch/arm/boot/dts/am335x-bonegreen.dts
+++ b/arch/arm/boot/dts/am335x-bonegreen.dts
-@@ -11,4 +11,9 @@
+@@ -7,8 +7,14 @@
+ #include "am33xx.dtsi"
+ #include "am335x-bone-common.dtsi"
+ #include "am335x-bonegreen-common.dtsi"
++/* #include "am335x-bone-jtag.dtsi" */
+
/ {
model = "TI AM335x BeagleBone Green";
compatible = "ti,am335x-bone-green", "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";
@@ -368,10 +705,27 @@ index 18cc0f49e999..62ca9c8764bd 100644
+ };
};
diff --git a/arch/arm/boot/dts/am335x-osd3358-sm-red.dts b/arch/arm/boot/dts/am335x-osd3358-sm-red.dts
-index f841afb27844..8a9a7c341371 100644
+index f841afb27844..a2abee573b4f 100644
--- a/arch/arm/boot/dts/am335x-osd3358-sm-red.dts
+++ b/arch/arm/boot/dts/am335x-osd3358-sm-red.dts
-@@ -17,6 +17,11 @@
+@@ -1,9 +1,6 @@
+ //SPDX-License-Identifier: GPL-2.0
+-/* Copyright (C) 2018 Octavo Systems LLC - https://www.octavosystems.com/
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License version 2 as
+- * published by the Free Software Foundation.
++/*
++ * Copyright (C) 2018 Octavo Systems LLC - https://www.octavosystems.com/
+ */
+
+ /dts-v1/;
+@@ -13,10 +10,16 @@
+ #include <dt-bindings/interrupt-controller/irq.h>
+
+ #include <dt-bindings/display/tda998x.h>
++/* #include "am335x-bone-jtag.dtsi" */
+
/ {
model = "Octavo Systems OSD3358-SM-RED";
compatible = "oct,osd3358-sm-refdesign", "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";
@@ -383,6 +737,61 @@ index f841afb27844..8a9a7c341371 100644
};
&ldo3_reg {
+@@ -40,7 +43,6 @@ &mmc2 {
+ &am33xx_pinmux {
+ nxp_hdmi_bonelt_pins: nxp-hdmi-bonelt-pins {
+ pinctrl-single,pins = <
+- AM33XX_PADCONF(AM335X_PIN_XDMA_EVENT_INTR0, PIN_OUTPUT_PULLDOWN, MUX_MODE3)
+ AM33XX_PADCONF(AM335X_PIN_LCD_DATA0, PIN_OUTPUT, MUX_MODE0)
+ AM33XX_PADCONF(AM335X_PIN_LCD_DATA1, PIN_OUTPUT, MUX_MODE0)
+ AM33XX_PADCONF(AM335X_PIN_LCD_DATA2, PIN_OUTPUT, MUX_MODE0)
+@@ -64,12 +66,6 @@ AM33XX_PADCONF(AM335X_PIN_LCD_AC_BIAS_EN, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
+ >;
+ };
+
+- nxp_hdmi_bonelt_off_pins: nxp-hdmi-bonelt-off-pins {
+- pinctrl-single,pins = <
+- AM33XX_PADCONF(AM335X_PIN_XDMA_EVENT_INTR0, PIN_OUTPUT_PULLDOWN, MUX_MODE3)
+- >;
+- };
+-
+ mcasp0_pins: mcasp0-pins {
+ pinctrl-single,pins = <
+ AM33XX_PADCONF(AM335X_PIN_MCASP0_AHCLKX, PIN_INPUT_PULLUP, MUX_MODE0)
+@@ -124,9 +120,8 @@ tda19988: hdmi-encoder@70 {
+ compatible = "nxp,tda998x";
+ reg = <0x70>;
+
+- pinctrl-names = "default", "off";
++ pinctrl-names = "default";
+ pinctrl-0 = <&nxp_hdmi_bonelt_pins>;
+- pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>;
+
+ /* Convert 24bit BGR to RGB, e.g. cross red and blue wiring */
+ /* video-ports = <0x234501>; */
+@@ -264,9 +259,6 @@ vmmcsd_fixed: fixedregulator0 {
+ };
+
+ &am33xx_pinmux {
+- pinctrl-names = "default";
+- pinctrl-0 = <&clkout2_pin>;
+-
+ user_leds_s0: user-leds-s0 {
+ pinctrl-single,pins = <
+ AM33XX_PADCONF(AM335X_PIN_GPMC_A5, PIN_OUTPUT_PULLDOWN, MUX_MODE7) /* gpmc_a5.gpio1_21 */
+@@ -290,12 +282,6 @@ AM33XX_PADCONF(AM335X_PIN_UART0_TXD, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
+ >;
+ };
+
+- clkout2_pin: pinmux-clkout2-pin {
+- pinctrl-single,pins = <
+- AM33XX_PADCONF(AM335X_PIN_XDMA_EVENT_INTR1, PIN_OUTPUT_PULLDOWN, MUX_MODE3) /* xdma_event_intr1.clkout2 */
+- >;
+- };
+-
+ cpsw_default: cpsw-default {
+ pinctrl-single,pins = <
+ /* Slave 1 */
diff --git a/arch/arm/boot/dts/am335x-pocketbeagle.dts b/arch/arm/boot/dts/am335x-pocketbeagle.dts
index d526c5941c9b..20e998ea5ba9 100644
--- a/arch/arm/boot/dts/am335x-pocketbeagle.dts
@@ -396,6 +805,163 @@ index d526c5941c9b..20e998ea5ba9 100644
};
leds {
+diff --git a/arch/arm/boot/dts/am335x-sancloud-bbe-uboot.dts b/arch/arm/boot/dts/am335x-sancloud-bbe-uboot.dts
+new file mode 100644
+index 000000000000..8d8982f722b7
+--- /dev/null
++++ b/arch/arm/boot/dts/am335x-sancloud-bbe-uboot.dts
+@@ -0,0 +1,151 @@
++// SPDX-License-Identifier: GPL-2.0-only
++/*
++ * Copyright (C) 2012 Texas Instruments Incorporated - https://www.ti.com/
++ */
++/dts-v1/;
++
++#include "am33xx.dtsi"
++#include "am335x-bone-common.dtsi"
++#include <dt-bindings/interrupt-controller/irq.h>
++
++/ {
++ model = "SanCloud BeagleBone Enhanced";
++ compatible = "sancloud,am335x-boneenhanced", "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";
++
++ chosen {
++ base_dtb = "am335x-sancloud-bbe-uboot.dts";
++ base_dtb_timestamp = __TIMESTAMP__;
++ };
++};
++
++&am33xx_pinmux {
++ pinctrl-names = "default";
++
++ cpsw_default: cpsw_default {
++ pinctrl-single,pins = <
++ /* Slave 1 */
++ AM33XX_PADCONF(AM335X_PIN_MII1_TX_EN, PIN_OUTPUT_PULLDOWN, MUX_MODE2) /* mii1_txen.rgmii1_tctl */
++ AM33XX_PADCONF(AM335X_PIN_MII1_RX_DV, PIN_INPUT_PULLDOWN, MUX_MODE2) /* mii1_rxdv.rgmii1_rctl */
++ AM33XX_PADCONF(AM335X_PIN_MII1_TXD3, PIN_OUTPUT_PULLDOWN, MUX_MODE2) /* mii1_txd3.rgmii1_td3 */
++ AM33XX_PADCONF(AM335X_PIN_MII1_TXD2, PIN_OUTPUT_PULLDOWN, MUX_MODE2) /* mii1_txd2.rgmii1_td2 */
++ AM33XX_PADCONF(AM335X_PIN_MII1_TXD1, PIN_OUTPUT_PULLDOWN, MUX_MODE2) /* mii1_txd1.rgmii1_td1 */
++ AM33XX_PADCONF(AM335X_PIN_MII1_TXD0, PIN_OUTPUT_PULLDOWN, MUX_MODE2) /* mii1_txd0.rgmii1_td0 */
++ AM33XX_PADCONF(AM335X_PIN_MII1_TX_CLK, PIN_OUTPUT_PULLDOWN, MUX_MODE2) /* mii1_txclk.rgmii1_tclk */
++ AM33XX_PADCONF(AM335X_PIN_MII1_RX_CLK, PIN_INPUT_PULLDOWN, MUX_MODE2) /* mii1_rxclk.rgmii1_rclk */
++ AM33XX_PADCONF(AM335X_PIN_MII1_RXD3, PIN_INPUT_PULLDOWN, MUX_MODE2) /* mii1_rxd3.rgmii1_rd3 */
++ AM33XX_PADCONF(AM335X_PIN_MII1_RXD2, PIN_INPUT_PULLDOWN, MUX_MODE2) /* mii1_rxd2.rgmii1_rd2 */
++ AM33XX_PADCONF(AM335X_PIN_MII1_RXD1, PIN_INPUT_PULLDOWN, MUX_MODE2) /* mii1_rxd1.rgmii1_rd1 */
++ AM33XX_PADCONF(AM335X_PIN_MII1_RXD0, PIN_INPUT_PULLDOWN, MUX_MODE2) /* mii1_rxd0.rgmii1_rd0 */
++ >;
++ };
++
++ cpsw_sleep: cpsw_sleep {
++ pinctrl-single,pins = <
++ /* Slave 1 reset value */
++ AM33XX_PADCONF(AM335X_PIN_MII1_TX_EN, PIN_INPUT_PULLDOWN, MUX_MODE7)
++ AM33XX_PADCONF(AM335X_PIN_MII1_RX_DV, PIN_INPUT_PULLDOWN, MUX_MODE7)
++ AM33XX_PADCONF(AM335X_PIN_MII1_TXD3, PIN_INPUT_PULLDOWN, MUX_MODE7)
++ AM33XX_PADCONF(AM335X_PIN_MII1_TXD2, PIN_INPUT_PULLDOWN, MUX_MODE7)
++ AM33XX_PADCONF(AM335X_PIN_MII1_TXD1, PIN_INPUT_PULLDOWN, MUX_MODE7)
++ AM33XX_PADCONF(AM335X_PIN_MII1_TXD0, PIN_INPUT_PULLDOWN, MUX_MODE7)
++ AM33XX_PADCONF(AM335X_PIN_MII1_TX_CLK, PIN_INPUT_PULLDOWN, MUX_MODE7)
++ AM33XX_PADCONF(AM335X_PIN_MII1_RX_CLK, PIN_INPUT_PULLDOWN, MUX_MODE7)
++ AM33XX_PADCONF(AM335X_PIN_MII1_RXD3, PIN_INPUT_PULLDOWN, MUX_MODE7)
++ AM33XX_PADCONF(AM335X_PIN_MII1_RXD2, PIN_INPUT_PULLDOWN, MUX_MODE7)
++ AM33XX_PADCONF(AM335X_PIN_MII1_RXD1, PIN_INPUT_PULLDOWN, MUX_MODE7)
++ AM33XX_PADCONF(AM335X_PIN_MII1_RXD0, PIN_INPUT_PULLDOWN, MUX_MODE7)
++ >;
++ };
++
++ davinci_mdio_default: davinci_mdio_default {
++ pinctrl-single,pins = <
++ /* MDIO */
++ AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLUP | SLEWCTRL_FAST, MUX_MODE0)
++ AM33XX_PADCONF(AM335X_PIN_MDC, PIN_OUTPUT_PULLUP, MUX_MODE0)
++ >;
++ };
++
++ davinci_mdio_sleep: davinci_mdio_sleep {
++ pinctrl-single,pins = <
++ /* MDIO reset value */
++ AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLDOWN, MUX_MODE7)
++ AM33XX_PADCONF(AM335X_PIN_MDC, PIN_INPUT_PULLDOWN, MUX_MODE7)
++ >;
++ };
++
++ usb_hub_ctrl: usb_hub_ctrl {
++ pinctrl-single,pins = <
++ AM33XX_PADCONF(AM335X_PIN_RMII1_REF_CLK, PIN_OUTPUT_PULLUP, MUX_MODE7) /* rmii1_refclk.gpio0_29 */
++ >;
++ };
++
++ mpu6050_pins: pinmux_mpu6050_pins {
++ pinctrl-single,pins = <
++ AM33XX_PADCONF(AM335X_PIN_UART0_CTSN, PIN_INPUT, MUX_MODE7) /* uart0_ctsn.gpio1_8 */
++ >;
++ };
++
++ lps3331ap_pins: pinmux_lps3331ap_pins {
++ pinctrl-single,pins = <
++ AM33XX_PADCONF(AM335X_PIN_GPMC_A10, PIN_INPUT, MUX_MODE7) /* gpmc_a10.gpio1_26 */
++ >;
++ };
++};
++
++&mac {
++ pinctrl-names = "default", "sleep";
++ pinctrl-0 = <&cpsw_default>;
++ pinctrl-1 = <&cpsw_sleep>;
++ status = "okay";
++};
++
++&davinci_mdio {
++ pinctrl-names = "default", "sleep";
++ pinctrl-0 = <&davinci_mdio_default>;
++ pinctrl-1 = <&davinci_mdio_sleep>;
++ status = "okay";
++
++ ethphy0: ethernet-phy@0 {
++ reg = <0>;
++ };
++};
++
++&cpsw_emac0 {
++ phy-handle = <ðphy0>;
++ phy-mode = "rgmii-id";
++};
++
++&i2c0 {
++ lps331ap: barometer@5c {
++ compatible = "st,lps331ap-press";
++ st,drdy-int-pin = <1>;
++ reg = <0x5c>;
++ interrupt-parent = <&gpio1>;
++ interrupts = <26 IRQ_TYPE_EDGE_RISING>;
++ };
++
++ mpu6050: accelerometer@68 {
++ compatible = "invensense,mpu6050";
++ reg = <0x68>;
++ interrupt-parent = <&gpio0>;
++ interrupts = <2 IRQ_TYPE_EDGE_RISING>;
++ orientation = <0xff 0 0 0 1 0 0 0 0xff>;
++ };
++
++ usb2512b: usb-hub@2c {
++ compatible = "microchip,usb2512b";
++ reg = <0x2c>;
++ reset-gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
++ /* wifi on port 4 */
++ };
++};
++
++&ldo3_reg {
++ regulator-min-microvolt = <1800000>;
++ regulator-max-microvolt = <1800000>;
++ regulator-always-on;
++};
++
++&mmc1 {
++ vmmc-supply = <&vmmcsd_fixed>;
++};
diff --git a/arch/arm/boot/dts/am335x-sancloud-bbe.dts b/arch/arm/boot/dts/am335x-sancloud-bbe.dts
index 275ba339adf4..0a80f58489d9 100644
--- a/arch/arm/boot/dts/am335x-sancloud-bbe.dts
@@ -425,21 +991,6 @@ index 149cfafb90bf..62477211d4d8 100644
};
memory@0 {
-diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
-index 6b82ecf803c5..d342636da13e 100644
---- a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
-+++ b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
-@@ -220,6 +220,10 @@ sound0_master: simple-audio-card,codec {
- };
- };
-
-+&bb2d {
-+ status = "okay";
-+};
-+
- &i2c1 {
- status = "okay";
- clock-frequency = <400000>;
diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts b/arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts
index 83e174e053c7..0ba920286dfb 100644
--- a/arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts
@@ -488,27 +1039,6 @@ index 0a8b16505ed9..028928f8d43e 100644
};
&tpd12s015 {
-diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
-index ce1194744f84..ee345bbc1c90 100644
---- a/arch/arm/boot/dts/dra7.dtsi
-+++ b/arch/arm/boot/dts/dra7.dtsi
-@@ -446,6 +446,16 @@ dsp1: dsp@40800000 {
- firmware-name = "dra7-dsp1-fw.xe66";
- };
-
-+ bb2d: bb2d@59000000 {
-+ compatible = "ti,dra7-bb2d","vivante,gc";
-+ reg = <0x59000000 0x0700>;
-+ interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
-+ ti,hwmods = "bb2d";
-+ clocks = <&dpll_core_h24x2_ck>;
-+ clock-names = "fclk";
-+ status = "disabled";
-+ };
-+
- target-module@40d01000 {
- compatible = "ti,sysc-omap2", "ti,sysc";
- reg = <0x40d01000 0x4>,
diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts
index a858ebfa1500..bc319ffbc54d 100644
--- a/arch/arm/boot/dts/omap3-beagle-xm.dts
@@ -825,10 +1355,42 @@ index 000000000000..522af0551206
+
+always-y := $(dtbo-y)
+clean-files := *.dtbo
+diff --git a/arch/arm/boot/dts/tps65217.dtsi b/arch/arm/boot/dts/tps65217.dtsi
+index 0d463de5650f..a0717d95b12d 100644
+--- a/arch/arm/boot/dts/tps65217.dtsi
++++ b/arch/arm/boot/dts/tps65217.dtsi
+@@ -1,6 +1,6 @@
+ // SPDX-License-Identifier: GPL-2.0-only
+ /*
+- * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
++ * Copyright (C) 2012 Texas Instruments Incorporated - https://www.ti.com/
+ */
+
+ /*
+diff --git a/arch/arm/boot/dts/twl4030.dtsi b/arch/arm/boot/dts/twl4030.dtsi
+index 93e07c18781b..a5d9c5738317 100644
+--- a/arch/arm/boot/dts/twl4030.dtsi
++++ b/arch/arm/boot/dts/twl4030.dtsi
+@@ -1,6 +1,6 @@
+ // SPDX-License-Identifier: GPL-2.0-only
+ /*
+- * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
++ * Copyright (C) 2011 Texas Instruments Incorporated - https://www.ti.com/
+ */
+
+ /*
diff --git a/arch/arm/boot/dts/twl6030.dtsi b/arch/arm/boot/dts/twl6030.dtsi
-index 9d588cfaa5cb..c0094e0c4e0f 100644
+index 9d588cfaa5cb..102d38a5f5a6 100644
--- a/arch/arm/boot/dts/twl6030.dtsi
+++ b/arch/arm/boot/dts/twl6030.dtsi
+@@ -1,6 +1,6 @@
+ // SPDX-License-Identifier: GPL-2.0-only
+ /*
+- * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
++ * Copyright (C) 2011 Texas Instruments Incorporated - https://www.ti.com/
+ */
+
+ /*
@@ -80,6 +80,11 @@ v2v1: regulator-v2v1 {
regulator-always-on;
};
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 460caa2bbfe4ef22e9d319f92710e7279b23af2a..b30140bd06c2e03987ece40679f0392c75866d62 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 d87e7cb92471a281f3434f62eb5ecc9c95c1f176 Mon Sep 17 00:00:00 2001
+From 8439282aa215b06c07aeed158925591ba75113dc Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Wed, 27 Jan 2021 12:07:42 -0600
+Date: Thu, 28 Jan 2021 19:39:44 -0600
Subject: [PATCH] merge: wpanusb: https://github.com/statropy/wpanusb
https://github.com/statropy/wpanusb/commit/7ba5f3d24d95f804e80b2d8d28e35b34c15219c2
diff --git a/version.sh b/version.sh
index cf61b8f447272599f728ecdadfe34405bb7a67c8..77571bb48197f5ef1b003ef36f47627f17789955 100644
--- a/version.sh
+++ b/version.sh
@@ -45,7 +45,7 @@ KERNEL_REL=5.11
KERNEL_TAG=${KERNEL_REL}-rc5
kernel_rt=".x-rty"
#Kernel Build
-BUILD=${build_prefix}6.2
+BUILD=${build_prefix}6.3
#v5.X-rcX + upto SHA
#prev_KERNEL_SHA=""