7b74b40fe9
Remove the "firmware" partition definition from the DTS of R7800
to fix sysupgrade.
Commit 4645a6d3 defined CONFIG_MTD_SPLIT_UIMAGE_FW=y for ipq806x
and that causes mtd to misbehave as additional kernel and ubi
partitions are detected from inside the "firmware" partition.
[ 1.111324] 0x000001480000-0x000001880000 : "kernel"
[ 1.121005] 0x000001880000-0x000007900000 : "ubi"
[ 1.283912] 0x000007900000-0x000008000000 : "reserve"
[ 1.296407] 0x000001480000-0x000007900000 : "firmware"
[ 1.468043] no rootfs found after FIT image in "firmware"
[ 2.426860] 2 uimage-fw partitions found on MTD device firmware
[ 2.426931] 0x000001480000-0x000001880000 : "kernel"
[ 2.440420] 0x000001880000-0x000007900000 : "ubi"
Both kernel and ubi are already defined in DTS, so this duplication
leads into errors in sysupgrade:
Writing from <stdin> to kernel ...
ubiattach: error!: strtoul: unable to parse the number '6 mtd10'
ubiattach: error!: bad MTD device number: "6 mtd10"
The partition is defined to same area as kernel+ubi, and is not
needed for sysupgrade anymore. Remove it to fix things.
Only tested for the R7800 but all of them should behave equal.
Fixes: FS#1617
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
[squashed commits, add "tested on" note]
Signed-off-by: Mathias Kresin <dev@kresin.me>
514 lines
9.7 KiB
Text
514 lines
9.7 KiB
Text
#include "qcom-ipq8065.dtsi"
|
|
|
|
#include <dt-bindings/input/input.h>
|
|
|
|
/ {
|
|
model = "Netgear Nighthawk X4S R7800";
|
|
compatible = "netgear,r7800", "qcom,ipq8065", "qcom,ipq8064";
|
|
|
|
memory@0 {
|
|
reg = <0x42000000 0x1e000000>;
|
|
device_type = "memory";
|
|
};
|
|
|
|
reserved-memory {
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
ranges;
|
|
rsvd@41200000 {
|
|
reg = <0x41200000 0x300000>;
|
|
no-map;
|
|
};
|
|
|
|
rsvd@5fe00000 {
|
|
reg = <0x5fe00000 0x200000>;
|
|
reusable;
|
|
};
|
|
};
|
|
|
|
aliases {
|
|
serial0 = &gsbi4_serial;
|
|
mdio-gpio0 = &mdio0;
|
|
|
|
led-boot = &power_white;
|
|
led-failsafe = &power_amber;
|
|
led-running = &power_white;
|
|
led-upgrade = &power_amber;
|
|
};
|
|
|
|
chosen {
|
|
linux,stdout-path = "serial0:115200n8";
|
|
};
|
|
|
|
soc {
|
|
pinmux@800000 {
|
|
button_pins: button_pins {
|
|
mux {
|
|
pins = "gpio6", "gpio54", "gpio65";
|
|
function = "gpio";
|
|
drive-strength = <2>;
|
|
bias-pull-up;
|
|
};
|
|
};
|
|
|
|
i2c4_pins: i2c4_pinmux {
|
|
mux {
|
|
pins = "gpio12", "gpio13";
|
|
function = "gsbi4";
|
|
drive-strength = <12>;
|
|
bias-disable;
|
|
};
|
|
};
|
|
|
|
led_pins: led_pins {
|
|
pins = "gpio7", "gpio8", "gpio9", "gpio22", "gpio23",
|
|
"gpio24","gpio26", "gpio53", "gpio64";
|
|
function = "gpio";
|
|
drive-strength = <2>;
|
|
bias-pull-down;
|
|
};
|
|
|
|
nand_pins: nand_pins {
|
|
mux {
|
|
pins = "gpio34", "gpio35", "gpio36",
|
|
"gpio37", "gpio38", "gpio39",
|
|
"gpio40", "gpio41", "gpio42",
|
|
"gpio43", "gpio44", "gpio45",
|
|
"gpio46", "gpio47";
|
|
function = "nand";
|
|
drive-strength = <10>;
|
|
bias-disable;
|
|
};
|
|
pullups {
|
|
pins = "gpio39";
|
|
bias-pull-up;
|
|
};
|
|
hold {
|
|
pins = "gpio40", "gpio41", "gpio42",
|
|
"gpio43", "gpio44", "gpio45",
|
|
"gpio46", "gpio47";
|
|
bias-bus-hold;
|
|
};
|
|
};
|
|
|
|
mdio0_pins: mdio0_pins {
|
|
mux {
|
|
pins = "gpio0", "gpio1";
|
|
function = "gpio";
|
|
drive-strength = <8>;
|
|
bias-disable;
|
|
};
|
|
|
|
clk {
|
|
pins = "gpio1";
|
|
input-disable;
|
|
};
|
|
};
|
|
|
|
rgmii2_pins: rgmii2_pins {
|
|
mux {
|
|
pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
|
|
"gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
|
|
function = "rgmii2";
|
|
drive-strength = <8>;
|
|
bias-disable;
|
|
};
|
|
|
|
tx {
|
|
pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32" ;
|
|
input-disable;
|
|
};
|
|
};
|
|
|
|
spi_pins: spi_pins {
|
|
mux {
|
|
pins = "gpio18", "gpio19", "gpio21";
|
|
function = "gsbi5";
|
|
bias-pull-down;
|
|
};
|
|
|
|
data {
|
|
pins = "gpio18", "gpio19";
|
|
drive-strength = <10>;
|
|
};
|
|
|
|
cs {
|
|
pins = "gpio20";
|
|
drive-strength = <10>;
|
|
bias-pull-up;
|
|
};
|
|
|
|
clk {
|
|
pins = "gpio21";
|
|
drive-strength = <12>;
|
|
};
|
|
};
|
|
|
|
spi6_pins: spi6_pins {
|
|
mux {
|
|
pins = "gpio55", "gpio56", "gpio58";
|
|
function = "gsbi6";
|
|
bias-pull-down;
|
|
};
|
|
|
|
mosi {
|
|
pins = "gpio55";
|
|
drive-strength = <12>;
|
|
};
|
|
|
|
miso {
|
|
pins = "gpio56";
|
|
drive-strength = <14>;
|
|
};
|
|
|
|
cs {
|
|
pins = "gpio57";
|
|
drive-strength = <12>;
|
|
bias-pull-up;
|
|
};
|
|
|
|
clk {
|
|
pins = "gpio58";
|
|
drive-strength = <12>;
|
|
};
|
|
|
|
reset {
|
|
pins = "gpio33";
|
|
drive-strength = <10>;
|
|
bias-pull-down;
|
|
output-high;
|
|
};
|
|
};
|
|
|
|
usb0_pwr_en_pins: usb0_pwr_en_pins {
|
|
mux {
|
|
pins = "gpio15";
|
|
function = "gpio";
|
|
drive-strength = <12>;
|
|
bias-pull-down;
|
|
output-high;
|
|
};
|
|
};
|
|
|
|
usb1_pwr_en_pins: usb1_pwr_en_pins {
|
|
mux {
|
|
pins = "gpio16", "gpio68";
|
|
function = "gpio";
|
|
drive-strength = <12>;
|
|
bias-pull-down;
|
|
output-high;
|
|
};
|
|
};
|
|
};
|
|
|
|
gsbi@16300000 {
|
|
qcom,mode = <GSBI_PROT_I2C_UART>;
|
|
status = "ok";
|
|
serial@16340000 {
|
|
status = "ok";
|
|
};
|
|
/*
|
|
* The i2c device on gsbi4 should not be enabled.
|
|
* On ipq806x designs gsbi4 i2c is meant for exclusive
|
|
* RPM usage. Turning this on in kernel manifests as
|
|
* i2c failure for the RPM.
|
|
*/
|
|
};
|
|
|
|
sata-phy@1b400000 {
|
|
status = "ok";
|
|
};
|
|
|
|
sata@29000000 {
|
|
ports-implemented = <0x1>;
|
|
status = "ok";
|
|
};
|
|
|
|
phy@100f8800 { /* USB3 port 1 HS phy */
|
|
status = "ok";
|
|
};
|
|
|
|
phy@100f8830 { /* USB3 port 1 SS phy */
|
|
status = "ok";
|
|
};
|
|
|
|
phy@110f8800 { /* USB3 port 0 HS phy */
|
|
status = "ok";
|
|
};
|
|
|
|
phy@110f8830 { /* USB3 port 0 SS phy */
|
|
status = "ok";
|
|
};
|
|
|
|
usb30@0 {
|
|
status = "ok";
|
|
|
|
pinctrl-0 = <&usb0_pwr_en_pins>;
|
|
pinctrl-names = "default";
|
|
};
|
|
|
|
usb30@1 {
|
|
status = "ok";
|
|
|
|
pinctrl-0 = <&usb1_pwr_en_pins>;
|
|
pinctrl-names = "default";
|
|
};
|
|
|
|
pcie0: pci@1b500000 {
|
|
status = "ok";
|
|
};
|
|
|
|
pcie1: pci@1b700000 {
|
|
status = "ok";
|
|
force_gen1 = <1>;
|
|
};
|
|
|
|
nand@1ac00000 {
|
|
status = "ok";
|
|
|
|
pinctrl-0 = <&nand_pins>;
|
|
pinctrl-names = "default";
|
|
|
|
cs0 {
|
|
reg = <0>;
|
|
compatible = "qcom,nandcs";
|
|
|
|
nand-ecc-strength = <4>;
|
|
nand-bus-width = <8>;
|
|
nand-ecc-step-size = <512>;
|
|
|
|
partitions {
|
|
compatible = "fixed-partitions";
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
|
|
qcadata@0 {
|
|
label = "qcadata";
|
|
reg = <0x0000000 0x0c80000>;
|
|
read-only;
|
|
};
|
|
|
|
APPSBL@c80000 {
|
|
label = "APPSBL";
|
|
reg = <0x0c80000 0x0500000>;
|
|
read-only;
|
|
};
|
|
|
|
APPSBLENV@1180000 {
|
|
label = "APPSBLENV";
|
|
reg = <0x1180000 0x0080000>;
|
|
read-only;
|
|
};
|
|
|
|
art: art@1200000 {
|
|
label = "art";
|
|
reg = <0x1200000 0x0140000>;
|
|
read-only;
|
|
};
|
|
|
|
artbak: art@1340000 {
|
|
label = "artbak";
|
|
reg = <0x1340000 0x0140000>;
|
|
read-only;
|
|
};
|
|
|
|
kernel@1480000 {
|
|
label = "kernel";
|
|
reg = <0x1480000 0x0400000>;
|
|
};
|
|
|
|
ubi@1880000 {
|
|
label = "ubi";
|
|
reg = <0x1880000 0x6080000>;
|
|
};
|
|
|
|
reserve@7900000 {
|
|
label = "reserve";
|
|
reg = <0x7900000 0x0700000>;
|
|
read-only;
|
|
};
|
|
};
|
|
};
|
|
};
|
|
|
|
mdio0: mdio {
|
|
compatible = "virtual,mdio-gpio";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH &qcom_pinmux 0 GPIO_ACTIVE_HIGH>;
|
|
pinctrl-0 = <&mdio0_pins>;
|
|
pinctrl-names = "default";
|
|
|
|
|
|
phy0: ethernet-phy@0 {
|
|
device_type = "ethernet-phy";
|
|
reg = <0>;
|
|
qca,ar8327-initvals = <
|
|
0x00004 0x7600000 /* PAD0_MODE */
|
|
0x00008 0x1000000 /* PAD5_MODE */
|
|
0x0000c 0x80 /* PAD6_MODE */
|
|
0x000e4 0xaa545 /* MAC_POWER_SEL */
|
|
0x000e0 0xc74164de /* SGMII_CTRL */
|
|
0x0007c 0x4e /* PORT0_STATUS */
|
|
0x00094 0x4e /* PORT6_STATUS */
|
|
0x00970 0x1e864443 /* QM_PORT0_CTRL0 */
|
|
0x00974 0x000001c6 /* QM_PORT0_CTRL1 */
|
|
0x00978 0x19008643 /* QM_PORT1_CTRL0 */
|
|
0x0097c 0x000001c6 /* QM_PORT1_CTRL1 */
|
|
0x00980 0x19008643 /* QM_PORT2_CTRL0 */
|
|
0x00984 0x000001c6 /* QM_PORT2_CTRL1 */
|
|
0x00988 0x19008643 /* QM_PORT3_CTRL0 */
|
|
0x0098c 0x000001c6 /* QM_PORT3_CTRL1 */
|
|
0x00990 0x19008643 /* QM_PORT4_CTRL0 */
|
|
0x00994 0x000001c6 /* QM_PORT4_CTRL1 */
|
|
0x00998 0x1e864443 /* QM_PORT5_CTRL0 */
|
|
0x0099c 0x000001c6 /* QM_PORT5_CTRL1 */
|
|
0x009a0 0x1e864443 /* QM_PORT6_CTRL0 */
|
|
0x009a4 0x000001c6 /* QM_PORT6_CTRL1 */
|
|
>;
|
|
qca,ar8327-vlans = <
|
|
0x1 0x5e /* VLAN1 Ports 1/2/3/4/6 */
|
|
0x2 0x21 /* VLAN2 Ports 0/5 */
|
|
>;
|
|
};
|
|
|
|
phy4: ethernet-phy@4 {
|
|
device_type = "ethernet-phy";
|
|
reg = <4>;
|
|
qca,ar8327-initvals = <
|
|
0x000e4 0x6a545 /* MAC_POWER_SEL */
|
|
0x0000c 0x80 /* PAD6_MODE */
|
|
>;
|
|
};
|
|
};
|
|
|
|
gmac1: ethernet@37200000 {
|
|
status = "ok";
|
|
phy-mode = "rgmii";
|
|
qcom,id = <1>;
|
|
qcom,phy_mdio_addr = <4>;
|
|
qcom,poll_required = <0>;
|
|
qcom,rgmii_delay = <1>;
|
|
qcom,phy_mii_type = <0>;
|
|
qcom,emulation = <0>;
|
|
qcom,irq = <255>;
|
|
mdiobus = <&mdio0>;
|
|
|
|
pinctrl-0 = <&rgmii2_pins>;
|
|
pinctrl-names = "default";
|
|
|
|
mtd-mac-address = <&art 6>;
|
|
|
|
fixed-link {
|
|
speed = <1000>;
|
|
full-duplex;
|
|
};
|
|
};
|
|
|
|
gmac2: ethernet@37400000 {
|
|
status = "ok";
|
|
phy-mode = "sgmii";
|
|
qcom,id = <2>;
|
|
qcom,phy_mdio_addr = <0>; /* none */
|
|
qcom,poll_required = <0>; /* no polling */
|
|
qcom,rgmii_delay = <0>;
|
|
qcom,phy_mii_type = <1>;
|
|
qcom,emulation = <0>;
|
|
qcom,irq = <258>;
|
|
mdiobus = <&mdio0>;
|
|
|
|
mtd-mac-address = <&art 0>;
|
|
|
|
fixed-link {
|
|
speed = <1000>;
|
|
full-duplex;
|
|
};
|
|
};
|
|
};
|
|
|
|
gpio-keys {
|
|
compatible = "gpio-keys";
|
|
pinctrl-0 = <&button_pins>;
|
|
pinctrl-names = "default";
|
|
|
|
wifi {
|
|
label = "wifi";
|
|
gpios = <&qcom_pinmux 6 GPIO_ACTIVE_LOW>;
|
|
linux,code = <KEY_RFKILL>;
|
|
debounce-interval = <60>;
|
|
wakeup-source;
|
|
};
|
|
|
|
reset {
|
|
label = "reset";
|
|
gpios = <&qcom_pinmux 54 GPIO_ACTIVE_LOW>;
|
|
linux,code = <KEY_RESTART>;
|
|
debounce-interval = <60>;
|
|
wakeup-source;
|
|
};
|
|
|
|
wps {
|
|
label = "wps";
|
|
gpios = <&qcom_pinmux 65 GPIO_ACTIVE_LOW>;
|
|
linux,code = <KEY_WPS_BUTTON>;
|
|
debounce-interval = <60>;
|
|
wakeup-source;
|
|
};
|
|
};
|
|
|
|
gpio-leds {
|
|
compatible = "gpio-leds";
|
|
pinctrl-0 = <&led_pins>;
|
|
pinctrl-names = "default";
|
|
|
|
power_white: power_white {
|
|
label = "r7800:white:power";
|
|
gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
|
|
default-state = "keep";
|
|
};
|
|
|
|
power_amber: power_amber {
|
|
label = "r7800:amber:power";
|
|
gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
|
|
wan_white {
|
|
label = "r7800:white:wan";
|
|
gpios = <&qcom_pinmux 22 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
|
|
wan_amber {
|
|
label = "r7800:amber:wan";
|
|
gpios = <&qcom_pinmux 23 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
|
|
usb1 {
|
|
label = "r7800:white:usb1";
|
|
gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
|
|
usb2 {
|
|
label = "r7800:white:usb2";
|
|
gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
|
|
esata {
|
|
label = "r7800:white:esata";
|
|
gpios = <&qcom_pinmux 26 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
|
|
wifi {
|
|
label = "r7800:white:wifi";
|
|
gpios = <&qcom_pinmux 64 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
|
|
wps {
|
|
label = "r7800:white:wps";
|
|
gpios = <&qcom_pinmux 24 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
};
|
|
};
|
|
|
|
&adm_dma {
|
|
status = "ok";
|
|
};
|