mirror of
https://github.com/torvalds/linux.git
synced 2026-04-18 06:44:00 -04:00
This reverts commit8124b4a4a9. The change introduced a regression: at least Colibri iMX6ULL and Colibri iMX7 no longer boot with that commit applied, while they boot again after reverting it. Although this has only been verified on these two modules, the issue is expected to affect all device trees using the gpmi-nand driver. [ 0.876938] Creating 5 MTD partitions on "gpmi-nand": [ 0.876974] 0x000000000000-0x000000080000 : "mx7-bcb" [ 0.879860] 0x000000080000-0x000000200000 : "u-boot1" [ 0.884761] 0x000000200000-0x000000380000 : "u-boot2" [ 0.886993] 0x000000380000-0x000000400000 : "u-boot-env" [ 0.894686] 0x000000400000-0x000020000000 : "ubi" [ 0.899054] gpmi-nand 33002000.nand-controller: driver registered. ... [ 0.960443] ubi0: default fastmap pool size: 200 [ 0.960476] ubi0: default fastmap WL pool size: 100 [ 0.960500] ubi0: attaching mtd4 [ 1.636355] ubi0 error: scan_peb: bad image sequence number 1588722158 in PEB 4060, expected 1574791632 ... [ 1.649889] ubi0 error: ubi_attach_mtd_dev: failed to attach mtd4, error -22 [ 1.650029] UBI error: cannot attach mtd4 ... [ 1.670262] Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(0,253) Fixes:8124b4a4a9("ARM: dts: imx: move nand related property under nand@0") Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Signed-off-by: Frank Li <Frank.Li@nxp.com>
239 lines
6.3 KiB
Plaintext
239 lines
6.3 KiB
Plaintext
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* Copyright (C) 2020 Linumiz
|
|
* Author: Parthiban Nallathambi <parthiban@linumiz.com>
|
|
*/
|
|
|
|
#include <dt-bindings/gpio/gpio.h>
|
|
#include <dt-bindings/interrupt-controller/irq.h>
|
|
#include <dt-bindings/pwm/pwm.h>
|
|
|
|
/ {
|
|
model = "MYiR MYS-6ULX Single Board Computer";
|
|
compatible = "fsl,imx6ull";
|
|
|
|
chosen {
|
|
stdout-path = &uart1;
|
|
};
|
|
|
|
reg_vdd_5v: regulator-vdd-5v {
|
|
compatible = "regulator-fixed";
|
|
regulator-name = "VDD_5V";
|
|
regulator-min-microvolt = <5000000>;
|
|
regulator-max-microvolt = <5000000>;
|
|
regulator-always-on;
|
|
regulator-boot-on;
|
|
};
|
|
|
|
reg_vdd_3v3: regulator-vdd-3v3 {
|
|
compatible = "regulator-fixed";
|
|
regulator-name = "VDD_3V3";
|
|
regulator-min-microvolt = <3300000>;
|
|
regulator-max-microvolt = <3300000>;
|
|
regulator-always-on;
|
|
vin-supply = <®_vdd_5v>;
|
|
};
|
|
};
|
|
|
|
&fec1 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&pinctrl_enet1>;
|
|
phy-mode = "rmii";
|
|
phy-handle = <ðphy0>;
|
|
phy-supply = <®_vdd_3v3>;
|
|
status = "okay";
|
|
|
|
mdio: mdio {
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
|
|
ethphy0: ethernet-phy@0 {
|
|
reg = <0>;
|
|
interrupt-parent = <&gpio5>;
|
|
interrupts = <5 IRQ_TYPE_LEVEL_LOW>;
|
|
clocks = <&clks IMX6UL_CLK_ENET_REF>;
|
|
clock-names = "rmii-ref";
|
|
};
|
|
};
|
|
};
|
|
|
|
&gpmi {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&pinctrl_gpmi_nand>;
|
|
nand-on-flash-bbt;
|
|
status = "disabled";
|
|
};
|
|
|
|
&uart1 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&pinctrl_uart1>;
|
|
status = "okay";
|
|
};
|
|
|
|
&usbotg1 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&pinctrl_usb_otg1_id>;
|
|
dr_mode = "otg";
|
|
status = "okay";
|
|
};
|
|
|
|
&usbotg2 {
|
|
dr_mode = "host";
|
|
disable-over-current;
|
|
status = "okay";
|
|
};
|
|
|
|
&usdhc1 {
|
|
pinctrl-names = "default", "state_100mhz", "state_200mhz";
|
|
pinctrl-0 = <&pinctrl_usdhc1>;
|
|
pinctrl-1 = <&pinctrl_usdhc1_100mhz>;
|
|
pinctrl-2 = <&pinctrl_usdhc1_200mhz>;
|
|
cd-gpios = <&gpio1 19 GPIO_ACTIVE_LOW>;
|
|
no-1-8-v;
|
|
keep-power-in-suspend;
|
|
wakeup-source;
|
|
vmmc-supply = <®_vdd_3v3>;
|
|
status = "okay";
|
|
};
|
|
|
|
&usdhc2 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&pinctrl_usdhc2>;
|
|
pinctrl-1 = <&pinctrl_usdhc2_100mhz>;
|
|
pinctrl-2 = <&pinctrl_usdhc2_200mhz>;
|
|
bus-width = <8>;
|
|
non-removable;
|
|
keep-power-in-suspend;
|
|
vmmc-supply = <®_vdd_3v3>;
|
|
};
|
|
|
|
&iomuxc {
|
|
pinctrl_enet1: enet1grp {
|
|
fsl,pins = <
|
|
MX6UL_PAD_GPIO1_IO06__ENET1_MDIO 0x1b0b0
|
|
MX6UL_PAD_GPIO1_IO07__ENET1_MDC 0x1b0b0
|
|
MX6UL_PAD_ENET1_RX_EN__ENET1_RX_EN 0x1b0b0
|
|
MX6UL_PAD_ENET1_RX_ER__ENET1_RX_ER 0x1b0b0
|
|
MX6UL_PAD_ENET1_RX_DATA0__ENET1_RDATA00 0x1b0b0
|
|
MX6UL_PAD_ENET1_RX_DATA1__ENET1_RDATA01 0x1b0b0
|
|
MX6UL_PAD_ENET1_TX_EN__ENET1_TX_EN 0x1b0b0
|
|
MX6UL_PAD_ENET1_TX_DATA0__ENET1_TDATA00 0x1b0b0
|
|
MX6UL_PAD_ENET1_TX_DATA1__ENET1_TDATA01 0x1b0b0
|
|
MX6UL_PAD_ENET1_TX_CLK__ENET1_REF_CLK1 0x4001b031
|
|
MX6UL_PAD_SNVS_TAMPER5__GPIO5_IO05 0x1b0b0
|
|
>;
|
|
};
|
|
|
|
pinctrl_gpmi_nand: gpminandgrp {
|
|
fsl,pins = <
|
|
MX6UL_PAD_NAND_CLE__RAWNAND_CLE 0x0b0b1
|
|
MX6UL_PAD_NAND_ALE__RAWNAND_ALE 0x0b0b1
|
|
MX6UL_PAD_NAND_WP_B__RAWNAND_WP_B 0x0b0b1
|
|
MX6UL_PAD_NAND_READY_B__RAWNAND_READY_B 0x0b000
|
|
MX6UL_PAD_NAND_CE0_B__RAWNAND_CE0_B 0x0b0b1
|
|
MX6UL_PAD_NAND_RE_B__RAWNAND_RE_B 0x0b0b1
|
|
MX6UL_PAD_NAND_WE_B__RAWNAND_WE_B 0x0b0b1
|
|
MX6UL_PAD_NAND_DATA00__RAWNAND_DATA00 0x0b0b1
|
|
MX6UL_PAD_NAND_DATA01__RAWNAND_DATA01 0x0b0b1
|
|
MX6UL_PAD_NAND_DATA02__RAWNAND_DATA02 0x0b0b1
|
|
MX6UL_PAD_NAND_DATA03__RAWNAND_DATA03 0x0b0b1
|
|
MX6UL_PAD_NAND_DATA04__RAWNAND_DATA04 0x0b0b1
|
|
MX6UL_PAD_NAND_DATA05__RAWNAND_DATA05 0x0b0b1
|
|
MX6UL_PAD_NAND_DATA06__RAWNAND_DATA06 0x0b0b1
|
|
MX6UL_PAD_NAND_DATA07__RAWNAND_DATA07 0x0b0b1
|
|
>;
|
|
};
|
|
|
|
pinctrl_uart1: uart1grp {
|
|
fsl,pins = <
|
|
MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX 0x1b0b1
|
|
MX6UL_PAD_UART1_RX_DATA__UART1_DCE_RX 0x1b0b1
|
|
>;
|
|
};
|
|
|
|
pinctrl_usb_otg1_id: usbotg1idgrp {
|
|
fsl,pins = <
|
|
MX6UL_PAD_GPIO1_IO00__ANATOP_OTG1_ID 0x17059
|
|
>;
|
|
};
|
|
|
|
pinctrl_usdhc1: usdhc1grp {
|
|
fsl,pins = <
|
|
MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x17059
|
|
MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x10059
|
|
MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x17059
|
|
MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x17059
|
|
MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x17059
|
|
MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x17059
|
|
MX6UL_PAD_UART1_RTS_B__GPIO1_IO19 0x17059
|
|
>;
|
|
};
|
|
|
|
pinctrl_usdhc1_100mhz: usdhc1-100mhz-grp {
|
|
fsl,pins = <
|
|
MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x170b9
|
|
MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x100b9
|
|
MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x170b9
|
|
MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x170b9
|
|
MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x170b9
|
|
MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x170b9
|
|
>;
|
|
};
|
|
|
|
pinctrl_usdhc1_200mhz: usdhc1-200mhz-grp {
|
|
fsl,pins = <
|
|
MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x170f9
|
|
MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x100f9
|
|
MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x170f9
|
|
MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x170f9
|
|
MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x170f9
|
|
MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x170f9
|
|
>;
|
|
};
|
|
|
|
pinctrl_usdhc2: usdhc2grp {
|
|
fsl,pins = <
|
|
MX6UL_PAD_NAND_RE_B__USDHC2_CLK 0x10069
|
|
MX6UL_PAD_NAND_WE_B__USDHC2_CMD 0x17059
|
|
MX6UL_PAD_NAND_DATA00__USDHC2_DATA0 0x17059
|
|
MX6UL_PAD_NAND_DATA01__USDHC2_DATA1 0x17059
|
|
MX6UL_PAD_NAND_DATA02__USDHC2_DATA2 0x17059
|
|
MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x17059
|
|
MX6UL_PAD_NAND_DATA04__USDHC2_DATA4 0x17059
|
|
MX6UL_PAD_NAND_DATA05__USDHC2_DATA5 0x17059
|
|
MX6UL_PAD_NAND_DATA06__USDHC2_DATA6 0x17059
|
|
MX6UL_PAD_NAND_DATA07__USDHC2_DATA7 0x17059
|
|
>;
|
|
};
|
|
|
|
pinctrl_usdhc2_100mhz: usdhc2-100mhz-grp {
|
|
fsl,pins = <
|
|
MX6UL_PAD_NAND_RE_B__USDHC2_CLK 0x100b9
|
|
MX6UL_PAD_NAND_WE_B__USDHC2_CMD 0x170b9
|
|
MX6UL_PAD_NAND_DATA00__USDHC2_DATA0 0x170b9
|
|
MX6UL_PAD_NAND_DATA01__USDHC2_DATA1 0x170b9
|
|
MX6UL_PAD_NAND_DATA02__USDHC2_DATA2 0x170b9
|
|
MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x170b9
|
|
MX6UL_PAD_NAND_DATA04__USDHC2_DATA4 0x170b9
|
|
MX6UL_PAD_NAND_DATA05__USDHC2_DATA5 0x170b9
|
|
MX6UL_PAD_NAND_DATA06__USDHC2_DATA6 0x170b9
|
|
MX6UL_PAD_NAND_DATA07__USDHC2_DATA7 0x170b9
|
|
>;
|
|
};
|
|
|
|
pinctrl_usdhc2_200mhz: usdhc2-200mhz-grp {
|
|
fsl,pins = <
|
|
MX6UL_PAD_NAND_RE_B__USDHC2_CLK 0x100f9
|
|
MX6UL_PAD_NAND_WE_B__USDHC2_CMD 0x170f9
|
|
MX6UL_PAD_NAND_DATA00__USDHC2_DATA0 0x170f9
|
|
MX6UL_PAD_NAND_DATA01__USDHC2_DATA1 0x170f9
|
|
MX6UL_PAD_NAND_DATA02__USDHC2_DATA2 0x170f9
|
|
MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x170f9
|
|
MX6UL_PAD_NAND_DATA04__USDHC2_DATA4 0x170f9
|
|
MX6UL_PAD_NAND_DATA05__USDHC2_DATA5 0x170f9
|
|
MX6UL_PAD_NAND_DATA06__USDHC2_DATA6 0x170f9
|
|
MX6UL_PAD_NAND_DATA07__USDHC2_DATA7 0x170f9
|
|
>;
|
|
};
|
|
};
|