logicpd-torpedo-som.dtsi is a direct port, but the
logicpd-torpedo-37xx-devkit is mostly copied from Linux, but
there are a few changes:
Slow I2C1 to 400KHz from 26MHz, because U-Boot doesn't seem
to handle that speed.
Fixes required for U-Boot's NS16550 driver by adding
reg-shift = <2> for each UART.
Rename the model since this can booth both SOM-LV and Torpedo kits
U-Boot will still load the proper dtb file from SD card for Linux
Since there is only 1 support MMC socket on either dev kit,
disable others in U-Boot
Changes the license to SPDX
Signed-off-by: Adam Ford <aford...@gmail.com>
---
arch/arm/dts/logicpd-torpedo-37xx-devkit.dts | 49 +++++++++++++++++++++-------
arch/arm/dts/logicpd-torpedo-som.dtsi | 35 ++++++++++++++++++--
2 files changed, 70 insertions(+), 14 deletions(-)
diff --git a/arch/arm/dts/logicpd-torpedo-37xx-devkit.dts
b/arch/arm/dts/logicpd-torpedo-37xx-devkit.dts
index de603a4..935dfae 100644
--- a/arch/arm/dts/logicpd-torpedo-37xx-devkit.dts
+++ b/arch/arm/dts/logicpd-torpedo-37xx-devkit.dts
@@ -1,7 +1,10 @@
/*
- * 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.
+ * Based on logicpd-torpedo-37xx-devkit.dts from Linux 4.13-RC5
+ *
+ * Copyright (C) 2017
+ * Logic PD - http://www.logicpd.com
+ *
+ * SPDX-License-Identifier: GPL-2.0+
*/
/dts-v1/;
@@ -11,13 +14,9 @@
#include "omap-gpmc-smsc9221.dtsi"
/ {
- model = "LogicPD Zoom DM3730 Torpedo + Wireless Development Kit";
+ model = "LogicPD Zoom AM37xx / DM37xx Development Kit";
compatible = "logicpd,dm3730-torpedo-devkit", "ti,omap3630", "ti,omap3";
- chosen {
- stdout-path = &uart1;
- };
-
gpio_keys {
compatible = "gpio-keys";
pinctrl-names = "default";
@@ -86,6 +85,14 @@
};
+&i2c1 {
+ clock-frequency = <400000>;
+};
+
+&i2c2 {
+ clock-frequency = <400000>;
+};
+
&vaux1 {
regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>;
@@ -196,13 +203,18 @@
interrupts-extended = <&intc 83 &omap3_pmx_core 0x11a>;
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins &mmc1_cd>;
+ cd-gpios = <&gpio4 31 IRQ_TYPE_LEVEL_LOW>; /* gpio127 */
vmmc-supply = <&vmmc1>;
bus-width = <4>;
cap-power-off-card;
};
&mmc2 {
- status = "disabled";
+ status = "disabled";
+};
+
+&mmc3 {
+ status = "disabled";
};
&omap3_pmx_core {
@@ -256,9 +268,9 @@
OMAP3_CORE1_IOPAD(0x2110, PIN_INPUT | MUX_MODE0) /*
cam_xclka.cam_xclka */
OMAP3_CORE1_IOPAD(0x2112, PIN_INPUT | MUX_MODE0) /*
cam_pclk.cam_pclk */
- OMAP3_CORE1_IOPAD(0x2114, PIN_INPUT | MUX_MODE0) /*
cam_d0.cam_d0 */
- OMAP3_CORE1_IOPAD(0x2116, PIN_INPUT | MUX_MODE0) /*
cam_d1.cam_d1 */
- OMAP3_CORE1_IOPAD(0x2118, PIN_INPUT | MUX_MODE0) /*
cam_d2.cam_d2 */
+ OMAP3_CORE1_IOPAD(0x2116, PIN_INPUT | MUX_MODE0) /*
cam_d0.cam_d0 */
+ OMAP3_CORE1_IOPAD(0x2118, PIN_INPUT | MUX_MODE0) /*
cam_d1.cam_d1 */
+ OMAP3_CORE1_IOPAD(0x211a, PIN_INPUT | MUX_MODE0) /*
cam_d2.cam_d2 */
OMAP3_CORE1_IOPAD(0x211c, PIN_INPUT | MUX_MODE0) /*
cam_d3.cam_d3 */
OMAP3_CORE1_IOPAD(0x211e, PIN_INPUT | MUX_MODE0) /*
cam_d4.cam_d4 */
OMAP3_CORE1_IOPAD(0x2120, PIN_INPUT | MUX_MODE0) /*
cam_d5.cam_d5 */
@@ -396,6 +408,19 @@
&uart1 {
interrupts-extended = <&intc 72 &omap3_pmx_core OMAP3_UART1_RX>;
+ reg-shift = <2>;
+};
+
+&uart2 {
+ reg-shift = <2>;
+};
+
+&uart3 {
+ reg-shift = <2>;
+};
+
+&uart4 {
+ reg-shift = <2>;
};
/* Wired to the tps65950 on the SOM, only the USB connector is on the devkit */
diff --git a/arch/arm/dts/logicpd-torpedo-som.dtsi
b/arch/arm/dts/logicpd-torpedo-som.dtsi
index 23c9228..6d89736 100644
--- a/arch/arm/dts/logicpd-torpedo-som.dtsi
+++ b/arch/arm/dts/logicpd-torpedo-som.dtsi
@@ -7,6 +7,10 @@
#include <dt-bindings/input/input.h>
/ {
+ chosen {
+ stdout-path = &uart1;
+ };
+
cpus {
cpu@0 {
cpu0-supply = <&vcc>;
@@ -69,11 +73,38 @@
gpmc,device-width = <2>;
#address-cells = <1>;
#size-cells = <1>;
+
+ /* u-boot uses
mtdparts=omap2-nand.0:512k(x-loader),1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs)
*/
+
+ x-loader@0 {
+ label = "x-loader";
+ reg = <0 0x80000>;
+ };
+
+ bootloaders@80000 {
+ label = "u-boot";
+ reg = <0x80000 0x1e0000>;
+ };
+
+ bootloaders_env@260000 {
+ label = "u-boot-env";
+ reg = <0x260000 0x20000>;
+ };
+
+ kernel@280000 {
+ label = "kernel";
+ reg = <0x280000 0x400000>;
+ };
+
+ filesystem@680000 {
+ label = "fs";
+ reg = <0x680000 0>; /* 0 = MTDPART_SIZ_FULL */
+ };
};
};
&i2c1 {
- clock-frequency = <400000>;
+ clock-frequency = <2600000>;
twl: twl@48 {
reg = <0x48>;
@@ -94,7 +125,7 @@
&i2c3 {
clock-frequency = <400000>;
at24@50 {
- compatible = "at24,24c02";
+ compatible = "atmel,24c64";
readonly;
reg = <0x50>;
};
--
2.7.4
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
