From 66b4dfcf520122f7ddaeb5e774af35840105d53e Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Thu, 28 Jan 2016 12:56:49 -0600
Subject: [PATCH] add: dmtimer and 1ghz hack for all am335x
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
patch.sh | 16 +-
.../0001-am335x-broken-voltdm.patch | 242 ++++++++++++++++++
...am335x-boneblack-add-cpu0-opp-points.patch | 97 -------
...Add-PWM-dmtimer-platform-data-quirks.patch | 67 +++++
...ata-quirks-for-sgx-deassert_hardrese.patch | 14 +-
version.sh | 2 +-
6 files changed, 332 insertions(+), 106 deletions(-)
create mode 100644 patches/beaglebone/broken-voltdm/0001-am335x-broken-voltdm.patch
delete mode 100644 patches/beaglebone/dts/0001-am335x-boneblack-add-cpu0-opp-points.patch
create mode 100644 patches/lts44_backports/dmtimer/0003-ARM-OMAP-Add-PWM-dmtimer-platform-data-quirks.patch
diff --git a/patch.sh b/patch.sh
index daa6d3788..edf1b73e0 100644
--- a/patch.sh
+++ b/patch.sh
@@ -135,6 +135,8 @@ lts44_backports () {
${git} "${DIR}/patches/lts44_backports/dmtimer/0002-pwm-omap-dmtimer-Potential-NULL-dereference-on-error.patch"
fi
unset is_44
+
+ ${git} "${DIR}/patches/lts44_backports/dmtimer/0003-ARM-OMAP-Add-PWM-dmtimer-platform-data-quirks.patch"
}
reverts () {
@@ -414,7 +416,6 @@ beaglebone () {
start_cleanup
fi
- ${git} "${DIR}/patches/beaglebone/dts/0001-am335x-boneblack-add-cpu0-opp-points.patch"
#${git} "${DIR}/patches/beaglebone/dts/0001-hack-bbb-enable-1ghz-operation.patch"
${git} "${DIR}/patches/beaglebone/dts/0002-dts-am335x-bone-common-fixup-leds-to-match-3.8.patch"
${git} "${DIR}/patches/beaglebone/dts/0003-arm-dts-am335x-bone-common-add-collision-and-carrier.patch"
@@ -596,6 +597,19 @@ beaglebone () {
cleanup
fi
+ echo "dir: beaglebone/broken-voltdm"
+ #regenerate="enable"
+ if [ "x${regenerate}" = "xenable" ] ; then
+ start_cleanup
+ fi
+
+ ${git} "${DIR}/patches/beaglebone/broken-voltdm/0001-am335x-broken-voltdm.patch"
+
+ if [ "x${regenerate}" = "xenable" ] ; then
+ number=1
+ cleanup
+ fi
+
####
#dtb makefile
echo "dir: beaglebone/generated"
diff --git a/patches/beaglebone/broken-voltdm/0001-am335x-broken-voltdm.patch b/patches/beaglebone/broken-voltdm/0001-am335x-broken-voltdm.patch
new file mode 100644
index 000000000..2133e4a9a
--- /dev/null
+++ b/patches/beaglebone/broken-voltdm/0001-am335x-broken-voltdm.patch
@@ -0,0 +1,242 @@
+From fefab7779bb81451b067c0661ee5b18bc74fd8e3 Mon Sep 17 00:00:00 2001
+From: Robert Nelson <robertcnelson@gmail.com>
+Date: Thu, 28 Jan 2016 10:35:37 -0600
+Subject: [PATCH] am335x broken voltdm
+
+Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
+---
+ arch/arm/boot/dts/am335x-abbbi.dts | 1 +
+ arch/arm/boot/dts/am335x-arduino-tre.dts | 1 +
+ arch/arm/boot/dts/am335x-bbb-broken-voltdm.dtsi | 27 ++++++++++++++++++++++
+ arch/arm/boot/dts/am335x-boneblack-bbb-exp-c.dts | 1 +
+ arch/arm/boot/dts/am335x-boneblack-bbb-exp-r.dts | 1 +
+ arch/arm/boot/dts/am335x-boneblack-bbbmini.dts | 1 +
+ .../boot/dts/am335x-boneblack-cape-bone-argus.dts | 1 +
+ .../arm/boot/dts/am335x-boneblack-emmc-overlay.dts | 1 +
+ .../arm/boot/dts/am335x-boneblack-hdmi-overlay.dts | 1 +
+ .../boot/dts/am335x-boneblack-nhdmi-overlay.dts | 1 +
+ arch/arm/boot/dts/am335x-boneblack-overlay.dts | 1 +
+ arch/arm/boot/dts/am335x-boneblack-wl1835mod.dts | 1 +
+ arch/arm/boot/dts/am335x-boneblack.dts | 1 +
+ arch/arm/boot/dts/am335x-bonegreen-overlay.dts | 1 +
+ arch/arm/boot/dts/am335x-bonegreen-wireless.dts | 1 +
+ arch/arm/boot/dts/am335x-bonegreen.dts | 1 +
+ 16 files changed, 42 insertions(+)
+ create mode 100644 arch/arm/boot/dts/am335x-bbb-broken-voltdm.dtsi
+
+diff --git a/arch/arm/boot/dts/am335x-abbbi.dts b/arch/arm/boot/dts/am335x-abbbi.dts
+index cc9b1f4..e7aac54 100644
+--- a/arch/arm/boot/dts/am335x-abbbi.dts
++++ b/arch/arm/boot/dts/am335x-abbbi.dts
+@@ -11,6 +11,7 @@
+ #include "am33xx.dtsi"
+ #include "am335x-bone-common.dtsi"
+ #include "am33xx-overlay-edma-fix.dtsi"
++#include "am335x-bbb-broken-voltdm.dtsi"
+
+ / {
+ model = "Arrow BeagleBone Black Industrial";
+diff --git a/arch/arm/boot/dts/am335x-arduino-tre.dts b/arch/arm/boot/dts/am335x-arduino-tre.dts
+index 9e27df0..5b91487 100644
+--- a/arch/arm/boot/dts/am335x-arduino-tre.dts
++++ b/arch/arm/boot/dts/am335x-arduino-tre.dts
+@@ -8,6 +8,7 @@
+ /dts-v1/;
+
+ #include "am33xx.dtsi"
++#include "am335x-bbb-broken-voltdm.dtsi"
+
+ / {
+ model = "TI AM335x Arduino Tre";
+diff --git a/arch/arm/boot/dts/am335x-bbb-broken-voltdm.dtsi b/arch/arm/boot/dts/am335x-bbb-broken-voltdm.dtsi
+new file mode 100644
+index 0000000..1fb10a0
+--- /dev/null
++++ b/arch/arm/boot/dts/am335x-bbb-broken-voltdm.dtsi
+@@ -0,0 +1,27 @@
++/*
++ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.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.
++ */
++
++/ {
++ cpus {
++ cpu@0 {
++ cpu0-supply = <&dcdc2_reg>;
++ /*
++ * To consider voltage drop between PMIC and SoC,
++ * tolerance value is reduced to 2% from 4% and
++ * voltage value is increased as a precaution.
++ */
++ operating-points = <
++ /* kHz uV */
++ 1000000 1325000
++ 800000 1300000
++ 600000 1112000
++ 300000 969000
++ >;
++ };
++ };
++};
+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 938a26a..55238fb 100644
+--- a/arch/arm/boot/dts/am335x-boneblack-bbb-exp-c.dts
++++ b/arch/arm/boot/dts/am335x-boneblack-bbb-exp-c.dts
+@@ -9,6 +9,7 @@
+
+ #include "am33xx.dtsi"
+ #include "am335x-bone-common-no-capemgr.dtsi"
++#include "am335x-bbb-broken-voltdm.dtsi"
+
+ / {
+ model = "TI AM335x BeagleBone Black";
+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 6cf786f..1deece5 100644
+--- a/arch/arm/boot/dts/am335x-boneblack-bbb-exp-r.dts
++++ b/arch/arm/boot/dts/am335x-boneblack-bbb-exp-r.dts
+@@ -9,6 +9,7 @@
+
+ #include "am33xx.dtsi"
+ #include "am335x-bone-common-no-capemgr.dtsi"
++#include "am335x-bbb-broken-voltdm.dtsi"
+
+ / {
+ model = "TI AM335x BeagleBone Black";
+diff --git a/arch/arm/boot/dts/am335x-boneblack-bbbmini.dts b/arch/arm/boot/dts/am335x-boneblack-bbbmini.dts
+index adb317c..5dd5d40 100644
+--- a/arch/arm/boot/dts/am335x-boneblack-bbbmini.dts
++++ b/arch/arm/boot/dts/am335x-boneblack-bbbmini.dts
+@@ -10,6 +10,7 @@
+
+ #include "am33xx.dtsi"
+ #include "am335x-bone-common.dtsi"
++#include "am335x-bbb-broken-voltdm.dtsi"
+
+ #include <dt-bindings/board/am335x-bbw-bbb-base.h>
+ #include <dt-bindings/pinctrl/am33xx.h>
+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..6ec2ea8 100644
+--- a/arch/arm/boot/dts/am335x-boneblack-cape-bone-argus.dts
++++ b/arch/arm/boot/dts/am335x-boneblack-cape-bone-argus.dts
+@@ -9,6 +9,7 @@
+
+ #include "am33xx.dtsi"
+ #include "am335x-bone-common-no-capemgr.dtsi"
++#include "am335x-bbb-broken-voltdm.dtsi"
+
+ / {
+ model = "TI AM335x BeagleBone Black";
+diff --git a/arch/arm/boot/dts/am335x-boneblack-emmc-overlay.dts b/arch/arm/boot/dts/am335x-boneblack-emmc-overlay.dts
+index 5946a7e..33a8a0e 100644
+--- a/arch/arm/boot/dts/am335x-boneblack-emmc-overlay.dts
++++ b/arch/arm/boot/dts/am335x-boneblack-emmc-overlay.dts
+@@ -10,6 +10,7 @@
+ #include "am33xx.dtsi"
+ #include "am335x-bone-common.dtsi"
+ #include "am33xx-overlay-edma-fix.dtsi"
++#include "am335x-bbb-broken-voltdm.dtsi"
+
+ / {
+ model = "TI AM335x BeagleBone Black";
+diff --git a/arch/arm/boot/dts/am335x-boneblack-hdmi-overlay.dts b/arch/arm/boot/dts/am335x-boneblack-hdmi-overlay.dts
+index 9b0a7ba..2eb0253 100644
+--- a/arch/arm/boot/dts/am335x-boneblack-hdmi-overlay.dts
++++ b/arch/arm/boot/dts/am335x-boneblack-hdmi-overlay.dts
+@@ -10,6 +10,7 @@
+ #include "am33xx.dtsi"
+ #include "am335x-bone-common.dtsi"
+ #include "am33xx-overlay-edma-fix.dtsi"
++#include "am335x-bbb-broken-voltdm.dtsi"
+
+ / {
+ model = "TI AM335x BeagleBone Black";
+diff --git a/arch/arm/boot/dts/am335x-boneblack-nhdmi-overlay.dts b/arch/arm/boot/dts/am335x-boneblack-nhdmi-overlay.dts
+index 9b0a7ba..2eb0253 100644
+--- a/arch/arm/boot/dts/am335x-boneblack-nhdmi-overlay.dts
++++ b/arch/arm/boot/dts/am335x-boneblack-nhdmi-overlay.dts
+@@ -10,6 +10,7 @@
+ #include "am33xx.dtsi"
+ #include "am335x-bone-common.dtsi"
+ #include "am33xx-overlay-edma-fix.dtsi"
++#include "am335x-bbb-broken-voltdm.dtsi"
+
+ / {
+ model = "TI AM335x BeagleBone Black";
+diff --git a/arch/arm/boot/dts/am335x-boneblack-overlay.dts b/arch/arm/boot/dts/am335x-boneblack-overlay.dts
+index 880629c..b8daf01 100644
+--- a/arch/arm/boot/dts/am335x-boneblack-overlay.dts
++++ b/arch/arm/boot/dts/am335x-boneblack-overlay.dts
+@@ -10,6 +10,7 @@
+ #include "am33xx.dtsi"
+ #include "am335x-bone-common.dtsi"
+ #include "am33xx-overlay-edma-fix.dtsi"
++#include "am335x-bbb-broken-voltdm.dtsi"
+
+ / {
+ model = "TI AM335x BeagleBone Black";
+diff --git a/arch/arm/boot/dts/am335x-boneblack-wl1835mod.dts b/arch/arm/boot/dts/am335x-boneblack-wl1835mod.dts
+index e376613..60cdc98 100644
+--- a/arch/arm/boot/dts/am335x-boneblack-wl1835mod.dts
++++ b/arch/arm/boot/dts/am335x-boneblack-wl1835mod.dts
+@@ -9,6 +9,7 @@
+
+ #include "am33xx.dtsi"
+ #include "am335x-bone-common-no-capemgr.dtsi"
++#include "am335x-bbb-broken-voltdm.dtsi"
+
+ / {
+ model = "TI AM335x BeagleBone Black";
+diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
+index db5beb5..6d77d2e 100644
+--- a/arch/arm/boot/dts/am335x-boneblack.dts
++++ b/arch/arm/boot/dts/am335x-boneblack.dts
+@@ -10,6 +10,7 @@
+ #include "am33xx.dtsi"
+ #include "am335x-bone-common.dtsi"
+ #include "am33xx-overlay-edma-fix.dtsi"
++#include "am335x-bbb-broken-voltdm.dtsi"
+
+ / {
+ model = "TI AM335x BeagleBone Black";
+diff --git a/arch/arm/boot/dts/am335x-bonegreen-overlay.dts b/arch/arm/boot/dts/am335x-bonegreen-overlay.dts
+index b87a606..14f3431 100644
+--- a/arch/arm/boot/dts/am335x-bonegreen-overlay.dts
++++ b/arch/arm/boot/dts/am335x-bonegreen-overlay.dts
+@@ -10,6 +10,7 @@
+ #include "am33xx.dtsi"
+ #include "am335x-bone-common.dtsi"
+ #include "am33xx-overlay-edma-fix.dtsi"
++#include "am335x-bbb-broken-voltdm.dtsi"
+
+ / {
+ model = "TI AM335x BeagleBone Green";
+diff --git a/arch/arm/boot/dts/am335x-bonegreen-wireless.dts b/arch/arm/boot/dts/am335x-bonegreen-wireless.dts
+index 788a2bd..0da0331 100644
+--- a/arch/arm/boot/dts/am335x-bonegreen-wireless.dts
++++ b/arch/arm/boot/dts/am335x-bonegreen-wireless.dts
+@@ -10,6 +10,7 @@
+ #include "am33xx.dtsi"
+ #include "am335x-bone-common.dtsi"
+ #include "am335x-bonegreen-wl1835.dtsi"
++#include "am335x-bbb-broken-voltdm.dtsi"
+
+ / {
+ model = "TI AM335x BeagleBone Green";
+diff --git a/arch/arm/boot/dts/am335x-bonegreen.dts b/arch/arm/boot/dts/am335x-bonegreen.dts
+index 42ac698..8bf93e6 100644
+--- a/arch/arm/boot/dts/am335x-bonegreen.dts
++++ b/arch/arm/boot/dts/am335x-bonegreen.dts
+@@ -10,6 +10,7 @@
+ #include "am33xx.dtsi"
+ #include "am335x-bone-common.dtsi"
+ #include "am33xx-overlay-edma-fix.dtsi"
++#include "am335x-bbb-broken-voltdm.dtsi"
+
+ / {
+ model = "TI AM335x BeagleBone Green";
+--
+2.7.0.rc3
+
diff --git a/patches/beaglebone/dts/0001-am335x-boneblack-add-cpu0-opp-points.patch b/patches/beaglebone/dts/0001-am335x-boneblack-add-cpu0-opp-points.patch
deleted file mode 100644
index 7018ffdc5..000000000
--- a/patches/beaglebone/dts/0001-am335x-boneblack-add-cpu0-opp-points.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From a3535363c3983a7f65f2115cbb72b25c2cc17d2c Mon Sep 17 00:00:00 2001
-From: Robert Nelson <robertcnelson@gmail.com>
-Date: Tue, 23 Dec 2014 15:27:26 -0600
-Subject: [PATCH 1/5] am335x-boneblack: add cpu0 opp points
-
-Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
----
- arch/arm/boot/dts/am335x-boneblack-1ghz.dtsi | 27 ++++++++++++++++++++++++++
- arch/arm/boot/dts/am335x-boneblack-800mhz.dtsi | 26 +++++++++++++++++++++++++
- arch/arm/boot/dts/am335x-boneblack.dts | 4 ++++
- 3 files changed, 57 insertions(+)
- create mode 100644 arch/arm/boot/dts/am335x-boneblack-1ghz.dtsi
- create mode 100644 arch/arm/boot/dts/am335x-boneblack-800mhz.dtsi
-
-diff --git a/arch/arm/boot/dts/am335x-boneblack-1ghz.dtsi b/arch/arm/boot/dts/am335x-boneblack-1ghz.dtsi
-new file mode 100644
-index 0000000..1fb10a0
---- /dev/null
-+++ b/arch/arm/boot/dts/am335x-boneblack-1ghz.dtsi
-@@ -0,0 +1,27 @@
-+/*
-+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.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.
-+ */
-+
-+/ {
-+ cpus {
-+ cpu@0 {
-+ cpu0-supply = <&dcdc2_reg>;
-+ /*
-+ * To consider voltage drop between PMIC and SoC,
-+ * tolerance value is reduced to 2% from 4% and
-+ * voltage value is increased as a precaution.
-+ */
-+ operating-points = <
-+ /* kHz uV */
-+ 1000000 1325000
-+ 800000 1300000
-+ 600000 1112000
-+ 300000 969000
-+ >;
-+ };
-+ };
-+};
-diff --git a/arch/arm/boot/dts/am335x-boneblack-800mhz.dtsi b/arch/arm/boot/dts/am335x-boneblack-800mhz.dtsi
-new file mode 100644
-index 0000000..6d57fd1
---- /dev/null
-+++ b/arch/arm/boot/dts/am335x-boneblack-800mhz.dtsi
-@@ -0,0 +1,26 @@
-+/*
-+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.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.
-+ */
-+
-+/ {
-+ cpus {
-+ cpu@0 {
-+ cpu0-supply = <&dcdc2_reg>;
-+ /*
-+ * To consider voltage drop between PMIC and SoC,
-+ * tolerance value is reduced to 2% from 4% and
-+ * voltage value is increased as a precaution.
-+ */
-+ operating-points = <
-+ /* kHz uV */
-+ 800000 1300000
-+ 600000 1112000
-+ 300000 969000
-+ >;
-+ };
-+ };
-+};
-diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
-index 5c42d25..577d67c 100644
---- a/arch/arm/boot/dts/am335x-boneblack.dts
-+++ b/arch/arm/boot/dts/am335x-boneblack.dts
-@@ -15,6 +15,10 @@
- compatible = "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";
- };
-
-+/* Max Core Speed */
-+#include "am335x-boneblack-1ghz.dtsi"
-+/* #include "am335x-boneblack-800mhz.dtsi" */
-+
- &ldo3_reg {
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
---
-2.1.4
-
diff --git a/patches/lts44_backports/dmtimer/0003-ARM-OMAP-Add-PWM-dmtimer-platform-data-quirks.patch b/patches/lts44_backports/dmtimer/0003-ARM-OMAP-Add-PWM-dmtimer-platform-data-quirks.patch
new file mode 100644
index 000000000..b2078e4c3
--- /dev/null
+++ b/patches/lts44_backports/dmtimer/0003-ARM-OMAP-Add-PWM-dmtimer-platform-data-quirks.patch
@@ -0,0 +1,67 @@
+From b0ccd976e87ec0abd9c72d7f587c4a7b48b154e0 Mon Sep 17 00:00:00 2001
+From: Neil Armstrong <narmstrong@baylibre.com>
+Date: Fri, 22 Jan 2016 17:15:51 +0100
+Subject: [PATCH 3/3] ARM: OMAP: Add PWM dmtimer platform data quirks
+
+In order to set the currently platform dependent dmtimer
+functions pointers as platform data for the pwm-omap-dmtimer
+platform driver, add it to plat-omap auxdata_lookup table.
+
+Suggested-by: Tony Lindgren <tony@atomide.com>
+Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
+Signed-off-by: Tony Lindgren <tony@atomide.com>
+---
+ arch/arm/mach-omap2/pdata-quirks.c | 23 +++++++++++++++++++++++
+ 1 file changed, 23 insertions(+)
+
+diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c
+index e781e4f..a935d28 100644
+--- a/arch/arm/mach-omap2/pdata-quirks.c
++++ b/arch/arm/mach-omap2/pdata-quirks.c
+@@ -23,6 +23,8 @@
+ #include <linux/platform_data/pinctrl-single.h>
+ #include <linux/platform_data/iommu-omap.h>
+ #include <linux/platform_data/wkup_m3.h>
++#include <linux/platform_data/pwm_omap_dmtimer.h>
++#include <plat/dmtimer.h>
+
+ #include "common.h"
+ #include "common-board-devices.h"
+@@ -449,6 +451,24 @@ void omap_auxdata_legacy_init(struct device *dev)
+ dev->platform_data = &twl_gpio_auxdata;
+ }
+
++/* Dual mode timer PWM callbacks platdata */
++#if IS_ENABLED(CONFIG_OMAP_DM_TIMER)
++struct pwm_omap_dmtimer_pdata pwm_dmtimer_pdata = {
++ .request_by_node = omap_dm_timer_request_by_node,
++ .free = omap_dm_timer_free,
++ .enable = omap_dm_timer_enable,
++ .disable = omap_dm_timer_disable,
++ .get_fclk = omap_dm_timer_get_fclk,
++ .start = omap_dm_timer_start,
++ .stop = omap_dm_timer_stop,
++ .set_load = omap_dm_timer_set_load,
++ .set_match = omap_dm_timer_set_match,
++ .set_pwm = omap_dm_timer_set_pwm,
++ .set_prescaler = omap_dm_timer_set_prescaler,
++ .write_counter = omap_dm_timer_write_counter,
++};
++#endif
++
+ /*
+ * Few boards still need auxdata populated before we populate
+ * the dev entries in of_platform_populate().
+@@ -502,6 +522,9 @@ 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 IS_ENABLED(CONFIG_OMAP_DM_TIMER)
++ OF_DEV_AUXDATA("ti,omap-dmtimer-pwm", 0, NULL, &pwm_dmtimer_pdata),
++#endif
+ #if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5)
+ OF_DEV_AUXDATA("ti,omap4-iommu", 0x4a066000, "4a066000.mmu",
+ &omap4_iommu_pdata),
+--
+2.7.0.rc3
+
diff --git a/patches/sgx/0004-ARM-OMAP2-Use-pdata-quirks-for-sgx-deassert_hardrese.patch b/patches/sgx/0004-ARM-OMAP2-Use-pdata-quirks-for-sgx-deassert_hardrese.patch
index e04c3f6a2..410f9902f 100644
--- a/patches/sgx/0004-ARM-OMAP2-Use-pdata-quirks-for-sgx-deassert_hardrese.patch
+++ b/patches/sgx/0004-ARM-OMAP2-Use-pdata-quirks-for-sgx-deassert_hardrese.patch
@@ -17,18 +17,18 @@ Signed-off-by: Darren Etheridge <detheridge@ti.com>
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 5814477..3bd1d243 100644
+index 339b859..573d72f 100644
--- a/arch/arm/mach-omap2/pdata-quirks.c
+++ b/arch/arm/mach-omap2/pdata-quirks.c
-@@ -23,6 +23,7 @@
- #include <linux/platform_data/pinctrl-single.h>
+@@ -24,6 +24,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 <plat/dmtimer.h>
#include "common.h"
- #include "common-board-devices.h"
-@@ -41,6 +42,13 @@ struct pdata_init {
+@@ -43,6 +44,13 @@ struct pdata_init {
static struct of_dev_auxdata omap_auxdata_lookup[];
static struct twl4030_gpio_platform_data twl_gpio_auxdata;
@@ -42,7 +42,7 @@ index 5814477..3bd1d243 100644
#ifdef CONFIG_MACH_NOKIA_N8X0
static void __init omap2420_n8x0_legacy_init(void)
{
-@@ -464,6 +472,10 @@ static struct of_dev_auxdata omap_auxdata_lookup[] __initdata = {
+@@ -484,6 +492,10 @@ static struct of_dev_auxdata omap_auxdata_lookup[] __initdata = {
OF_DEV_AUXDATA("ti,am3352-wkup-m3", 0x44d00000, "44d00000.wkup_m3",
&wkup_m3_data),
#endif
@@ -82,5 +82,5 @@ index 0000000..aa59b2c
+ int (*deassert_reset)(struct platform_device *pdev, const char *name);
+};
--
-2.6.4
+2.7.0.rc3
diff --git a/version.sh b/version.sh
index cdc8d5c7a..1b94d1e5f 100644
--- a/version.sh
+++ b/version.sh
@@ -25,7 +25,7 @@ toolchain="gcc_linaro_gnueabihf_5"
#Kernel/Build
KERNEL_REL=4.5
KERNEL_TAG=${KERNEL_REL}-rc1
-BUILD=${build_prefix}1.2
+BUILD=${build_prefix}1.3
kernel_rt=".X-rtY"
#v4.X-rcX + upto SHA
--
GitLab