[source] ipq806x: fix leds, sata port for Netgear R7800 and minor fixes - renamed leds in correct color accordance - blink power led with white during boot and with amber when flashing firmware - fixed usb leds - enabled unused wps and rfkill leds as wlan leds. Now rfkill led is for 2.4GHz and wps - 5GHz WIFI - removed unneeded bootargs - removed unneeded pci pins from R7800 DT (driver already handles it in proper way) and add tx offsetting - nand ecc step size - fixed sata ports
LEDE Commits
lede-commits at lists.infradead.org
Thu Nov 3 00:35:05 PDT 2016
blogic pushed a commit to source.git, branch master:
https://git.lede-project.org/bf7166e54569266a7d7525742f3216b4e3064825
commit bf7166e54569266a7d7525742f3216b4e3064825
Author: Pavel Kubelun <be.dissent at gmail.com>
AuthorDate: Sat Oct 1 11:32:58 2016 -0400
ipq806x: fix leds, sata port for Netgear R7800 and minor fixes - renamed leds in correct color accordance - blink power led with white during boot and with amber when flashing firmware - fixed usb leds - enabled unused wps and rfkill leds as wlan leds. Now rfkill led is for 2.4GHz and wps - 5GHz WIFI - removed unneeded bootargs - removed unneeded pci pins from R7800 DT (driver already handles it in proper way) and add tx offsetting - nand ecc step size - fixed sata ports
Signed-off-by: Pavel Kubelun <be.dissent at gmail.com>
---
.../linux/ipq806x/base-files/etc/board.d/01_leds | 11 +++-
.../files/arch/arm/boot/dts/qcom-ipq8065-r7800.dts | 66 +++++++++++-----------
2 files changed, 43 insertions(+), 34 deletions(-)
diff --git a/target/linux/ipq806x/base-files/etc/board.d/01_leds b/target/linux/ipq806x/base-files/etc/board.d/01_leds
index 6809c54..fbe19cd 100755
--- a/target/linux/ipq806x/base-files/etc/board.d/01_leds
+++ b/target/linux/ipq806x/base-files/etc/board.d/01_leds
@@ -20,8 +20,7 @@ c2600)
;;
d7800 |\
r7500 |\
-r7500v2 |\
-r7800)
+r7500v2)
ucidef_set_led_usbdev "usb1" "USB 1" "${board}:white:usb1" "1-1"
ucidef_set_led_usbdev "usb2" "USB 2" "${board}:white:usb3" "3-1"
ucidef_set_led_netdev "wan" "WAN" "${board}:white:wan" "eth0"
@@ -29,6 +28,14 @@ r7800)
ucidef_set_led_default "wps" "WPS" "${board}:white:wps" "0"
ucidef_set_led_default "rfkill" "rfkill" "${board}:white:rfkill" "0"
;;
+r7800)
+ ucidef_set_led_usbdev "usb1" "USB 1" "${board}:white:usb1" "2-1"
+ ucidef_set_led_usbdev "usb2" "USB 2" "${board}:white:usb2" "4-1"
+ ucidef_set_led_netdev "wan" "WAN" "${board}:white:wan" "eth0"
+ ucidef_set_led_ide "esata" "eSATA" "${board}:white:esata"
+ ucidef_set_led_wlan "wps" "WPS" "${board}:white:wps" "phy0tpt"
+ ucidef_set_led_wlan "rfkill" "rfkill" "${board}:white:rfkill" "phy1tpt"
+ ;;
ea8500)
ucidef_set_led_wlan "wifi" "WIFI" "ea8500:green:wifi" "phy0radio"
ucidef_set_led_default "wps" "WPS" "ea8500:green:wps" "0"
diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-r7800.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
index 6d9349f..43ee572 100644
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
@@ -4,7 +4,7 @@
/ {
model = "Netgear Nighthawk X4S R7800";
- compatible = "netgear,r7800", "qcom,ipq8065";
+ compatible = "netgear,r7800", "qcom,ipq8065", "qcom,ipq8064";
memory at 0 {
reg = <0x42000000 0x1e000000>;
@@ -29,10 +29,14 @@
aliases {
serial0 = &uart4;
mdio-gpio0 = &mdio0;
+
+ led-boot = &power_white;
+ led-failsafe = &power_white;
+ led-running = &power_white;
+ led-upgrade = &power_amber;
};
chosen {
- bootargs = "rootfstype=squashfs noinitrd";
linux,stdout-path = "serial0:115200n8";
};
@@ -160,6 +164,7 @@
};
sata at 29000000 {
+ ports-implemented = <0x1>;
status = "ok";
};
@@ -189,16 +194,12 @@
pcie0: pci at 1b500000 {
status = "ok";
- reset-gpio = <&qcom_pinmux 3 GPIO_ACTIVE_LOW>;
- pinctrl-0 = <&pcie0_pins>;
- pinctrl-names = "default";
+ phy-tx0-term-offset = <7>;
};
pcie1: pci at 1b700000 {
status = "ok";
- reset-gpio = <&qcom_pinmux 48 GPIO_ACTIVE_LOW>;
- pinctrl-0 = <&pcie1_pins>;
- pinctrl-names = "default";
+ phy-tx0-term-offset = <7>;
};
nand at 1ac00000 {
@@ -208,6 +209,7 @@
pinctrl-names = "default";
nand-ecc-strength = <4>;
+ nand-ecc-step-size = <512>;
nand-bus-width = <8>;
#address-cells = <1>;
@@ -368,7 +370,7 @@
wifi {
label = "wifi";
gpios = <&qcom_pinmux 6 1>;
- linux,code = <KEY_WLAN>;
+ linux,code = <KEY_RFKILL>;
};
reset {
@@ -387,34 +389,35 @@
gpio-leds {
compatible = "gpio-leds";
- usb1 {
- label = "r7800:amber:usb1";
- gpios = <&qcom_pinmux 7 0>;
- };
-
- usb3 {
- label = "r7800:amber:usb3";
- gpios = <&qcom_pinmux 8 0>;
+ power_white: power_white {
+ label = "r7800:white:power";
+ gpios = <&qcom_pinmux 53 0>;
+ default-state = "on";
};
- status {
- label = "r7800:amber:status";
+ power_amber: power_amber {
+ label = "r7800:amber:power";
gpios = <&qcom_pinmux 9 0>;
};
- internet {
- label = "r7800:white:internet";
+ wan_white {
+ label = "r7800:white:wan";
gpios = <&qcom_pinmux 22 0>;
};
- wan {
- label = "r7800:white:wan";
+ wan_amber {
+ label = "r7800:amber:wan";
gpios = <&qcom_pinmux 23 0>;
};
- wps {
- label = "r7800:white:wps";
- gpios = <&qcom_pinmux 24 0>;
+ usb1 {
+ label = "r7800:white:usb1";
+ gpios = <&qcom_pinmux 7 0>;
+ };
+
+ usb2 {
+ label = "r7800:white:usb2";
+ gpios = <&qcom_pinmux 8 0>;
};
esata {
@@ -422,17 +425,16 @@
gpios = <&qcom_pinmux 26 0>;
};
- power {
- label = "r7800:white:power";
- gpios = <&qcom_pinmux 53 0>;
- default-state = "on";
- };
-
rfkill {
label = "r7800:white:rfkill";
gpios = <&qcom_pinmux 64 0>;
};
+ wps {
+ label = "r7800:white:wps";
+ gpios = <&qcom_pinmux 24 0>;
+ };
+
wifi {
label = "r7800:white:wifi";
gpios = <&qcom_pinmux 67 0>;
More information about the lede-commits
mailing list