3.8: more tester patches

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
beagleboard · Apr 8, 2013 · a65bac1 · a65bac1
1 parent d879b52
commit a65bac1
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 2 deletions.
diff --git a/patches/not-capebus/0158-cape-Add-CAPE-BONE-EXPTEST-to-capemaps.patch b/patches/not-capebus/0158-cape-Add-CAPE-BONE-EXPTEST-to-capemaps.patch
@@ -0,0 +1,31 @@
+From 63481f3abf0f53b98253d41c58b3b432fa8f77a7 Mon Sep 17 00:00:00 2001
+From: Pantelis Antoniou <panto@antoniou-consulting.com>
+Date: Fri, 5 Apr 2013 14:34:31 +0300
+Subject: [PATCH 158/159] cape: Add CAPE-BONE-EXPTEST to capemaps
+
+---
+ 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 524bf03..1c91d7d 100644
+--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
++++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
+@@ -320,6 +320,14 @@
+ 					dtbo = "cape-bone-mrf24j40-00A0.dtbo";
+ 				};
+ 			};
++			/* expansion test */
++			cape@11 {
++				part-number = "BB-BONE-EXPTEST";
++				version@00A0 {
++					version = "00A0";
++					dtbo = "cape-bone-exptest-00A0.dtbo";
++				};
++			};
+ 		};
+ 	};
+
+-- 
+1.8.1.4
+
diff --git a/patches/not-capebus/0159-tester-button-cape.patch b/patches/not-capebus/0159-tester-button-cape.patch
@@ -0,0 +1,35 @@
+From ed78b6f62737751ac5c22c96ebeb0ab6b1151124 Mon Sep 17 00:00:00 2001
+From: Pantelis Antoniou <panto@antoniou-consulting.com>
+Date: Mon, 8 Apr 2013 22:35:55 +0300
+Subject: [PATCH 159/159] tester: button cape
+
+Disable pull up on the pinmux.
+---
+ firmware/capes/BB-BONELT-BT-00A0.dts | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/firmware/capes/BB-BONELT-BT-00A0.dts b/firmware/capes/BB-BONELT-BT-00A0.dts
+index f32d6f5..94b9a12 100644
+--- a/firmware/capes/BB-BONELT-BT-00A0.dts
++++ b/firmware/capes/BB-BONELT-BT-00A0.dts
+@@ -21,7 +21,7 @@
+
+ 			bone_bt_cape_key_pins: pinmux_bone_bt_cape_key_pins {
+ 				pinctrl-single,pins = <
+-					0x0a8 0x27 /* P8.43 lcd_data2.gpio2[8]    */
++					0x0a8 0x2f /* P8.43 lcd_data2.gpio2[8]  DISABLE internal pullup  */
+ 				>;
+ 			};
+ 		};
+@@ -39,7 +39,7 @@
+ 				#size-cells = <0>;
+
+ 				button@1 {
+-					debounce_interval = <1>;
++					debounce_interval = <0>;
+ 					linux,code = <28>;
+ 					label = "enter";
+ 					gpios = <&gpio3 8 0x0>;
+-- 
+1.8.1.4
+
diff --git a/recipes/linux-mainline_3.8.bb b/recipes/linux-mainline_3.8.bb
@@ -3,10 +3,12 @@ require linux.inc
 DESCRIPTION = "Linux kernel"
 KERNEL_IMAGETYPE = "uImage"
 
-COMPATIBLE_MACHINE = "(beagleboard|beaglebone)"
+COMPATIBLE_MACHINE = "(beaglebone|beagleboard)"
+
+DEFAULT_PREFERENCE_beagleboard = "-1"
 
 # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc
-MACHINE_KERNEL_PR_append = "a"
+MACHINE_KERNEL_PR_append = "c"
 
 FILESPATH =. "${FILE_DIRNAME}/linux-mainline-3.8:${FILE_DIRNAME}/linux-mainline-3.8/${MACHINE}:"