diff --git a/3rdparty/packaging/builddeb b/3rdparty/packaging/builddeb
index f9dba415d068073499f05619b828dee14372ab84..1d46d7dcd6b0230c82654696b0381fca5e54650b 100755
--- a/3rdparty/packaging/builddeb
+++ b/3rdparty/packaging/builddeb
@@ -51,7 +51,7 @@ set_debarch() {
debarch=hppa ;;
mips*)
debarch=mips$(grep -q CPU_LITTLE_ENDIAN=y $KCONFIG_CONFIG && echo el || true) ;;
- arm64)
+ aarch64|arm64)
debarch=arm64 ;;
arm*)
if grep -q CONFIG_AEABI=y $KCONFIG_CONFIG; then
diff --git a/patch.sh b/patch.sh
index 84c9eebb3dc3fe61fcaad41130c97f5a35241f4a..050c461a8012fbc5a8532ba0cb7c52027959cb73 100644
--- a/patch.sh
+++ b/patch.sh
@@ -104,7 +104,26 @@ external_git () {
}
sync_cherrypicks () {
- dir 'ti_4.9.x/pm_opp'
+ echo "dir: ti_4.9.x/pm_opp"
+ #regenerate="enable"
+ if [ "x${regenerate}" = "xenable" ] ; then
+ start_cleanup
+ fi
+
+ ${git} "${DIR}/patches/ti_4.9.x/pm_opp/0001-Documentation-dt-add-bindings-for-ti-cpufreq.patch"
+ ${git} "${DIR}/patches/ti_4.9.x/pm_opp/0002-cpufreq-ti-Add-cpufreq-driver-to-determine-available.patch"
+ ${git} "${DIR}/patches/ti_4.9.x/pm_opp/0003-cpufreq-dt-Don-t-use-generic-platdev-driver-for-ti-c.patch"
+ ${git} "${DIR}/patches/ti_4.9.x/pm_opp/0004-ARM-dts-am33xx-Add-updated-operating-points-v2-table.patch"
+ ${git} "${DIR}/patches/ti_4.9.x/pm_opp/0005-ARM-dts-am335x-boneblack-Enable-1GHz-OPP-for-cpu.patch"
+ ${git} "${DIR}/patches/ti_4.9.x/pm_opp/0006-ARM-dts-am4372-Update-operating-points-v2-table-for-.patch"
+ ${git} "${DIR}/patches/ti_4.9.x/pm_opp/0007-ARM-dts-dra7-Add-updated-operating-points-v2-table-f.patch"
+ ${git} "${DIR}/patches/ti_4.9.x/pm_opp/0008-PM-OPP-Expose-_of_get_opp_desc_node-as-dev_pm_opp-AP.patch"
+
+ if [ "x${regenerate}" = "xenable" ] ; then
+ wdir="ti_4.9.x/pm_opp"
+ number=8
+ cleanup
+ fi
}
aufs_fail () {
@@ -275,8 +294,8 @@ local_patch () {
}
#external_git
-sync_cherrypicks
-aufs4
+#sync_cherrypicks
+#aufs4
#rt
tinydrm
#local_patch
@@ -357,10 +376,6 @@ reverts () {
drivers () {
dir 'drivers/pm_bus'
-
- #[PATCH V5 00/10] PM / OPP: Multiple regulator support
- dir 'drivers/pm_opp'
-
dir 'drivers/spi'
dir 'drivers/tsl2550'
dir 'drivers/tps65217'
@@ -477,9 +492,7 @@ drivers () {
dir 'drivers/ti/eqep'
dir 'drivers/ti/mcasp'
dir 'drivers/ti/mmc'
- dir 'drivers/ti/omapdrm'
dir 'drivers/ti/rpmsg'
- dir 'drivers/ti/rtc'
dir 'drivers/ti/serial'
dir 'drivers/ti/spi'
dir 'drivers/ti/uio'
diff --git a/patches/beaglebone/dtbs/0001-sync-am335x-peripheral-pinmux.patch b/patches/beaglebone/dtbs/0001-sync-am335x-peripheral-pinmux.patch
index f9ccfb86174cebac314996d1089c7bad8a14c4fe..08ed5226e8358a47aa76bb0dec942477d36d44c7 100644
--- a/patches/beaglebone/dtbs/0001-sync-am335x-peripheral-pinmux.patch
+++ b/patches/beaglebone/dtbs/0001-sync-am335x-peripheral-pinmux.patch
@@ -1,6 +1,6 @@
-From d46fa33ce8dd5c8446047481fdfdf73b032254f6 Mon Sep 17 00:00:00 2001
+From b7c3ce3ef04c37e456d1a9f11bcde3006ddf623d Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Tue, 8 Nov 2016 09:50:56 -0600
+Date: Sun, 25 Dec 2016 11:06:52 -0600
Subject: [PATCH] sync: am335x-peripheral/pinmux
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
@@ -14,14 +14,14 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
arch/arm/boot/dts/am335x-bone-pinmux-spi1.dtsi | 27 +++++
arch/arm/boot/dts/am335x-bone-pinmux-spi1a.dtsi | 28 +++++
arch/arm/boot/dts/am335x-bone-pinmux-ttyS5.dtsi | 48 +++++++++
- arch/arm/boot/dts/am335x-boneblack-bbb-exp-c.dts | 11 +-
- arch/arm/boot/dts/am335x-boneblack-bbb-exp-r.dts | 11 +-
+ arch/arm/boot/dts/am335x-boneblack-bbb-exp-c.dts | 13 ++-
+ arch/arm/boot/dts/am335x-boneblack-bbb-exp-r.dts | 13 ++-
arch/arm/boot/dts/am335x-boneblack-bbbmini.dts | 15 ++-
.../boot/dts/am335x-boneblack-cape-bone-argus.dts | 15 ++-
.../arm/boot/dts/am335x-boneblack-emmc-overlay.dts | 11 ++
.../arm/boot/dts/am335x-boneblack-hdmi-overlay.dts | 11 ++
.../boot/dts/am335x-boneblack-nhdmi-overlay.dts | 11 ++
- arch/arm/boot/dts/am335x-boneblack-overlay.dts | 11 +-
+ arch/arm/boot/dts/am335x-boneblack-overlay.dts | 13 ++-
arch/arm/boot/dts/am335x-boneblack-wl1835mod.dts | 15 ++-
arch/arm/boot/dts/am335x-cape-rtc-ds1307.dtsi | 31 ++++++
arch/arm/boot/dts/am335x-peripheral-can1.dtsi | 13 +++
@@ -32,7 +32,7 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
arch/arm/boot/dts/am335x-peripheral-spi1.dtsi | 13 +++
arch/arm/boot/dts/am335x-peripheral-spi1a.dtsi | 13 +++
arch/arm/boot/dts/am335x-peripheral-ttyS5.dtsi | 13 +++
- 27 files changed, 716 insertions(+), 18 deletions(-)
+ 27 files changed, 719 insertions(+), 21 deletions(-)
create mode 100644 arch/arm/boot/dts/am335x-bone-emmc-in-reset.dtsi
create mode 100644 arch/arm/boot/dts/am335x-bone-pinmux-can1.dtsi
create mode 100644 arch/arm/boot/dts/am335x-bone-pinmux-emmc.dtsi
@@ -54,7 +54,7 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
diff --git a/arch/arm/boot/dts/am335x-bone-emmc-in-reset.dtsi b/arch/arm/boot/dts/am335x-bone-emmc-in-reset.dtsi
new file mode 100644
-index 0000000..7d8f673
+index 000000000000..7d8f673229c0
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-bone-emmc-in-reset.dtsi
@@ -0,0 +1,18 @@
@@ -78,7 +78,7 @@ index 0000000..7d8f673
+};
diff --git a/arch/arm/boot/dts/am335x-bone-pinmux-can1.dtsi b/arch/arm/boot/dts/am335x-bone-pinmux-can1.dtsi
new file mode 100644
-index 0000000..9e26413
+index 000000000000..9e264132cc46
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-bone-pinmux-can1.dtsi
@@ -0,0 +1,45 @@
@@ -129,7 +129,7 @@ index 0000000..9e26413
+};
diff --git a/arch/arm/boot/dts/am335x-bone-pinmux-emmc.dtsi b/arch/arm/boot/dts/am335x-bone-pinmux-emmc.dtsi
new file mode 100644
-index 0000000..22cf462
+index 000000000000..22cf4621b357
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-bone-pinmux-emmc.dtsi
@@ -0,0 +1,88 @@
@@ -223,7 +223,7 @@ index 0000000..22cf462
+};
diff --git a/arch/arm/boot/dts/am335x-bone-pinmux-i2c2.dtsi b/arch/arm/boot/dts/am335x-bone-pinmux-i2c2.dtsi
new file mode 100644
-index 0000000..abf3b57
+index 000000000000..abf3b57522e3
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-bone-pinmux-i2c2.dtsi
@@ -0,0 +1,45 @@
@@ -274,7 +274,7 @@ index 0000000..abf3b57
+};
diff --git a/arch/arm/boot/dts/am335x-bone-pinmux-nxp-hdmi.dtsi b/arch/arm/boot/dts/am335x-bone-pinmux-nxp-hdmi.dtsi
new file mode 100644
-index 0000000..5205fa0
+index 000000000000..5205fa0f9a95
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-bone-pinmux-nxp-hdmi.dtsi
@@ -0,0 +1,120 @@
@@ -400,7 +400,7 @@ index 0000000..5205fa0
+};
diff --git a/arch/arm/boot/dts/am335x-bone-pinmux-spi0.dtsi b/arch/arm/boot/dts/am335x-bone-pinmux-spi0.dtsi
new file mode 100644
-index 0000000..354e66a
+index 000000000000..354e66ad4f04
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-bone-pinmux-spi0.dtsi
@@ -0,0 +1,51 @@
@@ -457,7 +457,7 @@ index 0000000..354e66a
+};
diff --git a/arch/arm/boot/dts/am335x-bone-pinmux-spi1.dtsi b/arch/arm/boot/dts/am335x-bone-pinmux-spi1.dtsi
new file mode 100644
-index 0000000..bff7f8d
+index 000000000000..bff7f8dae839
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-bone-pinmux-spi1.dtsi
@@ -0,0 +1,27 @@
@@ -490,7 +490,7 @@ index 0000000..bff7f8d
+};
diff --git a/arch/arm/boot/dts/am335x-bone-pinmux-spi1a.dtsi b/arch/arm/boot/dts/am335x-bone-pinmux-spi1a.dtsi
new file mode 100644
-index 0000000..62874c8
+index 000000000000..62874c892ff7
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-bone-pinmux-spi1a.dtsi
@@ -0,0 +1,28 @@
@@ -524,7 +524,7 @@ index 0000000..62874c8
+};
diff --git a/arch/arm/boot/dts/am335x-bone-pinmux-ttyS5.dtsi b/arch/arm/boot/dts/am335x-bone-pinmux-ttyS5.dtsi
new file mode 100644
-index 0000000..01d0aec
+index 000000000000..01d0aec1de44
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-bone-pinmux-ttyS5.dtsi
@@ -0,0 +1,48 @@
@@ -577,7 +577,7 @@ index 0000000..01d0aec
+ pinctrl-0 = <&uart5_pins>;
+};
diff --git a/arch/arm/boot/dts/am335x-boneblack-bbb-exp-c.dts b/arch/arm/boot/dts/am335x-boneblack-bbb-exp-c.dts
-index 857c21e..8d795c0 100644
+index 857c21ea4834..f4cd428dabf7 100644
--- a/arch/arm/boot/dts/am335x-boneblack-bbb-exp-c.dts
+++ b/arch/arm/boot/dts/am335x-boneblack-bbb-exp-c.dts
@@ -33,8 +33,15 @@
@@ -586,20 +586,21 @@ index 857c21e..8d795c0 100644
-&rtc {
- system-power-controller;
-+&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>;
-+ };
- };
+-};
++//&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>;
++// };
++//};
#include "am335x-cape-bbb-exp-c.dtsi"
diff --git a/arch/arm/boot/dts/am335x-boneblack-bbb-exp-r.dts b/arch/arm/boot/dts/am335x-boneblack-bbb-exp-r.dts
-index b834fa2..5df881e 100644
+index b834fa2ee098..dd961c6580ca 100644
--- a/arch/arm/boot/dts/am335x-boneblack-bbb-exp-r.dts
+++ b/arch/arm/boot/dts/am335x-boneblack-bbb-exp-r.dts
@@ -33,8 +33,15 @@
@@ -608,36 +609,37 @@ index b834fa2..5df881e 100644
-&rtc {
- system-power-controller;
-+&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>;
-+ };
- };
+-};
++//&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>;
++// };
++//};
#include "am335x-cape-bbb-exp-r.dtsi"
diff --git a/arch/arm/boot/dts/am335x-boneblack-bbbmini.dts b/arch/arm/boot/dts/am335x-boneblack-bbbmini.dts
-index adb317c..5ed89a2 100644
+index adb317ceed7a..29a8de2e6381 100644
--- a/arch/arm/boot/dts/am335x-boneblack-bbbmini.dts
+++ b/arch/arm/boot/dts/am335x-boneblack-bbbmini.dts
@@ -37,6 +37,17 @@
status = "okay";
};
-+&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>;
-+ };
-+};
++//&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>;
++// };
++//};
+
&am33xx_pinmux {
dcan1_pins: pinmux_dcan1_pins {
@@ -651,23 +653,23 @@ index adb317c..5ed89a2 100644
- system-power-controller;
-};
diff --git a/arch/arm/boot/dts/am335x-boneblack-cape-bone-argus.dts b/arch/arm/boot/dts/am335x-boneblack-cape-bone-argus.dts
-index cecb0fcc..c97c912 100644
+index cecb0fccc70b..e381ff209643 100644
--- a/arch/arm/boot/dts/am335x-boneblack-cape-bone-argus.dts
+++ b/arch/arm/boot/dts/am335x-boneblack-cape-bone-argus.dts
@@ -33,6 +33,17 @@
status = "okay";
};
-+&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>;
-+ };
-+};
++//&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>;
++// };
++//};
+
&am33xx_pinmux {
nxp_hdmi_bonelt_pins: nxp_hdmi_bonelt_pins {
@@ -682,7 +684,7 @@ index cecb0fcc..c97c912 100644
-
#include "am335x-bone-argus.dtsi"
diff --git a/arch/arm/boot/dts/am335x-boneblack-emmc-overlay.dts b/arch/arm/boot/dts/am335x-boneblack-emmc-overlay.dts
-index f3eeb88..ccd358e 100644
+index f3eeb88da02f..39c802a3941e 100644
--- a/arch/arm/boot/dts/am335x-boneblack-emmc-overlay.dts
+++ b/arch/arm/boot/dts/am335x-boneblack-emmc-overlay.dts
@@ -34,3 +34,14 @@
@@ -690,62 +692,62 @@ index f3eeb88..ccd358e 100644
status = "okay";
};
+
-+&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>;
-+ };
-+};
++//&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>;
++// };
++//};
diff --git a/arch/arm/boot/dts/am335x-boneblack-hdmi-overlay.dts b/arch/arm/boot/dts/am335x-boneblack-hdmi-overlay.dts
-index 4875da9..0582e572 100644
+index 4875da950015..266725144a95 100644
--- a/arch/arm/boot/dts/am335x-boneblack-hdmi-overlay.dts
+++ b/arch/arm/boot/dts/am335x-boneblack-hdmi-overlay.dts
@@ -37,6 +37,17 @@
};
};
-+&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>;
-+ };
-+};
++//&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>;
++// };
++//};
+
&am33xx_pinmux {
nxp_hdmi_bonelt_pins: nxp_hdmi_bonelt_pins {
pinctrl-single,pins = <
diff --git a/arch/arm/boot/dts/am335x-boneblack-nhdmi-overlay.dts b/arch/arm/boot/dts/am335x-boneblack-nhdmi-overlay.dts
-index 361b78b..c166c90 100644
+index 361b78bbb416..8fd74bef0ad6 100644
--- a/arch/arm/boot/dts/am335x-boneblack-nhdmi-overlay.dts
+++ b/arch/arm/boot/dts/am335x-boneblack-nhdmi-overlay.dts
@@ -37,6 +37,17 @@
};
};
-+&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>;
-+ };
-+};
++//&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>;
++// };
++//};
+
&am33xx_pinmux {
nxp_hdmi_bonelt_pins: nxp_hdmi_bonelt_pins {
pinctrl-single,pins = <
diff --git a/arch/arm/boot/dts/am335x-boneblack-overlay.dts b/arch/arm/boot/dts/am335x-boneblack-overlay.dts
-index f4f0c10..e9bbd93 100644
+index f4f0c100e210..11df99b2cba8 100644
--- a/arch/arm/boot/dts/am335x-boneblack-overlay.dts
+++ b/arch/arm/boot/dts/am335x-boneblack-overlay.dts
@@ -37,6 +37,13 @@
@@ -754,18 +756,19 @@ index f4f0c10..e9bbd93 100644
-&rtc {
- system-power-controller;
-+&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>;
-+ };
- };
+-};
++//&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>;
++// };
++//};
diff --git a/arch/arm/boot/dts/am335x-boneblack-wl1835mod.dts b/arch/arm/boot/dts/am335x-boneblack-wl1835mod.dts
-index e376613..f35b64a 100644
+index e376613cce21..3713ce38b820 100644
--- a/arch/arm/boot/dts/am335x-boneblack-wl1835mod.dts
+++ b/arch/arm/boot/dts/am335x-boneblack-wl1835mod.dts
@@ -25,10 +25,6 @@
@@ -783,21 +786,21 @@ index e376613..f35b64a 100644
};
};
-+&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>;
-+ };
-+};
++//&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>;
++// };
++//};
+
#include "am335x-boneblack-wl1835mod-cape.dtsi"
diff --git a/arch/arm/boot/dts/am335x-cape-rtc-ds1307.dtsi b/arch/arm/boot/dts/am335x-cape-rtc-ds1307.dtsi
new file mode 100644
-index 0000000..bce6ac5
+index 000000000000..bce6ac50cd89
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-cape-rtc-ds1307.dtsi
@@ -0,0 +1,31 @@
@@ -834,7 +837,7 @@ index 0000000..bce6ac5
+};
diff --git a/arch/arm/boot/dts/am335x-peripheral-can1.dtsi b/arch/arm/boot/dts/am335x-peripheral-can1.dtsi
new file mode 100644
-index 0000000..02b5bd1
+index 000000000000..02b5bd17066e
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-peripheral-can1.dtsi
@@ -0,0 +1,13 @@
@@ -853,7 +856,7 @@ index 0000000..02b5bd1
+};
diff --git a/arch/arm/boot/dts/am335x-peripheral-emmc.dtsi b/arch/arm/boot/dts/am335x-peripheral-emmc.dtsi
new file mode 100644
-index 0000000..603f34e
+index 000000000000..603f34ec6dc4
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-peripheral-emmc.dtsi
@@ -0,0 +1,15 @@
@@ -874,7 +877,7 @@ index 0000000..603f34e
+};
diff --git a/arch/arm/boot/dts/am335x-peripheral-i2c2.dtsi b/arch/arm/boot/dts/am335x-peripheral-i2c2.dtsi
new file mode 100644
-index 0000000..ed9a0b5
+index 000000000000..ed9a0b52f913
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-peripheral-i2c2.dtsi
@@ -0,0 +1,13 @@
@@ -893,7 +896,7 @@ index 0000000..ed9a0b5
+};
diff --git a/arch/arm/boot/dts/am335x-peripheral-nxp-hdmi.dtsi b/arch/arm/boot/dts/am335x-peripheral-nxp-hdmi.dtsi
new file mode 100644
-index 0000000..1dfd26a
+index 000000000000..1dfd26a691a6
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-peripheral-nxp-hdmi.dtsi
@@ -0,0 +1,29 @@
@@ -928,7 +931,7 @@ index 0000000..1dfd26a
+};
diff --git a/arch/arm/boot/dts/am335x-peripheral-spi0.dtsi b/arch/arm/boot/dts/am335x-peripheral-spi0.dtsi
new file mode 100644
-index 0000000..969e352
+index 000000000000..969e35259979
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-peripheral-spi0.dtsi
@@ -0,0 +1,13 @@
@@ -947,7 +950,7 @@ index 0000000..969e352
+};
diff --git a/arch/arm/boot/dts/am335x-peripheral-spi1.dtsi b/arch/arm/boot/dts/am335x-peripheral-spi1.dtsi
new file mode 100644
-index 0000000..ac5fe97
+index 000000000000..ac5fe97b65d9
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-peripheral-spi1.dtsi
@@ -0,0 +1,13 @@
@@ -966,7 +969,7 @@ index 0000000..ac5fe97
+};
diff --git a/arch/arm/boot/dts/am335x-peripheral-spi1a.dtsi b/arch/arm/boot/dts/am335x-peripheral-spi1a.dtsi
new file mode 100644
-index 0000000..ac5fe97
+index 000000000000..ac5fe97b65d9
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-peripheral-spi1a.dtsi
@@ -0,0 +1,13 @@
@@ -985,7 +988,7 @@ index 0000000..ac5fe97
+};
diff --git a/arch/arm/boot/dts/am335x-peripheral-ttyS5.dtsi b/arch/arm/boot/dts/am335x-peripheral-ttyS5.dtsi
new file mode 100644
-index 0000000..8b42fb0
+index 000000000000..8b42fb02b9b4
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-peripheral-ttyS5.dtsi
@@ -0,0 +1,13 @@
@@ -1003,5 +1006,5 @@ index 0000000..8b42fb0
+ status = "okay";
+};
--
-2.10.2
+2.11.0
diff --git a/patches/debian-armmp b/patches/debian-armmp
index 26d42a514ebc90812cfdaf55feca3aca1d213b57..c196929a47eee35bf0f2685b0b20c3983846be2f 100644
--- a/patches/debian-armmp
+++ b/patches/debian-armmp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.9.0-rc5 Kernel Configuration
+# Linux/arm 4.9.0-rc8 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -2623,7 +2623,6 @@ CONFIG_STMMAC_PLATFORM=m
CONFIG_DWMAC_GENERIC=m
CONFIG_DWMAC_ROCKCHIP=m
CONFIG_DWMAC_SOCFPGA=m
-# CONFIG_DWMAC_STM32 is not set
CONFIG_DWMAC_SUNXI=m
# CONFIG_STMMAC_PCI is not set
CONFIG_NET_VENDOR_SUN=y
@@ -3586,7 +3585,6 @@ CONFIG_PINCTRL_WMT=y
CONFIG_PINCTRL_WM8850=y
CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
CONFIG_GPIOLIB=y
-CONFIG_GPIO_DEVRES=y
CONFIG_OF_GPIO=y
CONFIG_GPIOLIB_IRQCHIP=y
# CONFIG_DEBUG_GPIO is not set
diff --git a/patches/defconfig b/patches/defconfig
index e53a6431eee154adfd9c40fb28890c92be9d134d..ff2ca02f8c582507228167b2df9beecc132c78ac 100644
--- a/patches/defconfig
+++ b/patches/defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.9.0 Kernel Configuration
+# Linux/arm 4.10.0-rc1 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -137,6 +137,7 @@ CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_DEVICE=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_CGROUP_PERF=y
+# CONFIG_CGROUP_BPF is not set
# CONFIG_CGROUP_DEBUG is not set
CONFIG_CHECKPOINT_RESTORE=y
CONFIG_NAMESPACES=y
@@ -156,6 +157,7 @@ CONFIG_RD_LZMA=y
CONFIG_RD_XZ=y
CONFIG_RD_LZO=y
CONFIG_RD_LZ4=y
+CONFIG_INITRAMFS_COMPRESSION=".gz"
CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_SYSCTL=y
@@ -168,6 +170,7 @@ CONFIG_MULTIUSER=y
# CONFIG_SGETMASK_SYSCALL is not set
CONFIG_SYSFS_SYSCALL=y
CONFIG_SYSCTL_SYSCALL=y
+CONFIG_POSIX_TIMERS=y
CONFIG_KALLSYMS=y
CONFIG_KALLSYMS_ALL=y
# CONFIG_KALLSYMS_ABSOLUTE_PERCPU is not set
@@ -284,8 +287,10 @@ CONFIG_LBDAF=y
CONFIG_BLK_DEV_BSG=y
CONFIG_BLK_DEV_BSGLIB=y
CONFIG_BLK_DEV_INTEGRITY=y
+# CONFIG_BLK_DEV_ZONED is not set
CONFIG_BLK_DEV_THROTTLING=y
# CONFIG_BLK_CMDLINE_PARSER is not set
+# CONFIG_BLK_WBT is not set
#
# Partition Types
@@ -391,9 +396,6 @@ CONFIG_ARCH_OMAP=y
# OMAP Feature Selections
#
CONFIG_OMAP_RESET_CLOCKS=y
-CONFIG_OMAP_MUX=y
-# CONFIG_OMAP_MUX_DEBUG is not set
-CONFIG_OMAP_MUX_WARNINGS=y
CONFIG_OMAP_32K_TIMER=y
CONFIG_OMAP_DM_TIMER=y
CONFIG_OMAP_PM_NOOP=y
@@ -636,7 +638,6 @@ CONFIG_CPUFREQ_DT=m
CONFIG_CPUFREQ_DT_PLATDEV=y
# CONFIG_ARM_KIRKWOOD_CPUFREQ is not set
# CONFIG_ARM_OMAP2PLUS_CPUFREQ is not set
-CONFIG_ARM_TI_CPUFREQ=y
# CONFIG_QORIQ_CPUFREQ is not set
#
@@ -762,6 +763,7 @@ CONFIG_INET_XFRM_MODE_BEET=m
CONFIG_INET_DIAG=m
CONFIG_INET_TCP_DIAG=m
CONFIG_INET_UDP_DIAG=m
+# CONFIG_INET_RAW_DIAG is not set
# CONFIG_INET_DIAG_DESTROY is not set
CONFIG_TCP_CONG_ADVANCED=y
CONFIG_TCP_CONG_BIC=m
@@ -812,6 +814,8 @@ CONFIG_IPV6_SUBTREES=y
CONFIG_IPV6_MROUTE=y
CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
CONFIG_IPV6_PIMSM_V2=y
+# CONFIG_IPV6_SEG6_LWTUNNEL is not set
+# CONFIG_IPV6_SEG6_HMAC is not set
CONFIG_NETLABEL=y
CONFIG_NETWORK_SECMARK=y
CONFIG_NET_PTP_CLASSIFY=y
@@ -831,6 +835,7 @@ CONFIG_NETFILTER_NETLINK_QUEUE=m
CONFIG_NETFILTER_NETLINK_LOG=m
CONFIG_NF_CONNTRACK=m
CONFIG_NF_LOG_COMMON=m
+# CONFIG_NF_LOG_NETDEV is not set
CONFIG_NF_CONNTRACK_MARK=y
CONFIG_NF_CONNTRACK_SECMARK=y
CONFIG_NF_CONNTRACK_ZONES=y
@@ -839,10 +844,10 @@ CONFIG_NF_CONNTRACK_EVENTS=y
CONFIG_NF_CONNTRACK_TIMEOUT=y
CONFIG_NF_CONNTRACK_TIMESTAMP=y
CONFIG_NF_CONNTRACK_LABELS=y
-CONFIG_NF_CT_PROTO_DCCP=m
+CONFIG_NF_CT_PROTO_DCCP=y
CONFIG_NF_CT_PROTO_GRE=m
-CONFIG_NF_CT_PROTO_SCTP=m
-CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CT_PROTO_SCTP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
CONFIG_NF_CONNTRACK_AMANDA=m
CONFIG_NF_CONNTRACK_FTP=m
CONFIG_NF_CONNTRACK_H323=m
@@ -860,9 +865,9 @@ CONFIG_NF_CT_NETLINK_HELPER=m
CONFIG_NETFILTER_NETLINK_GLUE_CT=y
CONFIG_NF_NAT=m
CONFIG_NF_NAT_NEEDED=y
-CONFIG_NF_NAT_PROTO_DCCP=m
-CONFIG_NF_NAT_PROTO_UDPLITE=m
-CONFIG_NF_NAT_PROTO_SCTP=m
+CONFIG_NF_NAT_PROTO_DCCP=y
+CONFIG_NF_NAT_PROTO_UDPLITE=y
+CONFIG_NF_NAT_PROTO_SCTP=y
CONFIG_NF_NAT_AMANDA=m
CONFIG_NF_NAT_FTP=m
CONFIG_NF_NAT_IRC=m
@@ -875,6 +880,7 @@ CONFIG_NF_TABLES_INET=m
CONFIG_NF_TABLES_NETDEV=m
CONFIG_NFT_EXTHDR=m
CONFIG_NFT_META=m
+# CONFIG_NFT_RT is not set
# CONFIG_NFT_NUMGEN is not set
CONFIG_NFT_CT=m
CONFIG_NFT_SET_RBTREE=m
@@ -885,6 +891,7 @@ CONFIG_NFT_LIMIT=m
CONFIG_NFT_MASQ=m
CONFIG_NFT_REDIR=m
CONFIG_NFT_NAT=m
+# CONFIG_NFT_OBJREF is not set
CONFIG_NFT_QUEUE=m
# CONFIG_NFT_QUOTA is not set
CONFIG_NFT_REJECT=m
@@ -975,7 +982,6 @@ CONFIG_NETFILTER_XT_MATCH_RATEEST=m
CONFIG_NETFILTER_XT_MATCH_REALM=m
CONFIG_NETFILTER_XT_MATCH_RECENT=m
CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
CONFIG_NETFILTER_XT_MATCH_STATE=m
CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
CONFIG_NETFILTER_XT_MATCH_STRING=m
@@ -992,6 +998,7 @@ CONFIG_IP_SET_HASH_IPMARK=m
CONFIG_IP_SET_HASH_IPPORT=m
CONFIG_IP_SET_HASH_IPPORTIP=m
CONFIG_IP_SET_HASH_IPPORTNET=m
+# CONFIG_IP_SET_HASH_IPMAC is not set
CONFIG_IP_SET_HASH_MAC=m
CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_HASH_NET=m
@@ -1047,10 +1054,12 @@ CONFIG_IP_VS_PE_SIP=m
#
CONFIG_NF_DEFRAG_IPV4=m
CONFIG_NF_CONNTRACK_IPV4=m
+# CONFIG_NF_SOCKET_IPV4 is not set
CONFIG_NF_TABLES_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_DUP_IPV4=m
+# CONFIG_NFT_FIB_IPV4 is not set
CONFIG_NF_TABLES_ARP=m
CONFIG_NF_DUP_IPV4=m
CONFIG_NF_LOG_ARP=m
@@ -1092,10 +1101,12 @@ CONFIG_IP_NF_ARP_MANGLE=m
#
CONFIG_NF_DEFRAG_IPV6=m
CONFIG_NF_CONNTRACK_IPV6=m
+# CONFIG_NF_SOCKET_IPV6 is not set
CONFIG_NF_TABLES_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_REJECT_IPV6=m
CONFIG_NFT_DUP_IPV6=m
+# CONFIG_NFT_FIB_IPV6 is not set
CONFIG_NF_DUP_IPV6=m
CONFIG_NF_REJECT_IPV6=m
CONFIG_NF_LOG_IPV6=m
@@ -1547,6 +1558,7 @@ CONFIG_NFC_MICROREAD_I2C=m
# CONFIG_NFC_S3FWRN5_I2C is not set
# CONFIG_NFC_ST95HF is not set
CONFIG_LWTUNNEL=y
+CONFIG_LWTUNNEL_BPF=y
CONFIG_DST_CACHE=y
# CONFIG_NET_DEVLINK is not set
CONFIG_MAY_USE_DEVLINK=y
@@ -1577,6 +1589,7 @@ CONFIG_DEV_COREDUMP=y
# CONFIG_DEBUG_DRIVER is not set
# CONFIG_DEBUG_DEVRES is not set
# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
# CONFIG_SYS_HYPERVISOR is not set
# CONFIG_GENERIC_CPU_DEVICES is not set
CONFIG_SOC_BUS=y
@@ -1586,7 +1599,7 @@ CONFIG_REGMAP_SPI=y
CONFIG_REGMAP_MMIO=y
CONFIG_REGMAP_IRQ=y
CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_FENCE_TRACE is not set
+# CONFIG_DMA_FENCE_TRACE is not set
CONFIG_DMA_CMA=y
#
@@ -1698,6 +1711,7 @@ CONFIG_MTD_NAND_IDS=y
CONFIG_MTD_NAND_NANDSIM=m
# CONFIG_MTD_NAND_BRCMNAND is not set
# CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_NAND_OXNAS is not set
# CONFIG_MTD_NAND_HISI504 is not set
# CONFIG_MTD_NAND_MTK is not set
CONFIG_MTD_ONENAND=y
@@ -1757,6 +1771,7 @@ CONFIG_ATA_OVER_ETH=m
# CONFIG_MG_DISK is not set
CONFIG_VIRTIO_BLK=m
CONFIG_BLK_DEV_RBD=m
+# CONFIG_NVME_FC is not set
# CONFIG_NVME_TARGET is not set
#
@@ -1959,7 +1974,7 @@ CONFIG_BLK_DEV_DM=m
# CONFIG_DM_MQ_DEFAULT is not set
# CONFIG_DM_DEBUG is not set
CONFIG_DM_BUFIO=m
-# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
+# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
CONFIG_DM_BIO_PRISON=m
CONFIG_DM_PERSISTENT_DATA=m
CONFIG_DM_CRYPT=m
@@ -2043,6 +2058,7 @@ CONFIG_NET_DSA_MV88E6XXX=m
CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
# CONFIG_NET_DSA_QCA8K is not set
CONFIG_ETHERNET=y
+CONFIG_NET_VENDOR_ALACRITECH=y
# CONFIG_ALTERA_TSE is not set
CONFIG_NET_VENDOR_AMAZON=y
# CONFIG_NET_VENDOR_ARC is not set
@@ -2095,6 +2111,7 @@ CONFIG_NET_VENDOR_ROCKER=y
CONFIG_NET_VENDOR_SAMSUNG=y
# CONFIG_SXGBE_ETH is not set
CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SOLARFLARE=y
CONFIG_NET_VENDOR_SMSC=y
CONFIG_SMC91X=m
CONFIG_SMC911X=m
@@ -2119,6 +2136,7 @@ CONFIG_NET_VENDOR_WIZNET=y
# CONFIG_WIZNET_W5300 is not set
CONFIG_PHYLIB=y
CONFIG_SWPHY=y
+# CONFIG_LED_TRIGGER_PHY is not set
#
# MDIO bus device drivers
@@ -2149,6 +2167,7 @@ CONFIG_ICPLUS_PHY=m
CONFIG_LSI_ET1011C_PHY=m
CONFIG_LXT_PHY=m
CONFIG_MARVELL_PHY=m
+# CONFIG_MESON_GXL_PHY is not set
CONFIG_MICREL_PHY=y
CONFIG_MICROCHIP_PHY=m
CONFIG_MICROSEMI_PHY=y
@@ -2223,6 +2242,7 @@ CONFIG_USB_SIERRA_NET=m
CONFIG_USB_VL600=m
CONFIG_USB_NET_CH9200=m
CONFIG_WLAN=y
+# CONFIG_WIRELESS_WDS is not set
CONFIG_WLAN_VENDOR_ADMTEK=y
CONFIG_ATH_COMMON=m
CONFIG_WLAN_VENDOR_ATH=y
@@ -2718,7 +2738,6 @@ CONFIG_CONSOLE_POLL=y
# CONFIG_SERIAL_FSL_LPUART is not set
# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
# CONFIG_SERIAL_ST_ASC is not set
-# CONFIG_SERIAL_STM32 is not set
CONFIG_TTY_PRINTK=m
CONFIG_HVC_DRIVER=y
# CONFIG_HVC_DCC is not set
@@ -2733,6 +2752,7 @@ CONFIG_HW_RANDOM_TPM=m
# CONFIG_R3964 is not set
# CONFIG_RAW_DRIVER is not set
CONFIG_TCG_TPM=m
+# CONFIG_TCG_TIS is not set
# CONFIG_TCG_TIS_SPI is not set
CONFIG_TCG_TIS_I2C_ATMEL=m
# CONFIG_TCG_TIS_I2C_INFINEON is not set
@@ -2762,6 +2782,7 @@ CONFIG_I2C_MUX_PCA954x=m
CONFIG_I2C_MUX_PINCTRL=y
# CONFIG_I2C_MUX_REG is not set
# CONFIG_I2C_DEMUX_PINCTRL is not set
+# CONFIG_I2C_MUX_MLXCPLD is not set
CONFIG_I2C_HELPER_AUTO=y
CONFIG_I2C_ALGOBIT=y
CONFIG_I2C_ALGOPCA=m
@@ -2886,6 +2907,7 @@ CONFIG_GENERIC_PINCONF=y
CONFIG_PINCTRL_AS3722=y
# CONFIG_PINCTRL_AMD is not set
CONFIG_PINCTRL_SINGLE=y
+CONFIG_PINCTRL_SX150X=y
CONFIG_PINCTRL_TI_IODELAY=y
CONFIG_PINCTRL_PALMAS=y
CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
@@ -2905,7 +2927,6 @@ CONFIG_GPIO_MAX730X=m
# CONFIG_GPIO_ALTERA is not set
CONFIG_GPIO_AXP209=y
# CONFIG_GPIO_DWAPB is not set
-# CONFIG_GPIO_EM is not set
CONFIG_GPIO_GENERIC_PLATFORM=y
# CONFIG_GPIO_GRGPIO is not set
# CONFIG_GPIO_MOCKUP is not set
@@ -2914,7 +2935,6 @@ CONFIG_GPIO_OMAP=y
CONFIG_GPIO_SYSCON=y
CONFIG_GPIO_XILINX=y
# CONFIG_GPIO_ZEVIO is not set
-# CONFIG_GPIO_ZX is not set
#
# I2C GPIO expanders
@@ -2928,7 +2948,6 @@ CONFIG_GPIO_PCA953X_IRQ=y
CONFIG_GPIO_PCF857X=m
CONFIG_GPIO_SX150X=y
CONFIG_GPIO_TPIC2810=m
-# CONFIG_GPIO_TS4900 is not set
#
# MFD GPIO expanders
@@ -3105,6 +3124,7 @@ CONFIG_SENSORS_MAX6650=m
CONFIG_SENSORS_MAX6697=m
CONFIG_SENSORS_MAX31790=m
CONFIG_SENSORS_MCP3021=m
+# CONFIG_SENSORS_TC654 is not set
CONFIG_SENSORS_ADCXX=m
CONFIG_SENSORS_LM63=m
CONFIG_SENSORS_LM70=m
@@ -3173,6 +3193,7 @@ CONFIG_SENSORS_TC74=m
CONFIG_SENSORS_THMC50=m
CONFIG_SENSORS_TMP102=m
CONFIG_SENSORS_TMP103=m
+# CONFIG_SENSORS_TMP108 is not set
CONFIG_SENSORS_TMP401=m
CONFIG_SENSORS_TMP421=m
CONFIG_SENSORS_TWL4030_MADC=m
@@ -3299,7 +3320,6 @@ CONFIG_MFD_DA9055=y
CONFIG_MFD_DA9063=y
# CONFIG_MFD_DA9150 is not set
CONFIG_MFD_DLN2=y
-# CONFIG_MFD_EXYNOS_LPASS is not set
CONFIG_MFD_MC13XXX=m
CONFIG_MFD_MC13XXX_SPI=m
CONFIG_MFD_MC13XXX_I2C=m
@@ -3327,7 +3347,7 @@ CONFIG_MFD_VIPERBOARD=m
# CONFIG_MFD_RETU is not set
# CONFIG_MFD_PCF50633 is not set
# CONFIG_UCB1400_CORE is not set
-# CONFIG_MFD_PM8921_CORE is not set
+# CONFIG_MFD_PM8XXX is not set
# CONFIG_MFD_RT5033 is not set
CONFIG_MFD_RTSX_USB=m
# CONFIG_MFD_RC5T583 is not set
@@ -3453,6 +3473,7 @@ CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
CONFIG_MEDIA_RADIO_SUPPORT=y
CONFIG_MEDIA_SDR_SUPPORT=y
CONFIG_MEDIA_RC_SUPPORT=y
+# CONFIG_MEDIA_CEC_SUPPORT is not set
CONFIG_MEDIA_CEC_EDID=y
CONFIG_MEDIA_CONTROLLER=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
@@ -3476,6 +3497,7 @@ CONFIG_DVB_NET=y
CONFIG_TTPCI_EEPROM=m
CONFIG_DVB_MAX_ADAPTERS=8
CONFIG_DVB_DYNAMIC_MINORS=y
+# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
#
# Media drivers
@@ -3507,6 +3529,7 @@ CONFIG_IR_TTUSBIR=m
# CONFIG_IR_RX51 is not set
CONFIG_RC_LOOPBACK=m
CONFIG_IR_GPIO_CIR=m
+# CONFIG_IR_SERIAL is not set
CONFIG_MEDIA_USB_SUPPORT=y
#
@@ -3969,9 +3992,11 @@ CONFIG_DVB_AF9033=m
#
# Graphics support
#
+# CONFIG_IMX_IPUV3_CORE is not set
CONFIG_DRM=y
CONFIG_DRM_MIPI_DSI=y
# CONFIG_DRM_DP_AUX_CHARDEV is not set
+# CONFIG_DRM_DEBUG_MM is not set
CONFIG_DRM_KMS_HELPER=y
CONFIG_DRM_KMS_FB_HELPER=y
CONFIG_DRM_FBDEV_EMULATION=y
@@ -4011,13 +4036,17 @@ CONFIG_DRM_BRIDGE=y
# CONFIG_DRM_DUMB_VGA_DAC is not set
# CONFIG_DRM_NXP_PTN3460 is not set
# CONFIG_DRM_PARADE_PS8622 is not set
+# CONFIG_DRM_SIL_SII8620 is not set
# CONFIG_DRM_SII902X is not set
# CONFIG_DRM_TOSHIBA_TC358767 is not set
+# CONFIG_DRM_TI_TFP410 is not set
CONFIG_DRM_I2C_ADV7511=m
+# CONFIG_DRM_I2C_ADV7511_AUDIO is not set
CONFIG_DRM_I2C_ADV7533=y
# CONFIG_DRM_STI is not set
# CONFIG_DRM_ETNAVIV is not set
# CONFIG_DRM_ARCPGU is not set
+# CONFIG_DRM_MXSFB is not set
# CONFIG_DRM_LEGACY is not set
CONFIG_DRM_TINYDRM=y
CONFIG_TINYDRM_MIPI_DBI=m
@@ -4210,6 +4239,8 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
# CONFIG_SND_SOC_BT_SCO is not set
# CONFIG_SND_SOC_CS35L32 is not set
# CONFIG_SND_SOC_CS35L33 is not set
+# CONFIG_SND_SOC_CS35L34 is not set
+# CONFIG_SND_SOC_CS42L42 is not set
# CONFIG_SND_SOC_CS42L51_I2C is not set
# CONFIG_SND_SOC_CS42L52 is not set
# CONFIG_SND_SOC_CS42L56 is not set
@@ -4227,6 +4258,7 @@ CONFIG_SND_SOC_ES8328=m
# CONFIG_SND_SOC_INNO_RK3036 is not set
# CONFIG_SND_SOC_MAX98504 is not set
# CONFIG_SND_SOC_MAX9860 is not set
+# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
# CONFIG_SND_SOC_PCM1681 is not set
# CONFIG_SND_SOC_PCM179X_I2C is not set
# CONFIG_SND_SOC_PCM179X_SPI is not set
@@ -4250,7 +4282,7 @@ CONFIG_SND_SOC_SGTL5000=m
# CONFIG_SND_SOC_TAS5086 is not set
# CONFIG_SND_SOC_TAS571X is not set
# CONFIG_SND_SOC_TAS5720 is not set
-CONFIG_SND_SOC_TDM=m
+# CONFIG_SND_SOC_TDM is not set
# CONFIG_SND_SOC_TFA9879 is not set
CONFIG_SND_SOC_TLV320AIC23=m
CONFIG_SND_SOC_TLV320AIC23_I2C=m
@@ -4344,6 +4376,7 @@ CONFIG_LOGIRUMBLEPAD2_FF=y
CONFIG_LOGIG940_FF=y
CONFIG_LOGIWHEELS_FF=y
CONFIG_HID_MAGICMOUSE=m
+# CONFIG_HID_MAYFLASH is not set
CONFIG_HID_MICROSOFT=m
CONFIG_HID_MONTEREY=m
CONFIG_HID_MULTITOUCH=m
@@ -4378,6 +4411,7 @@ CONFIG_HID_TOPSEED=m
CONFIG_HID_THINGM=m
CONFIG_HID_THRUSTMASTER=m
CONFIG_THRUSTMASTER_FF=y
+# CONFIG_HID_UDRAW_PS3 is not set
CONFIG_HID_WACOM=m
CONFIG_HID_WIIMOTE=m
CONFIG_HID_XINMO=m
@@ -4556,6 +4590,7 @@ CONFIG_USB_SERIAL_IR=m
CONFIG_USB_SERIAL_EDGEPORT=m
CONFIG_USB_SERIAL_EDGEPORT_TI=m
CONFIG_USB_SERIAL_F81232=m
+# CONFIG_USB_SERIAL_F8153X is not set
CONFIG_USB_SERIAL_GARMIN=m
CONFIG_USB_SERIAL_IPW=m
CONFIG_USB_SERIAL_IUU=m
@@ -4743,10 +4778,6 @@ CONFIG_MMC=y
# CONFIG_MMC_DEBUG is not set
CONFIG_PWRSEQ_EMMC=y
CONFIG_PWRSEQ_SIMPLE=y
-
-#
-# MMC/SD/SDIO Card Drivers
-#
CONFIG_MMC_BLOCK=y
CONFIG_MMC_BLOCK_MINORS=8
CONFIG_MMC_BLOCK_BOUNCE=y
@@ -4760,6 +4791,7 @@ CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_PLTFM=y
CONFIG_MMC_SDHCI_OF_ARASAN=y
# CONFIG_MMC_SDHCI_OF_AT91 is not set
+# CONFIG_MMC_SDHCI_CADENCE is not set
# CONFIG_MMC_SDHCI_F_SDH30 is not set
CONFIG_MMC_OMAP=m
CONFIG_MMC_OMAP_HS=y
@@ -4827,6 +4859,7 @@ CONFIG_LEDS_IS31FL32XX=m
#
# CONFIG_LEDS_BLINKM is not set
# CONFIG_LEDS_SYSCON is not set
+# CONFIG_LEDS_USER is not set
#
# LED Triggers
@@ -4974,6 +5007,7 @@ CONFIG_RTC_DRV_ZYNQMP=m
CONFIG_RTC_DRV_OMAP=y
CONFIG_RTC_DRV_MC13XXX=m
CONFIG_RTC_DRV_SNVS=y
+# CONFIG_RTC_DRV_R7301 is not set
#
# HID Sensor RTC drivers
@@ -5009,7 +5043,8 @@ CONFIG_ASYNC_TX_DMA=y
#
# DMABUF options
#
-# CONFIG_SYNC_FILE is not set
+CONFIG_SYNC_FILE=y
+# CONFIG_SW_SYNC is not set
# CONFIG_AUXDISPLAY is not set
CONFIG_UIO=m
CONFIG_UIO_PDRV_GENIRQ=m
@@ -5053,7 +5088,6 @@ CONFIG_ADIS16201=m
CONFIG_ADIS16203=m
CONFIG_ADIS16209=m
CONFIG_ADIS16240=m
-CONFIG_SCA3000=m
#
# Analog to digital converters
@@ -5099,9 +5133,7 @@ CONFIG_AD5933=m
#
# Light sensors
#
-CONFIG_SENSORS_ISL29018=m
CONFIG_SENSORS_ISL29028=m
-CONFIG_TSL2583=m
# CONFIG_TSL2x7x is not set
#
@@ -5245,6 +5277,13 @@ CONFIG_COMMON_CLK_PALMAS=y
# CONFIG_COMMON_CLK_PWM is not set
# CONFIG_COMMON_CLK_PXA is not set
# CONFIG_COMMON_CLK_PIC32 is not set
+# CONFIG_COMMON_CLK_MT2701 is not set
+# CONFIG_COMMON_CLK_MT2701_MMSYS is not set
+# CONFIG_COMMON_CLK_MT2701_IMGSYS is not set
+# CONFIG_COMMON_CLK_MT2701_VDECSYS is not set
+# CONFIG_COMMON_CLK_MT2701_HIFSYS is not set
+# CONFIG_COMMON_CLK_MT2701_ETHSYS is not set
+# CONFIG_COMMON_CLK_MT2701_BDPSYS is not set
CONFIG_COMMON_CLK_TI_ADPLL=y
CONFIG_HWSPINLOCK=y
@@ -5294,7 +5333,6 @@ CONFIG_ARM_SMMU=y
# Remoteproc drivers
#
CONFIG_REMOTEPROC=y
-# CONFIG_STE_MODEM_RPROC is not set
CONFIG_WKUP_M3_RPROC=y
#
@@ -5365,8 +5403,11 @@ CONFIG_BMA220=m
CONFIG_BMC150_ACCEL=m
CONFIG_BMC150_ACCEL_I2C=m
CONFIG_BMC150_ACCEL_SPI=m
+# CONFIG_DA280 is not set
+# CONFIG_DA311 is not set
CONFIG_DMARD06=m
CONFIG_DMARD09=m
+# CONFIG_DMARD10 is not set
CONFIG_HID_SENSOR_ACCEL_3D=m
CONFIG_IIO_ST_ACCEL_3AXIS=m
CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
@@ -5386,6 +5427,7 @@ CONFIG_MMA9551=m
CONFIG_MMA9553=m
CONFIG_MXC4005=m
CONFIG_MXC6255=m
+CONFIG_SCA3000=m
CONFIG_STK8312=m
CONFIG_STK8BA50=m
@@ -5397,6 +5439,7 @@ CONFIG_AD7266=m
CONFIG_AD7291=m
CONFIG_AD7298=m
CONFIG_AD7476=m
+# CONFIG_AD7766 is not set
CONFIG_AD7791=m
CONFIG_AD7793=m
CONFIG_AD7887=m
@@ -5404,6 +5447,7 @@ CONFIG_AD7923=m
CONFIG_AD799X=m
CONFIG_AXP288_ADC=m
CONFIG_CC10001_ADC=m
+# CONFIG_ENVELOPE_DETECTOR is not set
CONFIG_HI8435=m
CONFIG_INA2XX_ADC=m
CONFIG_LTC2485=m
@@ -5437,6 +5481,7 @@ CONFIG_AD8366=m
CONFIG_ATLAS_PH_SENSOR=m
CONFIG_IAQCORE=m
CONFIG_VZ89X=m
+# CONFIG_IIO_CROS_EC_SENSORS_CORE is not set
#
# Hid Sensor IIO Common
@@ -5454,6 +5499,10 @@ CONFIG_IIO_ST_SENSORS_I2C=m
CONFIG_IIO_ST_SENSORS_SPI=m
CONFIG_IIO_ST_SENSORS_CORE=m
+#
+# Counters
+#
+
#
# Digital to analog converters
#
@@ -5475,6 +5524,7 @@ CONFIG_AD5764=m
CONFIG_AD5791=m
CONFIG_AD7303=m
CONFIG_AD8801=m
+# CONFIG_DPOT_DAC is not set
CONFIG_M62332=m
CONFIG_MAX517=m
CONFIG_MAX5821=m
@@ -5534,6 +5584,7 @@ CONFIG_MAX30100=m
CONFIG_AM2315=m
CONFIG_DHT11=m
CONFIG_HDC100X=m
+# CONFIG_HTS221 is not set
CONFIG_HTU21=m
CONFIG_SI7005=m
CONFIG_SI7020=m
@@ -5567,6 +5618,7 @@ CONFIG_CM3232=m
CONFIG_CM3323=m
CONFIG_CM36651=m
CONFIG_GP2AP020A00F=m
+CONFIG_SENSORS_ISL29018=m
CONFIG_ISL29125=m
CONFIG_HID_SENSOR_ALS=m
CONFIG_HID_SENSOR_PROX=m
@@ -5581,6 +5633,7 @@ CONFIG_STK3310=m
CONFIG_TCS3414=m
CONFIG_TCS3472=m
CONFIG_SENSORS_TSL2563=m
+CONFIG_TSL2583=m
CONFIG_TSL4531=m
CONFIG_US5182D=m
CONFIG_VCNL4000=m
@@ -5626,9 +5679,15 @@ CONFIG_MCP4131=m
CONFIG_MCP4531=m
CONFIG_TPL0102=m
+#
+# Digital potentiostats
+#
+# CONFIG_LMP91000 is not set
+
#
# Pressure sensors
#
+# CONFIG_ABP060MG is not set
CONFIG_BMP280=m
CONFIG_BMP280_I2C=m
CONFIG_BMP280_SPI=m
@@ -5737,6 +5796,10 @@ CONFIG_ARM_PSCI_FW=y
# CONFIG_FW_CFG_SYSFS is not set
CONFIG_HAVE_ARM_SMCCC=y
+#
+# Tegra firmware driver
+#
+
#
# File systems
#
@@ -5818,6 +5881,7 @@ CONFIG_AUTOFS4_FS=y
CONFIG_FUSE_FS=y
CONFIG_CUSE=m
CONFIG_OVERLAY_FS=y
+# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
#
# Caches
@@ -5903,7 +5967,7 @@ CONFIG_UBIFS_FS_ADVANCED_COMPR=y
CONFIG_UBIFS_FS_LZO=y
CONFIG_UBIFS_FS_ZLIB=y
# CONFIG_UBIFS_ATIME_SUPPORT is not set
-# CONFIG_LOGFS is not set
+# CONFIG_UBIFS_FS_ENCRYPTION is not set
# CONFIG_CRAMFS is not set
CONFIG_SQUASHFS=m
CONFIG_SQUASHFS_FILE_CACHE=y
@@ -5939,23 +6003,6 @@ CONFIG_UFS_FS=m
# CONFIG_UFS_DEBUG is not set
CONFIG_EXOFS_FS=m
# CONFIG_EXOFS_DEBUG is not set
-CONFIG_AUFS_FS=m
-CONFIG_AUFS_BRANCH_MAX_127=y
-# CONFIG_AUFS_BRANCH_MAX_511 is not set
-# CONFIG_AUFS_BRANCH_MAX_1023 is not set
-# CONFIG_AUFS_BRANCH_MAX_32767 is not set
-CONFIG_AUFS_SBILIST=y
-# CONFIG_AUFS_HNOTIFY is not set
-CONFIG_AUFS_EXPORT=y
-CONFIG_AUFS_XATTR=y
-# CONFIG_AUFS_FHSM is not set
-# CONFIG_AUFS_RDU is not set
-# CONFIG_AUFS_SHWH is not set
-# CONFIG_AUFS_BR_RAMFS is not set
-# CONFIG_AUFS_BR_FUSE is not set
-CONFIG_AUFS_BR_HFSPLUS=y
-CONFIG_AUFS_BDEV_LOOP=y
-# CONFIG_AUFS_DEBUG is not set
CONFIG_ORE=m
CONFIG_NETWORK_FILESYSTEMS=y
CONFIG_NFS_FS=y
@@ -6094,6 +6141,7 @@ CONFIG_DLM_DEBUG=y
# printk and dmesg options
#
CONFIG_PRINTK_TIME=y
+CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
CONFIG_BOOT_PRINTK_DELAY=y
CONFIG_DYNAMIC_DEBUG=y
@@ -6265,6 +6313,7 @@ CONFIG_TEST_FIRMWARE=m
# CONFIG_TEST_UDELAY is not set
# CONFIG_MEMTEST is not set
CONFIG_TEST_STATIC_KEYS=m
+# CONFIG_BUG_ON_DATA_CORRUPTION is not set
# CONFIG_SAMPLES is not set
CONFIG_HAVE_ARCH_KGDB=y
CONFIG_KGDB=y
@@ -6363,6 +6412,7 @@ CONFIG_CRYPTO_RNG_DEFAULT=y
CONFIG_CRYPTO_AKCIPHER2=y
CONFIG_CRYPTO_AKCIPHER=y
CONFIG_CRYPTO_KPP2=y
+CONFIG_CRYPTO_ACOMP2=y
CONFIG_CRYPTO_RSA=y
# CONFIG_CRYPTO_DH is not set
# CONFIG_CRYPTO_ECDH is not set
@@ -6378,7 +6428,7 @@ CONFIG_CRYPTO_CRYPTD=m
# CONFIG_CRYPTO_MCRYPTD is not set
CONFIG_CRYPTO_AUTHENC=m
CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_ABLK_HELPER=m
+CONFIG_CRYPTO_SIMD=m
CONFIG_CRYPTO_ENGINE=m
#
@@ -6481,9 +6531,11 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_CRYPTO_HASH_INFO=y
CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC is not set
CONFIG_CRYPTO_DEV_OMAP_SHAM=m
CONFIG_CRYPTO_DEV_OMAP_AES=m
CONFIG_CRYPTO_DEV_OMAP_DES=m
+CONFIG_CRYPTO_DEV_VIRTIO=m
CONFIG_ASYMMETRIC_KEY_TYPE=y
CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
CONFIG_X509_CERTIFICATE_PARSER=y
@@ -6504,6 +6556,8 @@ CONFIG_CRYPTO_AES_ARM=m
CONFIG_CRYPTO_AES_ARM_BS=m
# CONFIG_CRYPTO_AES_ARM_CE is not set
# CONFIG_CRYPTO_GHASH_ARM_CE is not set
+# CONFIG_CRYPTO_CRCT10DIF_ARM_CE is not set
+# CONFIG_CRYPTO_CRC32_ARM_CE is not set
CONFIG_BINARY_PRINTF=y
#
diff --git a/patches/defconfig-bone b/patches/defconfig-bone
index 30e31257d29b3dcf4d7b183b896b1cc654a617b5..acf1edd0d0367f25305df7913f95d7d8dc650d71 100644
--- a/patches/defconfig-bone
+++ b/patches/defconfig-bone
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.9.0 Kernel Configuration
+# Linux/arm 4.10.0-rc1 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -137,6 +137,7 @@ CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_DEVICE=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_CGROUP_PERF=y
+# CONFIG_CGROUP_BPF is not set
# CONFIG_CGROUP_DEBUG is not set
CONFIG_CHECKPOINT_RESTORE=y
CONFIG_NAMESPACES=y
@@ -156,6 +157,7 @@ CONFIG_RD_LZMA=y
CONFIG_RD_XZ=y
CONFIG_RD_LZO=y
CONFIG_RD_LZ4=y
+CONFIG_INITRAMFS_COMPRESSION=".gz"
CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_SYSCTL=y
@@ -168,6 +170,7 @@ CONFIG_MULTIUSER=y
# CONFIG_SGETMASK_SYSCALL is not set
CONFIG_SYSFS_SYSCALL=y
CONFIG_SYSCTL_SYSCALL=y
+CONFIG_POSIX_TIMERS=y
CONFIG_KALLSYMS=y
CONFIG_KALLSYMS_ALL=y
# CONFIG_KALLSYMS_ABSOLUTE_PERCPU is not set
@@ -284,8 +287,10 @@ CONFIG_LBDAF=y
CONFIG_BLK_DEV_BSG=y
CONFIG_BLK_DEV_BSGLIB=y
CONFIG_BLK_DEV_INTEGRITY=y
+# CONFIG_BLK_DEV_ZONED is not set
CONFIG_BLK_DEV_THROTTLING=y
# CONFIG_BLK_CMDLINE_PARSER is not set
+# CONFIG_BLK_WBT is not set
#
# Partition Types
@@ -391,9 +396,6 @@ CONFIG_ARCH_OMAP=y
# OMAP Feature Selections
#
CONFIG_OMAP_RESET_CLOCKS=y
-CONFIG_OMAP_MUX=y
-# CONFIG_OMAP_MUX_DEBUG is not set
-CONFIG_OMAP_MUX_WARNINGS=y
CONFIG_OMAP_32K_TIMER=y
CONFIG_OMAP_DM_TIMER=y
CONFIG_OMAP_PM_NOOP=y
@@ -636,7 +638,6 @@ CONFIG_CPUFREQ_DT=m
CONFIG_CPUFREQ_DT_PLATDEV=y
# CONFIG_ARM_KIRKWOOD_CPUFREQ is not set
# CONFIG_ARM_OMAP2PLUS_CPUFREQ is not set
-CONFIG_ARM_TI_CPUFREQ=y
# CONFIG_QORIQ_CPUFREQ is not set
#
@@ -762,6 +763,7 @@ CONFIG_INET_XFRM_MODE_BEET=m
CONFIG_INET_DIAG=m
CONFIG_INET_TCP_DIAG=m
CONFIG_INET_UDP_DIAG=m
+# CONFIG_INET_RAW_DIAG is not set
# CONFIG_INET_DIAG_DESTROY is not set
CONFIG_TCP_CONG_ADVANCED=y
CONFIG_TCP_CONG_BIC=m
@@ -812,6 +814,8 @@ CONFIG_IPV6_SUBTREES=y
CONFIG_IPV6_MROUTE=y
CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
CONFIG_IPV6_PIMSM_V2=y
+# CONFIG_IPV6_SEG6_LWTUNNEL is not set
+# CONFIG_IPV6_SEG6_HMAC is not set
CONFIG_NETLABEL=y
CONFIG_NETWORK_SECMARK=y
CONFIG_NET_PTP_CLASSIFY=y
@@ -831,6 +835,7 @@ CONFIG_NETFILTER_NETLINK_QUEUE=m
CONFIG_NETFILTER_NETLINK_LOG=m
CONFIG_NF_CONNTRACK=m
CONFIG_NF_LOG_COMMON=m
+# CONFIG_NF_LOG_NETDEV is not set
CONFIG_NF_CONNTRACK_MARK=y
CONFIG_NF_CONNTRACK_SECMARK=y
CONFIG_NF_CONNTRACK_ZONES=y
@@ -839,10 +844,10 @@ CONFIG_NF_CONNTRACK_EVENTS=y
CONFIG_NF_CONNTRACK_TIMEOUT=y
CONFIG_NF_CONNTRACK_TIMESTAMP=y
CONFIG_NF_CONNTRACK_LABELS=y
-CONFIG_NF_CT_PROTO_DCCP=m
+CONFIG_NF_CT_PROTO_DCCP=y
CONFIG_NF_CT_PROTO_GRE=m
-CONFIG_NF_CT_PROTO_SCTP=m
-CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CT_PROTO_SCTP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
CONFIG_NF_CONNTRACK_AMANDA=m
CONFIG_NF_CONNTRACK_FTP=m
CONFIG_NF_CONNTRACK_H323=m
@@ -860,9 +865,9 @@ CONFIG_NF_CT_NETLINK_HELPER=m
CONFIG_NETFILTER_NETLINK_GLUE_CT=y
CONFIG_NF_NAT=m
CONFIG_NF_NAT_NEEDED=y
-CONFIG_NF_NAT_PROTO_DCCP=m
-CONFIG_NF_NAT_PROTO_UDPLITE=m
-CONFIG_NF_NAT_PROTO_SCTP=m
+CONFIG_NF_NAT_PROTO_DCCP=y
+CONFIG_NF_NAT_PROTO_UDPLITE=y
+CONFIG_NF_NAT_PROTO_SCTP=y
CONFIG_NF_NAT_AMANDA=m
CONFIG_NF_NAT_FTP=m
CONFIG_NF_NAT_IRC=m
@@ -875,6 +880,7 @@ CONFIG_NF_TABLES_INET=m
CONFIG_NF_TABLES_NETDEV=m
CONFIG_NFT_EXTHDR=m
CONFIG_NFT_META=m
+# CONFIG_NFT_RT is not set
# CONFIG_NFT_NUMGEN is not set
CONFIG_NFT_CT=m
CONFIG_NFT_SET_RBTREE=m
@@ -885,6 +891,7 @@ CONFIG_NFT_LIMIT=m
CONFIG_NFT_MASQ=m
CONFIG_NFT_REDIR=m
CONFIG_NFT_NAT=m
+# CONFIG_NFT_OBJREF is not set
CONFIG_NFT_QUEUE=m
# CONFIG_NFT_QUOTA is not set
CONFIG_NFT_REJECT=m
@@ -975,7 +982,6 @@ CONFIG_NETFILTER_XT_MATCH_RATEEST=m
CONFIG_NETFILTER_XT_MATCH_REALM=m
CONFIG_NETFILTER_XT_MATCH_RECENT=m
CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
CONFIG_NETFILTER_XT_MATCH_STATE=m
CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
CONFIG_NETFILTER_XT_MATCH_STRING=m
@@ -992,6 +998,7 @@ CONFIG_IP_SET_HASH_IPMARK=m
CONFIG_IP_SET_HASH_IPPORT=m
CONFIG_IP_SET_HASH_IPPORTIP=m
CONFIG_IP_SET_HASH_IPPORTNET=m
+# CONFIG_IP_SET_HASH_IPMAC is not set
CONFIG_IP_SET_HASH_MAC=m
CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_HASH_NET=m
@@ -1047,10 +1054,12 @@ CONFIG_IP_VS_PE_SIP=m
#
CONFIG_NF_DEFRAG_IPV4=m
CONFIG_NF_CONNTRACK_IPV4=m
+# CONFIG_NF_SOCKET_IPV4 is not set
CONFIG_NF_TABLES_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_DUP_IPV4=m
+# CONFIG_NFT_FIB_IPV4 is not set
CONFIG_NF_TABLES_ARP=m
CONFIG_NF_DUP_IPV4=m
CONFIG_NF_LOG_ARP=m
@@ -1092,10 +1101,12 @@ CONFIG_IP_NF_ARP_MANGLE=m
#
CONFIG_NF_DEFRAG_IPV6=m
CONFIG_NF_CONNTRACK_IPV6=m
+# CONFIG_NF_SOCKET_IPV6 is not set
CONFIG_NF_TABLES_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_REJECT_IPV6=m
CONFIG_NFT_DUP_IPV6=m
+# CONFIG_NFT_FIB_IPV6 is not set
CONFIG_NF_DUP_IPV6=m
CONFIG_NF_REJECT_IPV6=m
CONFIG_NF_LOG_IPV6=m
@@ -1547,6 +1558,7 @@ CONFIG_NFC_MICROREAD_I2C=m
# CONFIG_NFC_S3FWRN5_I2C is not set
# CONFIG_NFC_ST95HF is not set
CONFIG_LWTUNNEL=y
+CONFIG_LWTUNNEL_BPF=y
CONFIG_DST_CACHE=y
# CONFIG_NET_DEVLINK is not set
CONFIG_MAY_USE_DEVLINK=y
@@ -1577,6 +1589,7 @@ CONFIG_DEV_COREDUMP=y
# CONFIG_DEBUG_DRIVER is not set
# CONFIG_DEBUG_DEVRES is not set
# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
# CONFIG_SYS_HYPERVISOR is not set
# CONFIG_GENERIC_CPU_DEVICES is not set
CONFIG_SOC_BUS=y
@@ -1586,7 +1599,7 @@ CONFIG_REGMAP_SPI=y
CONFIG_REGMAP_MMIO=y
CONFIG_REGMAP_IRQ=y
CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_FENCE_TRACE is not set
+# CONFIG_DMA_FENCE_TRACE is not set
CONFIG_DMA_CMA=y
#
@@ -1698,6 +1711,7 @@ CONFIG_MTD_NAND_IDS=y
CONFIG_MTD_NAND_NANDSIM=m
# CONFIG_MTD_NAND_BRCMNAND is not set
# CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_NAND_OXNAS is not set
# CONFIG_MTD_NAND_HISI504 is not set
# CONFIG_MTD_NAND_MTK is not set
CONFIG_MTD_ONENAND=y
@@ -1757,6 +1771,7 @@ CONFIG_ATA_OVER_ETH=m
# CONFIG_MG_DISK is not set
CONFIG_VIRTIO_BLK=m
CONFIG_BLK_DEV_RBD=m
+# CONFIG_NVME_FC is not set
# CONFIG_NVME_TARGET is not set
#
@@ -1959,7 +1974,7 @@ CONFIG_BLK_DEV_DM=m
# CONFIG_DM_MQ_DEFAULT is not set
# CONFIG_DM_DEBUG is not set
CONFIG_DM_BUFIO=m
-# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
+# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
CONFIG_DM_BIO_PRISON=m
CONFIG_DM_PERSISTENT_DATA=m
CONFIG_DM_CRYPT=m
@@ -2043,6 +2058,7 @@ CONFIG_NET_DSA_MV88E6XXX=m
CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
# CONFIG_NET_DSA_QCA8K is not set
CONFIG_ETHERNET=y
+CONFIG_NET_VENDOR_ALACRITECH=y
# CONFIG_ALTERA_TSE is not set
CONFIG_NET_VENDOR_AMAZON=y
# CONFIG_NET_VENDOR_ARC is not set
@@ -2095,6 +2111,7 @@ CONFIG_NET_VENDOR_ROCKER=y
CONFIG_NET_VENDOR_SAMSUNG=y
# CONFIG_SXGBE_ETH is not set
CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SOLARFLARE=y
CONFIG_NET_VENDOR_SMSC=y
CONFIG_SMC91X=m
CONFIG_SMC911X=m
@@ -2119,6 +2136,7 @@ CONFIG_NET_VENDOR_WIZNET=y
# CONFIG_WIZNET_W5300 is not set
CONFIG_PHYLIB=y
CONFIG_SWPHY=y
+# CONFIG_LED_TRIGGER_PHY is not set
#
# MDIO bus device drivers
@@ -2149,6 +2167,7 @@ CONFIG_ICPLUS_PHY=m
CONFIG_LSI_ET1011C_PHY=m
CONFIG_LXT_PHY=m
CONFIG_MARVELL_PHY=m
+# CONFIG_MESON_GXL_PHY is not set
CONFIG_MICREL_PHY=y
CONFIG_MICROCHIP_PHY=m
CONFIG_MICROSEMI_PHY=y
@@ -2223,6 +2242,7 @@ CONFIG_USB_SIERRA_NET=m
CONFIG_USB_VL600=m
CONFIG_USB_NET_CH9200=m
CONFIG_WLAN=y
+# CONFIG_WIRELESS_WDS is not set
CONFIG_WLAN_VENDOR_ADMTEK=y
CONFIG_ATH_COMMON=m
CONFIG_WLAN_VENDOR_ATH=y
@@ -2718,7 +2738,6 @@ CONFIG_CONSOLE_POLL=y
# CONFIG_SERIAL_FSL_LPUART is not set
# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
# CONFIG_SERIAL_ST_ASC is not set
-# CONFIG_SERIAL_STM32 is not set
CONFIG_TTY_PRINTK=m
CONFIG_HVC_DRIVER=y
# CONFIG_HVC_DCC is not set
@@ -2733,6 +2752,7 @@ CONFIG_HW_RANDOM_TPM=m
# CONFIG_R3964 is not set
# CONFIG_RAW_DRIVER is not set
CONFIG_TCG_TPM=m
+# CONFIG_TCG_TIS is not set
# CONFIG_TCG_TIS_SPI is not set
CONFIG_TCG_TIS_I2C_ATMEL=m
# CONFIG_TCG_TIS_I2C_INFINEON is not set
@@ -2762,6 +2782,7 @@ CONFIG_I2C_MUX_PCA954x=m
CONFIG_I2C_MUX_PINCTRL=y
# CONFIG_I2C_MUX_REG is not set
# CONFIG_I2C_DEMUX_PINCTRL is not set
+# CONFIG_I2C_MUX_MLXCPLD is not set
CONFIG_I2C_HELPER_AUTO=y
CONFIG_I2C_ALGOBIT=y
CONFIG_I2C_ALGOPCA=m
@@ -2886,6 +2907,7 @@ CONFIG_GENERIC_PINCONF=y
CONFIG_PINCTRL_AS3722=y
# CONFIG_PINCTRL_AMD is not set
CONFIG_PINCTRL_SINGLE=y
+CONFIG_PINCTRL_SX150X=y
CONFIG_PINCTRL_TI_IODELAY=y
CONFIG_PINCTRL_PALMAS=y
CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
@@ -2905,7 +2927,6 @@ CONFIG_GPIO_MAX730X=m
# CONFIG_GPIO_ALTERA is not set
CONFIG_GPIO_AXP209=y
# CONFIG_GPIO_DWAPB is not set
-# CONFIG_GPIO_EM is not set
CONFIG_GPIO_GENERIC_PLATFORM=y
# CONFIG_GPIO_GRGPIO is not set
# CONFIG_GPIO_MOCKUP is not set
@@ -2914,7 +2935,6 @@ CONFIG_GPIO_OMAP=y
CONFIG_GPIO_SYSCON=y
CONFIG_GPIO_XILINX=y
# CONFIG_GPIO_ZEVIO is not set
-# CONFIG_GPIO_ZX is not set
#
# I2C GPIO expanders
@@ -2928,7 +2948,6 @@ CONFIG_GPIO_PCA953X_IRQ=y
CONFIG_GPIO_PCF857X=m
CONFIG_GPIO_SX150X=y
CONFIG_GPIO_TPIC2810=m
-# CONFIG_GPIO_TS4900 is not set
#
# MFD GPIO expanders
@@ -3111,6 +3130,7 @@ CONFIG_SENSORS_MAX6650=m
CONFIG_SENSORS_MAX6697=m
CONFIG_SENSORS_MAX31790=m
CONFIG_SENSORS_MCP3021=m
+# CONFIG_SENSORS_TC654 is not set
CONFIG_SENSORS_ADCXX=m
CONFIG_SENSORS_LM63=m
CONFIG_SENSORS_LM70=m
@@ -3179,6 +3199,7 @@ CONFIG_SENSORS_TC74=m
CONFIG_SENSORS_THMC50=m
CONFIG_SENSORS_TMP102=m
CONFIG_SENSORS_TMP103=m
+# CONFIG_SENSORS_TMP108 is not set
CONFIG_SENSORS_TMP401=m
CONFIG_SENSORS_TMP421=m
CONFIG_SENSORS_TWL4030_MADC=m
@@ -3305,7 +3326,6 @@ CONFIG_MFD_DA9055=y
CONFIG_MFD_DA9063=y
# CONFIG_MFD_DA9150 is not set
CONFIG_MFD_DLN2=y
-# CONFIG_MFD_EXYNOS_LPASS is not set
CONFIG_MFD_MC13XXX=m
CONFIG_MFD_MC13XXX_SPI=m
CONFIG_MFD_MC13XXX_I2C=m
@@ -3333,7 +3353,7 @@ CONFIG_MFD_VIPERBOARD=m
# CONFIG_MFD_RETU is not set
# CONFIG_MFD_PCF50633 is not set
# CONFIG_UCB1400_CORE is not set
-# CONFIG_MFD_PM8921_CORE is not set
+# CONFIG_MFD_PM8XXX is not set
# CONFIG_MFD_RT5033 is not set
CONFIG_MFD_RTSX_USB=m
# CONFIG_MFD_RC5T583 is not set
@@ -3459,6 +3479,7 @@ CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
CONFIG_MEDIA_RADIO_SUPPORT=y
CONFIG_MEDIA_SDR_SUPPORT=y
CONFIG_MEDIA_RC_SUPPORT=y
+# CONFIG_MEDIA_CEC_SUPPORT is not set
CONFIG_MEDIA_CEC_EDID=y
CONFIG_MEDIA_CONTROLLER=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
@@ -3482,6 +3503,7 @@ CONFIG_DVB_NET=y
CONFIG_TTPCI_EEPROM=m
CONFIG_DVB_MAX_ADAPTERS=8
CONFIG_DVB_DYNAMIC_MINORS=y
+# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
#
# Media drivers
@@ -3513,6 +3535,7 @@ CONFIG_IR_TTUSBIR=m
# CONFIG_IR_RX51 is not set
CONFIG_RC_LOOPBACK=m
CONFIG_IR_GPIO_CIR=m
+# CONFIG_IR_SERIAL is not set
CONFIG_MEDIA_USB_SUPPORT=y
#
@@ -3975,9 +3998,11 @@ CONFIG_DVB_AF9033=m
#
# Graphics support
#
+# CONFIG_IMX_IPUV3_CORE is not set
CONFIG_DRM=y
CONFIG_DRM_MIPI_DSI=y
# CONFIG_DRM_DP_AUX_CHARDEV is not set
+# CONFIG_DRM_DEBUG_MM is not set
CONFIG_DRM_KMS_HELPER=y
CONFIG_DRM_KMS_FB_HELPER=y
CONFIG_DRM_FBDEV_EMULATION=y
@@ -4017,13 +4042,17 @@ CONFIG_DRM_BRIDGE=y
# CONFIG_DRM_DUMB_VGA_DAC is not set
# CONFIG_DRM_NXP_PTN3460 is not set
# CONFIG_DRM_PARADE_PS8622 is not set
+# CONFIG_DRM_SIL_SII8620 is not set
# CONFIG_DRM_SII902X is not set
# CONFIG_DRM_TOSHIBA_TC358767 is not set
+# CONFIG_DRM_TI_TFP410 is not set
CONFIG_DRM_I2C_ADV7511=m
+# CONFIG_DRM_I2C_ADV7511_AUDIO is not set
CONFIG_DRM_I2C_ADV7533=y
# CONFIG_DRM_STI is not set
# CONFIG_DRM_ETNAVIV is not set
# CONFIG_DRM_ARCPGU is not set
+# CONFIG_DRM_MXSFB is not set
# CONFIG_DRM_LEGACY is not set
CONFIG_DRM_TINYDRM=y
CONFIG_TINYDRM_MIPI_DBI=m
@@ -4216,6 +4245,8 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
# CONFIG_SND_SOC_BT_SCO is not set
# CONFIG_SND_SOC_CS35L32 is not set
# CONFIG_SND_SOC_CS35L33 is not set
+# CONFIG_SND_SOC_CS35L34 is not set
+# CONFIG_SND_SOC_CS42L42 is not set
# CONFIG_SND_SOC_CS42L51_I2C is not set
# CONFIG_SND_SOC_CS42L52 is not set
# CONFIG_SND_SOC_CS42L56 is not set
@@ -4233,6 +4264,7 @@ CONFIG_SND_SOC_ES8328=m
# CONFIG_SND_SOC_INNO_RK3036 is not set
# CONFIG_SND_SOC_MAX98504 is not set
# CONFIG_SND_SOC_MAX9860 is not set
+# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
# CONFIG_SND_SOC_PCM1681 is not set
# CONFIG_SND_SOC_PCM179X_I2C is not set
# CONFIG_SND_SOC_PCM179X_SPI is not set
@@ -4350,6 +4382,7 @@ CONFIG_LOGIRUMBLEPAD2_FF=y
CONFIG_LOGIG940_FF=y
CONFIG_LOGIWHEELS_FF=y
CONFIG_HID_MAGICMOUSE=m
+# CONFIG_HID_MAYFLASH is not set
CONFIG_HID_MICROSOFT=m
CONFIG_HID_MONTEREY=m
CONFIG_HID_MULTITOUCH=m
@@ -4384,6 +4417,7 @@ CONFIG_HID_TOPSEED=m
CONFIG_HID_THINGM=m
CONFIG_HID_THRUSTMASTER=m
CONFIG_THRUSTMASTER_FF=y
+# CONFIG_HID_UDRAW_PS3 is not set
CONFIG_HID_WACOM=m
CONFIG_HID_WIIMOTE=m
CONFIG_HID_XINMO=m
@@ -4562,6 +4596,7 @@ CONFIG_USB_SERIAL_IR=m
CONFIG_USB_SERIAL_EDGEPORT=m
CONFIG_USB_SERIAL_EDGEPORT_TI=m
CONFIG_USB_SERIAL_F81232=m
+# CONFIG_USB_SERIAL_F8153X is not set
CONFIG_USB_SERIAL_GARMIN=m
CONFIG_USB_SERIAL_IPW=m
CONFIG_USB_SERIAL_IUU=m
@@ -4749,10 +4784,6 @@ CONFIG_MMC=y
# CONFIG_MMC_DEBUG is not set
CONFIG_PWRSEQ_EMMC=y
CONFIG_PWRSEQ_SIMPLE=y
-
-#
-# MMC/SD/SDIO Card Drivers
-#
CONFIG_MMC_BLOCK=y
CONFIG_MMC_BLOCK_MINORS=8
CONFIG_MMC_BLOCK_BOUNCE=y
@@ -4766,6 +4797,7 @@ CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_PLTFM=y
CONFIG_MMC_SDHCI_OF_ARASAN=y
# CONFIG_MMC_SDHCI_OF_AT91 is not set
+# CONFIG_MMC_SDHCI_CADENCE is not set
# CONFIG_MMC_SDHCI_F_SDH30 is not set
CONFIG_MMC_OMAP=m
CONFIG_MMC_OMAP_HS=y
@@ -4833,6 +4865,7 @@ CONFIG_LEDS_IS31FL32XX=m
#
# CONFIG_LEDS_BLINKM is not set
# CONFIG_LEDS_SYSCON is not set
+# CONFIG_LEDS_USER is not set
#
# LED Triggers
@@ -4980,6 +5013,7 @@ CONFIG_RTC_DRV_ZYNQMP=m
CONFIG_RTC_DRV_OMAP=y
CONFIG_RTC_DRV_MC13XXX=m
CONFIG_RTC_DRV_SNVS=y
+# CONFIG_RTC_DRV_R7301 is not set
#
# HID Sensor RTC drivers
@@ -5015,7 +5049,8 @@ CONFIG_ASYNC_TX_DMA=y
#
# DMABUF options
#
-# CONFIG_SYNC_FILE is not set
+CONFIG_SYNC_FILE=y
+# CONFIG_SW_SYNC is not set
# CONFIG_AUXDISPLAY is not set
CONFIG_UIO=m
CONFIG_UIO_PDRV_GENIRQ=m
@@ -5059,7 +5094,6 @@ CONFIG_ADIS16201=m
CONFIG_ADIS16203=m
CONFIG_ADIS16209=m
CONFIG_ADIS16240=m
-CONFIG_SCA3000=m
#
# Analog to digital converters
@@ -5105,9 +5139,7 @@ CONFIG_AD5933=m
#
# Light sensors
#
-CONFIG_SENSORS_ISL29018=m
CONFIG_SENSORS_ISL29028=m
-CONFIG_TSL2583=m
# CONFIG_TSL2x7x is not set
#
@@ -5251,6 +5283,13 @@ CONFIG_COMMON_CLK_PALMAS=y
# CONFIG_COMMON_CLK_PWM is not set
# CONFIG_COMMON_CLK_PXA is not set
# CONFIG_COMMON_CLK_PIC32 is not set
+# CONFIG_COMMON_CLK_MT2701 is not set
+# CONFIG_COMMON_CLK_MT2701_MMSYS is not set
+# CONFIG_COMMON_CLK_MT2701_IMGSYS is not set
+# CONFIG_COMMON_CLK_MT2701_VDECSYS is not set
+# CONFIG_COMMON_CLK_MT2701_HIFSYS is not set
+# CONFIG_COMMON_CLK_MT2701_ETHSYS is not set
+# CONFIG_COMMON_CLK_MT2701_BDPSYS is not set
CONFIG_COMMON_CLK_TI_ADPLL=y
CONFIG_HWSPINLOCK=y
@@ -5300,7 +5339,6 @@ CONFIG_ARM_SMMU=y
# Remoteproc drivers
#
CONFIG_REMOTEPROC=y
-# CONFIG_STE_MODEM_RPROC is not set
CONFIG_WKUP_M3_RPROC=y
#
@@ -5371,8 +5409,11 @@ CONFIG_BMA220=m
CONFIG_BMC150_ACCEL=m
CONFIG_BMC150_ACCEL_I2C=m
CONFIG_BMC150_ACCEL_SPI=m
+# CONFIG_DA280 is not set
+# CONFIG_DA311 is not set
CONFIG_DMARD06=m
CONFIG_DMARD09=m
+# CONFIG_DMARD10 is not set
CONFIG_HID_SENSOR_ACCEL_3D=m
CONFIG_IIO_ST_ACCEL_3AXIS=m
CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
@@ -5392,6 +5433,7 @@ CONFIG_MMA9551=m
CONFIG_MMA9553=m
CONFIG_MXC4005=m
CONFIG_MXC6255=m
+CONFIG_SCA3000=m
CONFIG_STK8312=m
CONFIG_STK8BA50=m
@@ -5403,6 +5445,7 @@ CONFIG_AD7266=m
CONFIG_AD7291=m
CONFIG_AD7298=m
CONFIG_AD7476=m
+# CONFIG_AD7766 is not set
CONFIG_AD7791=m
CONFIG_AD7793=m
CONFIG_AD7887=m
@@ -5410,6 +5453,7 @@ CONFIG_AD7923=m
CONFIG_AD799X=m
CONFIG_AXP288_ADC=m
CONFIG_CC10001_ADC=m
+# CONFIG_ENVELOPE_DETECTOR is not set
CONFIG_HI8435=m
CONFIG_INA2XX_ADC=m
CONFIG_LTC2485=m
@@ -5443,6 +5487,7 @@ CONFIG_AD8366=m
CONFIG_ATLAS_PH_SENSOR=m
CONFIG_IAQCORE=m
CONFIG_VZ89X=m
+# CONFIG_IIO_CROS_EC_SENSORS_CORE is not set
#
# Hid Sensor IIO Common
@@ -5460,6 +5505,10 @@ CONFIG_IIO_ST_SENSORS_I2C=m
CONFIG_IIO_ST_SENSORS_SPI=m
CONFIG_IIO_ST_SENSORS_CORE=m
+#
+# Counters
+#
+
#
# Digital to analog converters
#
@@ -5481,6 +5530,7 @@ CONFIG_AD5764=m
CONFIG_AD5791=m
CONFIG_AD7303=m
CONFIG_AD8801=m
+# CONFIG_DPOT_DAC is not set
CONFIG_M62332=m
CONFIG_MAX517=m
CONFIG_MAX5821=m
@@ -5540,6 +5590,7 @@ CONFIG_MAX30100=m
CONFIG_AM2315=m
CONFIG_DHT11=m
CONFIG_HDC100X=m
+# CONFIG_HTS221 is not set
CONFIG_HTU21=m
CONFIG_SI7005=m
CONFIG_SI7020=m
@@ -5573,6 +5624,7 @@ CONFIG_CM3232=m
CONFIG_CM3323=m
CONFIG_CM36651=m
CONFIG_GP2AP020A00F=m
+CONFIG_SENSORS_ISL29018=m
CONFIG_ISL29125=m
CONFIG_HID_SENSOR_ALS=m
CONFIG_HID_SENSOR_PROX=m
@@ -5587,6 +5639,7 @@ CONFIG_STK3310=m
CONFIG_TCS3414=m
CONFIG_TCS3472=m
CONFIG_SENSORS_TSL2563=m
+CONFIG_TSL2583=m
CONFIG_TSL4531=m
CONFIG_US5182D=m
CONFIG_VCNL4000=m
@@ -5632,9 +5685,15 @@ CONFIG_MCP4131=m
CONFIG_MCP4531=m
CONFIG_TPL0102=m
+#
+# Digital potentiostats
+#
+# CONFIG_LMP91000 is not set
+
#
# Pressure sensors
#
+# CONFIG_ABP060MG is not set
CONFIG_BMP280=m
CONFIG_BMP280_I2C=m
CONFIG_BMP280_SPI=m
@@ -5743,6 +5802,10 @@ CONFIG_ARM_PSCI_FW=y
# CONFIG_FW_CFG_SYSFS is not set
CONFIG_HAVE_ARM_SMCCC=y
+#
+# Tegra firmware driver
+#
+
#
# File systems
#
@@ -5824,6 +5887,7 @@ CONFIG_AUTOFS4_FS=y
CONFIG_FUSE_FS=y
CONFIG_CUSE=m
CONFIG_OVERLAY_FS=y
+# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
#
# Caches
@@ -5909,7 +5973,7 @@ CONFIG_UBIFS_FS_ADVANCED_COMPR=y
CONFIG_UBIFS_FS_LZO=y
CONFIG_UBIFS_FS_ZLIB=y
# CONFIG_UBIFS_ATIME_SUPPORT is not set
-# CONFIG_LOGFS is not set
+# CONFIG_UBIFS_FS_ENCRYPTION is not set
# CONFIG_CRAMFS is not set
CONFIG_SQUASHFS=m
CONFIG_SQUASHFS_FILE_CACHE=y
@@ -6083,6 +6147,7 @@ CONFIG_DLM_DEBUG=y
# printk and dmesg options
#
CONFIG_PRINTK_TIME=y
+CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
CONFIG_BOOT_PRINTK_DELAY=y
CONFIG_DYNAMIC_DEBUG=y
@@ -6254,6 +6319,7 @@ CONFIG_TEST_FIRMWARE=m
# CONFIG_TEST_UDELAY is not set
# CONFIG_MEMTEST is not set
CONFIG_TEST_STATIC_KEYS=m
+# CONFIG_BUG_ON_DATA_CORRUPTION is not set
# CONFIG_SAMPLES is not set
CONFIG_HAVE_ARCH_KGDB=y
CONFIG_KGDB=y
@@ -6352,6 +6418,7 @@ CONFIG_CRYPTO_RNG_DEFAULT=y
CONFIG_CRYPTO_AKCIPHER2=y
CONFIG_CRYPTO_AKCIPHER=y
CONFIG_CRYPTO_KPP2=y
+CONFIG_CRYPTO_ACOMP2=y
CONFIG_CRYPTO_RSA=y
# CONFIG_CRYPTO_DH is not set
# CONFIG_CRYPTO_ECDH is not set
@@ -6367,7 +6434,7 @@ CONFIG_CRYPTO_CRYPTD=m
# CONFIG_CRYPTO_MCRYPTD is not set
CONFIG_CRYPTO_AUTHENC=m
CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_ABLK_HELPER=m
+CONFIG_CRYPTO_SIMD=m
CONFIG_CRYPTO_ENGINE=m
#
@@ -6470,9 +6537,11 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_CRYPTO_HASH_INFO=y
CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC is not set
CONFIG_CRYPTO_DEV_OMAP_SHAM=m
CONFIG_CRYPTO_DEV_OMAP_AES=m
CONFIG_CRYPTO_DEV_OMAP_DES=m
+CONFIG_CRYPTO_DEV_VIRTIO=m
CONFIG_ASYMMETRIC_KEY_TYPE=y
CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
CONFIG_X509_CERTIFICATE_PARSER=y
@@ -6493,6 +6562,8 @@ CONFIG_CRYPTO_AES_ARM=m
CONFIG_CRYPTO_AES_ARM_BS=m
# CONFIG_CRYPTO_AES_ARM_CE is not set
# CONFIG_CRYPTO_GHASH_ARM_CE is not set
+# CONFIG_CRYPTO_CRCT10DIF_ARM_CE is not set
+# CONFIG_CRYPTO_CRC32_ARM_CE is not set
CONFIG_BINARY_PRINTF=y
#
diff --git a/patches/drivers/pm_opp/0001-PM-OPP-Fix-incorrect-cpu-supply-property-in-binding.patch b/patches/drivers/pm_opp/0001-PM-OPP-Fix-incorrect-cpu-supply-property-in-binding.patch
deleted file mode 100644
index 3194af2357d34ea1b8191f792905baa0d75f1e56..0000000000000000000000000000000000000000
--- a/patches/drivers/pm_opp/0001-PM-OPP-Fix-incorrect-cpu-supply-property-in-binding.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From cfa7e2dcfac1ff1a785bf6f667a0553a4c931452 Mon Sep 17 00:00:00 2001
-From: Viresh Kumar <viresh.kumar@linaro.org>
-Date: Tue, 29 Nov 2016 12:06:48 +0530
-Subject: [PATCH 01/10] PM / OPP: Fix incorrect cpu-supply property in binding
-
-The regulator bindings allow the "<name>-supply" property to define a
-single parent supply and not a list of parents.
-
-Fix the wrong example code present in OPP bindings.
-
-While at it also change the compatible string as Rob pointed out earlier
-that none of A7 implementation have multiple supplies for the CPU core.
-
-Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
-Acked-by: Rob Herring <robh@kernel.org>
-Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
----
- Documentation/devicetree/bindings/opp/opp.txt | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/Documentation/devicetree/bindings/opp/opp.txt b/Documentation/devicetree/bindings/opp/opp.txt
-index ee91cbd..f0239f6 100644
---- a/Documentation/devicetree/bindings/opp/opp.txt
-+++ b/Documentation/devicetree/bindings/opp/opp.txt
-@@ -386,10 +386,12 @@ Example 4: Handling multiple regulators
- / {
- cpus {
- cpu@0 {
-- compatible = "arm,cortex-a7";
-+ compatible = "vendor,cpu-type";
- ...
-
-- cpu-supply = <&cpu_supply0>, <&cpu_supply1>, <&cpu_supply2>;
-+ vcc0-supply = <&cpu_supply0>;
-+ vcc1-supply = <&cpu_supply1>;
-+ vcc2-supply = <&cpu_supply2>;
- operating-points-v2 = <&cpu0_opp_table>;
- };
- };
---
-2.10.2
-
diff --git a/patches/drivers/pm_opp/0002-PM-OPP-Reword-binding-supporting-multiple-regulators.patch b/patches/drivers/pm_opp/0002-PM-OPP-Reword-binding-supporting-multiple-regulators.patch
deleted file mode 100644
index 0f074807b912b760163ab3f89c27bac6915cafba..0000000000000000000000000000000000000000
--- a/patches/drivers/pm_opp/0002-PM-OPP-Reword-binding-supporting-multiple-regulators.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From bf6abad728eb4b0d749aeb0f461e3e6090356abf Mon Sep 17 00:00:00 2001
-From: Viresh Kumar <viresh.kumar@linaro.org>
-Date: Tue, 29 Nov 2016 12:06:49 +0530
-Subject: [PATCH 02/10] PM / OPP: Reword binding supporting multiple regulators
- per device
-
-On certain platforms (like TI), DVFS for a single device (CPU) requires
-configuring multiple power supplies.
-
-The OPP bindings already contains binding and example to explain this
-case, but it isn't sufficient.
-
-- There is no way for the code parsing these bindings to know which
- voltage values belong to which power supply.
-
-- It is not possible to know the order in which the supplies need to be
- configured while switching OPPs.
-
-This patch clarifies on those details by mentioning that such
-information is left for the implementation specific bindings to explain.
-They may want to hardcode such details or implement their own properties
-to get such information. All implementations using multiple regulators
-for their devices must provide a binding document explaining their
-implementation.
-
-Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
-Acked-by: Rob Herring <robh@kernel.org>
-Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
----
- Documentation/devicetree/bindings/opp/opp.txt | 21 +++++++++++++++------
- 1 file changed, 15 insertions(+), 6 deletions(-)
-
-diff --git a/Documentation/devicetree/bindings/opp/opp.txt b/Documentation/devicetree/bindings/opp/opp.txt
-index f0239f6..9f5ca44 100644
---- a/Documentation/devicetree/bindings/opp/opp.txt
-+++ b/Documentation/devicetree/bindings/opp/opp.txt
-@@ -86,8 +86,14 @@ Optional properties:
- Single entry is for target voltage and three entries are for <target min max>
- voltages.
-
-- Entries for multiple regulators must be present in the same order as
-- regulators are specified in device's DT node.
-+ Entries for multiple regulators shall be provided in the same field separated
-+ by angular brackets <>. The OPP binding doesn't provide any provisions to
-+ relate the values to their power supplies or the order in which the supplies
-+ need to be configured and that is left for the implementation specific
-+ binding.
-+
-+ Entries for all regulators shall be of the same size, i.e. either all use a
-+ single value or triplets.
-
- - opp-microvolt-<name>: Named opp-microvolt property. This is exactly similar to
- the above opp-microvolt property, but allows multiple voltage ranges to be
-@@ -104,10 +110,13 @@ Optional properties:
-
- Should only be set if opp-microvolt is set for the OPP.
-
-- Entries for multiple regulators must be present in the same order as
-- regulators are specified in device's DT node. If this property isn't required
-- for few regulators, then this should be marked as zero for them. If it isn't
-- required for any regulator, then this property need not be present.
-+ Entries for multiple regulators shall be provided in the same field separated
-+ by angular brackets <>. If current values aren't required for a regulator,
-+ then it shall be filled with 0. If current values aren't required for any of
-+ the regulators, then this field is not required. The OPP binding doesn't
-+ provide any provisions to relate the values to their power supplies or the
-+ order in which the supplies need to be configured and that is left for the
-+ implementation specific binding.
-
- - opp-microamp-<name>: Named opp-microamp property. Similar to
- opp-microvolt-<name> property, but for microamp instead.
---
-2.10.2
-
diff --git a/patches/drivers/pm_opp/0003-PM-OPP-Don-t-use-OPP-structure-outside-of-rcu-protec.patch b/patches/drivers/pm_opp/0003-PM-OPP-Don-t-use-OPP-structure-outside-of-rcu-protec.patch
deleted file mode 100644
index cc1de26cb2f2f53a40d98a683d878fb289882866..0000000000000000000000000000000000000000
--- a/patches/drivers/pm_opp/0003-PM-OPP-Don-t-use-OPP-structure-outside-of-rcu-protec.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From e80c8ca60e39cdac162edb13e739eca38c2fff2c Mon Sep 17 00:00:00 2001
-From: Viresh Kumar <viresh.kumar@linaro.org>
-Date: Tue, 29 Nov 2016 12:06:50 +0530
-Subject: [PATCH 03/10] PM / OPP: Don't use OPP structure outside of rcu
- protected section
-
-The OPP structure must not be used out of the rcu protected section.
-Cache the values to be used in separate variables instead.
-
-Cc: # v4.6+ <stable@vger.kernel.org>
-Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
-Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
-Tested-by: Dave Gerlach <d-gerlach@ti.com>
----
- drivers/base/power/opp/core.c | 16 +++++++++++++---
- 1 file changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/base/power/opp/core.c b/drivers/base/power/opp/core.c
-index 4c7c6da..056527a 100644
---- a/drivers/base/power/opp/core.c
-+++ b/drivers/base/power/opp/core.c
-@@ -584,6 +584,7 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
- struct clk *clk;
- unsigned long freq, old_freq;
- unsigned long u_volt, u_volt_min, u_volt_max;
-+ unsigned long old_u_volt, old_u_volt_min, old_u_volt_max;
- int ret;
-
- if (unlikely(!target_freq)) {
-@@ -633,6 +634,14 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
- return ret;
- }
-
-+ if (IS_ERR(old_opp)) {
-+ old_u_volt = 0;
-+ } else {
-+ old_u_volt = old_opp->u_volt;
-+ old_u_volt_min = old_opp->u_volt_min;
-+ old_u_volt_max = old_opp->u_volt_max;
-+ }
-+
- u_volt = opp->u_volt;
- u_volt_min = opp->u_volt_min;
- u_volt_max = opp->u_volt_max;
-@@ -677,9 +686,10 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
- __func__, old_freq);
- restore_voltage:
- /* This shouldn't harm even if the voltages weren't updated earlier */
-- if (!IS_ERR(old_opp))
-- _set_opp_voltage(dev, reg, old_opp->u_volt,
-- old_opp->u_volt_min, old_opp->u_volt_max);
-+ if (old_u_volt) {
-+ _set_opp_voltage(dev, reg, old_u_volt, old_u_volt_min,
-+ old_u_volt_max);
-+ }
-
- return ret;
- }
---
-2.10.2
-
diff --git a/patches/drivers/pm_opp/0004-PM-OPP-Manage-supply-s-voltage-current-in-a-separate.patch b/patches/drivers/pm_opp/0004-PM-OPP-Manage-supply-s-voltage-current-in-a-separate.patch
deleted file mode 100644
index 1272041dc99b9b8cff565bd9d8742cd5c1954154..0000000000000000000000000000000000000000
--- a/patches/drivers/pm_opp/0004-PM-OPP-Manage-supply-s-voltage-current-in-a-separate.patch
+++ /dev/null
@@ -1,244 +0,0 @@
-From 6e9c4404b0545adea2ac88249dcf60297b4ac269 Mon Sep 17 00:00:00 2001
-From: Viresh Kumar <viresh.kumar@linaro.org>
-Date: Tue, 29 Nov 2016 12:06:51 +0530
-Subject: [PATCH 04/10] PM / OPP: Manage supply's voltage/current in a separate
- structure
-
-This is a preparatory step for multiple regulator per device support.
-Move the voltage/current variables to a new structure.
-
-Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
-Tested-by: Dave Gerlach <d-gerlach@ti.com>
-Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
----
- drivers/base/power/opp/core.c | 44 +++++++++++++++++++++-------------------
- drivers/base/power/opp/debugfs.c | 8 ++++----
- drivers/base/power/opp/of.c | 18 ++++++++--------
- drivers/base/power/opp/opp.h | 11 +++-------
- include/linux/pm_opp.h | 16 +++++++++++++++
- 5 files changed, 55 insertions(+), 42 deletions(-)
-
-diff --git a/drivers/base/power/opp/core.c b/drivers/base/power/opp/core.c
-index 056527a..8d60061 100644
---- a/drivers/base/power/opp/core.c
-+++ b/drivers/base/power/opp/core.c
-@@ -112,7 +112,7 @@ unsigned long dev_pm_opp_get_voltage(struct dev_pm_opp *opp)
- if (IS_ERR_OR_NULL(tmp_opp))
- pr_err("%s: Invalid parameters\n", __func__);
- else
-- v = tmp_opp->u_volt;
-+ v = tmp_opp->supply.u_volt;
-
- return v;
- }
-@@ -246,10 +246,10 @@ unsigned long dev_pm_opp_get_max_volt_latency(struct device *dev)
- if (!opp->available)
- continue;
-
-- if (opp->u_volt_min < min_uV)
-- min_uV = opp->u_volt_min;
-- if (opp->u_volt_max > max_uV)
-- max_uV = opp->u_volt_max;
-+ if (opp->supply.u_volt_min < min_uV)
-+ min_uV = opp->supply.u_volt_min;
-+ if (opp->supply.u_volt_max > max_uV)
-+ max_uV = opp->supply.u_volt_max;
- }
-
- rcu_read_unlock();
-@@ -637,14 +637,14 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
- if (IS_ERR(old_opp)) {
- old_u_volt = 0;
- } else {
-- old_u_volt = old_opp->u_volt;
-- old_u_volt_min = old_opp->u_volt_min;
-- old_u_volt_max = old_opp->u_volt_max;
-+ old_u_volt = old_opp->supply.u_volt;
-+ old_u_volt_min = old_opp->supply.u_volt_min;
-+ old_u_volt_max = old_opp->supply.u_volt_max;
- }
-
-- u_volt = opp->u_volt;
-- u_volt_min = opp->u_volt_min;
-- u_volt_max = opp->u_volt_max;
-+ u_volt = opp->supply.u_volt;
-+ u_volt_min = opp->supply.u_volt_min;
-+ u_volt_max = opp->supply.u_volt_max;
-
- reg = opp_table->regulator;
-
-@@ -957,10 +957,11 @@ static bool _opp_supported_by_regulators(struct dev_pm_opp *opp,
- struct regulator *reg = opp_table->regulator;
-
- if (!IS_ERR(reg) &&
-- !regulator_is_supported_voltage(reg, opp->u_volt_min,
-- opp->u_volt_max)) {
-+ !regulator_is_supported_voltage(reg, opp->supply.u_volt_min,
-+ opp->supply.u_volt_max)) {
- pr_warn("%s: OPP minuV: %lu maxuV: %lu, not supported by regulator\n",
-- __func__, opp->u_volt_min, opp->u_volt_max);
-+ __func__, opp->supply.u_volt_min,
-+ opp->supply.u_volt_max);
- return false;
- }
-
-@@ -993,11 +994,12 @@ int _opp_add(struct device *dev, struct dev_pm_opp *new_opp,
-
- /* Duplicate OPPs */
- dev_warn(dev, "%s: duplicate OPPs detected. Existing: freq: %lu, volt: %lu, enabled: %d. New: freq: %lu, volt: %lu, enabled: %d\n",
-- __func__, opp->rate, opp->u_volt, opp->available,
-- new_opp->rate, new_opp->u_volt, new_opp->available);
-+ __func__, opp->rate, opp->supply.u_volt,
-+ opp->available, new_opp->rate, new_opp->supply.u_volt,
-+ new_opp->available);
-
-- return opp->available && new_opp->u_volt == opp->u_volt ?
-- 0 : -EEXIST;
-+ return opp->available &&
-+ new_opp->supply.u_volt == opp->supply.u_volt ? 0 : -EEXIST;
- }
-
- new_opp->opp_table = opp_table;
-@@ -1064,9 +1066,9 @@ int _opp_add_v1(struct device *dev, unsigned long freq, long u_volt,
- /* populate the opp table */
- new_opp->rate = freq;
- tol = u_volt * opp_table->voltage_tolerance_v1 / 100;
-- new_opp->u_volt = u_volt;
-- new_opp->u_volt_min = u_volt - tol;
-- new_opp->u_volt_max = u_volt + tol;
-+ new_opp->supply.u_volt = u_volt;
-+ new_opp->supply.u_volt_min = u_volt - tol;
-+ new_opp->supply.u_volt_max = u_volt + tol;
- new_opp->available = true;
- new_opp->dynamic = dynamic;
-
-diff --git a/drivers/base/power/opp/debugfs.c b/drivers/base/power/opp/debugfs.c
-index ef1ae6b..c897676 100644
---- a/drivers/base/power/opp/debugfs.c
-+++ b/drivers/base/power/opp/debugfs.c
-@@ -63,16 +63,16 @@ int opp_debug_create_one(struct dev_pm_opp *opp, struct opp_table *opp_table)
- if (!debugfs_create_ulong("rate_hz", S_IRUGO, d, &opp->rate))
- return -ENOMEM;
-
-- if (!debugfs_create_ulong("u_volt_target", S_IRUGO, d, &opp->u_volt))
-+ if (!debugfs_create_ulong("u_volt_target", S_IRUGO, d, &opp->supply.u_volt))
- return -ENOMEM;
-
-- if (!debugfs_create_ulong("u_volt_min", S_IRUGO, d, &opp->u_volt_min))
-+ if (!debugfs_create_ulong("u_volt_min", S_IRUGO, d, &opp->supply.u_volt_min))
- return -ENOMEM;
-
-- if (!debugfs_create_ulong("u_volt_max", S_IRUGO, d, &opp->u_volt_max))
-+ if (!debugfs_create_ulong("u_volt_max", S_IRUGO, d, &opp->supply.u_volt_max))
- return -ENOMEM;
-
-- if (!debugfs_create_ulong("u_amp", S_IRUGO, d, &opp->u_amp))
-+ if (!debugfs_create_ulong("u_amp", S_IRUGO, d, &opp->supply.u_amp))
- return -ENOMEM;
-
- if (!debugfs_create_ulong("clock_latency_ns", S_IRUGO, d,
-diff --git a/drivers/base/power/opp/of.c b/drivers/base/power/opp/of.c
-index 5552211..b7fcd0a 100644
---- a/drivers/base/power/opp/of.c
-+++ b/drivers/base/power/opp/of.c
-@@ -148,14 +148,14 @@ static int opp_parse_supplies(struct dev_pm_opp *opp, struct device *dev,
- return -EINVAL;
- }
-
-- opp->u_volt = microvolt[0];
-+ opp->supply.u_volt = microvolt[0];
-
- if (count == 1) {
-- opp->u_volt_min = opp->u_volt;
-- opp->u_volt_max = opp->u_volt;
-+ opp->supply.u_volt_min = opp->supply.u_volt;
-+ opp->supply.u_volt_max = opp->supply.u_volt;
- } else {
-- opp->u_volt_min = microvolt[1];
-- opp->u_volt_max = microvolt[2];
-+ opp->supply.u_volt_min = microvolt[1];
-+ opp->supply.u_volt_max = microvolt[2];
- }
-
- /* Search for "opp-microamp-<name>" */
-@@ -173,7 +173,7 @@ static int opp_parse_supplies(struct dev_pm_opp *opp, struct device *dev,
- }
-
- if (prop && !of_property_read_u32(opp->np, name, &val))
-- opp->u_amp = val;
-+ opp->supply.u_amp = val;
-
- return 0;
- }
-@@ -303,9 +303,9 @@ static int _opp_add_static_v2(struct device *dev, struct device_node *np)
- mutex_unlock(&opp_table_lock);
-
- pr_debug("%s: turbo:%d rate:%lu uv:%lu uvmin:%lu uvmax:%lu latency:%lu\n",
-- __func__, new_opp->turbo, new_opp->rate, new_opp->u_volt,
-- new_opp->u_volt_min, new_opp->u_volt_max,
-- new_opp->clock_latency_ns);
-+ __func__, new_opp->turbo, new_opp->rate,
-+ new_opp->supply.u_volt, new_opp->supply.u_volt_min,
-+ new_opp->supply.u_volt_max, new_opp->clock_latency_ns);
-
- /*
- * Notify the changes in the availability of the operable
-diff --git a/drivers/base/power/opp/opp.h b/drivers/base/power/opp/opp.h
-index fabd5ca..7912131 100644
---- a/drivers/base/power/opp/opp.h
-+++ b/drivers/base/power/opp/opp.h
-@@ -61,10 +61,7 @@ extern struct list_head opp_tables;
- * @turbo: true if turbo (boost) OPP
- * @suspend: true if suspend OPP
- * @rate: Frequency in hertz
-- * @u_volt: Target voltage in microvolts corresponding to this OPP
-- * @u_volt_min: Minimum voltage in microvolts corresponding to this OPP
-- * @u_volt_max: Maximum voltage in microvolts corresponding to this OPP
-- * @u_amp: Maximum current drawn by the device in microamperes
-+ * @supply: Power supply voltage/current values
- * @clock_latency_ns: Latency (in nanoseconds) of switching to this OPP's
- * frequency from any other OPP's frequency.
- * @opp_table: points back to the opp_table struct this opp belongs to
-@@ -83,10 +80,8 @@ struct dev_pm_opp {
- bool suspend;
- unsigned long rate;
-
-- unsigned long u_volt;
-- unsigned long u_volt_min;
-- unsigned long u_volt_max;
-- unsigned long u_amp;
-+ struct dev_pm_opp_supply supply;
-+
- unsigned long clock_latency_ns;
-
- struct opp_table *opp_table;
-diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h
-index bca2615..f69126e 100644
---- a/include/linux/pm_opp.h
-+++ b/include/linux/pm_opp.h
-@@ -24,6 +24,22 @@ enum dev_pm_opp_event {
- OPP_EVENT_ADD, OPP_EVENT_REMOVE, OPP_EVENT_ENABLE, OPP_EVENT_DISABLE,
- };
-
-+/**
-+ * struct dev_pm_opp_supply - Power supply voltage/current values
-+ * @u_volt: Target voltage in microvolts corresponding to this OPP
-+ * @u_volt_min: Minimum voltage in microvolts corresponding to this OPP
-+ * @u_volt_max: Maximum voltage in microvolts corresponding to this OPP
-+ * @u_amp: Maximum current drawn by the device in microamperes
-+ *
-+ * This structure stores the voltage/current values for a single power supply.
-+ */
-+struct dev_pm_opp_supply {
-+ unsigned long u_volt;
-+ unsigned long u_volt_min;
-+ unsigned long u_volt_max;
-+ unsigned long u_amp;
-+};
-+
- #if defined(CONFIG_PM_OPP)
-
- unsigned long dev_pm_opp_get_voltage(struct dev_pm_opp *opp);
---
-2.10.2
-
diff --git a/patches/drivers/pm_opp/0005-PM-OPP-Pass-struct-dev_pm_opp_supply-to-_set_opp_vol.patch b/patches/drivers/pm_opp/0005-PM-OPP-Pass-struct-dev_pm_opp_supply-to-_set_opp_vol.patch
deleted file mode 100644
index 2dffa67dfa3e82019d75fe48aaf1e0b937c8f855..0000000000000000000000000000000000000000
--- a/patches/drivers/pm_opp/0005-PM-OPP-Pass-struct-dev_pm_opp_supply-to-_set_opp_vol.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From 4ee34f511c2ce6c4c89f5db4ee7da932f0d90316 Mon Sep 17 00:00:00 2001
-From: Viresh Kumar <viresh.kumar@linaro.org>
-Date: Tue, 29 Nov 2016 12:06:52 +0530
-Subject: [PATCH 05/10] PM / OPP: Pass struct dev_pm_opp_supply to
- _set_opp_voltage()
-
-Pass the entire supply structure instead of all of its fields.
-
-Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
-Tested-by: Dave Gerlach <d-gerlach@ti.com>
-Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
----
- drivers/base/power/opp/core.c | 44 +++++++++++++++++--------------------------
- 1 file changed, 17 insertions(+), 27 deletions(-)
-
-diff --git a/drivers/base/power/opp/core.c b/drivers/base/power/opp/core.c
-index 8d60061..37fad2e 100644
---- a/drivers/base/power/opp/core.c
-+++ b/drivers/base/power/opp/core.c
-@@ -542,8 +542,7 @@ static struct clk *_get_opp_clk(struct device *dev)
- }
-
- static int _set_opp_voltage(struct device *dev, struct regulator *reg,
-- unsigned long u_volt, unsigned long u_volt_min,
-- unsigned long u_volt_max)
-+ struct dev_pm_opp_supply *supply)
- {
- int ret;
-
-@@ -554,14 +553,15 @@ static int _set_opp_voltage(struct device *dev, struct regulator *reg,
- return 0;
- }
-
-- dev_dbg(dev, "%s: voltages (mV): %lu %lu %lu\n", __func__, u_volt_min,
-- u_volt, u_volt_max);
-+ dev_dbg(dev, "%s: voltages (mV): %lu %lu %lu\n", __func__,
-+ supply->u_volt_min, supply->u_volt, supply->u_volt_max);
-
-- ret = regulator_set_voltage_triplet(reg, u_volt_min, u_volt,
-- u_volt_max);
-+ ret = regulator_set_voltage_triplet(reg, supply->u_volt_min,
-+ supply->u_volt, supply->u_volt_max);
- if (ret)
- dev_err(dev, "%s: failed to set voltage (%lu %lu %lu mV): %d\n",
-- __func__, u_volt_min, u_volt, u_volt_max, ret);
-+ __func__, supply->u_volt_min, supply->u_volt,
-+ supply->u_volt_max, ret);
-
- return ret;
- }
-@@ -583,8 +583,7 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
- struct regulator *reg;
- struct clk *clk;
- unsigned long freq, old_freq;
-- unsigned long u_volt, u_volt_min, u_volt_max;
-- unsigned long old_u_volt, old_u_volt_min, old_u_volt_max;
-+ struct dev_pm_opp_supply old_supply, new_supply;
- int ret;
-
- if (unlikely(!target_freq)) {
-@@ -634,17 +633,12 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
- return ret;
- }
-
-- if (IS_ERR(old_opp)) {
-- old_u_volt = 0;
-- } else {
-- old_u_volt = old_opp->supply.u_volt;
-- old_u_volt_min = old_opp->supply.u_volt_min;
-- old_u_volt_max = old_opp->supply.u_volt_max;
-- }
-+ if (IS_ERR(old_opp))
-+ old_supply.u_volt = 0;
-+ else
-+ memcpy(&old_supply, &old_opp->supply, sizeof(old_supply));
-
-- u_volt = opp->supply.u_volt;
-- u_volt_min = opp->supply.u_volt_min;
-- u_volt_max = opp->supply.u_volt_max;
-+ memcpy(&new_supply, &opp->supply, sizeof(new_supply));
-
- reg = opp_table->regulator;
-
-@@ -652,8 +646,7 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
-
- /* Scaling up? Scale voltage before frequency */
- if (freq > old_freq) {
-- ret = _set_opp_voltage(dev, reg, u_volt, u_volt_min,
-- u_volt_max);
-+ ret = _set_opp_voltage(dev, reg, &new_supply);
- if (ret)
- goto restore_voltage;
- }
-@@ -672,8 +665,7 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
-
- /* Scaling down? Scale voltage after frequency */
- if (freq < old_freq) {
-- ret = _set_opp_voltage(dev, reg, u_volt, u_volt_min,
-- u_volt_max);
-+ ret = _set_opp_voltage(dev, reg, &new_supply);
- if (ret)
- goto restore_freq;
- }
-@@ -686,10 +678,8 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
- __func__, old_freq);
- restore_voltage:
- /* This shouldn't harm even if the voltages weren't updated earlier */
-- if (old_u_volt) {
-- _set_opp_voltage(dev, reg, old_u_volt, old_u_volt_min,
-- old_u_volt_max);
-- }
-+ if (old_supply.u_volt)
-+ _set_opp_voltage(dev, reg, &old_supply);
-
- return ret;
- }
---
-2.10.2
-
diff --git a/patches/drivers/pm_opp/0006-PM-OPP-Add-infrastructure-to-manage-multiple-regulat.patch b/patches/drivers/pm_opp/0006-PM-OPP-Add-infrastructure-to-manage-multiple-regulat.patch
deleted file mode 100644
index 5b8a48bb234d2ba1127a86bcd0c6e85a64a643b4..0000000000000000000000000000000000000000
--- a/patches/drivers/pm_opp/0006-PM-OPP-Add-infrastructure-to-manage-multiple-regulat.patch
+++ /dev/null
@@ -1,805 +0,0 @@
-From c70ebc79a570fa6f6f4702b10d4f80661ab57472 Mon Sep 17 00:00:00 2001
-From: Viresh Kumar <viresh.kumar@linaro.org>
-Date: Tue, 29 Nov 2016 12:06:53 +0530
-Subject: [PATCH 06/10] PM / OPP: Add infrastructure to manage multiple
- regulators
-
-This patch adds infrastructure to manage multiple regulators and updates
-the only user (cpufreq-dt) of dev_pm_opp_set{put}_regulator().
-
-This is preparatory work for adding full support for devices with
-multiple regulators.
-
-Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
-Tested-by: Dave Gerlach <d-gerlach@ti.com>
----
- drivers/base/power/opp/core.c | 246 +++++++++++++++++++++++++++------------
- drivers/base/power/opp/debugfs.c | 52 +++++++--
- drivers/base/power/opp/of.c | 103 +++++++++++-----
- drivers/base/power/opp/opp.h | 10 +-
- drivers/cpufreq/cpufreq-dt.c | 9 +-
- include/linux/pm_opp.h | 8 +-
- 6 files changed, 301 insertions(+), 127 deletions(-)
-
-diff --git a/drivers/base/power/opp/core.c b/drivers/base/power/opp/core.c
-index 37fad2e..89a3fd7 100644
---- a/drivers/base/power/opp/core.c
-+++ b/drivers/base/power/opp/core.c
-@@ -93,6 +93,8 @@ struct opp_table *_find_opp_table(struct device *dev)
- * Return: voltage in micro volt corresponding to the opp, else
- * return 0
- *
-+ * This is useful only for devices with single power supply.
-+ *
- * Locking: This function must be called under rcu_read_lock(). opp is a rcu
- * protected pointer. This means that opp which could have been fetched by
- * opp_find_freq_{exact,ceil,floor} functions is valid as long as we are
-@@ -112,7 +114,7 @@ unsigned long dev_pm_opp_get_voltage(struct dev_pm_opp *opp)
- if (IS_ERR_OR_NULL(tmp_opp))
- pr_err("%s: Invalid parameters\n", __func__);
- else
-- v = tmp_opp->supply.u_volt;
-+ v = tmp_opp->supplies[0].u_volt;
-
- return v;
- }
-@@ -210,6 +212,24 @@ unsigned long dev_pm_opp_get_max_clock_latency(struct device *dev)
- }
- EXPORT_SYMBOL_GPL(dev_pm_opp_get_max_clock_latency);
-
-+static int _get_regulator_count(struct device *dev)
-+{
-+ struct opp_table *opp_table;
-+ int count;
-+
-+ rcu_read_lock();
-+
-+ opp_table = _find_opp_table(dev);
-+ if (!IS_ERR(opp_table))
-+ count = opp_table->regulator_count;
-+ else
-+ count = 0;
-+
-+ rcu_read_unlock();
-+
-+ return count;
-+}
-+
- /**
- * dev_pm_opp_get_max_volt_latency() - Get max voltage latency in nanoseconds
- * @dev: device for which we do this operation
-@@ -222,34 +242,51 @@ unsigned long dev_pm_opp_get_max_volt_latency(struct device *dev)
- {
- struct opp_table *opp_table;
- struct dev_pm_opp *opp;
-- struct regulator *reg;
-+ struct regulator *reg, **regulators;
- unsigned long latency_ns = 0;
-- unsigned long min_uV = ~0, max_uV = 0;
-- int ret;
-+ int ret, i, count;
-+ struct {
-+ unsigned long min;
-+ unsigned long max;
-+ } *uV;
-+
-+ count = _get_regulator_count(dev);
-+
-+ /* Regulator may not be required for the device */
-+ if (!count)
-+ return 0;
-+
-+ regulators = kmalloc_array(count, sizeof(*regulators), GFP_KERNEL);
-+ if (!regulators)
-+ return 0;
-+
-+ uV = kmalloc_array(count, sizeof(*uV), GFP_KERNEL);
-+ if (!uV)
-+ goto free_regulators;
-
- rcu_read_lock();
-
- opp_table = _find_opp_table(dev);
- if (IS_ERR(opp_table)) {
- rcu_read_unlock();
-- return 0;
-+ goto free_uV;
- }
-
-- reg = opp_table->regulator;
-- if (IS_ERR(reg)) {
-- /* Regulator may not be required for device */
-- rcu_read_unlock();
-- return 0;
-- }
-+ memcpy(regulators, opp_table->regulators, count * sizeof(*regulators));
-
-- list_for_each_entry_rcu(opp, &opp_table->opp_list, node) {
-- if (!opp->available)
-- continue;
-+ for (i = 0; i < count; i++) {
-+ uV[i].min = ~0;
-+ uV[i].max = 0;
-
-- if (opp->supply.u_volt_min < min_uV)
-- min_uV = opp->supply.u_volt_min;
-- if (opp->supply.u_volt_max > max_uV)
-- max_uV = opp->supply.u_volt_max;
-+ list_for_each_entry_rcu(opp, &opp_table->opp_list, node) {
-+ if (!opp->available)
-+ continue;
-+
-+ if (opp->supplies[i].u_volt_min < uV[i].min)
-+ uV[i].min = opp->supplies[i].u_volt_min;
-+ if (opp->supplies[i].u_volt_max > uV[i].max)
-+ uV[i].max = opp->supplies[i].u_volt_max;
-+ }
- }
-
- rcu_read_unlock();
-@@ -258,9 +295,16 @@ unsigned long dev_pm_opp_get_max_volt_latency(struct device *dev)
- * The caller needs to ensure that opp_table (and hence the regulator)
- * isn't freed, while we are executing this routine.
- */
-- ret = regulator_set_voltage_time(reg, min_uV, max_uV);
-- if (ret > 0)
-- latency_ns = ret * 1000;
-+ for (i = 0; reg = regulators[i], i < count; i++) {
-+ ret = regulator_set_voltage_time(reg, uV[i].min, uV[i].max);
-+ if (ret > 0)
-+ latency_ns += ret * 1000;
-+ }
-+
-+free_uV:
-+ kfree(uV);
-+free_regulators:
-+ kfree(regulators);
-
- return latency_ns;
- }
-@@ -580,7 +624,7 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
- {
- struct opp_table *opp_table;
- struct dev_pm_opp *old_opp, *opp;
-- struct regulator *reg;
-+ struct regulator *reg = ERR_PTR(-ENXIO);
- struct clk *clk;
- unsigned long freq, old_freq;
- struct dev_pm_opp_supply old_supply, new_supply;
-@@ -633,14 +677,23 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
- return ret;
- }
-
-+ if (opp_table->regulators) {
-+ /* This function only supports single regulator per device */
-+ if (WARN_ON(opp_table->regulator_count > 1)) {
-+ dev_err(dev, "multiple regulators not supported\n");
-+ rcu_read_unlock();
-+ return -EINVAL;
-+ }
-+
-+ reg = opp_table->regulators[0];
-+ }
-+
- if (IS_ERR(old_opp))
- old_supply.u_volt = 0;
- else
-- memcpy(&old_supply, &old_opp->supply, sizeof(old_supply));
--
-- memcpy(&new_supply, &opp->supply, sizeof(new_supply));
-+ memcpy(&old_supply, old_opp->supplies, sizeof(old_supply));
-
-- reg = opp_table->regulator;
-+ memcpy(&new_supply, opp->supplies, sizeof(new_supply));
-
- rcu_read_unlock();
-
-@@ -764,9 +817,6 @@ static struct opp_table *_add_opp_table(struct device *dev)
-
- _of_init_opp_table(opp_table, dev);
-
-- /* Set regulator to a non-NULL error value */
-- opp_table->regulator = ERR_PTR(-ENXIO);
--
- /* Find clk for the device */
- opp_table->clk = clk_get(dev, NULL);
- if (IS_ERR(opp_table->clk)) {
-@@ -815,7 +865,7 @@ static void _remove_opp_table(struct opp_table *opp_table)
- if (opp_table->prop_name)
- return;
-
-- if (!IS_ERR(opp_table->regulator))
-+ if (opp_table->regulators)
- return;
-
- /* Release clk */
-@@ -924,35 +974,50 @@ struct dev_pm_opp *_allocate_opp(struct device *dev,
- struct opp_table **opp_table)
- {
- struct dev_pm_opp *opp;
-+ int count, supply_size;
-+ struct opp_table *table;
-
-- /* allocate new OPP node */
-- opp = kzalloc(sizeof(*opp), GFP_KERNEL);
-- if (!opp)
-+ table = _add_opp_table(dev);
-+ if (!table)
- return NULL;
-
-- INIT_LIST_HEAD(&opp->node);
-+ /* Allocate space for at least one supply */
-+ count = table->regulator_count ? table->regulator_count : 1;
-+ supply_size = sizeof(*opp->supplies) * count;
-
-- *opp_table = _add_opp_table(dev);
-- if (!*opp_table) {
-- kfree(opp);
-+ /* allocate new OPP node and supplies structures */
-+ opp = kzalloc(sizeof(*opp) + supply_size, GFP_KERNEL);
-+ if (!opp) {
-+ kfree(table);
- return NULL;
- }
-
-+ /* Put the supplies at the end of the OPP structure as an empty array */
-+ opp->supplies = (struct dev_pm_opp_supply *)(opp + 1);
-+ INIT_LIST_HEAD(&opp->node);
-+
-+ *opp_table = table;
-+
- return opp;
- }
-
- static bool _opp_supported_by_regulators(struct dev_pm_opp *opp,
- struct opp_table *opp_table)
- {
-- struct regulator *reg = opp_table->regulator;
--
-- if (!IS_ERR(reg) &&
-- !regulator_is_supported_voltage(reg, opp->supply.u_volt_min,
-- opp->supply.u_volt_max)) {
-- pr_warn("%s: OPP minuV: %lu maxuV: %lu, not supported by regulator\n",
-- __func__, opp->supply.u_volt_min,
-- opp->supply.u_volt_max);
-- return false;
-+ struct regulator *reg;
-+ int i;
-+
-+ for (i = 0; i < opp_table->regulator_count; i++) {
-+ reg = opp_table->regulators[i];
-+
-+ if (!regulator_is_supported_voltage(reg,
-+ opp->supplies[i].u_volt_min,
-+ opp->supplies[i].u_volt_max)) {
-+ pr_warn("%s: OPP minuV: %lu maxuV: %lu, not supported by regulator\n",
-+ __func__, opp->supplies[i].u_volt_min,
-+ opp->supplies[i].u_volt_max);
-+ return false;
-+ }
- }
-
- return true;
-@@ -984,12 +1049,13 @@ int _opp_add(struct device *dev, struct dev_pm_opp *new_opp,
-
- /* Duplicate OPPs */
- dev_warn(dev, "%s: duplicate OPPs detected. Existing: freq: %lu, volt: %lu, enabled: %d. New: freq: %lu, volt: %lu, enabled: %d\n",
-- __func__, opp->rate, opp->supply.u_volt,
-- opp->available, new_opp->rate, new_opp->supply.u_volt,
-- new_opp->available);
-+ __func__, opp->rate, opp->supplies[0].u_volt,
-+ opp->available, new_opp->rate,
-+ new_opp->supplies[0].u_volt, new_opp->available);
-
-+ /* Should we compare voltages for all regulators here ? */
- return opp->available &&
-- new_opp->supply.u_volt == opp->supply.u_volt ? 0 : -EEXIST;
-+ new_opp->supplies[0].u_volt == opp->supplies[0].u_volt ? 0 : -EEXIST;
- }
-
- new_opp->opp_table = opp_table;
-@@ -1056,9 +1122,9 @@ int _opp_add_v1(struct device *dev, unsigned long freq, long u_volt,
- /* populate the opp table */
- new_opp->rate = freq;
- tol = u_volt * opp_table->voltage_tolerance_v1 / 100;
-- new_opp->supply.u_volt = u_volt;
-- new_opp->supply.u_volt_min = u_volt - tol;
-- new_opp->supply.u_volt_max = u_volt + tol;
-+ new_opp->supplies[0].u_volt = u_volt;
-+ new_opp->supplies[0].u_volt_min = u_volt - tol;
-+ new_opp->supplies[0].u_volt_max = u_volt + tol;
- new_opp->available = true;
- new_opp->dynamic = dynamic;
-
-@@ -1303,12 +1369,14 @@ void dev_pm_opp_put_prop_name(struct device *dev)
- EXPORT_SYMBOL_GPL(dev_pm_opp_put_prop_name);
-
- /**
-- * dev_pm_opp_set_regulator() - Set regulator name for the device
-+ * dev_pm_opp_set_regulators() - Set regulator names for the device
- * @dev: Device for which regulator name is being set.
-- * @name: Name of the regulator.
-+ * @names: Array of pointers to the names of the regulator.
-+ * @count: Number of regulators.
- *
- * In order to support OPP switching, OPP layer needs to know the name of the
-- * device's regulator, as the core would be required to switch voltages as well.
-+ * device's regulators, as the core would be required to switch voltages as
-+ * well.
- *
- * This must be called before any OPPs are initialized for the device.
- *
-@@ -1318,11 +1386,12 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_put_prop_name);
- * that this function is *NOT* called under RCU protection or in contexts where
- * mutex cannot be locked.
- */
--int dev_pm_opp_set_regulator(struct device *dev, const char *name)
-+int dev_pm_opp_set_regulators(struct device *dev, const char * const names[],
-+ unsigned int count)
- {
- struct opp_table *opp_table;
- struct regulator *reg;
-- int ret;
-+ int ret, i;
-
- mutex_lock(&opp_table_lock);
-
-@@ -1338,26 +1407,44 @@ int dev_pm_opp_set_regulator(struct device *dev, const char *name)
- goto err;
- }
-
-- /* Already have a regulator set */
-- if (WARN_ON(!IS_ERR(opp_table->regulator))) {
-+ /* Already have regulators set */
-+ if (WARN_ON(opp_table->regulators)) {
- ret = -EBUSY;
- goto err;
- }
-- /* Allocate the regulator */
-- reg = regulator_get_optional(dev, name);
-- if (IS_ERR(reg)) {
-- ret = PTR_ERR(reg);
-- if (ret != -EPROBE_DEFER)
-- dev_err(dev, "%s: no regulator (%s) found: %d\n",
-- __func__, name, ret);
-+
-+ opp_table->regulators = kmalloc_array(count,
-+ sizeof(*opp_table->regulators),
-+ GFP_KERNEL);
-+ if (!opp_table->regulators) {
-+ ret = -ENOMEM;
- goto err;
- }
-
-- opp_table->regulator = reg;
-+ for (i = 0; i < count; i++) {
-+ reg = regulator_get_optional(dev, names[i]);
-+ if (IS_ERR(reg)) {
-+ ret = PTR_ERR(reg);
-+ if (ret != -EPROBE_DEFER)
-+ dev_err(dev, "%s: regulator (%s) not found: %d\n",
-+ __func__, names[i], ret);
-+ goto free_regulators;
-+ }
-+
-+ opp_table->regulators[i] = reg;
-+ }
-+
-+ opp_table->regulator_count = count;
-
- mutex_unlock(&opp_table_lock);
- return 0;
-
-+free_regulators:
-+ while (i != 0)
-+ regulator_put(opp_table->regulators[--i]);
-+
-+ kfree(opp_table->regulators);
-+ opp_table->regulators = NULL;
- err:
- _remove_opp_table(opp_table);
- unlock:
-@@ -1365,11 +1452,11 @@ int dev_pm_opp_set_regulator(struct device *dev, const char *name)
-
- return ret;
- }
--EXPORT_SYMBOL_GPL(dev_pm_opp_set_regulator);
-+EXPORT_SYMBOL_GPL(dev_pm_opp_set_regulators);
-
- /**
-- * dev_pm_opp_put_regulator() - Releases resources blocked for regulator
-- * @dev: Device for which regulator was set.
-+ * dev_pm_opp_put_regulators() - Releases resources blocked for regulators
-+ * @dev: Device for which regulators were set.
- *
- * Locking: The internal opp_table and opp structures are RCU protected.
- * Hence this function internally uses RCU updater strategy with mutex locks
-@@ -1377,9 +1464,10 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_set_regulator);
- * that this function is *NOT* called under RCU protection or in contexts where
- * mutex cannot be locked.
- */
--void dev_pm_opp_put_regulator(struct device *dev)
-+void dev_pm_opp_put_regulators(struct device *dev)
- {
- struct opp_table *opp_table;
-+ int i;
-
- mutex_lock(&opp_table_lock);
-
-@@ -1391,16 +1479,20 @@ void dev_pm_opp_put_regulator(struct device *dev)
- goto unlock;
- }
-
-- if (IS_ERR(opp_table->regulator)) {
-- dev_err(dev, "%s: Doesn't have regulator set\n", __func__);
-+ if (!opp_table->regulators) {
-+ dev_err(dev, "%s: Doesn't have regulators set\n", __func__);
- goto unlock;
- }
-
- /* Make sure there are no concurrent readers while updating opp_table */
- WARN_ON(!list_empty(&opp_table->opp_list));
-
-- regulator_put(opp_table->regulator);
-- opp_table->regulator = ERR_PTR(-ENXIO);
-+ for (i = opp_table->regulator_count - 1; i >= 0; i--)
-+ regulator_put(opp_table->regulators[i]);
-+
-+ kfree(opp_table->regulators);
-+ opp_table->regulators = NULL;
-+ opp_table->regulator_count = 0;
-
- /* Try freeing opp_table if this was the last blocking resource */
- _remove_opp_table(opp_table);
-@@ -1408,7 +1500,7 @@ void dev_pm_opp_put_regulator(struct device *dev)
- unlock:
- mutex_unlock(&opp_table_lock);
- }
--EXPORT_SYMBOL_GPL(dev_pm_opp_put_regulator);
-+EXPORT_SYMBOL_GPL(dev_pm_opp_put_regulators);
-
- /**
- * dev_pm_opp_add() - Add an OPP table from a table definitions
-diff --git a/drivers/base/power/opp/debugfs.c b/drivers/base/power/opp/debugfs.c
-index c897676..95f433d 100644
---- a/drivers/base/power/opp/debugfs.c
-+++ b/drivers/base/power/opp/debugfs.c
-@@ -15,6 +15,7 @@
- #include <linux/err.h>
- #include <linux/init.h>
- #include <linux/limits.h>
-+#include <linux/slab.h>
-
- #include "opp.h"
-
-@@ -34,6 +35,46 @@ void opp_debug_remove_one(struct dev_pm_opp *opp)
- debugfs_remove_recursive(opp->dentry);
- }
-
-+static bool opp_debug_create_supplies(struct dev_pm_opp *opp,
-+ struct opp_table *opp_table,
-+ struct dentry *pdentry)
-+{
-+ struct dentry *d;
-+ int i = 0;
-+ char *name;
-+
-+ /* Always create at least supply-0 directory */
-+ do {
-+ name = kasprintf(GFP_KERNEL, "supply-%d", i);
-+
-+ /* Create per-opp directory */
-+ d = debugfs_create_dir(name, pdentry);
-+
-+ kfree(name);
-+
-+ if (!d)
-+ return false;
-+
-+ if (!debugfs_create_ulong("u_volt_target", S_IRUGO, d,
-+ &opp->supplies[i].u_volt))
-+ return false;
-+
-+ if (!debugfs_create_ulong("u_volt_min", S_IRUGO, d,
-+ &opp->supplies[i].u_volt_min))
-+ return false;
-+
-+ if (!debugfs_create_ulong("u_volt_max", S_IRUGO, d,
-+ &opp->supplies[i].u_volt_max))
-+ return false;
-+
-+ if (!debugfs_create_ulong("u_amp", S_IRUGO, d,
-+ &opp->supplies[i].u_amp))
-+ return false;
-+ } while (++i < opp_table->regulator_count);
-+
-+ return true;
-+}
-+
- int opp_debug_create_one(struct dev_pm_opp *opp, struct opp_table *opp_table)
- {
- struct dentry *pdentry = opp_table->dentry;
-@@ -63,16 +104,7 @@ int opp_debug_create_one(struct dev_pm_opp *opp, struct opp_table *opp_table)
- if (!debugfs_create_ulong("rate_hz", S_IRUGO, d, &opp->rate))
- return -ENOMEM;
-
-- if (!debugfs_create_ulong("u_volt_target", S_IRUGO, d, &opp->supply.u_volt))
-- return -ENOMEM;
--
-- if (!debugfs_create_ulong("u_volt_min", S_IRUGO, d, &opp->supply.u_volt_min))
-- return -ENOMEM;
--
-- if (!debugfs_create_ulong("u_volt_max", S_IRUGO, d, &opp->supply.u_volt_max))
-- return -ENOMEM;
--
-- if (!debugfs_create_ulong("u_amp", S_IRUGO, d, &opp->supply.u_amp))
-+ if (!opp_debug_create_supplies(opp, opp_table, d))
- return -ENOMEM;
-
- if (!debugfs_create_ulong("clock_latency_ns", S_IRUGO, d,
-diff --git a/drivers/base/power/opp/of.c b/drivers/base/power/opp/of.c
-index b7fcd0a..477beda 100644
---- a/drivers/base/power/opp/of.c
-+++ b/drivers/base/power/opp/of.c
-@@ -17,6 +17,7 @@
- #include <linux/errno.h>
- #include <linux/device.h>
- #include <linux/of.h>
-+#include <linux/slab.h>
- #include <linux/export.h>
-
- #include "opp.h"
-@@ -101,16 +102,16 @@ static bool _opp_is_supported(struct device *dev, struct opp_table *opp_table,
- return true;
- }
-
--/* TODO: Support multiple regulators */
- static int opp_parse_supplies(struct dev_pm_opp *opp, struct device *dev,
- struct opp_table *opp_table)
- {
-- u32 microvolt[3] = {0};
-- u32 val;
-- int count, ret;
-+ u32 *microvolt, *microamp = NULL;
-+ int supplies, vcount, icount, ret, i, j;
- struct property *prop = NULL;
- char name[NAME_MAX];
-
-+ supplies = opp_table->regulator_count ? opp_table->regulator_count : 1;
-+
- /* Search for "opp-microvolt-<name>" */
- if (opp_table->prop_name) {
- snprintf(name, sizeof(name), "opp-microvolt-%s",
-@@ -128,34 +129,29 @@ static int opp_parse_supplies(struct dev_pm_opp *opp, struct device *dev,
- return 0;
- }
-
-- count = of_property_count_u32_elems(opp->np, name);
-- if (count < 0) {
-+ vcount = of_property_count_u32_elems(opp->np, name);
-+ if (vcount < 0) {
- dev_err(dev, "%s: Invalid %s property (%d)\n",
-- __func__, name, count);
-- return count;
-+ __func__, name, vcount);
-+ return vcount;
- }
-
-- /* There can be one or three elements here */
-- if (count != 1 && count != 3) {
-- dev_err(dev, "%s: Invalid number of elements in %s property (%d)\n",
-- __func__, name, count);
-+ /* There can be one or three elements per supply */
-+ if (vcount != supplies && vcount != supplies * 3) {
-+ dev_err(dev, "%s: Invalid number of elements in %s property (%d) with supplies (%d)\n",
-+ __func__, name, vcount, supplies);
- return -EINVAL;
- }
-
-- ret = of_property_read_u32_array(opp->np, name, microvolt, count);
-+ microvolt = kmalloc_array(vcount, sizeof(*microvolt), GFP_KERNEL);
-+ if (!microvolt)
-+ return -ENOMEM;
-+
-+ ret = of_property_read_u32_array(opp->np, name, microvolt, vcount);
- if (ret) {
- dev_err(dev, "%s: error parsing %s: %d\n", __func__, name, ret);
-- return -EINVAL;
-- }
--
-- opp->supply.u_volt = microvolt[0];
--
-- if (count == 1) {
-- opp->supply.u_volt_min = opp->supply.u_volt;
-- opp->supply.u_volt_max = opp->supply.u_volt;
-- } else {
-- opp->supply.u_volt_min = microvolt[1];
-- opp->supply.u_volt_max = microvolt[2];
-+ ret = -EINVAL;
-+ goto free_microvolt;
- }
-
- /* Search for "opp-microamp-<name>" */
-@@ -172,10 +168,59 @@ static int opp_parse_supplies(struct dev_pm_opp *opp, struct device *dev,
- prop = of_find_property(opp->np, name, NULL);
- }
-
-- if (prop && !of_property_read_u32(opp->np, name, &val))
-- opp->supply.u_amp = val;
-+ if (prop) {
-+ icount = of_property_count_u32_elems(opp->np, name);
-+ if (icount < 0) {
-+ dev_err(dev, "%s: Invalid %s property (%d)\n", __func__,
-+ name, icount);
-+ ret = icount;
-+ goto free_microvolt;
-+ }
-
-- return 0;
-+ if (icount != supplies) {
-+ dev_err(dev, "%s: Invalid number of elements in %s property (%d) with supplies (%d)\n",
-+ __func__, name, icount, supplies);
-+ ret = -EINVAL;
-+ goto free_microvolt;
-+ }
-+
-+ microamp = kmalloc_array(icount, sizeof(*microamp), GFP_KERNEL);
-+ if (!microamp) {
-+ ret = -EINVAL;
-+ goto free_microvolt;
-+ }
-+
-+ ret = of_property_read_u32_array(opp->np, name, microamp,
-+ icount);
-+ if (ret) {
-+ dev_err(dev, "%s: error parsing %s: %d\n", __func__,
-+ name, ret);
-+ ret = -EINVAL;
-+ goto free_microamp;
-+ }
-+ }
-+
-+ for (i = 0, j = 0; i < supplies; i++) {
-+ opp->supplies[i].u_volt = microvolt[j++];
-+
-+ if (vcount == supplies) {
-+ opp->supplies[i].u_volt_min = opp->supplies[i].u_volt;
-+ opp->supplies[i].u_volt_max = opp->supplies[i].u_volt;
-+ } else {
-+ opp->supplies[i].u_volt_min = microvolt[j++];
-+ opp->supplies[i].u_volt_max = microvolt[j++];
-+ }
-+
-+ if (microamp)
-+ opp->supplies[i].u_amp = microamp[i];
-+ }
-+
-+free_microamp:
-+ kfree(microamp);
-+free_microvolt:
-+ kfree(microvolt);
-+
-+ return ret;
- }
-
- /**
-@@ -304,8 +349,8 @@ static int _opp_add_static_v2(struct device *dev, struct device_node *np)
-
- pr_debug("%s: turbo:%d rate:%lu uv:%lu uvmin:%lu uvmax:%lu latency:%lu\n",
- __func__, new_opp->turbo, new_opp->rate,
-- new_opp->supply.u_volt, new_opp->supply.u_volt_min,
-- new_opp->supply.u_volt_max, new_opp->clock_latency_ns);
-+ new_opp->supplies[0].u_volt, new_opp->supplies[0].u_volt_min,
-+ new_opp->supplies[0].u_volt_max, new_opp->clock_latency_ns);
-
- /*
- * Notify the changes in the availability of the operable
-diff --git a/drivers/base/power/opp/opp.h b/drivers/base/power/opp/opp.h
-index 7912131..d5f09ee 100644
---- a/drivers/base/power/opp/opp.h
-+++ b/drivers/base/power/opp/opp.h
-@@ -61,7 +61,7 @@ extern struct list_head opp_tables;
- * @turbo: true if turbo (boost) OPP
- * @suspend: true if suspend OPP
- * @rate: Frequency in hertz
-- * @supply: Power supply voltage/current values
-+ * @supplies: Power supplies voltage/current values
- * @clock_latency_ns: Latency (in nanoseconds) of switching to this OPP's
- * frequency from any other OPP's frequency.
- * @opp_table: points back to the opp_table struct this opp belongs to
-@@ -80,7 +80,7 @@ struct dev_pm_opp {
- bool suspend;
- unsigned long rate;
-
-- struct dev_pm_opp_supply supply;
-+ struct dev_pm_opp_supply *supplies;
-
- unsigned long clock_latency_ns;
-
-@@ -139,7 +139,8 @@ enum opp_table_access {
- * @supported_hw_count: Number of elements in supported_hw array.
- * @prop_name: A name to postfix to many DT properties, while parsing them.
- * @clk: Device's clock handle
-- * @regulator: Supply regulator
-+ * @regulators: Supply regulators
-+ * @regulator_count: Number of power supply regulators
- * @dentry: debugfs dentry pointer of the real device directory (not links).
- * @dentry_name: Name of the real dentry.
- *
-@@ -174,7 +175,8 @@ struct opp_table {
- unsigned int supported_hw_count;
- const char *prop_name;
- struct clk *clk;
-- struct regulator *regulator;
-+ struct regulator **regulators;
-+ unsigned int regulator_count;
-
- #ifdef CONFIG_DEBUG_FS
- struct dentry *dentry;
-diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c
-index 5c07ae0..15cb261 100644
---- a/drivers/cpufreq/cpufreq-dt.c
-+++ b/drivers/cpufreq/cpufreq-dt.c
-@@ -186,7 +186,10 @@ static int cpufreq_init(struct cpufreq_policy *policy)
- */
- name = find_supply_name(cpu_dev);
- if (name) {
-- ret = dev_pm_opp_set_regulator(cpu_dev, name);
-+ const char *names[] = {name};
-+
-+ ret = dev_pm_opp_set_regulators(cpu_dev, names,
-+ ARRAY_SIZE(names));
- if (ret) {
- dev_err(cpu_dev, "Failed to set regulator for cpu%d: %d\n",
- policy->cpu, ret);
-@@ -285,7 +288,7 @@ static int cpufreq_init(struct cpufreq_policy *policy)
- out_free_opp:
- dev_pm_opp_of_cpumask_remove_table(policy->cpus);
- if (name)
-- dev_pm_opp_put_regulator(cpu_dev);
-+ dev_pm_opp_put_regulators(cpu_dev);
- out_put_clk:
- clk_put(cpu_clk);
-
-@@ -300,7 +303,7 @@ static int cpufreq_exit(struct cpufreq_policy *policy)
- dev_pm_opp_free_cpufreq_table(priv->cpu_dev, &policy->freq_table);
- dev_pm_opp_of_cpumask_remove_table(policy->related_cpus);
- if (priv->reg_name)
-- dev_pm_opp_put_regulator(priv->cpu_dev);
-+ dev_pm_opp_put_regulators(priv->cpu_dev);
-
- clk_put(policy->clk);
- kfree(priv);
-diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h
-index f69126e..27eea9b 100644
---- a/include/linux/pm_opp.h
-+++ b/include/linux/pm_opp.h
-@@ -78,8 +78,8 @@ int dev_pm_opp_set_supported_hw(struct device *dev, const u32 *versions,
- void dev_pm_opp_put_supported_hw(struct device *dev);
- int dev_pm_opp_set_prop_name(struct device *dev, const char *name);
- void dev_pm_opp_put_prop_name(struct device *dev);
--int dev_pm_opp_set_regulator(struct device *dev, const char *name);
--void dev_pm_opp_put_regulator(struct device *dev);
-+int dev_pm_opp_set_regulators(struct device *dev, const char * const names[], unsigned int count);
-+void dev_pm_opp_put_regulators(struct device *dev);
- int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq);
- int dev_pm_opp_set_sharing_cpus(struct device *cpu_dev, const struct cpumask *cpumask);
- int dev_pm_opp_get_sharing_cpus(struct device *cpu_dev, struct cpumask *cpumask);
-@@ -186,12 +186,12 @@ static inline int dev_pm_opp_set_prop_name(struct device *dev, const char *name)
-
- static inline void dev_pm_opp_put_prop_name(struct device *dev) {}
-
--static inline int dev_pm_opp_set_regulator(struct device *dev, const char *name)
-+static inline int dev_pm_opp_set_regulators(struct device *dev, const char *names[], unsigned int count)
- {
- return -ENOTSUPP;
- }
-
--static inline void dev_pm_opp_put_regulator(struct device *dev) {}
-+static inline void dev_pm_opp_put_regulators(struct device *dev) {}
-
- static inline int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
- {
---
-2.10.2
-
diff --git a/patches/drivers/pm_opp/0007-PM-OPP-Separate-out-_generic_set_opp.patch b/patches/drivers/pm_opp/0007-PM-OPP-Separate-out-_generic_set_opp.patch
deleted file mode 100644
index f2a17940e0b23a842a6f6b506fd5275d94579464..0000000000000000000000000000000000000000
--- a/patches/drivers/pm_opp/0007-PM-OPP-Separate-out-_generic_set_opp.patch
+++ /dev/null
@@ -1,340 +0,0 @@
-From 9d2e8fddd2ba4208de0cc0995cfbdc3fb86be055 Mon Sep 17 00:00:00 2001
-From: Viresh Kumar <viresh.kumar@linaro.org>
-Date: Tue, 29 Nov 2016 12:06:54 +0530
-Subject: [PATCH 07/10] PM / OPP: Separate out _generic_set_opp()
-
-Later patches would add support for custom set_opp() callbacks. This
-patch separates out the code for _generic_set_opp() handler in order to
-prepare for that.
-
-Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
-Tested-by: Dave Gerlach <d-gerlach@ti.com>
-Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
----
- drivers/base/power/opp/core.c | 181 +++++++++++++++++++++++++++++-------------
- drivers/base/power/opp/opp.h | 3 +
- include/linux/pm_opp.h | 35 ++++++++
- 3 files changed, 166 insertions(+), 53 deletions(-)
-
-diff --git a/drivers/base/power/opp/core.c b/drivers/base/power/opp/core.c
-index 89a3fd7..3a0b9d9 100644
---- a/drivers/base/power/opp/core.c
-+++ b/drivers/base/power/opp/core.c
-@@ -610,6 +610,69 @@ static int _set_opp_voltage(struct device *dev, struct regulator *reg,
- return ret;
- }
-
-+static inline int
-+_generic_set_opp_clk_only(struct device *dev, struct clk *clk,
-+ unsigned long old_freq, unsigned long freq)
-+{
-+ int ret;
-+
-+ ret = clk_set_rate(clk, freq);
-+ if (ret) {
-+ dev_err(dev, "%s: failed to set clock rate: %d\n", __func__,
-+ ret);
-+ }
-+
-+ return ret;
-+}
-+
-+static int _generic_set_opp(struct dev_pm_set_opp_data *data)
-+{
-+ struct dev_pm_opp_supply *old_supply = data->old_opp.supplies;
-+ struct dev_pm_opp_supply *new_supply = data->new_opp.supplies;
-+ unsigned long old_freq = data->old_opp.rate, freq = data->new_opp.rate;
-+ struct regulator *reg = data->regulators[0];
-+ struct device *dev= data->dev;
-+ int ret;
-+
-+ /* This function only supports single regulator per device */
-+ if (WARN_ON(data->regulator_count > 1)) {
-+ dev_err(dev, "multiple regulators are not supported\n");
-+ return -EINVAL;
-+ }
-+
-+ /* Scaling up? Scale voltage before frequency */
-+ if (freq > old_freq) {
-+ ret = _set_opp_voltage(dev, reg, new_supply);
-+ if (ret)
-+ goto restore_voltage;
-+ }
-+
-+ /* Change frequency */
-+ ret = _generic_set_opp_clk_only(dev, data->clk, old_freq, freq);
-+ if (ret)
-+ goto restore_voltage;
-+
-+ /* Scaling down? Scale voltage after frequency */
-+ if (freq < old_freq) {
-+ ret = _set_opp_voltage(dev, reg, new_supply);
-+ if (ret)
-+ goto restore_freq;
-+ }
-+
-+ return 0;
-+
-+restore_freq:
-+ if (_generic_set_opp_clk_only(dev, data->clk, freq, old_freq))
-+ dev_err(dev, "%s: failed to restore old-freq (%lu Hz)\n",
-+ __func__, old_freq);
-+restore_voltage:
-+ /* This shouldn't harm even if the voltages weren't updated earlier */
-+ if (old_supply->u_volt)
-+ _set_opp_voltage(dev, reg, old_supply);
-+
-+ return ret;
-+}
-+
- /**
- * dev_pm_opp_set_rate() - Configure new OPP based on frequency
- * @dev: device for which we do this operation
-@@ -623,12 +686,12 @@ static int _set_opp_voltage(struct device *dev, struct regulator *reg,
- int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
- {
- struct opp_table *opp_table;
-+ unsigned long freq, old_freq;
- struct dev_pm_opp *old_opp, *opp;
-- struct regulator *reg = ERR_PTR(-ENXIO);
-+ struct regulator **regulators;
-+ struct dev_pm_set_opp_data *data;
- struct clk *clk;
-- unsigned long freq, old_freq;
-- struct dev_pm_opp_supply old_supply, new_supply;
-- int ret;
-+ int ret, size;
-
- if (unlikely(!target_freq)) {
- dev_err(dev, "%s: Invalid target frequency %lu\n", __func__,
-@@ -677,64 +740,36 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
- return ret;
- }
-
-- if (opp_table->regulators) {
-- /* This function only supports single regulator per device */
-- if (WARN_ON(opp_table->regulator_count > 1)) {
-- dev_err(dev, "multiple regulators not supported\n");
-- rcu_read_unlock();
-- return -EINVAL;
-- }
-+ dev_dbg(dev, "%s: switching OPP: %lu Hz --> %lu Hz\n", __func__,
-+ old_freq, freq);
-
-- reg = opp_table->regulators[0];
-+ regulators = opp_table->regulators;
-+
-+ /* Only frequency scaling */
-+ if (!regulators) {
-+ rcu_read_unlock();
-+ return _generic_set_opp_clk_only(dev, clk, old_freq, freq);
- }
-
-+ data = opp_table->set_opp_data;
-+ data->regulators = regulators;
-+ data->regulator_count = opp_table->regulator_count;
-+ data->clk = clk;
-+ data->dev = dev;
-+
-+ data->old_opp.rate = old_freq;
-+ size = sizeof(*opp->supplies) * opp_table->regulator_count;
- if (IS_ERR(old_opp))
-- old_supply.u_volt = 0;
-+ memset(data->old_opp.supplies, 0, size);
- else
-- memcpy(&old_supply, old_opp->supplies, sizeof(old_supply));
-+ memcpy(data->old_opp.supplies, old_opp->supplies, size);
-
-- memcpy(&new_supply, opp->supplies, sizeof(new_supply));
-+ data->new_opp.rate = freq;
-+ memcpy(data->new_opp.supplies, opp->supplies, size);
-
- rcu_read_unlock();
-
-- /* Scaling up? Scale voltage before frequency */
-- if (freq > old_freq) {
-- ret = _set_opp_voltage(dev, reg, &new_supply);
-- if (ret)
-- goto restore_voltage;
-- }
--
-- /* Change frequency */
--
-- dev_dbg(dev, "%s: switching OPP: %lu Hz --> %lu Hz\n",
-- __func__, old_freq, freq);
--
-- ret = clk_set_rate(clk, freq);
-- if (ret) {
-- dev_err(dev, "%s: failed to set clock rate: %d\n", __func__,
-- ret);
-- goto restore_voltage;
-- }
--
-- /* Scaling down? Scale voltage after frequency */
-- if (freq < old_freq) {
-- ret = _set_opp_voltage(dev, reg, &new_supply);
-- if (ret)
-- goto restore_freq;
-- }
--
-- return 0;
--
--restore_freq:
-- if (clk_set_rate(clk, old_freq))
-- dev_err(dev, "%s: failed to restore old-freq (%lu Hz)\n",
-- __func__, old_freq);
--restore_voltage:
-- /* This shouldn't harm even if the voltages weren't updated earlier */
-- if (old_supply.u_volt)
-- _set_opp_voltage(dev, reg, &old_supply);
--
-- return ret;
-+ return _generic_set_opp(data);
- }
- EXPORT_SYMBOL_GPL(dev_pm_opp_set_rate);
-
-@@ -1368,6 +1403,38 @@ void dev_pm_opp_put_prop_name(struct device *dev)
- }
- EXPORT_SYMBOL_GPL(dev_pm_opp_put_prop_name);
-
-+static int _allocate_set_opp_data(struct opp_table *opp_table)
-+{
-+ struct dev_pm_set_opp_data *data;
-+ int len, count = opp_table->regulator_count;
-+
-+ if (WARN_ON(!count))
-+ return -EINVAL;
-+
-+ /* space for set_opp_data */
-+ len = sizeof(*data);
-+
-+ /* space for old_opp.supplies and new_opp.supplies */
-+ len += 2 * sizeof(struct dev_pm_opp_supply) * count;
-+
-+ data = kzalloc(len, GFP_KERNEL);
-+ if (!data)
-+ return -ENOMEM;
-+
-+ data->old_opp.supplies = (void *)(data + 1);
-+ data->new_opp.supplies = data->old_opp.supplies + count;
-+
-+ opp_table->set_opp_data = data;
-+
-+ return 0;
-+}
-+
-+static void _free_set_opp_data(struct opp_table *opp_table)
-+{
-+ kfree(opp_table->set_opp_data);
-+ opp_table->set_opp_data = NULL;
-+}
-+
- /**
- * dev_pm_opp_set_regulators() - Set regulator names for the device
- * @dev: Device for which regulator name is being set.
-@@ -1436,6 +1503,11 @@ int dev_pm_opp_set_regulators(struct device *dev, const char * const names[],
-
- opp_table->regulator_count = count;
-
-+ /* Allocate block only once to pass to set_opp() routines */
-+ ret = _allocate_set_opp_data(opp_table);
-+ if (ret)
-+ goto free_regulators;
-+
- mutex_unlock(&opp_table_lock);
- return 0;
-
-@@ -1445,6 +1517,7 @@ int dev_pm_opp_set_regulators(struct device *dev, const char * const names[],
-
- kfree(opp_table->regulators);
- opp_table->regulators = NULL;
-+ opp_table->regulator_count = 0;
- err:
- _remove_opp_table(opp_table);
- unlock:
-@@ -1490,6 +1563,8 @@ void dev_pm_opp_put_regulators(struct device *dev)
- for (i = opp_table->regulator_count - 1; i >= 0; i--)
- regulator_put(opp_table->regulators[i]);
-
-+ _free_set_opp_data(opp_table);
-+
- kfree(opp_table->regulators);
- opp_table->regulators = NULL;
- opp_table->regulator_count = 0;
-diff --git a/drivers/base/power/opp/opp.h b/drivers/base/power/opp/opp.h
-index d5f09ee..ef70110 100644
---- a/drivers/base/power/opp/opp.h
-+++ b/drivers/base/power/opp/opp.h
-@@ -141,6 +141,7 @@ enum opp_table_access {
- * @clk: Device's clock handle
- * @regulators: Supply regulators
- * @regulator_count: Number of power supply regulators
-+ * @set_opp_data: Data to be passed to set_opp callback
- * @dentry: debugfs dentry pointer of the real device directory (not links).
- * @dentry_name: Name of the real dentry.
- *
-@@ -178,6 +179,8 @@ struct opp_table {
- struct regulator **regulators;
- unsigned int regulator_count;
-
-+ struct dev_pm_set_opp_data *set_opp_data;
-+
- #ifdef CONFIG_DEBUG_FS
- struct dentry *dentry;
- char dentry_name[NAME_MAX];
-diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h
-index 27eea9b..4723625 100644
---- a/include/linux/pm_opp.h
-+++ b/include/linux/pm_opp.h
-@@ -17,6 +17,8 @@
- #include <linux/err.h>
- #include <linux/notifier.h>
-
-+struct clk;
-+struct regulator;
- struct dev_pm_opp;
- struct device;
-
-@@ -40,6 +42,39 @@ struct dev_pm_opp_supply {
- unsigned long u_amp;
- };
-
-+/**
-+ * struct dev_pm_opp_info - OPP freq/voltage/current values
-+ * @rate: Target clk rate in hz
-+ * @supplies: Array of voltage/current values for all power supplies
-+ *
-+ * This structure stores the freq/voltage/current values for a single OPP.
-+ */
-+struct dev_pm_opp_info {
-+ unsigned long rate;
-+ struct dev_pm_opp_supply *supplies;
-+};
-+
-+/**
-+ * struct dev_pm_set_opp_data - Set OPP data
-+ * @old_opp: Old OPP info
-+ * @new_opp: New OPP info
-+ * @regulators: Array of regulator pointers
-+ * @regulator_count: Number of regulators
-+ * @clk: Pointer to clk
-+ * @dev: Pointer to the struct device
-+ *
-+ * This structure contains all information required for setting an OPP.
-+ */
-+struct dev_pm_set_opp_data {
-+ struct dev_pm_opp_info old_opp;
-+ struct dev_pm_opp_info new_opp;
-+
-+ struct regulator **regulators;
-+ unsigned int regulator_count;
-+ struct clk *clk;
-+ struct device *dev;
-+};
-+
- #if defined(CONFIG_PM_OPP)
-
- unsigned long dev_pm_opp_get_voltage(struct dev_pm_opp *opp);
---
-2.10.2
-
diff --git a/patches/drivers/pm_opp/0008-PM-OPP-Allow-platform-specific-custom-set_opp-callba.patch b/patches/drivers/pm_opp/0008-PM-OPP-Allow-platform-specific-custom-set_opp-callba.patch
deleted file mode 100644
index 592112815488f8c4797aa2c5496e33826d5478ec..0000000000000000000000000000000000000000
--- a/patches/drivers/pm_opp/0008-PM-OPP-Allow-platform-specific-custom-set_opp-callba.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-From db1d5ed6457eeda415b93d7d2a5f3fe28b832df2 Mon Sep 17 00:00:00 2001
-From: Viresh Kumar <viresh.kumar@linaro.org>
-Date: Tue, 29 Nov 2016 12:06:55 +0530
-Subject: [PATCH 08/10] PM / OPP: Allow platform specific custom set_opp()
- callbacks
-
-The generic set_opp() handler isn't sufficient for platforms with
-complex DVFS. For example, some TI platforms have multiple regulators
-for a CPU device. The order in which various supplies need to be
-programmed is only known to the platform code and its best to leave it
-to it.
-
-This patch implements APIs to register platform specific set_opp()
-callback.
-
-Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
-Tested-by: Dave Gerlach <d-gerlach@ti.com>
----
- drivers/base/power/opp/core.c | 114 +++++++++++++++++++++++++++++++++++++++++-
- drivers/base/power/opp/opp.h | 2 +
- include/linux/pm_opp.h | 10 ++++
- 3 files changed, 125 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/base/power/opp/core.c b/drivers/base/power/opp/core.c
-index 3a0b9d9..ddd4915 100644
---- a/drivers/base/power/opp/core.c
-+++ b/drivers/base/power/opp/core.c
-@@ -687,6 +687,7 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
- {
- struct opp_table *opp_table;
- unsigned long freq, old_freq;
-+ int (*set_opp)(struct dev_pm_set_opp_data *data);
- struct dev_pm_opp *old_opp, *opp;
- struct regulator **regulators;
- struct dev_pm_set_opp_data *data;
-@@ -751,6 +752,11 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
- return _generic_set_opp_clk_only(dev, clk, old_freq, freq);
- }
-
-+ if (opp_table->set_opp)
-+ set_opp = opp_table->set_opp;
-+ else
-+ set_opp = _generic_set_opp;
-+
- data = opp_table->set_opp_data;
- data->regulators = regulators;
- data->regulator_count = opp_table->regulator_count;
-@@ -769,7 +775,7 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
-
- rcu_read_unlock();
-
-- return _generic_set_opp(data);
-+ return set_opp(data);
- }
- EXPORT_SYMBOL_GPL(dev_pm_opp_set_rate);
-
-@@ -903,6 +909,9 @@ static void _remove_opp_table(struct opp_table *opp_table)
- if (opp_table->regulators)
- return;
-
-+ if (opp_table->set_opp)
-+ return;
-+
- /* Release clk */
- if (!IS_ERR(opp_table->clk))
- clk_put(opp_table->clk);
-@@ -1578,6 +1587,109 @@ void dev_pm_opp_put_regulators(struct device *dev)
- EXPORT_SYMBOL_GPL(dev_pm_opp_put_regulators);
-
- /**
-+ * dev_pm_opp_register_set_opp_helper() - Register custom set OPP helper
-+ * @dev: Device for which the helper is getting registered.
-+ * @set_opp: Custom set OPP helper.
-+ *
-+ * This is useful to support complex platforms (like platforms with multiple
-+ * regulators per device), instead of the generic OPP set rate helper.
-+ *
-+ * This must be called before any OPPs are initialized for the device.
-+ *
-+ * Locking: The internal opp_table and opp structures are RCU protected.
-+ * Hence this function internally uses RCU updater strategy with mutex locks
-+ * to keep the integrity of the internal data structures. Callers should ensure
-+ * that this function is *NOT* called under RCU protection or in contexts where
-+ * mutex cannot be locked.
-+ */
-+int dev_pm_opp_register_set_opp_helper(struct device *dev,
-+ int (*set_opp)(struct dev_pm_set_opp_data *data))
-+{
-+ struct opp_table *opp_table;
-+ int ret;
-+
-+ if (!set_opp)
-+ return -EINVAL;
-+
-+ mutex_lock(&opp_table_lock);
-+
-+ opp_table = _add_opp_table(dev);
-+ if (!opp_table) {
-+ ret = -ENOMEM;
-+ goto unlock;
-+ }
-+
-+ /* This should be called before OPPs are initialized */
-+ if (WARN_ON(!list_empty(&opp_table->opp_list))) {
-+ ret = -EBUSY;
-+ goto err;
-+ }
-+
-+ /* Already have custom set_opp helper */
-+ if (WARN_ON(opp_table->set_opp)) {
-+ ret = -EBUSY;
-+ goto err;
-+ }
-+
-+ opp_table->set_opp = set_opp;
-+
-+ mutex_unlock(&opp_table_lock);
-+ return 0;
-+
-+err:
-+ _remove_opp_table(opp_table);
-+unlock:
-+ mutex_unlock(&opp_table_lock);
-+
-+ return ret;
-+}
-+EXPORT_SYMBOL_GPL(dev_pm_opp_register_set_opp_helper);
-+
-+/**
-+ * dev_pm_opp_register_put_opp_helper() - Releases resources blocked for
-+ * set_opp helper
-+ * @dev: Device for which custom set_opp helper has to be cleared.
-+ *
-+ * Locking: The internal opp_table and opp structures are RCU protected.
-+ * Hence this function internally uses RCU updater strategy with mutex locks
-+ * to keep the integrity of the internal data structures. Callers should ensure
-+ * that this function is *NOT* called under RCU protection or in contexts where
-+ * mutex cannot be locked.
-+ */
-+void dev_pm_opp_register_put_opp_helper(struct device *dev)
-+{
-+ struct opp_table *opp_table;
-+
-+ mutex_lock(&opp_table_lock);
-+
-+ /* Check for existing table for 'dev' first */
-+ opp_table = _find_opp_table(dev);
-+ if (IS_ERR(opp_table)) {
-+ dev_err(dev, "Failed to find opp_table: %ld\n",
-+ PTR_ERR(opp_table));
-+ goto unlock;
-+ }
-+
-+ if (!opp_table->set_opp) {
-+ dev_err(dev, "%s: Doesn't have custom set_opp helper set\n",
-+ __func__);
-+ goto unlock;
-+ }
-+
-+ /* Make sure there are no concurrent readers while updating opp_table */
-+ WARN_ON(!list_empty(&opp_table->opp_list));
-+
-+ opp_table->set_opp = NULL;
-+
-+ /* Try freeing opp_table if this was the last blocking resource */
-+ _remove_opp_table(opp_table);
-+
-+unlock:
-+ mutex_unlock(&opp_table_lock);
-+}
-+EXPORT_SYMBOL_GPL(dev_pm_opp_register_put_opp_helper);
-+
-+/**
- * dev_pm_opp_add() - Add an OPP table from a table definitions
- * @dev: device for which we do this operation
- * @freq: Frequency in Hz for this OPP
-diff --git a/drivers/base/power/opp/opp.h b/drivers/base/power/opp/opp.h
-index ef70110..d830d4b 100644
---- a/drivers/base/power/opp/opp.h
-+++ b/drivers/base/power/opp/opp.h
-@@ -141,6 +141,7 @@ enum opp_table_access {
- * @clk: Device's clock handle
- * @regulators: Supply regulators
- * @regulator_count: Number of power supply regulators
-+ * @set_opp: Platform specific set_opp callback
- * @set_opp_data: Data to be passed to set_opp callback
- * @dentry: debugfs dentry pointer of the real device directory (not links).
- * @dentry_name: Name of the real dentry.
-@@ -179,6 +180,7 @@ struct opp_table {
- struct regulator **regulators;
- unsigned int regulator_count;
-
-+ int (*set_opp)(struct dev_pm_set_opp_data *data);
- struct dev_pm_set_opp_data *set_opp_data;
-
- #ifdef CONFIG_DEBUG_FS
-diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h
-index 4723625..d62bd05 100644
---- a/include/linux/pm_opp.h
-+++ b/include/linux/pm_opp.h
-@@ -115,6 +115,8 @@ int dev_pm_opp_set_prop_name(struct device *dev, const char *name);
- void dev_pm_opp_put_prop_name(struct device *dev);
- int dev_pm_opp_set_regulators(struct device *dev, const char * const names[], unsigned int count);
- void dev_pm_opp_put_regulators(struct device *dev);
-+int dev_pm_opp_register_set_opp_helper(struct device *dev, int (*set_opp)(struct dev_pm_set_opp_data *data));
-+void dev_pm_opp_register_put_opp_helper(struct device *dev);
- int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq);
- int dev_pm_opp_set_sharing_cpus(struct device *cpu_dev, const struct cpumask *cpumask);
- int dev_pm_opp_get_sharing_cpus(struct device *cpu_dev, struct cpumask *cpumask);
-@@ -214,6 +216,14 @@ static inline int dev_pm_opp_set_supported_hw(struct device *dev,
-
- static inline void dev_pm_opp_put_supported_hw(struct device *dev) {}
-
-+static inline int dev_pm_opp_register_set_opp_helper(struct device *dev,
-+ int (*set_opp)(struct dev_pm_set_opp_data *data))
-+{
-+ return -ENOTSUPP;
-+}
-+
-+static inline void dev_pm_opp_register_put_opp_helper(struct device *dev) {}
-+
- static inline int dev_pm_opp_set_prop_name(struct device *dev, const char *name)
- {
- return -ENOTSUPP;
---
-2.10.2
-
diff --git a/patches/drivers/pm_opp/0009-PM-OPP-Don-t-WARN-on-multiple-calls-to-dev_pm_opp_se.patch b/patches/drivers/pm_opp/0009-PM-OPP-Don-t-WARN-on-multiple-calls-to-dev_pm_opp_se.patch
deleted file mode 100644
index d2b4a3fdb66385fb87c1f0a81fe9b63869f72504..0000000000000000000000000000000000000000
--- a/patches/drivers/pm_opp/0009-PM-OPP-Don-t-WARN-on-multiple-calls-to-dev_pm_opp_se.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 539f800b470dd6da367b59de7f44dfc481097dcd Mon Sep 17 00:00:00 2001
-From: Viresh Kumar <viresh.kumar@linaro.org>
-Date: Tue, 29 Nov 2016 12:06:56 +0530
-Subject: [PATCH 09/10] PM / OPP: Don't WARN on multiple calls to
- dev_pm_opp_set_regulators()
-
-If a platform specific OPP driver has called this routine first and set
-the regulators, then the second call from cpufreq-dt driver will hit the
-WARN_ON(). Remove the WARN_ON(), but continue to return error in such
-cases.
-
-Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
-Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
-Tested-by: Dave Gerlach <d-gerlach@ti.com>
----
- drivers/base/power/opp/core.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/base/power/opp/core.c b/drivers/base/power/opp/core.c
-index ddd4915..3c9f223 100644
---- a/drivers/base/power/opp/core.c
-+++ b/drivers/base/power/opp/core.c
-@@ -1484,7 +1484,7 @@ int dev_pm_opp_set_regulators(struct device *dev, const char * const names[],
- }
-
- /* Already have regulators set */
-- if (WARN_ON(opp_table->regulators)) {
-+ if (opp_table->regulators) {
- ret = -EBUSY;
- goto err;
- }
---
-2.10.2
-
diff --git a/patches/drivers/pm_opp/0010-PM-OPP-Don-t-assume-platform-doesn-t-have-regulators.patch b/patches/drivers/pm_opp/0010-PM-OPP-Don-t-assume-platform-doesn-t-have-regulators.patch
deleted file mode 100644
index b2e4d2b2d71944524057e69272a20226608d9b96..0000000000000000000000000000000000000000
--- a/patches/drivers/pm_opp/0010-PM-OPP-Don-t-assume-platform-doesn-t-have-regulators.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 6ca824bf8f1dd596d9b46e2c7f9c6f795b377525 Mon Sep 17 00:00:00 2001
-From: Viresh Kumar <viresh.kumar@linaro.org>
-Date: Tue, 29 Nov 2016 12:06:57 +0530
-Subject: [PATCH 10/10] PM / OPP: Don't assume platform doesn't have regulators
-
-If the regulators aren't set explicitly by the platform, the OPP core
-assumes that the platform doesn't have any regulator and uses the
-clk-only callback.
-
-If the platform failed to register a regulator with the core, then this
-can turn out to be a dangerous assumption as the OPP core will try to
-change clk without changing regulators.
-
-Handle that properly by making sure that the DT didn't have any entries
-for supply voltages as well.
-
-Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
-Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
----
- drivers/base/power/opp/core.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/drivers/base/power/opp/core.c b/drivers/base/power/opp/core.c
-index 3c9f223..f7a5fb4 100644
---- a/drivers/base/power/opp/core.c
-+++ b/drivers/base/power/opp/core.c
-@@ -748,7 +748,20 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
-
- /* Only frequency scaling */
- if (!regulators) {
-+ unsigned long u_volt = opp->supplies[0].u_volt;
-+
- rcu_read_unlock();
-+
-+ /*
-+ * DT contained supply ratings? Consider platform failed to set
-+ * regulators.
-+ */
-+ if (unlikely(u_volt)) {
-+ dev_err(dev, "%s: Regulator not registered with OPP core\n",
-+ __func__);
-+ return -EINVAL;
-+ }
-+
- return _generic_set_opp_clk_only(dev, clk, old_freq, freq);
- }
-
---
-2.10.2
-
diff --git a/patches/drivers/ti/bbb_overlays/0010-of-overlay-global-sysfs-enable-attribute.patch b/patches/drivers/ti/bbb_overlays/0010-of-overlay-global-sysfs-enable-attribute.patch
index 6712119cbfeb2f19b2194a1e26234f1573ce95f4..172756da5ae984bf1576f25c53b15480f7465600 100644
--- a/patches/drivers/ti/bbb_overlays/0010-of-overlay-global-sysfs-enable-attribute.patch
+++ b/patches/drivers/ti/bbb_overlays/0010-of-overlay-global-sysfs-enable-attribute.patch
@@ -15,7 +15,7 @@ Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 file changed, 49 insertions(+), 1 deletion(-)
diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
-index 4a3f63b..053f4b2 100644
+index e6f1ca7..88248a4 100644
--- a/drivers/of/overlay.c
+++ b/drivers/of/overlay.c
@@ -23,6 +23,7 @@
@@ -44,9 +44,9 @@ index 4a3f63b..053f4b2 100644
struct device_node *target, const struct device_node *overlay);
+static int overlay_removal_is_ok(struct of_overlay *ov);
- static int of_overlay_apply_single_property(struct of_overlay *ov,
- struct device_node *target, struct property *prop)
-@@ -340,6 +352,35 @@ void of_overlay_release(struct kobject *kobj)
+ static BLOCKING_NOTIFIER_HEAD(of_overlay_chain);
+
+@@ -375,6 +387,35 @@ void of_overlay_release(struct kobject *kobj)
kfree(ov);
}
@@ -82,7 +82,7 @@ index 4a3f63b..053f4b2 100644
static struct kobj_type of_overlay_ktype = {
.release = of_overlay_release,
};
-@@ -361,6 +402,10 @@ int of_overlay_create(struct device_node *tree)
+@@ -396,6 +437,10 @@ int of_overlay_create(struct device_node *tree)
struct of_overlay *ov;
int err, id;
@@ -93,7 +93,7 @@ index 4a3f63b..053f4b2 100644
/* allocate the overlay structure */
ov = kzalloc(sizeof(*ov), GFP_KERNEL);
if (ov == NULL)
-@@ -586,5 +631,8 @@ int of_overlay_init(void)
+@@ -631,5 +676,8 @@ int of_overlay_init(void)
if (!ov_kset)
return -ENOMEM;
@@ -104,5 +104,5 @@ index 4a3f63b..053f4b2 100644
+ return rc;
}
--
-2.9.3
+2.10.2
diff --git a/patches/drivers/ti/bbb_overlays/0012-Documentation-document-of_overlay_disable-parameter.patch b/patches/drivers/ti/bbb_overlays/0012-Documentation-document-of_overlay_disable-parameter.patch
index 8fdd38d98ba6eb69ca02c770fc146263928a30e3..ebe23c3423d54cad69e716bbb3ef81abfe63ceb2 100644
--- a/patches/drivers/ti/bbb_overlays/0012-Documentation-document-of_overlay_disable-parameter.patch
+++ b/patches/drivers/ti/bbb_overlays/0012-Documentation-document-of_overlay_disable-parameter.patch
@@ -8,22 +8,14 @@ Document the of_overlay_disable parameter.
Signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
- Documentation/kernel-parameters.txt | 3 +++
- 1 file changed, 3 insertions(+)
+ Documentation/admin-guide/kernel-parameters.txt | 2 ++
+ 1 file changed, 2 insertions(+)
-diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
-index fcf05a0..df08a26 100644
---- a/Documentation/kernel-parameters.txt
-+++ b/Documentation/kernel-parameters.txt
-@@ -90,6 +90,7 @@ parameter is applicable:
- NET Appropriate network support is enabled.
- NUMA NUMA support is enabled.
- NFS Appropriate NFS support is enabled.
-+ OF Open Firmware support (device tree) is enabled.
- OSS OSS sound support is enabled.
- PV_OPS A paravirtualized kernel is enabled.
- PARIDE The ParIDE (parallel port IDE) subsystem is enabled.
-@@ -2801,6 +2802,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
+diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
+index 62d68b2..f80fa95 100644
+--- a/Documentation/admin-guide/kernel-parameters.txt
++++ b/Documentation/admin-guide/kernel-parameters.txt
+@@ -2659,6 +2659,8 @@
This can be set from sysctl after boot.
See Documentation/sysctl/vm.txt for details.
@@ -33,5 +25,5 @@ index fcf05a0..df08a26 100644
See Documentation/debugging-via-ohci1394.txt for more
info.
--
-2.9.3
+2.10.2
diff --git a/patches/drivers/ti/bbb_overlays/0013-of-overlay-add-per-overlay-sysfs-attributes.patch b/patches/drivers/ti/bbb_overlays/0013-of-overlay-add-per-overlay-sysfs-attributes.patch
index 1ca0cfa927145abf90a6f351675d5c10b9a11620..b21fb350e8e590f5910bfa339e65d5a16601a1bf 100644
--- a/patches/drivers/ti/bbb_overlays/0013-of-overlay-add-per-overlay-sysfs-attributes.patch
+++ b/patches/drivers/ti/bbb_overlays/0013-of-overlay-add-per-overlay-sysfs-attributes.patch
@@ -12,11 +12,11 @@ in a group named after the name of the fragment.
Signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
- drivers/of/overlay.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++++--
- 1 file changed, 99 insertions(+), 4 deletions(-)
+ drivers/of/overlay.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 98 insertions(+), 3 deletions(-)
diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
-index 053f4b2..73336d9 100644
+index 88248a4..fb2274d 100644
--- a/drivers/of/overlay.c
+++ b/drivers/of/overlay.c
@@ -27,8 +27,23 @@
@@ -65,7 +65,7 @@ index 053f4b2..73336d9 100644
struct of_changeset cset;
struct kobject kobj;
};
-@@ -253,6 +274,8 @@ static int of_fill_overlay_info(struct of_overlay *ov,
+@@ -288,6 +309,8 @@ static int of_fill_overlay_info(struct of_overlay *ov,
if (ovinfo->target == NULL)
goto err_fail;
@@ -74,7 +74,7 @@ index 053f4b2..73336d9 100644
return 0;
err_fail:
-@@ -263,6 +286,17 @@ err_fail:
+@@ -298,6 +321,17 @@ static int of_fill_overlay_info(struct of_overlay *ov,
return -EINVAL;
}
@@ -92,7 +92,7 @@ index 053f4b2..73336d9 100644
/**
* of_build_overlay_info() - Build an overlay info array
* @ov Overlay to build
-@@ -280,7 +314,7 @@ static int of_build_overlay_info(struct of_overlay *ov,
+@@ -315,7 +349,7 @@ static int of_build_overlay_info(struct of_overlay *ov,
{
struct device_node *node;
struct of_overlay_info *ovinfo;
@@ -101,7 +101,7 @@ index 053f4b2..73336d9 100644
/* worst case; every child is a node */
cnt = 0;
-@@ -301,14 +335,45 @@ static int of_build_overlay_info(struct of_overlay *ov,
+@@ -336,14 +370,45 @@ static int of_build_overlay_info(struct of_overlay *ov,
/* if nothing filled, return error */
if (cnt == 0) {
@@ -149,7 +149,7 @@ index 053f4b2..73336d9 100644
}
/**
-@@ -325,12 +390,16 @@ static int of_free_overlay_info(struct of_overlay *ov)
+@@ -360,12 +425,16 @@ static int of_free_overlay_info(struct of_overlay *ov)
struct of_overlay_info *ovinfo;
int i;
@@ -166,7 +166,7 @@ index 053f4b2..73336d9 100644
}
kfree(ov->ovinfo_tab);
-@@ -381,8 +450,25 @@ static const struct attribute *overlay_global_attrs[] = {
+@@ -416,8 +485,25 @@ static const struct attribute *overlay_global_attrs[] = {
NULL
};
@@ -192,9 +192,9 @@ index 053f4b2..73336d9 100644
};
static struct kset *ov_kset;
-@@ -455,13 +541,21 @@ int of_overlay_create(struct device_node *tree)
- goto err_cancel_overlay;
- }
+@@ -488,6 +574,12 @@ int of_overlay_create(struct device_node *tree)
+ if (err)
+ goto err_revert_overlay;
+ err = sysfs_create_groups(&ov->kobj, ov->attr_groups);
+ if (err != 0) {
@@ -202,27 +202,26 @@ index 053f4b2..73336d9 100644
+ __func__, tree->full_name);
+ goto err_remove_kobj;
+ }
-+
- /* add to the tail of the overlay list */
- list_add_tail(&ov->node, &ov_list);
- mutex_unlock(&of_mutex);
+ ov->kobj.kset = ov_kset;
+ err = kobject_add(&ov->kobj, NULL, "%d", id);
+@@ -506,6 +598,8 @@ int of_overlay_create(struct device_node *tree)
return id;
--
+
+err_remove_kobj:
+ kobject_put(&ov->kobj);
err_cancel_overlay:
of_changeset_revert(&ov->cset);
err_revert_overlay:
-@@ -578,6 +672,7 @@ int of_overlay_destroy(int id)
-
+@@ -622,6 +716,7 @@ int of_overlay_destroy(int id)
+ of_overlay_notify(ov, OF_OVERLAY_PRE_REMOVE);
list_del(&ov->node);
+ sysfs_remove_groups(&ov->kobj, ov->attr_groups);
__of_changeset_revert(&ov->cset);
+ of_overlay_notify(ov, OF_OVERLAY_POST_REMOVE);
of_free_overlay_info(ov);
- idr_remove(&ov_idr, id);
--
-2.9.3
+2.10.2
diff --git a/patches/drivers/ti/bbb_overlays/0026-arm-dts-Enable-beaglebone-cape-manager.patch b/patches/drivers/ti/bbb_overlays/0026-arm-dts-Enable-beaglebone-cape-manager.patch
index f431cd9b39694d9667a30dc3e9b26ec9a677b9f0..4453875976b9b35c0411413b04d29e7a93f7feef 100644
--- a/patches/drivers/ti/bbb_overlays/0026-arm-dts-Enable-beaglebone-cape-manager.patch
+++ b/patches/drivers/ti/bbb_overlays/0026-arm-dts-Enable-beaglebone-cape-manager.patch
@@ -11,12 +11,12 @@ Signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
1 file changed, 25 insertions(+)
diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
-index e247c15..d0e15df 100644
+index dc561d5..e3cb3ec 100644
--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
-@@ -393,3 +393,28 @@
- &sham {
- status = "okay";
+@@ -415,3 +415,28 @@
+ clocks = <&clk_32768_ck>, <&clkdiv32k_ick>;
+ clock-names = "ext-clk", "int-clk";
};
+
+/* the cape manager */
@@ -44,5 +44,5 @@ index e247c15..d0e15df 100644
+ };
+};
--
-2.9.3
+2.10.2
diff --git a/patches/drivers/ti/bbb_overlays/0027-of-overlay-Implement-target-index-support.patch b/patches/drivers/ti/bbb_overlays/0027-of-overlay-Implement-target-index-support.patch
index f79f46a905106a4596575684786a5ffd71e84663..5f89401340acbf1f3c6a56c4f5f8323cf6122cff 100644
--- a/patches/drivers/ti/bbb_overlays/0027-of-overlay-Implement-target-index-support.patch
+++ b/patches/drivers/ti/bbb_overlays/0027-of-overlay-Implement-target-index-support.patch
@@ -26,7 +26,7 @@ Signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
2 files changed, 53 insertions(+), 20 deletions(-)
diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
-index 73336d9..c6972ea 100644
+index fb2274d..5140f6b 100644
--- a/drivers/of/overlay.c
+++ b/drivers/of/overlay.c
@@ -77,6 +77,7 @@ struct of_overlay {
@@ -37,7 +37,7 @@ index 73336d9..c6972ea 100644
};
/* master enable switch; once set to 0 can't be re-enabled */
-@@ -222,30 +223,29 @@ static int of_overlay_apply(struct of_overlay *ov)
+@@ -257,30 +258,29 @@ static int of_overlay_apply(struct of_overlay *ov)
/*
* Find the target node using a number of different strategies
@@ -75,7 +75,7 @@ index 73336d9..c6972ea 100644
return NULL;
}
-@@ -270,7 +270,7 @@ static int of_fill_overlay_info(struct of_overlay *ov,
+@@ -305,7 +305,7 @@ static int of_fill_overlay_info(struct of_overlay *ov,
if (ovinfo->overlay == NULL)
goto err_fail;
@@ -84,7 +84,7 @@ index 73336d9..c6972ea 100644
if (ovinfo->target == NULL)
goto err_fail;
-@@ -473,17 +473,8 @@ static struct kobj_type of_overlay_ktype = {
+@@ -508,17 +508,8 @@ static struct kobj_type of_overlay_ktype = {
static struct kset *ov_kset;
@@ -104,7 +104,7 @@ index 73336d9..c6972ea 100644
{
struct of_overlay *ov;
int err, id;
-@@ -498,6 +489,8 @@ int of_overlay_create(struct device_node *tree)
+@@ -533,6 +524,8 @@ int of_overlay_create(struct device_node *tree)
return -ENOMEM;
ov->id = -1;
@@ -113,7 +113,7 @@ index 73336d9..c6972ea 100644
INIT_LIST_HEAD(&ov->node);
of_changeset_init(&ov->cset);
-@@ -570,8 +563,40 @@ err_destroy_trans:
+@@ -614,8 +607,40 @@ int of_overlay_create(struct device_node *tree)
return err;
}
@@ -155,20 +155,20 @@ index 73336d9..c6972ea 100644
static int overlay_subtree_check(struct device_node *tree,
struct device_node *dn)
diff --git a/include/linux/of.h b/include/linux/of.h
-index 6617d23..5cd40eb 100644
+index c50f088..d9d9537 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
-@@ -1490,6 +1490,8 @@ int of_overlay_create(struct device_node *tree);
- int of_overlay_destroy(int id);
- int of_overlay_destroy_all(void);
+@@ -1625,6 +1625,8 @@ int of_overlay_destroy_all(void);
+ int of_overlay_notifier_register(struct notifier_block *nb);
+ int of_overlay_notifier_unregister(struct notifier_block *nb);
+int of_overlay_create_target_index(struct device_node *tree, int index);
+
#else
static inline int of_overlay_create(struct device_node *tree)
-@@ -1507,6 +1509,12 @@ static inline int of_overlay_destroy_all(void)
- return -ENOTSUPP;
+@@ -1652,6 +1654,12 @@ static inline int of_overlay_notifier_unregister(struct notifier_block *nb)
+ return 0;
}
+static inline int of_overlay_create_target_index(struct device_node *tree,
@@ -181,5 +181,5 @@ index 6617d23..5cd40eb 100644
#endif /* _LINUX_OF_H */
--
-2.9.3
+2.10.2
diff --git a/patches/drivers/ti/bbb_overlays/0030-of-overlay-Introduce-target-root-capability.patch b/patches/drivers/ti/bbb_overlays/0030-of-overlay-Introduce-target-root-capability.patch
index 29730220f7f01209f96e1c575bf7793e7c9a11b8..f50bcfcd5cb51725895b56df9f1aa7749b3cdeff 100644
--- a/patches/drivers/ti/bbb_overlays/0030-of-overlay-Introduce-target-root-capability.patch
+++ b/patches/drivers/ti/bbb_overlays/0030-of-overlay-Introduce-target-root-capability.patch
@@ -22,7 +22,7 @@ Signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
2 files changed, 102 insertions(+), 7 deletions(-)
diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
-index c6972ea..722350b 100644
+index 5140f6b..71a705a 100644
--- a/drivers/of/overlay.c
+++ b/drivers/of/overlay.c
@@ -78,6 +78,7 @@ struct of_overlay {
@@ -33,7 +33,7 @@ index c6972ea..722350b 100644
};
/* master enable switch; once set to 0 can't be re-enabled */
-@@ -231,22 +232,85 @@ static int of_overlay_apply(struct of_overlay *ov)
+@@ -266,22 +267,85 @@ static int of_overlay_apply(struct of_overlay *ov)
static struct device_node *find_target_node(struct of_overlay *ov,
struct device_node *info_node, int index)
{
@@ -123,7 +123,7 @@ index c6972ea..722350b 100644
}
/**
-@@ -418,6 +482,7 @@ void of_overlay_release(struct kobject *kobj)
+@@ -453,6 +517,7 @@ void of_overlay_release(struct kobject *kobj)
{
struct of_overlay *ov = kobj_to_overlay(kobj);
@@ -131,7 +131,7 @@ index c6972ea..722350b 100644
kfree(ov);
}
-@@ -474,7 +539,7 @@ static struct kobj_type of_overlay_ktype = {
+@@ -509,7 +574,7 @@ static struct kobj_type of_overlay_ktype = {
static struct kset *ov_kset;
static int __of_overlay_create(struct device_node *tree,
@@ -140,7 +140,7 @@ index c6972ea..722350b 100644
{
struct of_overlay *ov;
int err, id;
-@@ -490,6 +555,7 @@ static int __of_overlay_create(struct device_node *tree,
+@@ -525,6 +590,7 @@ static int __of_overlay_create(struct device_node *tree,
ov->id = -1;
ov->target_index = target_index;
@@ -148,7 +148,7 @@ index c6972ea..722350b 100644
INIT_LIST_HEAD(&ov->node);
-@@ -558,6 +624,7 @@ err_free_idr:
+@@ -602,6 +668,7 @@ static int __of_overlay_create(struct device_node *tree,
idr_remove(&ov_idr, ov->id);
err_destroy_trans:
of_changeset_destroy(&ov->cset);
@@ -156,7 +156,7 @@ index c6972ea..722350b 100644
kfree(ov);
mutex_unlock(&of_mutex);
-@@ -576,7 +643,7 @@ err_destroy_trans:
+@@ -620,7 +687,7 @@ static int __of_overlay_create(struct device_node *tree,
*/
int of_overlay_create(struct device_node *tree)
{
@@ -165,7 +165,7 @@ index c6972ea..722350b 100644
}
EXPORT_SYMBOL_GPL(of_overlay_create);
-@@ -593,10 +660,30 @@ EXPORT_SYMBOL_GPL(of_overlay_create);
+@@ -637,10 +704,30 @@ EXPORT_SYMBOL_GPL(of_overlay_create);
*/
int of_overlay_create_target_index(struct device_node *tree, int index)
{
@@ -198,11 +198,11 @@ index c6972ea..722350b 100644
static int overlay_subtree_check(struct device_node *tree,
struct device_node *dn)
diff --git a/include/linux/of.h b/include/linux/of.h
-index 5cd40eb..672539c 100644
+index d9d9537..09693b9 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
-@@ -1491,6 +1491,8 @@ int of_overlay_destroy(int id);
- int of_overlay_destroy_all(void);
+@@ -1626,6 +1626,8 @@ int of_overlay_notifier_register(struct notifier_block *nb);
+ int of_overlay_notifier_unregister(struct notifier_block *nb);
int of_overlay_create_target_index(struct device_node *tree, int index);
+int of_overlay_create_target_root(struct device_node *tree,
@@ -210,7 +210,7 @@ index 5cd40eb..672539c 100644
#else
-@@ -1515,6 +1517,12 @@ static inline int of_overlay_create_target_index(struct device_node *tree,
+@@ -1660,6 +1662,12 @@ static inline int of_overlay_create_target_index(struct device_node *tree,
return -ENOTSUPP;
}
@@ -224,5 +224,5 @@ index 5cd40eb..672539c 100644
#endif /* _LINUX_OF_H */
--
-2.9.3
+2.10.2
diff --git a/patches/drivers/ti/iodelay/0002-pinctrl-Introduce-TI-IOdelay-configuration-driver.patch b/patches/drivers/ti/iodelay/0002-pinctrl-Introduce-TI-IOdelay-configuration-driver.patch
index 533190c872f3cf0ef1bb0fe4fb59ec3cf531d78e..00909292b882051818879485659479c8c670963d 100644
--- a/patches/drivers/ti/iodelay/0002-pinctrl-Introduce-TI-IOdelay-configuration-driver.patch
+++ b/patches/drivers/ti/iodelay/0002-pinctrl-Introduce-TI-IOdelay-configuration-driver.patch
@@ -60,10 +60,10 @@ Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
create mode 100644 drivers/pinctrl/pinctrl-ti-iodelay.c
diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
-index b3fe1d3..6f9a380 100644
+index 54044a8..b43b6e7 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
-@@ -179,6 +179,18 @@ config PINCTRL_ST
+@@ -203,6 +203,18 @@ config PINCTRL_ST
select PINCONF
select GPIOLIB_IRQCHIP
@@ -83,12 +83,12 @@ index b3fe1d3..6f9a380 100644
bool "Toumaz Xenif TZ1090 pin control driver"
depends on SOC_TZ1090
diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile
-index 8ebd7b8..499eb1e 100644
+index 25d50a8..25e1ec46 100644
--- a/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
-@@ -26,6 +26,7 @@ obj-$(CONFIG_PINCTRL_ROCKCHIP) += pinctrl-rockchip.o
- obj-$(CONFIG_PINCTRL_SINGLE) += pinctrl-single.o
+@@ -28,6 +28,7 @@ obj-$(CONFIG_PINCTRL_SINGLE) += pinctrl-single.o
obj-$(CONFIG_PINCTRL_SIRF) += sirf/
+ obj-$(CONFIG_PINCTRL_SX150X) += pinctrl-sx150x.o
obj-$(CONFIG_ARCH_TEGRA) += tegra/
+obj-$(CONFIG_PINCTRL_TI_IODELAY)+= pinctrl-ti-iodelay.o
obj-$(CONFIG_PINCTRL_TZ1090) += pinctrl-tz1090.o
@@ -1092,5 +1092,5 @@ index 5c75e80..5a60e3b 100644
#endif
--
-2.9.3
+2.10.2
diff --git a/patches/drivers/ti/mcasp/0001-ASoC-add-generic-TDM-codec.patch b/patches/drivers/ti/mcasp/0001-ASoC-add-generic-TDM-codec.patch
index 5983777c15b100f3da813dd158fef51bdba00f45..7a26170e75895954f2ed04753a32e4a191d56d1c 100644
--- a/patches/drivers/ti/mcasp/0001-ASoC-add-generic-TDM-codec.patch
+++ b/patches/drivers/ti/mcasp/0001-ASoC-add-generic-TDM-codec.patch
@@ -1,21 +1,21 @@
-From 91cf06d33c5eb019b1fbecd411bcaaf9f497b788 Mon Sep 17 00:00:00 2001
+From c91761fab292fe91583b9b597d431d088d123336 Mon Sep 17 00:00:00 2001
From: Matthijs van Duin <matthijsvanduin@gmail.com>
Date: Mon, 1 Feb 2016 08:21:08 +0100
-Subject: [PATCH] ASoC: add generic TDM codec
+Subject: [PATCH 1/2] ASoC: add generic TDM codec
Signed-off-by: Matthijs van Duin <matthijsvanduin@gmail.com>
---
sound/soc/codecs/Kconfig | 4 ++
sound/soc/codecs/Makefile | 2 +
- sound/soc/codecs/tdm.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 118 insertions(+)
+ sound/soc/codecs/tdm.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 116 insertions(+)
create mode 100644 sound/soc/codecs/tdm.c
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
-index c67667bb970f..0f40b095ddb8 100644
+index cfdafc4..917cc40 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
-@@ -135,6 +135,7 @@ config SND_SOC_ALL_CODECS
+@@ -112,6 +112,7 @@ config SND_SOC_ALL_CODECS
select SND_SOC_TAS5086 if I2C
select SND_SOC_TAS571X if I2C
select SND_SOC_TAS5720 if I2C
@@ -23,7 +23,7 @@ index c67667bb970f..0f40b095ddb8 100644
select SND_SOC_TFA9879 if I2C
select SND_SOC_TLV320AIC23_I2C if I2C
select SND_SOC_TLV320AIC23_SPI if SPI_MASTER
-@@ -812,6 +813,9 @@ config SND_SOC_TAS5720
+@@ -656,6 +657,9 @@ config SND_SOC_TAS5720
Enable support for Texas Instruments TAS5720L/M high-efficiency mono
Class-D audio power amplifiers.
@@ -34,10 +34,10 @@ index c67667bb970f..0f40b095ddb8 100644
tristate "NXP Semiconductors TFA9879 amplifier"
depends on I2C
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
-index 958cd4912fbc..ea82c79333ea 100644
+index f632fc4..a47d48d 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
-@@ -142,6 +142,7 @@ snd-soc-sti-sas-objs := sti-sas.o
+@@ -115,6 +115,7 @@ snd-soc-sti-sas-objs := sti-sas.o
snd-soc-tas5086-objs := tas5086.o
snd-soc-tas571x-objs := tas571x.o
snd-soc-tas5720-objs := tas5720.o
@@ -45,7 +45,7 @@ index 958cd4912fbc..ea82c79333ea 100644
snd-soc-tfa9879-objs := tfa9879.o
snd-soc-tlv320aic23-objs := tlv320aic23.o
snd-soc-tlv320aic23-i2c-objs := tlv320aic23-i2c.o
-@@ -363,6 +364,7 @@ obj-$(CONFIG_SND_SOC_TAS2552) += snd-soc-tas2552.o
+@@ -307,6 +308,7 @@ obj-$(CONFIG_SND_SOC_TAS2552) += snd-soc-tas2552.o
obj-$(CONFIG_SND_SOC_TAS5086) += snd-soc-tas5086.o
obj-$(CONFIG_SND_SOC_TAS571X) += snd-soc-tas571x.o
obj-$(CONFIG_SND_SOC_TAS5720) += snd-soc-tas5720.o
@@ -55,10 +55,10 @@ index 958cd4912fbc..ea82c79333ea 100644
obj-$(CONFIG_SND_SOC_TLV320AIC23_I2C) += snd-soc-tlv320aic23-i2c.o
diff --git a/sound/soc/codecs/tdm.c b/sound/soc/codecs/tdm.c
new file mode 100644
-index 000000000000..b8fb3b8d0177
+index 0000000..f20d3e2
--- /dev/null
+++ b/sound/soc/codecs/tdm.c
-@@ -0,0 +1,112 @@
+@@ -0,0 +1,110 @@
+/*
+ * ALSA SoC generic TDM codec driver
+ *
@@ -110,12 +110,10 @@ index 000000000000..b8fb3b8d0177
+};
+
+static struct snd_soc_codec_driver soc_codec_tdm_audio = {
-+ .component_driver = {
-+ .dapm_widgets = tdm_audio_widgets,
-+ .num_dapm_widgets = ARRAY_SIZE(tdm_audio_widgets),
-+ .dapm_routes = tdm_audio_routes,
-+ .num_dapm_routes = ARRAY_SIZE(tdm_audio_routes),
-+ },
++ .dapm_widgets = tdm_audio_widgets,
++ .num_dapm_widgets = ARRAY_SIZE(tdm_audio_widgets),
++ .dapm_routes = tdm_audio_routes,
++ .num_dapm_routes = ARRAY_SIZE(tdm_audio_routes),
+};
+
+static struct snd_soc_dai_driver tdm_audio_dai = {
@@ -172,5 +170,5 @@ index 000000000000..b8fb3b8d0177
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:" DRV_NAME);
--
-2.10.2
+2.6.4
diff --git a/patches/drivers/ti/mmc/0001-mmc-use-of_alias-for-device-numbering.patch b/patches/drivers/ti/mmc/0001-mmc-use-of_alias-for-device-numbering.patch
index 2bb8fb9da0a9e44190402c6d3c09468f5dd0bb5f..ab8213ea09e8bfdc7a6c5d384c7d2a10cf4beeba 100644
--- a/patches/drivers/ti/mmc/0001-mmc-use-of_alias-for-device-numbering.patch
+++ b/patches/drivers/ti/mmc/0001-mmc-use-of_alias-for-device-numbering.patch
@@ -5,14 +5,14 @@ Subject: [PATCH] mmc: use of_alias for device numbering
Signed-off-by: Matthijs van Duin <matthijsvanduin@gmail.com>
---
- drivers/mmc/card/block.c | 10 +++++++++-
+ drivers/mmc/core/block.c | 10 +++++++++-
drivers/mmc/core/host.c | 13 ++++++++++++-
2 files changed, 21 insertions(+), 2 deletions(-)
-diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
-index c5472e3..f87c8dc 100644
---- a/drivers/mmc/card/block.c
-+++ b/drivers/mmc/card/block.c
+diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
+index bab3f07..92f183f 100644
+--- a/drivers/mmc/core/block.c
++++ b/drivers/mmc/core/block.c
@@ -36,6 +36,7 @@
#include <linux/compat.h>
#include <linux/pm_runtime.h>
@@ -21,7 +21,7 @@ index c5472e3..f87c8dc 100644
#include <linux/mmc/ioctl.h>
#include <linux/mmc/card.h>
-@@ -2216,13 +2217,20 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card,
+@@ -1820,13 +1821,20 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card,
{
struct mmc_blk_data *md;
int devidx, ret;
@@ -44,10 +44,10 @@ index c5472e3..f87c8dc 100644
if (ret == -EAGAIN)
diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
-index 1be42fa..b9e2365 100644
+index 98f25ff..9c211c5 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
-@@ -338,6 +338,8 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
+@@ -346,6 +346,8 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
{
int err;
struct mmc_host *host;
@@ -56,7 +56,7 @@ index 1be42fa..b9e2365 100644
host = kzalloc(sizeof(struct mmc_host) + extra, GFP_KERNEL);
if (!host)
-@@ -353,7 +355,16 @@ again:
+@@ -361,7 +363,16 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
}
spin_lock(&mmc_host_lock);
@@ -75,5 +75,5 @@ index 1be42fa..b9e2365 100644
if (err == -EAGAIN) {
--
-2.8.1
+2.10.2
diff --git a/patches/drivers/ti/omapdrm/0001-drm-omap-tpd12s015-fix-error-handling.patch b/patches/drivers/ti/omapdrm/0001-drm-omap-tpd12s015-fix-error-handling.patch
deleted file mode 100644
index 7251e262875754700c96e235e5d00db581c84e3c..0000000000000000000000000000000000000000
--- a/patches/drivers/ti/omapdrm/0001-drm-omap-tpd12s015-fix-error-handling.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 1e59e7b2d21b0423ceaa6d72f43834d3b04ef8d9 Mon Sep 17 00:00:00 2001
-From: Tomi Valkeinen <tomi.valkeinen@ti.com>
-Date: Tue, 22 Nov 2016 10:11:07 +0200
-Subject: [PATCH] drm/omap: tpd12s015: fix error handling
-
-tpd12s015 driver is missing error value handling for gpio
-initialization, causing 0 to be returned as an error if gpiod_get_*
-fails. This may cause deferred probing to fail.
-
-Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
----
- drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c | 13 +++++++++----
- 1 file changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
-index 46855c8..d189426 100644
---- a/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
-+++ b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
-@@ -234,25 +234,30 @@ static int tpd_probe(struct platform_device *pdev)
- if (r)
- return r;
-
--
- gpio = devm_gpiod_get_index_optional(&pdev->dev, NULL, 0,
- GPIOD_OUT_LOW);
-- if (IS_ERR(gpio))
-+ if (IS_ERR(gpio)) {
-+ r = PTR_ERR(gpio);
- goto err_gpio;
-+ }
-
- ddata->ct_cp_hpd_gpio = gpio;
-
- gpio = devm_gpiod_get_index_optional(&pdev->dev, NULL, 1,
- GPIOD_OUT_LOW);
-- if (IS_ERR(gpio))
-+ if (IS_ERR(gpio)) {
-+ r = PTR_ERR(gpio);
- goto err_gpio;
-+ }
-
- ddata->ls_oe_gpio = gpio;
-
- gpio = devm_gpiod_get_index(&pdev->dev, NULL, 2,
- GPIOD_IN);
-- if (IS_ERR(gpio))
-+ if (IS_ERR(gpio)) {
-+ r = PTR_ERR(gpio);
- goto err_gpio;
-+ }
-
- ddata->hpd_gpio = gpio;
-
---
-2.10.2
-
diff --git a/patches/drivers/ti/rpmsg/0001-ARM-samples-seccomp-no-m32.patch b/patches/drivers/ti/rpmsg/0001-ARM-samples-seccomp-no-m32.patch
index 766a7a3a53fb77760d4524306a74e1a9afd3d050..40ca8362a92b2ef7e4e410fe1e54d350fb4a4235 100644
--- a/patches/drivers/ti/rpmsg/0001-ARM-samples-seccomp-no-m32.patch
+++ b/patches/drivers/ti/rpmsg/0001-ARM-samples-seccomp-no-m32.patch
@@ -9,7 +9,7 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
1 file changed, 2 insertions(+)
diff --git a/samples/seccomp/Makefile b/samples/seccomp/Makefile
-index ae7ff6f..7659beb 100644
+index bf7cc6b..edb3fab 100644
--- a/samples/seccomp/Makefile
+++ b/samples/seccomp/Makefile
@@ -20,6 +20,7 @@ bpf-direct-objs := bpf-direct.o
@@ -21,10 +21,10 @@ index ae7ff6f..7659beb 100644
# s390 has -m31 flag to build 31 bit binaries
ifndef CONFIG_S390
@@ -46,3 +47,4 @@ ifndef CONFIG_MIPS
- always := $(hostprogs-y)
+ always := $(hostprogs-m)
endif
endif
+endif
--
-2.9.3
+2.10.2
diff --git a/patches/drivers/ti/rtc/0001-ARM-am335x-don-t-reset-or-idle-the-rtc-on-init.patch b/patches/drivers/ti/rtc/0001-ARM-am335x-don-t-reset-or-idle-the-rtc-on-init.patch
deleted file mode 100644
index 12e2e4fe73abd3f0f00db8cee3e977e371694229..0000000000000000000000000000000000000000
--- a/patches/drivers/ti/rtc/0001-ARM-am335x-don-t-reset-or-idle-the-rtc-on-init.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 6e7d33d02124e52978748ddd9627fdea21ac7d92 Mon Sep 17 00:00:00 2001
-From: Matthijs van Duin <matthijsvanduin@gmail.com>
-Date: Fri, 9 Sep 2016 18:51:21 +0200
-Subject: [PATCH] ARM: am335x: don't reset or idle the rtc on init
-
-This fixes a bus error in omap_hwmod_read called from
-omap_rtc_wait_not_busy. The root cause probably lies elsewhere however
-and should be investigated.
-
-Signed-off-by: Matthijs van Duin <matthijsvanduin@gmail.com>
----
- arch/arm/boot/dts/am33xx.dtsi | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
-index 2bbfa1fe9e93..5b31a06b2fe8 100644
---- a/arch/arm/boot/dts/am33xx.dtsi
-+++ b/arch/arm/boot/dts/am33xx.dtsi
-@@ -583,6 +583,8 @@
- interrupts = <75
- 76>;
- ti,hwmods = "rtc";
-+ ti,no-reset-on-init;
-+ ti,no-idle-on-init;
- };
-
- spi0: spi@48030000 {
---
-2.9.3
-
diff --git a/patches/drivers/ti/sgx/0001-HACK-drm-fb_helper-enable-panning-support.patch b/patches/drivers/ti/sgx/0001-HACK-drm-fb_helper-enable-panning-support.patch
deleted file mode 100644
index 5930beba5284aa0d47094df9a50143240a6f42f0..0000000000000000000000000000000000000000
--- a/patches/drivers/ti/sgx/0001-HACK-drm-fb_helper-enable-panning-support.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 2e65df6fb029057b8e2f6981291c3b683c8663c0 Mon Sep 17 00:00:00 2001
-From: Darren Etheridge <detheridge@ti.com>
-Date: Thu, 24 Jul 2014 11:49:28 -0500
-Subject: [PATCH 1/6] HACK: drm/fb_helper: enable panning support
-
-Increase the size of the buffer that is created in the fbdev emulation
-helpers. And fill in the var structure with the amount that was allocated.
-
-Signed-off-by: Darren Etheridge <detheridge@ti.com>
----
- drivers/gpu/drm/drm_fb_cma_helper.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c b/drivers/gpu/drm/drm_fb_cma_helper.c
-index 1fd6eac..843163e 100644
---- a/drivers/gpu/drm/drm_fb_cma_helper.c
-+++ b/drivers/gpu/drm/drm_fb_cma_helper.c
-@@ -28,6 +28,12 @@
-
- #define DEFAULT_FBDEFIO_DELAY_MS 50
-
-+/*
-+ * number of buffers to allocate from CMA pool, often increased for
-+ * double/triple buffering
-+ */
-+#define DRM_NUM_FBDEV_BUFFERS 3
-+
- struct drm_fb_cma {
- struct drm_framebuffer fb;
- struct drm_gem_cma_object *obj[4];
-@@ -403,7 +409,7 @@ int drm_fbdev_cma_create_with_funcs(struct drm_fb_helper *helper,
- bytes_per_pixel = DIV_ROUND_UP(sizes->surface_bpp, 8);
-
- mode_cmd.width = sizes->surface_width;
-- mode_cmd.height = sizes->surface_height;
-+ mode_cmd.height = sizes->surface_height * DRM_NUM_FBDEV_BUFFERS;
- mode_cmd.pitches[0] = sizes->surface_width * bytes_per_pixel;
- mode_cmd.pixel_format = drm_mode_legacy_fb_format(sizes->surface_bpp,
- sizes->surface_depth);
-@@ -434,7 +440,7 @@ int drm_fbdev_cma_create_with_funcs(struct drm_fb_helper *helper,
- fbi->fbops = &drm_fbdev_cma_ops;
-
- drm_fb_helper_fill_fix(fbi, fb->pitches[0], fb->depth);
-- drm_fb_helper_fill_var(fbi, helper, sizes->fb_width, sizes->fb_height);
-+ drm_fb_helper_fill_var(fbi, helper, sizes->fb_width, sizes->surface_height);
-
- offset = fbi->var.xoffset * bytes_per_pixel;
- offset += fbi->var.yoffset * fb->pitches[0];
---
-2.10.2
-
diff --git a/patches/drivers/ti/sgx/0002-HACK-drm-tilcdc-add-vsync-callback-for-use-in-omaplf.patch b/patches/drivers/ti/sgx/0002-HACK-drm-tilcdc-add-vsync-callback-for-use-in-omaplf.patch
deleted file mode 100644
index 29901ae514e9e02a7c54762badc7f5934f6cc5a5..0000000000000000000000000000000000000000
--- a/patches/drivers/ti/sgx/0002-HACK-drm-tilcdc-add-vsync-callback-for-use-in-omaplf.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 954e7d5791ff176f3b046575a8465c880d4eb536 Mon Sep 17 00:00:00 2001
-From: Darren Etheridge <detheridge@ti.com>
-Date: Fri, 11 Jul 2014 09:15:25 -0500
-Subject: [PATCH 2/6] HACK: drm/tilcdc: add vsync callback for use in omaplfb
- for gpu
-
-Add a vsync callback registration API that is identical to what was done
-for da8xx-fb.c.
-
-Need to find if there is a better way using the DRM infrastructure from
-kernel space. Either that or change the userspace window manager stuff in
-the gpu libraries to make use of the DRM provided syncronization
-mechanisms.
-
-Signed-off-by: Darren Etheridge <detheridge@ti.com>
----
- drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 33 +++++++++++++++++++++++++++++++++
- drivers/gpu/drm/tilcdc/tilcdc_drv.h | 5 +++++
- 2 files changed, 38 insertions(+)
-
-diff --git a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
-index 52ebe8f..062c4d7 100644
---- a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
-+++ b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
-@@ -54,6 +54,10 @@ struct tilcdc_crtc {
- int sync_lost_count;
- bool frame_intact;
- };
-+
-+static vsync_callback_t vsync_cb_handler;
-+static void *vsync_cb_arg;
-+
- #define to_tilcdc_crtc(x) container_of(x, struct tilcdc_crtc, base)
-
- static void unref_worker(struct drm_flip_work *work, void *val)
-@@ -703,6 +707,32 @@ void tilcdc_crtc_update_clk(struct drm_crtc *crtc)
-
- #define SYNC_LOST_COUNT_LIMIT 50
-
-+int register_vsync_cb(vsync_callback_t handler, void *arg, int idx)
-+{
-+ if ((vsync_cb_handler == NULL) && (vsync_cb_arg == NULL)) {
-+ vsync_cb_arg = arg;
-+ vsync_cb_handler = handler;
-+ } else {
-+ return -EEXIST;
-+ }
-+
-+ return 0;
-+}
-+EXPORT_SYMBOL(register_vsync_cb);
-+
-+int unregister_vsync_cb(vsync_callback_t handler, void *arg, int idx)
-+{
-+ if ((vsync_cb_handler == handler) && (vsync_cb_arg == arg)) {
-+ vsync_cb_handler = NULL;
-+ vsync_cb_arg = NULL;
-+ } else {
-+ return -ENXIO;
-+ }
-+
-+ return 0;
-+}
-+EXPORT_SYMBOL(unregister_vsync_cb);
-+
- irqreturn_t tilcdc_crtc_irq(struct drm_crtc *crtc)
- {
- struct tilcdc_crtc *tilcdc_crtc = to_tilcdc_crtc(crtc);
-@@ -746,6 +776,9 @@ irqreturn_t tilcdc_crtc_irq(struct drm_crtc *crtc)
- if (event)
- drm_crtc_send_vblank_event(crtc, event);
-
-+ if (vsync_cb_handler)
-+ vsync_cb_handler(vsync_cb_arg);
-+
- spin_unlock_irqrestore(&dev->event_lock, flags);
- }
-
-diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.h b/drivers/gpu/drm/tilcdc/tilcdc_drv.h
-index 9780c37..3c62b3a 100644
---- a/drivers/gpu/drm/tilcdc/tilcdc_drv.h
-+++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.h
-@@ -179,4 +179,9 @@ int tilcdc_crtc_update_fb(struct drm_crtc *crtc,
-
- int tilcdc_plane_init(struct drm_device *dev, struct drm_plane *plane);
-
-+/* used by SGX OMAPLFB drvier */
-+typedef void (*vsync_callback_t)(void *arg);
-+int register_vsync_cb(vsync_callback_t handler, void *arg, int idx);
-+int unregister_vsync_cb(vsync_callback_t handler, void *arg, int idx);
-+
- #endif /* __TILCDC_DRV_H__ */
---
-2.10.2
-
diff --git a/patches/drivers/ti/sgx/0003-ARM-OMAP2-Use-pdata-quirks-for-sgx-deassert_hardrese.patch b/patches/drivers/ti/sgx/0003-ARM-OMAP2-Use-pdata-quirks-for-sgx-deassert_hardrese.patch
deleted file mode 100644
index 05ccdfb309300d21d4b91819e82d2bf3ada38135..0000000000000000000000000000000000000000
--- a/patches/drivers/ti/sgx/0003-ARM-OMAP2-Use-pdata-quirks-for-sgx-deassert_hardrese.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 3f25636595e55d60bcbeb379c06b13969a2721dd Mon Sep 17 00:00:00 2001
-From: Darren Etheridge <detheridge@ti.com>
-Date: Fri, 25 Jul 2014 16:09:53 -0500
-Subject: [PATCH 3/6] ARM: OMAP2+: Use pdata-quirks for sgx deassert_hardreset
-
-Use pdata_quirks to provide platform data to the sgx driver.
-The data that is provided includes:
-
-1) Function pointers for the driver to use to reset the h/w block.
-2) The reset name that matches with what is used in hwmod.
-
-Signed-off-by: Darren Etheridge <detheridge@ti.com>
----
- arch/arm/mach-omap2/pdata-quirks.c | 12 ++++++++++++
- include/linux/platform_data/sgx-omap.h | 22 ++++++++++++++++++++++
- 2 files changed, 34 insertions(+)
- create mode 100644 include/linux/platform_data/sgx-omap.h
-
-diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c
-index 05e20aa..964598f6 100644
---- a/arch/arm/mach-omap2/pdata-quirks.c
-+++ b/arch/arm/mach-omap2/pdata-quirks.c
-@@ -25,6 +25,7 @@
- #include <linux/platform_data/iommu-omap.h>
- #include <linux/platform_data/wkup_m3.h>
- #include <linux/platform_data/pwm_omap_dmtimer.h>
-+#include <linux/platform_data/sgx-omap.h>
- #include <linux/platform_data/media/ir-rx51.h>
- #include <linux/platform_data/asoc-ti-mcbsp.h>
- #include <plat/dmtimer.h>
-@@ -49,6 +50,13 @@ struct pdata_init {
- static struct of_dev_auxdata omap_auxdata_lookup[];
- static struct twl4030_gpio_platform_data twl_gpio_auxdata;
-
-+#if defined(CONFIG_SOC_AM33XX) || defined(CONFIG_SOC_AM43XX)
-+static struct gfx_sgx_platform_data gfx_pdata = {
-+ .reset_name = "gfx",
-+ .deassert_reset = omap_device_deassert_hardreset,
-+};
-+#endif
-+
- #ifdef CONFIG_MACH_NOKIA_N8X0
- static void __init omap2420_n8x0_legacy_init(void)
- {
-@@ -553,6 +561,10 @@ static struct of_dev_auxdata omap_auxdata_lookup[] __initdata = {
- OF_DEV_AUXDATA("ti,am4372-wkup-m3", 0x44d00000, "44d00000.wkup_m3",
- &wkup_m3_data),
- #endif
-+#if defined(CONFIG_SOC_AM33XX) || defined(CONFIG_SOC_AM43XX)
-+ OF_DEV_AUXDATA("ti,sgx", 0x56000000, "56000000.sgx",
-+ &gfx_pdata),
-+#endif
- #if IS_ENABLED(CONFIG_OMAP_DM_TIMER)
- OF_DEV_AUXDATA("ti,omap-dmtimer-pwm", 0, NULL, &pwm_dmtimer_pdata),
- #endif
-diff --git a/include/linux/platform_data/sgx-omap.h b/include/linux/platform_data/sgx-omap.h
-new file mode 100644
-index 0000000..aa59b2c
---- /dev/null
-+++ b/include/linux/platform_data/sgx-omap.h
-@@ -0,0 +1,22 @@
-+/*
-+ * SGX Graphics Driver Platform Data
-+ *
-+ * Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/
-+ * Darren Etheridge <detheridge@ti.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.
-+ *
-+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
-+ * kind, whether express or implied; without even the implied warranty
-+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ */
-+#include <linux/platform_device.h>
-+
-+struct gfx_sgx_platform_data {
-+ const char *reset_name;
-+
-+ int (*deassert_reset)(struct platform_device *pdev, const char *name);
-+};
---
-2.10.2
-
diff --git a/patches/drivers/ti/sgx/0004-ARM-dts-am33xx-add-DT-node-for-gpu.patch b/patches/drivers/ti/sgx/0004-ARM-dts-am33xx-add-DT-node-for-gpu.patch
deleted file mode 100644
index 8b0b469b44c4dbc3dec88b38cb3ed513895d9131..0000000000000000000000000000000000000000
--- a/patches/drivers/ti/sgx/0004-ARM-dts-am33xx-add-DT-node-for-gpu.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 20171b32feee4ebc11339e95cc9664fd43123d95 Mon Sep 17 00:00:00 2001
-From: Darren Etheridge <detheridge@ti.com>
-Date: Fri, 18 Jul 2014 16:19:54 -0500
-Subject: [PATCH 4/6] ARM: dts: am33xx: add DT node for gpu
-
-Add the node into the am33xx.dtsi file for the SGX GPU
-that is found in some variants of the SoC.
-
-Signed-off-by: Darren Etheridge <detheridge@ti.com>
----
- arch/arm/boot/dts/am33xx.dtsi | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
-index 3f609c8..0117413 100644
---- a/arch/arm/boot/dts/am33xx.dtsi
-+++ b/arch/arm/boot/dts/am33xx.dtsi
-@@ -1048,6 +1048,13 @@
- reg = <0x48310000 0x2000>;
- interrupts = <111>;
- };
-+
-+ sgx@0x56000000 {
-+ compatible = "ti,sgx";
-+ ti,hwmods = "gfx";
-+ reg = <0x56000000 0x1000000>;
-+ interrupts = <37>;
-+ };
- };
- };
-
---
-2.10.2
-
diff --git a/patches/drivers/ti/sgx/0005-Revert-ARM-reduce-visibility-of-dmac_-functions.patch b/patches/drivers/ti/sgx/0005-Revert-ARM-reduce-visibility-of-dmac_-functions.patch
deleted file mode 100644
index 08e04307df29c2f412f906fa6bf8312faa0adf38..0000000000000000000000000000000000000000
--- a/patches/drivers/ti/sgx/0005-Revert-ARM-reduce-visibility-of-dmac_-functions.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From df2d6cb53948d9f0641c72ae643eba19f13066b8 Mon Sep 17 00:00:00 2001
-From: Robert Nelson <robertcnelson@gmail.com>
-Date: Mon, 4 Jan 2016 11:00:59 -0600
-Subject: [PATCH 5/6] Revert "ARM: reduce visibility of dmac_* functions"
-
-This reverts commit 1234e3fda9aa24b2d650bbcd9ef09d5f6a12dc86.
-
-Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
----
- arch/arm/include/asm/cacheflush.h | 4 ++++
- arch/arm/include/asm/glue-cache.h | 2 ++
- arch/arm/mm/dma-mapping.c | 1 -
- arch/arm/mm/dma.h | 32 --------------------------------
- 4 files changed, 6 insertions(+), 33 deletions(-)
- delete mode 100644 arch/arm/mm/dma.h
-
-diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
-index bdd283b..b8039a6 100644
---- a/arch/arm/include/asm/cacheflush.h
-+++ b/arch/arm/include/asm/cacheflush.h
-@@ -140,6 +140,8 @@ extern struct cpu_cache_fns cpu_cache;
- * is visible to DMA, or data written by DMA to system memory is
- * visible to the CPU.
- */
-+#define dmac_map_area cpu_cache.dma_map_area
-+#define dmac_unmap_area cpu_cache.dma_unmap_area
- #define dmac_flush_range cpu_cache.dma_flush_range
-
- #else
-@@ -159,6 +161,8 @@ extern void __cpuc_flush_dcache_area(void *, size_t);
- * is visible to DMA, or data written by DMA to system memory is
- * visible to the CPU.
- */
-+extern void dmac_map_area(const void *, size_t, int);
-+extern void dmac_unmap_area(const void *, size_t, int);
- extern void dmac_flush_range(const void *, const void *);
-
- #endif
-diff --git a/arch/arm/include/asm/glue-cache.h b/arch/arm/include/asm/glue-cache.h
-index 01c3d92..9f94cba 100644
---- a/arch/arm/include/asm/glue-cache.h
-+++ b/arch/arm/include/asm/glue-cache.h
-@@ -154,6 +154,8 @@ static inline void nop_dma_unmap_area(const void *s, size_t l, int f) { }
- #define __cpuc_coherent_user_range __glue(_CACHE,_coherent_user_range)
- #define __cpuc_flush_dcache_area __glue(_CACHE,_flush_kern_dcache_area)
-
-+#define dmac_map_area __glue(_CACHE,_dma_map_area)
-+#define dmac_unmap_area __glue(_CACHE,_dma_unmap_area)
- #define dmac_flush_range __glue(_CACHE,_dma_flush_range)
- #endif
-
-diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
-index ab77100..12ddd32 100644
---- a/arch/arm/mm/dma-mapping.c
-+++ b/arch/arm/mm/dma-mapping.c
-@@ -39,7 +39,6 @@
- #include <asm/system_info.h>
- #include <asm/dma-contiguous.h>
-
--#include "dma.h"
- #include "mm.h"
-
- struct arm_dma_alloc_args {
-diff --git a/arch/arm/mm/dma.h b/arch/arm/mm/dma.h
-deleted file mode 100644
-index 70ea6852..0000000
---- a/arch/arm/mm/dma.h
-+++ /dev/null
-@@ -1,32 +0,0 @@
--#ifndef DMA_H
--#define DMA_H
--
--#include <asm/glue-cache.h>
--
--#ifndef MULTI_CACHE
--#define dmac_map_area __glue(_CACHE,_dma_map_area)
--#define dmac_unmap_area __glue(_CACHE,_dma_unmap_area)
--
--/*
-- * These are private to the dma-mapping API. Do not use directly.
-- * Their sole purpose is to ensure that data held in the cache
-- * is visible to DMA, or data written by DMA to system memory is
-- * visible to the CPU.
-- */
--extern void dmac_map_area(const void *, size_t, int);
--extern void dmac_unmap_area(const void *, size_t, int);
--
--#else
--
--/*
-- * These are private to the dma-mapping API. Do not use directly.
-- * Their sole purpose is to ensure that data held in the cache
-- * is visible to DMA, or data written by DMA to system memory is
-- * visible to the CPU.
-- */
--#define dmac_map_area cpu_cache.dma_map_area
--#define dmac_unmap_area cpu_cache.dma_unmap_area
--
--#endif
--
--#endif
---
-2.10.2
-
diff --git a/patches/drivers/ti/sgx/0006-arm-Export-cache-flush-management-symbols-when-MULTI.patch b/patches/drivers/ti/sgx/0006-arm-Export-cache-flush-management-symbols-when-MULTI.patch
deleted file mode 100644
index 7f6b30b25b67a53114d81031d689adfc6343151a..0000000000000000000000000000000000000000
--- a/patches/drivers/ti/sgx/0006-arm-Export-cache-flush-management-symbols-when-MULTI.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 1f6c6f6ef1c0d687de7e376cb92fb1de6c1ca7de Mon Sep 17 00:00:00 2001
-From: Pantelis Antoniou <panto@antoniou-consulting.com>
-Date: Fri, 4 Jan 2013 00:32:33 +0200
-Subject: [PATCH 6/6] arm: Export cache flush management symbols when
- !MULTI_CACHE
-
-When compiling a kernel without CONFIG_MULTI_CACHE enabled the
-dma access functions end up not being exported. Fix it.
-
-Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
----
- arch/arm/kernel/setup.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
-index 34e3f3c..3325965 100644
---- a/arch/arm/kernel/setup.c
-+++ b/arch/arm/kernel/setup.c
-@@ -1292,3 +1292,12 @@ const struct seq_operations cpuinfo_op = {
- .stop = c_stop,
- .show = c_show
- };
-+
-+/* export the cache management functions */
-+#ifndef MULTI_CACHE
-+
-+EXPORT_SYMBOL(__glue(_CACHE,_dma_map_area));
-+EXPORT_SYMBOL(__glue(_CACHE,_dma_unmap_area));
-+EXPORT_SYMBOL(__glue(_CACHE,_dma_flush_range));
-+
-+#endif
---
-2.10.2
-
diff --git a/patches/drivers/ti/uio/0001-Making-the-uio-pruss-driver-work.patch b/patches/drivers/ti/uio/0001-Making-the-uio-pruss-driver-work.patch
index 5f9f69cef4d3273ca7ec0e67284c1060fd651bf8..3e18ed9b263473f4253e661dd2242a98bd6462d0 100644
--- a/patches/drivers/ti/uio/0001-Making-the-uio-pruss-driver-work.patch
+++ b/patches/drivers/ti/uio/0001-Making-the-uio-pruss-driver-work.patch
@@ -12,7 +12,7 @@ Subject: [PATCH] Making the uio pruss driver work
5 files changed, 139 insertions(+), 8 deletions(-)
diff --git a/Documentation/devicetree/bindings/arm/omap/omap.txt b/Documentation/devicetree/bindings/arm/omap/omap.txt
-index 94b57f2..413aeed 100644
+index f53e2ee..29bc4fe 100644
--- a/Documentation/devicetree/bindings/arm/omap/omap.txt
+++ b/Documentation/devicetree/bindings/arm/omap/omap.txt
@@ -24,6 +24,8 @@ Optional properties:
@@ -25,10 +25,10 @@ index 94b57f2..413aeed 100644
Example:
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
-index 98748c6..386d044 100644
+index 4efb3f5..ee36d6f 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
-@@ -561,6 +561,17 @@
+@@ -566,6 +566,17 @@
ti,timer-pwm;
};
@@ -47,7 +47,7 @@ index 98748c6..386d044 100644
compatible = "ti,am3352-rtc", "ti,da830-rtc";
reg = <0x44e3e000 0x1000>;
diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
-index e920dd8..2ea553d 100644
+index 3133fe8..f5eff35 100644
--- a/arch/arm/mach-omap2/omap_device.c
+++ b/arch/arm/mach-omap2/omap_device.c
@@ -138,8 +138,8 @@ static int omap_device_build_from_dt(struct platform_device *pdev)
@@ -89,7 +89,7 @@ index e920dd8..2ea553d 100644
odbfd_exit1:
kfree(hwmods);
diff --git a/drivers/uio/Kconfig b/drivers/uio/Kconfig
-index 52c98ce..05400bc0 100644
+index 7e8dc78..e0c68ac 100644
--- a/drivers/uio/Kconfig
+++ b/drivers/uio/Kconfig
@@ -129,7 +129,7 @@ config UIO_PRUSS
@@ -102,7 +102,7 @@ index 52c98ce..05400bc0 100644
driver is available from below SVN repo - you may use anonymous login
diff --git a/drivers/uio/uio_pruss.c b/drivers/uio/uio_pruss.c
-index ca9e2fa..6559752 100644
+index 31d5b1d..dbe8ec8 100644
--- a/drivers/uio/uio_pruss.c
+++ b/drivers/uio/uio_pruss.c
@@ -19,6 +19,7 @@
@@ -136,9 +136,9 @@ index ca9e2fa..6559752 100644
sram_pool_sz);
+#endif
kfree(gdev->info);
+ clk_disable(gdev->pruss_clk);
clk_put(gdev->pruss_clk);
- kfree(gdev);
-@@ -120,9 +128,15 @@ static int pruss_probe(struct platform_device *pdev)
+@@ -121,9 +129,15 @@ static int pruss_probe(struct platform_device *pdev)
struct uio_info *p;
struct uio_pruss_dev *gdev;
struct resource *regs_prussio;
@@ -154,7 +154,7 @@ index ca9e2fa..6559752 100644
gdev = kzalloc(sizeof(struct uio_pruss_dev), GFP_KERNEL);
if (!gdev)
-@@ -133,7 +147,7 @@ static int pruss_probe(struct platform_device *pdev)
+@@ -134,7 +148,7 @@ static int pruss_probe(struct platform_device *pdev)
kfree(gdev);
return -ENOMEM;
}
@@ -163,9 +163,9 @@ index ca9e2fa..6559752 100644
/* Power on PRU in case its not done as part of boot-loader */
gdev->pruss_clk = clk_get(dev, "pruss");
if (IS_ERR(gdev->pruss_clk)) {
-@@ -145,8 +159,25 @@ static int pruss_probe(struct platform_device *pdev)
- } else {
- clk_enable(gdev->pruss_clk);
+@@ -153,8 +167,25 @@ static int pruss_probe(struct platform_device *pdev)
+ return ret;
+ }
}
+#endif
+
@@ -190,7 +190,7 @@ index ca9e2fa..6559752 100644
if (!regs_prussio) {
dev_err(dev, "No PRUSS I/O resource specified\n");
goto out_free;
-@@ -157,7 +188,50 @@ static int pruss_probe(struct platform_device *pdev)
+@@ -165,7 +196,50 @@ static int pruss_probe(struct platform_device *pdev)
goto out_free;
}
@@ -242,7 +242,7 @@ index ca9e2fa..6559752 100644
gdev->sram_pool = pdata->sram_pool;
gdev->sram_vaddr =
(unsigned long)gen_pool_dma_alloc(gdev->sram_pool,
-@@ -182,7 +256,17 @@ static int pruss_probe(struct platform_device *pdev)
+@@ -190,7 +264,17 @@ static int pruss_probe(struct platform_device *pdev)
goto out_free;
}
@@ -261,7 +261,7 @@ index ca9e2fa..6559752 100644
gdev->hostirq_start = platform_get_irq(pdev, 0);
for (cnt = 0, p = gdev->info; cnt < MAX_PRUSS_EVT; cnt++, p++) {
-@@ -190,6 +274,7 @@ static int pruss_probe(struct platform_device *pdev)
+@@ -198,6 +282,7 @@ static int pruss_probe(struct platform_device *pdev)
p->mem[0].size = resource_size(regs_prussio);
p->mem[0].memtype = UIO_MEM_PHYS;
@@ -269,7 +269,7 @@ index ca9e2fa..6559752 100644
p->mem[1].addr = gdev->sram_paddr;
p->mem[1].size = sram_pool_sz;
p->mem[1].memtype = UIO_MEM_PHYS;
-@@ -197,7 +282,11 @@ static int pruss_probe(struct platform_device *pdev)
+@@ -205,7 +290,11 @@ static int pruss_probe(struct platform_device *pdev)
p->mem[2].addr = gdev->ddr_paddr;
p->mem[2].size = extram_pool_sz;
p->mem[2].memtype = UIO_MEM_PHYS;
@@ -282,7 +282,7 @@ index ca9e2fa..6559752 100644
p->name = kasprintf(GFP_KERNEL, "pruss_evt%d", cnt);
p->version = DRV_VERSION;
-@@ -227,11 +316,20 @@ static int pruss_remove(struct platform_device *dev)
+@@ -235,11 +324,20 @@ static int pruss_remove(struct platform_device *dev)
return 0;
}
@@ -304,5 +304,5 @@ index ca9e2fa..6559752 100644
};
--
-2.9.3
+2.10.2
diff --git a/patches/drivers/tinydrm/0001-merge-tinydrm.patch b/patches/drivers/tinydrm/0001-merge-tinydrm.patch
index f1ac064c9f1fde3016ca545336867921c001d2d3..9b0486af8381fdd48e95c8d900ecef785aff4730 100644
--- a/patches/drivers/tinydrm/0001-merge-tinydrm.patch
+++ b/patches/drivers/tinydrm/0001-merge-tinydrm.patch
@@ -1,6 +1,6 @@
-From a60588bf5e7bd0173661947aaa5f951765042745 Mon Sep 17 00:00:00 2001
+From c30ce6e1ecf1c9026940ae0ec8667d0de8efdf47 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Tue, 20 Dec 2016 13:56:28 -0600
+Date: Tue, 13 Dec 2016 14:10:42 -0600
Subject: [PATCH] merge: tinydrm
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
@@ -52,26 +52,26 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
create mode 100644 include/uapi/drm/utinydrm.h
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
-index 483059a22b1b..c882d09d8279 100644
+index ebfe840..0b1d655 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
-@@ -300,3 +300,4 @@ config DRM_SAVAGE
+@@ -321,3 +321,4 @@ config DRM_SAVAGE
chipset. If M is selected the module will be called savage.
endif # DRM_LEGACY
+source "drivers/gpu/drm/tinydrm/Kconfig"
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
-index 25c720454017..11c4b8e7ecd8 100644
+index b9ae428..da26c96 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
-@@ -86,3 +86,4 @@ obj-$(CONFIG_DRM_FSL_DCU) += fsl-dcu/
- obj-$(CONFIG_DRM_ETNAVIV) += etnaviv/
- obj-$(CONFIG_DRM_ARCPGU)+= arc/
+@@ -91,3 +91,4 @@ obj-$(CONFIG_DRM_ARCPGU)+= arc/
obj-y += hisilicon/
+ obj-$(CONFIG_DRM_ZTE) += zte/
+ obj-$(CONFIG_DRM_MXSFB) += mxsfb/
+obj-$(CONFIG_DRM_TINYDRM)+= tinydrm/
diff --git a/drivers/gpu/drm/tinydrm/Kconfig b/drivers/gpu/drm/tinydrm/Kconfig
new file mode 100644
-index 000000000000..38a073e9a498
+index 0000000..38a073e
--- /dev/null
+++ b/drivers/gpu/drm/tinydrm/Kconfig
@@ -0,0 +1,38 @@
@@ -115,7 +115,7 @@ index 000000000000..38a073e9a498
+ choose 'm' here: the module will be called utinydrm.
diff --git a/drivers/gpu/drm/tinydrm/Makefile b/drivers/gpu/drm/tinydrm/Makefile
new file mode 100644
-index 000000000000..7417a5eff617
+index 0000000..7417a5e
--- /dev/null
+++ b/drivers/gpu/drm/tinydrm/Makefile
@@ -0,0 +1,11 @@
@@ -132,7 +132,7 @@ index 000000000000..7417a5eff617
+obj-$(CONFIG_TINYDRM_USER) += utinydrm.o
diff --git a/drivers/gpu/drm/tinydrm/adafruit-tft.c b/drivers/gpu/drm/tinydrm/adafruit-tft.c
new file mode 100644
-index 000000000000..ef89c1b6b0e6
+index 0000000..ef89c1b
--- /dev/null
+++ b/drivers/gpu/drm/tinydrm/adafruit-tft.c
@@ -0,0 +1,394 @@
@@ -532,7 +532,7 @@ index 000000000000..ef89c1b6b0e6
+MODULE_LICENSE("GPL");
diff --git a/drivers/gpu/drm/tinydrm/core/Makefile b/drivers/gpu/drm/tinydrm/core/Makefile
new file mode 100644
-index 000000000000..c672d89dce9b
+index 0000000..c672d89
--- /dev/null
+++ b/drivers/gpu/drm/tinydrm/core/Makefile
@@ -0,0 +1,7 @@
@@ -545,7 +545,7 @@ index 000000000000..c672d89dce9b
+obj-$(CONFIG_DRM_TINYDRM) += tinydrm.o
diff --git a/drivers/gpu/drm/tinydrm/core/tinydrm-core.c b/drivers/gpu/drm/tinydrm/core/tinydrm-core.c
new file mode 100644
-index 000000000000..da55c2c5dc59
+index 0000000..da55c2c
--- /dev/null
+++ b/drivers/gpu/drm/tinydrm/core/tinydrm-core.c
@@ -0,0 +1,411 @@
@@ -962,7 +962,7 @@ index 000000000000..da55c2c5dc59
+MODULE_LICENSE("GPL");
diff --git a/drivers/gpu/drm/tinydrm/core/tinydrm-debugfs.c b/drivers/gpu/drm/tinydrm/core/tinydrm-debugfs.c
new file mode 100644
-index 000000000000..0c701464ef83
+index 0000000..0c70146
--- /dev/null
+++ b/drivers/gpu/drm/tinydrm/core/tinydrm-debugfs.c
@@ -0,0 +1,439 @@
@@ -1407,7 +1407,7 @@ index 000000000000..0c701464ef83
+EXPORT_SYMBOL(tinydrm_debugfs_cleanup);
diff --git a/drivers/gpu/drm/tinydrm/core/tinydrm-fb.c b/drivers/gpu/drm/tinydrm/core/tinydrm-fb.c
new file mode 100644
-index 000000000000..3150754695d3
+index 0000000..3150754
--- /dev/null
+++ b/drivers/gpu/drm/tinydrm/core/tinydrm-fb.c
@@ -0,0 +1,182 @@
@@ -1595,7 +1595,7 @@ index 000000000000..3150754695d3
+EXPORT_SYMBOL(tinydrm_fbdev_fini);
diff --git a/drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c b/drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c
new file mode 100644
-index 000000000000..27683e90e8da
+index 0000000..27683e9
--- /dev/null
+++ b/drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c
@@ -0,0 +1,222 @@
@@ -1823,7 +1823,7 @@ index 000000000000..27683e90e8da
+EXPORT_SYMBOL(tinydrm_spi_shutdown);
diff --git a/drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c b/drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c
new file mode 100644
-index 000000000000..0751208e4f78
+index 0000000..0751208
--- /dev/null
+++ b/drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c
@@ -0,0 +1,247 @@
@@ -2076,7 +2076,7 @@ index 000000000000..0751208e4f78
+EXPORT_SYMBOL(tinydrm_display_pipe_init);
diff --git a/drivers/gpu/drm/tinydrm/core/tinydrm-regmap.c b/drivers/gpu/drm/tinydrm/core/tinydrm-regmap.c
new file mode 100644
-index 000000000000..15a879c6d6b0
+index 0000000..15a879c
--- /dev/null
+++ b/drivers/gpu/drm/tinydrm/core/tinydrm-regmap.c
@@ -0,0 +1,326 @@
@@ -2408,7 +2408,7 @@ index 000000000000..15a879c6d6b0
+#endif /* CONFIG_SPI */
diff --git a/drivers/gpu/drm/tinydrm/mi0283qt.c b/drivers/gpu/drm/tinydrm/mi0283qt.c
new file mode 100644
-index 000000000000..aca2a0483687
+index 0000000..aca2a04
--- /dev/null
+++ b/drivers/gpu/drm/tinydrm/mi0283qt.c
@@ -0,0 +1,310 @@
@@ -2724,7 +2724,7 @@ index 000000000000..aca2a0483687
+MODULE_LICENSE("GPL");
diff --git a/drivers/gpu/drm/tinydrm/mipi-dbi.c b/drivers/gpu/drm/tinydrm/mipi-dbi.c
new file mode 100644
-index 000000000000..0a074a20c605
+index 0000000..0a074a2
--- /dev/null
+++ b/drivers/gpu/drm/tinydrm/mipi-dbi.c
@@ -0,0 +1,1087 @@
@@ -3817,7 +3817,7 @@ index 000000000000..0a074a20c605
+MODULE_LICENSE("GPL");
diff --git a/drivers/gpu/drm/tinydrm/utinydrm.c b/drivers/gpu/drm/tinydrm/utinydrm.c
new file mode 100644
-index 000000000000..14ac47ce64b4
+index 0000000..14ac47c
--- /dev/null
+++ b/drivers/gpu/drm/tinydrm/utinydrm.c
@@ -0,0 +1,652 @@
@@ -4475,7 +4475,7 @@ index 000000000000..14ac47ce64b4
+MODULE_LICENSE("GPL");
diff --git a/include/drm/tinydrm/hx8340.h b/include/drm/tinydrm/hx8340.h
new file mode 100644
-index 000000000000..4fc975f698a3
+index 0000000..4fc975f
--- /dev/null
+++ b/include/drm/tinydrm/hx8340.h
@@ -0,0 +1,46 @@
@@ -4527,7 +4527,7 @@ index 000000000000..4fc975f698a3
+#endif /* __LINUX_HX8340_H */
diff --git a/include/drm/tinydrm/ili9341.h b/include/drm/tinydrm/ili9341.h
new file mode 100644
-index 000000000000..807a09f43cad
+index 0000000..807a09f
--- /dev/null
+++ b/include/drm/tinydrm/ili9341.h
@@ -0,0 +1,54 @@
@@ -4587,7 +4587,7 @@ index 000000000000..807a09f43cad
+#endif /* __LINUX_ILI9341_H */
diff --git a/include/drm/tinydrm/mipi-dbi.h b/include/drm/tinydrm/mipi-dbi.h
new file mode 100644
-index 000000000000..e3de909391d5
+index 0000000..e3de909
--- /dev/null
+++ b/include/drm/tinydrm/mipi-dbi.h
@@ -0,0 +1,82 @@
@@ -4675,7 +4675,7 @@ index 000000000000..e3de909391d5
+#endif /* __LINUX_MIPI_DBI_H */
diff --git a/include/drm/tinydrm/st7735r.h b/include/drm/tinydrm/st7735r.h
new file mode 100644
-index 000000000000..f2ba5352b634
+index 0000000..f2ba535
--- /dev/null
+++ b/include/drm/tinydrm/st7735r.h
@@ -0,0 +1,44 @@
@@ -4725,7 +4725,7 @@ index 000000000000..f2ba5352b634
+#endif /* __LINUX_ST7735R_H */
diff --git a/include/drm/tinydrm/tinydrm-helpers.h b/include/drm/tinydrm/tinydrm-helpers.h
new file mode 100644
-index 000000000000..2cf416afd64b
+index 0000000..2cf416a
--- /dev/null
+++ b/include/drm/tinydrm/tinydrm-helpers.h
@@ -0,0 +1,50 @@
@@ -4781,7 +4781,7 @@ index 000000000000..2cf416afd64b
+#endif /* __LINUX_TINYDRM_HELPERS_H */
diff --git a/include/drm/tinydrm/tinydrm-regmap.h b/include/drm/tinydrm/tinydrm-regmap.h
new file mode 100644
-index 000000000000..70a67ed684a5
+index 0000000..70a67ed
--- /dev/null
+++ b/include/drm/tinydrm/tinydrm-regmap.h
@@ -0,0 +1,99 @@
@@ -4886,7 +4886,7 @@ index 000000000000..70a67ed684a5
+#endif /* __LINUX_TINYDRM_REGMAP_H */
diff --git a/include/drm/tinydrm/tinydrm.h b/include/drm/tinydrm/tinydrm.h
new file mode 100644
-index 000000000000..15557420b678
+index 0000000..1555742
--- /dev/null
+++ b/include/drm/tinydrm/tinydrm.h
@@ -0,0 +1,177 @@
@@ -5069,7 +5069,7 @@ index 000000000000..15557420b678
+#endif /* __LINUX_TINYDRM_H */
diff --git a/include/uapi/drm/utinydrm.h b/include/uapi/drm/utinydrm.h
new file mode 100644
-index 000000000000..7d578861fcd3
+index 0000000..7d57886
--- /dev/null
+++ b/include/uapi/drm/utinydrm.h
@@ -0,0 +1,73 @@
@@ -5147,5 +5147,5 @@ index 000000000000..7d578861fcd3
+
+#endif /* _UAPI__UTINYDRM_H_ */
--
-2.11.0
+2.10.2
diff --git a/patches/drivers/tps65217/0001-ARM-dts-tps65217-Specify-the-interrupt-controller.patch b/patches/drivers/tps65217/0001-ARM-dts-tps65217-Specify-the-interrupt-controller.patch
deleted file mode 100644
index 4802606b81f73e0b96f5679557b1afef7695b667..0000000000000000000000000000000000000000
--- a/patches/drivers/tps65217/0001-ARM-dts-tps65217-Specify-the-interrupt-controller.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From c8935c1531ef0a7007ee63e9ece54a0626b0b1c2 Mon Sep 17 00:00:00 2001
-From: Milo Kim <woogyom.kim@gmail.com>
-Date: Fri, 28 Oct 2016 21:36:55 +0900
-Subject: [PATCH 1/9] ARM: dts: tps65217: Specify the interrupt controller
-
-TPS65217 MFD driver supports the IRQ domain to handle the charger input
-interrupts and push button status event. The interrupt controller enables
-corresponding IRQ handling in the charger[*] and power button driver[**].
-
-[*] drivers/power/supply/tps65217_charger.c
-[**] drivers/input/misc/tps65218-pwrbutton.c
-
-Signed-off-by: Milo Kim <woogyom.kim@gmail.com>
----
- arch/arm/boot/dts/tps65217.dtsi | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/arch/arm/boot/dts/tps65217.dtsi b/arch/arm/boot/dts/tps65217.dtsi
-index a632724..27935f8 100644
---- a/arch/arm/boot/dts/tps65217.dtsi
-+++ b/arch/arm/boot/dts/tps65217.dtsi
-@@ -13,6 +13,8 @@
-
- &tps {
- compatible = "ti,tps65217";
-+ interrupt-controller;
-+ #interrupt-cells = <1>;
-
- regulators {
- #address-cells = <1>;
---
-2.10.2
-
diff --git a/patches/drivers/tps65217/0009-HACK-tps65217_pwr_but.patch b/patches/drivers/tps65217/0001-HACK-tps65217_pwr_but.patch
similarity index 100%
rename from patches/drivers/tps65217/0009-HACK-tps65217_pwr_but.patch
rename to patches/drivers/tps65217/0001-HACK-tps65217_pwr_but.patch
diff --git a/patches/drivers/tps65217/0002-ARM-dts-tps65217-Add-the-charger-device.patch b/patches/drivers/tps65217/0002-ARM-dts-tps65217-Add-the-charger-device.patch
deleted file mode 100644
index 6d1b5774db1d52042142a3143233e5dfe46e5aa7..0000000000000000000000000000000000000000
--- a/patches/drivers/tps65217/0002-ARM-dts-tps65217-Add-the-charger-device.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 7e18b51eb2f74d1ea33ced94435e5be7083111c7 Mon Sep 17 00:00:00 2001
-From: Milo Kim <woogyom.kim@gmail.com>
-Date: Fri, 28 Oct 2016 21:36:56 +0900
-Subject: [PATCH 2/9] ARM: dts: tps65217: Add the charger device
-
-Support the charger driver and disable it by default.
-
-Signed-off-by: Milo Kim <woogyom.kim@gmail.com>
----
- arch/arm/boot/dts/tps65217.dtsi | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/arch/arm/boot/dts/tps65217.dtsi b/arch/arm/boot/dts/tps65217.dtsi
-index 27935f8..8f77d0d 100644
---- a/arch/arm/boot/dts/tps65217.dtsi
-+++ b/arch/arm/boot/dts/tps65217.dtsi
-@@ -16,6 +16,11 @@
- interrupt-controller;
- #interrupt-cells = <1>;
-
-+ charger {
-+ compatible = "ti,tps65217-charger";
-+ status = "disabled";
-+ };
-+
- regulators {
- #address-cells = <1>;
- #size-cells = <0>;
---
-2.10.2
-
diff --git a/patches/drivers/tps65217/0003-ARM-dts-tps65217-Add-the-power-button-device.patch b/patches/drivers/tps65217/0003-ARM-dts-tps65217-Add-the-power-button-device.patch
deleted file mode 100644
index ee265e525cfe28a82e41d8b03c3dc9c96b9226dc..0000000000000000000000000000000000000000
--- a/patches/drivers/tps65217/0003-ARM-dts-tps65217-Add-the-power-button-device.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4ce14d862b7cec2d6b964c623ec99fcbe38b5083 Mon Sep 17 00:00:00 2001
-From: Milo Kim <woogyom.kim@gmail.com>
-Date: Fri, 28 Oct 2016 21:36:57 +0900
-Subject: [PATCH 3/9] ARM: dts: tps65217: Add the power button device
-
-Support the power button driver and disable it by default.
-
-Signed-off-by: Milo Kim <woogyom.kim@gmail.com>
----
- arch/arm/boot/dts/tps65217.dtsi | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/arch/arm/boot/dts/tps65217.dtsi b/arch/arm/boot/dts/tps65217.dtsi
-index 8f77d0d..02de56b 100644
---- a/arch/arm/boot/dts/tps65217.dtsi
-+++ b/arch/arm/boot/dts/tps65217.dtsi
-@@ -21,6 +21,11 @@
- status = "disabled";
- };
-
-+ pwrbutton {
-+ compatible = "ti,tps65217-pwrbutton";
-+ status = "disabled";
-+ };
-+
- regulators {
- #address-cells = <1>;
- #size-cells = <0>;
---
-2.10.2
-
diff --git a/patches/drivers/tps65217/0004-ARM-dts-am335x-Support-the-PMIC-interrupt.patch b/patches/drivers/tps65217/0004-ARM-dts-am335x-Support-the-PMIC-interrupt.patch
deleted file mode 100644
index eacaf51c1d2387dc134f84f554c7b20d4708982a..0000000000000000000000000000000000000000
--- a/patches/drivers/tps65217/0004-ARM-dts-am335x-Support-the-PMIC-interrupt.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 341f8a44fb57e2bd461c1c21d2331943b53ce1c6 Mon Sep 17 00:00:00 2001
-From: Milo Kim <woogyom.kim@gmail.com>
-Date: Fri, 28 Oct 2016 21:36:58 +0900
-Subject: [PATCH 4/9] ARM: dts: am335x: Support the PMIC interrupt
-
-AM335x bone based boards have the PMIC interrupt named NMI which is
-connected to TPS65217 device. AM335x main interrupt controller provides it
-and the number is 7.
-
-Signed-off-by: Milo Kim <woogyom.kim@gmail.com>
----
- arch/arm/boot/dts/am335x-bone-common.dtsi | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
-index 007b5e5..25303d9 100644
---- a/arch/arm/boot/dts/am335x-bone-common.dtsi
-+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
-@@ -310,6 +310,10 @@
- * by the hardware problems. (Tip: double-check by performing a current
- * measurement after shutdown: it should be less than 1 mA.)
- */
-+
-+ interrupts = <7>; /* NMI */
-+ interrupt-parent = <&intc>;
-+
- ti,pmic-shutdown-controller;
-
- regulators {
---
-2.10.2
-
diff --git a/patches/drivers/tps65217/0005-dt-bindings-mfd-Provide-human-readable-defines-for-T.patch b/patches/drivers/tps65217/0005-dt-bindings-mfd-Provide-human-readable-defines-for-T.patch
deleted file mode 100644
index 4b367135c51f7820ca21379c414fcef58344a624..0000000000000000000000000000000000000000
--- a/patches/drivers/tps65217/0005-dt-bindings-mfd-Provide-human-readable-defines-for-T.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From bc8f1ded76566e75703380399d77d67922ab18bc Mon Sep 17 00:00:00 2001
-From: Milo Kim <woogyom.kim@gmail.com>
-Date: Fri, 28 Oct 2016 21:36:59 +0900
-Subject: [PATCH 5/9] dt-bindings: mfd: Provide human readable defines for
- TPS65217 interrupts
-
-TPS65217 supports three interrupt sources. This patch enables assigning
-each IRQ number in the charger and power button node. Then corresponding
-IRQ will be requested by each driver.
-
-Signed-off-by: Milo Kim <woogyom.kim@gmail.com>
----
- include/dt-bindings/mfd/tps65217.h | 26 ++++++++++++++++++++++++++
- 1 file changed, 26 insertions(+)
- create mode 100644 include/dt-bindings/mfd/tps65217.h
-
-diff --git a/include/dt-bindings/mfd/tps65217.h b/include/dt-bindings/mfd/tps65217.h
-new file mode 100644
-index 0000000..cafb9e6
---- /dev/null
-+++ b/include/dt-bindings/mfd/tps65217.h
-@@ -0,0 +1,26 @@
-+/*
-+ * This header provides macros for TI TPS65217 DT bindings.
-+ *
-+ * Copyright (C) 2016 Texas Instruments
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along with
-+ * this program. If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#ifndef __DT_BINDINGS_TPS65217_H__
-+#define __DT_BINDINGS_TPS65217_H__
-+
-+#define TPS65217_IRQ_USB 0
-+#define TPS65217_IRQ_AC 1
-+#define TPS65217_IRQ_PB 2
-+
-+#endif
---
-2.10.2
-
diff --git a/patches/drivers/tps65217/0006-ARM-dts-am335x-Add-the-charger-interrupt.patch b/patches/drivers/tps65217/0006-ARM-dts-am335x-Add-the-charger-interrupt.patch
deleted file mode 100644
index 189b02eddb4126f03e513450186a67530cdeb22b..0000000000000000000000000000000000000000
--- a/patches/drivers/tps65217/0006-ARM-dts-am335x-Add-the-charger-interrupt.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From e55374ce9374dae0066eef8e4193c288c6536eab Mon Sep 17 00:00:00 2001
-From: Milo Kim <woogyom.kim@gmail.com>
-Date: Fri, 28 Oct 2016 21:37:00 +0900
-Subject: [PATCH 6/9] ARM: dts: am335x: Add the charger interrupt
-
-This enables the charger driver gets corresponding IRQ number by using
-platform_get_irq_byname() helper.
-
-Signed-off-by: Milo Kim <woogyom.kim@gmail.com>
----
- arch/arm/boot/dts/am335x-bone-common.dtsi | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
-index 25303d9..cec9d91 100644
---- a/arch/arm/boot/dts/am335x-bone-common.dtsi
-+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
-@@ -6,6 +6,8 @@
- * published by the Free Software Foundation.
- */
-
-+#include <dt-bindings/mfd/tps65217.h>
-+
- / {
- cpus {
- cpu@0 {
-@@ -316,6 +318,12 @@
-
- ti,pmic-shutdown-controller;
-
-+ charger {
-+ interrupts = <TPS65217_IRQ_AC>, <TPS65217_IRQ_USB>;
-+ interrupts-names = "AC", "USB";
-+ status = "okay";
-+ };
-+
- regulators {
- dcdc1_reg: regulator@0 {
- regulator-name = "vdds_dpr";
---
-2.10.2
-
diff --git a/patches/drivers/tps65217/0007-ARM-dts-am335x-Add-the-power-button-interrupt.patch b/patches/drivers/tps65217/0007-ARM-dts-am335x-Add-the-power-button-interrupt.patch
deleted file mode 100644
index 13b534def56e268beee637420e87a433285c5a36..0000000000000000000000000000000000000000
--- a/patches/drivers/tps65217/0007-ARM-dts-am335x-Add-the-power-button-interrupt.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 27cfe40d02ff47105650935a7de900dce2cc6608 Mon Sep 17 00:00:00 2001
-From: Milo Kim <woogyom.kim@gmail.com>
-Date: Fri, 28 Oct 2016 21:37:01 +0900
-Subject: [PATCH 7/9] ARM: dts: am335x: Add the power button interrupt
-
-This enables the power button driver gets corresponding IRQ number by
-using platform_get_irq().
-
-Signed-off-by: Milo Kim <woogyom.kim@gmail.com>
----
- arch/arm/boot/dts/am335x-bone-common.dtsi | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
-index cec9d91..0c0a90c 100644
---- a/arch/arm/boot/dts/am335x-bone-common.dtsi
-+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
-@@ -324,6 +324,11 @@
- status = "okay";
- };
-
-+ pwrbutton {
-+ interrupts = <TPS65217_IRQ_PB>;
-+ status = "okay";
-+ };
-+
- regulators {
- dcdc1_reg: regulator@0 {
- regulator-name = "vdds_dpr";
---
-2.10.2
-
diff --git a/patches/drivers/tps65217/0008-mfd-tps65217-Fix-mismatched-interrupt-number.patch b/patches/drivers/tps65217/0008-mfd-tps65217-Fix-mismatched-interrupt-number.patch
deleted file mode 100644
index 790fe450aba19fa6ed9e5ed0144f1cad3a219a0f..0000000000000000000000000000000000000000
--- a/patches/drivers/tps65217/0008-mfd-tps65217-Fix-mismatched-interrupt-number.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 7302a9421fc213a17f2796b1ac12d9874011aa5b Mon Sep 17 00:00:00 2001
-From: Milo Kim <woogyom.kim@gmail.com>
-Date: Fri, 28 Oct 2016 21:37:02 +0900
-Subject: [PATCH 8/9] mfd: tps65217: Fix mismatched interrupt number
-
-Enum value of 'tps65217_irq_type' is not matched with DT parsed hwirq
-number[*].
-
-The MFD driver gets the IRQ data by referencing hwirq, but the value is
-different. So, irq_to_tps65217_irq() returns mismatched IRQ data.
-Eventually, the power button driver enables not PB but USB interrupt
-when it is probed.
-
-According to the TPS65217 register map[**], USB interrupt is the LSB.
-This patch defines synchronized IRQ value.
-
-[*] include/dt-bindings/mfd/tps65217.h
-[**] http://www.ti.com/lit/ds/symlink/tps65217.pdf
-
-Signed-off-by: Milo Kim <woogyom.kim@gmail.com>
----
- include/linux/mfd/tps65217.h | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/include/linux/mfd/tps65217.h b/include/linux/mfd/tps65217.h
-index 4ccda89..3cbec4b 100644
---- a/include/linux/mfd/tps65217.h
-+++ b/include/linux/mfd/tps65217.h
-@@ -234,12 +234,11 @@ struct tps65217_bl_pdata {
- int dft_brightness;
- };
-
--enum tps65217_irq_type {
-- TPS65217_IRQ_PB,
-- TPS65217_IRQ_AC,
-- TPS65217_IRQ_USB,
-- TPS65217_NUM_IRQ
--};
-+/* Interrupt numbers */
-+#define TPS65217_IRQ_USB 0
-+#define TPS65217_IRQ_AC 1
-+#define TPS65217_IRQ_PB 2
-+#define TPS65217_NUM_IRQ 3
-
- /**
- * struct tps65217_board - packages regulator init data
---
-2.10.2
-
diff --git a/patches/ref_omap2plus_defconfig b/patches/ref_omap2plus_defconfig
index 666086cdb48d0d7aa6e970f5e7413286e84a36e1..4eaba57a35a258e2d97deb9a346928b0d1dbde4e 100644
--- a/patches/ref_omap2plus_defconfig
+++ b/patches/ref_omap2plus_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.9.0 Kernel Configuration
+# Linux/arm 4.10.0-rc1 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -157,6 +157,7 @@ CONFIG_RD_LZMA=y
CONFIG_RD_XZ=y
CONFIG_RD_LZO=y
CONFIG_RD_LZ4=y
+CONFIG_INITRAMFS_COMPRESSION=".gz"
CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_SYSCTL=y
@@ -169,6 +170,7 @@ CONFIG_MULTIUSER=y
# CONFIG_SGETMASK_SYSCALL is not set
CONFIG_SYSFS_SYSCALL=y
# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_POSIX_TIMERS=y
CONFIG_KALLSYMS=y
CONFIG_KALLSYMS_ALL=y
# CONFIG_KALLSYMS_ABSOLUTE_PERCPU is not set
@@ -286,8 +288,10 @@ CONFIG_LBDAF=y
# CONFIG_BLK_DEV_BSG is not set
# CONFIG_BLK_DEV_BSGLIB is not set
# CONFIG_BLK_DEV_INTEGRITY is not set
+# CONFIG_BLK_DEV_ZONED is not set
# CONFIG_BLK_DEV_THROTTLING is not set
# CONFIG_BLK_CMDLINE_PARSER is not set
+# CONFIG_BLK_WBT is not set
#
# Partition Types
@@ -326,6 +330,7 @@ CONFIG_DEFAULT_CFQ=y
CONFIG_DEFAULT_IOSCHED="cfq"
CONFIG_UNINLINE_SPIN_UNLOCK=y
CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
+CONFIG_MUTEX_SPIN_ON_OWNER=y
CONFIG_RWSEM_SPIN_ON_OWNER=y
CONFIG_LOCK_SPIN_ON_OWNER=y
CONFIG_FREEZER=y
@@ -395,9 +400,6 @@ CONFIG_ARCH_OMAP=y
CONFIG_POWER_AVS_OMAP=y
CONFIG_POWER_AVS_OMAP_CLASS3=y
CONFIG_OMAP_RESET_CLOCKS=y
-CONFIG_OMAP_MUX=y
-CONFIG_OMAP_MUX_DEBUG=y
-CONFIG_OMAP_MUX_WARNINGS=y
CONFIG_OMAP_32K_TIMER=y
# CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
CONFIG_OMAP_DM_TIMER=y
@@ -446,6 +448,7 @@ CONFIG_MACH_NOKIA_N8X0=y
# CONFIG_OMAP5_ERRATA_801819 is not set
# CONFIG_ARCH_PICOXCELL is not set
# CONFIG_ARCH_MMP is not set
+# CONFIG_ARCH_OXNAS is not set
# CONFIG_ARCH_QCOM is not set
# CONFIG_ARCH_REALVIEW is not set
# CONFIG_ARCH_ROCKCHIP is not set
@@ -682,7 +685,6 @@ CONFIG_CPUFREQ_DT_PLATDEV=y
# CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set
# CONFIG_ARM_KIRKWOOD_CPUFREQ is not set
# CONFIG_ARM_OMAP2PLUS_CPUFREQ is not set
-# CONFIG_ARM_TI_CPUFREQ is not set
# CONFIG_QORIQ_CPUFREQ is not set
#
@@ -791,6 +793,7 @@ CONFIG_INET_XFRM_MODE_BEET=y
CONFIG_INET_DIAG=y
CONFIG_INET_TCP_DIAG=y
# CONFIG_INET_UDP_DIAG is not set
+# CONFIG_INET_RAW_DIAG is not set
# CONFIG_INET_DIAG_DESTROY is not set
# CONFIG_TCP_CONG_ADVANCED is not set
CONFIG_TCP_CONG_CUBIC=y
@@ -819,6 +822,8 @@ CONFIG_IPV6_NDISC_NODETYPE=y
# CONFIG_IPV6_FOU_TUNNEL is not set
# CONFIG_IPV6_MULTIPLE_TABLES is not set
# CONFIG_IPV6_MROUTE is not set
+# CONFIG_IPV6_SEG6_LWTUNNEL is not set
+# CONFIG_IPV6_SEG6_HMAC is not set
# CONFIG_NETLABEL is not set
# CONFIG_NETWORK_SECMARK is not set
CONFIG_NET_PTP_CLASSIFY=y
@@ -835,6 +840,7 @@ CONFIG_NETFILTER_INGRESS=y
# CONFIG_NETFILTER_NETLINK_QUEUE is not set
# CONFIG_NETFILTER_NETLINK_LOG is not set
# CONFIG_NF_CONNTRACK is not set
+# CONFIG_NF_LOG_NETDEV is not set
# CONFIG_NF_TABLES is not set
# CONFIG_NETFILTER_XTABLES is not set
# CONFIG_IP_SET is not set
@@ -844,6 +850,7 @@ CONFIG_NETFILTER_INGRESS=y
# IP: Netfilter Configuration
#
# CONFIG_NF_DEFRAG_IPV4 is not set
+# CONFIG_NF_SOCKET_IPV4 is not set
# CONFIG_NF_DUP_IPV4 is not set
# CONFIG_NF_LOG_ARP is not set
# CONFIG_NF_LOG_IPV4 is not set
@@ -855,6 +862,7 @@ CONFIG_NETFILTER_INGRESS=y
# IPv6: Netfilter Configuration
#
# CONFIG_NF_DEFRAG_IPV6 is not set
+# CONFIG_NF_SOCKET_IPV6 is not set
# CONFIG_NF_DUP_IPV6 is not set
# CONFIG_NF_REJECT_IPV6 is not set
# CONFIG_NF_LOG_IPV6 is not set
@@ -1063,6 +1071,7 @@ CONFIG_DEV_COREDUMP=y
# CONFIG_DEBUG_DRIVER is not set
# CONFIG_DEBUG_DEVRES is not set
# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
# CONFIG_SYS_HYPERVISOR is not set
# CONFIG_GENERIC_CPU_DEVICES is not set
CONFIG_SOC_BUS=y
@@ -1072,7 +1081,7 @@ CONFIG_REGMAP_SPI=y
CONFIG_REGMAP_MMIO=y
CONFIG_REGMAP_IRQ=y
CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_FENCE_TRACE is not set
+# CONFIG_DMA_FENCE_TRACE is not set
CONFIG_DMA_CMA=y
#
@@ -1187,6 +1196,7 @@ CONFIG_MTD_NAND_IDS=y
# CONFIG_MTD_NAND_NANDSIM is not set
# CONFIG_MTD_NAND_BRCMNAND is not set
# CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_NAND_OXNAS is not set
# CONFIG_MTD_NAND_HISI504 is not set
# CONFIG_MTD_NAND_MTK is not set
CONFIG_MTD_ONENAND=y
@@ -1239,6 +1249,7 @@ CONFIG_BLK_DEV_RAM_SIZE=16384
# CONFIG_ATA_OVER_ETH is not set
# CONFIG_MG_DISK is not set
# CONFIG_BLK_DEV_RBD is not set
+# CONFIG_NVME_FC is not set
# CONFIG_NVME_TARGET is not set
#
@@ -1432,6 +1443,7 @@ CONFIG_NET_CORE=y
# Distributed Switch Architecture drivers
#
CONFIG_ETHERNET=y
+CONFIG_NET_VENDOR_ALACRITECH=y
# CONFIG_ALTERA_TSE is not set
CONFIG_NET_VENDOR_AMAZON=y
# CONFIG_NET_VENDOR_ARC is not set
@@ -1461,6 +1473,7 @@ CONFIG_NET_VENDOR_RENESAS=y
CONFIG_NET_VENDOR_ROCKER=y
# CONFIG_NET_VENDOR_SAMSUNG is not set
# CONFIG_NET_VENDOR_SEEQ is not set
+CONFIG_NET_VENDOR_SOLARFLARE=y
CONFIG_NET_VENDOR_SMSC=y
CONFIG_SMC91X=y
# CONFIG_SMC911X is not set
@@ -1481,6 +1494,7 @@ CONFIG_TI_CPTS=y
# CONFIG_NET_VENDOR_WIZNET is not set
CONFIG_PHYLIB=y
CONFIG_SWPHY=y
+# CONFIG_LED_TRIGGER_PHY is not set
#
# MDIO bus device drivers
@@ -1510,6 +1524,7 @@ CONFIG_FIXED_PHY=y
# CONFIG_LSI_ET1011C_PHY is not set
# CONFIG_LXT_PHY is not set
# CONFIG_MARVELL_PHY is not set
+# CONFIG_MESON_GXL_PHY is not set
# CONFIG_MICREL_PHY is not set
# CONFIG_MICROCHIP_PHY is not set
# CONFIG_MICROSEMI_PHY is not set
@@ -1572,6 +1587,7 @@ CONFIG_USB_CDC_PHONET=m
# CONFIG_USB_VL600 is not set
# CONFIG_USB_NET_CH9200 is not set
CONFIG_WLAN=y
+# CONFIG_WIRELESS_WDS is not set
CONFIG_WLAN_VENDOR_ADMTEK=y
CONFIG_WLAN_VENDOR_ATH=y
# CONFIG_ATH_DEBUG is not set
@@ -1740,7 +1756,7 @@ CONFIG_TOUCHSCREEN_PIXCIR=m
# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
# CONFIG_TOUCHSCREEN_TSC_SERIO is not set
CONFIG_TOUCHSCREEN_TSC200X_CORE=m
-# CONFIG_TOUCHSCREEN_TSC2004 is not set
+CONFIG_TOUCHSCREEN_TSC2004=m
CONFIG_TOUCHSCREEN_TSC2005=m
CONFIG_TOUCHSCREEN_TSC2007=m
# CONFIG_TOUCHSCREEN_RM_TS is not set
@@ -1818,7 +1834,7 @@ CONFIG_UNIX98_PTYS=y
# CONFIG_N_GSM is not set
# CONFIG_TRACE_SINK is not set
CONFIG_DEVMEM=y
-CONFIG_DEVKMEM=y
+# CONFIG_DEVKMEM is not set
#
# Serial drivers
@@ -1865,7 +1881,6 @@ CONFIG_SERIAL_OMAP_CONSOLE=y
# CONFIG_SERIAL_FSL_LPUART is not set
# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
# CONFIG_SERIAL_ST_ASC is not set
-# CONFIG_SERIAL_STM32 is not set
# CONFIG_TTY_PRINTK is not set
# CONFIG_HVC_DCC is not set
# CONFIG_IPMI_HANDLER is not set
@@ -2006,6 +2021,7 @@ CONFIG_GENERIC_PINCONF=y
# CONFIG_DEBUG_PINCTRL is not set
# CONFIG_PINCTRL_AMD is not set
CONFIG_PINCTRL_SINGLE=y
+# CONFIG_PINCTRL_SX150X is not set
# CONFIG_PINCTRL_TI_IODELAY is not set
# CONFIG_PINCTRL_PALMAS is not set
CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
@@ -2022,7 +2038,6 @@ CONFIG_GPIO_SYSFS=y
# CONFIG_GPIO_74XX_MMIO is not set
# CONFIG_GPIO_ALTERA is not set
# CONFIG_GPIO_DWAPB is not set
-# CONFIG_GPIO_EM is not set
# CONFIG_GPIO_GENERIC_PLATFORM is not set
# CONFIG_GPIO_GRGPIO is not set
# CONFIG_GPIO_MOCKUP is not set
@@ -2031,7 +2046,6 @@ CONFIG_GPIO_OMAP=y
# CONFIG_GPIO_SYSCON is not set
# CONFIG_GPIO_XILINX is not set
# CONFIG_GPIO_ZEVIO is not set
-# CONFIG_GPIO_ZX is not set
#
# I2C GPIO expanders
@@ -2044,12 +2058,12 @@ CONFIG_GPIO_PCA953X=m
CONFIG_GPIO_PCF857X=y
# CONFIG_GPIO_SX150X is not set
# CONFIG_GPIO_TPIC2810 is not set
-# CONFIG_GPIO_TS4900 is not set
#
# MFD GPIO expanders
#
# CONFIG_HTC_EGPIO is not set
+# CONFIG_GPIO_LP873X is not set
CONFIG_GPIO_PALMAS=y
# CONFIG_GPIO_TPS65218 is not set
# CONFIG_GPIO_TPS65910 is not set
@@ -2201,6 +2215,7 @@ CONFIG_SENSORS_GPIO_FAN=m
# CONFIG_SENSORS_MAX6697 is not set
# CONFIG_SENSORS_MAX31790 is not set
# CONFIG_SENSORS_MCP3021 is not set
+# CONFIG_SENSORS_TC654 is not set
# CONFIG_SENSORS_ADCXX is not set
# CONFIG_SENSORS_LM63 is not set
# CONFIG_SENSORS_LM70 is not set
@@ -2255,6 +2270,7 @@ CONFIG_SENSORS_LM75=m
# CONFIG_SENSORS_THMC50 is not set
CONFIG_SENSORS_TMP102=m
# CONFIG_SENSORS_TMP103 is not set
+# CONFIG_SENSORS_TMP108 is not set
# CONFIG_SENSORS_TMP401 is not set
# CONFIG_SENSORS_TMP421 is not set
# CONFIG_SENSORS_VT1211 is not set
@@ -2363,7 +2379,6 @@ CONFIG_MFD_CORE=y
# CONFIG_MFD_DA9063 is not set
# CONFIG_MFD_DA9150 is not set
# CONFIG_MFD_DLN2 is not set
-# CONFIG_MFD_EXYNOS_LPASS is not set
# CONFIG_MFD_MC13XXX_SPI is not set
# CONFIG_MFD_MC13XXX_I2C is not set
# CONFIG_MFD_HI6421_PMIC is not set
@@ -2389,7 +2404,7 @@ CONFIG_MFD_CORE=y
# CONFIG_MFD_VIPERBOARD is not set
# CONFIG_MFD_RETU is not set
# CONFIG_MFD_PCF50633 is not set
-# CONFIG_MFD_PM8921_CORE is not set
+# CONFIG_MFD_PM8XXX is not set
# CONFIG_MFD_RT5033 is not set
# CONFIG_MFD_RTSX_USB is not set
# CONFIG_MFD_RC5T583 is not set
@@ -2414,7 +2429,7 @@ CONFIG_MFD_PALMAS=y
# CONFIG_MFD_TPS65086 is not set
# CONFIG_MFD_TPS65090 is not set
CONFIG_MFD_TPS65217=y
-# CONFIG_MFD_TI_LP873X is not set
+CONFIG_MFD_TI_LP873X=y
CONFIG_MFD_TPS65218=y
# CONFIG_MFD_TPS6586X is not set
CONFIG_MFD_TPS65910=y
@@ -2451,12 +2466,13 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
# CONFIG_REGULATOR_DA9210 is not set
# CONFIG_REGULATOR_DA9211 is not set
# CONFIG_REGULATOR_FAN53555 is not set
-# CONFIG_REGULATOR_GPIO is not set
+CONFIG_REGULATOR_GPIO=y
# CONFIG_REGULATOR_ISL9305 is not set
# CONFIG_REGULATOR_ISL6271A is not set
# CONFIG_REGULATOR_LP3971 is not set
# CONFIG_REGULATOR_LP3972 is not set
CONFIG_REGULATOR_LP872X=y
+CONFIG_REGULATOR_LP873X=y
# CONFIG_REGULATOR_LP8755 is not set
# CONFIG_REGULATOR_LTC3589 is not set
# CONFIG_REGULATOR_LTC3676 is not set
@@ -2494,8 +2510,8 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
# CONFIG_MEDIA_RADIO_SUPPORT is not set
# CONFIG_MEDIA_SDR_SUPPORT is not set
CONFIG_MEDIA_RC_SUPPORT=y
+# CONFIG_MEDIA_CEC_SUPPORT is not set
CONFIG_MEDIA_CONTROLLER=y
-# CONFIG_MEDIA_CONTROLLER_DVB is not set
CONFIG_VIDEO_DEV=m
CONFIG_VIDEO_V4L2_SUBDEV_API=y
CONFIG_VIDEO_V4L2=m
@@ -2536,6 +2552,7 @@ CONFIG_RC_DEVICES=y
CONFIG_IR_RX51=m
# CONFIG_RC_LOOPBACK is not set
# CONFIG_IR_GPIO_CIR is not set
+# CONFIG_IR_SERIAL is not set
# CONFIG_MEDIA_USB_SUPPORT is not set
CONFIG_V4L_PLATFORM_DRIVERS=y
# CONFIG_VIDEO_OMAP2_VOUT is not set
@@ -2692,19 +2709,15 @@ CONFIG_VIDEO_TVP5150=m
#
# Customise DVB Frontends
#
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_AU8522_V4L=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_TUNER_DIB0090=m
#
# Tools to develop new frontends
#
-# CONFIG_DVB_DUMMY_FE is not set
#
# Graphics support
#
+# CONFIG_IMX_IPUV3_CORE is not set
# CONFIG_DRM is not set
#
@@ -2914,7 +2927,6 @@ CONFIG_SND_OMAP_SOC_DMIC=m
CONFIG_SND_OMAP_SOC_MCBSP=m
CONFIG_SND_OMAP_SOC_MCPDM=m
# CONFIG_SND_OMAP_SOC_HDMI_AUDIO is not set
-# CONFIG_SND_OMAP_SOC_N810 is not set
# CONFIG_SND_OMAP_SOC_RX51 is not set
# CONFIG_SND_OMAP_SOC_AM3517EVM is not set
CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
@@ -2939,6 +2951,8 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
# CONFIG_SND_SOC_BT_SCO is not set
# CONFIG_SND_SOC_CS35L32 is not set
# CONFIG_SND_SOC_CS35L33 is not set
+# CONFIG_SND_SOC_CS35L34 is not set
+# CONFIG_SND_SOC_CS42L42 is not set
# CONFIG_SND_SOC_CS42L51_I2C is not set
# CONFIG_SND_SOC_CS42L52 is not set
# CONFIG_SND_SOC_CS42L56 is not set
@@ -2956,6 +2970,7 @@ CONFIG_SND_SOC_DMIC=m
# CONFIG_SND_SOC_INNO_RK3036 is not set
# CONFIG_SND_SOC_MAX98504 is not set
# CONFIG_SND_SOC_MAX9860 is not set
+# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
# CONFIG_SND_SOC_PCM1681 is not set
# CONFIG_SND_SOC_PCM179X_I2C is not set
# CONFIG_SND_SOC_PCM179X_SPI is not set
@@ -3063,6 +3078,7 @@ CONFIG_HID_GENERIC=m
# CONFIG_HID_LENOVO is not set
# CONFIG_HID_LOGITECH is not set
# CONFIG_HID_MAGICMOUSE is not set
+# CONFIG_HID_MAYFLASH is not set
# CONFIG_HID_MICROSOFT is not set
# CONFIG_HID_MONTEREY is not set
# CONFIG_HID_MULTITOUCH is not set
@@ -3088,6 +3104,7 @@ CONFIG_HID_GENERIC=m
# CONFIG_HID_TOPSEED is not set
# CONFIG_HID_THINGM is not set
# CONFIG_HID_THRUSTMASTER is not set
+# CONFIG_HID_UDRAW_PS3 is not set
# CONFIG_HID_WACOM is not set
# CONFIG_HID_WIIMOTE is not set
# CONFIG_HID_XINMO is not set
@@ -3250,6 +3267,7 @@ CONFIG_USB_SERIAL_FTDI_SIO=m
# CONFIG_USB_SERIAL_EDGEPORT is not set
# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
# CONFIG_USB_SERIAL_F81232 is not set
+# CONFIG_USB_SERIAL_F8153X is not set
# CONFIG_USB_SERIAL_GARMIN is not set
# CONFIG_USB_SERIAL_IPW is not set
# CONFIG_USB_SERIAL_IUU is not set
@@ -3408,10 +3426,6 @@ CONFIG_MMC=y
# CONFIG_MMC_DEBUG is not set
CONFIG_PWRSEQ_EMMC=y
CONFIG_PWRSEQ_SIMPLE=y
-
-#
-# MMC/SD/SDIO Card Drivers
-#
CONFIG_MMC_BLOCK=y
CONFIG_MMC_BLOCK_MINORS=8
CONFIG_MMC_BLOCK_BOUNCE=y
@@ -3466,6 +3480,7 @@ CONFIG_LEDS_PWM=m
# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
#
# CONFIG_LEDS_BLINKM is not set
+# CONFIG_LEDS_USER is not set
#
# LED Triggers
@@ -3594,6 +3609,7 @@ CONFIG_RTC_I2C_AND_SPI=y
#
CONFIG_RTC_DRV_OMAP=m
# CONFIG_RTC_DRV_SNVS is not set
+# CONFIG_RTC_DRV_R7301 is not set
#
# HID Sensor RTC drivers
@@ -3665,6 +3681,13 @@ CONFIG_COMMON_CLK_PALMAS=m
# CONFIG_COMMON_CLK_PWM is not set
# CONFIG_COMMON_CLK_PXA is not set
# CONFIG_COMMON_CLK_PIC32 is not set
+# CONFIG_COMMON_CLK_MT2701 is not set
+# CONFIG_COMMON_CLK_MT2701_MMSYS is not set
+# CONFIG_COMMON_CLK_MT2701_IMGSYS is not set
+# CONFIG_COMMON_CLK_MT2701_VDECSYS is not set
+# CONFIG_COMMON_CLK_MT2701_HIFSYS is not set
+# CONFIG_COMMON_CLK_MT2701_ETHSYS is not set
+# CONFIG_COMMON_CLK_MT2701_BDPSYS is not set
CONFIG_COMMON_CLK_TI_ADPLL=y
#
@@ -3704,9 +3727,7 @@ CONFIG_OMAP_IOMMU=y
#
# Remoteproc drivers
#
-# CONFIG_OMAP_REMOTEPROC is not set
-# CONFIG_STE_MODEM_RPROC is not set
-# CONFIG_WKUP_M3_RPROC is not set
+# CONFIG_REMOTEPROC is not set
#
# Rpmsg drivers
@@ -3755,8 +3776,11 @@ CONFIG_IIO_KFIFO_BUF=m
# CONFIG_BMA180 is not set
# CONFIG_BMA220 is not set
# CONFIG_BMC150_ACCEL is not set
+# CONFIG_DA280 is not set
+# CONFIG_DA311 is not set
# CONFIG_DMARD06 is not set
# CONFIG_DMARD09 is not set
+# CONFIG_DMARD10 is not set
# CONFIG_IIO_ST_ACCEL_3AXIS is not set
# CONFIG_KXSD9 is not set
# CONFIG_KXCJK1013 is not set
@@ -3769,6 +3793,7 @@ CONFIG_IIO_KFIFO_BUF=m
# CONFIG_MMA9553 is not set
# CONFIG_MXC4005 is not set
# CONFIG_MXC6255 is not set
+# CONFIG_SCA3000 is not set
# CONFIG_STK8312 is not set
# CONFIG_STK8BA50 is not set
@@ -3779,12 +3804,14 @@ CONFIG_IIO_KFIFO_BUF=m
# CONFIG_AD7291 is not set
# CONFIG_AD7298 is not set
# CONFIG_AD7476 is not set
+# CONFIG_AD7766 is not set
# CONFIG_AD7791 is not set
# CONFIG_AD7793 is not set
# CONFIG_AD7887 is not set
# CONFIG_AD7923 is not set
# CONFIG_AD799X is not set
# CONFIG_CC10001_ADC is not set
+# CONFIG_ENVELOPE_DETECTOR is not set
# CONFIG_HI8435 is not set
# CONFIG_INA2XX_ADC is not set
# CONFIG_LTC2485 is not set
@@ -3827,6 +3854,10 @@ CONFIG_TI_AM335X_ADC=m
#
# CONFIG_IIO_SSP_SENSORHUB is not set
+#
+# Counters
+#
+
#
# Digital to analog converters
#
@@ -3847,6 +3878,7 @@ CONFIG_TI_AM335X_ADC=m
# CONFIG_AD5791 is not set
# CONFIG_AD7303 is not set
# CONFIG_AD8801 is not set
+# CONFIG_DPOT_DAC is not set
# CONFIG_M62332 is not set
# CONFIG_MAX517 is not set
# CONFIG_MAX5821 is not set
@@ -3881,6 +3913,7 @@ CONFIG_TI_AM335X_ADC=m
# CONFIG_ADIS16260 is not set
# CONFIG_ADXRS450 is not set
# CONFIG_BMG160 is not set
+# CONFIG_MPU3050_I2C is not set
# CONFIG_IIO_ST_GYRO_3AXIS is not set
# CONFIG_ITG3200 is not set
@@ -3901,6 +3934,7 @@ CONFIG_TI_AM335X_ADC=m
# CONFIG_AM2315 is not set
# CONFIG_DHT11 is not set
# CONFIG_HDC100X is not set
+# CONFIG_HTS221 is not set
# CONFIG_HTU21 is not set
# CONFIG_SI7005 is not set
# CONFIG_SI7020 is not set
@@ -3929,6 +3963,7 @@ CONFIG_TI_AM335X_ADC=m
# CONFIG_CM3323 is not set
# CONFIG_CM36651 is not set
# CONFIG_GP2AP020A00F is not set
+# CONFIG_SENSORS_ISL29018 is not set
# CONFIG_ISL29125 is not set
# CONFIG_JSA1212 is not set
# CONFIG_RPR0521 is not set
@@ -3941,6 +3976,7 @@ CONFIG_TI_AM335X_ADC=m
# CONFIG_TCS3414 is not set
# CONFIG_TCS3472 is not set
# CONFIG_SENSORS_TSL2563 is not set
+# CONFIG_TSL2583 is not set
# CONFIG_TSL4531 is not set
# CONFIG_US5182D is not set
# CONFIG_VCNL4000 is not set
@@ -3973,9 +4009,15 @@ CONFIG_TI_AM335X_ADC=m
# CONFIG_MCP4531 is not set
# CONFIG_TPL0102 is not set
+#
+# Digital potentiostats
+#
+# CONFIG_LMP91000 is not set
+
#
# Pressure sensors
#
+# CONFIG_ABP060MG is not set
CONFIG_BMP280=m
CONFIG_BMP280_I2C=m
CONFIG_BMP280_SPI=m
@@ -4069,6 +4111,10 @@ CONFIG_NVMEM=m
# CONFIG_FW_CFG_SYSFS is not set
CONFIG_HAVE_ARM_SMCCC=y
+#
+# Tegra firmware driver
+#
+
#
# File systems
#
@@ -4185,7 +4231,7 @@ CONFIG_UBIFS_FS=y
CONFIG_UBIFS_FS_LZO=y
CONFIG_UBIFS_FS_ZLIB=y
# CONFIG_UBIFS_ATIME_SUPPORT is not set
-# CONFIG_LOGFS is not set
+# CONFIG_UBIFS_FS_ENCRYPTION is not set
CONFIG_CRAMFS=y
# CONFIG_SQUASHFS is not set
# CONFIG_VXFS_FS is not set
@@ -4198,7 +4244,6 @@ CONFIG_CRAMFS=y
# CONFIG_PSTORE is not set
# CONFIG_SYSV_FS is not set
# CONFIG_UFS_FS is not set
-# CONFIG_AUFS_FS is not set
CONFIG_NETWORK_FILESYSTEMS=y
CONFIG_NFS_FS=y
CONFIG_NFS_V2=y
@@ -4285,6 +4330,7 @@ CONFIG_NLS_ISO8859_1=y
# printk and dmesg options
#
CONFIG_PRINTK_TIME=y
+CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_BOOT_PRINTK_DELAY is not set
# CONFIG_DYNAMIC_DEBUG is not set
@@ -4453,6 +4499,7 @@ CONFIG_TRACING_EVENTS_GPIO=y
# CONFIG_TEST_UDELAY is not set
# CONFIG_MEMTEST is not set
# CONFIG_TEST_STATIC_KEYS is not set
+# CONFIG_BUG_ON_DATA_CORRUPTION is not set
# CONFIG_SAMPLES is not set
CONFIG_HAVE_ARCH_KGDB=y
# CONFIG_KGDB is not set
@@ -4517,6 +4564,7 @@ CONFIG_CRYPTO_RNG2=y
CONFIG_CRYPTO_RNG_DEFAULT=m
CONFIG_CRYPTO_AKCIPHER2=y
CONFIG_CRYPTO_KPP2=y
+CONFIG_CRYPTO_ACOMP2=y
# CONFIG_CRYPTO_RSA is not set
# CONFIG_CRYPTO_DH is not set
# CONFIG_CRYPTO_ECDH is not set
@@ -4629,6 +4677,7 @@ CONFIG_CRYPTO_JITTERENTROPY=m
# CONFIG_CRYPTO_USER_API_RNG is not set
# CONFIG_CRYPTO_USER_API_AEAD is not set
CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC is not set
# CONFIG_CRYPTO_DEV_OMAP_SHAM is not set
# CONFIG_CRYPTO_DEV_OMAP_AES is not set
# CONFIG_CRYPTO_DEV_OMAP_DES is not set
diff --git a/patches/soc/imx/0002-mcimx6ul-bb-and-ism43362-b81-evb.patch b/patches/soc/imx/0002-mcimx6ul-bb-and-ism43362-b81-evb.patch
index f8cd49fd94867d6b9750192bcd0d366708daa484..0d7367b06dfb299b0e064b5eba26c3ea7927aafd 100644
--- a/patches/soc/imx/0002-mcimx6ul-bb-and-ism43362-b81-evb.patch
+++ b/patches/soc/imx/0002-mcimx6ul-bb-and-ism43362-b81-evb.patch
@@ -1,33 +1,33 @@
-From 1fa392187efc7d98f8afa8ebe08df0fb063c6e78 Mon Sep 17 00:00:00 2001
+From c7375ef8c4515b74632d676b4ab39203c825ac3b Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Sat, 8 Oct 2016 11:19:36 -0500
+Date: Fri, 16 Dec 2016 10:13:25 -0600
Subject: [PATCH 2/2] mcimx6ul-bb and ism43362-b81-evb
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
arch/arm/boot/dts/Makefile | 1 +
- .../boot/dts/imx6ul-14x14-evk-ism43362-b81-evb.dts | 516 +++++++++++++++++++++
- 2 files changed, 517 insertions(+)
+ .../boot/dts/imx6ul-14x14-evk-ism43362-b81-evb.dts | 524 +++++++++++++++++++++
+ 2 files changed, 525 insertions(+)
create mode 100644 arch/arm/boot/dts/imx6ul-14x14-evk-ism43362-b81-evb.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index ae7f203..2d2be97 100644
+index 1ad4b16..9aa85b0 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
-@@ -427,6 +427,7 @@ dtb-$(CONFIG_SOC_IMX6SX) += \
- imx6sx-sdb.dtb
+@@ -441,6 +441,7 @@ dtb-$(CONFIG_SOC_IMX6SX) += \
+ imx6sx-udoo-neo-full.dtb
dtb-$(CONFIG_SOC_IMX6UL) += \
imx6ul-14x14-evk.dtb \
+ imx6ul-14x14-evk-ism43362-b81-evb.dtb \
imx6ul-geam-kit.dtb \
+ imx6ul-liteboard.dtb \
imx6ul-pico-hobbit.dtb \
- imx6ul-tx6ul-0010.dtb \
diff --git a/arch/arm/boot/dts/imx6ul-14x14-evk-ism43362-b81-evb.dts b/arch/arm/boot/dts/imx6ul-14x14-evk-ism43362-b81-evb.dts
new file mode 100644
-index 0000000..9ba86b8
+index 0000000..75ddec4
--- /dev/null
+++ b/arch/arm/boot/dts/imx6ul-14x14-evk-ism43362-b81-evb.dts
-@@ -0,0 +1,516 @@
+@@ -0,0 +1,524 @@
+/*
+ * Copyright (C) 2015 Freescale Semiconductor, Inc.
+ *
@@ -265,7 +265,7 @@ index 0000000..9ba86b8
+};
+
+&usbotg1 {
-+ dr_mode = "peripheral";
++ dr_mode = "otg";
+ status = "okay";
+};
+
@@ -275,6 +275,14 @@ index 0000000..9ba86b8
+ status = "okay";
+};
+
++&usbphy1 {
++ fsl,tx-d-cal = <106>;
++};
++
++&usbphy2 {
++ fsl,tx-d-cal = <106>;
++};
++
+®_sd1_vmmc {
+ regulator-always-on;
+};
@@ -545,5 +553,5 @@ index 0000000..9ba86b8
+ };
+};
--
-2.9.3
+2.10.2
diff --git a/patches/soc/imx/udoo/0004-usb-core-add-power-sequence-handling-for-USB-devices.patch b/patches/soc/imx/udoo/0004-usb-core-add-power-sequence-handling-for-USB-devices.patch
index 7d827b76a87e2983c6c9cc79c4c8ee6c458cdb82..a975c68139d9ce6a2f8dc97e15093d140de71419 100644
--- a/patches/soc/imx/udoo/0004-usb-core-add-power-sequence-handling-for-USB-devices.patch
+++ b/patches/soc/imx/udoo/0004-usb-core-add-power-sequence-handling-for-USB-devices.patch
@@ -25,18 +25,18 @@ Reviewed-by: Vaibhav Hiremath <hvaibhav.linux@gmail.com>
2 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index cbb1467..acbbf0a 100644
+index 1fa5c0f29c64..08b5d66e5d16 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
-@@ -26,6 +26,7 @@
+@@ -28,6 +28,7 @@
#include <linux/mutex.h>
#include <linux/random.h>
#include <linux/pm_qos.h>
+#include <linux/power/pwrseq.h>
- #include <asm/uaccess.h>
+ #include <linux/uaccess.h>
#include <asm/byteorder.h>
-@@ -1695,6 +1696,7 @@ static void hub_disconnect(struct usb_interface *intf)
+@@ -1645,6 +1646,7 @@ static void hub_disconnect(struct usb_interface *intf)
hub->error = 0;
hub_quiesce(hub, HUB_DISCONNECT);
@@ -44,7 +44,7 @@ index cbb1467..acbbf0a 100644
mutex_lock(&usb_port_peer_mutex);
/* Avoid races with recursively_mark_NOTATTACHED() */
-@@ -1722,12 +1724,41 @@ static void hub_disconnect(struct usb_interface *intf)
+@@ -1672,12 +1674,41 @@ static void hub_disconnect(struct usb_interface *intf)
kref_put(&hub->kref, hub_release);
}
@@ -86,7 +86,7 @@ index cbb1467..acbbf0a 100644
desc = intf->cur_altsetting;
hdev = interface_to_usbdev(intf);
-@@ -1832,6 +1863,7 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id)
+@@ -1782,6 +1813,7 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id)
INIT_DELAYED_WORK(&hub->leds, led_work);
INIT_DELAYED_WORK(&hub->init_work, NULL);
INIT_WORK(&hub->events, hub_event);
@@ -94,7 +94,7 @@ index cbb1467..acbbf0a 100644
usb_get_intf(intf);
usb_get_dev(hdev);
-@@ -1845,11 +1877,14 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id)
+@@ -1795,11 +1827,14 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id)
if (id->driver_info & HUB_QUIRK_CHECK_PORT_AUTOSUSPEND)
hub->quirk_check_port_auto_suspend = 1;
@@ -113,7 +113,7 @@ index cbb1467..acbbf0a 100644
static int
diff --git a/drivers/usb/core/hub.h b/drivers/usb/core/hub.h
-index 34c1a7e..cd86f91 100644
+index 34c1a7e22aae..cd86f91e0342 100644
--- a/drivers/usb/core/hub.h
+++ b/drivers/usb/core/hub.h
@@ -78,6 +78,7 @@ struct usb_hub {
@@ -125,5 +125,5 @@ index 34c1a7e..cd86f91 100644
/**
--
-2.10.2
+2.11.0
diff --git a/patches/soc/ti/0001-sync-with-ti-4.4.patch b/patches/soc/ti/0001-sync-with-ti-4.4.patch
index 822f32ea3db7151b1c7ebc47619d86592c662daf..aa4735d91024d474a71aefa3d39a6c73044d7dbd 100644
--- a/patches/soc/ti/0001-sync-with-ti-4.4.patch
+++ b/patches/soc/ti/0001-sync-with-ti-4.4.patch
@@ -1,28 +1,25 @@
-From 115c3233807a34c1f09bae95c307ec5cf2bc9e25 Mon Sep 17 00:00:00 2001
+From 44e0ab099272d20473abcf9815b1c459fde304f1 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Mon, 4 Apr 2016 11:06:52 -0500
+Date: Fri, 16 Dec 2016 10:15:02 -0600
Subject: [PATCH 1/8] sync: with ti-4.4
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
- arch/arm/boot/dts/am335x-bone-common.dtsi | 4 ++++
- 1 file changed, 4 insertions(+)
+ arch/arm/boot/dts/am335x-bone-common.dtsi | 1 +
+ 1 file changed, 1 insertion(+)
diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
-index c078139..8eb69de 100644
+index e3cb3ec..3253763 100644
--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
-@@ -411,6 +411,10 @@
- status = "okay";
+@@ -414,6 +414,7 @@
+ &rtc {
+ clocks = <&clk_32768_ck>, <&clkdiv32k_ick>;
+ clock-names = "ext-clk", "int-clk";
++ system-power-controller;
};
-+&rtc {
-+ system-power-controller;
-+};
-+
/* the cape manager */
- / {
- bone_capemgr {
--
2.10.2
diff --git a/patches/soc/ti/0008-clk-ti-omap36xx-Work-around-sprz319-advisory-2.1.patch b/patches/soc/ti/0008-clk-ti-omap36xx-Work-around-sprz319-advisory-2.1.patch
deleted file mode 100644
index 06af562c481b94f94503176890bddec48bfaac20..0000000000000000000000000000000000000000
--- a/patches/soc/ti/0008-clk-ti-omap36xx-Work-around-sprz319-advisory-2.1.patch
+++ /dev/null
@@ -1,217 +0,0 @@
-From 5f01e5787ade74056d811fce43c7d35f5f73b81b Mon Sep 17 00:00:00 2001
-From: Richard Watts <rrw@kynesim.co.uk>
-Date: Fri, 2 Dec 2016 23:14:38 +0200
-Subject: [PATCH 8/8] clk: ti: omap36xx: Work around sprz319 advisory 2.1
-
-The OMAP36xx DPLL5, driving EHCI USB, can be subject to a long-term
-frequency drift. The frequency drift magnitude depends on the VCO update
-rate, which is inversely proportional to the PLL divider. The kernel
-DPLL configuration code results in a high value for the divider, leading
-to a long term drift high enough to cause USB transmission errors. In
-the worst case the USB PHY's ULPI interface can stop responding,
-breaking USB operation completely. This manifests itself on the
-Beagleboard xM by the LAN9514 reporting 'Cannot enable port 2. Maybe the
-cable is bad?' in the kernel log.
-
-Errata sprz319 advisory 2.1 documents PLL values that minimize the
-drift. Use them automatically when DPLL5 is used for USB operation,
-which we detect based on the requested clock rate. The clock framework
-will still compute the PLL parameters and resulting rate as usual, but
-the PLL M and N values will then be overridden. This can result in the
-effective clock rate being slightly different than the rate cached by
-the clock framework, but won't cause any adverse effect to USB
-operation.
-
-Signed-off-by: Richard Watts <rrw@kynesim.co.uk>
-[Upported from v3.2 to v4.9]
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
----
- drivers/clk/ti/clk-3xxx.c | 20 +++++++-------
- drivers/clk/ti/clock.h | 9 +++++++
- drivers/clk/ti/dpll.c | 19 +++++++++++++-
- drivers/clk/ti/dpll3xxx.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 104 insertions(+), 11 deletions(-)
-
-diff --git a/drivers/clk/ti/clk-3xxx.c b/drivers/clk/ti/clk-3xxx.c
-index 8831e1a..11d8aa3 100644
---- a/drivers/clk/ti/clk-3xxx.c
-+++ b/drivers/clk/ti/clk-3xxx.c
-@@ -22,13 +22,6 @@
-
- #include "clock.h"
-
--/*
-- * DPLL5_FREQ_FOR_USBHOST: USBHOST and USBTLL are the only clocks
-- * that are sourced by DPLL5, and both of these require this clock
-- * to be at 120 MHz for proper operation.
-- */
--#define DPLL5_FREQ_FOR_USBHOST 120000000
--
- #define OMAP3430ES2_ST_DSS_IDLE_SHIFT 1
- #define OMAP3430ES2_ST_HSOTGUSB_IDLE_SHIFT 5
- #define OMAP3430ES2_ST_SSI_IDLE_SHIFT 8
-@@ -546,14 +539,21 @@ void __init omap3_clk_lock_dpll5(void)
- struct clk *dpll5_clk;
- struct clk *dpll5_m2_clk;
-
-+ /*
-+ * Errata sprz319f advisory 2.1 documents a USB host clock drift issue
-+ * that can be worked around using specially crafted dpll5 settings
-+ * with a dpll5_m2 divider set to 8. Set the dpll5 rate to 8x the USB
-+ * host clock rate, its .set_rate handler() will detect that frequency
-+ * and use the errata settings.
-+ */
- dpll5_clk = clk_get(NULL, "dpll5_ck");
-- clk_set_rate(dpll5_clk, DPLL5_FREQ_FOR_USBHOST);
-+ clk_set_rate(dpll5_clk, OMAP3_DPLL5_FREQ_FOR_USBHOST * 8);
- clk_prepare_enable(dpll5_clk);
-
-- /* Program dpll5_m2_clk divider for no division */
-+ /* Program dpll5_m2_clk divider */
- dpll5_m2_clk = clk_get(NULL, "dpll5_m2_ck");
- clk_prepare_enable(dpll5_m2_clk);
-- clk_set_rate(dpll5_m2_clk, DPLL5_FREQ_FOR_USBHOST);
-+ clk_set_rate(dpll5_m2_clk, OMAP3_DPLL5_FREQ_FOR_USBHOST);
-
- clk_disable_unprepare(dpll5_m2_clk);
- clk_disable_unprepare(dpll5_clk);
-diff --git a/drivers/clk/ti/clock.h b/drivers/clk/ti/clock.h
-index 90f3f47..13c37f4 100644
---- a/drivers/clk/ti/clock.h
-+++ b/drivers/clk/ti/clock.h
-@@ -257,11 +257,20 @@ long omap2_dpll_round_rate(struct clk_hw *hw, unsigned long target_rate,
- unsigned long omap3_clkoutx2_recalc(struct clk_hw *hw,
- unsigned long parent_rate);
-
-+/*
-+ * OMAP3_DPLL5_FREQ_FOR_USBHOST: USBHOST and USBTLL are the only clocks
-+ * that are sourced by DPLL5, and both of these require this clock
-+ * to be at 120 MHz for proper operation.
-+ */
-+#define OMAP3_DPLL5_FREQ_FOR_USBHOST 120000000
-+
- unsigned long omap3_dpll_recalc(struct clk_hw *hw, unsigned long parent_rate);
- int omap3_dpll4_set_rate(struct clk_hw *clk, unsigned long rate,
- unsigned long parent_rate);
- int omap3_dpll4_set_rate_and_parent(struct clk_hw *hw, unsigned long rate,
- unsigned long parent_rate, u8 index);
-+int omap3_dpll5_set_rate(struct clk_hw *hw, unsigned long rate,
-+ unsigned long parent_rate);
- void omap3_clk_lock_dpll5(void);
-
- unsigned long omap4_dpll_regm4xen_recalc(struct clk_hw *hw,
-diff --git a/drivers/clk/ti/dpll.c b/drivers/clk/ti/dpll.c
-index 9fc8754..4b9a419 100644
---- a/drivers/clk/ti/dpll.c
-+++ b/drivers/clk/ti/dpll.c
-@@ -114,6 +114,18 @@ static const struct clk_ops omap3_dpll_ck_ops = {
- .round_rate = &omap2_dpll_round_rate,
- };
-
-+static const struct clk_ops omap3_dpll5_ck_ops = {
-+ .enable = &omap3_noncore_dpll_enable,
-+ .disable = &omap3_noncore_dpll_disable,
-+ .get_parent = &omap2_init_dpll_parent,
-+ .recalc_rate = &omap3_dpll_recalc,
-+ .set_rate = &omap3_dpll5_set_rate,
-+ .set_parent = &omap3_noncore_dpll_set_parent,
-+ .set_rate_and_parent = &omap3_noncore_dpll_set_rate_and_parent,
-+ .determine_rate = &omap3_noncore_dpll_determine_rate,
-+ .round_rate = &omap2_dpll_round_rate,
-+};
-+
- static const struct clk_ops omap3_dpll_per_ck_ops = {
- .enable = &omap3_noncore_dpll_enable,
- .disable = &omap3_noncore_dpll_disable,
-@@ -474,7 +486,12 @@ static void __init of_ti_omap3_dpll_setup(struct device_node *node)
- .modes = (1 << DPLL_LOW_POWER_BYPASS) | (1 << DPLL_LOCKED),
- };
-
-- of_ti_dpll_setup(node, &omap3_dpll_ck_ops, &dd);
-+ if ((of_machine_is_compatible("ti,omap3630") ||
-+ of_machine_is_compatible("ti,omap36xx")) &&
-+ !strcmp(node->name, "dpll5_ck"))
-+ of_ti_dpll_setup(node, &omap3_dpll5_ck_ops, &dd);
-+ else
-+ of_ti_dpll_setup(node, &omap3_dpll_ck_ops, &dd);
- }
- CLK_OF_DECLARE(ti_omap3_dpll_clock, "ti,omap3-dpll-clock",
- of_ti_omap3_dpll_setup);
-diff --git a/drivers/clk/ti/dpll3xxx.c b/drivers/clk/ti/dpll3xxx.c
-index 88f2ce8..4cdd28a 100644
---- a/drivers/clk/ti/dpll3xxx.c
-+++ b/drivers/clk/ti/dpll3xxx.c
-@@ -838,3 +838,70 @@ int omap3_dpll4_set_rate_and_parent(struct clk_hw *hw, unsigned long rate,
- return omap3_noncore_dpll_set_rate_and_parent(hw, rate, parent_rate,
- index);
- }
-+
-+/* Apply DM3730 errata sprz319 advisory 2.1. */
-+static bool omap3_dpll5_apply_errata(struct clk_hw *hw,
-+ unsigned long parent_rate)
-+{
-+ struct omap3_dpll5_settings {
-+ unsigned int rate, m, n;
-+ };
-+
-+ static const struct omap3_dpll5_settings precomputed[] = {
-+ /*
-+ * From DM3730 errata advisory 2.1, table 35 and 36.
-+ * The N value is increased by 1 compared to the tables as the
-+ * errata lists register values while last_rounded_field is the
-+ * real divider value.
-+ */
-+ { 12000000, 80, 0 + 1 },
-+ { 13000000, 443, 5 + 1 },
-+ { 19200000, 50, 0 + 1 },
-+ { 26000000, 443, 11 + 1 },
-+ { 38400000, 25, 0 + 1 }
-+ };
-+
-+ const struct omap3_dpll5_settings *d;
-+ struct clk_hw_omap *clk = to_clk_hw_omap(hw);
-+ struct dpll_data *dd;
-+ unsigned int i;
-+
-+ for (i = 0; i < ARRAY_SIZE(precomputed); ++i) {
-+ if (parent_rate == precomputed[i].rate)
-+ break;
-+ }
-+
-+ if (i == ARRAY_SIZE(precomputed))
-+ return false;
-+
-+ d = &precomputed[i];
-+
-+ /* Update the M, N and rounded rate values and program the DPLL. */
-+ dd = clk->dpll_data;
-+ dd->last_rounded_m = d->m;
-+ dd->last_rounded_n = d->n;
-+ dd->last_rounded_rate = div_u64((u64)parent_rate * d->m, d->n);
-+ omap3_noncore_dpll_program(clk, 0);
-+
-+ return true;
-+}
-+
-+/**
-+ * omap3_dpll5_set_rate - set rate for omap3 dpll5
-+ * @hw: clock to change
-+ * @rate: target rate for clock
-+ * @parent_rate: rate of the parent clock
-+ *
-+ * Set rate for the DPLL5 clock. Apply the sprz319 advisory 2.1 on OMAP36xx if
-+ * the DPLL is used for USB host (detected through the requested rate).
-+ */
-+int omap3_dpll5_set_rate(struct clk_hw *hw, unsigned long rate,
-+ unsigned long parent_rate)
-+{
-+ if (rate == OMAP3_DPLL5_FREQ_FOR_USBHOST * 8) {
-+ if (omap3_dpll5_apply_errata(hw, parent_rate))
-+ return 0;
-+ }
-+
-+ return omap3_noncore_dpll_set_rate(hw, rate, parent_rate);
-+}
---
-2.10.2
-
diff --git a/patches/soc/ti/blue/0001-ARM-dts-add-am335x-boneblue.dtb.patch b/patches/soc/ti/blue/0001-ARM-dts-add-am335x-boneblue.dtb.patch
index 636eb7b7607103035b407f3ab6ee72e6e9306e55..ed87a87203303ecb924d0aab8e03c35857df1e37 100644
--- a/patches/soc/ti/blue/0001-ARM-dts-add-am335x-boneblue.dtb.patch
+++ b/patches/soc/ti/blue/0001-ARM-dts-add-am335x-boneblue.dtb.patch
@@ -1018,16 +1018,16 @@ index 0000000..16e9376
+ status = "okay";
+};
+
-+&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>;
-+ };
-+};
++//&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>;
++// };
++//};
diff --git a/arch/arm/boot/dts/am335x-boneblack-wireless-roboticscape.dts b/arch/arm/boot/dts/am335x-boneblack-wireless-roboticscape.dts
new file mode 100644
index 0000000..4a72d56
diff --git a/patches/ti_4.9.x/pm_opp/0002-Documentation-dt-add-bindings-for-ti-cpufreq.patch b/patches/ti_4.9.x/pm_opp/0001-Documentation-dt-add-bindings-for-ti-cpufreq.patch
similarity index 97%
rename from patches/ti_4.9.x/pm_opp/0002-Documentation-dt-add-bindings-for-ti-cpufreq.patch
rename to patches/ti_4.9.x/pm_opp/0001-Documentation-dt-add-bindings-for-ti-cpufreq.patch
index 250978ba1aea1e60f616c2680274dcead3b53a94..d3af0674c05eae8ecbfe7c8671c03e2867f99083 100644
--- a/patches/ti_4.9.x/pm_opp/0002-Documentation-dt-add-bindings-for-ti-cpufreq.patch
+++ b/patches/ti_4.9.x/pm_opp/0001-Documentation-dt-add-bindings-for-ti-cpufreq.patch
@@ -1,7 +1,7 @@
-From 14f6b0371f49d044f7b7f4384f528cf64e0b2977 Mon Sep 17 00:00:00 2001
+From f00aa33e1accefa17bf33cbd0be4a16b48006c4b Mon Sep 17 00:00:00 2001
From: Dave Gerlach <d-gerlach@ti.com>
Date: Tue, 29 Nov 2016 18:02:16 -0600
-Subject: [PATCH] Documentation: dt: add bindings for ti-cpufreq
+Subject: [PATCH 1/7] Documentation: dt: add bindings for ti-cpufreq
Add the device tree bindings document for the TI CPUFreq/OPP driver
on AM33xx and AM43xx SoCs. The operating-points-v2 binding allows us
diff --git a/patches/ti_4.9.x/pm_opp/0003-cpufreq-ti-Add-cpufreq-driver-to-determine-available.patch b/patches/ti_4.9.x/pm_opp/0002-cpufreq-ti-Add-cpufreq-driver-to-determine-available.patch
similarity index 97%
rename from patches/ti_4.9.x/pm_opp/0003-cpufreq-ti-Add-cpufreq-driver-to-determine-available.patch
rename to patches/ti_4.9.x/pm_opp/0002-cpufreq-ti-Add-cpufreq-driver-to-determine-available.patch
index 50498d9b096ab1418a6356fec46d76b8c698d400..dd6ee763d446d4778b1d6d461327e8d0ceeac062 100644
--- a/patches/ti_4.9.x/pm_opp/0003-cpufreq-ti-Add-cpufreq-driver-to-determine-available.patch
+++ b/patches/ti_4.9.x/pm_opp/0002-cpufreq-ti-Add-cpufreq-driver-to-determine-available.patch
@@ -1,8 +1,8 @@
-From 78ff54d5f5f159532ba8dd2db4018f5f401796bd Mon Sep 17 00:00:00 2001
+From 787af24a89ac3ac7d7fdcd8049f26d5e8bc7af93 Mon Sep 17 00:00:00 2001
From: Dave Gerlach <d-gerlach@ti.com>
Date: Tue, 29 Nov 2016 18:02:17 -0600
-Subject: [PATCH] cpufreq: ti: Add cpufreq driver to determine available OPPs
- at runtime
+Subject: [PATCH 2/7] cpufreq: ti: Add cpufreq driver to determine available
+ OPPs at runtime
Some TI SoCs, like those in the AM335x, AM437x, DRA7x, and AM57x families,
have different OPPs available for the MPU depending on which specific
@@ -30,10 +30,10 @@ Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
create mode 100644 drivers/cpufreq/ti-cpufreq.c
diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
-index d89b8af..665f11d 100644
+index 920c469..6d87742 100644
--- a/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
-@@ -234,6 +234,17 @@ config ARM_TEGRA124_CPUFREQ
+@@ -247,6 +247,17 @@ config ARM_TEGRA124_CPUFREQ
help
This adds the CPUFreq driver support for Tegra124 SOCs.
@@ -52,7 +52,7 @@ index d89b8af..665f11d 100644
tristate "Intel PXA2xx CPUfreq driver"
depends on PXA27x || PXA25x
diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile
-index 0a9b6a09..5b1b6ec 100644
+index 1e46c39..2078a0f 100644
--- a/drivers/cpufreq/Makefile
+++ b/drivers/cpufreq/Makefile
@@ -77,6 +77,7 @@ obj-$(CONFIG_ARM_SPEAR_CPUFREQ) += spear-cpufreq.o
diff --git a/patches/ti_4.9.x/pm_opp/0004-cpufreq-dt-Don-t-use-generic-platdev-driver-for-ti-c.patch b/patches/ti_4.9.x/pm_opp/0003-cpufreq-dt-Don-t-use-generic-platdev-driver-for-ti-c.patch
similarity index 73%
rename from patches/ti_4.9.x/pm_opp/0004-cpufreq-dt-Don-t-use-generic-platdev-driver-for-ti-c.patch
rename to patches/ti_4.9.x/pm_opp/0003-cpufreq-dt-Don-t-use-generic-platdev-driver-for-ti-c.patch
index 9f446bdf93a6db7f5079342eed456714bbe5baec..1ccba523d8f88adb5b500ee66917914125a2679e 100644
--- a/patches/ti_4.9.x/pm_opp/0004-cpufreq-dt-Don-t-use-generic-platdev-driver-for-ti-c.patch
+++ b/patches/ti_4.9.x/pm_opp/0003-cpufreq-dt-Don-t-use-generic-platdev-driver-for-ti-c.patch
@@ -1,8 +1,8 @@
-From d4bca0c2d8c315c0aa4f7c15207a26d12974f929 Mon Sep 17 00:00:00 2001
+From 7ea8914366c31120ef5b4328a8a00f279f02084b Mon Sep 17 00:00:00 2001
From: Dave Gerlach <d-gerlach@ti.com>
Date: Tue, 29 Nov 2016 18:02:18 -0600
-Subject: [PATCH] cpufreq: dt: Don't use generic platdev driver for ti-cpufreq
- platforms
+Subject: [PATCH 3/7] cpufreq: dt: Don't use generic platdev driver for
+ ti-cpufreq platforms
Some TI platforms, specifically those in the am33xx, am43xx, dra7xx, and
am57xx families of SoCs can make use of the ti-cpufreq driver to
@@ -17,12 +17,12 @@ Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
1 file changed, 2 deletions(-)
diff --git a/drivers/cpufreq/cpufreq-dt-platdev.c b/drivers/cpufreq/cpufreq-dt-platdev.c
-index 7126762..d2637e1 100644
+index bc97b6a..d22326f 100644
--- a/drivers/cpufreq/cpufreq-dt-platdev.c
+++ b/drivers/cpufreq/cpufreq-dt-platdev.c
-@@ -72,8 +72,6 @@ static const struct of_device_id machines[] __initconst = {
-
- { .compatible = "sigma,tango4" },
+@@ -85,8 +85,6 @@ static const struct of_device_id machines[] __initconst = {
+ { .compatible = "socionext,uniphier-ld11", },
+ { .compatible = "socionext,uniphier-ld20", },
- { .compatible = "ti,am33xx", },
- { .compatible = "ti,dra7", },
diff --git a/patches/ti_4.9.x/pm_opp/0005-ARM-dts-am33xx-Add-updated-operating-points-v2-table.patch b/patches/ti_4.9.x/pm_opp/0004-ARM-dts-am33xx-Add-updated-operating-points-v2-table.patch
similarity index 94%
rename from patches/ti_4.9.x/pm_opp/0005-ARM-dts-am33xx-Add-updated-operating-points-v2-table.patch
rename to patches/ti_4.9.x/pm_opp/0004-ARM-dts-am33xx-Add-updated-operating-points-v2-table.patch
index cf27fbef82c472ee105edbe5bd2a0946f14e2e18..2ea4166ec11a56eaa4a8f264d407758fe5770069 100644
--- a/patches/ti_4.9.x/pm_opp/0005-ARM-dts-am33xx-Add-updated-operating-points-v2-table.patch
+++ b/patches/ti_4.9.x/pm_opp/0004-ARM-dts-am33xx-Add-updated-operating-points-v2-table.patch
@@ -1,8 +1,8 @@
-From c5d004835f2d162a04be591419d17864b477a789 Mon Sep 17 00:00:00 2001
+From c8fbce7db84ce92b28d0c690afb2d58681d1d2fd Mon Sep 17 00:00:00 2001
From: Dave Gerlach <d-gerlach@ti.com>
Date: Tue, 29 Nov 2016 18:02:19 -0600
-Subject: [PATCH] ARM: dts: am33xx: Add updated operating-points-v2 table for
- cpu
+Subject: [PATCH 4/7] ARM: dts: am33xx: Add updated operating-points-v2 table
+ for cpu
After the ti-cpufreq driver has been added, we can now drop the
operating-points table present in am33xx.dtsi for the cpu and add an
@@ -20,7 +20,7 @@ Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
1 file changed, 75 insertions(+), 13 deletions(-)
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
-index d52fa1c..c3aafe6 100644
+index 194d884..b379c24 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -45,19 +45,7 @@
diff --git a/patches/ti_4.9.x/pm_opp/0006-ARM-dts-am335x-boneblack-Enable-1GHz-OPP-for-cpu.patch b/patches/ti_4.9.x/pm_opp/0005-ARM-dts-am335x-boneblack-Enable-1GHz-OPP-for-cpu.patch
similarity index 89%
rename from patches/ti_4.9.x/pm_opp/0006-ARM-dts-am335x-boneblack-Enable-1GHz-OPP-for-cpu.patch
rename to patches/ti_4.9.x/pm_opp/0005-ARM-dts-am335x-boneblack-Enable-1GHz-OPP-for-cpu.patch
index 753446643aad034ea79b9adb666e63c6d6917ddc..997c32b1325061304ed4b17366b7590d98aa88a8 100644
--- a/patches/ti_4.9.x/pm_opp/0006-ARM-dts-am335x-boneblack-Enable-1GHz-OPP-for-cpu.patch
+++ b/patches/ti_4.9.x/pm_opp/0005-ARM-dts-am335x-boneblack-Enable-1GHz-OPP-for-cpu.patch
@@ -1,7 +1,7 @@
-From 85fd3abebe7191cfcf70f4fbf9b1c7e31369129b Mon Sep 17 00:00:00 2001
+From 5e5e80fe44b83d79d9540ce6f5f28acd9612d256 Mon Sep 17 00:00:00 2001
From: Dave Gerlach <d-gerlach@ti.com>
Date: Tue, 29 Nov 2016 18:02:20 -0600
-Subject: [PATCH] ARM: dts: am335x-boneblack: Enable 1GHz OPP for cpu
+Subject: [PATCH 5/7] ARM: dts: am335x-boneblack: Enable 1GHz OPP for cpu
Although all PG2.0 silicon may not support 1GHz OPP for the MPU, older
Beaglebone Blacks may have PG2.0 silicon populated and these particular
diff --git a/patches/ti_4.9.x/pm_opp/0007-ARM-dts-am4372-Update-operating-points-v2-table-for-.patch b/patches/ti_4.9.x/pm_opp/0006-ARM-dts-am4372-Update-operating-points-v2-table-for-.patch
similarity index 88%
rename from patches/ti_4.9.x/pm_opp/0007-ARM-dts-am4372-Update-operating-points-v2-table-for-.patch
rename to patches/ti_4.9.x/pm_opp/0006-ARM-dts-am4372-Update-operating-points-v2-table-for-.patch
index cab94edaf6a660139f4f48cdfdaa6d164ab2682b..738a96b5d4ae8a23536d148841b01f9ed70f4a7f 100644
--- a/patches/ti_4.9.x/pm_opp/0007-ARM-dts-am4372-Update-operating-points-v2-table-for-.patch
+++ b/patches/ti_4.9.x/pm_opp/0006-ARM-dts-am4372-Update-operating-points-v2-table-for-.patch
@@ -1,7 +1,8 @@
-From d99c96b19e5d2821689c4c3ba97479289dbe9f79 Mon Sep 17 00:00:00 2001
+From 760aa1effb63f92c4b045422ca74cc7b120f2b48 Mon Sep 17 00:00:00 2001
From: Dave Gerlach <d-gerlach@ti.com>
Date: Tue, 29 Nov 2016 18:02:21 -0600
-Subject: [PATCH] ARM: dts: am4372: Update operating-points-v2 table for cpu
+Subject: [PATCH 6/7] ARM: dts: am4372: Update operating-points-v2 table for
+ cpu
The new ti-cpufreq driver expects the platform specific properties to be
part of the operating-points-v2 table rather than the cpu node so let's
diff --git a/patches/ti_4.9.x/pm_opp/0008-ARM-dts-dra7-Add-updated-operating-points-v2-table-f.patch b/patches/ti_4.9.x/pm_opp/0007-ARM-dts-dra7-Add-updated-operating-points-v2-table-f.patch
similarity index 94%
rename from patches/ti_4.9.x/pm_opp/0008-ARM-dts-dra7-Add-updated-operating-points-v2-table-f.patch
rename to patches/ti_4.9.x/pm_opp/0007-ARM-dts-dra7-Add-updated-operating-points-v2-table-f.patch
index acfe0d7d75ead5d4b9f9ddca131906d449cc3d3a..aad4ed7d86c9dfe9b4e15462697380b03351710c 100644
--- a/patches/ti_4.9.x/pm_opp/0008-ARM-dts-dra7-Add-updated-operating-points-v2-table-f.patch
+++ b/patches/ti_4.9.x/pm_opp/0007-ARM-dts-dra7-Add-updated-operating-points-v2-table-f.patch
@@ -1,7 +1,8 @@
-From 3bf60fbfab08b34cead5549b414fb2ed47e512b9 Mon Sep 17 00:00:00 2001
+From c7c95a29bc80c4d04eb4a4b4daa8b519df60b6ac Mon Sep 17 00:00:00 2001
From: Dave Gerlach <d-gerlach@ti.com>
Date: Tue, 29 Nov 2016 18:02:22 -0600
-Subject: [PATCH] ARM: dts: dra7: Add updated operating-points-v2 table for cpu
+Subject: [PATCH 7/7] ARM: dts: dra7: Add updated operating-points-v2 table for
+ cpu
After the ti-cpufreq driver has been added, we can now drop the
operating-points table present in dra7.dtsi for the cpu and add an
diff --git a/patches/ti_4.9.x/pm_opp/0001-PM-OPP-Expose-_of_get_opp_desc_node-as-dev_pm_opp-AP.patch b/patches/ti_4.9.x/pm_opp/0008-PM-OPP-Expose-_of_get_opp_desc_node-as-dev_pm_opp-AP.patch
similarity index 50%
rename from patches/ti_4.9.x/pm_opp/0001-PM-OPP-Expose-_of_get_opp_desc_node-as-dev_pm_opp-AP.patch
rename to patches/ti_4.9.x/pm_opp/0008-PM-OPP-Expose-_of_get_opp_desc_node-as-dev_pm_opp-AP.patch
index 551cef86f6fe91db542908c810da6a6ea9a347cd..de75330bbffacf1d6c5ad051532276de3e086305 100644
--- a/patches/ti_4.9.x/pm_opp/0001-PM-OPP-Expose-_of_get_opp_desc_node-as-dev_pm_opp-AP.patch
+++ b/patches/ti_4.9.x/pm_opp/0008-PM-OPP-Expose-_of_get_opp_desc_node-as-dev_pm_opp-AP.patch
@@ -1,7 +1,7 @@
-From b3ba20b199ddd8bbb77c03bef1ad854da9cffec2 Mon Sep 17 00:00:00 2001
+From adca00fe4f9eefcc5239971b3f459172d2c332b4 Mon Sep 17 00:00:00 2001
From: Dave Gerlach <d-gerlach@ti.com>
Date: Tue, 29 Nov 2016 18:02:15 -0600
-Subject: [PATCH] PM / OPP: Expose _of_get_opp_desc_node as dev_pm_opp API
+Subject: [PATCH 8/8] PM / OPP: Expose _of_get_opp_desc_node as dev_pm_opp API
Move _of_get_opp_desc_node into include/linux/pm_opp.h and rename it
dev_pm_opp_of_get_opp_desc_node to allow other drivers, such as platform
@@ -9,25 +9,15 @@ OPP and cpufreq drivers, to make use of it.
Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
---
- drivers/base/power/opp/of.c | 9 +++++----
- drivers/base/power/opp/opp.h | 1 -
- include/linux/pm_opp.h | 6 ++++++
- 3 files changed, 11 insertions(+), 5 deletions(-)
+ drivers/base/power/opp/of.c | 7 ++++---
+ include/linux/pm_opp.h | 6 ++++++
+ 2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/base/power/opp/of.c b/drivers/base/power/opp/of.c
-index 5552211..9c8cfb6 100644
+index 3f7d259..618f018 100644
--- a/drivers/base/power/opp/of.c
+++ b/drivers/base/power/opp/of.c
-@@ -198,7 +198,7 @@ void dev_pm_opp_of_remove_table(struct device *dev)
- EXPORT_SYMBOL_GPL(dev_pm_opp_of_remove_table);
-
- /* Returns opp descriptor node for a device, caller must do of_node_put() */
--struct device_node *_of_get_opp_desc_node(struct device *dev)
-+struct device_node *dev_pm_opp_of_get_opp_desc_node(struct device *dev)
- {
- /*
- * TODO: Support for multiple OPP tables.
-@@ -209,6 +209,7 @@ struct device_node *_of_get_opp_desc_node(struct device *dev)
+@@ -254,6 +254,7 @@ static struct device_node *_of_get_opp_desc_node(struct device *dev)
return of_parse_phandle(dev->of_node, "operating-points-v2", 0);
}
@@ -35,7 +25,7 @@ index 5552211..9c8cfb6 100644
/**
* _opp_add_static_v2() - Allocate static OPPs (As per 'v2' DT bindings)
-@@ -450,7 +451,7 @@ int dev_pm_opp_of_add_table(struct device *dev)
+@@ -495,7 +496,7 @@ int dev_pm_opp_of_add_table(struct device *dev)
* OPPs have two version of bindings now. The older one is deprecated,
* try for the new binding first.
*/
@@ -44,41 +34,29 @@ index 5552211..9c8cfb6 100644
if (!opp_np) {
/*
* Try old-deprecated bindings for backward compatibility with
-@@ -560,7 +561,7 @@ int dev_pm_opp_of_get_sharing_cpus(struct device *cpu_dev,
+@@ -605,7 +606,7 @@ int dev_pm_opp_of_get_sharing_cpus(struct device *cpu_dev,
int cpu, ret = 0;
/* Get OPP descriptor node */
- np = _of_get_opp_desc_node(cpu_dev);
+ np = dev_pm_opp_of_get_opp_desc_node(cpu_dev);
if (!np) {
- dev_dbg(cpu_dev, "%s: Couldn't find cpu_dev node.\n", __func__);
+ dev_dbg(cpu_dev, "%s: Couldn't find opp node.\n", __func__);
return -ENOENT;
-@@ -585,7 +586,7 @@ int dev_pm_opp_of_get_sharing_cpus(struct device *cpu_dev,
+@@ -630,7 +631,7 @@ int dev_pm_opp_of_get_sharing_cpus(struct device *cpu_dev,
}
/* Get OPP descriptor node */
- tmp_np = _of_get_opp_desc_node(tcpu_dev);
+ tmp_np = dev_pm_opp_of_get_opp_desc_node(tcpu_dev);
if (!tmp_np) {
- dev_err(tcpu_dev, "%s: Couldn't find tcpu_dev node.\n",
+ dev_err(tcpu_dev, "%s: Couldn't find opp node.\n",
__func__);
-diff --git a/drivers/base/power/opp/opp.h b/drivers/base/power/opp/opp.h
-index fabd5ca..96cd30a 100644
---- a/drivers/base/power/opp/opp.h
-+++ b/drivers/base/power/opp/opp.h
-@@ -190,7 +190,6 @@ struct opp_table {
- /* Routines internal to opp core */
- struct opp_table *_find_opp_table(struct device *dev);
- struct opp_device *_add_opp_dev(const struct device *dev, struct opp_table *opp_table);
--struct device_node *_of_get_opp_desc_node(struct device *dev);
- void _dev_pm_opp_remove_table(struct device *dev, bool remove_all);
- struct dev_pm_opp *_allocate_opp(struct device *dev, struct opp_table **opp_table);
- int _opp_add(struct device *dev, struct dev_pm_opp *new_opp, struct opp_table *opp_table);
diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h
-index bca2615..9e8c138 100644
+index 0edd88f..a5b1aae 100644
--- a/include/linux/pm_opp.h
+++ b/include/linux/pm_opp.h
-@@ -208,6 +208,7 @@ void dev_pm_opp_of_remove_table(struct device *dev);
+@@ -270,6 +270,7 @@ void dev_pm_opp_of_remove_table(struct device *dev);
int dev_pm_opp_of_cpumask_add_table(const struct cpumask *cpumask);
void dev_pm_opp_of_cpumask_remove_table(const struct cpumask *cpumask);
int dev_pm_opp_of_get_sharing_cpus(struct device *cpu_dev, struct cpumask *cpumask);
@@ -86,7 +64,7 @@ index bca2615..9e8c138 100644
#else
static inline int dev_pm_opp_of_add_table(struct device *dev)
{
-@@ -231,6 +232,11 @@ static inline int dev_pm_opp_of_get_sharing_cpus(struct device *cpu_dev, struct
+@@ -293,6 +294,11 @@ static inline int dev_pm_opp_of_get_sharing_cpus(struct device *cpu_dev, struct
{
return -ENOTSUPP;
}
diff --git a/version.sh b/version.sh
index b4fac9d7b2ca19b385ed7b83c998ff1097664d6e..2efbe4f334a6265ddeaf2fb7613caebed5cd00d0 100644
--- a/version.sh
+++ b/version.sh
@@ -26,9 +26,9 @@ toolchain="gcc_linaro_gnueabihf_6"
#toolchain="gcc_linaro_aarch64_gnu_6"
#Kernel/Build
-KERNEL_REL=4.9
-KERNEL_TAG=${KERNEL_REL}
-BUILD=${build_prefix}4
+KERNEL_REL=4.10
+KERNEL_TAG=${KERNEL_REL}-rc1
+BUILD=${build_prefix}0
kernel_rt=".X-rtY"
#v4.X-rcX + upto SHA