From: gregory.clement@free-electrons.com (Gregory CLEMENT)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 2/6] arm64: dts: marvell: armada-3720-db: Add information about the V2 board
Date: Tue, 13 Jun 2017 15:57:07 +0200 [thread overview]
Message-ID: <20170613135711.7622-3-gregory.clement@free-electrons.com> (raw)
In-Reply-To: <20170613135711.7622-1-gregory.clement@free-electrons.com>
The initial device tree file was for the board V1.4. Now the V2.0 board
is also available. The same dtb will work for both, but the CON number
have changed, so update the comment in the dts to reflect this.
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
arch/arm64/boot/dts/marvell/armada-3720-db.dts | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/boot/dts/marvell/armada-3720-db.dts b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
index d6f12fafac6c..3ee920ac0015 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
@@ -42,6 +42,10 @@
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * This file is compatible with the version 1.4 and the version 2.0 of
+ * the board, however the CON numbers are different between the 2
+ * version
*/
/dts-v1/;
@@ -78,6 +82,7 @@
};
};
+/* Gigabit module on CON19(V2.0)/CON21(V1.4) */
ð0 {
pinctrl-names = "default";
pinctrl-0 = <&rgmii_pins>;
@@ -86,6 +91,7 @@
status = "okay";
};
+/* Gigabit module on CON18(V2.0)/CON20(V1.4) */
ð1 {
phy-mode = "sgmii";
phy = <&phy1>;
@@ -133,7 +139,7 @@
};
};
-/* CON17 (PCIe) / CON12 (mini-PCIe) */
+/* CON15(V2.0)/CON17(V1.4) : PCIe / CON15(V2.0)/CON12(V1.4) :mini-PCIe */
&pcie0 {
status = "okay";
};
@@ -184,19 +190,22 @@
};
};
-/* Exported on the micro USB connector CON32 through an FTDI */
+/*
+ * Exported on the micro USB connector CON30(V2.0)/CON32(V1.4) through
+ * an FTDI
+ */
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart1_pins>;
status = "okay";
};
-/* CON27 */
+/* CON27(V2.0)/CON29(V1.4) */
&usb2 {
status = "okay";
};
-/* CON31 */
+/* CON29(V2.0)/CON31(V1.4) */
&usb3 {
status = "okay";
usb-phy = <&usb3_phy>;
--
2.11.0
next prev parent reply other threads:[~2017-06-13 13:57 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-13 13:57 [PATCH v3 0/6] Update device tree for Armada 3720 DB Gregory CLEMENT
2017-06-13 13:57 ` [PATCH v3 1/6] arm64: dts: marvell: armada-3720-db: Sort the dts node alphabetically Gregory CLEMENT
2017-06-13 13:57 ` Gregory CLEMENT [this message]
2017-06-13 13:57 ` [PATCH v3 3/6] arm64: dts: marvell: armada-37xx: Align the compatible string Gregory CLEMENT
2017-06-13 13:57 ` [PATCH v3 4/6] arm64: dts: marvell: armada-37xx: Use angle bracket for each register set Gregory CLEMENT
2017-06-13 13:57 ` [PATCH v3 5/6] arm64: dts: marvell: Enable second SDHCI controller in Armada 37xx Gregory CLEMENT
2017-06-13 13:57 ` [PATCH v3 6/6] arm64: dts: marvell: armada-3720-db: Add vqmmc regulator for SD slot Gregory CLEMENT
2017-06-15 16:11 ` [PATCH v3 0/6] Update device tree for Armada 3720 DB Gregory CLEMENT
2017-06-15 16:24 ` Gregory CLEMENT
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170613135711.7622-3-gregory.clement@free-electrons.com \
--to=gregory.clement@free-electrons.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox