Skip to content

Commit

Permalink
3.8: sync tester DT with bone-common
Browse files Browse the repository at this point in the history
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
  • Loading branch information
koenkooi committed Apr 11, 2013
1 parent 66f856e commit 278c4ae
Show file tree
Hide file tree
Showing 2 changed files with 139 additions and 1 deletion.
138 changes: 138 additions & 0 deletions patches/not-capebus/0163-Sync-tester-DTS-with-am335x-common.patch
@@ -0,0 +1,138 @@
From 13d1d9e819a2dadcbaa9e977b9cd323f6089f039 Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <panto@antoniou-consulting.com>
Date: Thu, 11 Apr 2013 19:37:08 +0300
Subject: [PATCH 163/163] Sync tester DTS with am335x-common

---
arch/arm/boot/dts/am335x-tester.dts | 87 ++++++++++++++++++++++++++++++++++---
1 file changed, 80 insertions(+), 7 deletions(-)

diff --git a/arch/arm/boot/dts/am335x-tester.dts b/arch/arm/boot/dts/am335x-tester.dts
index 1fdba03..5059988 100644
--- a/arch/arm/boot/dts/am335x-tester.dts
+++ b/arch/arm/boot/dts/am335x-tester.dts
@@ -177,15 +177,43 @@
part-number = "BB-BONE-NIXIE";
};

- /* geiger cape version A0 without an EEPROM */
+ /* adafruit 1.8" TFT prototype cape */
slot@8 {
ti,cape-override;
compatible = "kernel-command-line", "runtime";
- board-name = "Bone-Tester";
+ board-name = "Bone-TFT";
+ version = "00A0";
+ manufacturer = "Adafruit";
+ part-number = "BB-BONE-TFT-01";
+ };
+
+ /* adafruit RTC DS1307 prototype cape */
+ slot@9 {
+ ti,cape-override;
+ compatible = "kernel-command-line", "runtime";
+ board-name = "Bone-RTC";
version = "00A0";
- part-number = "BB-BONE-TESTER";
+ manufacturer = "Adafruit";
+ part-number = "BB-BONE-RTC-01";
};

+ slot@10 {
+ ti,cape-override;
+ compatible = "kernel-command-line", "runtime";
+ board-name = "Bone-Hexy";
+ version = "00A0";
+ manufacturer = "Koen Kooi";
+ part-number = "BB-BONE-HEXY-01";
+ };
+ /* MRF24J40 Cape Override */
+ slot@11 {
+ ti,cape-override;
+ compatible = "kernel-command-line", "runtime";
+ board-name = "Bone-MRF24J40";
+ version = "00A0";
+ manufacturer = "Signal 11 Software";
+ part-number = "BB-BONE-MRF24J40";
+ };
};

/* mapping between board names and dtb objects */
@@ -202,6 +230,14 @@
version = "00A1", "01";
dtbo = "cape-bone-dvi-00A1.dtbo";
};
+ version@00A2 {
+ version = "00A2", "A2";
+ dtbo = "cape-bone-dvi-00A2.dtbo";
+ };
+ version@00A3 {
+ version = "00A3";
+ dtbo = "cape-bone-dvi-00A2.dtbo";
+ };
};

/* beaglebone black emmc on board */
@@ -262,18 +298,55 @@
dtbo = "cape-bone-nixie-00A0.dtbo";
};
};
-
- /* tester */
cape@7 {
- part-number = "BB-BONE-TESTER";
+ part-number = "BB-BONE-TFT-01";
+ version@00A0 {
+ version = "00A0";
+ dtbo = "cape-bone-adafruit-lcd-00A0.dtbo";
+ };
+ };
+
+ cape@8 {
+ part-number = "BB-BONE-RTC-01";
version@00A0 {
version = "00A0";
- dtbo = "cape-bone-tester-00A0.dtbo";
+ dtbo = "cape-bone-adafruit-rtc-00A0.dtbo";
};
};

+ cape@9 {
+ part-number = "BB-BONE-HEXY-01";
+ version@00A0 {
+ version = "00A0";
+ dtbo = "cape-bone-hexy-00A0.dtbo";
+ };
+ };
+ /* mrf24j40 cape */
+ cape@10 {
+ part-number = "BB-BONE-MRF24J40";
+ version@00A0 {
+ version = "00A0";
+ 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";
+ };
+ };
};
};
+
+ vmmcsd_fixed: fixedregulator@0 {
+ compatible = "regulator-fixed";
+ regulator-name = "vmmcsd_fixed";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ };
+
};

&i2c0 {
--
1.8.1.4

2 changes: 1 addition & 1 deletion recipes/linux-mainline_3.8.bb
Expand Up @@ -8,7 +8,7 @@ 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 = "c"
MACHINE_KERNEL_PR_append = "d"

FILESPATH =. "${FILE_DIRNAME}/linux-mainline-3.8:${FILE_DIRNAME}/linux-mainline-3.8/${MACHINE}:"

Expand Down

0 comments on commit 278c4ae

Please sign in to comment.