mirror of
https://github.com/Fishwaldo/build.git
synced 2025-07-23 13:29:33 +00:00
23604e8a0d
* Introducing Rockchip rk322x SoC support Main features: - Legacy kernel flavour based upon stable v2.x rk3288 Rockchip branch (https://github.com/rockchip-linux/kernel/tree/stable-4.4-rk3288-linux-v2.x) - Current kernel flavour based on mainline 5.6.y kernel - Mainline u-boot (v2020.04) - Single generic tv box target (rk322x-box) which boots on all the known tv boxes - Hardware devices (eMMC/NAND, led wiring configuration, SoC variant selection) modulation done by user at runtime via device tree overlays - a script (rk322x-config) is provided for autodetection and simple configuration by inexperienced users; - Bits added to armbian-hardware-optimization to set affinity for irq handlers - rk322x-box targets already added to targets.conf for automatic image creation * Removed disabled patches * Restored mysteriously removed comment character
92 lines
2.3 KiB
Diff
92 lines
2.3 KiB
Diff
diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi
|
|
index b2fcf0e75..25051c03f 100644
|
|
--- a/arch/arm/boot/dts/rk322x.dtsi
|
|
+++ b/arch/arm/boot/dts/rk322x.dtsi
|
|
@@ -1149,51 +1149,71 @@
|
|
|
|
flash_cs0: flash-cs0 {
|
|
rockchip,pins =
|
|
- <2 RK_PA6 1 &pcfg_pull_none>;
|
|
+ <2 RK_PA6 RK_FUNC_1 &pcfg_pull_up>;
|
|
};
|
|
|
|
flash_cs1: flash-cs1 {
|
|
rockchip,pins =
|
|
- <0 RK_PC7 1 &pcfg_pull_none>;
|
|
+ <0 RK_PC7 RK_FUNC_1 &pcfg_pull_up>;
|
|
+ };
|
|
+
|
|
+ flash_cs2: flash-cs2 {
|
|
+ rockchip,pins =
|
|
+ <1 RK_PC6 RK_FUNC_1 &pcfg_pull_up>;
|
|
+ };
|
|
+
|
|
+ flash_cs3: flash-cs3 {
|
|
+ rockchip,pins =
|
|
+ <1 RK_PC7 RK_FUNC_1 &pcfg_pull_up>;
|
|
};
|
|
|
|
flash_rdy: flash-rdy {
|
|
rockchip,pins =
|
|
- <2 RK_PA4 1 &pcfg_pull_none>;
|
|
+ <2 RK_PA4 RK_FUNC_1 &pcfg_pull_up>;
|
|
};
|
|
|
|
flash_ale: flash-ale {
|
|
rockchip,pins =
|
|
- <2 RK_PA0 1 &pcfg_pull_none>;
|
|
+ <2 RK_PA0 RK_FUNC_1 &pcfg_pull_down>;
|
|
};
|
|
|
|
flash_cle: flash-cle {
|
|
rockchip,pins =
|
|
- <2 RK_PA1 1 &pcfg_pull_none>;
|
|
+ <2 RK_PA1 RK_FUNC_1 &pcfg_pull_down>;
|
|
};
|
|
|
|
flash_wrn: flash-wrn {
|
|
- rockchip,pins =
|
|
- <2 RK_PA2 1 &pcfg_pull_none>;
|
|
+ rockchip,pins =
|
|
+ <2 RK_PA2 RK_FUNC_1 &pcfg_pull_up>;
|
|
};
|
|
|
|
flash_rdn: flash-rdn {
|
|
rockchip,pins =
|
|
- <2 RK_PA3 1 &pcfg_pull_none>;
|
|
+ <2 RK_PA3 RK_FUNC_1 &pcfg_pull_up>;
|
|
};
|
|
|
|
flash_bus8: flash-bus8 {
|
|
- rockchip,pins = <1 RK_PD0 1 &pcfg_pull_none>,
|
|
- <1 RK_PD1 1 &pcfg_pull_none>,
|
|
- <1 RK_PD2 1 &pcfg_pull_none>,
|
|
- <1 RK_PD3 1 &pcfg_pull_none>,
|
|
- <1 RK_PD4 1 &pcfg_pull_none>,
|
|
- <1 RK_PD5 1 &pcfg_pull_none>,
|
|
- <1 RK_PD6 1 &pcfg_pull_none>,
|
|
- <1 RK_PD7 1 &pcfg_pull_none>;
|
|
+ rockchip,pins = <1 RK_PD0 RK_FUNC_1 &pcfg_pull_up>,
|
|
+ <1 RK_PD1 RK_FUNC_1 &pcfg_pull_up>,
|
|
+ <1 RK_PD2 RK_FUNC_1 &pcfg_pull_up>,
|
|
+ <1 RK_PD3 RK_FUNC_1 &pcfg_pull_up>,
|
|
+ <1 RK_PD4 RK_FUNC_1 &pcfg_pull_up>,
|
|
+ <1 RK_PD5 RK_FUNC_1 &pcfg_pull_up>,
|
|
+ <1 RK_PD6 RK_FUNC_1 &pcfg_pull_up>,
|
|
+ <1 RK_PD7 RK_FUNC_1 &pcfg_pull_up>;
|
|
};
|
|
+
|
|
+ flash_dqs: flash-dqs {
|
|
+ rockchip,pins = <2 RK_PA7 RK_FUNC_1 &pcfg_pull_up>;
|
|
+ };
|
|
+
|
|
+ flash_wp: flash-wp {
|
|
+ rockchip,pins = <2 RK_PA5 RK_FUNC_1 &pcfg_pull_down>;
|
|
+ };
|
|
+
|
|
};
|
|
|
|
+
|
|
gmac {
|
|
rgmii_pins: rgmii-pins {
|
|
rockchip,pins = <2 RK_PB6 1 &pcfg_pull_none>,
|