diff options
author | Mathias Kresin <dev@kresin.me> | 2016-11-26 10:20:03 +0100 |
---|---|---|
committer | Mathias Kresin <dev@kresin.me> | 2016-11-27 15:33:54 +0100 |
commit | 3228c2a682f287337db3dda880bc1e35ebaa7ce9 (patch) | |
tree | e9a18daf4f259d4e3d0a786ecdcc9f76dd0328a1 /target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts | |
parent | e3caadc69d405a74f9643134bc5074607f2a999b (diff) | |
download | upstream-3228c2a682f287337db3dda880bc1e35ebaa7ce9.tar.gz upstream-3228c2a682f287337db3dda880bc1e35ebaa7ce9.tar.bz2 upstream-3228c2a682f287337db3dda880bc1e35ebaa7ce9.zip |
ipq806x: more dts cleanup
Remove the wifi5g LED from the the d7800, r7500 and r7800. Albeit this
GPIO is mentioned in the GPL tarball, it doesn't do anything. The
2.4/5 GHz LEDs are connected to the wifi chips and not be controlled
from the the userspace.
Use the LEDs names/colours as they are used in the board manuals. Merge
redundant LED configurations. Use the phy[0|1]tpt trigger for the
wireless LEDs. Remove the workarounds for the not controllable wireless
LEDs.
Fix spi compatible strings and remove superfluous spi-max-frequency
parameters.
If there are two power leds, use one for indicating normal operation and
one for failsafe/upgrade. Keep the on/off state of the main power led
during boot.
Use the usb pinmux settings from the nbg6817 gpl sources.
Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts')
-rw-r--r-- | target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts index d23d57aa47..abc381a15e 100644 --- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts +++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts @@ -58,19 +58,12 @@ }; led_pins: led_pins { - off { - pins = "gpio26", "gpio33", "gpio64"; + mux { + pins = "gpio9", "gpio26", "gpio33", "gpio64"; function = "gpio"; drive-strength = <2>; bias-pull-down; }; - - on { - pins = "gpio9"; - function = "gpio"; - drive-strength = <2>; - bias-pull-up; - }; }; mdio0_pins: mdio0_pins { @@ -117,38 +110,40 @@ }; usb0_pwr_en_pins: usb0_pwr_en_pins { - pwr { - pins = "gpio14"; + mux { + pins = "gpio16", "gpio17"; function = "gpio"; drive-strength = <12>; + }; + + pwr { + pins = "gpio17"; bias-pull-down; output-high; }; ovc { - pins = "gpio15"; - function = "gpio"; - drive-strength = <12>; + pins = "gpio16"; bias-pull-up; - output-high; }; }; usb1_pwr_en_pins: usb1_pwr_en_pins { - pwr { - pins = "gpio17"; + mux { + pins = "gpio14", "gpio15"; function = "gpio"; drive-strength = <12>; + }; + + pwr { + pins = "gpio14"; bias-pull-down; output-high; }; ovc { - pins = "gpio16"; - function = "gpio"; - drive-strength = <12>; + pins = "gpio15"; bias-pull-up; - output-high; }; }; }; @@ -173,14 +168,14 @@ spi4: spi@1a280000 { status = "ok"; - spi-max-frequency = <50000000>; + pinctrl-0 = <&spi_pins>; pinctrl-names = "default"; cs-gpios = <&qcom_pinmux 20 GPIO_ACTIVE_HIGH>; flash: m25p80@0 { - compatible = "s25fl512s"; + compatible = "jedec,spi-nor"; #address-cells = <1>; #size-cells = <1>; spi-max-frequency = <51200000>; @@ -371,17 +366,22 @@ power: power { label = "nbg6817:white:power"; gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>; + default-state = "keep"; }; - wifi { - label = "nbg6817:amber:wifi"; + wifi2g { + label = "nbg6817:amber:wifi2g"; gpios = <&qcom_pinmux 33 GPIO_ACTIVE_HIGH>; }; + /* wifi2g amber from the manual is missing */ + wifi5g { label = "nbg6817:amber:wifi5g"; gpios = <&qcom_pinmux 26 GPIO_ACTIVE_HIGH>; }; + + /* wifi5g amber from the manual is missing */ }; }; |