* [U-Boot] [PATCH 0/3] ARM: omap3: evm: Add OF_CONTROL support
@ 2017-12-16 20:14 Derald D. Woods
2017-12-16 20:14 ` [U-Boot] [PATCH 1/3] ARM: dts: omap3-evm: Add support for TMDSEVM{3530, 3730} Derald D. Woods
` (3 more replies)
0 siblings, 4 replies; 15+ messages in thread
From: Derald D. Woods @ 2017-12-16 20:14 UTC (permalink / raw)
To: u-boot
This series adds OF_CONTROL support for TMDSEVM{3530,3730} and
additionally updates ethaddr setup with smc911x initialization.
Devicetree files are taken from Linux v4.15-rc3. Note that this is the
first addition of OMAP34XX devicetree files.
Tested using GCC 7.2.0 [--with-float=hard --with-mode=thumb]
--- 8< -----------------------------------------------------------------
U-Boot SPL 2018.01-rc1-00177-g27f9740bcf (Dec 16 2017 - 13:13:10)
Trying to boot from MMC1
reading u-boot.img
reading u-boot.img
U-Boot 2018.01-rc1-00177-g27f9740bcf (Dec 16 2017 - 13:13:10 -0600)
OMAP3530-GP ES3.1, CPU-OPP2, L3-165MHz, Max CPU Clock 720 MHz
Model: TI OMAP35XX EVM (TMDSEVM3530)
OMAP3 EVM board + LPDDR/NAND
I2C: ready
DRAM: 256 MiB
NAND: 256 MiB
MMC: OMAP SD/MMC: 0
Read back SMSC id 0x92200000
OMAP die ID: 265a002400000000040365fa1801b01f
Net: smc911x-0
starting USB...
USB0: USB EHCI 1.00
scanning bus 0 for devices... 1 USB Device(s) found
Hit any key to stop autoboot: 0
OMAP3_EVM # echo $stdin;echo $stdout;echo $stderr
serial at 4806a000
serial at 4806a000
serial@4806a000
--- 8< -----------------------------------------------------------------
Derald D. Woods (3):
ARM: dts: omap3-evm: Add support for TMDSEVM{3530,3730}
ARM: dts: omap3-evm: Enable DM and devicetree for TMDSEVM{3530,3730}
ARM: omap3: evm: Refactor 'board_eth_init'
arch/arm/dts/Makefile | 4 +
arch/arm/dts/omap-gpmc-smsc911x.dtsi | 55 ++++++
arch/arm/dts/omap3-evm-37xx-u-boot.dtsi | 29 ++++
arch/arm/dts/omap3-evm-37xx.dts | 110 ++++++++++++
arch/arm/dts/omap3-evm-common.dtsi | 195 +++++++++++++++++++++
arch/arm/dts/omap3-evm-processor-common.dtsi | 216 ++++++++++++++++++++++++
arch/arm/dts/omap3-evm-u-boot.dtsi | 29 ++++
arch/arm/dts/omap3-evm.dts | 89 ++++++++++
arch/arm/dts/omap3-panel-sharp-ls037v7dw01.dtsi | 73 ++++++++
arch/arm/dts/omap34xx.dtsi | 84 +++++++++
arch/arm/mach-omap2/omap3/Kconfig | 4 +
board/ti/evm/evm.c | 24 +--
configs/omap3_evm_defconfig | 9 +-
include/configs/omap3_evm.h | 2 -
14 files changed, 896 insertions(+), 27 deletions(-)
create mode 100644 arch/arm/dts/omap-gpmc-smsc911x.dtsi
create mode 100644 arch/arm/dts/omap3-evm-37xx-u-boot.dtsi
create mode 100644 arch/arm/dts/omap3-evm-37xx.dts
create mode 100644 arch/arm/dts/omap3-evm-common.dtsi
create mode 100644 arch/arm/dts/omap3-evm-processor-common.dtsi
create mode 100644 arch/arm/dts/omap3-evm-u-boot.dtsi
create mode 100644 arch/arm/dts/omap3-evm.dts
create mode 100644 arch/arm/dts/omap3-panel-sharp-ls037v7dw01.dtsi
create mode 100644 arch/arm/dts/omap34xx.dtsi
--
2.15.1
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 1/3] ARM: dts: omap3-evm: Add support for TMDSEVM{3530, 3730}
2017-12-16 20:14 [U-Boot] [PATCH 0/3] ARM: omap3: evm: Add OF_CONTROL support Derald D. Woods
@ 2017-12-16 20:14 ` Derald D. Woods
2018-01-02 0:47 ` [U-Boot] [U-Boot, " Tom Rini
2017-12-16 20:14 ` [U-Boot] [PATCH 2/3] ARM: dts: omap3-evm: Enable DM and devicetree " Derald D. Woods
` (2 subsequent siblings)
3 siblings, 1 reply; 15+ messages in thread
From: Derald D. Woods @ 2017-12-16 20:14 UTC (permalink / raw)
To: u-boot
This commit adds OMAP3 EVM devicetree files from Linux v4.15-rc3. Note
that this is the first addition of OMAP34XX devicetree files.
Signed-off-by: Derald D. Woods <woods.technical@gmail.com>
---
arch/arm/dts/Makefile | 4 +
arch/arm/dts/omap-gpmc-smsc911x.dtsi | 55 ++++++
arch/arm/dts/omap3-evm-37xx-u-boot.dtsi | 29 ++++
arch/arm/dts/omap3-evm-37xx.dts | 110 ++++++++++++
arch/arm/dts/omap3-evm-common.dtsi | 195 +++++++++++++++++++++
arch/arm/dts/omap3-evm-processor-common.dtsi | 216 ++++++++++++++++++++++++
arch/arm/dts/omap3-evm-u-boot.dtsi | 29 ++++
arch/arm/dts/omap3-evm.dts | 89 ++++++++++
arch/arm/dts/omap3-panel-sharp-ls037v7dw01.dtsi | 73 ++++++++
arch/arm/dts/omap34xx.dtsi | 84 +++++++++
10 files changed, 884 insertions(+)
create mode 100644 arch/arm/dts/omap-gpmc-smsc911x.dtsi
create mode 100644 arch/arm/dts/omap3-evm-37xx-u-boot.dtsi
create mode 100644 arch/arm/dts/omap3-evm-37xx.dts
create mode 100644 arch/arm/dts/omap3-evm-common.dtsi
create mode 100644 arch/arm/dts/omap3-evm-processor-common.dtsi
create mode 100644 arch/arm/dts/omap3-evm-u-boot.dtsi
create mode 100644 arch/arm/dts/omap3-evm.dts
create mode 100644 arch/arm/dts/omap3-panel-sharp-ls037v7dw01.dtsi
create mode 100644 arch/arm/dts/omap34xx.dtsi
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 1c9ac1468b..cf23a46f4c 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -432,6 +432,10 @@ dtb-$(CONFIG_TARGET_OMAP3_LOGIC) += \
logicpd-torpedo-37xx-devkit.dtb \
logicpd-som-lv-37xx-devkit.dtb
+dtb-$(CONFIG_TARGET_OMAP3_EVM) += \
+ omap3-evm-37xx.dtb \
+ omap3-evm.dtb
+
dtb-$(CONFIG_TARGET_SAMA5D2_PTC_EK) += \
at91-sama5d2_ptc_ek.dtb
diff --git a/arch/arm/dts/omap-gpmc-smsc911x.dtsi b/arch/arm/dts/omap-gpmc-smsc911x.dtsi
new file mode 100644
index 0000000000..ded7e8fec9
--- /dev/null
+++ b/arch/arm/dts/omap-gpmc-smsc911x.dtsi
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Common file for GPMC connected smsc911x on omaps
+ *
+ * Note that the board specifc DTS file needs to specify
+ * ranges, pinctrl, reg, interrupt parent and interrupts.
+ */
+
+/ {
+ vddvario: regulator-vddvario {
+ compatible = "regulator-fixed";
+ regulator-name = "vddvario";
+ regulator-always-on;
+ };
+
+ vdd33a: regulator-vdd33a {
+ compatible = "regulator-fixed";
+ regulator-name = "vdd33a";
+ regulator-always-on;
+ };
+};
+
+&gpmc {
+ ethernet at gpmc {
+ compatible = "smsc,lan9221", "smsc,lan9115";
+ bank-width = <2>;
+ gpmc,device-width = <1>;
+ gpmc,cycle2cycle-samecsen = <1>;
+ gpmc,cycle2cycle-diffcsen = <1>;
+ gpmc,cs-on-ns = <5>;
+ gpmc,cs-rd-off-ns = <150>;
+ gpmc,cs-wr-off-ns = <150>;
+ gpmc,adv-on-ns = <0>;
+ gpmc,adv-rd-off-ns = <15>;
+ gpmc,adv-wr-off-ns = <40>;
+ gpmc,oe-on-ns = <45>;
+ gpmc,oe-off-ns = <140>;
+ gpmc,we-on-ns = <45>;
+ gpmc,we-off-ns = <140>;
+ gpmc,rd-cycle-ns = <155>;
+ gpmc,wr-cycle-ns = <155>;
+ gpmc,access-ns = <120>;
+ gpmc,page-burst-access-ns = <20>;
+ gpmc,bus-turnaround-ns = <75>;
+ gpmc,cycle2cycle-delay-ns = <75>;
+ gpmc,wait-monitoring-ns = <0>;
+ gpmc,clk-activation-ns = <0>;
+ gpmc,wr-data-mux-bus-ns = <0>;
+ gpmc,wr-access-ns = <0>;
+ vddvario-supply = <&vddvario>;
+ vdd33a-supply = <&vdd33a>;
+ reg-io-width = <4>;
+ smsc,save-mac-address;
+ };
+};
diff --git a/arch/arm/dts/omap3-evm-37xx-u-boot.dtsi b/arch/arm/dts/omap3-evm-37xx-u-boot.dtsi
new file mode 100644
index 0000000000..53a489988e
--- /dev/null
+++ b/arch/arm/dts/omap3-evm-37xx-u-boot.dtsi
@@ -0,0 +1,29 @@
+/*
+ * U-Boot additions
+ *
+ * (C) Copyright 2017 Derald D. Woods <woods.technical@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+/ {
+ chosen {
+ stdout-path = &uart1;
+ };
+};
+
+&mmc1 {
+ cd-inverted;
+};
+
+&uart1 {
+ reg-shift = <2>;
+};
+
+&uart2 {
+ reg-shift = <2>;
+};
+
+&uart3 {
+ reg-shift = <2>;
+};
diff --git a/arch/arm/dts/omap3-evm-37xx.dts b/arch/arm/dts/omap3-evm-37xx.dts
new file mode 100644
index 0000000000..5a4ba0aea4
--- /dev/null
+++ b/arch/arm/dts/omap3-evm-37xx.dts
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.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/;
+
+#include "omap36xx.dtsi"
+#include "omap3-evm-common.dtsi"
+#include "omap3-evm-processor-common.dtsi"
+
+/ {
+ model = "TI OMAP37XX EVM (TMDSEVM3730)";
+ compatible = "ti,omap3-evm-37xx", "ti,omap3630", "ti,omap3";
+};
+
+&omap3_pmx_core2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&hsusb2_2_pins>;
+
+ ehci_phy_pins: pinmux_ehci_phy_pins {
+ pinctrl-single,pins = <
+
+ /* EHCI PHY reset GPIO etk_d7.gpio_21 */
+ OMAP3630_CORE2_IOPAD(0x25ea, PIN_OUTPUT | MUX_MODE4)
+
+ /* EHCI VBUS etk_d8.gpio_22 */
+ OMAP3630_CORE2_IOPAD(0x25ec, PIN_OUTPUT | MUX_MODE4)
+ >;
+ };
+
+ /* Used by OHCI and EHCI. OHCI won't work without external phy */
+ hsusb2_2_pins: pinmux_hsusb2_2_pins {
+ pinctrl-single,pins = <
+
+ /* etk_d10.hsusb2_clk */
+ OMAP3630_CORE2_IOPAD(0x25f0, PIN_OUTPUT | MUX_MODE3)
+
+ /* etk_d11.hsusb2_stp */
+ OMAP3630_CORE2_IOPAD(0x25f2, PIN_OUTPUT | MUX_MODE3)
+
+ /* etk_d12.hsusb2_dir */
+ OMAP3630_CORE2_IOPAD(0x25f4, PIN_INPUT_PULLDOWN | MUX_MODE3)
+
+ /* etk_d13.hsusb2_nxt */
+ OMAP3630_CORE2_IOPAD(0x25f6, PIN_INPUT_PULLDOWN | MUX_MODE3)
+
+ /* etk_d14.hsusb2_data0 */
+ OMAP3630_CORE2_IOPAD(0x25f8, PIN_INPUT_PULLDOWN | MUX_MODE3)
+
+ /* etk_d15.hsusb2_data1 */
+ OMAP3630_CORE2_IOPAD(0x25fa, PIN_INPUT_PULLDOWN | MUX_MODE3)
+ >;
+ };
+};
+
+&gpmc {
+ nand at 0,0 {
+ compatible = "ti,omap2-nand";
+ reg = <0 0 4>; /* CS0, offset 0, IO size 4 */
+ interrupt-parent = <&gpmc>;
+ interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */
+ <1 IRQ_TYPE_NONE>; /* termcount */
+ linux,mtd-name= "hynix,h8kds0un0mer-4em";
+ nand-bus-width = <16>;
+ gpmc,device-width = <2>;
+ ti,nand-ecc-opt = "bch8";
+
+ gpmc,sync-clk-ps = <0>;
+ gpmc,cs-on-ns = <0>;
+ gpmc,cs-rd-off-ns = <44>;
+ gpmc,cs-wr-off-ns = <44>;
+ gpmc,adv-on-ns = <6>;
+ gpmc,adv-rd-off-ns = <34>;
+ gpmc,adv-wr-off-ns = <44>;
+ gpmc,we-off-ns = <40>;
+ gpmc,oe-off-ns = <54>;
+ gpmc,access-ns = <64>;
+ gpmc,rd-cycle-ns = <82>;
+ gpmc,wr-cycle-ns = <82>;
+ gpmc,wr-access-ns = <40>;
+ gpmc,wr-data-mux-bus-ns = <0>;
+
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ partition at 0 {
+ label = "X-Loader";
+ reg = <0 0x80000>;
+ };
+ partition at 0x80000 {
+ label = "U-Boot";
+ reg = <0x80000 0x1c0000>;
+ };
+ partition at 0x1c0000 {
+ label = "Environment";
+ reg = <0x240000 0x40000>;
+ };
+ partition at 0x280000 {
+ label = "Kernel";
+ reg = <0x280000 0x500000>;
+ };
+ partition at 0x780000 {
+ label = "Filesystem";
+ reg = <0x780000 0x1f880000>;
+ };
+ };
+};
diff --git a/arch/arm/dts/omap3-evm-common.dtsi b/arch/arm/dts/omap3-evm-common.dtsi
new file mode 100644
index 0000000000..ee64191e41
--- /dev/null
+++ b/arch/arm/dts/omap3-evm-common.dtsi
@@ -0,0 +1,195 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Common support for omap3 EVM boards
+ */
+
+#include <dt-bindings/input/input.h>
+#include "omap-gpmc-smsc911x.dtsi"
+
+/ {
+ cpus {
+ cpu at 0 {
+ cpu0-supply = <&vcc>;
+ };
+ };
+
+ /* HS USB Port 2 Power */
+ hsusb2_power: hsusb2_power_reg {
+ compatible = "regulator-fixed";
+ regulator-name = "hsusb2_vbus";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>; /* gpio_22 */
+ startup-delay-us = <70000>;
+ enable-active-high;
+ };
+
+ /* HS USB Host PHY on PORT 2 */
+ hsusb2_phy: hsusb2_phy {
+ compatible = "usb-nop-xceiv";
+ reset-gpios = <&gpio1 21 GPIO_ACTIVE_LOW>; /* gpio_21 */
+ vcc-supply = <&hsusb2_power>;
+ #phy-cells = <0>;
+ };
+
+ leds {
+ compatible = "gpio-leds";
+ ledb {
+ label = "omap3evm::ledb";
+ gpios = <&twl_gpio 19 GPIO_ACTIVE_HIGH>; /* LEDB */
+ linux,default-trigger = "default-on";
+ };
+ };
+
+ wl12xx_vmmc: wl12xx_vmmc {
+ compatible = "regulator-fixed";
+ regulator-name = "vwl1271";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ gpio = <&gpio5 22 GPIO_ACTIVE_HIGH>; /* gpio150 */
+ startup-delay-us = <70000>;
+ enable-active-high;
+ vin-supply = <&vmmc2>;
+ };
+};
+
+&i2c1 {
+ clock-frequency = <2600000>;
+
+ twl: twl at 48 {
+ reg = <0x48>;
+ interrupts = <7>; /* SYS_NIRQ cascaded to intc */
+ interrupt-parent = <&intc>;
+ };
+};
+
+#include "twl4030.dtsi"
+#include "twl4030_omap3.dtsi"
+#include "omap3-panel-sharp-ls037v7dw01.dtsi"
+
+&backlight0 {
+ gpios = <&twl_gpio 18 GPIO_ACTIVE_LOW>;
+};
+
+&twl {
+ twl_power: power {
+ compatible = "ti,twl4030-power-omap3-evm", "ti,twl4030-power-idle";
+ ti,use_poweroff;
+ };
+};
+
+&i2c2 {
+ clock-frequency = <400000>;
+};
+
+&i2c3 {
+ clock-frequency = <400000>;
+
+ /*
+ * TVP5146 Video decoder-in for analog input support.
+ */
+ tvp5146 at 5c {
+ compatible = "ti,tvp5146m2";
+ reg = <0x5c>;
+ };
+};
+
+&lcd_3v3 {
+ gpio = <&gpio5 25 GPIO_ACTIVE_LOW>; /* gpio153 */
+};
+
+&lcd0 {
+ enable-gpios = <&gpio5 24 GPIO_ACTIVE_HIGH>; /* gpio152, lcd INI */
+ reset-gpios = <&gpio5 27 GPIO_ACTIVE_HIGH>; /* gpio155, lcd RESB */
+ mode-gpios = <&gpio5 26 GPIO_ACTIVE_HIGH /* gpio154, lcd MO */
+ &gpio1 2 GPIO_ACTIVE_HIGH /* gpio2, lcd LR */
+ &gpio1 3 GPIO_ACTIVE_HIGH>; /* gpio3, lcd UD */
+};
+
+&mcspi1 {
+ tsc2046 at 0 {
+ interrupt-parent = <&gpio6>;
+ interrupts = <15 0>; /* gpio175 */
+ pendown-gpio = <&gpio6 15 GPIO_ACTIVE_HIGH>;
+ };
+};
+
+&mmc1 {
+ interrupts-extended = <&intc 83 &omap3_pmx_core 0x11a>;
+ vmmc-supply = <&vmmc1>;
+ vqmmc-supply = <&vsim>;
+ bus-width = <8>;
+};
+
+&mmc2 {
+ vmmc-supply = <&wl12xx_vmmc>;
+ non-removable;
+ bus-width = <4>;
+ cap-power-off-card;
+
+ #address-cells = <1>;
+ #size-cells = <0>;
+ wlcore: wlcore at 2 {
+ compatible = "ti,wl1271";
+ reg = <2>;
+ interrupt-parent = <&gpio5>;
+ interrupts = <21 IRQ_TYPE_LEVEL_HIGH>; /* gpio 149 */
+ ref-clock-frequency = <38400000>;
+ };
+};
+
+&twl_gpio {
+ ti,use-leds;
+};
+
+&twl_keypad {
+ linux,keymap = <
+ MATRIX_KEY(2, 2, KEY_1)
+ MATRIX_KEY(1, 1, KEY_2)
+ MATRIX_KEY(0, 0, KEY_3)
+ MATRIX_KEY(3, 2, KEY_4)
+ MATRIX_KEY(2, 1, KEY_5)
+ MATRIX_KEY(1, 0, KEY_6)
+ MATRIX_KEY(1, 3, KEY_7)
+ MATRIX_KEY(3, 1, KEY_8)
+ MATRIX_KEY(2, 0, KEY_9)
+ MATRIX_KEY(2, 3, KEY_KPASTERISK)
+ MATRIX_KEY(0, 2, KEY_0)
+ MATRIX_KEY(3, 0, KEY_KPDOT)
+ /* s4 not wired */
+ MATRIX_KEY(1, 2, KEY_BACKSPACE)
+ MATRIX_KEY(0, 1, KEY_ENTER)
+ >;
+};
+
+&usbhshost {
+ port2-mode = "ehci-phy";
+};
+
+&usbhsehci {
+ phys = <0 &hsusb2_phy>;
+};
+
+&usb_otg_hs {
+ interface-type = <0>;
+ usb-phy = <&usb2_phy>;
+ phys = <&usb2_phy>;
+ phy-names = "usb2-phy";
+ mode = <3>;
+ power = <50>;
+};
+
+&gpmc {
+ ethernet at gpmc {
+ interrupt-parent = <&gpio6>;
+ interrupts = <16 8>;
+ reg = <5 0 0xff>;
+ };
+};
+
+&vaux2 {
+ regulator-name = "usb_1v8";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ regulator-always-on;
+};
diff --git a/arch/arm/dts/omap3-evm-processor-common.dtsi b/arch/arm/dts/omap3-evm-processor-common.dtsi
new file mode 100644
index 0000000000..ce7f42f944
--- /dev/null
+++ b/arch/arm/dts/omap3-evm-processor-common.dtsi
@@ -0,0 +1,216 @@
+/*
+ * Common support for omap3 EVM 35xx/37xx processor modules
+ */
+
+/ {
+ memory at 80000000 {
+ device_type = "memory";
+ reg = <0x80000000 0x10000000>; /* 256 MB */
+ };
+
+ wl12xx_vmmc: wl12xx_vmmc {
+ pinctrl-names = "default";
+ pinctrl-0 = <&wl12xx_gpio>;
+ };
+};
+
+&dss {
+ vdds_dsi-supply = <&vpll2>;
+ vdda_video-supply = <&lcd_3v3>;
+ pinctrl-names = "default";
+ pinctrl-0 = <
+ &dss_dpi_pins1
+ &dss_dpi_pins2
+ >;
+};
+
+&hsusb2_phy {
+ pinctrl-names = "default";
+ pinctrl-0 = <&ehci_phy_pins>;
+};
+
+&omap3_pmx_core {
+ pinctrl-names = "default";
+ pinctrl-0 = <&on_board_gpio_61 &hsusb2_pins>;
+
+ dss_dpi_pins1: pinmux_dss_dpi_pins2 {
+ pinctrl-single,pins = <
+ OMAP3_CORE1_IOPAD(0x20d4, PIN_OUTPUT | MUX_MODE0) /* dss_pclk.dss_pclk */
+ OMAP3_CORE1_IOPAD(0x20d6, PIN_OUTPUT | MUX_MODE0) /* dss_hsync.dss_hsync */
+ OMAP3_CORE1_IOPAD(0x20d8, PIN_OUTPUT | MUX_MODE0) /* dss_vsync.dss_vsync */
+ OMAP3_CORE1_IOPAD(0x20da, PIN_OUTPUT | MUX_MODE0) /* dss_acbias.dss_acbias */
+
+ OMAP3_CORE1_IOPAD(0x20e8, PIN_OUTPUT | MUX_MODE0) /* dss_data6.dss_data6 */
+ OMAP3_CORE1_IOPAD(0x20ea, PIN_OUTPUT | MUX_MODE0) /* dss_data7.dss_data7 */
+ OMAP3_CORE1_IOPAD(0x20ec, PIN_OUTPUT | MUX_MODE0) /* dss_data8.dss_data8 */
+ OMAP3_CORE1_IOPAD(0x20ee, PIN_OUTPUT | MUX_MODE0) /* dss_data9.dss_data9 */
+ OMAP3_CORE1_IOPAD(0x20f0, PIN_OUTPUT | MUX_MODE0) /* dss_data10.dss_data10 */
+ OMAP3_CORE1_IOPAD(0x20f2, PIN_OUTPUT | MUX_MODE0) /* dss_data11.dss_data11 */
+ OMAP3_CORE1_IOPAD(0x20f4, PIN_OUTPUT | MUX_MODE0) /* dss_data12.dss_data12 */
+ OMAP3_CORE1_IOPAD(0x20f6, PIN_OUTPUT | MUX_MODE0) /* dss_data13.dss_data13 */
+ OMAP3_CORE1_IOPAD(0x20f8, PIN_OUTPUT | MUX_MODE0) /* dss_data14.dss_data14 */
+ OMAP3_CORE1_IOPAD(0x20fa, PIN_OUTPUT | MUX_MODE0) /* dss_data15.dss_data15 */
+ OMAP3_CORE1_IOPAD(0x20fc, PIN_OUTPUT | MUX_MODE0) /* dss_data16.dss_data16 */
+ OMAP3_CORE1_IOPAD(0x20fe, PIN_OUTPUT | MUX_MODE0) /* dss_data17.dss_data17 */
+
+ OMAP3_CORE1_IOPAD(0x2100, PIN_OUTPUT | MUX_MODE3) /* dss_data18.dss_data0 */
+ OMAP3_CORE1_IOPAD(0x2102, PIN_OUTPUT | MUX_MODE3) /* dss_data19.dss_data1 */
+ OMAP3_CORE1_IOPAD(0x2104, PIN_OUTPUT | MUX_MODE3) /* dss_data20.dss_data2 */
+ OMAP3_CORE1_IOPAD(0x2106, PIN_OUTPUT | MUX_MODE3) /* dss_data21.dss_data3 */
+ OMAP3_CORE1_IOPAD(0x2108, PIN_OUTPUT | MUX_MODE3) /* dss_data22.dss_data4 */
+ OMAP3_CORE1_IOPAD(0x210a, PIN_OUTPUT | MUX_MODE3) /* dss_data23.dss_data5 */
+ >;
+ };
+
+ mmc1_pins: pinmux_mmc1_pins {
+ pinctrl-single,pins = <
+ OMAP3_CORE1_IOPAD(0x2144, PIN_OUTPUT_PULLUP | MUX_MODE0) /* sdmmc1_clk.sdmmc1_clk */
+ OMAP3_CORE1_IOPAD(0x2146, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_cmd.sdmmc1_cmd */
+ OMAP3_CORE1_IOPAD(0x2148, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_dat0.sdmmc1_dat0 */
+ OMAP3_CORE1_IOPAD(0x214a, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_dat1.sdmmc1_dat1 */
+ OMAP3_CORE1_IOPAD(0x214c, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_dat2.sdmmc1_dat2 */
+ OMAP3_CORE1_IOPAD(0x214e, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_dat3.sdmmc1_dat3 */
+ OMAP3_CORE1_IOPAD(0x2150, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_dat4.sdmmc1_dat4 */
+ OMAP3_CORE1_IOPAD(0x2152, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_dat5.sdmmc1_dat5 */
+ OMAP3_CORE1_IOPAD(0x2154, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_dat6.sdmmc1_dat6 */
+ OMAP3_CORE1_IOPAD(0x2156, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_dat7.sdmmc1_dat7 */
+ >;
+ };
+
+ /* NOTE: Clocked externally, needs INPUT also for sdmmc2_clk.sdmmc2_clk */
+ mmc2_pins: pinmux_mmc2_pins {
+ pinctrl-single,pins = <
+ OMAP3_CORE1_IOPAD(0x2158, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_clk.sdmmc2_clk */
+ OMAP3_CORE1_IOPAD(0x215a, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_cmd.sdmmc2_cmd */
+ OMAP3_CORE1_IOPAD(0x215c, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat0.sdmmc2_dat0 */
+ OMAP3_CORE1_IOPAD(0x215e, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat1.sdmmc2_dat1 */
+ OMAP3_CORE1_IOPAD(0x2160, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat2.sdmmc2_dat2 */
+ OMAP3_CORE1_IOPAD(0x2162, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat3.sdmmc2_dat3 */
+ >;
+ };
+
+ uart3_pins: pinmux_uart3_pins {
+ pinctrl-single,pins = <
+ OMAP3_CORE1_IOPAD(0x219e, WAKEUP_EN | PIN_INPUT | MUX_MODE0) /* uart3_rx_irrx.uart3_rx_irrx */
+ OMAP3_CORE1_IOPAD(0x21a0, PIN_OUTPUT | MUX_MODE0) /* uart3_tx_irtx.uart3_tx_irtx */
+ >;
+ };
+
+ /* Devices are routed with gpmc_nbe1.gpio_61 to on-board devices */
+ on_board_gpio_61: pinmux_ehci_port_select_pins {
+ pinctrl-single,pins = <
+ OMAP3_CORE1_IOPAD(0x20c8, PIN_OUTPUT | MUX_MODE4)
+ >;
+ };
+
+ /* Used by OHCI and EHCI. OHCI won't work without external phy */
+ hsusb2_pins: pinmux_hsusb2_pins {
+ pinctrl-single,pins = <
+
+ /* mcspi1_cs3.hsusb2_data2 */
+ OMAP3_CORE1_IOPAD(0x21d4, PIN_INPUT_PULLDOWN | MUX_MODE3)
+
+ /* mcspi2_clk.hsusb2_data7 */
+ OMAP3_CORE1_IOPAD(0x21d6, PIN_INPUT_PULLDOWN | MUX_MODE3)
+
+ /* mcspi2_simo.hsusb2_data4 */
+ OMAP3_CORE1_IOPAD(0x21d8, PIN_INPUT_PULLDOWN | MUX_MODE3)
+
+ /* mcspi2_somi.hsusb2_data5 */
+ OMAP3_CORE1_IOPAD(0x21da, PIN_INPUT_PULLDOWN | MUX_MODE3)
+
+ /* mcspi2_cs0.hsusb2_data6 */
+ OMAP3_CORE1_IOPAD(0x21dc, PIN_INPUT_PULLDOWN | MUX_MODE3)
+
+ /* mcspi2_cs1.hsusb2_data3 */
+ OMAP3_CORE1_IOPAD(0x21de, PIN_INPUT_PULLDOWN | MUX_MODE3)
+ >;
+ };
+
+ wl12xx_gpio: pinmux_wl12xx_gpio {
+ pinctrl-single,pins = <
+ OMAP3_CORE1_IOPAD(0x2180, PIN_OUTPUT | MUX_MODE4) /* uart1_cts.gpio_150 */
+ OMAP3_CORE1_IOPAD(0x217e, PIN_INPUT | MUX_MODE4) /* uart1_rts.gpio_149 */
+ >;
+ };
+
+ smsc911x_pins: pinmux_smsc911x_pins {
+ pinctrl-single,pins = <
+ OMAP3_CORE1_IOPAD(0x21d2, PIN_INPUT | MUX_MODE4) /* mcspi1_cs2.gpio_176 */
+ >;
+ };
+};
+
+&omap3_pmx_wkup {
+ dss_dpi_pins2: pinmux_dss_dpi_pins1 {
+ pinctrl-single,pins = <
+ OMAP3_WKUP_IOPAD(0x2a0a, PIN_OUTPUT | MUX_MODE3) /* sys_boot0.dss_data18 */
+ OMAP3_WKUP_IOPAD(0x2a0c, PIN_OUTPUT | MUX_MODE3) /* sys_boot1.dss_data19 */
+ OMAP3_WKUP_IOPAD(0x2a10, PIN_OUTPUT | MUX_MODE3) /* sys_boot3.dss_data20 */
+ OMAP3_WKUP_IOPAD(0x2a12, PIN_OUTPUT | MUX_MODE3) /* sys_boot4.dss_data21 */
+ OMAP3_WKUP_IOPAD(0x2a14, PIN_OUTPUT | MUX_MODE3) /* sys_boot5.dss_data22 */
+ OMAP3_WKUP_IOPAD(0x2a16, PIN_OUTPUT | MUX_MODE3) /* sys_boot6.dss_data23 */
+ >;
+ };
+};
+
+&mmc1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc1_pins>;
+};
+
+&mmc2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc2_pins>;
+};
+
+&mmc3 {
+ status = "disabled";
+};
+
+&uart1 {
+ interrupts-extended = <&intc 72 &omap3_pmx_core OMAP3_UART1_RX>;
+};
+
+&uart2 {
+ interrupts-extended = <&intc 73 &omap3_pmx_core OMAP3_UART2_RX>;
+};
+
+&uart3 {
+ interrupts-extended = <&intc 74 &omap3_pmx_core OMAP3_UART3_RX>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart3_pins>;
+};
+
+/*
+ * GPIO_61 (nUSB2_EN_1V8) must be low to enable on-board EHCI USB2 interface
+ * for bus switch SN74CB3Q3384A, level-shifter SN74AVC16T245DGGR, and 1.8V.
+ */
+&gpio2 {
+ en_usb2_port {
+ gpio-hog;
+ gpios = <29 GPIO_ACTIVE_HIGH>; /* gpio_61 */
+ output-low;
+ line-name = "enable usb2 port";
+ };
+};
+
+/* T2_GPIO_2 low to route GPIO_61 to on-board devices */
+&twl_gpio {
+ en_on_board_gpio_61 {
+ gpio-hog;
+ gpios = <2 GPIO_ACTIVE_HIGH>;
+ output-low;
+ line-name = "en_hsusb2_clk";
+ };
+};
+
+&gpmc {
+ ranges = <0 0 0x30000000 0x1000000>, /* CS0: 16MB for NAND */
+ <5 0 0x2c000000 0x01000000>; /* CS5: 16MB for LAN9220 */
+
+ ethernet at gpmc {
+ pinctrl-names = "default";
+ pinctrl-0 = <&smsc911x_pins>;
+ };
+};
diff --git a/arch/arm/dts/omap3-evm-u-boot.dtsi b/arch/arm/dts/omap3-evm-u-boot.dtsi
new file mode 100644
index 0000000000..53a489988e
--- /dev/null
+++ b/arch/arm/dts/omap3-evm-u-boot.dtsi
@@ -0,0 +1,29 @@
+/*
+ * U-Boot additions
+ *
+ * (C) Copyright 2017 Derald D. Woods <woods.technical@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+/ {
+ chosen {
+ stdout-path = &uart1;
+ };
+};
+
+&mmc1 {
+ cd-inverted;
+};
+
+&uart1 {
+ reg-shift = <2>;
+};
+
+&uart2 {
+ reg-shift = <2>;
+};
+
+&uart3 {
+ reg-shift = <2>;
+};
diff --git a/arch/arm/dts/omap3-evm.dts b/arch/arm/dts/omap3-evm.dts
new file mode 100644
index 0000000000..21a3b88aef
--- /dev/null
+++ b/arch/arm/dts/omap3-evm.dts
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.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/;
+
+#include "omap34xx.dtsi"
+#include "omap3-evm-common.dtsi"
+#include "omap3-evm-processor-common.dtsi"
+
+/ {
+ model = "TI OMAP35XX EVM (TMDSEVM3530)";
+ compatible = "ti,omap3-evm", "ti,omap3430", "ti,omap3";
+};
+
+&omap3_pmx_core2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&hsusb2_2_pins>;
+
+ ehci_phy_pins: pinmux_ehci_phy_pins {
+ pinctrl-single,pins = <
+
+ /* EHCI PHY reset GPIO etk_d7.gpio_21 */
+ OMAP3430_CORE2_IOPAD(0x25ea, PIN_OUTPUT | MUX_MODE4)
+
+ /* EHCI VBUS etk_d8.gpio_22 */
+ OMAP3430_CORE2_IOPAD(0x25ec, PIN_OUTPUT | MUX_MODE4)
+ >;
+ };
+
+ /* Used by OHCI and EHCI. OHCI won't work without external phy */
+ hsusb2_2_pins: pinmux_hsusb2_2_pins {
+ pinctrl-single,pins = <
+
+ /* etk_d10.hsusb2_clk */
+ OMAP3430_CORE2_IOPAD(0x25f0, PIN_OUTPUT | MUX_MODE3)
+
+ /* etk_d11.hsusb2_stp */
+ OMAP3430_CORE2_IOPAD(0x25f2, PIN_OUTPUT | MUX_MODE3)
+
+ /* etk_d12.hsusb2_dir */
+ OMAP3430_CORE2_IOPAD(0x25f4, PIN_INPUT_PULLDOWN | MUX_MODE3)
+
+ /* etk_d13.hsusb2_nxt */
+ OMAP3430_CORE2_IOPAD(0x25f6, PIN_INPUT_PULLDOWN | MUX_MODE3)
+
+ /* etk_d14.hsusb2_data0 */
+ OMAP3430_CORE2_IOPAD(0x25f8, PIN_INPUT_PULLDOWN | MUX_MODE3)
+
+ /* etk_d15.hsusb2_data1 */
+ OMAP3430_CORE2_IOPAD(0x25fa, PIN_INPUT_PULLDOWN | MUX_MODE3)
+ >;
+ };
+};
+
+&gpmc {
+ nand at 0,0 {
+ compatible = "ti,omap2-nand";
+ reg = <0 0 4>; /* CS0, offset 0, IO size 4 */
+ interrupt-parent = <&gpmc>;
+ interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */
+ <1 IRQ_TYPE_NONE>; /* termcount */
+ linux,mtd-name= "micron,mt29f2g16abdhc";
+ nand-bus-width = <16>;
+ gpmc,device-width = <2>;
+ ti,nand-ecc-opt = "bch8";
+
+ gpmc,sync-clk-ps = <0>;
+ gpmc,cs-on-ns = <0>;
+ gpmc,cs-rd-off-ns = <44>;
+ gpmc,cs-wr-off-ns = <44>;
+ gpmc,adv-on-ns = <6>;
+ gpmc,adv-rd-off-ns = <34>;
+ gpmc,adv-wr-off-ns = <44>;
+ gpmc,we-off-ns = <40>;
+ gpmc,oe-off-ns = <54>;
+ gpmc,access-ns = <64>;
+ gpmc,rd-cycle-ns = <82>;
+ gpmc,wr-cycle-ns = <82>;
+ gpmc,wr-access-ns = <40>;
+ gpmc,wr-data-mux-bus-ns = <0>;
+
+ #address-cells = <1>;
+ #size-cells = <1>;
+ };
+};
diff --git a/arch/arm/dts/omap3-panel-sharp-ls037v7dw01.dtsi b/arch/arm/dts/omap3-panel-sharp-ls037v7dw01.dtsi
new file mode 100644
index 0000000000..b8b9fcc41e
--- /dev/null
+++ b/arch/arm/dts/omap3-panel-sharp-ls037v7dw01.dtsi
@@ -0,0 +1,73 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Common file for omap dpi panels with QVGA and reset pins
+ *
+ * Note that the board specifc DTS file needs to specify
+ * at minimum the GPIO enable-gpios for display, and
+ * gpios for gpio-backlight.
+ */
+
+/ {
+ aliases {
+ display0 = &lcd0;
+ };
+
+ backlight0: backlight {
+ compatible = "gpio-backlight";
+ default-on;
+ };
+
+ /* 3.3V GPIO controlled regulator for LCD_ENVDD */
+ lcd_3v3: regulator-lcd-3v3 {
+ compatible = "regulator-fixed";
+ regulator-name = "lcd_3v3";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ startup-delay-us = <70000>;
+ };
+
+ lcd0: display {
+ compatible = "sharp,ls037v7dw01";
+ label = "lcd";
+ power-supply = <&lcd_3v3>;
+ envdd-supply = <&lcd_3v3>;
+
+ port {
+ lcd_in: endpoint {
+ remote-endpoint = <&dpi_out>;
+ };
+ };
+ };
+};
+
+/* Needed to power the DPI pins */
+&vpll2 {
+ regulator-always-on;
+};
+
+&dss {
+ status = "ok";
+ port {
+ dpi_out: endpoint {
+ remote-endpoint = <&lcd_in>;
+ data-lines = <18>;
+ };
+ };
+};
+
+&mcspi1 {
+ tsc2046 at 0 {
+ reg = <0>; /* CS0 */
+ compatible = "ti,tsc2046";
+ spi-max-frequency = <1000000>;
+ vcc-supply = <&lcd_3v3>;
+ ti,x-min = /bits/ 16 <0>;
+ ti,x-max = /bits/ 16 <8000>;
+ ti,y-min = /bits/ 16 <0>;
+ ti,y-max = /bits/ 16 <4800>;
+ ti,x-plate-ohms = /bits/ 16 <40>;
+ ti,pressure-max = /bits/ 16 <255>;
+ ti,swap-xy;
+ wakeup-source;
+ };
+};
diff --git a/arch/arm/dts/omap34xx.dtsi b/arch/arm/dts/omap34xx.dtsi
new file mode 100644
index 0000000000..ac4f8795b7
--- /dev/null
+++ b/arch/arm/dts/omap34xx.dtsi
@@ -0,0 +1,84 @@
+/*
+ * Device Tree Source for OMAP34xx/OMAP35xx SoC
+ *
+ * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+#include <dt-bindings/media/omap3-isp.h>
+
+#include "omap3.dtsi"
+
+/ {
+ cpus {
+ cpu: cpu at 0 {
+ /* OMAP343x/OMAP35xx variants OPP1-5 */
+ operating-points = <
+ /* kHz uV */
+ 125000 975000
+ 250000 1075000
+ 500000 1200000
+ 550000 1270000
+ 600000 1350000
+ >;
+ clock-latency = <300000>; /* From legacy driver */
+ };
+ };
+
+ ocp at 68000000 {
+ omap3_pmx_core2: pinmux at 480025d8 {
+ compatible = "ti,omap3-padconf", "pinctrl-single";
+ reg = <0x480025d8 0x24>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ #pinctrl-cells = <1>;
+ #interrupt-cells = <1>;
+ interrupt-controller;
+ pinctrl-single,register-width = <16>;
+ pinctrl-single,function-mask = <0xff1f>;
+ };
+
+ isp: isp at 480bc000 {
+ compatible = "ti,omap3-isp";
+ reg = <0x480bc000 0x12fc
+ 0x480bd800 0x017c>;
+ interrupts = <24>;
+ iommus = <&mmu_isp>;
+ syscon = <&scm_conf 0x6c>;
+ ti,phy-type = <OMAP3ISP_PHY_TYPE_COMPLEX_IO>;
+ #clock-cells = <1>;
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ };
+ };
+
+ bandgap: bandgap at 48002524 {
+ reg = <0x48002524 0x4>;
+ compatible = "ti,omap34xx-bandgap";
+ #thermal-sensor-cells = <0>;
+ };
+ };
+
+ thermal_zones: thermal-zones {
+ #include "omap3-cpu-thermal.dtsi"
+ };
+};
+
+&ssi {
+ status = "ok";
+
+ clocks = <&ssi_ssr_fck>,
+ <&ssi_sst_fck>,
+ <&ssi_ick>;
+ clock-names = "ssi_ssr_fck",
+ "ssi_sst_fck",
+ "ssi_ick";
+};
+
+/include/ "omap34xx-omap36xx-clocks.dtsi"
+/include/ "omap36xx-omap3430es2plus-clocks.dtsi"
+/include/ "omap36xx-am35xx-omap3430es2plus-clocks.dtsi"
--
2.15.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 2/3] ARM: dts: omap3-evm: Enable DM and devicetree for TMDSEVM{3530, 3730}
2017-12-16 20:14 [U-Boot] [PATCH 0/3] ARM: omap3: evm: Add OF_CONTROL support Derald D. Woods
2017-12-16 20:14 ` [U-Boot] [PATCH 1/3] ARM: dts: omap3-evm: Add support for TMDSEVM{3530, 3730} Derald D. Woods
@ 2017-12-16 20:14 ` Derald D. Woods
2017-12-17 2:36 ` Derald D. Woods
2017-12-16 20:14 ` [U-Boot] [PATCH 3/3] ARM: omap3: evm: Refactor 'board_eth_init' Derald D. Woods
2017-12-26 3:34 ` [U-Boot] [PATCH 0/3] ARM: omap3: evm: Add OF_CONTROL support Derald D. Woods
3 siblings, 1 reply; 15+ messages in thread
From: Derald D. Woods @ 2017-12-16 20:14 UTC (permalink / raw)
To: u-boot
This commit updates the configuration files needed to support OF_CONTROL
on the OMAP3 EVM baseboard.
Tested using GCC 7.2.0 [--with-float=hard --with-mode=thumb].
Signed-off-by: Derald D. Woods <woods.technical@gmail.com>
---
arch/arm/mach-omap2/omap3/Kconfig | 4 ++++
configs/omap3_evm_defconfig | 9 +++------
include/configs/omap3_evm.h | 2 --
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/arch/arm/mach-omap2/omap3/Kconfig b/arch/arm/mach-omap2/omap3/Kconfig
index 4dbf9a27da..6d714f6cdb 100644
--- a/arch/arm/mach-omap2/omap3/Kconfig
+++ b/arch/arm/mach-omap2/omap3/Kconfig
@@ -61,6 +61,10 @@ config TARGET_DEVKIT8000
config TARGET_OMAP3_EVM
bool "TI OMAP3 EVM"
+ select DM
+ select DM_SERIAL
+ select DM_GPIO
+ select OMAP3_GPIO_3
config TARGET_OMAP3_IGEP00X0
bool "IGEP"
diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig
index 0c513664fe..bf4480fc5d 100644
--- a/configs/omap3_evm_defconfig
+++ b/configs/omap3_evm_defconfig
@@ -1,10 +1,11 @@
CONFIG_ARM=y
-# CONFIG_SYS_THUMB_BUILD is not set
CONFIG_ARCH_OMAP2PLUS=y
CONFIG_SYS_TEXT_BASE=0x80100000
+CONFIG_TI_COMMON_CMD_OPTIONS=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_SYS_MPUCLK=720
CONFIG_TARGET_OMAP3_EVM=y
+CONFIG_DEFAULT_DEVICE_TREE="omap3-evm"
CONFIG_DISTRO_DEFAULTS=y
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTCOMMAND=y
@@ -20,15 +21,11 @@ CONFIG_SYS_PROMPT="OMAP3_EVM # "
CONFIG_CMD_ASKENV=y
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set
-CONFIG_CMD_GPIO=y
-CONFIG_CMD_I2C=y
CONFIG_CMD_MMC=y
CONFIG_CMD_NAND=y
CONFIG_CMD_NAND_TRIMFFS=y
-CONFIG_CMD_SPI=y
CONFIG_CMD_USB=y
CONFIG_CMD_CACHE=y
-CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FS_UUID=y
CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(spl),1792k(u-boot),128k(dtb),128k(u-boot-env),6m(kernel),-(rootfs)"
@@ -36,6 +33,7 @@ CONFIG_CMD_UBI=y
# CONFIG_ISO_PARTITION is not set
# CONFIG_EFI_PARTITION is not set
CONFIG_SPL_PARTITION_UUIDS=y
+CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_NAND=y
CONFIG_DM=y
CONFIG_SPL_DM=y
@@ -61,7 +59,6 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0451
CONFIG_USB_GADGET_PRODUCT_NUM=0x5678
CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_USB_ETHER=y
-CONFIG_FAT_WRITE=y
CONFIG_BCH=y
CONFIG_OF_LIBFDT=y
CONFIG_OF_LIBFDT_OVERLAY=y
diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index 42f2153637..0bf3423129 100644
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -42,8 +42,6 @@
#define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1
#if defined(CONFIG_SPL_BUILD)
#undef CONFIG_SYS_NS16550_REG_SIZE
-#else /* !CONFIG_SPL_BUILD */
-#define CONFIG_SYS_NS16550_REG_SIZE (-1)
#endif /* CONFIG_SPL_BUILD */
/* NAND */
--
2.15.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 3/3] ARM: omap3: evm: Refactor 'board_eth_init'
2017-12-16 20:14 [U-Boot] [PATCH 0/3] ARM: omap3: evm: Add OF_CONTROL support Derald D. Woods
2017-12-16 20:14 ` [U-Boot] [PATCH 1/3] ARM: dts: omap3-evm: Add support for TMDSEVM{3530, 3730} Derald D. Woods
2017-12-16 20:14 ` [U-Boot] [PATCH 2/3] ARM: dts: omap3-evm: Enable DM and devicetree " Derald D. Woods
@ 2017-12-16 20:14 ` Derald D. Woods
2018-01-02 0:47 ` [U-Boot] [U-Boot, " Tom Rini
2017-12-26 3:34 ` [U-Boot] [PATCH 0/3] ARM: omap3: evm: Add OF_CONTROL support Derald D. Woods
3 siblings, 1 reply; 15+ messages in thread
From: Derald D. Woods @ 2017-12-16 20:14 UTC (permalink / raw)
To: u-boot
This commit clears 'ethaddr' before calling 'smc911x_initialize' to
allow the SROM MAC address to be assigned properly.
Signed-off-by: Derald D. Woods <woods.technical@gmail.com>
---
board/ti/evm/evm.c | 24 +++++-------------------
1 file changed, 5 insertions(+), 19 deletions(-)
diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c
index 4d5ddff1e1..3a9680ffec 100644
--- a/board/ti/evm/evm.c
+++ b/board/ti/evm/evm.c
@@ -299,26 +299,12 @@ static void reset_net_chip(void)
int board_eth_init(bd_t *bis)
{
- int rc = 0;
#if defined(CONFIG_SMC911X)
-#define STR_ENV_ETHADDR "ethaddr"
-
- struct eth_device *dev;
- uchar eth_addr[6];
-
- rc = smc911x_initialize(0, CONFIG_SMC911X_BASE);
-
- if (!eth_env_get_enetaddr(STR_ENV_ETHADDR, eth_addr)) {
- dev = eth_get_dev_by_index(0);
- if (dev) {
- eth_env_set_enetaddr(STR_ENV_ETHADDR, dev->enetaddr);
- } else {
- printf("omap3evm: Couldn't get eth device\n");
- rc = -1;
- }
- }
-#endif /* CONFIG_SMC911X */
- return rc;
+ env_set("ethaddr", NULL);
+ return smc911x_initialize(0, CONFIG_SMC911X_BASE);
+#else
+ return 0;
+#endif
}
#endif /* CONFIG_CMD_NET */
--
2.15.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 2/3] ARM: dts: omap3-evm: Enable DM and devicetree for TMDSEVM{3530, 3730}
2017-12-16 20:14 ` [U-Boot] [PATCH 2/3] ARM: dts: omap3-evm: Enable DM and devicetree " Derald D. Woods
@ 2017-12-17 2:36 ` Derald D. Woods
2017-12-27 13:15 ` [U-Boot] [U-Boot, " Tom Rini
2017-12-27 15:37 ` [U-Boot] [PATCH v3 " Derald D. Woods
0 siblings, 2 replies; 15+ messages in thread
From: Derald D. Woods @ 2017-12-17 2:36 UTC (permalink / raw)
To: u-boot
This commit updates the configuration files needed to support OF_CONTROL
on the OMAP3 EVM baseboard.
Additionally:
- CONFIG_SYS_THUMB_BUILD is enabled
- CONFIG_SPL_ENV_SUPPORT is enabled
- CONFIG_SPL_EXT_SUPPORT is enabled
Tested using GCC 7.2.0 [--with-float=hard --with-mode=thumb].
Signed-off-by: Derald D. Woods <woods.technical@gmail.com>
---
v2:
- Added CONFIG_SPL_ENV_SUPPORT and CONFIG_SPL_EXT_SUPPORT
- Bring back bus and filesystem commands previously dropped
- Update commit message
arch/arm/mach-omap2/omap3/Kconfig | 4 ++++
configs/omap3_evm_defconfig | 6 +++++-
include/configs/omap3_evm.h | 6 ------
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-omap2/omap3/Kconfig b/arch/arm/mach-omap2/omap3/Kconfig
index 4dbf9a27da..6d714f6cdb 100644
--- a/arch/arm/mach-omap2/omap3/Kconfig
+++ b/arch/arm/mach-omap2/omap3/Kconfig
@@ -61,6 +61,10 @@ config TARGET_DEVKIT8000
config TARGET_OMAP3_EVM
bool "TI OMAP3 EVM"
+ select DM
+ select DM_SERIAL
+ select DM_GPIO
+ select OMAP3_GPIO_3
config TARGET_OMAP3_IGEP00X0
bool "IGEP"
diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig
index 0c513664fe..c69b880bcc 100644
--- a/configs/omap3_evm_defconfig
+++ b/configs/omap3_evm_defconfig
@@ -1,10 +1,11 @@
CONFIG_ARM=y
-# CONFIG_SYS_THUMB_BUILD is not set
CONFIG_ARCH_OMAP2PLUS=y
CONFIG_SYS_TEXT_BASE=0x80100000
+CONFIG_TI_COMMON_CMD_OPTIONS=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_SYS_MPUCLK=720
CONFIG_TARGET_OMAP3_EVM=y
+CONFIG_DEFAULT_DEVICE_TREE="omap3-evm"
CONFIG_DISTRO_DEFAULTS=y
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTCOMMAND=y
@@ -12,6 +13,8 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_DEFAULT_FDT_FILE="omap3-evm.dtb"
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
+CONFIG_SPL_ENV_SUPPORT=y
+CONFIG_SPL_EXT_SUPPORT=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
# CONFIG_SPL_EXT_SUPPORT is not set
CONFIG_SPL_MTD_SUPPORT=y
@@ -36,6 +39,7 @@ CONFIG_CMD_UBI=y
# CONFIG_ISO_PARTITION is not set
# CONFIG_EFI_PARTITION is not set
CONFIG_SPL_PARTITION_UUIDS=y
+CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_NAND=y
CONFIG_DM=y
CONFIG_SPL_DM=y
diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index 42f2153637..629d60b961 100644
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -42,8 +42,6 @@
#define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1
#if defined(CONFIG_SPL_BUILD)
#undef CONFIG_SYS_NS16550_REG_SIZE
-#else /* !CONFIG_SPL_BUILD */
-#define CONFIG_SYS_NS16550_REG_SIZE (-1)
#endif /* CONFIG_SPL_BUILD */
/* NAND */
@@ -86,8 +84,6 @@
/* Environment */
#define CONFIG_PREBOOT "usb start"
-#if !defined(CONFIG_SPL_BUILD)
-
#include <config_distro_defaults.h>
#define MEM_LAYOUT_ENV_SETTINGS \
@@ -181,6 +177,4 @@
"bootm ${loadaddr} - ${fdtaddr}\0" \
BOOTENV
-#endif /* !CONFIG_SPL_BUILD */
-
#endif /* __CONFIG_H */
--
2.15.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 0/3] ARM: omap3: evm: Add OF_CONTROL support
2017-12-16 20:14 [U-Boot] [PATCH 0/3] ARM: omap3: evm: Add OF_CONTROL support Derald D. Woods
` (2 preceding siblings ...)
2017-12-16 20:14 ` [U-Boot] [PATCH 3/3] ARM: omap3: evm: Refactor 'board_eth_init' Derald D. Woods
@ 2017-12-26 3:34 ` Derald D. Woods
2017-12-26 16:14 ` Tom Rini
3 siblings, 1 reply; 15+ messages in thread
From: Derald D. Woods @ 2017-12-26 3:34 UTC (permalink / raw)
To: u-boot
On Sat, Dec 16, 2017 at 02:14:47PM -0600, Derald D. Woods wrote:
> This series adds OF_CONTROL support for TMDSEVM{3530,3730} and
> additionally updates ethaddr setup with smc911x initialization.
>
> Devicetree files are taken from Linux v4.15-rc3. Note that this is the
> first addition of OMAP34XX devicetree files.
>
> Tested using GCC 7.2.0 [--with-float=hard --with-mode=thumb]
>
> --- 8< -----------------------------------------------------------------
> U-Boot SPL 2018.01-rc1-00177-g27f9740bcf (Dec 16 2017 - 13:13:10)
> Trying to boot from MMC1
> reading u-boot.img
> reading u-boot.img
>
>
> U-Boot 2018.01-rc1-00177-g27f9740bcf (Dec 16 2017 - 13:13:10 -0600)
>
> OMAP3530-GP ES3.1, CPU-OPP2, L3-165MHz, Max CPU Clock 720 MHz
> Model: TI OMAP35XX EVM (TMDSEVM3530)
> OMAP3 EVM board + LPDDR/NAND
> I2C: ready
> DRAM: 256 MiB
> NAND: 256 MiB
> MMC: OMAP SD/MMC: 0
> Read back SMSC id 0x92200000
> OMAP die ID: 265a002400000000040365fa1801b01f
> Net: smc911x-0
> starting USB...
> USB0: USB EHCI 1.00
> scanning bus 0 for devices... 1 USB Device(s) found
> Hit any key to stop autoboot: 0
> OMAP3_EVM # echo $stdin;echo $stdout;echo $stderr
> serial at 4806a000
> serial at 4806a000
> serial at 4806a000
> --- 8< -----------------------------------------------------------------
>
>
> Derald D. Woods (3):
> ARM: dts: omap3-evm: Add support for TMDSEVM{3530,3730}
> ARM: dts: omap3-evm: Enable DM and devicetree for TMDSEVM{3530,3730}
> ARM: omap3: evm: Refactor 'board_eth_init'
>
> arch/arm/dts/Makefile | 4 +
> arch/arm/dts/omap-gpmc-smsc911x.dtsi | 55 ++++++
> arch/arm/dts/omap3-evm-37xx-u-boot.dtsi | 29 ++++
> arch/arm/dts/omap3-evm-37xx.dts | 110 ++++++++++++
> arch/arm/dts/omap3-evm-common.dtsi | 195 +++++++++++++++++++++
> arch/arm/dts/omap3-evm-processor-common.dtsi | 216 ++++++++++++++++++++++++
> arch/arm/dts/omap3-evm-u-boot.dtsi | 29 ++++
> arch/arm/dts/omap3-evm.dts | 89 ++++++++++
> arch/arm/dts/omap3-panel-sharp-ls037v7dw01.dtsi | 73 ++++++++
> arch/arm/dts/omap34xx.dtsi | 84 +++++++++
> arch/arm/mach-omap2/omap3/Kconfig | 4 +
> board/ti/evm/evm.c | 24 +--
> configs/omap3_evm_defconfig | 9 +-
> include/configs/omap3_evm.h | 2 -
> 14 files changed, 896 insertions(+), 27 deletions(-)
> create mode 100644 arch/arm/dts/omap-gpmc-smsc911x.dtsi
> create mode 100644 arch/arm/dts/omap3-evm-37xx-u-boot.dtsi
> create mode 100644 arch/arm/dts/omap3-evm-37xx.dts
> create mode 100644 arch/arm/dts/omap3-evm-common.dtsi
> create mode 100644 arch/arm/dts/omap3-evm-processor-common.dtsi
> create mode 100644 arch/arm/dts/omap3-evm-u-boot.dtsi
> create mode 100644 arch/arm/dts/omap3-evm.dts
> create mode 100644 arch/arm/dts/omap3-panel-sharp-ls037v7dw01.dtsi
> create mode 100644 arch/arm/dts/omap34xx.dtsi
>
> --
> 2.15.1
>
Ping. If there is any concern, please let me know and I will make
corrections. I plan to also update beagleboard and overo to use their
respective devicetree files. I would like to have these three OMAP34XX
boards, that I possess, to be near the same level of support. It will
help me to continue testing OMAP34XX stuff in general.
Derald
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 0/3] ARM: omap3: evm: Add OF_CONTROL support
2017-12-26 3:34 ` [U-Boot] [PATCH 0/3] ARM: omap3: evm: Add OF_CONTROL support Derald D. Woods
@ 2017-12-26 16:14 ` Tom Rini
2017-12-26 17:08 ` Derald D. Woods
0 siblings, 1 reply; 15+ messages in thread
From: Tom Rini @ 2017-12-26 16:14 UTC (permalink / raw)
To: u-boot
On Mon, Dec 25, 2017 at 09:34:03PM -0600, Derald D. Woods wrote:
> On Sat, Dec 16, 2017 at 02:14:47PM -0600, Derald D. Woods wrote:
> > This series adds OF_CONTROL support for TMDSEVM{3530,3730} and
> > additionally updates ethaddr setup with smc911x initialization.
> >
> > Devicetree files are taken from Linux v4.15-rc3. Note that this is the
> > first addition of OMAP34XX devicetree files.
> >
> > Tested using GCC 7.2.0 [--with-float=hard --with-mode=thumb]
> >
> > --- 8< -----------------------------------------------------------------
> > U-Boot SPL 2018.01-rc1-00177-g27f9740bcf (Dec 16 2017 - 13:13:10)
> > Trying to boot from MMC1
> > reading u-boot.img
> > reading u-boot.img
> >
> >
> > U-Boot 2018.01-rc1-00177-g27f9740bcf (Dec 16 2017 - 13:13:10 -0600)
> >
> > OMAP3530-GP ES3.1, CPU-OPP2, L3-165MHz, Max CPU Clock 720 MHz
> > Model: TI OMAP35XX EVM (TMDSEVM3530)
> > OMAP3 EVM board + LPDDR/NAND
> > I2C: ready
> > DRAM: 256 MiB
> > NAND: 256 MiB
> > MMC: OMAP SD/MMC: 0
> > Read back SMSC id 0x92200000
> > OMAP die ID: 265a002400000000040365fa1801b01f
> > Net: smc911x-0
> > starting USB...
> > USB0: USB EHCI 1.00
> > scanning bus 0 for devices... 1 USB Device(s) found
> > Hit any key to stop autoboot: 0
> > OMAP3_EVM # echo $stdin;echo $stdout;echo $stderr
> > serial at 4806a000
> > serial at 4806a000
> > serial at 4806a000
> > --- 8< -----------------------------------------------------------------
> >
> >
> > Derald D. Woods (3):
> > ARM: dts: omap3-evm: Add support for TMDSEVM{3530,3730}
> > ARM: dts: omap3-evm: Enable DM and devicetree for TMDSEVM{3530,3730}
> > ARM: omap3: evm: Refactor 'board_eth_init'
> >
> > arch/arm/dts/Makefile | 4 +
> > arch/arm/dts/omap-gpmc-smsc911x.dtsi | 55 ++++++
> > arch/arm/dts/omap3-evm-37xx-u-boot.dtsi | 29 ++++
> > arch/arm/dts/omap3-evm-37xx.dts | 110 ++++++++++++
> > arch/arm/dts/omap3-evm-common.dtsi | 195 +++++++++++++++++++++
> > arch/arm/dts/omap3-evm-processor-common.dtsi | 216 ++++++++++++++++++++++++
> > arch/arm/dts/omap3-evm-u-boot.dtsi | 29 ++++
> > arch/arm/dts/omap3-evm.dts | 89 ++++++++++
> > arch/arm/dts/omap3-panel-sharp-ls037v7dw01.dtsi | 73 ++++++++
> > arch/arm/dts/omap34xx.dtsi | 84 +++++++++
> > arch/arm/mach-omap2/omap3/Kconfig | 4 +
> > board/ti/evm/evm.c | 24 +--
> > configs/omap3_evm_defconfig | 9 +-
> > include/configs/omap3_evm.h | 2 -
> > 14 files changed, 896 insertions(+), 27 deletions(-)
> > create mode 100644 arch/arm/dts/omap-gpmc-smsc911x.dtsi
> > create mode 100644 arch/arm/dts/omap3-evm-37xx-u-boot.dtsi
> > create mode 100644 arch/arm/dts/omap3-evm-37xx.dts
> > create mode 100644 arch/arm/dts/omap3-evm-common.dtsi
> > create mode 100644 arch/arm/dts/omap3-evm-processor-common.dtsi
> > create mode 100644 arch/arm/dts/omap3-evm-u-boot.dtsi
> > create mode 100644 arch/arm/dts/omap3-evm.dts
> > create mode 100644 arch/arm/dts/omap3-panel-sharp-ls037v7dw01.dtsi
> > create mode 100644 arch/arm/dts/omap34xx.dtsi
> >
> > --
> > 2.15.1
> >
>
> Ping. If there is any concern, please let me know and I will make
> corrections. I plan to also update beagleboard and overo to use their
> respective devicetree files. I would like to have these three OMAP34XX
> boards, that I possess, to be near the same level of support. It will
> help me to continue testing OMAP34XX stuff in general.
It's localized enough that it's your call, do you want it in for
v2018.01 or .03? Thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20171226/8cb527bf/attachment.sig>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 0/3] ARM: omap3: evm: Add OF_CONTROL support
2017-12-26 16:14 ` Tom Rini
@ 2017-12-26 17:08 ` Derald D. Woods
0 siblings, 0 replies; 15+ messages in thread
From: Derald D. Woods @ 2017-12-26 17:08 UTC (permalink / raw)
To: u-boot
On Tue, Dec 26, 2017 at 11:14:55AM -0500, Tom Rini wrote:
> On Mon, Dec 25, 2017 at 09:34:03PM -0600, Derald D. Woods wrote:
> > On Sat, Dec 16, 2017 at 02:14:47PM -0600, Derald D. Woods wrote:
> > > This series adds OF_CONTROL support for TMDSEVM{3530,3730} and
> > > additionally updates ethaddr setup with smc911x initialization.
> > >
> > > Devicetree files are taken from Linux v4.15-rc3. Note that this is the
> > > first addition of OMAP34XX devicetree files.
> > >
> > > Tested using GCC 7.2.0 [--with-float=hard --with-mode=thumb]
> > >
> > > --- 8< -----------------------------------------------------------------
> > > U-Boot SPL 2018.01-rc1-00177-g27f9740bcf (Dec 16 2017 - 13:13:10)
> > > Trying to boot from MMC1
> > > reading u-boot.img
> > > reading u-boot.img
> > >
> > >
> > > U-Boot 2018.01-rc1-00177-g27f9740bcf (Dec 16 2017 - 13:13:10 -0600)
> > >
> > > OMAP3530-GP ES3.1, CPU-OPP2, L3-165MHz, Max CPU Clock 720 MHz
> > > Model: TI OMAP35XX EVM (TMDSEVM3530)
> > > OMAP3 EVM board + LPDDR/NAND
> > > I2C: ready
> > > DRAM: 256 MiB
> > > NAND: 256 MiB
> > > MMC: OMAP SD/MMC: 0
> > > Read back SMSC id 0x92200000
> > > OMAP die ID: 265a002400000000040365fa1801b01f
> > > Net: smc911x-0
> > > starting USB...
> > > USB0: USB EHCI 1.00
> > > scanning bus 0 for devices... 1 USB Device(s) found
> > > Hit any key to stop autoboot: 0
> > > OMAP3_EVM # echo $stdin;echo $stdout;echo $stderr
> > > serial at 4806a000
> > > serial at 4806a000
> > > serial at 4806a000
> > > --- 8< -----------------------------------------------------------------
> > >
> > >
> > > Derald D. Woods (3):
> > > ARM: dts: omap3-evm: Add support for TMDSEVM{3530,3730}
> > > ARM: dts: omap3-evm: Enable DM and devicetree for TMDSEVM{3530,3730}
> > > ARM: omap3: evm: Refactor 'board_eth_init'
> > >
> > > arch/arm/dts/Makefile | 4 +
> > > arch/arm/dts/omap-gpmc-smsc911x.dtsi | 55 ++++++
> > > arch/arm/dts/omap3-evm-37xx-u-boot.dtsi | 29 ++++
> > > arch/arm/dts/omap3-evm-37xx.dts | 110 ++++++++++++
> > > arch/arm/dts/omap3-evm-common.dtsi | 195 +++++++++++++++++++++
> > > arch/arm/dts/omap3-evm-processor-common.dtsi | 216 ++++++++++++++++++++++++
> > > arch/arm/dts/omap3-evm-u-boot.dtsi | 29 ++++
> > > arch/arm/dts/omap3-evm.dts | 89 ++++++++++
> > > arch/arm/dts/omap3-panel-sharp-ls037v7dw01.dtsi | 73 ++++++++
> > > arch/arm/dts/omap34xx.dtsi | 84 +++++++++
> > > arch/arm/mach-omap2/omap3/Kconfig | 4 +
> > > board/ti/evm/evm.c | 24 +--
> > > configs/omap3_evm_defconfig | 9 +-
> > > include/configs/omap3_evm.h | 2 -
> > > 14 files changed, 896 insertions(+), 27 deletions(-)
> > > create mode 100644 arch/arm/dts/omap-gpmc-smsc911x.dtsi
> > > create mode 100644 arch/arm/dts/omap3-evm-37xx-u-boot.dtsi
> > > create mode 100644 arch/arm/dts/omap3-evm-37xx.dts
> > > create mode 100644 arch/arm/dts/omap3-evm-common.dtsi
> > > create mode 100644 arch/arm/dts/omap3-evm-processor-common.dtsi
> > > create mode 100644 arch/arm/dts/omap3-evm-u-boot.dtsi
> > > create mode 100644 arch/arm/dts/omap3-evm.dts
> > > create mode 100644 arch/arm/dts/omap3-panel-sharp-ls037v7dw01.dtsi
> > > create mode 100644 arch/arm/dts/omap34xx.dtsi
> > >
> > > --
> > > 2.15.1
> > >
> >
> > Ping. If there is any concern, please let me know and I will make
> > corrections. I plan to also update beagleboard and overo to use their
> > respective devicetree files. I would like to have these three OMAP34XX
> > boards, that I possess, to be near the same level of support. It will
> > help me to continue testing OMAP34XX stuff in general.
>
> It's localized enough that it's your call, do you want it in for
> v2018.01 or .03? Thanks!
>
I would like it to land in v2018.01 if possible.
Derald
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [U-Boot, 2/3] ARM: dts: omap3-evm: Enable DM and devicetree for TMDSEVM{3530, 3730}
2017-12-17 2:36 ` Derald D. Woods
@ 2017-12-27 13:15 ` Tom Rini
2017-12-27 15:22 ` Derald D. Woods
2017-12-27 15:37 ` [U-Boot] [PATCH v3 " Derald D. Woods
1 sibling, 1 reply; 15+ messages in thread
From: Tom Rini @ 2017-12-27 13:15 UTC (permalink / raw)
To: u-boot
On Sat, Dec 16, 2017 at 08:36:06PM -0600, Derald D. Woods wrote:
> This commit updates the configuration files needed to support OF_CONTROL
> on the OMAP3 EVM baseboard.
>
> Additionally:
> - CONFIG_SYS_THUMB_BUILD is enabled
> - CONFIG_SPL_ENV_SUPPORT is enabled
> - CONFIG_SPL_EXT_SUPPORT is enabled
>
> Tested using GCC 7.2.0 [--with-float=hard --with-mode=thumb].
>
> Signed-off-by: Derald D. Woods <woods.technical@gmail.com>
> ---
>
> v2:
> - Added CONFIG_SPL_ENV_SUPPORT and CONFIG_SPL_EXT_SUPPORT
> - Bring back bus and filesystem commands previously dropped
> - Update commit message
So, this fails for me:
https://travis-ci.org/trini/u-boot/jobs/321879321
There's two possible reasons. One, gcc 7.2.0 is doing a better job of
optimizing things down and it still fits in SRAM. Or two, I noticed
when test building this at first that CONFIG_SPL_EXT_SUPPORT was both
enabled then disabled in the defconfig, and the disable won. Given the
commit message about enabling it specifically I also dropped the disable
line from the defconfig. Perhaps there's really not room for
CONFIG_SPL_EXT_SUPPORT ?
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20171227/5f97f9bc/attachment.sig>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [U-Boot, 2/3] ARM: dts: omap3-evm: Enable DM and devicetree for TMDSEVM{3530, 3730}
2017-12-27 13:15 ` [U-Boot] [U-Boot, " Tom Rini
@ 2017-12-27 15:22 ` Derald D. Woods
0 siblings, 0 replies; 15+ messages in thread
From: Derald D. Woods @ 2017-12-27 15:22 UTC (permalink / raw)
To: u-boot
On Wed, Dec 27, 2017 at 08:15:11AM -0500, Tom Rini wrote:
> On Sat, Dec 16, 2017 at 08:36:06PM -0600, Derald D. Woods wrote:
>
> > This commit updates the configuration files needed to support OF_CONTROL
> > on the OMAP3 EVM baseboard.
> >
> > Additionally:
> > - CONFIG_SYS_THUMB_BUILD is enabled
> > - CONFIG_SPL_ENV_SUPPORT is enabled
> > - CONFIG_SPL_EXT_SUPPORT is enabled
> >
> > Tested using GCC 7.2.0 [--with-float=hard --with-mode=thumb].
> >
> > Signed-off-by: Derald D. Woods <woods.technical@gmail.com>
> > ---
> >
> > v2:
> > - Added CONFIG_SPL_ENV_SUPPORT and CONFIG_SPL_EXT_SUPPORT
> > - Bring back bus and filesystem commands previously dropped
> > - Update commit message
>
> So, this fails for me:
> https://travis-ci.org/trini/u-boot/jobs/321879321
>
> There's two possible reasons. One, gcc 7.2.0 is doing a better job of
> optimizing things down and it still fits in SRAM. Or two, I noticed
> when test building this at first that CONFIG_SPL_EXT_SUPPORT was both
> enabled then disabled in the defconfig, and the disable won. Given the
> commit message about enabling it specifically I also dropped the disable
> line from the defconfig. Perhaps there's really not room for
> CONFIG_SPL_EXT_SUPPORT ?
>
Okay. I will revert the CONFIG_SPL_EXT_SUPPORT so that the 'CI' build
works for the board. A 'V3' will be posted shortly.
Derald
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH v3 2/3] ARM: dts: omap3-evm: Enable DM and devicetree for TMDSEVM{3530, 3730}
2017-12-17 2:36 ` Derald D. Woods
2017-12-27 13:15 ` [U-Boot] [U-Boot, " Tom Rini
@ 2017-12-27 15:37 ` Derald D. Woods
2017-12-27 15:40 ` [U-Boot] [PATCH v4 " Derald D. Woods
1 sibling, 1 reply; 15+ messages in thread
From: Derald D. Woods @ 2017-12-27 15:37 UTC (permalink / raw)
To: u-boot
This commit updates the configuration files needed to support OF_CONTROL
on the OMAP3 EVM baseboard.
Additionally:
- CONFIG_SYS_THUMB_BUILD is enabled
- CONFIG_SPL_ENV_SUPPORT is enabled
- CONFIG_SPL_EXT_SUPPORT is enabled
Tested using GCC 7.2.0 [--with-float=hard --with-mode=thumb].
Signed-off-by: Derald D. Woods <woods.technical@gmail.com>
--
v3:
- Remove CONFIG_SPL_EXT_SUPPORT from default config
v2:
- Added CONFIG_SPL_ENV_SUPPORT and CONFIG_SPL_EXT_SUPPORT
- Bring back bus and filesystem commands previously dropped
- Update commit message
---
arch/arm/mach-omap2/omap3/Kconfig | 4 ++++
configs/omap3_evm_defconfig | 5 ++++-
include/configs/omap3_evm.h | 6 ------
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-omap2/omap3/Kconfig b/arch/arm/mach-omap2/omap3/Kconfig
index 4dbf9a27da..6d714f6cdb 100644
--- a/arch/arm/mach-omap2/omap3/Kconfig
+++ b/arch/arm/mach-omap2/omap3/Kconfig
@@ -61,6 +61,10 @@ config TARGET_DEVKIT8000
config TARGET_OMAP3_EVM
bool "TI OMAP3 EVM"
+ select DM
+ select DM_SERIAL
+ select DM_GPIO
+ select OMAP3_GPIO_3
config TARGET_OMAP3_IGEP00X0
bool "IGEP"
diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig
index 5103e9fd8d..d2b8d42175 100644
--- a/configs/omap3_evm_defconfig
+++ b/configs/omap3_evm_defconfig
@@ -1,16 +1,18 @@
CONFIG_ARM=y
-# CONFIG_SYS_THUMB_BUILD is not set
CONFIG_ARCH_OMAP2PLUS=y
CONFIG_SYS_TEXT_BASE=0x80100000
+CONFIG_TI_COMMON_CMD_OPTIONS=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_SYS_MPUCLK=720
CONFIG_TARGET_OMAP3_EVM=y
+CONFIG_DEFAULT_DEVICE_TREE="omap3-evm"
CONFIG_DISTRO_DEFAULTS=y
CONFIG_BOOTDELAY=3
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_DEFAULT_FDT_FILE="omap3-evm.dtb"
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
+CONFIG_SPL_ENV_SUPPORT=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
# CONFIG_SPL_EXT_SUPPORT is not set
CONFIG_SPL_MTD_SUPPORT=y
@@ -35,6 +37,7 @@ CONFIG_CMD_UBI=y
# CONFIG_ISO_PARTITION is not set
# CONFIG_EFI_PARTITION is not set
CONFIG_SPL_PARTITION_UUIDS=y
+CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_NAND=y
CONFIG_DM=y
CONFIG_SPL_DM=y
diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index 42f2153637..629d60b961 100644
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -42,8 +42,6 @@
#define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1
#if defined(CONFIG_SPL_BUILD)
#undef CONFIG_SYS_NS16550_REG_SIZE
-#else /* !CONFIG_SPL_BUILD */
-#define CONFIG_SYS_NS16550_REG_SIZE (-1)
#endif /* CONFIG_SPL_BUILD */
/* NAND */
@@ -86,8 +84,6 @@
/* Environment */
#define CONFIG_PREBOOT "usb start"
-#if !defined(CONFIG_SPL_BUILD)
-
#include <config_distro_defaults.h>
#define MEM_LAYOUT_ENV_SETTINGS \
@@ -181,6 +177,4 @@
"bootm ${loadaddr} - ${fdtaddr}\0" \
BOOTENV
-#endif /* !CONFIG_SPL_BUILD */
-
#endif /* __CONFIG_H */
--
2.15.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH v4 2/3] ARM: dts: omap3-evm: Enable DM and devicetree for TMDSEVM{3530, 3730}
2017-12-27 15:37 ` [U-Boot] [PATCH v3 " Derald D. Woods
@ 2017-12-27 15:40 ` Derald D. Woods
2018-01-02 0:47 ` [U-Boot] [U-Boot, v4, " Tom Rini
0 siblings, 1 reply; 15+ messages in thread
From: Derald D. Woods @ 2017-12-27 15:40 UTC (permalink / raw)
To: u-boot
This commit updates the configuration files needed to support OF_CONTROL
on the OMAP3 EVM baseboard.
Additionally:
- CONFIG_SYS_THUMB_BUILD is enabled
- CONFIG_SPL_ENV_SUPPORT is enabled
Tested using GCC 7.2.0 [--with-float=hard --with-mode=thumb].
Signed-off-by: Derald D. Woods <woods.technical@gmail.com>
--
v4:
- Fix commit message
v3:
- Remove CONFIG_SPL_EXT_SUPPORT from default config
v2:
- Added CONFIG_SPL_ENV_SUPPORT and CONFIG_SPL_EXT_SUPPORT
- Bring back bus and filesystem commands previously dropped
- Update commit message
---
arch/arm/mach-omap2/omap3/Kconfig | 4 ++++
configs/omap3_evm_defconfig | 5 ++++-
include/configs/omap3_evm.h | 6 ------
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-omap2/omap3/Kconfig b/arch/arm/mach-omap2/omap3/Kconfig
index 4dbf9a27da..6d714f6cdb 100644
--- a/arch/arm/mach-omap2/omap3/Kconfig
+++ b/arch/arm/mach-omap2/omap3/Kconfig
@@ -61,6 +61,10 @@ config TARGET_DEVKIT8000
config TARGET_OMAP3_EVM
bool "TI OMAP3 EVM"
+ select DM
+ select DM_SERIAL
+ select DM_GPIO
+ select OMAP3_GPIO_3
config TARGET_OMAP3_IGEP00X0
bool "IGEP"
diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig
index 5103e9fd8d..d2b8d42175 100644
--- a/configs/omap3_evm_defconfig
+++ b/configs/omap3_evm_defconfig
@@ -1,16 +1,18 @@
CONFIG_ARM=y
-# CONFIG_SYS_THUMB_BUILD is not set
CONFIG_ARCH_OMAP2PLUS=y
CONFIG_SYS_TEXT_BASE=0x80100000
+CONFIG_TI_COMMON_CMD_OPTIONS=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_SYS_MPUCLK=720
CONFIG_TARGET_OMAP3_EVM=y
+CONFIG_DEFAULT_DEVICE_TREE="omap3-evm"
CONFIG_DISTRO_DEFAULTS=y
CONFIG_BOOTDELAY=3
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_DEFAULT_FDT_FILE="omap3-evm.dtb"
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
+CONFIG_SPL_ENV_SUPPORT=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
# CONFIG_SPL_EXT_SUPPORT is not set
CONFIG_SPL_MTD_SUPPORT=y
@@ -35,6 +37,7 @@ CONFIG_CMD_UBI=y
# CONFIG_ISO_PARTITION is not set
# CONFIG_EFI_PARTITION is not set
CONFIG_SPL_PARTITION_UUIDS=y
+CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_NAND=y
CONFIG_DM=y
CONFIG_SPL_DM=y
diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index 42f2153637..629d60b961 100644
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -42,8 +42,6 @@
#define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1
#if defined(CONFIG_SPL_BUILD)
#undef CONFIG_SYS_NS16550_REG_SIZE
-#else /* !CONFIG_SPL_BUILD */
-#define CONFIG_SYS_NS16550_REG_SIZE (-1)
#endif /* CONFIG_SPL_BUILD */
/* NAND */
@@ -86,8 +84,6 @@
/* Environment */
#define CONFIG_PREBOOT "usb start"
-#if !defined(CONFIG_SPL_BUILD)
-
#include <config_distro_defaults.h>
#define MEM_LAYOUT_ENV_SETTINGS \
@@ -181,6 +177,4 @@
"bootm ${loadaddr} - ${fdtaddr}\0" \
BOOTENV
-#endif /* !CONFIG_SPL_BUILD */
-
#endif /* __CONFIG_H */
--
2.15.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [U-Boot] [U-Boot, 1/3] ARM: dts: omap3-evm: Add support for TMDSEVM{3530, 3730}
2017-12-16 20:14 ` [U-Boot] [PATCH 1/3] ARM: dts: omap3-evm: Add support for TMDSEVM{3530, 3730} Derald D. Woods
@ 2018-01-02 0:47 ` Tom Rini
0 siblings, 0 replies; 15+ messages in thread
From: Tom Rini @ 2018-01-02 0:47 UTC (permalink / raw)
To: u-boot
On Sat, Dec 16, 2017 at 02:14:48PM -0600, Derald D. Woods wrote:
> This commit adds OMAP3 EVM devicetree files from Linux v4.15-rc3. Note
> that this is the first addition of OMAP34XX devicetree files.
>
> Signed-off-by: Derald D. Woods <woods.technical@gmail.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180101/001d6425/attachment.sig>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [U-Boot, 3/3] ARM: omap3: evm: Refactor 'board_eth_init'
2017-12-16 20:14 ` [U-Boot] [PATCH 3/3] ARM: omap3: evm: Refactor 'board_eth_init' Derald D. Woods
@ 2018-01-02 0:47 ` Tom Rini
0 siblings, 0 replies; 15+ messages in thread
From: Tom Rini @ 2018-01-02 0:47 UTC (permalink / raw)
To: u-boot
On Sat, Dec 16, 2017 at 02:14:50PM -0600, Derald D. Woods wrote:
> This commit clears 'ethaddr' before calling 'smc911x_initialize' to
> allow the SROM MAC address to be assigned properly.
>
> Signed-off-by: Derald D. Woods <woods.technical@gmail.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180101/f786eba4/attachment.sig>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [U-Boot, v4, 2/3] ARM: dts: omap3-evm: Enable DM and devicetree for TMDSEVM{3530, 3730}
2017-12-27 15:40 ` [U-Boot] [PATCH v4 " Derald D. Woods
@ 2018-01-02 0:47 ` Tom Rini
0 siblings, 0 replies; 15+ messages in thread
From: Tom Rini @ 2018-01-02 0:47 UTC (permalink / raw)
To: u-boot
On Wed, Dec 27, 2017 at 09:40:16AM -0600, Derald D. Woods wrote:
> This commit updates the configuration files needed to support OF_CONTROL
> on the OMAP3 EVM baseboard.
>
> Additionally:
> - CONFIG_SYS_THUMB_BUILD is enabled
> - CONFIG_SPL_ENV_SUPPORT is enabled
>
> Tested using GCC 7.2.0 [--with-float=hard --with-mode=thumb].
>
> Signed-off-by: Derald D. Woods <woods.technical@gmail.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180101/05e7d224/attachment.sig>
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2018-01-02 0:47 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-16 20:14 [U-Boot] [PATCH 0/3] ARM: omap3: evm: Add OF_CONTROL support Derald D. Woods
2017-12-16 20:14 ` [U-Boot] [PATCH 1/3] ARM: dts: omap3-evm: Add support for TMDSEVM{3530, 3730} Derald D. Woods
2018-01-02 0:47 ` [U-Boot] [U-Boot, " Tom Rini
2017-12-16 20:14 ` [U-Boot] [PATCH 2/3] ARM: dts: omap3-evm: Enable DM and devicetree " Derald D. Woods
2017-12-17 2:36 ` Derald D. Woods
2017-12-27 13:15 ` [U-Boot] [U-Boot, " Tom Rini
2017-12-27 15:22 ` Derald D. Woods
2017-12-27 15:37 ` [U-Boot] [PATCH v3 " Derald D. Woods
2017-12-27 15:40 ` [U-Boot] [PATCH v4 " Derald D. Woods
2018-01-02 0:47 ` [U-Boot] [U-Boot, v4, " Tom Rini
2017-12-16 20:14 ` [U-Boot] [PATCH 3/3] ARM: omap3: evm: Refactor 'board_eth_init' Derald D. Woods
2018-01-02 0:47 ` [U-Boot] [U-Boot, " Tom Rini
2017-12-26 3:34 ` [U-Boot] [PATCH 0/3] ARM: omap3: evm: Add OF_CONTROL support Derald D. Woods
2017-12-26 16:14 ` Tom Rini
2017-12-26 17:08 ` Derald D. Woods
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).