fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipq40xx: fix build error for cm520-79f (#30)

Browse Source 
This commit fix 94a743ea53

Signed-off-by: AmadeusGhost <amadeus@jmu.edu.cn>
This commit is contained in:
AmadeusGhost 2020-02-19 21:29:47 +08:00 committed by GitHub
parent 103c855481
commit 223124e43d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 53 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/ipq40xx/base-files/etc/board.d/02_network
View File

@ -55,7 +55,7 @@ ipq40xx_setup_interfaces()
;;
mobipromo,cm520-79f)
ucidef_add_switch "switch0" \
"0u@eth0" "3:lan:2" "4:lan:1"
"0t@eth0" "3:lan:2" "4:lan:1"
ucidef_set_interface_wan "eth1"
;;
*)

42
target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts
View File

@ -1,5 +1,10 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Copyright (C) 2019 LGA1150
* Copyright (C) 2020 Mleaf
*/
#include "qcom-ipq4019.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
@ -14,6 +19,7 @@
led-failsafe = &led_sys;
led-running = &led_sys;
led-upgrade = &led_sys;
serial0 = &blsp1_uart1;
};
chosen {
@ -30,7 +36,7 @@
pinctrl-0 = <&mdio_pins>;
pinctrl-names = "default";
reset-gpios = <&tlmm 47 GPIO_ACTIVE_LOW>;
reset-delay-us = <1000>;
reset-delay-us = <5000>;
};
ess-psgmii@98000 {
@ -133,15 +139,15 @@
leds {
compatible = "gpio-leds";
usb {
led_usb: usb {
label = "cm520-79f:blue:usb";
gpios = <&tlmm 10 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "usbport";
trigger-sources = <&usb3_port1>, <&usb3_port2>, <&usb2_port1>;
};
led_sys: can {
label = "cm520-79f:blue:can";
led_sys: sys {
label = "cm520-79f:blue:sys";
gpios = <&tlmm 11 GPIO_ACTIVE_HIGH>;
};
@ -190,10 +196,8 @@
&blsp1_uart1 {
status = "okay";
};
&blsp1_uart2 {
status = "okay";
pinctrl-0 = <&serial_0_pins>;
pinctrl-names = "default";
};
&cryptobam {
@ -220,7 +224,7 @@
#size-cells = <1>;
partition@0 {
label = "bootloader";
label = "Bootloader";
reg = <0x0 0xb00000>;
};
@ -243,6 +247,12 @@
};
&tlmm {
serial_0_pins: serial0-pinmux {
pins = "gpio16", "gpio17";
function = "blsp_uart0";
bias-disable;
};
mdio_pins: mdio_pinmux {
mux_1 {
pins = "gpio6";
@ -259,18 +269,18 @@
nand_pins: nand_pins {
pullups {
pins = "gpio52", "gpio53", "gpio58",
"gpio59";
pins = "gpio53", "gpio58", "gpio59";
function = "qpic";
bias-pull-up;
};
// gpio61 controls led_usb
pulldowns {
pins = "gpio54", "gpio55", "gpio56",
"gpio57", "gpio60", "gpio61",
"gpio62", "gpio63", "gpio64",
"gpio65", "gpio66", "gpio67",
"gpio68", "gpio69";
pins = "gpio55", "gpio56", "gpio57",
"gpio60", "gpio62", "gpio63",
"gpio64", "gpio65", "gpio66",
"gpio67", "gpio68", "gpio69";
function = "qpic";
bias-pull-down;
};

42
target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts
View File

@ -1,5 +1,10 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Copyright (C) 2019 LGA1150
* Copyright (C) 2020 Mleaf
*/
#include "qcom-ipq4019.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
@ -14,6 +19,7 @@
led-failsafe = &led_sys;
led-running = &led_sys;
led-upgrade = &led_sys;
serial0 = &blsp1_uart1;
};
chosen {
@ -30,7 +36,7 @@
pinctrl-0 = <&mdio_pins>;
pinctrl-names = "default";
reset-gpios = <&tlmm 47 GPIO_ACTIVE_LOW>;
reset-delay-us = <1000>;
reset-delay-us = <5000>;
};
ess-psgmii@98000 {
@ -133,15 +139,15 @@
leds {
compatible = "gpio-leds";
usb {
led_usb: usb {
label = "cm520-79f:blue:usb";
gpios = <&tlmm 10 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "usbport";
trigger-sources = <&usb3_port1>, <&usb3_port2>, <&usb2_port1>;
};
led_sys: can {
label = "cm520-79f:blue:can";
led_sys: sys {
label = "cm520-79f:blue:sys";
gpios = <&tlmm 11 GPIO_ACTIVE_HIGH>;
};
@ -190,10 +196,8 @@
&blsp1_uart1 {
status = "okay";
};
&blsp1_uart2 {
status = "okay";
pinctrl-0 = <&serial_0_pins>;
pinctrl-names = "default";
};
&cryptobam {
@ -220,7 +224,7 @@
#size-cells = <1>;
partition@0 {
label = "bootloader";
label = "Bootloader";
reg = <0x0 0xb00000>;
};
@ -243,6 +247,12 @@
};
&tlmm {
serial_0_pins: serial0-pinmux {
pins = "gpio16", "gpio17";
function = "blsp_uart0";
bias-disable;
};
mdio_pins: mdio_pinmux {
mux_1 {
pins = "gpio6";
@ -259,18 +269,18 @@
nand_pins: nand_pins {
pullups {
pins = "gpio52", "gpio53", "gpio58",
"gpio59";
pins = "gpio53", "gpio58", "gpio59";
function = "qpic";
bias-pull-up;
};
// gpio61 controls led_usb
pulldowns {
pins = "gpio54", "gpio55", "gpio56",
"gpio57", "gpio60", "gpio61",
"gpio62", "gpio63", "gpio64",
"gpio65", "gpio66", "gpio67",
"gpio68", "gpio69";
pins = "gpio55", "gpio56", "gpio57",
"gpio60", "gpio62", "gpio63",
"gpio64", "gpio65", "gpio66",
"gpio67", "gpio68", "gpio69";
function = "qpic";
bias-pull-down;
};