bbb: fix tps65217 power button

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
RobertCNelson · Oct 26, 2015 · 4360c00 · 4360c00
1 parent 1acbae1
commit 4360c00
Show file tree

Hide file tree

Showing 11 changed files with 253 additions and 34 deletions.
diff --git a/patch.sh b/patch.sh
@@ -389,9 +389,10 @@ beaglebone () {
 	${git} "${DIR}/patches/beaglebone/dts/0005-add-overlay-dtb.patch"
 	${git} "${DIR}/patches/beaglebone/dts/0006-am335x-bone-common-cpsw-no-longer-need-to-define-bot.patch"
 	${git} "${DIR}/patches/beaglebone/dts/0007-am335x-bone-common-drop-0x1a0-from-mmc.patch"
+	${git} "${DIR}/patches/beaglebone/dts/0008-tps65217-Enable-KEY_POWER-press-on-AC-loss-PWR_BUT.patch"
 
 	if [ "x${regenerate}" = "xenable" ] ; then
-		number=7
+		number=8
 		cleanup
 	fi
 

diff --git a/patches/beaglebone/dtbs/0001-sync-am335x-peripheral-pinmux.patch b/patches/beaglebone/dtbs/0001-sync-am335x-peripheral-pinmux.patch
@@ -1,12 +1,12 @@
-From 27a7efe409fef5e4da37576fbaf1c585035092ff Mon Sep 17 00:00:00 2001
+From 5591f24ab06f6b33b997c10dde972c5d40f5b3a4 Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
-Date: Fri, 16 Oct 2015 11:58:55 -0500
+Date: Mon, 26 Oct 2015 11:48:40 -0500
 Subject: [PATCH] sync: am335x-peripheral/pinmux
 
 Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
 ---
  arch/arm/boot/dts/am335x-arduino-tre.dts           | 570 +++++++++++++++++++++
- .../boot/dts/am335x-bone-common-no-capemgr.dtsi    | 371 ++++++++++++++
+ .../boot/dts/am335x-bone-common-no-capemgr.dtsi    | 374 ++++++++++++++
  arch/arm/boot/dts/am335x-bone-emmc-in-reset.dtsi   |  18 +
  arch/arm/boot/dts/am335x-bone-pinmux-can0.dtsi     |  45 ++
  arch/arm/boot/dts/am335x-bone-pinmux-emmc.dtsi     |  88 ++++
@@ -37,7 +37,7 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
  arch/arm/boot/dts/am57xx-beagle-x15.dts            |  21 +-
  arch/arm/boot/dts/dra74x.dtsi                      |   6 +
  include/dt-bindings/board/am335x-bbw-bbb-base.h    | 103 ++++
- 32 files changed, 2565 insertions(+), 20 deletions(-)
+ 32 files changed, 2568 insertions(+), 20 deletions(-)
  create mode 100644 arch/arm/boot/dts/am335x-arduino-tre.dts
  create mode 100644 arch/arm/boot/dts/am335x-bone-common-no-capemgr.dtsi
  create mode 100644 arch/arm/boot/dts/am335x-bone-emmc-in-reset.dtsi
@@ -643,10 +643,10 @@ index 0000000..7fa0849
 +};
 diff --git a/arch/arm/boot/dts/am335x-bone-common-no-capemgr.dtsi b/arch/arm/boot/dts/am335x-bone-common-no-capemgr.dtsi
 new file mode 100644
-index 0000000..d0ba951
+index 0000000..39c2e2d
 --- /dev/null
 +++ b/arch/arm/boot/dts/am335x-bone-common-no-capemgr.dtsi
-@@ -0,0 +1,371 @@
+@@ -0,0 +1,374 @@
 +/*
 + * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
 + *
@@ -927,6 +927,9 @@ index 0000000..d0ba951
 +	 */
 +	ti,pmic-shutdown-controller;
 +
++	interrupt-parent = <&intc>;
++	interrupts = <7>;	/* NNMI */
++
 +	regulators {
 +		dcdc1_reg: regulator@0 {
 +			regulator-name = "vdds_dpr";
@@ -2741,7 +2744,7 @@ index 0000000..8b42fb0
 +	status = "okay";
 +};
 diff --git a/arch/arm/boot/dts/am57xx-beagle-x15.dts b/arch/arm/boot/dts/am57xx-beagle-x15.dts
-index 934a1e7..333db77 100644
+index d2ef34a..1ef6c91 100644
 --- a/arch/arm/boot/dts/am57xx-beagle-x15.dts
 +++ b/arch/arm/boot/dts/am57xx-beagle-x15.dts
 @@ -58,10 +58,16 @@

diff --git a/patches/beaglebone/dts/0001-hack-bbb-enable-1ghz-operation.patch b/patches/beaglebone/dts/0001-hack-bbb-enable-1ghz-operation.patch
@@ -1,7 +1,7 @@
-From 12e91d4352a805d5ece6a6189dd6fc27d795583a Mon Sep 17 00:00:00 2001
+From 6485a639a7850a6a2d8d2e3b60e6d39bff334f14 Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
 Date: Thu, 4 Sep 2014 16:10:49 -0500
-Subject: [PATCH 1/6] hack: bbb enable 1ghz operation
+Subject: [PATCH 1/8] hack: bbb enable 1ghz operation
 
 Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
 ---
@@ -22,5 +22,5 @@ index 0e07186..c4f5e1e 100644
 
  /* From AM335x TRM, SPRUH73H, Section 9.3.50 */
 -- 
-2.1.4
+2.6.1
 
diff --git a/patches/beaglebone/dts/0002-dts-am335x-bone-common-fixup-leds-to-match-3.8.patch b/patches/beaglebone/dts/0002-dts-am335x-bone-common-fixup-leds-to-match-3.8.patch
@@ -1,7 +1,7 @@
-From 8a8dce948cb3f1b19d6be60d6e5044031e9f3af1 Mon Sep 17 00:00:00 2001
+From ac1460104108a787f7e32c7d02a341788da429a1 Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
 Date: Wed, 27 Aug 2014 13:56:37 -0500
-Subject: [PATCH 2/5] dts: am335x-bone-common: fixup leds to match 3.8
+Subject: [PATCH 2/8] dts: am335x-bone-common: fixup leds to match 3.8
 
 https://groups.google.com/d/msg/beagleboard/634Xm1m3XA8/B028x1FzAyAJ
 
@@ -12,7 +12,7 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
-index 0e0c25c..0ef133c 100644
+index 849b230..e99fc0b 100644
 --- a/arch/arm/boot/dts/am335x-bone-common.dtsi
 +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
 @@ -25,14 +25,14 @@
@@ -33,5 +33,5 @@ index 0e0c25c..0ef133c 100644
  			linux,default-trigger = "mmc0";
  			default-state = "off";
 -- 
-2.1.4
+2.6.1
 
diff --git a/patches/beaglebone/dts/0003-arm-dts-am335x-bone-common-add-collision-and-carrier.patch b/patches/beaglebone/dts/0003-arm-dts-am335x-bone-common-add-collision-and-carrier.patch
@@ -1,7 +1,7 @@
-From 33100dc0aed7598b80c136fb4e99eaac940d1ece Mon Sep 17 00:00:00 2001
+From b07523c2d472cf3c5b7657cfebcdaf939541809a Mon Sep 17 00:00:00 2001
 From: Schuyler Patton <spatton@ti.com>
 Date: Mon, 5 Jan 2015 15:44:14 -0600
-Subject: [PATCH 3/5] arm: dts: am335x-bone-common: add collision and carrier
+Subject: [PATCH 3/8] arm: dts: am335x-bone-common: add collision and carrier
  sense pinmux
 
 Added pin mux definitions for collision and carrier sense errors coming
@@ -21,7 +21,7 @@ Signed-off-by: Felipe Balbi <balbi@ti.com>
  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 0ef133c..8f578b3 100644
+index e99fc0b..4148d06 100644
 --- a/arch/arm/boot/dts/am335x-bone-common.dtsi
 +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
 @@ -104,6 +104,8 @@
@@ -43,5 +43,5 @@ index 0ef133c..8f578b3 100644
  			0x114 (PIN_INPUT_PULLDOWN | MUX_MODE7)
  			0x118 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -- 
-2.1.4
+2.6.1
 
diff --git a/patches/beaglebone/dts/0004-add-am335x-bonegreen.patch b/patches/beaglebone/dts/0004-add-am335x-bonegreen.patch
@@ -1,12 +1,12 @@
-From a41c37fd26905fd2861321be8697e5f48fc3a96c Mon Sep 17 00:00:00 2001
+From 3216bd630f7e818e7953c78cf762a13cb4438f94 Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
 Date: Thu, 21 May 2015 10:36:44 -0500
-Subject: [PATCH 4/5] add: am335x-bonegreen
+Subject: [PATCH 4/8] add: am335x-bonegreen
 
 Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
 ---
  arch/arm/boot/dts/am335x-bonegreen.dts | 38 ++++++++++++++++++++++++++++++++++
- 1 files changed, 38 insertions(+)
+ 1 file changed, 38 insertions(+)
  create mode 100644 arch/arm/boot/dts/am335x-bonegreen.dts
 
 diff --git a/arch/arm/boot/dts/am335x-bonegreen.dts b/arch/arm/boot/dts/am335x-bonegreen.dts
@@ -54,5 +54,5 @@ index 0000000..5de96f1
 +	status = "okay";
 +};
 -- 
-2.1.4
+2.6.1
 
diff --git a/patches/beaglebone/dts/0005-add-overlay-dtb.patch b/patches/beaglebone/dts/0005-add-overlay-dtb.patch
@@ -1,12 +1,12 @@
-From dc12de0080ce5aed0d49d863c0f76b6fe97d8bbc Mon Sep 17 00:00:00 2001
+From feb2b9f451744899d1ff387dec86dcaded2a6ecb Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
 Date: Thu, 21 May 2015 10:37:56 -0500
-Subject: [PATCH 5/5] add overlay dtb
+Subject: [PATCH 5/8] add overlay dtb
 
 Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
 ---
  arch/arm/boot/dts/am335x-boneblack-overlay.dts | 30 ++++++++++++++++++++++++++
- 1 files changed, 30 insertions(+)
+ 1 file changed, 30 insertions(+)
  create mode 100644 arch/arm/boot/dts/am335x-boneblack-overlay.dts
 
 diff --git a/arch/arm/boot/dts/am335x-boneblack-overlay.dts b/arch/arm/boot/dts/am335x-boneblack-overlay.dts
@@ -46,5 +46,5 @@ index 0000000..8206843
 +	vmmc-supply = <&vmmcsd_fixed>;
 +};
 -- 
-2.1.4
+2.6.1
 
diff --git a/patches/beaglebone/dts/0006-am335x-bone-common-cpsw-no-longer-need-to-define-bot.patch b/patches/beaglebone/dts/0006-am335x-bone-common-cpsw-no-longer-need-to-define-bot.patch
@@ -1,7 +1,7 @@
-From 2bd9030d721efd028e58dba6ec1ec19c776b0e77 Mon Sep 17 00:00:00 2001
+From 51d360f042e77eef4506fb8fc900bf31a8c3fc9c Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
 Date: Fri, 18 Sep 2015 20:30:05 -0500
-Subject: [PATCH 6/6] am335x-bone-common: cpsw no longer need to define both
+Subject: [PATCH 6/8] am335x-bone-common: cpsw no longer need to define both
  slaves
 
 Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
@@ -31,5 +31,5 @@ index 4148d06..525f2bb 100644
  };
 
 -- 
-2.5.1
+2.6.1
 
diff --git a/patches/beaglebone/dts/0007-am335x-bone-common-drop-0x1a0-from-mmc.patch b/patches/beaglebone/dts/0007-am335x-bone-common-drop-0x1a0-from-mmc.patch
@@ -1,7 +1,7 @@
-From 1dd7fd1ad6ebc694b433dd9292d7b3ac5810e47b Mon Sep 17 00:00:00 2001
+From 1da1f62621623b6e6656c05eebd4ecccd160d7ad Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
 Date: Tue, 29 Sep 2015 17:25:55 -0500
-Subject: [PATCH 7/7] am335x-bone-common: drop 0x1a0 from mmc
+Subject: [PATCH 7/8] am335x-bone-common: drop 0x1a0 from mmc
 
 Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
 ---
@@ -29,5 +29,5 @@ index 525f2bb..29c0c7e 100644
  		>;
  	};
 -- 
-2.5.3
+2.6.1