ipq806x: fix and cleanup dts for NEC WG2600HP

This commit fixes and cleanups qcom-ipq8064-wg2600hp.dts to improve the
support for WG2600HP.

- Use dt label in qcom-ipq8064.dtsi:

  - gmac1
  - gmac2
  - gsbi4
    - gsbi4_serial
  - gsbi5
  - hs_phy_0
  - ss_phy_0
  - usb3_0
  - usb3_1
  - pcie0
  - pcie1
  - qcom_pinmux

- Fix wrong pcie reset (perst) gpios

  - drop reset-gpio and use perst-gpios in qcom-ipq8064.dtsi

- Remove unnecessary dt label from device dts

  - flash
  - phy0, phy4

- Rename spi-nor node to "flash" from "m25p80"

- Fix qca,ar8327-initvals

  - use oem settings

    - fix: PAD0_MODE, PAD6_MODE
    - drop: PAD5_MODE (unnecessary)

- Move mtd partitions under partitions (fixed-partitions) node

- Specify "firmware" partition format

  - WG2600HP uses uImage format (denx,uimage)

- Change failsafe status LED to power_red

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
This commit is contained in:
INAGAKI Hiroshi 2018-12-11 15:40:28 +09:00 committed by Christian Lamparter
parent 3850b41f01
commit 3198ec5b9d

View file

@ -26,7 +26,7 @@
mdio-gpio0 = &mdio0; mdio-gpio0 = &mdio0;
led-boot = &power_green; led-boot = &power_green;
led-failsafe = &power_green; led-failsafe = &power_red;
led-running = &power_green; led-running = &power_green;
led-upgrade = &power_green; led-upgrade = &power_green;
}; };
@ -36,123 +36,198 @@
}; };
soc { soc {
pinmux@800000 { mdio0: mdio {
button_pins: button_pins { compatible = "virtual,mdio-gpio";
mux { #address-cells = <1>;
pins = "gpio16", "gpio54", "gpio24", "gpio25"; #size-cells = <0>;
function = "gpio"; gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH &qcom_pinmux 0 GPIO_ACTIVE_HIGH>;
drive-strength = <2>; pinctrl-0 = <&mdio0_pins>;
bias-pull-up; pinctrl-names = "default";
};
ethernet-phy@0 {
reg = <0>;
qca,ar8327-initvals = <
0x00004 0x06000000 /* PAD0_MODE */
0x0000c 0x00080080 /* PAD6_MODE */
0x000e4 0x0006a545 /* MAC_POWER_SEL */
0x000e0 0xc74164de /* SGMII_CTRL */
0x0007c 0x0000004e /* PORT0_STATUS */
0x00094 0x0000004e /* PORT6_STATUS */
>;
}; };
i2c4_pins: i2c4_pinmux { ethernet-phy@4 {
mux { reg = <4>;
pins = "gpio12", "gpio13";
function = "gsbi4";
drive-strength = <12>;
bias-disable;
};
};
led_pins: led_pins {
mux {
pins = "gpio6", "gpio7", "gpio8", "gpio9", "gpio14",
"gpio15", "gpio55", "gpio56", "gpio57", "gpio58",
"gpio64", "gpio65";
function = "gpio";
drive-strength = <2>;
bias-pull-down;
};
};
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>;
};
};
mdio0_pins: mdio0_pins {
mux {
pins = "gpio0", "gpio1";
function = "gpio";
drive-strength = <8>;
bias-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;
};
};
usb_pwr_en_pins: usb_pwr_en_pins {
mux {
pins = "gpio22";
function = "gpio";
drive-strength = <2>;
bias-pull-down;
output-high;
}; };
}; };
}; };
gsbi@16300000 { gpio-keys {
compatible = "gpio-keys";
pinctrl-0 = <&button_pins>;
pinctrl-names = "default";
wps {
label = "wps";
gpios = <&qcom_pinmux 16 GPIO_ACTIVE_LOW>;
linux,code = <KEY_WPS_BUTTON>;
};
reset {
label = "reset";
gpios = <&qcom_pinmux 54 GPIO_ACTIVE_LOW>;
linux,code = <KEY_RESTART>;
};
bridge {
label = "bridge";
gpios = <&qcom_pinmux 24 GPIO_ACTIVE_LOW>;
linux,code = <BTN_0>;
linux,input-type = <EV_SW>;
};
converter {
label = "converter";
gpios = <&qcom_pinmux 25 GPIO_ACTIVE_LOW>;
linux,code = <BTN_0>;
linux,input-type = <EV_SW>;
};
};
gpio-leds {
compatible = "gpio-leds";
pinctrl-0 = <&led_pins>;
pinctrl-names = "default";
converter_green {
label = "wg2600hp:green:converter";
gpios = <&qcom_pinmux 6 GPIO_ACTIVE_HIGH>;
};
power_red: power_red {
label = "wg2600hp:red:power";
gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
};
active_green {
label = "wg2600hp:green:active";
gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
};
active_red {
label = "wg2600hp:red:active";
gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
};
power_green: power_green {
label = "wg2600hp:green:power";
gpios = <&qcom_pinmux 14 GPIO_ACTIVE_HIGH>;
};
converter_red {
label = "wg2600hp:red:converter";
gpios = <&qcom_pinmux 15 GPIO_ACTIVE_HIGH>;
};
wlan2g_green {
label = "wg2600hp:green:wlan2g";
gpios = <&qcom_pinmux 55 GPIO_ACTIVE_HIGH>;
};
wlan2g_red {
label = "wg2600hp:red:wlan2g";
gpios = <&qcom_pinmux 56 GPIO_ACTIVE_HIGH>;
};
wlan5g_green {
label = "wg2600hp:green:wlan5g";
gpios = <&qcom_pinmux 57 GPIO_ACTIVE_HIGH>;
};
wlan5g_red {
label = "wg2600hp:red:wlan5g";
gpios = <&qcom_pinmux 58 GPIO_ACTIVE_HIGH>;
};
tv_green {
label = "wg2600hp:green:tv";
gpios = <&qcom_pinmux 64 GPIO_ACTIVE_HIGH>;
};
tv_red {
label = "wg2600hp:red:tv";
gpios = <&qcom_pinmux 65 GPIO_ACTIVE_HIGH>;
};
};
};
&adm_dma {
status = "okay";
};
&gmac1 {
status = "okay";
phy-mode = "rgmii";
qcom,id = <1>;
pinctrl-0 = <&rgmii2_pins>;
pinctrl-names = "default";
mtd-mac-address = <&PRODUCTDATA 6>;
fixed-link {
speed = <1000>;
full-duplex;
};
};
&gmac2 {
status = "okay";
phy-mode = "sgmii";
qcom,id = <2>;
mtd-mac-address = <&PRODUCTDATA 0>;
fixed-link {
speed = <1000>;
full-duplex;
};
};
&gsbi4 {
status = "okay";
qcom,mode = <GSBI_PROT_I2C_UART>; qcom,mode = <GSBI_PROT_I2C_UART>;
status = "ok"; };
serial@16340000 {
status = "ok"; &gsbi4_serial {
}; status = "okay";
/* };
* The i2c device on gsbi4 should not be enabled.
* On ipq806x designs gsbi4 i2c is meant for exclusive &gsbi5 {
* RPM usage. Turning this on in kernel manifests as status = "okay";
* i2c failure for the RPM.
*/
};
gsbi5: gsbi@1a200000 {
qcom,mode = <GSBI_PROT_SPI>; qcom,mode = <GSBI_PROT_SPI>;
status = "ok";
spi4: spi@1a280000 { spi@1a280000 {
status = "ok"; status = "okay";
pinctrl-0 = <&spi_pins>; pinctrl-0 = <&spi_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
cs-gpios = <&qcom_pinmux 20 GPIO_ACTIVE_HIGH>; cs-gpios = <&qcom_pinmux 20 GPIO_ACTIVE_HIGH>;
flash: m25p80@0 { flash@0 {
compatible = "jedec,spi-nor"; compatible = "jedec,spi-nor";
#address-cells = <1>;
#size-cells = <1>;
spi-max-frequency = <50000000>; spi-max-frequency = <50000000>;
reg = <0>; reg = <0>;
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
SBL1@0 { SBL1@0 {
label = "SBL1"; label = "SBL1";
reg = <0x0 0x20000>; reg = <0x0 0x20000>;
@ -237,210 +312,131 @@
}; };
firmware@860000 { firmware@860000 {
compatible = "denx,uimage";
label = "firmware"; label = "firmware";
reg = <0x860000 0x17a0000>; reg = <0x860000 0x17a0000>;
}; };
}; };
}; };
}; };
};
phy@100f8800 { /* USB3 port 1 HS phy */ &hs_phy_0 { /* USB3 port 0 HS phy */
status = "ok"; status = "okay";
}; };
phy@100f8830 { /* USB3 port 1 SS phy */ &ss_phy_0 { /* USB3 port 0 SS phy */
status = "ok"; status = "okay";
}; };
phy@110f8800 { /* USB3 port 0 HS phy */ &hs_phy_1 { /* USB3 port 1 HS phy */
status = "ok"; status = "okay";
}; };
phy@110f8830 { /* USB3 port 0 SS phy */ &ss_phy_1 { /* USB3 port 1 SS phy */
status = "ok"; status = "okay";
}; };
usb30@0 { &usb3_0 {
status = "ok"; status = "okay";
pinctrl-0 = <&usb_pwr_en_pins>; pinctrl-0 = <&usb_pwr_en_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
}; };
usb30@1 { &usb3_1 {
status = "ok"; status = "okay";
}; };
pcie0: pci@1b500000 { &pcie0 {
status = "ok"; status = "okay";
reset-gpio = <&qcom_pinmux 3 GPIO_ACTIVE_HIGH>; };
pinctrl-0 = <&pcie0_pins>;
pinctrl-names = "default";
};
pcie1: pci@1b700000 { &pcie1 {
status = "ok"; status = "okay";
reset-gpio = <&qcom_pinmux 48 GPIO_ACTIVE_HIGH>;
pinctrl-0 = <&pcie1_pins>;
pinctrl-names = "default";
force_gen1 = <1>; force_gen1 = <1>;
}; };
mdio0: mdio { &qcom_pinmux {
compatible = "virtual,mdio-gpio"; button_pins: button_pins {
#address-cells = <1>; mux {
#size-cells = <0>; pins = "gpio16", "gpio54", "gpio24", "gpio25";
gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH &qcom_pinmux 0 GPIO_ACTIVE_HIGH>; function = "gpio";
pinctrl-0 = <&mdio0_pins>; drive-strength = <2>;
pinctrl-names = "default"; bias-pull-up;
phy0: ethernet-phy@0 {
reg = <0>;
qca,ar8327-initvals = <
0x00004 0x7600000 /* PAD0_MODE */
0x00008 0x1000000 /* PAD5_MODE */
0x0000c 0x80 /* PAD6_MODE */
0x000e4 0x6a545 /* MAC_POWER_SEL */
0x000e0 0xc74164de /* SGMII_CTRL */
0x0007c 0x4e /* PORT0_STATUS */
0x00094 0x4e /* PORT6_STATUS */
>;
};
phy4: ethernet-phy@4 {
reg = <4>;
}; };
}; };
gmac1: ethernet@37200000 { i2c4_pins: i2c4_pinmux {
status = "ok"; mux {
phy-mode = "rgmii"; pins = "gpio12", "gpio13";
qcom,id = <1>; function = "gsbi4";
drive-strength = <12>;
pinctrl-0 = <&rgmii2_pins>; bias-disable;
pinctrl-names = "default";
mtd-mac-address = <&PRODUCTDATA 6>;
fixed-link {
speed = <1000>;
full-duplex;
}; };
}; };
gmac2: ethernet@37400000 { led_pins: led_pins {
status = "ok"; mux {
phy-mode = "sgmii"; pins = "gpio6", "gpio7", "gpio8", "gpio9", "gpio14",
qcom,id = <2>; "gpio15", "gpio55", "gpio56", "gpio57", "gpio58",
"gpio64", "gpio65";
mtd-mac-address = <&PRODUCTDATA 0>; function = "gpio";
drive-strength = <2>;
fixed-link { bias-pull-down;
speed = <1000>;
full-duplex;
};
};
};
gpio-keys {
compatible = "gpio-keys";
pinctrl-0 = <&button_pins>;
pinctrl-names = "default";
wps {
label = "wps";
gpios = <&qcom_pinmux 16 GPIO_ACTIVE_LOW>;
linux,code = <KEY_WPS_BUTTON>;
};
reset {
label = "reset";
gpios = <&qcom_pinmux 54 GPIO_ACTIVE_LOW>;
linux,code = <KEY_RESTART>;
};
bridge {
label = "bridge";
gpios = <&qcom_pinmux 24 GPIO_ACTIVE_LOW>;
linux,code = <BTN_0>;
linux,input-type = <EV_SW>;
};
converter {
label = "converter";
gpios = <&qcom_pinmux 25 GPIO_ACTIVE_LOW>;
linux,code = <BTN_0>;
linux,input-type = <EV_SW>;
}; };
}; };
gpio-leds { spi_pins: spi_pins {
compatible = "gpio-leds"; mux {
pinctrl-0 = <&led_pins>; pins = "gpio18", "gpio19", "gpio21";
pinctrl-names = "default"; function = "gsbi5";
bias-pull-down;
converter_green {
label = "wg2600hp:green:converter";
gpios = <&qcom_pinmux 6 GPIO_ACTIVE_HIGH>;
}; };
power_red { data {
label = "wg2600hp:red:power"; pins = "gpio18", "gpio19";
gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>; drive-strength = <10>;
}; };
active_green { cs {
label = "wg2600hp:green:active"; pins = "gpio20";
gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>; drive-strength = <10>;
bias-pull-up;
}; };
active_red { clk {
label = "wg2600hp:red:active"; pins = "gpio21";
gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>; drive-strength = <12>;
};
}; };
power_green: power_green { mdio0_pins: mdio0_pins {
label = "wg2600hp:green:power"; mux {
gpios = <&qcom_pinmux 14 GPIO_ACTIVE_HIGH>; pins = "gpio0", "gpio1";
function = "gpio";
drive-strength = <8>;
bias-disable;
};
}; };
converter_red { rgmii2_pins: rgmii2_pins {
label = "wg2600hp:red:converter"; mux {
gpios = <&qcom_pinmux 15 GPIO_ACTIVE_HIGH>; pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
"gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
function = "rgmii2";
drive-strength = <8>;
bias-disable;
};
}; };
wlan2g_green { usb_pwr_en_pins: usb_pwr_en_pins {
label = "wg2600hp:green:wlan2g"; mux {
gpios = <&qcom_pinmux 55 GPIO_ACTIVE_HIGH>; pins = "gpio22";
}; function = "gpio";
drive-strength = <2>;
wlan2g_red { bias-pull-down;
label = "wg2600hp:red:wlan2g"; output-high;
gpios = <&qcom_pinmux 56 GPIO_ACTIVE_HIGH>;
};
wlan5g_green {
label = "wg2600hp:green:wlan5g";
gpios = <&qcom_pinmux 57 GPIO_ACTIVE_HIGH>;
};
wlan5g_red {
label = "wg2600hp:red:wlan5g";
gpios = <&qcom_pinmux 58 GPIO_ACTIVE_HIGH>;
};
tv_green {
label = "wg2600hp:green:tv";
gpios = <&qcom_pinmux 64 GPIO_ACTIVE_HIGH>;
};
tv_red {
label = "wg2600hp:red:tv";
gpios = <&qcom_pinmux 65 GPIO_ACTIVE_HIGH>;
}; };
}; };
}; };
&adm_dma {
status = "ok";
};