Skip to content

Commit

Permalink
3.8: add support for rs232 cape
Browse files Browse the repository at this point in the history 
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
  • Loading branch information
@koenkooi
koenkooi committed May 9, 2013
1 parent 2ce1866 commit 0403e41
Show file tree
Hide file tree
Showing 11 changed files with 133 additions and 19 deletions.
114 changes: 114 additions & 0 deletions patches/not-capebus/0174-bone-Added-RS232-prototype-cape-DT-object.patch
View file
@@ -0,0 +1,114 @@
From 8d96e317017fdee106526ef8156b375842615fd4 Mon Sep 17 00:00:00 2001
From: Matt Ranostay <mranostay@gmail.com>
Date: Tue, 23 Apr 2013 17:18:34 +0000
Subject: [PATCH 174/174] bone: Added RS232 prototype cape DT object

Added UART device tree object to setup UART3 and pinmux.
This should work with the RS232 cape that currently exists.

Signed-off-by: Matt Ranostay <mranostay@gmail.com>
---
arch/arm/boot/dts/am335x-bone-common.dtsi | 19 ++++++++++++++-
firmware/Makefile | 1 +
firmware/capes/BB-BONE-RS232-00A0.dts | 39 +++++++++++++++++++++++++++++++
3 files changed, 58 insertions(+), 1 deletion(-)
create mode 100644 firmware/capes/BB-BONE-RS232-00A0.dts

diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
index 92e3fb6..d525195 100644
--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
@@ -205,8 +205,18 @@
manufacturer = "Signal 11 Software";
part-number = "BB-BONE-MRF24J40";
};
- };

+ /* RS232 cape */
+ slot@12 {
+ ti,cape-override;
+ compatible = "kernel-command-line", "runtime";
+ board-name = "BB-BONE-RS232";
+ version = "00A0";
+ manufacturer = "Adafruit";
+ part-number = "BB-BONE-RS232-01";
+ };
+ };
+
/* mapping between board names and dtb objects */
capemaps {
/* DVI cape */
@@ -328,6 +338,13 @@
dtbo = "cape-bone-exptest-00A0.dtbo";
};
};
+ cape@12 {
+ part-number = "BB-BONE-RS232-01";
+ version@00A0 {
+ version = "00A0";
+ dtbo = "BB-BONE-RS232-00A0.dtbo";
+ };
+ };
};
};

diff --git a/firmware/Makefile b/firmware/Makefile
index d122aa1..3a4f126 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -155,6 +155,7 @@ fw-shipped-$(CONFIG_CAPE_BEAGLEBONE) += \
BB-BONE-LCD7-01-00A4.dtbo \
BB-BONE-eMMC1-01-00A0.dtbo \
BB-BONE-GPEVT-00A0.dtbo \
+ BB-BONE-RS232-00A0.dtbo \
cape-bone-iio-00A0.dtbo \
cape-bone-pinmux-test-00A0.dtbo \
cape-bone-exptest-00A0.dtbo \
diff --git a/firmware/capes/BB-BONE-RS232-00A0.dts b/firmware/capes/BB-BONE-RS232-00A0.dts
new file mode 100644
index 0000000..220c85d
--- /dev/null
+++ b/firmware/capes/BB-BONE-RS232-00A0.dts
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2013 Matt Ranostay <mranostay@gmail.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.
+ */
+/dts-v1/;
+/plugin/;
+
+/ {
+ compatible = "ti,beaglebone", "ti,beaglebone-black";
+
+ /* identification */
+ part-number = "BB-BONE-RS232";
+ version = "00A0";
+
+ fragment@0 {
+ target = <&am33xx_pinmux>;
+ __overlay__ {
+ uart_pins: pinmux_uart_pins {
+ pinctrl-single,pins = <
+ 0x150 0x21 /* spi0_sclk.uart2_rxd | MODE1 | PULL_UP */
+ 0x154 0x01 /* spi0_d0.uart2_txd | MODE1 */
+ >;
+ };
+ };
+ };
+
+ fragment@1 {
+ target = <&uart3>;
+ __overlay__ {
+ status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart_pins>;
+ };
+ };
+
+};
--
1.8.1.4

2 changes: 1 addition & 1 deletion patches/resetctrl/0001-boneblack-Remove-default-pinmuxing-for-MMC1.patch
View file
@@ -1,4 +1,4 @@
From 9d664b4aeef584279061d430276b900fddce7437 Mon Sep 17 00:00:00 2001
From 03c1c5eff7a5909cd0ea979b245e6df52b4437ec Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <panto@antoniou-consulting.com>
Date: Thu, 18 Apr 2013 12:34:45 +0300
Subject: [PATCH 01/10] boneblack: Remove default pinmuxing for MMC1
Expand Down
2 changes: 1 addition & 1 deletion patches/resetctrl/0002-capemgr-Implement-cape-priorities.patch
View file
@@ -1,4 +1,4 @@
From aa583b5da556bdc069e6e18a2853c4973edfd2be Mon Sep 17 00:00:00 2001
From 0638d9c6ea1ff7251b528bb72f027c3e16615ddf Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <panto@antoniou-consulting.com>
Date: Mon, 22 Apr 2013 17:11:17 +0300
Subject: [PATCH 02/10] capemgr: Implement cape priorities
Expand Down
2 changes: 1 addition & 1 deletion patches/resetctrl/0003-rstctl-Reset-control-subsystem.patch
View file
@@ -1,4 +1,4 @@
From 8682a0693275ec7951042a39aabc35bbf28549a2 Mon Sep 17 00:00:00 2001
From 4d5365db3ae4c06912c62ec247356a89636bc95e Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <panto@antoniou-consulting.com>
Date: Thu, 11 Apr 2013 18:14:52 +0300
Subject: [PATCH 03/10] rstctl: Reset control subsystem
Expand Down
2 changes: 1 addition & 1 deletion patches/resetctrl/0004-omap_hsmmc-Enable-rstctl-bindings.patch
View file
@@ -1,4 +1,4 @@
From 612d39e20b34b05a837af7af52e4da01ba8e6c25 Mon Sep 17 00:00:00 2001
From ae981610013b4af953bd2ca581b358205732e695 Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <panto@antoniou-consulting.com>
Date: Mon, 22 Apr 2013 20:32:40 +0300
Subject: [PATCH 04/10] omap_hsmmc: Enable rstctl bindings.
Expand Down
4 changes: 2 additions & 2 deletions patches/resetctrl/0005-bone-Add-rstctl-DT-binding-for-beaglebone.patch
View file
@@ -1,4 +1,4 @@
From 1919a54bcebee0d0cdec68b8093059b88b8aebfe Mon Sep 17 00:00:00 2001
From 2d8521a2bbf08209ed87b8a5f0203153e4543a34 Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <panto@antoniou-consulting.com>
Date: Mon, 22 Apr 2013 20:36:35 +0300
Subject: [PATCH 05/10] bone: Add rstctl DT binding for beaglebone
Expand All @@ -12,7 +12,7 @@ Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
2 files changed, 30 insertions(+)

diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
index 7e02db5..79cddc9 100644
index 89ec6f2..e341a08 100644
--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
@@ -50,6 +50,12 @@
Expand Down
2 changes: 1 addition & 1 deletion patches/resetctrl/0006-bone-eMMC-Add-rstctl-rstctl-DT-bindings.patch
View file
@@ -1,4 +1,4 @@
From 2cd9e4be6f1c13fd68dda1653f313be719b8da9b Mon Sep 17 00:00:00 2001
From 9c14eb32b4e5ab9fae975c77e01d0a29fac9d12a Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <panto@antoniou-consulting.com>
Date: Mon, 22 Apr 2013 20:38:11 +0300
Subject: [PATCH 06/10] bone-eMMC: Add rstctl rstctl DT bindings
Expand Down
6 changes: 3 additions & 3 deletions patches/resetctrl/0007-capes-Add-testing-capes-for-rstctl.patch
View file
@@ -1,4 +1,4 @@
From 4bf3570079b5567840873db89b359bf325bf569e Mon Sep 17 00:00:00 2001
From 8924df080db3fd8a36501ba435537016cd83c4d7 Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <panto@antoniou-consulting.com>
Date: Mon, 22 Apr 2013 20:40:07 +0300
Subject: [PATCH 07/10] capes: Add testing capes for rstctl
Expand All @@ -15,10 +15,10 @@ Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
create mode 100644 firmware/capes/BB-BONE-RST2-00A0.dts

diff --git a/firmware/Makefile b/firmware/Makefile
index d122aa1..b9ea487 100644
index 3a4f126..775630b 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -175,7 +175,9 @@ fw-shipped-$(CONFIG_CAPE_BEAGLEBONE) += \
@@ -176,7 +176,9 @@ fw-shipped-$(CONFIG_CAPE_BEAGLEBONE) += \
bone_pwm_P9_29-00A0.dtbo \
bone_pwm_P9_31-00A0.dtbo \
bone_pwm_P9_42-00A0.dtbo \
Expand Down
2 changes: 1 addition & 1 deletion patches/resetctrl/0008-omap_hsmmc-Bail-out-when-rstctl-error-is-unrecoverab.patch
View file
@@ -1,4 +1,4 @@
From 679429feb182b3c084fa6b1ec69c808a3060c50b Mon Sep 17 00:00:00 2001
From c9ac45a1da488c0920eeb5ffa08452cf55d674c5 Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <panto@antoniou-consulting.com>
Date: Mon, 22 Apr 2013 17:05:53 +0300
Subject: [PATCH 08/10] omap_hsmmc: Bail out when rstctl error is unrecoverable
Expand Down
12 changes: 6 additions & 6 deletions patches/resetctrl/0009-bone-Put-priorities-in-built-in-capes.patch
View file
@@ -1,4 +1,4 @@
From 6749b152f095e7e74ba976cd4a273b90a3f920e0 Mon Sep 17 00:00:00 2001
From a3f77515ca334419eddb1ace4358bbbf98aa798d Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <panto@antoniou-consulting.com>
Date: Mon, 22 Apr 2013 17:08:09 +0300
Subject: [PATCH 09/10] bone: Put priorities in built-in capes
Expand All @@ -13,7 +13,7 @@ Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
2 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
index 79cddc9..b8eb5b4 100644
index e341a08..327e592 100644
--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
@@ -25,7 +25,7 @@
Expand Down Expand Up @@ -67,9 +67,9 @@ index 79cddc9..b8eb5b4 100644
/* Nixie cape version A0 without an EEPROM */
slot@7 {
ti,cape-override;
@@ -211,6 +196,29 @@
manufacturer = "Signal 11 Software";
part-number = "BB-BONE-MRF24J40";
@@ -221,6 +206,29 @@
manufacturer = "Adafruit";
part-number = "BB-BONE-RS232-01";
};
+
+ /* Beaglebone black has it soldered on */
Expand All @@ -95,7 +95,7 @@ index 79cddc9..b8eb5b4 100644
+ };
+
};

/* mapping between board names and dtb objects */
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 76fa03b..eb0d2d4 100644
Expand Down
4 changes: 2 additions & 2 deletions patches/resetctrl/0010-bone-common-dtsi-remove-reset-cape.patch
View file
@@ -1,4 +1,4 @@
From 973ddc2b4861e62596fd8554cbff62580779ef32 Mon Sep 17 00:00:00 2001
From 73420a8fd3c6153897c06bb30725842547e828d9 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Thu, 2 May 2013 14:15:13 +0200
Subject: [PATCH 10/10] bone-common dtsi: remove reset cape
Expand All @@ -9,7 +9,7 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
1 file changed, 10 deletions(-)

diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
index b8eb5b4..2949a03 100644
index 327e592..ae407c3 100644
--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
@@ -129,16 +129,6 @@
Expand Down

0 comments on commit 0403e41

Please sign in to comment.