From 920fe6769d5ed6d0fd01d8ca842a54ce69f1726f Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Fri, 14 Jul 2023 18:08:48 -0500
Subject: [PATCH] kernel v5.17.15-bone17.1 rebase external git projects BBDTBS:
https://git.beagleboard.org/beagleboard/BeagleBoard-DeviceTrees/-/commit/aea68b11d29ea750ee83e01fcae2c46ec9ff958b
AUFS:
https://github.com/sfjro/aufs-standalone/commit/1b8b70a361b6c2f8259851c826a482562d99d9ce
WIRELESS_REGDB:
https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git/commit/?id=9dc0800cdd7aeeae273b983973a1749f73008291
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>
---
patch.sh | 29 +-
.../0001-backports-uio-from-linux.git.patch | 8 +-
patches/defconfig | 3 +-
.../aufs/0001-merge-aufs-kbuild.patch | 4 +-
.../external/aufs/0002-merge-aufs-base.patch | 4 +-
.../external/aufs/0003-merge-aufs-mmap.patch | 4 +-
.../aufs/0004-merge-aufs-standalone.patch | 4 +-
patches/external/aufs/0005-merge-aufs.patch | 4 +-
...https-git.beagleboard.org-beagleconn.patch | 4 +-
patches/external/git/BBDTBS | 2 +-
...eless-regdb-regulatory-database-file.patch | 4 +-
...tps-git.beagleboard.org-beagleconnec.patch | 4 +-
...-BeagleBoard.org-Device-Tree-Changes.patch | 1077 ++++++++++++++++-
tools/config-hot-fix.sh | 12 +
version.sh | 2 +-
15 files changed, 1116 insertions(+), 49 deletions(-)
diff --git a/patch.sh b/patch.sh
index c2846cbd1..75ce2bb4e 100644
--- a/patch.sh
+++ b/patch.sh
@@ -110,31 +110,30 @@ aufs_fail () {
aufs () {
#https://github.com/sfjro/aufs-standalone/tree/aufs5.17.3
- aufs_prefix="aufs5-"
#regenerate="enable"
if [ "x${regenerate}" = "xenable" ] ; then
KERNEL_REL=5.17.3
- wget https://raw.githubusercontent.com/sfjro/aufs-standalone/aufs${KERNEL_REL}/${aufs_prefix}kbuild.patch
- patch -p1 < ${aufs_prefix}kbuild.patch || aufs_fail
- rm -rf ${aufs_prefix}kbuild.patch
+ wget https://raw.githubusercontent.com/sfjro/aufs-standalone/aufs${KERNEL_REL}/aufs5-kbuild.patch
+ patch -p1 < aufs5-kbuild.patch || aufs_fail
+ rm -rf aufs5-kbuild.patch
${git_bin} add .
${git_bin} commit -a -m 'merge: aufs-kbuild' -s
- wget https://raw.githubusercontent.com/sfjro/aufs-standalone/aufs${KERNEL_REL}/${aufs_prefix}base.patch
- patch -p1 < ${aufs_prefix}base.patch || aufs_fail
- rm -rf ${aufs_prefix}base.patch
+ wget https://raw.githubusercontent.com/sfjro/aufs-standalone/aufs${KERNEL_REL}/aufs5-base.patch
+ patch -p1 < aufs5-base.patch || aufs_fail
+ rm -rf aufs5-base.patch
${git_bin} add .
${git_bin} commit -a -m 'merge: aufs-base' -s
- wget https://raw.githubusercontent.com/sfjro/aufs-standalone/aufs${KERNEL_REL}/${aufs_prefix}mmap.patch
- patch -p1 < ${aufs_prefix}mmap.patch || aufs_fail
- rm -rf ${aufs_prefix}mmap.patch
+ wget https://raw.githubusercontent.com/sfjro/aufs-standalone/aufs${KERNEL_REL}/aufs5-mmap.patch
+ patch -p1 < aufs5-mmap.patch || aufs_fail
+ rm -rf aufs5-mmap.patch
${git_bin} add .
${git_bin} commit -a -m 'merge: aufs-mmap' -s
- wget https://raw.githubusercontent.com/sfjro/aufs-standalone/aufs${KERNEL_REL}/${aufs_prefix}standalone.patch
- patch -p1 < ${aufs_prefix}standalone.patch || aufs_fail
- rm -rf ${aufs_prefix}standalone.patch
+ wget https://raw.githubusercontent.com/sfjro/aufs-standalone/aufs${KERNEL_REL}/aufs5-standalone.patch
+ patch -p1 < aufs5-standalone.patch || aufs_fail
+ rm -rf aufs5-standalone.patch
${git_bin} add .
${git_bin} commit -a -m 'merge: aufs-standalone' -s
@@ -276,7 +275,7 @@ rt () {
#regenerate="enable"
if [ "x${regenerate}" = "xenable" ] ; then
- wget -c https://www.kernel.org/pub/linux/kernel/projects/rt/${KERNEL_REL}/patch-${rt_patch}.patch.xz
+ wget -c https://www.kernel.org/pub/linux/kernel/projects/rt/${KERNEL_REL}/older/patch-${rt_patch}.patch.xz
xzcat patch-${rt_patch}.patch.xz | patch -p1 || rt_cleanup
rm -f patch-${rt_patch}.patch.xz
rm -f localversion-rt
@@ -484,7 +483,7 @@ patch_backports () {
}
backports () {
- backport_tag="v5.10.165"
+ backport_tag="v5.10.186"
subsystem="uio"
#regenerate="enable"
diff --git a/patches/backports/uio/0001-backports-uio-from-linux.git.patch b/patches/backports/uio/0001-backports-uio-from-linux.git.patch
index 7de3967b0..912fc213a 100644
--- a/patches/backports/uio/0001-backports-uio-from-linux.git.patch
+++ b/patches/backports/uio/0001-backports-uio-from-linux.git.patch
@@ -1,9 +1,9 @@
-From 5d496fb070c7f6fe0f462eddd8ef50f66da21ac0 Mon Sep 17 00:00:00 2001
+From 0f27f5ba4ab5ac2843e75d8eea48c7962972f1ba Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Tue, 31 Jan 2023 17:30:06 -0600
+Date: Fri, 14 Jul 2023 18:06:18 -0500
Subject: [PATCH] backports: uio: from: linux.git
-Reference: v5.10.165
+Reference: v5.10.186
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
drivers/uio/uio_pruss.c | 34 +++++++++++++++++++++++++---------
@@ -111,5 +111,5 @@ index e9096f53b4cc..1cc175d3c25c 100644
return ret;
}
--
-2.39.1
+2.39.2
diff --git a/patches/defconfig b/patches/defconfig
index 4b22832d1..3bf842625 100644
--- a/patches/defconfig
+++ b/patches/defconfig
@@ -5464,8 +5464,7 @@ CONFIG_USB_MUSB_DSPS=y
#
# MUSB DMA mode
#
-# CONFIG_MUSB_PIO_ONLY is not set
-CONFIG_USB_TI_CPPI41_DMA=y
+CONFIG_MUSB_PIO_ONLY=y
# CONFIG_USB_DWC3 is not set
# CONFIG_USB_DWC2 is not set
# CONFIG_USB_CHIPIDEA is not set
diff --git a/patches/external/aufs/0001-merge-aufs-kbuild.patch b/patches/external/aufs/0001-merge-aufs-kbuild.patch
index 8adf58ae7..8ce86c9a7 100644
--- a/patches/external/aufs/0001-merge-aufs-kbuild.patch
+++ b/patches/external/aufs/0001-merge-aufs-kbuild.patch
@@ -1,6 +1,6 @@
-From ff4a216b40ec741975a81d11ec176fb1f01d31fd Mon Sep 17 00:00:00 2001
+From b61864d4574017230b95b234d1a18a4f79a3f910 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Tue, 11 Jul 2023 15:55:40 -0500
+Date: Fri, 14 Jul 2023 18:02:44 -0500
Subject: [PATCH 1/5] merge: aufs-kbuild
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
diff --git a/patches/external/aufs/0002-merge-aufs-base.patch b/patches/external/aufs/0002-merge-aufs-base.patch
index 447941491..fa6aec542 100644
--- a/patches/external/aufs/0002-merge-aufs-base.patch
+++ b/patches/external/aufs/0002-merge-aufs-base.patch
@@ -1,6 +1,6 @@
-From 49cdeb971fc602c6e46f4b3a3fab1f2955a286e4 Mon Sep 17 00:00:00 2001
+From 5ac5721983f88f6703302dbc465db7e4985c6b3a Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Tue, 11 Jul 2023 15:55:41 -0500
+Date: Fri, 14 Jul 2023 18:02:44 -0500
Subject: [PATCH 2/5] merge: aufs-base
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
diff --git a/patches/external/aufs/0003-merge-aufs-mmap.patch b/patches/external/aufs/0003-merge-aufs-mmap.patch
index 4156f066e..c647049b8 100644
--- a/patches/external/aufs/0003-merge-aufs-mmap.patch
+++ b/patches/external/aufs/0003-merge-aufs-mmap.patch
@@ -1,6 +1,6 @@
-From e78345b91b6065d4882b2b07bd4b5f191c5e0d12 Mon Sep 17 00:00:00 2001
+From c92b6af246f77cf296b4a6b49f12463f5f731b6f Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Tue, 11 Jul 2023 15:55:42 -0500
+Date: Fri, 14 Jul 2023 18:02:45 -0500
Subject: [PATCH 3/5] merge: aufs-mmap
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
diff --git a/patches/external/aufs/0004-merge-aufs-standalone.patch b/patches/external/aufs/0004-merge-aufs-standalone.patch
index 838d1365d..8d708839f 100644
--- a/patches/external/aufs/0004-merge-aufs-standalone.patch
+++ b/patches/external/aufs/0004-merge-aufs-standalone.patch
@@ -1,6 +1,6 @@
-From 92cbc4d99ed4656aed6c21a9955bef984bc64744 Mon Sep 17 00:00:00 2001
+From 14469644fe3a31934d4930842e21373fb79c2a42 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Tue, 11 Jul 2023 15:55:48 -0500
+Date: Fri, 14 Jul 2023 18:02:45 -0500
Subject: [PATCH 4/5] merge: aufs-standalone
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
diff --git a/patches/external/aufs/0005-merge-aufs.patch b/patches/external/aufs/0005-merge-aufs.patch
index 1f1f342ba..6ead51051 100644
--- a/patches/external/aufs/0005-merge-aufs.patch
+++ b/patches/external/aufs/0005-merge-aufs.patch
@@ -1,6 +1,6 @@
-From a315881c8a9784c2aff3adc4dd3298fd5e21fab4 Mon Sep 17 00:00:00 2001
+From ca50a04be4f1717191bf3fc038408a0de37acfae Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Tue, 11 Jul 2023 15:55:49 -0500
+Date: Fri, 14 Jul 2023 18:02:46 -0500
Subject: [PATCH 5/5] merge: aufs
https://github.com/sfjro/aufs-standalone/commit/1b8b70a361b6c2f8259851c826a482562d99d9ce
diff --git a/patches/external/bcfserial/0001-merge-bcfserial-https-git.beagleboard.org-beagleconn.patch b/patches/external/bcfserial/0001-merge-bcfserial-https-git.beagleboard.org-beagleconn.patch
index 3e55cbedf..a4f74a126 100644
--- a/patches/external/bcfserial/0001-merge-bcfserial-https-git.beagleboard.org-beagleconn.patch
+++ b/patches/external/bcfserial/0001-merge-bcfserial-https-git.beagleboard.org-beagleconn.patch
@@ -1,6 +1,6 @@
-From 8d7e4c67a561ec6f7b4a50f2995dc6109186735d Mon Sep 17 00:00:00 2001
+From e6a7fcd5c8f2860f2dbc15e4367dcfa9042d200e Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Tue, 11 Jul 2023 15:57:16 -0500
+Date: Fri, 14 Jul 2023 18:04:42 -0500
Subject: [PATCH] merge: bcfserial:
https://git.beagleboard.org/beagleconnect/linux/bcfserial.git
diff --git a/patches/external/git/BBDTBS b/patches/external/git/BBDTBS
index 852bbebed..e3ce7b3a3 100644
--- a/patches/external/git/BBDTBS
+++ b/patches/external/git/BBDTBS
@@ -1 +1 @@
-BBDTBS: https://git.beagleboard.org/beagleboard/BeagleBoard-DeviceTrees/-/commit/9865ab994f9b56665cfd7b99b526abd96b05516a
+BBDTBS: https://git.beagleboard.org/beagleboard/BeagleBoard-DeviceTrees/-/commit/aea68b11d29ea750ee83e01fcae2c46ec9ff958b
diff --git a/patches/external/wireless_regdb/0001-Add-wireless-regdb-regulatory-database-file.patch b/patches/external/wireless_regdb/0001-Add-wireless-regdb-regulatory-database-file.patch
index 5f5be4f17..39755abc5 100644
--- a/patches/external/wireless_regdb/0001-Add-wireless-regdb-regulatory-database-file.patch
+++ b/patches/external/wireless_regdb/0001-Add-wireless-regdb-regulatory-database-file.patch
@@ -1,6 +1,6 @@
-From 6640186135f04d59e59e51b3e2223081cb67253a Mon Sep 17 00:00:00 2001
+From e5c21050f01a4a18cac0ca4dab46bd52e7588881 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Tue, 11 Jul 2023 15:57:53 -0500
+Date: Fri, 14 Jul 2023 18:05:06 -0500
Subject: [PATCH] Add wireless-regdb regulatory database file
https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git/commit/?id=9dc0800cdd7aeeae273b983973a1749f73008291
diff --git a/patches/external/wpanusb/0001-merge-wpanusb-https-git.beagleboard.org-beagleconnec.patch b/patches/external/wpanusb/0001-merge-wpanusb-https-git.beagleboard.org-beagleconnec.patch
index adfd3a856..2e02e5f88 100644
--- a/patches/external/wpanusb/0001-merge-wpanusb-https-git.beagleboard.org-beagleconnec.patch
+++ b/patches/external/wpanusb/0001-merge-wpanusb-https-git.beagleboard.org-beagleconnec.patch
@@ -1,6 +1,6 @@
-From dc54bf01894a00b4e858615ff90e336c95e6a73e Mon Sep 17 00:00:00 2001
+From ef7012607ecbb2d0be18d4388aef552f689b3723 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Tue, 11 Jul 2023 15:56:30 -0500
+Date: Fri, 14 Jul 2023 18:03:35 -0500
Subject: [PATCH] merge: wpanusb:
https://git.beagleboard.org/beagleconnect/linux/wpanusb
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 82cc80220..0c0aa334a 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 462282959e61a7a612456a8501717ebac0738a8d Mon Sep 17 00:00:00 2001
+From 356eb6db182eef9338f5b711b56ec53bb1717042 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Tue, 11 Jul 2023 15:58:36 -0500
+Date: Fri, 14 Jul 2023 18:05:37 -0500
Subject: [PATCH] Add BeagleBoard.org Device Tree Changes
https://git.beagleboard.org/beagleboard/BeagleBoard-DeviceTrees/-/tree/v5.17.x
-https://git.beagleboard.org/beagleboard/BeagleBoard-DeviceTrees/-/commit/9865ab994f9b56665cfd7b99b526abd96b05516a
+https://git.beagleboard.org/beagleboard/BeagleBoard-DeviceTrees/-/commit/aea68b11d29ea750ee83e01fcae2c46ec9ff958b
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
arch/arm/boot/dts/Makefile | 5 +
@@ -17,7 +17,7 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
.../boot/dts/am335x-boneblack-uboot-univ.dts | 193 ++
arch/arm/boot/dts/am335x-boneblack-uboot.dts | 197 ++
.../boot/dts/am335x-boneblack-wireless.dts | 7 +-
- arch/arm/boot/dts/am335x-boneblack.dts | 9 +
+ arch/arm/boot/dts/am335x-boneblack.dts | 11 +-
arch/arm/boot/dts/am335x-boneblue.dts | 4 +-
.../arm/boot/dts/am335x-bonegreen-common.dtsi | 1 +
.../arm/boot/dts/am335x-bonegreen-gateway.dts | 263 ++
@@ -40,17 +40,25 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
arch/arm/boot/dts/dra7-iva-thermal.dtsi | 5 +-
arch/arm/boot/dts/dra7-l4.dtsi | 9 +-
arch/arm/boot/dts/dra7.dtsi | 24 +-
- arch/arm/boot/dts/dra74x-mmc-iodelay.dtsi | 10 +-
+ arch/arm/boot/dts/dra74x-mmc-iodelay.dtsi | 54 +-
+ arch/arm/boot/dts/omap3-beagle-xm.dts | 18 +-
+ arch/arm/boot/dts/omap3-beagle.dts | 20 +-
arch/arm/boot/dts/omap3-cpu-thermal.dtsi | 5 +-
arch/arm/boot/dts/omap3.dtsi | 5 +-
arch/arm/boot/dts/omap34xx.dtsi | 5 +-
arch/arm/boot/dts/omap36xx.dtsi | 5 +-
- arch/arm/boot/dts/omap4-cpu-thermal.dtsi | 5 +-
+ arch/arm/boot/dts/omap4-cpu-thermal.dtsi | 29 +-
+ arch/arm/boot/dts/omap4-mcpdm.dtsi | 2 +-
+ arch/arm/boot/dts/omap4-panda-common.dtsi | 36 +-
+ arch/arm/boot/dts/omap4-panda-es.dts | 12 +-
+ arch/arm/boot/dts/omap4-sdp.dts | 36 +-
arch/arm/boot/dts/omap443x.dtsi | 5 +-
arch/arm/boot/dts/omap4460.dtsi | 5 +-
+ arch/arm/boot/dts/omap5-board-common.dtsi | 42 +-
arch/arm/boot/dts/omap5-core-thermal.dtsi | 5 +-
arch/arm/boot/dts/omap5-gpu-thermal.dtsi | 5 +-
arch/arm/boot/dts/omap5-l4.dtsi | 2 +-
+ arch/arm/boot/dts/omap5-uevm.dts | 8 +-
.../boot/dts/overlays/AM335X-PRU-UIO-00A0.dts | 28 +
arch/arm/boot/dts/overlays/BB-ADC-00A0.dts | 112 +
.../boot/dts/overlays/BB-BBBW-WL1835-00A0.dts | 120 +
@@ -84,9 +92,11 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
arch/arm/boot/dts/overlays/Makefile | 41 +
arch/arm/boot/dts/overlays/PB-MIKROBUS-0.dts | 107 +
arch/arm/boot/dts/overlays/PB-MIKROBUS-1.dts | 108 +
+ arch/arm/boot/dts/twl4030_omap3.dtsi | 4 +-
+ arch/arm/boot/dts/twl6030_omap4.dtsi | 4 +-
include/dt-bindings/board/am335x-bone-pins.h | 253 ++
include/dt-bindings/pinctrl/omap.h | 4 +-
- 78 files changed, 10631 insertions(+), 392 deletions(-)
+ 88 files changed, 10757 insertions(+), 518 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-bone-uboot-univ.dts
@@ -3094,7 +3104,7 @@ index c72b09ab8da0..d27f305f2ac9 100644
/* WL_EN */
gpio = <&gpio3 9 0>;
diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
-index 9312197316f0..ce29a27f4eda 100644
+index 9312197316f0..23b98adeb5a3 100644
--- a/arch/arm/boot/dts/am335x-boneblack.dts
+++ b/arch/arm/boot/dts/am335x-boneblack.dts
@@ -12,6 +12,11 @@
@@ -3109,6 +3119,15 @@ index 9312197316f0..ce29a27f4eda 100644
};
&cpu0_opp_table {
+@@ -34,7 +39,7 @@ &gpio0 {
+ "P9_18 [spi0_d1]",
+ "P9_17 [spi0_cs0]",
+ "[mmc0_cd]",
+- "P8_42A [ecappwm0]",
++ "P9_42A [ecappwm0]",
+ "P8_35 [lcd d12]",
+ "P8_33 [lcd d13]",
+ "P8_31 [lcd d14]",
@@ -168,3 +173,7 @@ &gpio3 {
"NC",
"NC";
@@ -8080,7 +8099,7 @@ index 97ce0c4f1df7..fdbcf3805499 100644
};
};
diff --git a/arch/arm/boot/dts/dra74x-mmc-iodelay.dtsi b/arch/arm/boot/dts/dra74x-mmc-iodelay.dtsi
-index e86da7a970b6..b9d040135c5f 100644
+index e86da7a970b6..e2fdb0702f5c 100644
--- a/arch/arm/boot/dts/dra74x-mmc-iodelay.dtsi
+++ b/arch/arm/boot/dts/dra74x-mmc-iodelay.dtsi
@@ -1,16 +1,8 @@
@@ -8101,6 +8120,372 @@ index e86da7a970b6..b9d040135c5f 100644
*/
/*
+@@ -38,7 +30,7 @@
+ */
+
+ &dra7_pmx_core {
+- mmc1_pins_default: mmc1_pins_default {
++ mmc1_pins_default: mmc1-default-pins {
+ pinctrl-single,pins = <
+ DRA7XX_CORE_IOPAD(0x3754, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_clk.clk */
+ DRA7XX_CORE_IOPAD(0x3758, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_cmd.cmd */
+@@ -49,7 +41,7 @@ DRA7XX_CORE_IOPAD(0x3768, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat3.dat3 */
+ >;
+ };
+
+- mmc1_pins_sdr12: mmc1_pins_sdr12 {
++ mmc1_pins_sdr12: mmc1-sdr12-pins {
+ pinctrl-single,pins = <
+ DRA7XX_CORE_IOPAD(0x3754, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_clk.clk */
+ DRA7XX_CORE_IOPAD(0x3758, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_cmd.cmd */
+@@ -60,7 +52,7 @@ DRA7XX_CORE_IOPAD(0x3768, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat3.dat3 */
+ >;
+ };
+
+- mmc1_pins_hs: mmc1_pins_hs {
++ mmc1_pins_hs: mmc1-hs-pins {
+ pinctrl-single,pins = <
+ DRA7XX_CORE_IOPAD(0x3754, PIN_INPUT_PULLUP | MUX_VIRTUAL_MODE11 | MUX_MODE0) /* mmc1_clk.clk */
+ DRA7XX_CORE_IOPAD(0x3758, PIN_INPUT_PULLUP | MUX_VIRTUAL_MODE11 | MUX_MODE0) /* mmc1_cmd.cmd */
+@@ -71,7 +63,7 @@ DRA7XX_CORE_IOPAD(0x3768, PIN_INPUT_PULLUP | MUX_VIRTUAL_MODE11 | MUX_MODE0) /*
+ >;
+ };
+
+- mmc1_pins_sdr25: mmc1_pins_sdr25 {
++ mmc1_pins_sdr25: mmc1-sdr25-pins {
+ pinctrl-single,pins = <
+ DRA7XX_CORE_IOPAD(0x3754, PIN_INPUT_PULLUP | MUX_VIRTUAL_MODE11 | MUX_MODE0) /* mmc1_clk.clk */
+ DRA7XX_CORE_IOPAD(0x3758, PIN_INPUT_PULLUP | MUX_VIRTUAL_MODE11 | MUX_MODE0) /* mmc1_cmd.cmd */
+@@ -82,7 +74,7 @@ DRA7XX_CORE_IOPAD(0x3768, PIN_INPUT_PULLUP | MUX_VIRTUAL_MODE11 | MUX_MODE0) /*
+ >;
+ };
+
+- mmc1_pins_sdr50: mmc1_pins_sdr50 {
++ mmc1_pins_sdr50: mmc1-sdr50-pins {
+ pinctrl-single,pins = <
+ DRA7XX_CORE_IOPAD(0x3754, PIN_INPUT_PULLUP | MUX_VIRTUAL_MODE10 | MUX_MODE0) /* mmc1_clk.clk */
+ DRA7XX_CORE_IOPAD(0x3758, PIN_INPUT_PULLUP | MUX_VIRTUAL_MODE10 | MUX_MODE0) /* mmc1_cmd.cmd */
+@@ -93,7 +85,7 @@ DRA7XX_CORE_IOPAD(0x3768, PIN_INPUT_PULLUP | MUX_VIRTUAL_MODE10 | MUX_MODE0) /*
+ >;
+ };
+
+- mmc1_pins_ddr50: mmc1_pins_ddr50 {
++ mmc1_pins_ddr50: mmc1-ddr50-pins {
+ pinctrl-single,pins = <
+ DRA7XX_CORE_IOPAD(0x3754, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0) /* mmc1_clk.clk */
+ DRA7XX_CORE_IOPAD(0x3758, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0) /* mmc1_cmd.cmd */
+@@ -104,7 +96,7 @@ DRA7XX_CORE_IOPAD(0x3768, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0) /* mmc1_da
+ >;
+ };
+
+- mmc1_pins_sdr104: mmc1_pins_sdr104 {
++ mmc1_pins_sdr104: mmc1-sdr104-pins {
+ pinctrl-single,pins = <
+ DRA7XX_CORE_IOPAD(0x3754, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0) /* mmc1_clk.clk */
+ DRA7XX_CORE_IOPAD(0x3758, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0) /* mmc1_cmd.cmd */
+@@ -115,7 +107,7 @@ DRA7XX_CORE_IOPAD(0x3768, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0) /* mmc1_da
+ >;
+ };
+
+- mmc2_pins_default: mmc2_pins_default {
++ mmc2_pins_default: mmc2-default-pins {
+ pinctrl-single,pins = <
+ DRA7XX_CORE_IOPAD(0x349c, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a23.mmc2_clk */
+ DRA7XX_CORE_IOPAD(0x34b0, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_cs1.mmc2_cmd */
+@@ -130,7 +122,7 @@ DRA7XX_CORE_IOPAD(0x3498, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a22.mmc2_dat7 */
+ >;
+ };
+
+- mmc2_pins_hs: mmc2_pins_hs {
++ mmc2_pins_hs: mmc2-hs-pins {
+ pinctrl-single,pins = <
+ DRA7XX_CORE_IOPAD(0x349c, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a23.mmc2_clk */
+ DRA7XX_CORE_IOPAD(0x34b0, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_cs1.mmc2_cmd */
+@@ -145,7 +137,7 @@ DRA7XX_CORE_IOPAD(0x3498, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a22.mmc2_dat7 */
+ >;
+ };
+
+- mmc2_pins_ddr_3_3v_rev11: mmc2_pins_ddr_3_3v_rev11 {
++ mmc2_pins_ddr_3_3v_rev11: mmc2-ddr-3-3v-rev11-pins {
+ pinctrl-single,pins = <
+ DRA7XX_CORE_IOPAD(0x349c, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE1) /* gpmc_a23.mmc2_clk */
+ DRA7XX_CORE_IOPAD(0x34b0, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE1) /* gpmc_cs1.mmc2_cmd */
+@@ -160,7 +152,7 @@ DRA7XX_CORE_IOPAD(0x3498, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE1) /* gpmc_a2
+ >;
+ };
+
+- mmc2_pins_ddr_1_8v_rev11: mmc2_pins_ddr_1_8v_rev11 {
++ mmc2_pins_ddr_1_8v_rev11: mmc2-ddr-1-8v-rev11-pins {
+ pinctrl-single,pins = <
+ DRA7XX_CORE_IOPAD(0x349c, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE1) /* gpmc_a23.mmc2_clk */
+ DRA7XX_CORE_IOPAD(0x34b0, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE1) /* gpmc_cs1.mmc2_cmd */
+@@ -175,7 +167,7 @@ DRA7XX_CORE_IOPAD(0x3498, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE1) /* gpmc_a2
+ >;
+ };
+
+- mmc2_pins_ddr_rev20: mmc2_pins_ddr_rev20 {
++ mmc2_pins_ddr_rev20: mmc2-ddr-rev20-pins {
+ pinctrl-single,pins = <
+ DRA7XX_CORE_IOPAD(0x349c, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a23.mmc2_clk */
+ DRA7XX_CORE_IOPAD(0x34b0, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_cs1.mmc2_cmd */
+@@ -190,7 +182,7 @@ DRA7XX_CORE_IOPAD(0x3498, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a22.mmc2_dat7 */
+ >;
+ };
+
+- mmc2_pins_hs200: mmc2_pins_hs200 {
++ mmc2_pins_hs200: mmc2-hs200-pins {
+ pinctrl-single,pins = <
+ DRA7XX_CORE_IOPAD(0x349c, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE1) /* gpmc_a23.mmc2_clk */
+ DRA7XX_CORE_IOPAD(0x34b0, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE1) /* gpmc_cs1.mmc2_cmd */
+@@ -205,7 +197,7 @@ DRA7XX_CORE_IOPAD(0x3498, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE1) /* gpmc_a2
+ >;
+ };
+
+- mmc4_pins_default: mmc4_pins_default {
++ mmc4_pins_default: mmc4-default-pins {
+ pinctrl-single,pins = <
+ DRA7XX_CORE_IOPAD(0x37e8, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE3) /* uart1_ctsn.mmc4_clk */
+ DRA7XX_CORE_IOPAD(0x37ec, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE3) /* uart1_rtsn.mmc4_cmd */
+@@ -216,7 +208,7 @@ DRA7XX_CORE_IOPAD(0x37fc, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE3) /* uart2_r
+ >;
+ };
+
+- mmc4_pins_hs: mmc4_pins_hs {
++ mmc4_pins_hs: mmc4-hs-pins {
+ pinctrl-single,pins = <
+ DRA7XX_CORE_IOPAD(0x37e8, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE3) /* uart1_ctsn.mmc4_clk */
+ DRA7XX_CORE_IOPAD(0x37ec, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE3) /* uart1_rtsn.mmc4_cmd */
+@@ -227,7 +219,7 @@ DRA7XX_CORE_IOPAD(0x37fc, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE3) /* uart2_r
+ >;
+ };
+
+- mmc3_pins_default: mmc3_pins_default {
++ mmc3_pins_default: mmc3-default-pins {
+ pinctrl-single,pins = <
+ DRA7XX_CORE_IOPAD(0x377c, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_clk.mmc3_clk */
+ DRA7XX_CORE_IOPAD(0x3780, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_cmd.mmc3_cmd */
+@@ -238,7 +230,7 @@ DRA7XX_CORE_IOPAD(0x3790, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_
+ >;
+ };
+
+- mmc3_pins_hs: mmc3_pins_hs {
++ mmc3_pins_hs: mmc3-hs-pins {
+ pinctrl-single,pins = <
+ DRA7XX_CORE_IOPAD(0x377c, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_clk.mmc3_clk */
+ DRA7XX_CORE_IOPAD(0x3780, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_cmd.mmc3_cmd */
+@@ -249,7 +241,7 @@ DRA7XX_CORE_IOPAD(0x3790, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_
+ >;
+ };
+
+- mmc3_pins_sdr12: mmc3_pins_sdr12 {
++ mmc3_pins_sdr12: mmc3-sdr12-pins {
+ pinctrl-single,pins = <
+ DRA7XX_CORE_IOPAD(0x377c, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_clk.mmc3_clk */
+ DRA7XX_CORE_IOPAD(0x3780, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_cmd.mmc3_cmd */
+@@ -260,7 +252,7 @@ DRA7XX_CORE_IOPAD(0x3790, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_
+ >;
+ };
+
+- mmc3_pins_sdr25: mmc3_pins_sdr25 {
++ mmc3_pins_sdr25: mmc3-sdr25-pins {
+ pinctrl-single,pins = <
+ DRA7XX_CORE_IOPAD(0x377c, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_clk.mmc3_clk */
+ DRA7XX_CORE_IOPAD(0x3780, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_cmd.mmc3_cmd */
+@@ -271,7 +263,7 @@ DRA7XX_CORE_IOPAD(0x3790, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_
+ >;
+ };
+
+- mmc3_pins_sdr50: mmc3_pins_sdr50 {
++ mmc3_pins_sdr50: mmc3-sdr50-pins {
+ pinctrl-single,pins = <
+ DRA7XX_CORE_IOPAD(0x377c, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_clk.mmc3_clk */
+ DRA7XX_CORE_IOPAD(0x3780, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_cmd.mmc3_cmd */
+@@ -282,7 +274,7 @@ DRA7XX_CORE_IOPAD(0x3790, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_
+ >;
+ };
+
+- mmc4_pins_sdr12: mmc4_pins_sdr12 {
++ mmc4_pins_sdr12: mmc4-sdr12-pins {
+ pinctrl-single,pins = <
+ DRA7XX_CORE_IOPAD(0x37e8, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE3) /* uart1_ctsn.mmc4_clk */
+ DRA7XX_CORE_IOPAD(0x37ec, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE3) /* uart1_rtsn.mmc4_cmd */
+@@ -293,7 +285,7 @@ DRA7XX_CORE_IOPAD(0x37fc, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE3) /* uart2_r
+ >;
+ };
+
+- mmc4_pins_sdr25: mmc4_pins_sdr25 {
++ mmc4_pins_sdr25: mmc4-sdr25-pins {
+ pinctrl-single,pins = <
+ DRA7XX_CORE_IOPAD(0x37e8, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE3) /* uart1_ctsn.mmc4_clk */
+ DRA7XX_CORE_IOPAD(0x37ec, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE3) /* uart1_rtsn.mmc4_cmd */
+diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts
+index a858ebfa1500..08ee0f8ea68f 100644
+--- a/arch/arm/boot/dts/omap3-beagle-xm.dts
++++ b/arch/arm/boot/dts/omap3-beagle-xm.dts
+@@ -8,7 +8,7 @@
+
+ / {
+ model = "TI OMAP3 BeagleBoard xM";
+- compatible = "ti,omap3-beagle-xm", "ti,omap3630", "ti,omap36xx", "ti,omap3";
++ compatible = "ti,omap3-beagle-xm", "ti,omap3630", "ti,omap3";
+
+ cpus {
+ cpu@0 {
+@@ -90,7 +90,7 @@ hsusb2_power: hsusb2_power_reg {
+ };
+
+ /* HS USB Host PHY on PORT 2 */
+- hsusb2_phy: hsusb2_phy {
++ hsusb2_phy: hsusb2-phy-pins {
+ compatible = "usb-nop-xceiv";
+ reset-gpios = <&gpio5 19 GPIO_ACTIVE_LOW>; /* gpio_147 */
+ vcc-supply = <&hsusb2_power>;
+@@ -183,13 +183,13 @@ etm_out: endpoint {
+ };
+
+ &omap3_pmx_wkup {
+- gpio1_pins: pinmux_gpio1_pins {
++ gpio1_pins: gpio1-pins {
+ pinctrl-single,pins = <
+ OMAP3_WKUP_IOPAD(0x2a0e, PIN_INPUT | PIN_OFF_WAKEUPENABLE | MUX_MODE4) /* sys_boot2.gpio_4 */
+ >;
+ };
+
+- dss_dpi_pins2: pinmux_dss_dpi_pins1 {
++ dss_dpi_pins2: dss-dpi1-pins {
+ pinctrl-single,pins = <
+ OMAP3_WKUP_IOPAD(0x2a0a, PIN_OUTPUT | MUX_MODE3) /* sys_boot0.dss_data18 */
+ OMAP3_WKUP_IOPAD(0x2a0c, PIN_OUTPUT | MUX_MODE3) /* sys_boot1.dss_data19 */
+@@ -207,14 +207,14 @@ &omap3_pmx_core {
+ &hsusb2_pins
+ >;
+
+- uart3_pins: pinmux_uart3_pins {
++ uart3_pins: uart3-pins {
+ pinctrl-single,pins = <
+ OMAP3_CORE1_IOPAD(0x219e, PIN_INPUT | MUX_MODE0) /* uart3_rx_irrx.uart3_rx_irrx */
+ OMAP3_CORE1_IOPAD(0x21a0, PIN_OUTPUT | MUX_MODE0) /* uart3_tx_irtx.uart3_tx_irtx OUTPUT | MODE0 */
+ >;
+ };
+
+- hsusb2_pins: pinmux_hsusb2_pins {
++ hsusb2_pins: hsusb2-pins {
+ pinctrl-single,pins = <
+ OMAP3_CORE1_IOPAD(0x21d4, PIN_INPUT_PULLDOWN | MUX_MODE3) /* mcspi1_cs3.hsusb2_data2 */
+ OMAP3_CORE1_IOPAD(0x21d6, PIN_INPUT_PULLDOWN | MUX_MODE3) /* mcspi2_clk.hsusb2_data7 */
+@@ -225,7 +225,7 @@ OMAP3_CORE1_IOPAD(0x21de, PIN_INPUT_PULLDOWN | MUX_MODE3) /* mcspi2_cs1.hsusb2_d
+ >;
+ };
+
+- dss_dpi_pins1: pinmux_dss_dpi_pins2 {
++ dss_dpi_pins1: dss-dpi2-pins {
+ pinctrl-single,pins = <
+ OMAP3_CORE1_IOPAD(0x20d4, PIN_OUTPUT | MUX_MODE0) /* dss_pclk.dss_pclk */
+ OMAP3_CORE1_IOPAD(0x20d6, PIN_OUTPUT | MUX_MODE0) /* dss_hsync.dss_hsync */
+@@ -261,7 +261,7 @@ &omap3_pmx_core2 {
+ &hsusb2_2_pins
+ >;
+
+- hsusb2_2_pins: pinmux_hsusb2_2_pins {
++ hsusb2_2_pins: hsusb2-2-pins {
+ pinctrl-single,pins = <
+ OMAP3630_CORE2_IOPAD(0x25f0, PIN_OUTPUT | MUX_MODE3) /* etk_d10.hsusb2_clk */
+ OMAP3630_CORE2_IOPAD(0x25f2, PIN_OUTPUT | MUX_MODE3) /* etk_d11.hsusb2_stp */
+@@ -370,7 +370,7 @@ hub@2 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+- ethernet: usbether@1 {
++ ethernet: ethernet@1 {
+ compatible = "usb424,ec00";
+ reg = <1>;
+ };
+diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts
+index 0548b391334f..4d9a8eab6abf 100644
+--- a/arch/arm/boot/dts/omap3-beagle.dts
++++ b/arch/arm/boot/dts/omap3-beagle.dts
+@@ -28,18 +28,18 @@ aliases {
+
+ leds {
+ compatible = "gpio-leds";
+- pmu_stat {
++ led-pmu-stat {
+ label = "beagleboard::pmu_stat";
+ gpios = <&twl_gpio 19 GPIO_ACTIVE_HIGH>; /* LEDB */
+ };
+
+- heartbeat {
++ led-heartbeat {
+ label = "beagleboard::usr0";
+ gpios = <&gpio5 22 GPIO_ACTIVE_HIGH>; /* 150 -> D6 LED */
+ linux,default-trigger = "heartbeat";
+ };
+
+- mmc {
++ led-mmc {
+ label = "beagleboard::usr1";
+ gpios = <&gpio5 21 GPIO_ACTIVE_HIGH>; /* 149 -> D7 LED */
+ linux,default-trigger = "mmc0";
+@@ -57,7 +57,7 @@ hsusb2_power: hsusb2_power_reg {
+ };
+
+ /* HS USB Host PHY on PORT 2 */
+- hsusb2_phy: hsusb2_phy {
++ hsusb2_phy: hsusb2-phy-pins {
+ compatible = "usb-nop-xceiv";
+ reset-gpios = <&gpio5 19 GPIO_ACTIVE_LOW>; /* gpio_147 */
+ vcc-supply = <&hsusb2_power>;
+@@ -170,7 +170,7 @@ etm_out: endpoint {
+ };
+
+ &omap3_pmx_wkup {
+- gpio1_pins: pinmux_gpio1_pins {
++ gpio1_pins: gpio1-pins {
+ pinctrl-single,pins = <
+ OMAP3_WKUP_IOPAD(0x2a14, PIN_INPUT | PIN_OFF_WAKEUPENABLE | MUX_MODE4) /* sys_boot5.gpio_7 */
+ >;
+@@ -183,7 +183,7 @@ &omap3_pmx_core {
+ &hsusb2_pins
+ >;
+
+- hsusb2_pins: pinmux_hsusb2_pins {
++ hsusb2_pins: hsusb2-pins {
+ pinctrl-single,pins = <
+ OMAP3_CORE1_IOPAD(0x21d4, PIN_INPUT_PULLDOWN | MUX_MODE3) /* mcspi1_cs3.hsusb2_data2 */
+ OMAP3_CORE1_IOPAD(0x21d6, PIN_INPUT_PULLDOWN | MUX_MODE3) /* mcspi2_clk.hsusb2_data7 */
+@@ -194,20 +194,20 @@ OMAP3_CORE1_IOPAD(0x21de, PIN_INPUT_PULLDOWN | MUX_MODE3) /* mcspi2_cs1.hsusb2_d
+ >;
+ };
+
+- uart3_pins: pinmux_uart3_pins {
++ uart3_pins: uart3-pins {
+ pinctrl-single,pins = <
+ OMAP3_CORE1_IOPAD(0x219e, PIN_INPUT | PIN_OFF_WAKEUPENABLE | MUX_MODE0) /* uart3_rx_irrx.uart3_rx_irrx */
+ OMAP3_CORE1_IOPAD(0x21a0, PIN_OUTPUT | MUX_MODE0) /* uart3_tx_irtx.uart3_tx_irtx */
+ >;
+ };
+
+- tfp410_pins: pinmux_tfp410_pins {
++ tfp410_pins: tfp410-pins {
+ pinctrl-single,pins = <
+ OMAP3_CORE1_IOPAD(0x21c6, PIN_OUTPUT | MUX_MODE4) /* hdq_sio.gpio_170 */
+ >;
+ };
+
+- dss_dpi_pins: pinmux_dss_dpi_pins {
++ dss_dpi_pins: dss-dpi-pins {
+ pinctrl-single,pins = <
+ OMAP3_CORE1_IOPAD(0x20d4, PIN_OUTPUT | MUX_MODE0) /* dss_pclk.dss_pclk */
+ OMAP3_CORE1_IOPAD(0x20d6, PIN_OUTPUT | MUX_MODE0) /* dss_hsync.dss_hsync */
+@@ -247,7 +247,7 @@ &omap3_pmx_core2 {
+ &hsusb2_2_pins
+ >;
+
+- hsusb2_2_pins: pinmux_hsusb2_2_pins {
++ hsusb2_2_pins: hsusb2-2-pins {
+ pinctrl-single,pins = <
+ OMAP3430_CORE2_IOPAD(0x25f0, PIN_OUTPUT | MUX_MODE3) /* etk_d10.hsusb2_clk */
+ OMAP3430_CORE2_IOPAD(0x25f2, PIN_OUTPUT | MUX_MODE3) /* etk_d11.hsusb2_stp */
diff --git a/arch/arm/boot/dts/omap3-cpu-thermal.dtsi b/arch/arm/boot/dts/omap3-cpu-thermal.dtsi
index a9069cca5888..0da759f8e2c2 100644
--- a/arch/arm/boot/dts/omap3-cpu-thermal.dtsi
@@ -8170,7 +8555,7 @@ index 22b33098b1a2..32ac7924a130 100644
#include <dt-bindings/bus/ti-sysc.h>
diff --git a/arch/arm/boot/dts/omap4-cpu-thermal.dtsi b/arch/arm/boot/dts/omap4-cpu-thermal.dtsi
-index 03d054b2bf9a..4d7eeb133dad 100644
+index 03d054b2bf9a..801b4f10350c 100644
--- a/arch/arm/boot/dts/omap4-cpu-thermal.dtsi
+++ b/arch/arm/boot/dts/omap4-cpu-thermal.dtsi
@@ -1,12 +1,9 @@
@@ -8187,6 +8572,416 @@ index 03d054b2bf9a..4d7eeb133dad 100644
*/
#include <dt-bindings/thermal/thermal.h>
+@@ -16,20 +13,20 @@ cpu_thermal: cpu_thermal {
+ polling-delay = <1000>; /* milliseconds */
+
+ /* sensor ID */
+- thermal-sensors = <&bandgap 0>;
++ thermal-sensors = <&bandgap 0>;
+
+ cpu_trips: trips {
+- cpu_alert0: cpu_alert {
+- temperature = <100000>; /* millicelsius */
+- hysteresis = <2000>; /* millicelsius */
+- type = "passive";
+- };
+- cpu_crit: cpu_crit {
+- temperature = <125000>; /* millicelsius */
+- hysteresis = <2000>; /* millicelsius */
+- type = "critical";
+- };
+- };
++ cpu_alert0: cpu_alert {
++ temperature = <100000>; /* millicelsius */
++ hysteresis = <2000>; /* millicelsius */
++ type = "passive";
++ };
++ cpu_crit: cpu_crit {
++ temperature = <125000>; /* millicelsius */
++ hysteresis = <2000>; /* millicelsius */
++ type = "critical";
++ };
++ };
+
+ cpu_cooling_maps: cooling-maps {
+ map0 {
+diff --git a/arch/arm/boot/dts/omap4-mcpdm.dtsi b/arch/arm/boot/dts/omap4-mcpdm.dtsi
+index 915a9b31a33b..03ade47431fb 100644
+--- a/arch/arm/boot/dts/omap4-mcpdm.dtsi
++++ b/arch/arm/boot/dts/omap4-mcpdm.dtsi
+@@ -7,7 +7,7 @@
+ */
+
+ &omap4_pmx_core {
+- mcpdm_pins: pinmux_mcpdm_pins {
++ mcpdm_pins: mcpdm-pins {
+ pinctrl-single,pins = <
+ /* 0x4a100106 abe_pdm_ul_data.abe_pdm_ul_data ag25 */
+ OMAP4_IOPAD(0x106, PIN_INPUT_PULLDOWN | MUX_MODE0)
+diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi
+index 609a8dea946b..f528511c2537 100644
+--- a/arch/arm/boot/dts/omap4-panda-common.dtsi
++++ b/arch/arm/boot/dts/omap4-panda-common.dtsi
+@@ -49,13 +49,13 @@ leds: leds {
+ &led_wkgpio_pins
+ >;
+
+- heartbeat {
++ led-heartbeat {
+ label = "pandaboard::status1";
+ gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "heartbeat";
+ };
+
+- mmc {
++ led-mmc {
+ label = "pandaboard::status2";
+ gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "mmc0";
+@@ -237,14 +237,14 @@ &tpd12s015_pins
+ &hsusbb1_pins
+ >;
+
+- twl6040_pins: pinmux_twl6040_pins {
++ twl6040_pins: twl6040-pins {
+ pinctrl-single,pins = <
+ OMAP4_IOPAD(0x120, PIN_OUTPUT | MUX_MODE3) /* hdq_sio.gpio_127 */
+ OMAP4_IOPAD(0x1a0, PIN_INPUT | MUX_MODE0) /* sys_nirq2.sys_nirq2 */
+ >;
+ };
+
+- mcbsp1_pins: pinmux_mcbsp1_pins {
++ mcbsp1_pins: mcbsp1-pins {
+ pinctrl-single,pins = <
+ OMAP4_IOPAD(0x0fe, PIN_INPUT | MUX_MODE0) /* abe_mcbsp1_clkx.abe_mcbsp1_clkx */
+ OMAP4_IOPAD(0x100, PIN_INPUT_PULLDOWN | MUX_MODE0) /* abe_mcbsp1_dr.abe_mcbsp1_dr */
+@@ -253,7 +253,7 @@ OMAP4_IOPAD(0x104, PIN_INPUT | MUX_MODE0) /* abe_mcbsp1_fsx.abe_mcbsp1_fsx */
+ >;
+ };
+
+- dss_dpi_pins: pinmux_dss_dpi_pins {
++ dss_dpi_pins: dss-dpi-pins {
+ pinctrl-single,pins = <
+ OMAP4_IOPAD(0x162, PIN_OUTPUT | MUX_MODE5) /* dispc2_data23 */
+ OMAP4_IOPAD(0x164, PIN_OUTPUT | MUX_MODE5) /* dispc2_data22 */
+@@ -288,13 +288,13 @@ OMAP4_IOPAD(0x1d4, PIN_OUTPUT | MUX_MODE5) /* dispc2_data0 */
+ >;
+ };
+
+- tfp410_pins: pinmux_tfp410_pins {
++ tfp410_pins: tfp410-pins {
+ pinctrl-single,pins = <
+ OMAP4_IOPAD(0x184, PIN_OUTPUT | MUX_MODE3) /* gpio_0 */
+ >;
+ };
+
+- dss_hdmi_pins: pinmux_dss_hdmi_pins {
++ dss_hdmi_pins: dss-hdmi-pins {
+ pinctrl-single,pins = <
+ OMAP4_IOPAD(0x09a, PIN_INPUT | MUX_MODE0) /* hdmi_cec.hdmi_cec */
+ OMAP4_IOPAD(0x09c, PIN_INPUT_PULLUP | MUX_MODE0) /* hdmi_scl.hdmi_scl */
+@@ -302,7 +302,7 @@ OMAP4_IOPAD(0x09e, PIN_INPUT_PULLUP | MUX_MODE0) /* hdmi_sda.hdmi_sda */
+ >;
+ };
+
+- tpd12s015_pins: pinmux_tpd12s015_pins {
++ tpd12s015_pins: tpd12s015-pins {
+ pinctrl-single,pins = <
+ OMAP4_IOPAD(0x062, PIN_OUTPUT | MUX_MODE3) /* gpmc_a17.gpio_41 */
+ OMAP4_IOPAD(0x088, PIN_OUTPUT | MUX_MODE3) /* gpmc_nbe1.gpio_60 */
+@@ -310,7 +310,7 @@ OMAP4_IOPAD(0x098, PIN_INPUT_PULLDOWN | MUX_MODE3) /* hdmi_hpd.gpio_63 */
+ >;
+ };
+
+- hsusbb1_pins: pinmux_hsusbb1_pins {
++ hsusbb1_pins: hsusbb1-pins {
+ pinctrl-single,pins = <
+ OMAP4_IOPAD(0x0c2, PIN_INPUT_PULLDOWN | MUX_MODE4) /* usbb1_ulpitll_clk.usbb1_ulpiphy_clk */
+ OMAP4_IOPAD(0x0c4, PIN_OUTPUT | MUX_MODE4) /* usbb1_ulpitll_stp.usbb1_ulpiphy_stp */
+@@ -327,28 +327,28 @@ OMAP4_IOPAD(0x0d8, PIN_INPUT_PULLDOWN | MUX_MODE4) /* usbb1_ulpitll_dat7.usbb1_u
+ >;
+ };
+
+- i2c1_pins: pinmux_i2c1_pins {
++ i2c1_pins: i2c1-pins {
+ pinctrl-single,pins = <
+ OMAP4_IOPAD(0x122, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_scl */
+ OMAP4_IOPAD(0x124, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_sda */
+ >;
+ };
+
+- i2c2_pins: pinmux_i2c2_pins {
++ i2c2_pins: i2c2-pins {
+ pinctrl-single,pins = <
+ OMAP4_IOPAD(0x126, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c2_scl */
+ OMAP4_IOPAD(0x128, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c2_sda */
+ >;
+ };
+
+- i2c3_pins: pinmux_i2c3_pins {
++ i2c3_pins: i2c3-pins {
+ pinctrl-single,pins = <
+ OMAP4_IOPAD(0x12a, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c3_scl */
+ OMAP4_IOPAD(0x12c, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c3_sda */
+ >;
+ };
+
+- i2c4_pins: pinmux_i2c4_pins {
++ i2c4_pins: i2c4-pins {
+ pinctrl-single,pins = <
+ OMAP4_IOPAD(0x12e, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c4_scl */
+ OMAP4_IOPAD(0x130, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c4_sda */
+@@ -359,7 +359,7 @@ OMAP4_IOPAD(0x130, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c4_sda */
+ * wl12xx GPIO outputs for WLAN_EN, BT_EN, FM_EN, BT_WAKEUP
+ * REVISIT: Are the pull-ups needed for GPIO 48 and 49?
+ */
+- wl12xx_gpio: pinmux_wl12xx_gpio {
++ wl12xx_gpio: wl12xx-gpio-pins {
+ pinctrl-single,pins = <
+ OMAP4_IOPAD(0x066, PIN_OUTPUT | MUX_MODE3) /* gpmc_a19.gpio_43 */
+ OMAP4_IOPAD(0x06c, PIN_OUTPUT | MUX_MODE3) /* gpmc_a22.gpio_46 */
+@@ -369,7 +369,7 @@ OMAP4_IOPAD(0x072, PIN_OUTPUT_PULLUP | MUX_MODE3) /* gpmc_a25.gpio_49 */
+ };
+
+ /* wl12xx GPIO inputs and SDIO pins */
+- wl12xx_pins: pinmux_wl12xx_pins {
++ wl12xx_pins: wl12xx-pins {
+ pinctrl-single,pins = <
+ OMAP4_IOPAD(0x078, PIN_INPUT | MUX_MODE3) /* gpmc_ncs2.gpio_52 */
+ OMAP4_IOPAD(0x07a, PIN_INPUT | MUX_MODE3) /* gpmc_ncs3.gpio_53 */
+@@ -382,7 +382,7 @@ OMAP4_IOPAD(0x152, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc5_dat3.sdmmc5_dat3 */
+ >;
+ };
+
+- button_pins: pinmux_button_pins {
++ button_pins: button-pins {
+ pinctrl-single,pins = <
+ OMAP4_IOPAD(0x114, PIN_INPUT_PULLUP | MUX_MODE3) /* gpio_121 */
+ >;
+@@ -390,7 +390,7 @@ OMAP4_IOPAD(0x114, PIN_INPUT_PULLUP | MUX_MODE3) /* gpio_121 */
+ };
+
+ &omap4_pmx_wkup {
+- led_wkgpio_pins: pinmux_leds_wkpins {
++ led_wkgpio_pins: leds-wkpins-pins {
+ pinctrl-single,pins = <
+ OMAP4_IOPAD(0x05a, PIN_OUTPUT | MUX_MODE3) /* gpio_wk7 */
+ OMAP4_IOPAD(0x05c, PIN_OUTPUT | MUX_MODE3) /* gpio_wk8 */
+@@ -558,7 +558,7 @@ hub@1 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+- ethernet: usbether@1 {
++ ethernet: ethernet@1 {
+ compatible = "usb424,ec00";
+ reg = <1>;
+ };
+diff --git a/arch/arm/boot/dts/omap4-panda-es.dts b/arch/arm/boot/dts/omap4-panda-es.dts
+index 7c6886cd738f..fe7b156d10ed 100644
+--- a/arch/arm/boot/dts/omap4-panda-es.dts
++++ b/arch/arm/boot/dts/omap4-panda-es.dts
+@@ -38,26 +38,26 @@ OMAP4_IOPAD(0x09e, PIN_INPUT | MUX_MODE0) /* hdmi_sda.hdmi_sda */
+ };
+
+ &omap4_pmx_core {
+- led_gpio_pins: gpio_led_pmx {
++ led_gpio_pins: gpio-led-pmx-pins {
+ pinctrl-single,pins = <
+ OMAP4_IOPAD(0x0f6, PIN_OUTPUT | MUX_MODE3) /* gpio_110 */
+ >;
+ };
+
+- button_pins: pinmux_button_pins {
++ button_pins: button-pins {
+ pinctrl-single,pins = <
+ OMAP4_IOPAD(0x0fc, PIN_INPUT_PULLUP | MUX_MODE3) /* gpio_113 */
+ >;
+ };
+
+- bt_pins: pinmux_bt_pins {
++ bt_pins: bt-pins {
+ pinctrl-single,pins = <
+ OMAP4_IOPAD(0x06c, PIN_OUTPUT | MUX_MODE3) /* gpmc_a22.gpio_46 - BTEN */
+ OMAP4_IOPAD(0x072, PIN_OUTPUT_PULLUP | MUX_MODE3) /* gpmc_a25.gpio_49 - BTWAKEUP */
+ >;
+ };
+
+- uart2_pins: pinmux_uart2_pins {
++ uart2_pins: uart2-pins {
+ pinctrl-single,pins = <
+ OMAP4_IOPAD(0x118, PIN_INPUT_PULLUP | MUX_MODE0) /* uart2_cts.uart2_cts - HCI */
+ OMAP4_IOPAD(0x11a, PIN_OUTPUT | MUX_MODE0) /* uart2_rts.uart2_rts */
+@@ -79,10 +79,10 @@ &led_gpio_pins
+ &led_wkgpio_pins
+ >;
+
+- heartbeat {
++ led-heartbeat {
+ gpios = <&gpio4 14 GPIO_ACTIVE_HIGH>;
+ };
+- mmc {
++ led-mmc {
+ gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
+ };
+ };
+diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts
+index 9e976140f34a..b2cb93edbc3a 100644
+--- a/arch/arm/boot/dts/omap4-sdp.dts
++++ b/arch/arm/boot/dts/omap4-sdp.dts
+@@ -214,7 +214,7 @@ &dss_hdmi_pins
+ &tpd12s015_pins
+ >;
+
+- uart2_pins: pinmux_uart2_pins {
++ uart2_pins: uart2-pins {
+ pinctrl-single,pins = <
+ OMAP4_IOPAD(0x118, PIN_INPUT_PULLUP | MUX_MODE0) /* uart2_cts.uart2_cts */
+ OMAP4_IOPAD(0x11a, PIN_OUTPUT | MUX_MODE0) /* uart2_rts.uart2_rts */
+@@ -223,7 +223,7 @@ OMAP4_IOPAD(0x11e, PIN_OUTPUT | MUX_MODE0) /* uart2_tx.uart2_tx */
+ >;
+ };
+
+- uart3_pins: pinmux_uart3_pins {
++ uart3_pins: uart3-pins {
+ pinctrl-single,pins = <
+ OMAP4_IOPAD(0x140, PIN_INPUT_PULLUP | MUX_MODE0) /* uart3_cts_rctx.uart3_cts_rctx */
+ OMAP4_IOPAD(0x142, PIN_OUTPUT | MUX_MODE0) /* uart3_rts_sd.uart3_rts_sd */
+@@ -232,21 +232,21 @@ OMAP4_IOPAD(0x146, PIN_OUTPUT | MUX_MODE0) /* uart3_tx_irtx.uart3_tx_irtx */
+ >;
+ };
+
+- uart4_pins: pinmux_uart4_pins {
++ uart4_pins: uart4-pins {
+ pinctrl-single,pins = <
+ OMAP4_IOPAD(0x15c, PIN_INPUT | MUX_MODE0) /* uart4_rx.uart4_rx */
+ OMAP4_IOPAD(0x15e, PIN_OUTPUT | MUX_MODE0) /* uart4_tx.uart4_tx */
+ >;
+ };
+
+- twl6040_pins: pinmux_twl6040_pins {
++ twl6040_pins: twl6040-pins {
+ pinctrl-single,pins = <
+ OMAP4_IOPAD(0x120, PIN_OUTPUT | MUX_MODE3) /* hdq_sio.gpio_127 */
+ OMAP4_IOPAD(0x1a0, PIN_INPUT | MUX_MODE0) /* sys_nirq2.sys_nirq2 */
+ >;
+ };
+
+- dmic_pins: pinmux_dmic_pins {
++ dmic_pins: dmic-pins {
+ pinctrl-single,pins = <
+ OMAP4_IOPAD(0x110, PIN_OUTPUT | MUX_MODE0) /* abe_dmic_clk1.abe_dmic_clk1 */
+ OMAP4_IOPAD(0x112, PIN_INPUT | MUX_MODE0) /* abe_dmic_din1.abe_dmic_din1 */
+@@ -255,7 +255,7 @@ OMAP4_IOPAD(0x116, PIN_INPUT | MUX_MODE0) /* abe_dmic_din3.abe_dmic_din3 */
+ >;
+ };
+
+- mcbsp1_pins: pinmux_mcbsp1_pins {
++ mcbsp1_pins: mcbsp1-pins {
+ pinctrl-single,pins = <
+ OMAP4_IOPAD(0x0fe, PIN_INPUT | MUX_MODE0) /* abe_mcbsp1_clkx.abe_mcbsp1_clkx */
+ OMAP4_IOPAD(0x100, PIN_INPUT_PULLDOWN | MUX_MODE0) /* abe_mcbsp1_dr.abe_mcbsp1_dr */
+@@ -264,7 +264,7 @@ OMAP4_IOPAD(0x104, PIN_INPUT | MUX_MODE0) /* abe_mcbsp1_fsx.abe_mcbsp1_fsx */
+ >;
+ };
+
+- mcbsp2_pins: pinmux_mcbsp2_pins {
++ mcbsp2_pins: mcbsp2-pins {
+ pinctrl-single,pins = <
+ OMAP4_IOPAD(0x0f6, PIN_INPUT | MUX_MODE0) /* abe_mcbsp2_clkx.abe_mcbsp2_clkx */
+ OMAP4_IOPAD(0x0f8, PIN_INPUT_PULLDOWN | MUX_MODE0) /* abe_mcbsp2_dr.abe_mcbsp2_dr */
+@@ -273,7 +273,7 @@ OMAP4_IOPAD(0x0fc, PIN_INPUT | MUX_MODE0) /* abe_mcbsp2_fsx.abe_mcbsp2_fsx */
+ >;
+ };
+
+- mcspi1_pins: pinmux_mcspi1_pins {
++ mcspi1_pins: mcspi1-pins {
+ pinctrl-single,pins = <
+ OMAP4_IOPAD(0x132, PIN_INPUT | MUX_MODE0) /* mcspi1_clk.mcspi1_clk */
+ OMAP4_IOPAD(0x134, PIN_INPUT | MUX_MODE0) /* mcspi1_somi.mcspi1_somi */
+@@ -282,7 +282,7 @@ OMAP4_IOPAD(0x138, PIN_INPUT | MUX_MODE0) /* mcspi1_cs0.mcspi1_cs0 */
+ >;
+ };
+
+- dss_hdmi_pins: pinmux_dss_hdmi_pins {
++ dss_hdmi_pins: dss-hdmi-pins {
+ pinctrl-single,pins = <
+ OMAP4_IOPAD(0x09a, PIN_INPUT | MUX_MODE0) /* hdmi_cec.hdmi_cec */
+ OMAP4_IOPAD(0x09c, PIN_INPUT_PULLUP | MUX_MODE0) /* hdmi_scl.hdmi_scl */
+@@ -290,7 +290,7 @@ OMAP4_IOPAD(0x09e, PIN_INPUT_PULLUP | MUX_MODE0) /* hdmi_sda.hdmi_sda */
+ >;
+ };
+
+- tpd12s015_pins: pinmux_tpd12s015_pins {
++ tpd12s015_pins: tpd12s015-pins {
+ pinctrl-single,pins = <
+ OMAP4_IOPAD(0x062, PIN_OUTPUT | MUX_MODE3) /* gpmc_a17.gpio_41 */
+ OMAP4_IOPAD(0x088, PIN_OUTPUT | MUX_MODE3) /* gpmc_nbe1.gpio_60 */
+@@ -298,28 +298,28 @@ OMAP4_IOPAD(0x098, PIN_INPUT_PULLDOWN | MUX_MODE3) /* hdmi_hpd.gpio_63 */
+ >;
+ };
+
+- i2c1_pins: pinmux_i2c1_pins {
++ i2c1_pins: i2c1-pins {
+ pinctrl-single,pins = <
+ OMAP4_IOPAD(0x122, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_scl */
+ OMAP4_IOPAD(0x124, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_sda */
+ >;
+ };
+
+- i2c2_pins: pinmux_i2c2_pins {
++ i2c2_pins: i2c2-pins {
+ pinctrl-single,pins = <
+ OMAP4_IOPAD(0x126, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c2_scl */
+ OMAP4_IOPAD(0x128, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c2_sda */
+ >;
+ };
+
+- i2c3_pins: pinmux_i2c3_pins {
++ i2c3_pins: i2c3-pins {
+ pinctrl-single,pins = <
+ OMAP4_IOPAD(0x12a, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c3_scl */
+ OMAP4_IOPAD(0x12c, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c3_sda */
+ >;
+ };
+
+- i2c4_pins: pinmux_i2c4_pins {
++ i2c4_pins: i2c4-pins {
+ pinctrl-single,pins = <
+ OMAP4_IOPAD(0x12e, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c4_scl */
+ OMAP4_IOPAD(0x130, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c4_sda */
+@@ -327,14 +327,14 @@ OMAP4_IOPAD(0x130, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c4_sda */
+ };
+
+ /* wl12xx GPIO output for WLAN_EN */
+- wl12xx_gpio: pinmux_wl12xx_gpio {
++ wl12xx_gpio: wl12xx-gpio-pins {
+ pinctrl-single,pins = <
+ OMAP4_IOPAD(0x07c, PIN_OUTPUT | MUX_MODE3) /* gpmc_nwp.gpio_54 */
+ >;
+ };
+
+ /* wl12xx GPIO inputs and SDIO pins */
+- wl12xx_pins: pinmux_wl12xx_pins {
++ wl12xx_pins: wl12xx-pins {
+ pinctrl-single,pins = <
+ OMAP4_IOPAD(0x07a, PIN_INPUT | MUX_MODE3) /* gpmc_ncs3.gpio_53 */
+ OMAP4_IOPAD(0x148, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc5_clk.sdmmc5_clk */
+@@ -347,13 +347,13 @@ OMAP4_IOPAD(0x152, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc5_dat3.sdmmc5_dat3 */
+ };
+
+ /* gpio_48 for ENET_ENABLE */
+- enet_enable_gpio: pinmux_enet_enable_gpio {
++ enet_enable_gpio: enet-enable-gpio-pins {
+ pinctrl-single,pins = <
+ OMAP4_IOPAD(0x070, PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* gpmc_a24.gpio_48 */
+ >;
+ };
+
+- ks8851_pins: pinmux_ks8851_pins {
++ ks8851_pins: ks8851-pins {
+ pinctrl-single,pins = <
+ /* ENET_INT */
+ OMAP4_IOPAD(0x054, PIN_INPUT_PULLUP | MUX_MODE3) /* gpmc_ad10.gpio_34 */
diff --git a/arch/arm/boot/dts/omap443x.dtsi b/arch/arm/boot/dts/omap443x.dtsi
index 8466161197ae..238aceb799f8 100644
--- a/arch/arm/boot/dts/omap443x.dtsi
@@ -8221,6 +9016,187 @@ index 3d6db1db94e0..1b27a862ae81 100644
*/
#include "omap4.dtsi"
+diff --git a/arch/arm/boot/dts/omap5-board-common.dtsi b/arch/arm/boot/dts/omap5-board-common.dtsi
+index 373984c130e0..6f46f1ecf1e5 100644
+--- a/arch/arm/boot/dts/omap5-board-common.dtsi
++++ b/arch/arm/boot/dts/omap5-board-common.dtsi
+@@ -56,7 +56,7 @@ vmmcsdio_fixed: fixedregulator-mmcsdio {
+ };
+
+ /* HS USB Host PHY on PORT 2 */
+- hsusb2_phy: hsusb2_phy {
++ hsusb2_phy: hsusb2-phy-pins {
+ compatible = "usb-nop-xceiv";
+ reset-gpios = <&gpio3 16 GPIO_ACTIVE_LOW>; /* gpio3_80 HUB_NRESET */
+ clocks = <&auxclk1_ck>;
+@@ -156,13 +156,13 @@ &usbhost_pins
+ &led_gpio_pins
+ >;
+
+- twl6040_pins: pinmux_twl6040_pins {
++ twl6040_pins: twl6040-pins {
+ pinctrl-single,pins = <
+ OMAP5_IOPAD(0x1be, PIN_OUTPUT | MUX_MODE6) /* mcspi1_somi.gpio5_141 */
+ >;
+ };
+
+- mcpdm_pins: pinmux_mcpdm_pins {
++ mcpdm_pins: mcpdm-pins {
+ pinctrl-single,pins = <
+ OMAP5_IOPAD(0x182, PIN_INPUT_PULLDOWN | MUX_MODE0) /* abe_clks.abe_clks */
+ OMAP5_IOPAD(0x19c, PIN_INPUT_PULLDOWN | MUX_MODE0) /* abemcpdm_ul_data.abemcpdm_ul_data */
+@@ -172,7 +172,7 @@ OMAP5_IOPAD(0x1a2, PIN_INPUT_PULLDOWN | MUX_MODE0) /* abemcpdm_lb_clk.abemcpdm_l
+ >;
+ };
+
+- mcbsp1_pins: pinmux_mcbsp1_pins {
++ mcbsp1_pins: mcbsp1-pins {
+ pinctrl-single,pins = <
+ OMAP5_IOPAD(0x18c, PIN_INPUT | MUX_MODE1) /* abedmic_clk2.abemcbsp1_fsx */
+ OMAP5_IOPAD(0x18e, PIN_OUTPUT_PULLDOWN | MUX_MODE1) /* abedmic_clk3.abemcbsp1_dx */
+@@ -181,7 +181,7 @@ OMAP5_IOPAD(0x192, PIN_INPUT_PULLDOWN | MUX_MODE1) /* abeslimbus1_data.abemcbsp1
+ >;
+ };
+
+- mcbsp2_pins: pinmux_mcbsp2_pins {
++ mcbsp2_pins: mcbsp2-pins {
+ pinctrl-single,pins = <
+ OMAP5_IOPAD(0x194, PIN_INPUT_PULLDOWN | MUX_MODE0) /* abemcbsp2_dr.abemcbsp2_dr */
+ OMAP5_IOPAD(0x196, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* abemcbsp2_dx.abemcbsp2_dx */
+@@ -190,14 +190,14 @@ OMAP5_IOPAD(0x19a, PIN_INPUT | MUX_MODE0) /* abemcbsp2_clkx.abemcbsp2_clkx */
+ >;
+ };
+
+- i2c1_pins: pinmux_i2c1_pins {
++ i2c1_pins: i2c1-pins {
+ pinctrl-single,pins = <
+ OMAP5_IOPAD(0x1f2, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_scl */
+ OMAP5_IOPAD(0x1f4, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_sda */
+ >;
+ };
+
+- mcspi2_pins: pinmux_mcspi2_pins {
++ mcspi2_pins: mcspi2-pins {
+ pinctrl-single,pins = <
+ OMAP5_IOPAD(0x0fc, PIN_INPUT | MUX_MODE0) /* mcspi2_clk */
+ OMAP5_IOPAD(0x0fe, PIN_INPUT | MUX_MODE0) /* mcspi2_simo */
+@@ -206,7 +206,7 @@ OMAP5_IOPAD(0x102, PIN_OUTPUT | MUX_MODE0) /* mcspi2_cs0 */
+ >;
+ };
+
+- mcspi3_pins: pinmux_mcspi3_pins {
++ mcspi3_pins: mcspi3-pins {
+ pinctrl-single,pins = <
+ OMAP5_IOPAD(0x0b8, PIN_INPUT | MUX_MODE1) /* mcspi3_somi */
+ OMAP5_IOPAD(0x0ba, PIN_INPUT | MUX_MODE1) /* mcspi3_cs0 */
+@@ -215,7 +215,7 @@ OMAP5_IOPAD(0x0be, PIN_INPUT | MUX_MODE1) /* mcspi3_clk */
+ >;
+ };
+
+- mmc3_pins: pinmux_mmc3_pins {
++ mmc3_pins: mmc3-pins {
+ pinctrl-single,pins = <
+ OMAP5_IOPAD(0x01a4, PIN_INPUT_PULLUP | MUX_MODE0) /* wlsdio_clk */
+ OMAP5_IOPAD(0x01a6, PIN_INPUT_PULLUP | MUX_MODE0) /* wlsdio_cmd */
+@@ -226,20 +226,20 @@ OMAP5_IOPAD(0x01ae, PIN_INPUT_PULLUP | MUX_MODE0) /* wlsdio_data3 */
+ >;
+ };
+
+- wlan_pins: pinmux_wlan_pins {
++ wlan_pins: wlan-pins {
+ pinctrl-single,pins = <
+ OMAP5_IOPAD(0x1bc, PIN_OUTPUT | MUX_MODE6) /* mcspi1_clk.gpio5_140 */
+ >;
+ };
+
+ /* TI trees use GPIO mode; msecure mode does not work reliably? */
+- palmas_msecure_pins: palmas_msecure_pins {
++ palmas_msecure_pins: palmas-msecure-pins {
+ pinctrl-single,pins = <
+ OMAP5_IOPAD(0x180, PIN_OUTPUT | MUX_MODE6) /* gpio8_234 */
+ >;
+ };
+
+- usbhost_pins: pinmux_usbhost_pins {
++ usbhost_pins: usbhost-pins {
+ pinctrl-single,pins = <
+ OMAP5_IOPAD(0x0c4, PIN_INPUT | MUX_MODE0) /* usbb2_hsic_strobe */
+ OMAP5_IOPAD(0x0c6, PIN_INPUT | MUX_MODE0) /* usbb2_hsic_data */
+@@ -252,13 +252,13 @@ OMAP5_IOPAD(0x0ae, PIN_OUTPUT | MUX_MODE6) /* gpio3_79 ETH_NRESET */
+ >;
+ };
+
+- led_gpio_pins: pinmux_led_gpio_pins {
++ led_gpio_pins: led-gpio-pins {
+ pinctrl-single,pins = <
+ OMAP5_IOPAD(0x1d6, PIN_OUTPUT | MUX_MODE6) /* uart3_cts_rctx.gpio5_153 */
+ >;
+ };
+
+- uart1_pins: pinmux_uart1_pins {
++ uart1_pins: uart1-pins {
+ pinctrl-single,pins = <
+ OMAP5_IOPAD(0x0a0, PIN_OUTPUT | MUX_MODE0) /* uart1_tx.uart1_cts */
+ OMAP5_IOPAD(0x0a2, PIN_INPUT_PULLUP | MUX_MODE0) /* uart1_tx.uart1_cts */
+@@ -267,14 +267,14 @@ OMAP5_IOPAD(0x0a6, PIN_OUTPUT | MUX_MODE0) /* uart1_rx.uart1_rts */
+ >;
+ };
+
+- uart3_pins: pinmux_uart3_pins {
++ uart3_pins: uart3-pins {
+ pinctrl-single,pins = <
+ OMAP5_IOPAD(0x1da, PIN_OUTPUT | MUX_MODE0) /* uart3_rts_irsd.uart3_tx_irtx */
+ OMAP5_IOPAD(0x1dc, PIN_INPUT_PULLUP | MUX_MODE0) /* uart3_rx_irrx.uart3_usbb3_hsic */
+ >;
+ };
+
+- uart5_pins: pinmux_uart5_pins {
++ uart5_pins: uart5-pins {
+ pinctrl-single,pins = <
+ OMAP5_IOPAD(0x1b0, PIN_INPUT_PULLUP | MUX_MODE0) /* uart5_rx.uart5_rx */
+ OMAP5_IOPAD(0x1b2, PIN_OUTPUT | MUX_MODE0) /* uart5_tx.uart5_tx */
+@@ -283,7 +283,7 @@ OMAP5_IOPAD(0x1b6, PIN_OUTPUT | MUX_MODE0) /* uart5_cts.uart5_rts */
+ >;
+ };
+
+- dss_hdmi_pins: pinmux_dss_hdmi_pins {
++ dss_hdmi_pins: dss-hdmi-pins {
+ pinctrl-single,pins = <
+ OMAP5_IOPAD(0x13c, PIN_INPUT | MUX_MODE0) /* hdmi_cec.hdmi_cec */
+ OMAP5_IOPAD(0x140, PIN_INPUT | MUX_MODE0) /* hdmi_ddc_scl.hdmi_ddc_scl */
+@@ -291,7 +291,7 @@ OMAP5_IOPAD(0x142, PIN_INPUT | MUX_MODE0) /* hdmi_ddc_sda.hdmi_ddc_sda */
+ >;
+ };
+
+- tpd12s015_pins: pinmux_tpd12s015_pins {
++ tpd12s015_pins: tpd12s015-pins {
+ pinctrl-single,pins = <
+ OMAP5_IOPAD(0x13e, PIN_INPUT_PULLDOWN | MUX_MODE6) /* hdmi_hpd.gpio7_193 */
+ >;
+@@ -304,20 +304,20 @@ &omap5_pmx_wkup {
+ &usbhost_wkup_pins
+ >;
+
+- palmas_sys_nirq_pins: pinmux_palmas_sys_nirq_pins {
++ palmas_sys_nirq_pins: palmas-sys-nirq-pins {
+ pinctrl-single,pins = <
+ /* sys_nirq1 is pulled down as the SoC is inverting it for GIC */
+ OMAP5_IOPAD(0x068, PIN_INPUT_PULLUP | MUX_MODE0)
+ >;
+ };
+
+- usbhost_wkup_pins: pinmux_usbhost_wkup_pins {
++ usbhost_wkup_pins: usbhost-wkup-pins {
+ pinctrl-single,pins = <
+ OMAP5_IOPAD(0x05a, PIN_OUTPUT | MUX_MODE0) /* fref_clk1_out, USB hub clk */
+ >;
+ };
+
+- wlcore_irq_pin: pinmux_wlcore_irq_pin {
++ wlcore_irq_pin: wlcore-irq-pin-pins {
+ pinctrl-single,pins = <
+ OMAP5_IOPAD(0x40, PIN_INPUT | MUX_MODE6) /* llia_wakereqin.gpio1_wk14 */
+ >;
diff --git a/arch/arm/boot/dts/omap5-core-thermal.dtsi b/arch/arm/boot/dts/omap5-core-thermal.dtsi
index 02e76338bfbc..e0d8e39a0014 100644
--- a/arch/arm/boot/dts/omap5-core-thermal.dtsi
@@ -8270,6 +9246,43 @@ index 06cc3a19ddaa..3b505fe415ed 100644
"sysclk",
"refclk";
#phy-cells = <0>;
+diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts
+index 51d5fcae5081..933de05d3ca1 100644
+--- a/arch/arm/boot/dts/omap5-uevm.dts
++++ b/arch/arm/boot/dts/omap5-uevm.dts
+@@ -162,20 +162,20 @@ &mmc1 {
+ };
+
+ &omap5_pmx_core {
+- evm_keys_pins: pinmux_evm_keys_gpio_pins {
++ evm_keys_pins: evm-keys-gpio-pins {
+ pinctrl-single,pins = <
+ OMAP5_IOPAD(0x0b6, PIN_INPUT | MUX_MODE6) /* gpio3_83 */
+ >;
+ };
+
+- i2c5_pins: pinmux_i2c5_pins {
++ i2c5_pins: i2c5-pins {
+ pinctrl-single,pins = <
+ OMAP5_IOPAD(0x1c6, PIN_INPUT | MUX_MODE0) /* i2c5_scl */
+ OMAP5_IOPAD(0x1c8, PIN_INPUT | MUX_MODE0) /* i2c5_sda */
+ >;
+ };
+
+- mmc1_pins: pinmux_mmc1_pins {
++ mmc1_pins: mmc1-pins {
+ pinctrl-single,pins = <
+ OMAP5_IOPAD(0x1d4, PIN_INPUT_PULLUP | MUX_MODE6) /* gpio5_152 */
+ >;
+@@ -209,7 +209,7 @@ hub@2 {
+ #size-cells = <0>;
+ };
+
+- ethernet: usbether@3 {
++ ethernet: ethernet@3 {
+ compatible = "usb424,9730";
+ reg = <3>;
+ };
diff --git a/arch/arm/boot/dts/overlays/AM335X-PRU-UIO-00A0.dts b/arch/arm/boot/dts/overlays/AM335X-PRU-UIO-00A0.dts
new file mode 100644
index 000000000000..f3016efca2d7
@@ -11806,6 +12819,50 @@ index 000000000000..23236ee7c938
+ status = "okay";
+ force-empty-serdev-controller;
+};
+diff --git a/arch/arm/boot/dts/twl4030_omap3.dtsi b/arch/arm/boot/dts/twl4030_omap3.dtsi
+index 683419d5c0e5..89433f251df0 100644
+--- a/arch/arm/boot/dts/twl4030_omap3.dtsi
++++ b/arch/arm/boot/dts/twl4030_omap3.dtsi
+@@ -14,7 +14,7 @@ &omap3_pmx_core {
+ * to the SYS_NIRQ line on OMAP. Therefore, configure the
+ * defaults for the SYS_NIRQ pin here.
+ */
+- twl4030_pins: pinmux_twl4030_pins {
++ twl4030_pins: twl4030-pins {
+ pinctrl-single,pins = <
+ OMAP3_CORE1_IOPAD(0x21e0, PIN_INPUT_PULLUP | PIN_OFF_WAKEUPENABLE | MUX_MODE0) /* sys_nirq.sys_nirq */
+ >;
+@@ -28,7 +28,7 @@ OMAP3_CORE1_IOPAD(0x21e0, PIN_INPUT_PULLUP | PIN_OFF_WAKEUPENABLE | MUX_MODE0) /
+ * sys_nvmode2 signaling.
+ */
+ &omap3_pmx_wkup {
+- twl4030_vpins: pinmux_twl4030_vpins {
++ twl4030_vpins: twl4030-vpins-pins {
+ pinctrl-single,pins = <
+ OMAP3_WKUP_IOPAD(0x2a00, PIN_INPUT | MUX_MODE0) /* i2c4_scl.i2c4_scl */
+ OMAP3_WKUP_IOPAD(0x2a02, PIN_INPUT | MUX_MODE0) /* i2c4_sda.i2c4_sda */
+diff --git a/arch/arm/boot/dts/twl6030_omap4.dtsi b/arch/arm/boot/dts/twl6030_omap4.dtsi
+index 5730e46b0067..64e38c7c8be7 100644
+--- a/arch/arm/boot/dts/twl6030_omap4.dtsi
++++ b/arch/arm/boot/dts/twl6030_omap4.dtsi
+@@ -19,7 +19,7 @@ &twl6030_wkup_pins
+ };
+
+ &omap4_pmx_wkup {
+- twl6030_wkup_pins: pinmux_twl6030_wkup_pins {
++ twl6030_wkup_pins: twl6030-wkup-pins {
+ pinctrl-single,pins = <
+ OMAP4_IOPAD(0x054, PIN_OUTPUT | MUX_MODE2) /* fref_clk0_out.sys_drm_msecure */
+ >;
+@@ -27,7 +27,7 @@ OMAP4_IOPAD(0x054, PIN_OUTPUT | MUX_MODE2) /* fref_clk0_out.sys_drm_msecure */
+ };
+
+ &omap4_pmx_core {
+- twl6030_pins: pinmux_twl6030_pins {
++ twl6030_pins: twl6030-pins {
+ pinctrl-single,pins = <
+ OMAP4_IOPAD(0x19e, WAKEUP_EN | PIN_INPUT_PULLUP | MUX_MODE0) /* sys_nirq1.sys_nirq1 */
+ >;
diff --git a/include/dt-bindings/board/am335x-bone-pins.h b/include/dt-bindings/board/am335x-bone-pins.h
new file mode 100644
index 000000000000..54e92664ba79
diff --git a/tools/config-hot-fix.sh b/tools/config-hot-fix.sh
index 261cfc8f2..cd4b04f60 100755
--- a/tools/config-hot-fix.sh
+++ b/tools/config-hot-fix.sh
@@ -155,9 +155,21 @@ config="CONFIG_W1_SLAVE_DS2433_CRC" ; config_enable
config="CONFIG_UIO_PDRV_GENIRQ" ; config_module
config="CONFIG_UIO_PRUSS" ; config_module
+#2022.12.25: still totally broken..
+#[ 26.460634] tps65217-charger tps65217-charger: DMA mask not set
+#[ 26.581296] genirq: Flags mismatch irq 53. 00002000 (tps65217-charger) vs. 00002000 (vbus)
+#[ 26.739119] tps65217-charger tps65217-charger: Unable to register irq 53 err -16
+#[ 26.842097] tps65217-charger: probe of tps65217-charger failed with error -16
+config="CONFIG_CHARGER_TPS65217" ; config_disable
+
#2023.07.10
config="CONFIG_KERNEL_LZO" ; config_disable
config="CONFIG_KERNEL_LZ4" ; config_enable
config="CONFIG_GCC_PLUGINS" ; config_disable
+#2023.07.14
+# MUSB DMA mode
+config="CONFIG_MUSB_PIO_ONLY" ; config_enable
+config="CONFIG_USB_TI_CPPI41_DMA" ; config_disable
+
cd ${DIR}/
diff --git a/version.sh b/version.sh
index 03b991408..d83c5b56e 100644
--- a/version.sh
+++ b/version.sh
@@ -47,7 +47,7 @@ KERNEL_REL=5.17
KERNEL_TAG=${KERNEL_REL}.15
kernel_rt=".1-rt17"
#Kernel Build
-BUILD=${build_prefix}17
+BUILD=${build_prefix}17.1
#v6.X-rcX + upto SHA
#prev_KERNEL_SHA=""
--
GitLab