diff --git a/patch.sh b/patch.sh
index 0f6f092b225d931a20abc2a1a65c821a986bf222..4f607d052720f9a175ebc945dd72e7c1b597102c 100644
--- a/patch.sh
+++ b/patch.sh
@@ -108,10 +108,9 @@ dts () {
${git} "${DIR}/patches/dts/0006-arm-dts-omap4-move-emif-so-panda-es-b3-now-boots.patch"
${git} "${DIR}/patches/dts/0007-omap3-beagle-xm-ehci-works-again.patch"
${git} "${DIR}/patches/dts/0008-ARM-dts-omap3-beagle-ddc-i2c-bus-is-not-responding-d.patch"
-# ${git} "${DIR}/patches/dts/0009-ARM-dts-sunxi-Add-simplefb-nodes-for-de_be0-lcd0-de_.patch"
if [ "x${regenerate}" = "xenable" ] ; then
- number=9
+ number=8
cleanup
fi
}
@@ -135,15 +134,13 @@ fixes () {
fi
${git} "${DIR}/patches/fixes/0001-trusty-gcc-4.8-4.8.2-19ubuntu1-has-fix.patch"
-# ${git} "${DIR}/patches/fixes/0002-ARM-dts-Fix-missing-usb0_reset-for-sun4i-sun5i.patch"
- ${git} "${DIR}/patches/fixes/0003-ARM-dts-am57xx-beagle-x15-Add-GPIO-controlled-fan-no.patch"
- ${git} "${DIR}/patches/fixes/0004-tty-serial-8250-omap-add-ttySx-console-if-the-user-d.patch"
- ${git} "${DIR}/patches/fixes/0005-ARM-dts-am57xx-beagle-x15-Add-dual-ethernet.patch"
- ${git} "${DIR}/patches/fixes/0006-gpio-fan-Add-thermal-control-hooks.patch"
-# ${git} "${DIR}/patches/fixes/0007-ARM-dts-am57xx-beagle-x15-Add-thermal-map.patch"
+ ${git} "${DIR}/patches/fixes/0002-ARM-dts-am57xx-beagle-x15-Add-GPIO-controlled-fan-no.patch"
+ ${git} "${DIR}/patches/fixes/0003-tty-serial-8250-omap-add-ttySx-console-if-the-user-d.patch"
+ ${git} "${DIR}/patches/fixes/0004-ARM-dts-am57xx-beagle-x15-Add-dual-ethernet.patch"
+ ${git} "${DIR}/patches/fixes/0005-gpio-fan-Add-thermal-control-hooks.patch"
if [ "x${regenerate}" = "xenable" ] ; then
- number=7
+ number=5
cleanup
fi
diff --git a/patches/defconfig b/patches/defconfig
index d5e484086804d549c617f11d5f892016ec4507b1..91dc29de44170871d0d0598eadd6525486d6811f 100644
--- a/patches/defconfig
+++ b/patches/defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.19.0-rc7 Kernel Configuration
+# Linux/arm 3.19.0 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
diff --git a/patches/defconfig-bone b/patches/defconfig-bone
index 02933891f331428cc4fa7f11ed9a1e854d78adb3..31b875f19c694fed234db8d1a3d44e3a0d262c44 100644
--- a/patches/defconfig-bone
+++ b/patches/defconfig-bone
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.19.0-rc7 Kernel Configuration
+# Linux/arm 3.19.0 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
diff --git a/patches/fixes/0001-trusty-gcc-4.8-4.8.2-19ubuntu1-has-fix.patch b/patches/fixes/0001-trusty-gcc-4.8-4.8.2-19ubuntu1-has-fix.patch
index 348f8506d28d1ab2c11a304720bdb195f36c56a0..b2343b144f2c44c88dc31fca2f7ace8e9d71a5e4 100644
--- a/patches/fixes/0001-trusty-gcc-4.8-4.8.2-19ubuntu1-has-fix.patch
+++ b/patches/fixes/0001-trusty-gcc-4.8-4.8.2-19ubuntu1-has-fix.patch
@@ -1,7 +1,7 @@
-From 0753b7a6e984f481fcc53e46917806aa11265faf Mon Sep 17 00:00:00 2001
+From 9b4026682c2023fb04e07358dd2b6d05f3183ef8 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Tue, 11 Nov 2014 18:19:30 -0600
-Subject: [PATCH 1/7] trusty: gcc-4.8 (4.8.2-19ubuntu1) has fix
+Subject: [PATCH 1/5] trusty: gcc-4.8 (4.8.2-19ubuntu1) has fix
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
diff --git a/patches/fixes/0002-ARM-dts-Fix-missing-usb0_reset-for-sun4i-sun5i.patch b/patches/fixes/0002-ARM-dts-Fix-missing-usb0_reset-for-sun4i-sun5i.patch
deleted file mode 100644
index 9569c23b9fbdd2682d62917e4fc7b704d1a1da66..0000000000000000000000000000000000000000
--- a/patches/fixes/0002-ARM-dts-Fix-missing-usb0_reset-for-sun4i-sun5i.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 194839e9c9896cd7dbec4d31d65f50ca4d1dff17 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Wed, 24 Dec 2014 20:19:18 +0100
-Subject: [PATCH 2/7] ARM: dts: Fix missing usb0_reset for sun4i / sun5i
-
-The recent sun4i-usb-phy changes to add (preliminary) support for the oth phy,
-cause the ehci/ohci controllers to no longer work on sun4i / sun5i, because
-the phy driver refuses to load due to a missing usb0_reset reset controller
-in the dts files for sun4i / sun5i:
-
-[ 0.094293] sun4i-usb-phy 1c13400.phy: failed to get reset usb0_reset
-[ 0.094326] sun4i-usb-phy: probe of 1c13400.phy failed with error -22
-
-This fixes this.
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- arch/arm/boot/dts/sun4i-a10.dtsi | 4 ++--
- arch/arm/boot/dts/sun5i-a10s.dtsi | 4 ++--
- arch/arm/boot/dts/sun5i-a13.dtsi | 4 ++--
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
-index 7b4099f..e342230 100644
---- a/arch/arm/boot/dts/sun4i-a10.dtsi
-+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
-@@ -438,8 +438,8 @@
- reg-names = "phy_ctrl", "pmu1", "pmu2";
- clocks = <&usb_clk 8>;
- clock-names = "usb_phy";
-- resets = <&usb_clk 1>, <&usb_clk 2>;
-- reset-names = "usb1_reset", "usb2_reset";
-+ resets = <&usb_clk 0>, <&usb_clk 1>, <&usb_clk 2>;
-+ reset-names = "usb0_reset", "usb1_reset", "usb2_reset";
- status = "disabled";
- };
-
-diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
-index 1b76667..96f4992 100644
---- a/arch/arm/boot/dts/sun5i-a10s.dtsi
-+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
-@@ -390,8 +390,8 @@
- reg-names = "phy_ctrl", "pmu1";
- clocks = <&usb_clk 8>;
- clock-names = "usb_phy";
-- resets = <&usb_clk 1>;
-- reset-names = "usb1_reset";
-+ resets = <&usb_clk 0>, <&usb_clk 1>;
-+ reset-names = "usb0_reset", "usb1_reset";
- status = "disabled";
- };
-
-diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi
-index c35217e..7f74101 100644
---- a/arch/arm/boot/dts/sun5i-a13.dtsi
-+++ b/arch/arm/boot/dts/sun5i-a13.dtsi
-@@ -349,8 +349,8 @@
- reg-names = "phy_ctrl", "pmu1";
- clocks = <&usb_clk 8>;
- clock-names = "usb_phy";
-- resets = <&usb_clk 1>;
-- reset-names = "usb1_reset";
-+ resets = <&usb_clk 0>, <&usb_clk 1>;
-+ reset-names = "usb0_reset", "usb1_reset";
- status = "disabled";
- };
-
---
-2.1.4
-
diff --git a/patches/fixes/0003-ARM-dts-am57xx-beagle-x15-Add-GPIO-controlled-fan-no.patch b/patches/fixes/0002-ARM-dts-am57xx-beagle-x15-Add-GPIO-controlled-fan-no.patch
similarity index 90%
rename from patches/fixes/0003-ARM-dts-am57xx-beagle-x15-Add-GPIO-controlled-fan-no.patch
rename to patches/fixes/0002-ARM-dts-am57xx-beagle-x15-Add-GPIO-controlled-fan-no.patch
index 28e8a0fd3443a3e3f20b76a02c2a936bb5e1d624..c8b155be139437d9864bdae69cce345452059115 100644
--- a/patches/fixes/0003-ARM-dts-am57xx-beagle-x15-Add-GPIO-controlled-fan-no.patch
+++ b/patches/fixes/0002-ARM-dts-am57xx-beagle-x15-Add-GPIO-controlled-fan-no.patch
@@ -1,7 +1,7 @@
-From c004ee46644b5727985102b948e35e0f6b53a519 Mon Sep 17 00:00:00 2001
+From f32314da00fa48b45ec95fbcc4dcca22489fb2b4 Mon Sep 17 00:00:00 2001
From: Nishanth Menon <nm@ti.com>
Date: Mon, 5 Jan 2015 10:32:29 -0600
-Subject: [PATCH 3/7] ARM: dts: am57xx-beagle-x15: Add GPIO controlled fan node
+Subject: [PATCH 2/5] ARM: dts: am57xx-beagle-x15: Add GPIO controlled fan node
TPS gpio now controls a 5v 500mA TL5209 regulator which may be supply
a fan (such as AFB02505HHB) over J1 connector for various purposes.
diff --git a/patches/fixes/0004-tty-serial-8250-omap-add-ttySx-console-if-the-user-d.patch b/patches/fixes/0003-tty-serial-8250-omap-add-ttySx-console-if-the-user-d.patch
similarity index 96%
rename from patches/fixes/0004-tty-serial-8250-omap-add-ttySx-console-if-the-user-d.patch
rename to patches/fixes/0003-tty-serial-8250-omap-add-ttySx-console-if-the-user-d.patch
index 815a2688d6a2154f3d89fc3587e8af7e59f43d1d..56a7c395cdd5c7b22892c85e09ec1b2cc5ea9fb6 100644
--- a/patches/fixes/0004-tty-serial-8250-omap-add-ttySx-console-if-the-user-d.patch
+++ b/patches/fixes/0003-tty-serial-8250-omap-add-ttySx-console-if-the-user-d.patch
@@ -1,7 +1,7 @@
-From 61a7b042a4692ead3b0bb41ec1c2a1ee9a967030 Mon Sep 17 00:00:00 2001
+From 16a020efd046fe1cb890b2f80a97ad40ff6923a6 Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Thu, 18 Dec 2014 18:47:12 +0100
-Subject: [PATCH 4/7] tty: serial: 8250: omap: add ttySx console if the user
+Subject: [PATCH 3/5] tty: serial: 8250: omap: add ttySx console if the user
didn't
This patch invokes add_preferred_console() with ttyS based on ttyO
diff --git a/patches/fixes/0005-ARM-dts-am57xx-beagle-x15-Add-dual-ethernet.patch b/patches/fixes/0004-ARM-dts-am57xx-beagle-x15-Add-dual-ethernet.patch
similarity index 97%
rename from patches/fixes/0005-ARM-dts-am57xx-beagle-x15-Add-dual-ethernet.patch
rename to patches/fixes/0004-ARM-dts-am57xx-beagle-x15-Add-dual-ethernet.patch
index 74466b9b1e1b6b8cbcdbc6fb26b97a1a5246110d..ced62be98f14f7b274a2e0bd91b7d69425c8f175 100644
--- a/patches/fixes/0005-ARM-dts-am57xx-beagle-x15-Add-dual-ethernet.patch
+++ b/patches/fixes/0004-ARM-dts-am57xx-beagle-x15-Add-dual-ethernet.patch
@@ -1,7 +1,7 @@
-From 1b5d9a6fb45b7a1217bc22751cef207cb220727f Mon Sep 17 00:00:00 2001
+From bf862061d52b472a291b167c336491a307ab3d16 Mon Sep 17 00:00:00 2001
From: Felipe Balbi <balbi@ti.com>
Date: Thu, 4 Dec 2014 14:53:38 -0600
-Subject: [PATCH 5/7] ARM: dts: am57xx-beagle-x15: Add dual ethernet
+Subject: [PATCH 4/5] ARM: dts: am57xx-beagle-x15: Add dual ethernet
Make CPSW work - BeagleBoard-X15 has two network ports
diff --git a/patches/fixes/0006-gpio-fan-Add-thermal-control-hooks.patch b/patches/fixes/0005-gpio-fan-Add-thermal-control-hooks.patch
similarity index 97%
rename from patches/fixes/0006-gpio-fan-Add-thermal-control-hooks.patch
rename to patches/fixes/0005-gpio-fan-Add-thermal-control-hooks.patch
index cf219446138e8d718a9c3c41c94d149be1ae2417..d8118117e859bf323c742b0c3b4d616b05158738 100644
--- a/patches/fixes/0006-gpio-fan-Add-thermal-control-hooks.patch
+++ b/patches/fixes/0005-gpio-fan-Add-thermal-control-hooks.patch
@@ -1,7 +1,7 @@
-From 8f3608e974662f52e0f80c874de76667273750eb Mon Sep 17 00:00:00 2001
+From 60d3be52719b984dd86027f7bae55d259c96a575 Mon Sep 17 00:00:00 2001
From: Nishanth Menon <nm@ti.com>
Date: Thu, 8 Jan 2015 12:05:03 -0600
-Subject: [PATCH 6/7] (gpio-fan): Add thermal control hooks
+Subject: [PATCH 5/5] (gpio-fan): Add thermal control hooks
Allow gpio-fan to be used as thermal cooling device for platforms that
use GPIO maps to control fans.
diff --git a/patches/fixes/0007-ARM-dts-am57xx-beagle-x15-Add-thermal-map.patch b/patches/fixes/0007-ARM-dts-am57xx-beagle-x15-Add-thermal-map.patch
deleted file mode 100644
index 8feda95a12bd3b8aaa4c0c291952a13baf5e5e9b..0000000000000000000000000000000000000000
--- a/patches/fixes/0007-ARM-dts-am57xx-beagle-x15-Add-thermal-map.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 71feb30e8bf8b26d5f73a6d92eb9c6f527763e73 Mon Sep 17 00:00:00 2001
-From: Nishanth Menon <nm@ti.com>
-Date: Mon, 5 Jan 2015 10:29:07 -0600
-Subject: [PATCH 7/7] ARM: dts: am57xx-beagle-x15: Add thermal map
-
-BeagleBoard-X15 has capability for a fan and has an onboard TMP102
-temperature sensor as well. This allows us to create a new thermal
-zone (called, un-imaginatively "board"), and allows us to use some
-active cooling as temperatures start edge upward in the system by
-creating a new alert temperature (emperically 50C) for cpu.
-
-NOTE: Fan is NOT mounted by default on the platform, in such a case,
-all we end up doing is switch on a regulator and leak very minimal
-current.
-
-Signed-off-by: Nishanth Menon <nm@ti.com>
----
- arch/arm/boot/dts/am57xx-beagle-x15.dts | 49 +++++++++++++++++++++++++++++++++
- 1 file changed, 49 insertions(+)
-
-diff --git a/arch/arm/boot/dts/am57xx-beagle-x15.dts b/arch/arm/boot/dts/am57xx-beagle-x15.dts
-index 065b2f9..484b4b9 100644
---- a/arch/arm/boot/dts/am57xx-beagle-x15.dts
-+++ b/arch/arm/boot/dts/am57xx-beagle-x15.dts
-@@ -87,6 +87,7 @@
- gpios = <&tps659038_gpio 1 GPIO_ACTIVE_HIGH>;
- gpio-fan,speed-map = <0 0>,
- <13000 1>;
-+ #cooling-cells = <2>;
- };
- };
-
-@@ -417,6 +418,7 @@
- pinctrl-0 = <&tmp102_pins_default>;
- interrupt-parent = <&gpio7>;
- interrupts = <16 IRQ_TYPE_LEVEL_LOW>;
-+ #thermal-sensor-cells = <1>;
- };
- };
-
-@@ -523,3 +525,50 @@
- pinctrl-names = "default";
- pinctrl-0 = <&usb1_pins>;
- };
-+
-+&cpu_trips {
-+ cpu_alert1: cpu_alert1 {
-+ temperature = <50000>; /* millicelsius */
-+ hysteresis = <2000>; /* millicelsius */
-+ type = "active";
-+ };
-+};
-+
-+&cpu_cooling_maps {
-+ map1 {
-+ trip = <&cpu_alert1>;
-+ cooling-device = <&gpio_fan THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-+ };
-+};
-+
-+&thermal_zones {
-+ board_thermal: board_thermal {
-+ polling-delay-passive = <1250>; /* milliseconds */
-+ polling-delay = <1500>; /* milliseconds */
-+
-+ /* sensor ID */
-+ thermal-sensors = <&tmp102 0>;
-+
-+ board_trips: trips {
-+ board_alert0: board_alert {
-+ temperature = <40000>; /* millicelsius */
-+ hysteresis = <2000>; /* millicelsius */
-+ type = "active";
-+ };
-+
-+ board_crit: board_crit {
-+ temperature = <105000>; /* millicelsius */
-+ hysteresis = <0>; /* millicelsius */
-+ type = "critical";
-+ };
-+ };
-+
-+ board_cooling_maps: cooling-maps {
-+ map0 {
-+ trip = <&board_alert0>;
-+ cooling-device =
-+ <&gpio_fan THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-+ };
-+ };
-+ };
-+};
---
-2.1.4
-
diff --git a/patches/ref_omap2plus_defconfig b/patches/ref_omap2plus_defconfig
index 1e8ec22d88d5c12d68dbcef229e7907b0cbf48cb..98cd78e30ae33bfd367842d9540a1bc974b8b4e6 100644
--- a/patches/ref_omap2plus_defconfig
+++ b/patches/ref_omap2plus_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.19.0-rc7 Kernel Configuration
+# Linux/arm 3.19.0 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
diff --git a/version.sh b/version.sh
index 3e45e4454f0d447fd9b435aba29ad30a7d1b9e7c..598fb7f0b341f4471ff1afe25bb262fa9be3329c 100644
--- a/version.sh
+++ b/version.sh
@@ -21,7 +21,7 @@ toolchain="gcc_linaro_gnueabihf_4_9"
#Kernel/Build
KERNEL_REL=3.19
-KERNEL_TAG=${KERNEL_REL}-rc7
+KERNEL_TAG=${KERNEL_REL}
BUILD=bone3
#v3.X-rcX + upto SHA