* [U-Boot] [PATCH V2 0/7] ARM: imx: Update Novena to DM/DT
@ 2019-05-17 18:32 Marek Vasut
2019-05-17 18:32 ` [U-Boot] [PATCH V2 1/7] ARM: dts: imx: novena: Import Novena DT from Linux Marek Vasut
` (7 more replies)
0 siblings, 8 replies; 26+ messages in thread
From: Marek Vasut @ 2019-05-17 18:32 UTC (permalink / raw)
To: u-boot
Update Kosagi Novena to DM / DT and remove the warnings.
This depends on the following patches / series:
https://patchwork.ozlabs.org/patch/1095618/
https://patchwork.ozlabs.org/patch/1101171/
https://patchwork.ozlabs.org/project/uboot/list/?series=108463
Marek Vasut (7):
ARM: dts: imx: novena: Import Novena DT from Linux
ARM: imx: novena: Enable DM pin control
ARM: imx: novena: Enable DM GPIO
ARM: imx: novena: Convert block devices to DM
ARM: imx: novena: Enable DM USB
ARM: imx: novena: Enable DM PCI
ARM: imx: novena: Convert to DM VIDEO
arch/arm/dts/Makefile | 3 +-
arch/arm/dts/imx6q-novena.dts | 797 ++++++++++++++++++++++++++++++++++
board/kosagi/novena/novena.c | 77 +---
board/kosagi/novena/video.c | 3 +
configs/novena_defconfig | 18 +-
include/configs/novena.h | 9 +-
6 files changed, 838 insertions(+), 69 deletions(-)
create mode 100644 arch/arm/dts/imx6q-novena.dts
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Vagrant Cascadian <vagrant@debian.org>
--
2.20.1
^ permalink raw reply [flat|nested] 26+ messages in thread* [U-Boot] [PATCH V2 1/7] ARM: dts: imx: novena: Import Novena DT from Linux 2019-05-17 18:32 [U-Boot] [PATCH V2 0/7] ARM: imx: Update Novena to DM/DT Marek Vasut @ 2019-05-17 18:32 ` Marek Vasut 2019-06-10 9:59 ` [U-Boot] [PATCH V2 1/7] ARM: dts: imx: novena: Import Novena DT sbabic at denx.de 2019-05-17 18:32 ` [U-Boot] [PATCH V2 2/7] ARM: imx: novena: Enable DM pin control Marek Vasut ` (6 subsequent siblings) 7 siblings, 1 reply; 26+ messages in thread From: Marek Vasut @ 2019-05-17 18:32 UTC (permalink / raw) To: u-boot Import iMX6Q Novena device tree from Linux 5.1-rc7 37624b58542f . Enable DT control in full U-Boot . Signed-off-by: Marek Vasut <marex@denx.de> Cc: Fabio Estevam <fabio.estevam@nxp.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Vagrant Cascadian <vagrant@debian.org> --- V2: No change --- arch/arm/dts/Makefile | 3 +- arch/arm/dts/imx6q-novena.dts | 792 ++++++++++++++++++++++++++++++++++ configs/novena_defconfig | 3 +- 3 files changed, 796 insertions(+), 2 deletions(-) create mode 100644 arch/arm/dts/imx6q-novena.dts diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 0ec7bc987d..dad47144e7 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -535,7 +535,8 @@ dtb-$(CONFIG_MX53) += imx53-cx9020.dtb \ dtb-$(CONFIG_MX6Q) += \ imx6-apalis.dtb \ imx6q-display5.dtb \ - imx6q-logicpd.dtb + imx6q-logicpd.dtb \ + imx6q-novena.dtb dtb-$(CONFIG_TARGET_TBS2910) += \ imx6q-tbs2910.dtb diff --git a/arch/arm/dts/imx6q-novena.dts b/arch/arm/dts/imx6q-novena.dts new file mode 100644 index 0000000000..61347a545d --- /dev/null +++ b/arch/arm/dts/imx6q-novena.dts @@ -0,0 +1,792 @@ +/* + * Copyright 2015 Sutajio Ko-Usagi PTE LTD + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This file is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this file; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301 USA + * + * Or, alternatively, + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * 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. + * + */ + +/dts-v1/; +#include "imx6q.dtsi" +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> + +/ { + model = "Kosagi Novena Dual/Quad"; + compatible = "kosagi,imx6q-novena", "fsl,imx6q"; + + /* Will be filled by the bootloader */ + memory at 10000000 { + device_type = "memory"; + reg = <0x10000000 0>; + }; + + chosen { + stdout-path = &uart2; + }; + + backlight: backlight { + compatible = "pwm-backlight"; + pwms = <&pwm1 0 10000000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_backlight_novena>; + power-supply = <®_lvds_lcd>; + brightness-levels = <0 3 6 12 16 24 32 48 64 96 128 192 255>; + default-brightness-level = <12>; + }; + + gpio-keys { + compatible = "gpio-keys"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpio_keys_novena>; + + user-button { + label = "User Button"; + gpios = <&gpio4 14 GPIO_ACTIVE_LOW>; + linux,code = <KEY_POWER>; + }; + + lid { + label = "Lid"; + gpios = <&gpio4 12 GPIO_ACTIVE_LOW>; + linux,input-type = <5>; /* EV_SW */ + linux,code = <0>; /* SW_LID */ + }; + }; + + leds { + compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_leds_novena>; + + heartbeat { + label = "novena:white:panel"; + gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "default-on"; + }; + }; + + panel: panel { + compatible = "innolux,n133hse-ea1", "simple-panel"; + backlight = <&backlight>; + }; + + reg_2p5v: regulator-2p5v { + compatible = "regulator-fixed"; + regulator-name = "2P5V"; + regulator-min-microvolt = <2500000>; + regulator-max-microvolt = <2500000>; + regulator-always-on; + }; + + reg_3p3v: regulator-3p3v { + compatible = "regulator-fixed"; + regulator-name = "3P3V"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + reg_audio_codec: regulator-audio-codec { + compatible = "regulator-fixed"; + regulator-name = "es8328-power"; + regulator-boot-on; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + startup-delay-us = <400000>; + gpio = <&gpio5 17 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + + reg_display: regulator-display { + compatible = "regulator-fixed"; + regulator-name = "lcd-display-power"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + startup-delay-us = <200000>; + gpio = <&gpio5 28 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + + reg_lvds_lcd: regulator-lvds-lcd { + compatible = "regulator-fixed"; + regulator-name = "lcd-lvds-power"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + gpio = <&gpio4 15 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + + reg_pcie: regulator-pcie { + compatible = "regulator-fixed"; + regulator-name = "pcie-bus-power"; + regulator-min-microvolt = <1500000>; + regulator-max-microvolt = <1500000>; + gpio = <&gpio7 12 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + + reg_sata: regulator-sata { + compatible = "regulator-fixed"; + regulator-name = "sata-power"; + regulator-boot-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + startup-delay-us = <10000>; + gpio = <&gpio3 30 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + + reg_usb_otg_vbus: regulator-usb-otg-vbus { + compatible = "regulator-fixed"; + regulator-name = "usb_otg_vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + enable-active-high; + }; + + sound { + compatible = "fsl,imx-audio-es8328"; + model = "imx-audio-es8328"; + ssi-controller = <&ssi1>; + audio-codec = <&codec>; + audio-amp-supply = <®_audio_codec>; + jack-gpio = <&gpio5 15 GPIO_ACTIVE_HIGH>; + audio-routing = + "Speaker", "LOUT2", + "Speaker", "ROUT2", + "Speaker", "audio-amp", + "Headphone", "ROUT1", + "Headphone", "LOUT1", + "LINPUT1", "Mic Jack", + "RINPUT1", "Mic Jack", + "Mic Jack", "Mic Bias"; + mux-int-port = <0x1>; + mux-ext-port = <0x3>; + }; +}; + +&audmux { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_audmux_novena>; + status = "okay"; +}; + +&ecspi3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ecspi3_novena>; + status = "okay"; +}; + +&fec { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_enet_novena>; + phy-mode = "rgmii"; + phy-reset-gpios = <&gpio3 23 GPIO_ACTIVE_LOW>; + rxc-skew-ps = <3000>; + rxdv-skew-ps = <0>; + txc-skew-ps = <3000>; + txen-skew-ps = <0>; + rxd0-skew-ps = <0>; + rxd1-skew-ps = <0>; + rxd2-skew-ps = <0>; + rxd3-skew-ps = <0>; + txd0-skew-ps = <3000>; + txd1-skew-ps = <3000>; + txd2-skew-ps = <3000>; + txd3-skew-ps = <3000>; + status = "okay"; +}; + +&hdmi { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hdmi_novena>; + ddc-i2c-bus = <&i2c2>; + status = "okay"; +}; + +&i2c1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c1_novena>; + status = "okay"; + + accel: mma8452 at 1c { + compatible = "fsl,mma8452"; + reg = <0x1c>; + }; + + rtc: pcf8523 at 68 { + compatible = "nxp,pcf8523"; + reg = <0x68>; + }; + + sbs_battery: bq20z75 at b { + compatible = "sbs,sbs-battery"; + reg = <0x0b>; + sbs,i2c-retry-count = <50>; + }; + + touch: stmpe811 at 44 { + compatible = "st,stmpe811"; + reg = <0x44>; + irq-gpio = <&gpio5 13 GPIO_ACTIVE_HIGH>; + id = <0>; + blocks = <0x5>; + irq-trigger = <0x1>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_stmpe_novena>; + vio-supply = <®_3p3v>; + vcc-supply = <®_3p3v>; + + stmpe_touchscreen { + compatible = "st,stmpe-ts"; + st,sample-time = <4>; + st,mod-12b = <1>; + st,ref-sel = <0>; + st,adc-freq = <1>; + st,ave-ctrl = <1>; + st,touch-det-delay = <2>; + st,settling = <2>; + st,fraction-z = <7>; + st,i-drive = <1>; + }; + }; +}; + +&i2c2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c2_novena>; + status = "okay"; + + pmic: pfuze100 at 8 { + compatible = "fsl,pfuze100"; + reg = <0x08>; + + regulators { + reg_sw1a: sw1a { + regulator-min-microvolt = <300000>; + regulator-max-microvolt = <1875000>; + regulator-boot-on; + regulator-always-on; + regulator-ramp-delay = <6250>; + }; + + reg_sw1c: sw1c { + regulator-min-microvolt = <300000>; + regulator-max-microvolt = <1875000>; + regulator-boot-on; + regulator-always-on; + }; + + reg_sw2: sw2 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + regulator-always-on; + }; + + reg_sw3a: sw3a { + regulator-min-microvolt = <400000>; + regulator-max-microvolt = <1975000>; + regulator-boot-on; + regulator-always-on; + }; + + reg_sw3b: sw3b { + regulator-min-microvolt = <400000>; + regulator-max-microvolt = <1975000>; + regulator-boot-on; + regulator-always-on; + }; + + reg_sw4: sw4 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <3300000>; + }; + + reg_swbst: swbst { + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5150000>; + regulator-boot-on; + }; + + reg_snvs: vsnvs { + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <3000000>; + regulator-boot-on; + regulator-always-on; + }; + + reg_vref: vrefddr { + regulator-boot-on; + regulator-always-on; + }; + + reg_vgen1: vgen1 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <1550000>; + }; + + reg_vgen2: vgen2 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <1550000>; + }; + + reg_vgen3: vgen3 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + }; + + reg_vgen4: vgen4 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + reg_vgen5: vgen5 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + reg_vgen6: vgen6 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + }; + }; +}; + +&i2c3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c3_novena>; + status = "okay"; + + codec: es8328 at 11 { + compatible = "everest,es8328"; + reg = <0x11>; + DVDD-supply = <®_audio_codec>; + AVDD-supply = <®_audio_codec>; + PVDD-supply = <®_audio_codec>; + HPVDD-supply = <®_audio_codec>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sound_novena>; + clocks = <&clks IMX6QDL_CLK_CKO1>; + assigned-clocks = <&clks IMX6QDL_CLK_CKO>, + <&clks IMX6QDL_CLK_CKO1_SEL>, + <&clks IMX6QDL_CLK_PLL4_AUDIO>, + <&clks IMX6QDL_CLK_CKO1>; + assigned-clock-parents = <&clks IMX6QDL_CLK_CKO1>, + <&clks IMX6QDL_CLK_PLL4_AUDIO_DIV>, + <&clks IMX6QDL_CLK_OSC>, + <&clks IMX6QDL_CLK_CKO1_PODF>; + assigned-clock-rates = <0 0 722534400 22579200>; + }; +}; + +&kpp { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_kpp_novena>; + linux,keymap = < + MATRIX_KEY(1, 1, KEY_CONFIG) + >; + status = "okay"; +}; + +&ldb { + fsl,dual-channel; + status = "okay"; + + lvds-channel at 0 { + fsl,data-mapping = "jeida"; + fsl,data-width = <24>; + fsl,panel = <&panel>; + status = "okay"; + }; +}; + +&pcie { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pcie_novena>; + reset-gpio = <&gpio3 29 GPIO_ACTIVE_LOW>; + vpcie-supply = <®_pcie>; + status = "okay"; +}; + +&pwm1 { + status = "okay"; +}; + +&sata { + target-supply = <®_sata>; + fsl,transmit-level-mV = <1025>; + fsl,transmit-boost-mdB = <0>; + fsl,transmit-atten-16ths = <8>; + status = "okay"; +}; + +&ssi1 { + status = "okay"; +}; + +&uart2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart2_novena>; + status = "okay"; +}; + +&uart3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart3_novena>; + status = "okay"; +}; + +&uart4 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart4_novena>; + status = "okay"; +}; + +&usbotg { + vbus-supply = <®_usb_otg_vbus>; + dr_mode = "otg"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usbotg_novena>; + disable-over-current; + status = "okay"; +}; + +&usbh1 { + vbus-supply = <®_swbst>; + status = "okay"; +}; + +&usdhc2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc2_novena>; + cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; + wp-gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; + bus-width = <4>; + status = "okay"; +}; + +&usdhc3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc3_novena>; + bus-width = <4>; + non-removable; + status = "okay"; +}; + +&iomuxc { + pinctrl_audmux_novena: audmuxgrp-novena { + fsl,pins = < + MX6QDL_PAD_CSI0_DAT7__AUD3_RXD 0x130b0 + MX6QDL_PAD_CSI0_DAT4__AUD3_TXC 0x130b0 + MX6QDL_PAD_CSI0_DAT5__AUD3_TXD 0x110b0 + MX6QDL_PAD_CSI0_DAT6__AUD3_TXFS 0x130b0 + >; + }; + + pinctrl_backlight_novena: backlightgrp-novena { + fsl,pins = < + MX6QDL_PAD_DISP0_DAT8__PWM1_OUT 0x1b0b0 + MX6QDL_PAD_CSI0_DAT10__GPIO5_IO28 0x1b0b1 + MX6QDL_PAD_KEY_ROW4__GPIO4_IO15 0x1b0b1 + >; + }; + + pinctrl_ecspi3_novena: ecspi3grp-novena { + fsl,pins = < + MX6QDL_PAD_DISP0_DAT2__ECSPI3_MISO 0x100b1 + MX6QDL_PAD_DISP0_DAT1__ECSPI3_MOSI 0x100b1 + MX6QDL_PAD_DISP0_DAT0__ECSPI3_SCLK 0x100b1 + >; + }; + + pinctrl_enet_novena: enetgrp-novena { + fsl,pins = < + MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0 + MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0 + MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b020 + MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b028 + MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b028 + MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b028 + MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b028 + MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b028 + MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0 + MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b030 + MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b030 + MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b030 + MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b030 + MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b030 + MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b030 + MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8 + /* Ethernet reset */ + MX6QDL_PAD_EIM_D23__GPIO3_IO23 0x1b0b1 + >; + }; + + pinctrl_fpga_gpio: fpgagpiogrp-novena { + fsl,pins = < + /* FPGA power */ + MX6QDL_PAD_SD1_DAT1__GPIO1_IO17 0x1b0b1 + /* Reset */ + MX6QDL_PAD_DISP0_DAT13__GPIO5_IO07 0x1b0b1 + /* FPGA GPIOs */ + MX6QDL_PAD_EIM_DA0__GPIO3_IO00 0x1b0b1 + MX6QDL_PAD_EIM_DA1__GPIO3_IO01 0x1b0b1 + MX6QDL_PAD_EIM_DA2__GPIO3_IO02 0x1b0b1 + MX6QDL_PAD_EIM_DA3__GPIO3_IO03 0x1b0b1 + MX6QDL_PAD_EIM_DA4__GPIO3_IO04 0x1b0b1 + MX6QDL_PAD_EIM_DA5__GPIO3_IO05 0x1b0b1 + MX6QDL_PAD_EIM_DA6__GPIO3_IO06 0x1b0b1 + MX6QDL_PAD_EIM_DA7__GPIO3_IO07 0x1b0b1 + MX6QDL_PAD_EIM_DA8__GPIO3_IO08 0x1b0b1 + MX6QDL_PAD_EIM_DA9__GPIO3_IO09 0x1b0b1 + MX6QDL_PAD_EIM_DA10__GPIO3_IO10 0x1b0b1 + MX6QDL_PAD_EIM_DA11__GPIO3_IO11 0x1b0b1 + MX6QDL_PAD_EIM_DA12__GPIO3_IO12 0x1b0b1 + MX6QDL_PAD_EIM_DA13__GPIO3_IO13 0x1b0b1 + MX6QDL_PAD_EIM_DA14__GPIO3_IO14 0x1b0b1 + MX6QDL_PAD_EIM_DA15__GPIO3_IO15 0x1b0b1 + MX6QDL_PAD_EIM_A16__GPIO2_IO22 0x1b0b1 + MX6QDL_PAD_EIM_A17__GPIO2_IO21 0x1b0b1 + MX6QDL_PAD_EIM_A18__GPIO2_IO20 0x1b0b1 + MX6QDL_PAD_EIM_CS0__GPIO2_IO23 0x1b0b1 + MX6QDL_PAD_EIM_CS1__GPIO2_IO24 0x1b0b1 + MX6QDL_PAD_EIM_LBA__GPIO2_IO27 0x1b0b1 + MX6QDL_PAD_EIM_OE__GPIO2_IO25 0x1b0b1 + MX6QDL_PAD_EIM_RW__GPIO2_IO26 0x1b0b1 + MX6QDL_PAD_EIM_WAIT__GPIO5_IO00 0x1b0b1 + MX6QDL_PAD_EIM_BCLK__GPIO6_IO31 0x1b0b1 + >; + }; + + pinctrl_fpga_eim: fpgaeimgrp-novena { + fsl,pins = < + /* FPGA power */ + MX6QDL_PAD_SD1_DAT1__GPIO1_IO17 0x1b0b1 + /* Reset */ + MX6QDL_PAD_DISP0_DAT13__GPIO5_IO07 0x1b0b1 + /* FPGA GPIOs */ + MX6QDL_PAD_EIM_DA0__EIM_AD00 0xb0f1 + MX6QDL_PAD_EIM_DA1__EIM_AD01 0xb0f1 + MX6QDL_PAD_EIM_DA2__EIM_AD02 0xb0f1 + MX6QDL_PAD_EIM_DA3__EIM_AD03 0xb0f1 + MX6QDL_PAD_EIM_DA4__EIM_AD04 0xb0f1 + MX6QDL_PAD_EIM_DA5__EIM_AD05 0xb0f1 + MX6QDL_PAD_EIM_DA6__EIM_AD06 0xb0f1 + MX6QDL_PAD_EIM_DA7__EIM_AD07 0xb0f1 + MX6QDL_PAD_EIM_DA8__EIM_AD08 0xb0f1 + MX6QDL_PAD_EIM_DA9__EIM_AD09 0xb0f1 + MX6QDL_PAD_EIM_DA10__EIM_AD10 0xb0f1 + MX6QDL_PAD_EIM_DA11__EIM_AD11 0xb0f1 + MX6QDL_PAD_EIM_DA12__EIM_AD12 0xb0f1 + MX6QDL_PAD_EIM_DA13__EIM_AD13 0xb0f1 + MX6QDL_PAD_EIM_DA14__EIM_AD14 0xb0f1 + MX6QDL_PAD_EIM_DA15__EIM_AD15 0xb0f1 + MX6QDL_PAD_EIM_A16__EIM_ADDR16 0xb0f1 + MX6QDL_PAD_EIM_A17__EIM_ADDR17 0xb0f1 + MX6QDL_PAD_EIM_A18__EIM_ADDR18 0xb0f1 + MX6QDL_PAD_EIM_CS0__EIM_CS0_B 0xb0f1 + MX6QDL_PAD_EIM_CS1__EIM_CS1_B 0xb0f1 + MX6QDL_PAD_EIM_LBA__EIM_LBA_B 0xb0f1 + MX6QDL_PAD_EIM_OE__EIM_OE_B 0xb0f1 + MX6QDL_PAD_EIM_RW__EIM_RW 0xb0f1 + MX6QDL_PAD_EIM_WAIT__EIM_WAIT_B 0xb0f1 + MX6QDL_PAD_EIM_BCLK__EIM_BCLK 0xb0f1 + >; + }; + + pinctrl_gpio_keys_novena: gpiokeysgrp-novena { + fsl,pins = < + /* User button */ + MX6QDL_PAD_KEY_COL4__GPIO4_IO14 0x1b0b0 + /* PCIe Wakeup */ + MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1f0e0 + /* Lid switch */ + MX6QDL_PAD_KEY_COL3__GPIO4_IO12 0x1b0b0 + >; + }; + + pinctrl_hdmi_novena: hdmigrp-novena { + fsl,pins = < + MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE 0x1f8b0 + MX6QDL_PAD_EIM_A24__GPIO5_IO04 0x1b0b1 + >; + }; + + pinctrl_i2c1_novena: i2c1grp-novena { + fsl,pins = < + MX6QDL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1 + MX6QDL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1 + >; + }; + + pinctrl_i2c2_novena: i2c2grp-novena { + fsl,pins = < + MX6QDL_PAD_EIM_EB2__I2C2_SCL 0x4001b8b1 + MX6QDL_PAD_EIM_D16__I2C2_SDA 0x4001b8b1 + >; + }; + + pinctrl_i2c3_novena: i2c3grp-novena { + fsl,pins = < + MX6QDL_PAD_EIM_D17__I2C3_SCL 0x4001b8b1 + MX6QDL_PAD_EIM_D18__I2C3_SDA 0x4001b8b1 + >; + }; + + pinctrl_kpp_novena: kppgrp-novena { + fsl,pins = < + /* Front panel button */ + MX6QDL_PAD_KEY_ROW1__KEY_ROW1 0x1b0b1 + /* Fake column driver, not connected */ + MX6QDL_PAD_KEY_COL1__KEY_COL1 0x1b0b1 + >; + }; + + pinctrl_leds_novena: ledsgrp-novena { + fsl,pins = < + MX6QDL_PAD_SD1_DAT3__GPIO1_IO21 0x1b0b1 + >; + }; + + pinctrl_pcie_novena: pciegrp-novena { + fsl,pins = < + /* Reset */ + MX6QDL_PAD_EIM_D29__GPIO3_IO29 0x1b0b1 + /* Power On */ + MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x1b0b1 + /* Wifi kill */ + MX6QDL_PAD_EIM_A22__GPIO2_IO16 0x1b0b1 + >; + }; + + pinctrl_sata_novena: satagrp-novena { + fsl,pins = < + MX6QDL_PAD_EIM_D30__GPIO3_IO30 0x1b0b1 + >; + }; + + pinctrl_senoko_novena: senokogrp-novena { + fsl,pins = < + /* Senoko IRQ line */ + MX6QDL_PAD_SD1_CLK__GPIO1_IO20 0x13048 + /* Senoko reset line */ + MX6QDL_PAD_CSI0_VSYNC__GPIO5_IO21 0x1b0b1 + >; + }; + + pinctrl_sound_novena: soundgrp-novena { + fsl,pins = < + /* Audio power regulator */ + MX6QDL_PAD_DISP0_DAT23__GPIO5_IO17 0x1b0b1 + /* Headphone plug */ + MX6QDL_PAD_DISP0_DAT21__GPIO5_IO15 0x1b0b1 + MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x000b0 + >; + }; + + pinctrl_stmpe_novena: stmpegrp-novena { + fsl,pins = < + /* Touchscreen interrupt */ + MX6QDL_PAD_DISP0_DAT19__GPIO5_IO13 0x1b0b1 + >; + }; + + pinctrl_uart2_novena: uart2grp-novena { + fsl,pins = < + MX6QDL_PAD_EIM_D26__UART2_TX_DATA 0x1b0b1 + MX6QDL_PAD_EIM_D27__UART2_RX_DATA 0x1b0b1 + >; + }; + + pinctrl_uart3_novena: uart3grp-novena { + fsl,pins = < + MX6QDL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1 + MX6QDL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1 + >; + }; + + pinctrl_uart4_novena: uart4grp-novena { + fsl,pins = < + MX6QDL_PAD_CSI0_DAT12__UART4_TX_DATA 0x1b0b1 + MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1 + >; + }; + + pinctrl_usbotg_novena: usbotggrp-novena { + fsl,pins = < + MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059 + >; + }; + + pinctrl_usdhc2_novena: usdhc2grp-novena { + fsl,pins = < + MX6QDL_PAD_SD2_CMD__SD2_CMD 0x170f9 + MX6QDL_PAD_SD2_CLK__SD2_CLK 0x100f9 + MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x170f9 + MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x170f9 + MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x170f9 + MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x170f9 + /* Write protect */ + MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x1b0b1 + /* Card detect */ + MX6QDL_PAD_GPIO_4__GPIO1_IO04 0x1b0b1 + >; + }; + + pinctrl_usdhc3_novena: usdhc3grp-novena { + fsl,pins = < + MX6QDL_PAD_SD3_CMD__SD3_CMD 0x170f9 + MX6QDL_PAD_SD3_CLK__SD3_CLK 0x100f9 + MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x170f9 + MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x170f9 + MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x170f9 + MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x170f9 + >; + }; +}; diff --git a/configs/novena_defconfig b/configs/novena_defconfig index 340e1cd91c..04c944c6d8 100644 --- a/configs/novena_defconfig +++ b/configs/novena_defconfig @@ -40,6 +40,8 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_PARTITION_UUIDS is not set +CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="imx6q-novena" CONFIG_ENV_IS_IN_MMC=y CONFIG_DWC_AHSATA=y CONFIG_FSL_ESDHC=y @@ -62,4 +64,3 @@ CONFIG_VIDEO_IPUV3=y CONFIG_VIDEO=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_FAT_WRITE=y -CONFIG_OF_LIBFDT=y -- 2.20.1 ^ permalink raw reply related [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH V2 1/7] ARM: dts: imx: novena: Import Novena DT 2019-05-17 18:32 ` [U-Boot] [PATCH V2 1/7] ARM: dts: imx: novena: Import Novena DT from Linux Marek Vasut @ 2019-06-10 9:59 ` sbabic at denx.de 0 siblings, 0 replies; 26+ messages in thread From: sbabic at denx.de @ 2019-06-10 9:59 UTC (permalink / raw) To: u-boot > Import iMX6Q Novena device tree from Linux 5.1-rc7 37624b58542f . > Enable DT control in full U-Boot . > Signed-off-by: Marek Vasut <marex@denx.de> > Cc: Fabio Estevam <fabio.estevam@nxp.com> > Cc: Stefano Babic <sbabic@denx.de> > Cc: Vagrant Cascadian <vagrant@debian.org> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de ===================================================================== ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH V2 2/7] ARM: imx: novena: Enable DM pin control 2019-05-17 18:32 [U-Boot] [PATCH V2 0/7] ARM: imx: Update Novena to DM/DT Marek Vasut 2019-05-17 18:32 ` [U-Boot] [PATCH V2 1/7] ARM: dts: imx: novena: Import Novena DT from Linux Marek Vasut @ 2019-05-17 18:32 ` Marek Vasut 2019-06-10 9:49 ` sbabic at denx.de 2019-05-17 18:32 ` [U-Boot] [PATCH V2 3/7] ARM: imx: novena: Enable DM GPIO Marek Vasut ` (5 subsequent siblings) 7 siblings, 1 reply; 26+ messages in thread From: Marek Vasut @ 2019-05-17 18:32 UTC (permalink / raw) To: u-boot Enable DM pin control support on iMX6Q Novena. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Fabio Estevam <fabio.estevam@nxp.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Vagrant Cascadian <vagrant@debian.org> --- V2: No change --- configs/novena_defconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configs/novena_defconfig b/configs/novena_defconfig index 04c944c6d8..31a32da0dc 100644 --- a/configs/novena_defconfig +++ b/configs/novena_defconfig @@ -14,6 +14,7 @@ CONFIG_SPL_FS_FAT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_CMD_HDMIDETECT=y CONFIG_DISTRO_DEFAULTS=y +# CONFIG_SYS_MALLOC_F is not set CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q" CONFIG_USE_BOOTARGS=y @@ -29,6 +30,7 @@ CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_CMD_ASKENV=y CONFIG_CMD_EEPROM=y +CONFIG_CMD_DM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y @@ -43,6 +45,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-novena" CONFIG_ENV_IS_IN_MMC=y +CONFIG_DM=y CONFIG_DWC_AHSATA=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y @@ -50,6 +53,8 @@ CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_MII=y CONFIG_PCI=y +CONFIG_PINCTRL=y +CONFIG_PINCTRL_IMX6=y CONFIG_USB=y CONFIG_USB_KEYBOARD=y CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y -- 2.20.1 ^ permalink raw reply related [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH V2 2/7] ARM: imx: novena: Enable DM pin control 2019-05-17 18:32 ` [U-Boot] [PATCH V2 2/7] ARM: imx: novena: Enable DM pin control Marek Vasut @ 2019-06-10 9:49 ` sbabic at denx.de 0 siblings, 0 replies; 26+ messages in thread From: sbabic at denx.de @ 2019-06-10 9:49 UTC (permalink / raw) To: u-boot > Enable DM pin control support on iMX6Q Novena. > Signed-off-by: Marek Vasut <marex@denx.de> > Cc: Fabio Estevam <fabio.estevam@nxp.com> > Cc: Stefano Babic <sbabic@denx.de> > Cc: Vagrant Cascadian <vagrant@debian.org> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de ===================================================================== ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH V2 3/7] ARM: imx: novena: Enable DM GPIO 2019-05-17 18:32 [U-Boot] [PATCH V2 0/7] ARM: imx: Update Novena to DM/DT Marek Vasut 2019-05-17 18:32 ` [U-Boot] [PATCH V2 1/7] ARM: dts: imx: novena: Import Novena DT from Linux Marek Vasut 2019-05-17 18:32 ` [U-Boot] [PATCH V2 2/7] ARM: imx: novena: Enable DM pin control Marek Vasut @ 2019-05-17 18:32 ` Marek Vasut 2019-06-10 9:49 ` sbabic at denx.de 2019-05-17 18:32 ` [U-Boot] [PATCH V2 4/7] ARM: imx: novena: Convert block devices to DM Marek Vasut ` (4 subsequent siblings) 7 siblings, 1 reply; 26+ messages in thread From: Marek Vasut @ 2019-05-17 18:32 UTC (permalink / raw) To: u-boot Enable DM GPIO support on iMX6Q Novena and fix up board code where applicable. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Fabio Estevam <fabio.estevam@nxp.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Vagrant Cascadian <vagrant@debian.org> --- V2: No change --- board/kosagi/novena/novena.c | 2 ++ board/kosagi/novena/video.c | 3 +++ configs/novena_defconfig | 1 + 3 files changed, 6 insertions(+) diff --git a/board/kosagi/novena/novena.c b/board/kosagi/novena/novena.c index 9f2586521d..0750c4667e 100644 --- a/board/kosagi/novena/novena.c +++ b/board/kosagi/novena/novena.c @@ -83,6 +83,8 @@ int drv_keyboard_init(void) .tstc = novena_gpio_button_tstc, }; + gpio_request(NOVENA_BUTTON_GPIO, "button"); + error = input_init(&button_input, 0); if (error) { debug("%s: Cannot set up input\n", __func__); diff --git a/board/kosagi/novena/video.c b/board/kosagi/novena/video.c index f1351b9e28..7083b6e103 100644 --- a/board/kosagi/novena/video.c +++ b/board/kosagi/novena/video.c @@ -270,6 +270,7 @@ static void enable_lvds(struct display_info_t const *dev) return; /* ITE IT6251 power enable. */ + gpio_request(NOVENA_ITE6251_PWR_GPIO, "ite6251-power"); gpio_direction_output(NOVENA_ITE6251_PWR_GPIO, 0); mdelay(10); gpio_direction_output(NOVENA_ITE6251_PWR_GPIO, 1); @@ -447,6 +448,8 @@ void setup_display_lvds(void) /* Init the LVDS-to-eDP chip and if it succeeded, enable backlight. */ ret = it6251_init(); if (!ret) { + gpio_request(NOVENA_BACKLIGHT_PWR_GPIO, "backlight-power"); + gpio_request(NOVENA_BACKLIGHT_PWM_GPIO, "backlight-pwm"); /* Backlight power enable. */ gpio_direction_output(NOVENA_BACKLIGHT_PWR_GPIO, 1); /* PWM backlight pin, always on for full brightness. */ diff --git a/configs/novena_defconfig b/configs/novena_defconfig index 31a32da0dc..c74f635121 100644 --- a/configs/novena_defconfig +++ b/configs/novena_defconfig @@ -47,6 +47,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6q-novena" CONFIG_ENV_IS_IN_MMC=y CONFIG_DM=y CONFIG_DWC_AHSATA=y +CONFIG_DM_GPIO=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y -- 2.20.1 ^ permalink raw reply related [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH V2 3/7] ARM: imx: novena: Enable DM GPIO 2019-05-17 18:32 ` [U-Boot] [PATCH V2 3/7] ARM: imx: novena: Enable DM GPIO Marek Vasut @ 2019-06-10 9:49 ` sbabic at denx.de 0 siblings, 0 replies; 26+ messages in thread From: sbabic at denx.de @ 2019-06-10 9:49 UTC (permalink / raw) To: u-boot > Enable DM GPIO support on iMX6Q Novena and fix up board code > where applicable. > Signed-off-by: Marek Vasut <marex@denx.de> > Cc: Fabio Estevam <fabio.estevam@nxp.com> > Cc: Stefano Babic <sbabic@denx.de> > Cc: Vagrant Cascadian <vagrant@debian.org> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de ===================================================================== ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH V2 4/7] ARM: imx: novena: Convert block devices to DM 2019-05-17 18:32 [U-Boot] [PATCH V2 0/7] ARM: imx: Update Novena to DM/DT Marek Vasut ` (2 preceding siblings ...) 2019-05-17 18:32 ` [U-Boot] [PATCH V2 3/7] ARM: imx: novena: Enable DM GPIO Marek Vasut @ 2019-05-17 18:32 ` Marek Vasut 2019-06-10 9:40 ` sbabic at denx.de 2019-05-17 18:32 ` [U-Boot] [PATCH V2 5/7] ARM: imx: novena: Enable DM USB Marek Vasut ` (3 subsequent siblings) 7 siblings, 1 reply; 26+ messages in thread From: Marek Vasut @ 2019-05-17 18:32 UTC (permalink / raw) To: u-boot Enable DM block, DM MMC and DM SATA support on iMX6Q Novena convert board code to match the DM support. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Fabio Estevam <fabio.estevam@nxp.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Vagrant Cascadian <vagrant@debian.org> --- V2: - Drop the ad-hoc sata binding, this is superseded by CONFIG_DWC_AHSATA_AHCI=y resp. drivers/ata/dwc_ahsata.c - Drop dangling setup_sata() call --- arch/arm/dts/imx6q-novena.dts | 5 +++ board/kosagi/novena/novena.c | 62 +++-------------------------------- configs/novena_defconfig | 3 ++ include/configs/novena.h | 5 --- 4 files changed, 12 insertions(+), 63 deletions(-) diff --git a/arch/arm/dts/imx6q-novena.dts b/arch/arm/dts/imx6q-novena.dts index 61347a545d..35383c9a2b 100644 --- a/arch/arm/dts/imx6q-novena.dts +++ b/arch/arm/dts/imx6q-novena.dts @@ -61,6 +61,11 @@ reg = <0x10000000 0>; }; + aliases { + mmc0 = &usdhc3; + mmc1 = &usdhc2; + }; + chosen { stdout-path = &uart2; }; diff --git a/board/kosagi/novena/novena.c b/board/kosagi/novena/novena.c index 0750c4667e..d897f8f1cd 100644 --- a/board/kosagi/novena/novena.c +++ b/board/kosagi/novena/novena.c @@ -6,6 +6,9 @@ */ #include <common.h> +#include <dm.h> +#include <dm/device-internal.h> +#include <ahci.h> #include <linux/errno.h> #include <asm/gpio.h> #include <asm/io.h> @@ -20,6 +23,7 @@ #include <asm/mach-imx/mxc_i2c.h> #include <asm/mach-imx/sata.h> #include <asm/mach-imx/video.h> +#include <dwc_ahsata.h> #include <environment.h> #include <fsl_esdhc.h> #include <i2c.h> @@ -101,60 +105,6 @@ int drv_keyboard_init(void) } #endif -/* - * SDHC - */ -#ifdef CONFIG_FSL_ESDHC -static struct fsl_esdhc_cfg usdhc_cfg[] = { - { USDHC3_BASE_ADDR, 0, 4 }, /* Micro SD */ - { USDHC2_BASE_ADDR, 0, 4 }, /* Big SD */ -}; - -int board_mmc_getcd(struct mmc *mmc) -{ - struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv; - - /* There is no CD for a microSD card, assume always present. */ - if (cfg->esdhc_base == USDHC3_BASE_ADDR) - return 1; - else - return !gpio_get_value(NOVENA_SD_CD); -} - -int board_mmc_getwp(struct mmc *mmc) -{ - struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv; - - /* There is no WP for a microSD card, assume always read-write. */ - if (cfg->esdhc_base == USDHC3_BASE_ADDR) - return 0; - else - return gpio_get_value(NOVENA_SD_WP); -} - - -int board_mmc_init(bd_t *bis) -{ - s32 status = 0; - int index; - - usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK); - usdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK); - - /* Big SD write-protect and card-detect */ - gpio_direction_input(NOVENA_SD_WP); - gpio_direction_input(NOVENA_SD_CD); - - for (index = 0; index < ARRAY_SIZE(usdhc_cfg); index++) { - status = fsl_esdhc_initialize(bis, &usdhc_cfg[index]); - if (status) - return status; - } - - return status; -} -#endif - int board_early_init_f(void) { #if defined(CONFIG_VIDEO_IPUV3) @@ -169,10 +119,6 @@ int board_init(void) /* address of boot parameters */ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; -#ifdef CONFIG_SATA - setup_sata(); -#endif - return 0; } diff --git a/configs/novena_defconfig b/configs/novena_defconfig index c74f635121..fa5fdea278 100644 --- a/configs/novena_defconfig +++ b/configs/novena_defconfig @@ -13,6 +13,7 @@ CONFIG_SPL=y CONFIG_SPL_FS_FAT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_CMD_HDMIDETECT=y +CONFIG_AHCI=y CONFIG_DISTRO_DEFAULTS=y # CONFIG_SYS_MALLOC_F is not set CONFIG_FIT=y @@ -48,6 +49,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_DM=y CONFIG_DWC_AHSATA=y CONFIG_DM_GPIO=y +CONFIG_DM_MMC=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y @@ -56,6 +58,7 @@ CONFIG_MII=y CONFIG_PCI=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y +CONFIG_DM_SCSI=y CONFIG_USB=y CONFIG_USB_KEYBOARD=y CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y diff --git a/include/configs/novena.h b/include/configs/novena.h index bb5bf808c2..bc7383e957 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -102,12 +102,7 @@ #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 /* SATA Configs */ -#ifdef CONFIG_CMD_SATA -#define CONFIG_SYS_SATA_MAX_DEVICE 1 -#define CONFIG_DWC_AHSATA_PORT_ID 0 -#define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR #define CONFIG_LBA48 -#endif /* UART */ #define CONFIG_MXC_UART -- 2.20.1 ^ permalink raw reply related [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH V2 4/7] ARM: imx: novena: Convert block devices to DM 2019-05-17 18:32 ` [U-Boot] [PATCH V2 4/7] ARM: imx: novena: Convert block devices to DM Marek Vasut @ 2019-06-10 9:40 ` sbabic at denx.de 0 siblings, 0 replies; 26+ messages in thread From: sbabic at denx.de @ 2019-06-10 9:40 UTC (permalink / raw) To: u-boot > Enable DM block, DM MMC and DM SATA support on iMX6Q Novena > convert board code to match the DM support. > Signed-off-by: Marek Vasut <marex@denx.de> > Cc: Fabio Estevam <fabio.estevam@nxp.com> > Cc: Stefano Babic <sbabic@denx.de> > Cc: Vagrant Cascadian <vagrant@debian.org> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de ===================================================================== ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH V2 5/7] ARM: imx: novena: Enable DM USB 2019-05-17 18:32 [U-Boot] [PATCH V2 0/7] ARM: imx: Update Novena to DM/DT Marek Vasut ` (3 preceding siblings ...) 2019-05-17 18:32 ` [U-Boot] [PATCH V2 4/7] ARM: imx: novena: Convert block devices to DM Marek Vasut @ 2019-05-17 18:32 ` Marek Vasut 2019-06-10 9:41 ` sbabic at denx.de 2019-05-17 18:32 ` [U-Boot] [PATCH V2 6/7] ARM: imx: novena: Enable DM PCI Marek Vasut ` (2 subsequent siblings) 7 siblings, 1 reply; 26+ messages in thread From: Marek Vasut @ 2019-05-17 18:32 UTC (permalink / raw) To: u-boot Enable DM USB support on iMX6Q Novena. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Fabio Estevam <fabio.estevam@nxp.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Vagrant Cascadian <vagrant@debian.org> --- V2: No change --- configs/novena_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/novena_defconfig b/configs/novena_defconfig index fa5fdea278..c5dbbb0b4d 100644 --- a/configs/novena_defconfig +++ b/configs/novena_defconfig @@ -60,6 +60,7 @@ CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y CONFIG_DM_SCSI=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_KEYBOARD=y CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y CONFIG_USB_GADGET=y -- 2.20.1 ^ permalink raw reply related [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH V2 5/7] ARM: imx: novena: Enable DM USB 2019-05-17 18:32 ` [U-Boot] [PATCH V2 5/7] ARM: imx: novena: Enable DM USB Marek Vasut @ 2019-06-10 9:41 ` sbabic at denx.de 0 siblings, 0 replies; 26+ messages in thread From: sbabic at denx.de @ 2019-06-10 9:41 UTC (permalink / raw) To: u-boot > Enable DM USB support on iMX6Q Novena. > Signed-off-by: Marek Vasut <marex@denx.de> > Cc: Fabio Estevam <fabio.estevam@nxp.com> > Cc: Stefano Babic <sbabic@denx.de> > Cc: Vagrant Cascadian <vagrant@debian.org> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de ===================================================================== ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH V2 6/7] ARM: imx: novena: Enable DM PCI 2019-05-17 18:32 [U-Boot] [PATCH V2 0/7] ARM: imx: Update Novena to DM/DT Marek Vasut ` (4 preceding siblings ...) 2019-05-17 18:32 ` [U-Boot] [PATCH V2 5/7] ARM: imx: novena: Enable DM USB Marek Vasut @ 2019-05-17 18:32 ` Marek Vasut 2019-06-08 20:45 ` Stefano Babic 2019-06-10 9:39 ` sbabic at denx.de 2019-05-17 18:32 ` [U-Boot] [PATCH V2 7/7] ARM: imx: novena: Convert to DM VIDEO Marek Vasut 2019-06-04 7:06 ` [U-Boot] [PATCH V2 0/7] ARM: imx: Update Novena to DM/DT Vagrant Cascadian 7 siblings, 2 replies; 26+ messages in thread From: Marek Vasut @ 2019-05-17 18:32 UTC (permalink / raw) To: u-boot Enable DM PCI support on iMX6Q Novena. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Fabio Estevam <fabio.estevam@nxp.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Vagrant Cascadian <vagrant@debian.org> --- V2: New patch --- configs/novena_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/novena_defconfig b/configs/novena_defconfig index c5dbbb0b4d..bbed972a44 100644 --- a/configs/novena_defconfig +++ b/configs/novena_defconfig @@ -56,6 +56,7 @@ CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_MII=y CONFIG_PCI=y +CONFIG_DM_PCI=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y CONFIG_DM_SCSI=y -- 2.20.1 ^ permalink raw reply related [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH V2 6/7] ARM: imx: novena: Enable DM PCI 2019-05-17 18:32 ` [U-Boot] [PATCH V2 6/7] ARM: imx: novena: Enable DM PCI Marek Vasut @ 2019-06-08 20:45 ` Stefano Babic 2019-06-09 1:49 ` Marek Vasut 2019-06-10 9:39 ` sbabic at denx.de 1 sibling, 1 reply; 26+ messages in thread From: Stefano Babic @ 2019-06-08 20:45 UTC (permalink / raw) To: u-boot Hi Marek, On 17/05/19 20:32, Marek Vasut wrote: > Enable DM PCI support on iMX6Q Novena. > > Signed-off-by: Marek Vasut <marex@denx.de> > Cc: Fabio Estevam <fabio.estevam@nxp.com> > Cc: Stefano Babic <sbabic@denx.de> > Cc: Vagrant Cascadian <vagrant@debian.org> > --- > V2: New patch > --- > configs/novena_defconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/configs/novena_defconfig b/configs/novena_defconfig > index c5dbbb0b4d..bbed972a44 100644 > --- a/configs/novena_defconfig > +++ b/configs/novena_defconfig > @@ -56,6 +56,7 @@ CONFIG_PHY_MICREL=y > CONFIG_PHY_MICREL_KSZ90X1=y > CONFIG_MII=y > CONFIG_PCI=y > +CONFIG_DM_PCI=y > CONFIG_PINCTRL=y > CONFIG_PINCTRL_IMX6=y > CONFIG_DM_SCSI=y > I cannot build novena with this enabled - do you see the same error or am I missing something ? arm: + novena + pci_set_ops(hose, + ^~~~~~~~~~~ +drivers/pci/pcie_imx.c:686:7: error: ?pci_hose_read_config_byte_via_dword? undeclared (first use in this function) + pci_hose_read_config_byte_via_dword, + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +drivers/pci/pcie_imx.c:686:7: note: each undeclared identifier is reported only once for each function it appears in +drivers/pci/pcie_imx.c:687:7: error: ?pci_hose_read_config_word_via_dword? undeclared (first use in this function) + pci_hose_read_config_word_via_dword, +drivers/pci/pcie_imx.c:689:7: error: ?pci_hose_write_config_byte_via_dword? undeclared (first use in this function) + pci_hose_write_config_byte_via_dword, + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +drivers/pci/pcie_imx.c:690:7: error: ?pci_hose_write_config_word_via_dword? undeclared (first use in this function) + pci_hose_write_config_word_via_dword, + pci_register_hose(hose); + ^~~~~~~~~~~~~~~~~ + hose->last_busno = pci_hose_scan(hose); + ^~~~~~~~~~~~~ +make[3]: *** [drivers/pci/pcie_imx.o] Error 1 +make[2]: *** [drivers/pci] Error 2 +make[1]: *** [drivers] Error 2 +make: *** [sub-make] Error 2 w+drivers/pci/pcie_imx.c: In function ?imx_pcie_init?: w+drivers/pci/pcie_imx.c:685:2: warning: implicit declaration of function ?pci_set_ops? [-Wimplicit-function-declaration] w+drivers/pci/pcie_imx.c:697:3: warning: implicit declaration of function ?pci_register_hose? [-Wimplicit-function-declaration] w+drivers/pci/pcie_imx.c:698:22: warning: implicit declaration of function ?pci_hose_scan? [-Wimplicit-function-declaration] Regards, Stefano -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de ===================================================================== ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH V2 6/7] ARM: imx: novena: Enable DM PCI 2019-06-08 20:45 ` Stefano Babic @ 2019-06-09 1:49 ` Marek Vasut 2019-06-09 7:34 ` Stefano Babic 0 siblings, 1 reply; 26+ messages in thread From: Marek Vasut @ 2019-06-09 1:49 UTC (permalink / raw) To: u-boot On 6/8/19 10:45 PM, Stefano Babic wrote: > Hi Marek, > > On 17/05/19 20:32, Marek Vasut wrote: >> Enable DM PCI support on iMX6Q Novena. >> >> Signed-off-by: Marek Vasut <marex@denx.de> >> Cc: Fabio Estevam <fabio.estevam@nxp.com> >> Cc: Stefano Babic <sbabic@denx.de> >> Cc: Vagrant Cascadian <vagrant@debian.org> >> --- >> V2: New patch >> --- >> configs/novena_defconfig | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/configs/novena_defconfig b/configs/novena_defconfig >> index c5dbbb0b4d..bbed972a44 100644 >> --- a/configs/novena_defconfig >> +++ b/configs/novena_defconfig >> @@ -56,6 +56,7 @@ CONFIG_PHY_MICREL=y >> CONFIG_PHY_MICREL_KSZ90X1=y >> CONFIG_MII=y >> CONFIG_PCI=y >> +CONFIG_DM_PCI=y >> CONFIG_PINCTRL=y >> CONFIG_PINCTRL_IMX6=y >> CONFIG_DM_SCSI=y >> > > I cannot build novena with this enabled - do you see the same error or > am I missing something ? > > arm: + novena > + pci_set_ops(hose, > + ^~~~~~~~~~~ > +drivers/pci/pcie_imx.c:686:7: error: > ?pci_hose_read_config_byte_via_dword? undeclared (first use in this > function) > + pci_hose_read_config_byte_via_dword, > + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > +drivers/pci/pcie_imx.c:686:7: note: each undeclared identifier is > reported only once for each function it appears in > +drivers/pci/pcie_imx.c:687:7: error: > ?pci_hose_read_config_word_via_dword? undeclared (first use in this > function) > + pci_hose_read_config_word_via_dword, > +drivers/pci/pcie_imx.c:689:7: error: > ?pci_hose_write_config_byte_via_dword? undeclared (first use in this > function) > + pci_hose_write_config_byte_via_dword, > + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > +drivers/pci/pcie_imx.c:690:7: error: > ?pci_hose_write_config_word_via_dword? undeclared (first use in this > function) > + pci_hose_write_config_word_via_dword, > + pci_register_hose(hose); > + ^~~~~~~~~~~~~~~~~ > + hose->last_busno = pci_hose_scan(hose); > + ^~~~~~~~~~~~~ > +make[3]: *** [drivers/pci/pcie_imx.o] Error 1 > +make[2]: *** [drivers/pci] Error 2 > +make[1]: *** [drivers] Error 2 > +make: *** [sub-make] Error 2 > w+drivers/pci/pcie_imx.c: In function ?imx_pcie_init?: > w+drivers/pci/pcie_imx.c:685:2: warning: implicit declaration of > function ?pci_set_ops? [-Wimplicit-function-declaration] > w+drivers/pci/pcie_imx.c:697:3: warning: implicit declaration of > function ?pci_register_hose? [-Wimplicit-function-declaration] > w+drivers/pci/pcie_imx.c:698:22: warning: implicit declaration of > function ?pci_hose_scan? [-Wimplicit-function-declaration] I collected the patches here [1], CI passed: https://github.com/marex/u-boot-imx/tree/imx-dm -- Best regards, Marek Vasut ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH V2 6/7] ARM: imx: novena: Enable DM PCI 2019-06-09 1:49 ` Marek Vasut @ 2019-06-09 7:34 ` Stefano Babic 0 siblings, 0 replies; 26+ messages in thread From: Stefano Babic @ 2019-06-09 7:34 UTC (permalink / raw) To: u-boot On 09/06/19 03:49, Marek Vasut wrote: > On 6/8/19 10:45 PM, Stefano Babic wrote: >> Hi Marek, >> >> On 17/05/19 20:32, Marek Vasut wrote: >>> Enable DM PCI support on iMX6Q Novena. >>> >>> Signed-off-by: Marek Vasut <marex@denx.de> >>> Cc: Fabio Estevam <fabio.estevam@nxp.com> >>> Cc: Stefano Babic <sbabic@denx.de> >>> Cc: Vagrant Cascadian <vagrant@debian.org> >>> --- >>> V2: New patch >>> --- >>> configs/novena_defconfig | 1 + >>> 1 file changed, 1 insertion(+) >>> >>> diff --git a/configs/novena_defconfig b/configs/novena_defconfig >>> index c5dbbb0b4d..bbed972a44 100644 >>> --- a/configs/novena_defconfig >>> +++ b/configs/novena_defconfig >>> @@ -56,6 +56,7 @@ CONFIG_PHY_MICREL=y >>> CONFIG_PHY_MICREL_KSZ90X1=y >>> CONFIG_MII=y >>> CONFIG_PCI=y >>> +CONFIG_DM_PCI=y >>> CONFIG_PINCTRL=y >>> CONFIG_PINCTRL_IMX6=y >>> CONFIG_DM_SCSI=y >>> >> >> I cannot build novena with this enabled - do you see the same error or >> am I missing something ? >> >> arm: + novena >> + pci_set_ops(hose, >> + ^~~~~~~~~~~ >> +drivers/pci/pcie_imx.c:686:7: error: >> ?pci_hose_read_config_byte_via_dword? undeclared (first use in this >> function) >> + pci_hose_read_config_byte_via_dword, >> + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >> +drivers/pci/pcie_imx.c:686:7: note: each undeclared identifier is >> reported only once for each function it appears in >> +drivers/pci/pcie_imx.c:687:7: error: >> ?pci_hose_read_config_word_via_dword? undeclared (first use in this >> function) >> + pci_hose_read_config_word_via_dword, >> +drivers/pci/pcie_imx.c:689:7: error: >> ?pci_hose_write_config_byte_via_dword? undeclared (first use in this >> function) >> + pci_hose_write_config_byte_via_dword, >> + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >> +drivers/pci/pcie_imx.c:690:7: error: >> ?pci_hose_write_config_word_via_dword? undeclared (first use in this >> function) >> + pci_hose_write_config_word_via_dword, >> + pci_register_hose(hose); >> + ^~~~~~~~~~~~~~~~~ >> + hose->last_busno = pci_hose_scan(hose); >> + ^~~~~~~~~~~~~ >> +make[3]: *** [drivers/pci/pcie_imx.o] Error 1 >> +make[2]: *** [drivers/pci] Error 2 >> +make[1]: *** [drivers] Error 2 >> +make: *** [sub-make] Error 2 >> w+drivers/pci/pcie_imx.c: In function ?imx_pcie_init?: >> w+drivers/pci/pcie_imx.c:685:2: warning: implicit declaration of >> function ?pci_set_ops? [-Wimplicit-function-declaration] >> w+drivers/pci/pcie_imx.c:697:3: warning: implicit declaration of >> function ?pci_register_hose? [-Wimplicit-function-declaration] >> w+drivers/pci/pcie_imx.c:698:22: warning: implicit declaration of >> function ?pci_hose_scan? [-Wimplicit-function-declaration] > > I collected the patches here [1], CI passed: > > https://github.com/marex/u-boot-imx/tree/imx-dm Fine, thanks - I had not applied your pcie patches before novena. I see you sent V2 for pcie, I am picking up the new version then Thanks, Stefano -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de ===================================================================== ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH V2 6/7] ARM: imx: novena: Enable DM PCI 2019-05-17 18:32 ` [U-Boot] [PATCH V2 6/7] ARM: imx: novena: Enable DM PCI Marek Vasut 2019-06-08 20:45 ` Stefano Babic @ 2019-06-10 9:39 ` sbabic at denx.de 1 sibling, 0 replies; 26+ messages in thread From: sbabic at denx.de @ 2019-06-10 9:39 UTC (permalink / raw) To: u-boot > Enable DM PCI support on iMX6Q Novena. > Signed-off-by: Marek Vasut <marex@denx.de> > Cc: Fabio Estevam <fabio.estevam@nxp.com> > Cc: Stefano Babic <sbabic@denx.de> > Cc: Vagrant Cascadian <vagrant@debian.org> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de ===================================================================== ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH V2 7/7] ARM: imx: novena: Convert to DM VIDEO 2019-05-17 18:32 [U-Boot] [PATCH V2 0/7] ARM: imx: Update Novena to DM/DT Marek Vasut ` (5 preceding siblings ...) 2019-05-17 18:32 ` [U-Boot] [PATCH V2 6/7] ARM: imx: novena: Enable DM PCI Marek Vasut @ 2019-05-17 18:32 ` Marek Vasut 2019-06-10 9:59 ` sbabic at denx.de 2019-06-04 7:06 ` [U-Boot] [PATCH V2 0/7] ARM: imx: Update Novena to DM/DT Vagrant Cascadian 7 siblings, 1 reply; 26+ messages in thread From: Marek Vasut @ 2019-05-17 18:32 UTC (permalink / raw) To: u-boot Enable DM Video support on iMX6Q Novena and fix minor details to restore previous behavior of the system. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Fabio Estevam <fabio.estevam@nxp.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Vagrant Cascadian <vagrant@debian.org> --- V2: Print U-Boot version information on the LCD --- board/kosagi/novena/novena.c | 13 +++++++++++++ configs/novena_defconfig | 6 +++--- include/configs/novena.h | 4 ++-- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/board/kosagi/novena/novena.c b/board/kosagi/novena/novena.c index d897f8f1cd..78294b820e 100644 --- a/board/kosagi/novena/novena.c +++ b/board/kosagi/novena/novena.c @@ -39,6 +39,7 @@ #include <power/pmic.h> #include <power/pfuze100_pmic.h> #include <stdio_dev.h> +#include <video_console.h> #include "novena.h" @@ -125,7 +126,19 @@ int board_init(void) int board_late_init(void) { #if defined(CONFIG_VIDEO_IPUV3) + struct udevice *con; + char buf[DISPLAY_OPTIONS_BANNER_LENGTH]; + int ret; + setup_display_lvds(); + + ret = uclass_get_device(UCLASS_VIDEO_CONSOLE, 0, &con); + if (ret) + return ret; + + display_options_get_banner(false, buf, sizeof(buf)); + vidconsole_position_cursor(con, 0, 0); + vidconsole_put_string(con, buf); #endif return 0; } diff --git a/configs/novena_defconfig b/configs/novena_defconfig index bbed972a44..e649ebb549 100644 --- a/configs/novena_defconfig +++ b/configs/novena_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_MX6_DDRCAL=y CONFIG_TARGET_KOSAGI_NOVENA=y CONFIG_SPL_MMC_SUPPORT=y @@ -15,7 +16,6 @@ CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_CMD_HDMIDETECT=y CONFIG_AHCI=y CONFIG_DISTRO_DEFAULTS=y -# CONFIG_SYS_MALLOC_F is not set CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q" CONFIG_USE_BOOTARGS=y @@ -71,7 +71,7 @@ CONFIG_USB_ETH_CDC=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_SMSC95XX=y +CONFIG_DM_VIDEO=y +CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_IPUV3=y -CONFIG_VIDEO=y -# CONFIG_VIDEO_SW_CURSOR is not set CONFIG_FAT_WRITE=y diff --git a/include/configs/novena.h b/include/configs/novena.h index bc7383e957..cdc437c492 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -119,14 +119,12 @@ #endif /* Video output */ -#ifdef CONFIG_VIDEO #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_LOGO #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP -#endif /* Extra U-Boot environment. */ #ifndef CONFIG_SPL_BUILD @@ -144,6 +142,8 @@ "ramdisk_addr_r=0x28000000\0" \ "fdt_addr_r=0x18000000\0" \ "fdtfile=imx6q-novena.dtb\0" \ + "stdout=serial,vidconsole\0" \ + "stderr=serial,vidconsole\0" \ "addcons=" \ "setenv bootargs ${bootargs} " \ "console=${consdev},${baudrate}\0" \ -- 2.20.1 ^ permalink raw reply related [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH V2 7/7] ARM: imx: novena: Convert to DM VIDEO 2019-05-17 18:32 ` [U-Boot] [PATCH V2 7/7] ARM: imx: novena: Convert to DM VIDEO Marek Vasut @ 2019-06-10 9:59 ` sbabic at denx.de 0 siblings, 0 replies; 26+ messages in thread From: sbabic at denx.de @ 2019-06-10 9:59 UTC (permalink / raw) To: u-boot > Enable DM Video support on iMX6Q Novena and fix minor details > to restore previous behavior of the system. > Signed-off-by: Marek Vasut <marex@denx.de> > Cc: Fabio Estevam <fabio.estevam@nxp.com> > Cc: Stefano Babic <sbabic@denx.de> > Cc: Vagrant Cascadian <vagrant@debian.org> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de ===================================================================== ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH V2 0/7] ARM: imx: Update Novena to DM/DT 2019-05-17 18:32 [U-Boot] [PATCH V2 0/7] ARM: imx: Update Novena to DM/DT Marek Vasut ` (6 preceding siblings ...) 2019-05-17 18:32 ` [U-Boot] [PATCH V2 7/7] ARM: imx: novena: Convert to DM VIDEO Marek Vasut @ 2019-06-04 7:06 ` Vagrant Cascadian 2019-06-06 17:17 ` Vagrant Cascadian 2019-08-19 12:37 ` Marek Vasut 7 siblings, 2 replies; 26+ messages in thread From: Vagrant Cascadian @ 2019-06-04 7:06 UTC (permalink / raw) To: u-boot On 2019-05-17, Marek Vasut wrote: > Update Kosagi Novena to DM / DT and remove the warnings. > This depends on the following patches / series: > > https://patchwork.ozlabs.org/patch/1095618/ > https://patchwork.ozlabs.org/patch/1101171/ These are now merged in 2019.07-rc3. > https://patchwork.ozlabs.org/project/uboot/list/?series=108463 These were not yet. I have two oustanding issues... with some files it sometimes fails to load one or more from SATA: Retrieving file: /boot/initrd.img-5.0.0-trunk-armmp 20077960 bytes read in 375 ms (51.1 MiB/s) Retrieving file: /boot/vmlinuz-5.0.0-trunk-armmp 4215296 bytes read in 40 ms (100.5 MiB/s) append: root=UUID=9666ab0b-f932-4e2f-95d7-0e96a12a4540 ro quiet Retrieving file: /usr/lib/linux-image-5.0.0-trunk-armmp/imx6q-novena.dtb CACHE: Misaligned operation at range [fafb5398, fafb6398] CACHE: Misaligned operation at range [fafb5398, fafb6398] ERROR: v7_outer_cache_inval_range - start address is not aligned - 0xfafb5398 ERROR: v7_outer_cache_inval_range - stop address is not aligned - 0xfafb6398 invalid extent block It then falls back to one of the other kernels (using the extlinux.conf parsing) and succeeds. It consistantly gets a cache/alignment error with this specific file. A bit-for-bit identical .dtb loaded from another path works just fine. Older versions of u-boot boot this fine. Would some particular EXT4 flag possibly be causing issues? Several other kernel+initrd+dtb combinations work fine. I have not noticed issues loading from PXE. The second issue is still using one out of four exposed USB ports fails and resets the board: load usb 0:1 $kernel_addr_r misc/Binaries/linux/Image data abort pc : [<fefbb67a>] lr : [<fefbb0fd>] reloc pc : [<1783367a>] lr : [<178330fd>] sp : faf7c6e8 ip : 00000003 fp : 00000005 r10: faf8b200 r9 : faf87ea0 r8 : 00000001 r7 : faf8b2c0 r6 : f9f7a040 r5 : faf7c710 r4 : 00000038 r3 : 0000006d r2 : f9f7a0a3 r1 : faf8b32c r0 : f9f7a09f Flags: nzCv IRQs off FIQs off Mode SVC_32 Code: 4630fc5b 81f0e8bd e7d84606 bf082b2f (f822235c) Resetting CPU ... The three other usb ports work just fine with the same USB stick and file. All four ports work with 2019.01. Despite those two issues somewhat significant issues... it does appear to work in general... so, with 2019.07-rc3 + https://patchwork.ozlabs.org/project/uboot/list/?series=108463 and this series applied, with the above caveats: Tested-by: Vagrant Cascadian <vagrant@debian.org> live well, vagrant > Marek Vasut (7): > ARM: dts: imx: novena: Import Novena DT from Linux > ARM: imx: novena: Enable DM pin control > ARM: imx: novena: Enable DM GPIO > ARM: imx: novena: Convert block devices to DM > ARM: imx: novena: Enable DM USB > ARM: imx: novena: Enable DM PCI > ARM: imx: novena: Convert to DM VIDEO > > arch/arm/dts/Makefile | 3 +- > arch/arm/dts/imx6q-novena.dts | 797 ++++++++++++++++++++++++++++++++++ > board/kosagi/novena/novena.c | 77 +--- > board/kosagi/novena/video.c | 3 + > configs/novena_defconfig | 18 +- > include/configs/novena.h | 9 +- > 6 files changed, 838 insertions(+), 69 deletions(-) > create mode 100644 arch/arm/dts/imx6q-novena.dts > > Cc: Fabio Estevam <fabio.estevam@nxp.com> > Cc: Stefano Babic <sbabic@denx.de> > Cc: Vagrant Cascadian <vagrant@debian.org> > -- > 2.20.1 -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 227 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190604/8b8f5db2/attachment.sig> ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH V2 0/7] ARM: imx: Update Novena to DM/DT 2019-06-04 7:06 ` [U-Boot] [PATCH V2 0/7] ARM: imx: Update Novena to DM/DT Vagrant Cascadian @ 2019-06-06 17:17 ` Vagrant Cascadian 2019-06-07 19:09 ` Marek Vasut 2019-08-19 12:37 ` Marek Vasut 1 sibling, 1 reply; 26+ messages in thread From: Vagrant Cascadian @ 2019-06-06 17:17 UTC (permalink / raw) To: u-boot On 2019-06-04, Vagrant Cascadian wrote: > On 2019-05-17, Marek Vasut wrote: Retried with a build from: https://github.com/marex/u-boot-imx/tree/imx-dm commit:7a381bb7edfd43aefc1dbfea6d574234ef9d7771 Which contains the two patchsets needed. > I have two oustanding issues... with some files it sometimes fails to > load one or more from SATA: > > Retrieving file: /boot/initrd.img-5.0.0-trunk-armmp > 20077960 bytes read in 375 ms (51.1 MiB/s) > Retrieving file: /boot/vmlinuz-5.0.0-trunk-armmp > 4215296 bytes read in 40 ms (100.5 MiB/s) > append: root=UUID=9666ab0b-f932-4e2f-95d7-0e96a12a4540 ro quiet > Retrieving file: /usr/lib/linux-image-5.0.0-trunk-armmp/imx6q-novena.dtb > CACHE: Misaligned operation at range [fafb5398, fafb6398] > CACHE: Misaligned operation at range [fafb5398, fafb6398] > ERROR: v7_outer_cache_inval_range - start address is not aligned - > 0xfafb5398 > ERROR: v7_outer_cache_inval_range - stop address is not aligned - > 0xfafb6398 > invalid extent block > > It then falls back to one of the other kernels (using the extlinux.conf > parsing) and succeeds. It consistantly gets a cache/alignment error with > this specific file. A bit-for-bit identical .dtb loaded from another > path works just fine. Older versions of u-boot boot this fine. Would > some particular EXT4 flag possibly be causing issues? > > Several other kernel+initrd+dtb combinations work fine. Running "dcache off" before booting still produces the warnings/errors, but actually does boot successfully. Of course, it's much slower. > The second issue is still using one out of four exposed USB ports fails > and resets the board: > > load usb 0:1 $kernel_addr_r misc/Binaries/linux/Image > data abort > pc : [<fefbb67a>] lr : [<fefbb0fd>] > reloc pc : [<1783367a>] lr : [<178330fd>] > sp : faf7c6e8 ip : 00000003 fp : 00000005 > r10: faf8b200 r9 : faf87ea0 r8 : 00000001 > r7 : faf8b2c0 r6 : f9f7a040 r5 : faf7c710 r4 : 00000038 > r3 : 0000006d r2 : f9f7a0a3 r1 : faf8b32c r0 : f9f7a09f > Flags: nzCv IRQs off FIQs off Mode SVC_32 > Code: 4630fc5b 81f0e8bd e7d84606 bf082b2f (f822235c) > Resetting CPU ... > > The three other usb ports work just fine with the same USB stick and > file. All four ports work with 2019.01. Got a bit-for-bit identical error on this one. I was able to get the objdump output with the reloc pc value: $ arm-linux-gnueabihf-objdump -d u-boot | grep 178337aa 178337aa: f822 3b02 strh.w r3, [r2], #2 Hope that's helpful! live well, vagrant -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 227 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190606/66fcebfb/attachment.sig> ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH V2 0/7] ARM: imx: Update Novena to DM/DT 2019-06-06 17:17 ` Vagrant Cascadian @ 2019-06-07 19:09 ` Marek Vasut 0 siblings, 0 replies; 26+ messages in thread From: Marek Vasut @ 2019-06-07 19:09 UTC (permalink / raw) To: u-boot On 6/6/19 7:17 PM, Vagrant Cascadian wrote: > On 2019-06-04, Vagrant Cascadian wrote: >> On 2019-05-17, Marek Vasut wrote: > > Retried with a build from: > > https://github.com/marex/u-boot-imx/tree/imx-dm > commit:7a381bb7edfd43aefc1dbfea6d574234ef9d7771 > > Which contains the two patchsets needed. > > >> I have two oustanding issues... with some files it sometimes fails to >> load one or more from SATA: >> >> Retrieving file: /boot/initrd.img-5.0.0-trunk-armmp >> 20077960 bytes read in 375 ms (51.1 MiB/s) >> Retrieving file: /boot/vmlinuz-5.0.0-trunk-armmp >> 4215296 bytes read in 40 ms (100.5 MiB/s) >> append: root=UUID=9666ab0b-f932-4e2f-95d7-0e96a12a4540 ro quiet >> Retrieving file: /usr/lib/linux-image-5.0.0-trunk-armmp/imx6q-novena.dtb >> CACHE: Misaligned operation at range [fafb5398, fafb6398] >> CACHE: Misaligned operation at range [fafb5398, fafb6398] >> ERROR: v7_outer_cache_inval_range - start address is not aligned - >> 0xfafb5398 >> ERROR: v7_outer_cache_inval_range - stop address is not aligned - >> 0xfafb6398 >> invalid extent block >> >> It then falls back to one of the other kernels (using the extlinux.conf >> parsing) and succeeds. It consistantly gets a cache/alignment error with >> this specific file. A bit-for-bit identical .dtb loaded from another >> path works just fine. Older versions of u-boot boot this fine. Would >> some particular EXT4 flag possibly be causing issues? >> >> Several other kernel+initrd+dtb combinations work fine. > > Running "dcache off" before booting still produces the warnings/errors, > but actually does boot successfully. Of course, it's much slower. Well, someone needs to debug this :-) >> The second issue is still using one out of four exposed USB ports fails >> and resets the board: >> >> load usb 0:1 $kernel_addr_r misc/Binaries/linux/Image >> data abort >> pc : [<fefbb67a>] lr : [<fefbb0fd>] >> reloc pc : [<1783367a>] lr : [<178330fd>] >> sp : faf7c6e8 ip : 00000003 fp : 00000005 >> r10: faf8b200 r9 : faf87ea0 r8 : 00000001 >> r7 : faf8b2c0 r6 : f9f7a040 r5 : faf7c710 r4 : 00000038 >> r3 : 0000006d r2 : f9f7a0a3 r1 : faf8b32c r0 : f9f7a09f >> Flags: nzCv IRQs off FIQs off Mode SVC_32 >> Code: 4630fc5b 81f0e8bd e7d84606 bf082b2f (f822235c) >> Resetting CPU ... >> >> The three other usb ports work just fine with the same USB stick and >> file. All four ports work with 2019.01. > > Got a bit-for-bit identical error on this one. > > I was able to get the objdump output with the reloc pc value: > > $ arm-linux-gnueabihf-objdump -d u-boot | grep 178337aa > 178337aa: f822 3b02 strh.w r3, [r2], #2 > > Hope that's helpful! Not at all, it basically says "writing unknown value to unknown offset in memory causes data abort". If you run ...objdump -lSD u-boot, you can likely find more information in the dump and also where/why it crashes. -- Best regards, Marek Vasut ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH V2 0/7] ARM: imx: Update Novena to DM/DT 2019-06-04 7:06 ` [U-Boot] [PATCH V2 0/7] ARM: imx: Update Novena to DM/DT Vagrant Cascadian 2019-06-06 17:17 ` Vagrant Cascadian @ 2019-08-19 12:37 ` Marek Vasut 2019-08-20 17:41 ` Vagrant Cascadian 1 sibling, 1 reply; 26+ messages in thread From: Marek Vasut @ 2019-08-19 12:37 UTC (permalink / raw) To: u-boot On 6/4/19 9:06 AM, Vagrant Cascadian wrote: > On 2019-05-17, Marek Vasut wrote: >> Update Kosagi Novena to DM / DT and remove the warnings. >> This depends on the following patches / series: >> >> https://patchwork.ozlabs.org/patch/1095618/ >> https://patchwork.ozlabs.org/patch/1101171/ > > These are now merged in 2019.07-rc3. > >> https://patchwork.ozlabs.org/project/uboot/list/?series=108463 > > These were not yet. > > I have two oustanding issues... with some files it sometimes fails to > load one or more from SATA: > > Retrieving file: /boot/initrd.img-5.0.0-trunk-armmp > 20077960 bytes read in 375 ms (51.1 MiB/s) > Retrieving file: /boot/vmlinuz-5.0.0-trunk-armmp > 4215296 bytes read in 40 ms (100.5 MiB/s) > append: root=UUID=9666ab0b-f932-4e2f-95d7-0e96a12a4540 ro quiet > Retrieving file: /usr/lib/linux-image-5.0.0-trunk-armmp/imx6q-novena.dtb > CACHE: Misaligned operation at range [fafb5398, fafb6398] > CACHE: Misaligned operation at range [fafb5398, fafb6398] > ERROR: v7_outer_cache_inval_range - start address is not aligned - > 0xfafb5398 > ERROR: v7_outer_cache_inval_range - stop address is not aligned - > 0xfafb6398 > invalid extent block > > It then falls back to one of the other kernels (using the extlinux.conf > parsing) and succeeds. It consistantly gets a cache/alignment error with > this specific file. A bit-for-bit identical .dtb loaded from another > path works just fine. Older versions of u-boot boot this fine. Would > some particular EXT4 flag possibly be causing issues? I don't know. Do you still run into this with u-boot/master ? > Several other kernel+initrd+dtb combinations work fine. > > I have not noticed issues loading from PXE. > > > The second issue is still using one out of four exposed USB ports fails > and resets the board: > > load usb 0:1 $kernel_addr_r misc/Binaries/linux/Image > data abort > pc : [<fefbb67a>] lr : [<fefbb0fd>] > reloc pc : [<1783367a>] lr : [<178330fd>] > sp : faf7c6e8 ip : 00000003 fp : 00000005 > r10: faf8b200 r9 : faf87ea0 r8 : 00000001 > r7 : faf8b2c0 r6 : f9f7a040 r5 : faf7c710 r4 : 00000038 > r3 : 0000006d r2 : f9f7a0a3 r1 : faf8b32c r0 : f9f7a09f > Flags: nzCv IRQs off FIQs off Mode SVC_32 > Code: 4630fc5b 81f0e8bd e7d84606 bf082b2f (f822235c) > Resetting CPU ... > > The three other usb ports work just fine with the same USB stick and > file. All four ports work with 2019.01. Can you debug it ? I think some of this was due to the EFI stuff , which I think was fixed since. Can you re-check that ? ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH V2 0/7] ARM: imx: Update Novena to DM/DT 2019-08-19 12:37 ` Marek Vasut @ 2019-08-20 17:41 ` Vagrant Cascadian 2019-09-26 18:52 ` [U-Boot] dcache issues with wandboard too (was: [PATCH V2 0/7] ARM: imx: Update Novena to DM/DT) Vagrant Cascadian 2020-01-27 0:02 ` [PATCH V2 0/7] ARM: imx: Update Novena to DM/DT Marek Vasut 0 siblings, 2 replies; 26+ messages in thread From: Vagrant Cascadian @ 2019-08-20 17:41 UTC (permalink / raw) To: u-boot On 2019-08-19, Marek Vasut wrote: > On 6/4/19 9:06 AM, Vagrant Cascadian wrote: >> On 2019-05-17, Marek Vasut wrote: >>> Update Kosagi Novena to DM / DT and remove the warnings. ... >> I have two oustanding issues... with some files it sometimes fails to >> load one or more from SATA: >> >> Retrieving file: /boot/initrd.img-5.0.0-trunk-armmp >> 20077960 bytes read in 375 ms (51.1 MiB/s) >> Retrieving file: /boot/vmlinuz-5.0.0-trunk-armmp >> 4215296 bytes read in 40 ms (100.5 MiB/s) >> append: root=UUID=9666ab0b-f932-4e2f-95d7-0e96a12a4540 ro quiet >> Retrieving file: /usr/lib/linux-image-5.0.0-trunk-armmp/imx6q-novena.dtb >> CACHE: Misaligned operation at range [fafb5398, fafb6398] >> CACHE: Misaligned operation at range [fafb5398, fafb6398] >> ERROR: v7_outer_cache_inval_range - start address is not aligned - >> 0xfafb5398 >> ERROR: v7_outer_cache_inval_range - stop address is not aligned - >> 0xfafb6398 >> invalid extent block >> >> It then falls back to one of the other kernels (using the extlinux.conf >> parsing) and succeeds. It consistantly gets a cache/alignment error with >> this specific file. A bit-for-bit identical .dtb loaded from another >> path works just fine. Older versions of u-boot boot this fine. Would >> some particular EXT4 flag possibly be causing issues? > > I don't know. Do you still run into this with u-boot/master ? Still occurring with 2019.10-rc2. Haven't tested with master yet. Using "dcache off" before booting still outputs the CACHE and ERROR messages, but does successfully boot. >> The second issue is still using one out of four exposed USB ports fails >> and resets the board: >> >> load usb 0:1 $kernel_addr_r misc/Binaries/linux/Image >> data abort >> pc : [<fefbb67a>] lr : [<fefbb0fd>] >> reloc pc : [<1783367a>] lr : [<178330fd>] >> sp : faf7c6e8 ip : 00000003 fp : 00000005 >> r10: faf8b200 r9 : faf87ea0 r8 : 00000001 >> r7 : faf8b2c0 r6 : f9f7a040 r5 : faf7c710 r4 : 00000038 >> r3 : 0000006d r2 : f9f7a0a3 r1 : faf8b32c r0 : f9f7a09f >> Flags: nzCv IRQs off FIQs off Mode SVC_32 >> Code: 4630fc5b 81f0e8bd e7d84606 bf082b2f (f822235c) >> Resetting CPU ... >> >> The three other usb ports work just fine with the same USB stick and >> file. All four ports work with 2019.01. > > Can you debug it ? I think some of this was due to the EFI stuff , which > I think was fixed since. Can you re-check that ? USB appears to be working fine with 2019.10-rc2. live well, vagrant -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 227 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190820/f9476fa2/attachment.sig> ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] dcache issues with wandboard too (was: [PATCH V2 0/7] ARM: imx: Update Novena to DM/DT) 2019-08-20 17:41 ` Vagrant Cascadian @ 2019-09-26 18:52 ` Vagrant Cascadian 2019-09-26 19:59 ` Marek Vasut 2020-01-27 0:02 ` [PATCH V2 0/7] ARM: imx: Update Novena to DM/DT Marek Vasut 1 sibling, 1 reply; 26+ messages in thread From: Vagrant Cascadian @ 2019-09-26 18:52 UTC (permalink / raw) To: u-boot On 2019-08-20, Vagrant Cascadian wrote: > On 2019-08-19, Marek Vasut wrote: >> On 6/4/19 9:06 AM, Vagrant Cascadian wrote: >>> On 2019-05-17, Marek Vasut wrote: >>>> Update Kosagi Novena to DM / DT and remove the warnings. > ... >>> I have two oustanding issues... with some files it sometimes fails to >>> load one or more from SATA: >>> >>> Retrieving file: /boot/initrd.img-5.0.0-trunk-armmp >>> 20077960 bytes read in 375 ms (51.1 MiB/s) >>> Retrieving file: /boot/vmlinuz-5.0.0-trunk-armmp >>> 4215296 bytes read in 40 ms (100.5 MiB/s) >>> append: root=UUID=9666ab0b-f932-4e2f-95d7-0e96a12a4540 ro quiet >>> Retrieving file: /usr/lib/linux-image-5.0.0-trunk-armmp/imx6q-novena.dtb >>> CACHE: Misaligned operation at range [fafb5398, fafb6398] >>> CACHE: Misaligned operation at range [fafb5398, fafb6398] >>> ERROR: v7_outer_cache_inval_range - start address is not aligned - >>> 0xfafb5398 >>> ERROR: v7_outer_cache_inval_range - stop address is not aligned - >>> 0xfafb6398 >>> invalid extent block >>> >>> It then falls back to one of the other kernels (using the extlinux.conf >>> parsing) and succeeds. It consistantly gets a cache/alignment error with >>> this specific file. A bit-for-bit identical .dtb loaded from another >>> path works just fine. Older versions of u-boot boot this fine. Would >>> some particular EXT4 flag possibly be causing issues? >> >> I don't know. Do you still run into this with u-boot/master ? > > Still occurring with 2019.10-rc2. Haven't tested with master yet. > > Using "dcache off" before booting still outputs the CACHE and ERROR > messages, but does successfully boot. Also seeing this problem with wandboard solo with 2019.10-rc4 booting from microSD. Haven't retested with novena recently. Setting CONFIG_SYS_DCACHE_OFF=y avoids the need to manually type "dcache off" ... though obviously doesn't address the real problem. live well, vagrant -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 227 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190926/d010c567/attachment.sig> ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] dcache issues with wandboard too (was: [PATCH V2 0/7] ARM: imx: Update Novena to DM/DT) 2019-09-26 18:52 ` [U-Boot] dcache issues with wandboard too (was: [PATCH V2 0/7] ARM: imx: Update Novena to DM/DT) Vagrant Cascadian @ 2019-09-26 19:59 ` Marek Vasut 0 siblings, 0 replies; 26+ messages in thread From: Marek Vasut @ 2019-09-26 19:59 UTC (permalink / raw) To: u-boot On 9/26/19 8:52 PM, Vagrant Cascadian wrote: > On 2019-08-20, Vagrant Cascadian wrote: >> On 2019-08-19, Marek Vasut wrote: >>> On 6/4/19 9:06 AM, Vagrant Cascadian wrote: >>>> On 2019-05-17, Marek Vasut wrote: >>>>> Update Kosagi Novena to DM / DT and remove the warnings. >> ... >>>> I have two oustanding issues... with some files it sometimes fails to >>>> load one or more from SATA: >>>> >>>> Retrieving file: /boot/initrd.img-5.0.0-trunk-armmp >>>> 20077960 bytes read in 375 ms (51.1 MiB/s) >>>> Retrieving file: /boot/vmlinuz-5.0.0-trunk-armmp >>>> 4215296 bytes read in 40 ms (100.5 MiB/s) >>>> append: root=UUID=9666ab0b-f932-4e2f-95d7-0e96a12a4540 ro quiet >>>> Retrieving file: /usr/lib/linux-image-5.0.0-trunk-armmp/imx6q-novena.dtb >>>> CACHE: Misaligned operation at range [fafb5398, fafb6398] >>>> CACHE: Misaligned operation at range [fafb5398, fafb6398] >>>> ERROR: v7_outer_cache_inval_range - start address is not aligned - >>>> 0xfafb5398 >>>> ERROR: v7_outer_cache_inval_range - stop address is not aligned - >>>> 0xfafb6398 >>>> invalid extent block >>>> >>>> It then falls back to one of the other kernels (using the extlinux.conf >>>> parsing) and succeeds. It consistantly gets a cache/alignment error with >>>> this specific file. A bit-for-bit identical .dtb loaded from another >>>> path works just fine. Older versions of u-boot boot this fine. Would >>>> some particular EXT4 flag possibly be causing issues? >>> >>> I don't know. Do you still run into this with u-boot/master ? >> >> Still occurring with 2019.10-rc2. Haven't tested with master yet. >> >> Using "dcache off" before booting still outputs the CACHE and ERROR >> messages, but does successfully boot. > > Also seeing this problem with wandboard solo with 2019.10-rc4 booting > from microSD. Haven't retested with novena recently. > > Setting CONFIG_SYS_DCACHE_OFF=y avoids the need to manually type "dcache > off" ... though obviously doesn't address the real problem. Can you debug it further or prepare a reproducible testcase ? ^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH V2 0/7] ARM: imx: Update Novena to DM/DT 2019-08-20 17:41 ` Vagrant Cascadian 2019-09-26 18:52 ` [U-Boot] dcache issues with wandboard too (was: [PATCH V2 0/7] ARM: imx: Update Novena to DM/DT) Vagrant Cascadian @ 2020-01-27 0:02 ` Marek Vasut 1 sibling, 0 replies; 26+ messages in thread From: Marek Vasut @ 2020-01-27 0:02 UTC (permalink / raw) To: u-boot On 8/20/19 7:41 PM, Vagrant Cascadian wrote: > On 2019-08-19, Marek Vasut wrote: >> On 6/4/19 9:06 AM, Vagrant Cascadian wrote: >>> On 2019-05-17, Marek Vasut wrote: >>>> Update Kosagi Novena to DM / DT and remove the warnings. > ... >>> I have two oustanding issues... with some files it sometimes fails to >>> load one or more from SATA: >>> >>> Retrieving file: /boot/initrd.img-5.0.0-trunk-armmp >>> 20077960 bytes read in 375 ms (51.1 MiB/s) >>> Retrieving file: /boot/vmlinuz-5.0.0-trunk-armmp >>> 4215296 bytes read in 40 ms (100.5 MiB/s) >>> append: root=UUID=9666ab0b-f932-4e2f-95d7-0e96a12a4540 ro quiet >>> Retrieving file: /usr/lib/linux-image-5.0.0-trunk-armmp/imx6q-novena.dtb >>> CACHE: Misaligned operation at range [fafb5398, fafb6398] >>> CACHE: Misaligned operation at range [fafb5398, fafb6398] >>> ERROR: v7_outer_cache_inval_range - start address is not aligned - >>> 0xfafb5398 >>> ERROR: v7_outer_cache_inval_range - stop address is not aligned - >>> 0xfafb6398 >>> invalid extent block >>> >>> It then falls back to one of the other kernels (using the extlinux.conf >>> parsing) and succeeds. It consistantly gets a cache/alignment error with >>> this specific file. A bit-for-bit identical .dtb loaded from another >>> path works just fine. Older versions of u-boot boot this fine. Would >>> some particular EXT4 flag possibly be causing issues? >> >> I don't know. Do you still run into this with u-boot/master ? > > Still occurring with 2019.10-rc2. Haven't tested with master yet. > > Using "dcache off" before booting still outputs the CACHE and ERROR > messages, but does successfully boot. > > >>> The second issue is still using one out of four exposed USB ports fails >>> and resets the board: >>> >>> load usb 0:1 $kernel_addr_r misc/Binaries/linux/Image >>> data abort >>> pc : [<fefbb67a>] lr : [<fefbb0fd>] >>> reloc pc : [<1783367a>] lr : [<178330fd>] >>> sp : faf7c6e8 ip : 00000003 fp : 00000005 >>> r10: faf8b200 r9 : faf87ea0 r8 : 00000001 >>> r7 : faf8b2c0 r6 : f9f7a040 r5 : faf7c710 r4 : 00000038 >>> r3 : 0000006d r2 : f9f7a0a3 r1 : faf8b32c r0 : f9f7a09f >>> Flags: nzCv IRQs off FIQs off Mode SVC_32 >>> Code: 4630fc5b 81f0e8bd e7d84606 bf082b2f (f822235c) >>> Resetting CPU ... >>> >>> The three other usb ports work just fine with the same USB stick and >>> file. All four ports work with 2019.01. >> >> Can you debug it ? I think some of this was due to the EFI stuff , which >> I think was fixed since. Can you re-check that ? > > USB appears to be working fine with 2019.10-rc2. So what's the current status ? ^ permalink raw reply [flat|nested] 26+ messages in thread
end of thread, other threads:[~2020-01-27 0:02 UTC | newest] Thread overview: 26+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-05-17 18:32 [U-Boot] [PATCH V2 0/7] ARM: imx: Update Novena to DM/DT Marek Vasut 2019-05-17 18:32 ` [U-Boot] [PATCH V2 1/7] ARM: dts: imx: novena: Import Novena DT from Linux Marek Vasut 2019-06-10 9:59 ` [U-Boot] [PATCH V2 1/7] ARM: dts: imx: novena: Import Novena DT sbabic at denx.de 2019-05-17 18:32 ` [U-Boot] [PATCH V2 2/7] ARM: imx: novena: Enable DM pin control Marek Vasut 2019-06-10 9:49 ` sbabic at denx.de 2019-05-17 18:32 ` [U-Boot] [PATCH V2 3/7] ARM: imx: novena: Enable DM GPIO Marek Vasut 2019-06-10 9:49 ` sbabic at denx.de 2019-05-17 18:32 ` [U-Boot] [PATCH V2 4/7] ARM: imx: novena: Convert block devices to DM Marek Vasut 2019-06-10 9:40 ` sbabic at denx.de 2019-05-17 18:32 ` [U-Boot] [PATCH V2 5/7] ARM: imx: novena: Enable DM USB Marek Vasut 2019-06-10 9:41 ` sbabic at denx.de 2019-05-17 18:32 ` [U-Boot] [PATCH V2 6/7] ARM: imx: novena: Enable DM PCI Marek Vasut 2019-06-08 20:45 ` Stefano Babic 2019-06-09 1:49 ` Marek Vasut 2019-06-09 7:34 ` Stefano Babic 2019-06-10 9:39 ` sbabic at denx.de 2019-05-17 18:32 ` [U-Boot] [PATCH V2 7/7] ARM: imx: novena: Convert to DM VIDEO Marek Vasut 2019-06-10 9:59 ` sbabic at denx.de 2019-06-04 7:06 ` [U-Boot] [PATCH V2 0/7] ARM: imx: Update Novena to DM/DT Vagrant Cascadian 2019-06-06 17:17 ` Vagrant Cascadian 2019-06-07 19:09 ` Marek Vasut 2019-08-19 12:37 ` Marek Vasut 2019-08-20 17:41 ` Vagrant Cascadian 2019-09-26 18:52 ` [U-Boot] dcache issues with wandboard too (was: [PATCH V2 0/7] ARM: imx: Update Novena to DM/DT) Vagrant Cascadian 2019-09-26 19:59 ` Marek Vasut 2020-01-27 0:02 ` [PATCH V2 0/7] ARM: imx: Update Novena to DM/DT Marek Vasut
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.