mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-14 17:07:38 +00:00
def50c66cc
The pcie pinctrl override added in the commita76aa6ffa6("rockchip: rk3568-rock-3a: Enable PCIe and NVMe support") is causing a pinmux issue on linux when using a EFI boot flow. The pcie reset-gpios must however be configured with gpio function, or the device will freeze running pci enum and nothing is connected. Adjust the pinctrl override in u-boot.dtsi to fix this issue. PCIe/NVMe continues to work in both U-Boot and linux after this change. Also revert disable of sdmmc2 and uart1 to fix use of wifi in linux when using a EFI boot flow. Fixes:a76aa6ffa6("rockchip: rk3568-rock-3a: Enable PCIe and NVMe support") Fixes:073d911ae6("rockchip: rk3568-rock-3a: Sync device tree from linux") Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
56 lines
874 B
Text
56 lines
874 B
Text
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* (C) Copyright 2021 Rockchip Electronics Co., Ltd
|
|
* (C) Copyright 2023 Akash Gajjar <gajjar04akash@gmail.com>
|
|
*/
|
|
|
|
#include "rk356x-u-boot.dtsi"
|
|
|
|
/ {
|
|
chosen {
|
|
stdout-path = &uart2;
|
|
};
|
|
};
|
|
|
|
&pcie3x2 {
|
|
pinctrl-0 = <&pcie3x2_reset_h>;
|
|
};
|
|
|
|
&pinctrl {
|
|
pcie {
|
|
pcie3x2_reset_h: pcie3x2-reset-h {
|
|
rockchip,pins = <2 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>;
|
|
};
|
|
};
|
|
};
|
|
|
|
&sdhci {
|
|
cap-mmc-highspeed;
|
|
mmc-ddr-1_8v;
|
|
mmc-hs200-1_8v;
|
|
mmc-hs400-1_8v;
|
|
mmc-hs400-enhanced-strobe;
|
|
};
|
|
|
|
&sfc {
|
|
bootph-pre-ram;
|
|
u-boot,spl-sfc-no-dma;
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
status = "okay";
|
|
|
|
flash@0 {
|
|
bootph-pre-ram;
|
|
compatible = "jedec,spi-nor";
|
|
reg = <0>;
|
|
spi-max-frequency = <24000000>;
|
|
spi-rx-bus-width = <4>;
|
|
spi-tx-bus-width = <1>;
|
|
};
|
|
};
|
|
|
|
&uart2 {
|
|
clock-frequency = <24000000>;
|
|
bootph-all;
|
|
status = "okay";
|
|
};
|