From 3228c2a682f287337db3dda880bc1e35ebaa7ce9 Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Sat, 26 Nov 2016 10:20:03 +0100 Subject: 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 --- .../files/arch/arm/boot/dts/qcom-ipq8065-r7800.dts | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-r7800.dts') 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 42d6e2b7a0..79c8334a42 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 @@ -31,7 +31,7 @@ mdio-gpio0 = &mdio0; led-boot = &power_white; - led-failsafe = &power_white; + led-failsafe = &power_amber; led-running = &power_white; led-upgrade = &power_amber; }; @@ -62,7 +62,7 @@ led_pins: led_pins { pins = "gpio7", "gpio8", "gpio9", "gpio22", "gpio23", - "gpio24","gpio26", "gpio53", "gpio64", "gpio67"; + "gpio24","gpio26", "gpio53", "gpio64"; function = "gpio"; drive-strength = <2>; bias-pull-down; @@ -221,7 +221,7 @@ spi5: spi@1a280000 { status = "ok"; - spi-max-frequency = <50000000>; + pinctrl-0 = <&spi_pins>; pinctrl-names = "default"; @@ -244,14 +244,14 @@ status = "ok"; spi6: spi@16580000 { status = "ok"; - spi-max-frequency = <6000000>; + pinctrl-0 = <&spi6_pins>; pinctrl-names = "default"; cs-gpios = <&qcom_pinmux 57 GPIO_ACTIVE_HIGH>; spi-nor@0 { - compatible = "spi-nor"; + compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <6000000>; }; @@ -516,7 +516,7 @@ power_white: power_white { label = "r7800:white:power"; gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>; - default-state = "on"; + default-state = "keep"; }; power_amber: power_amber { @@ -549,8 +549,8 @@ gpios = <&qcom_pinmux 26 GPIO_ACTIVE_HIGH>; }; - rfkill { - label = "r7800:white:rfkill"; + wifi { + label = "r7800:white:wifi"; gpios = <&qcom_pinmux 64 GPIO_ACTIVE_HIGH>; }; @@ -558,11 +558,6 @@ label = "r7800:white:wps"; gpios = <&qcom_pinmux 24 GPIO_ACTIVE_HIGH>; }; - - wifi { - label = "r7800:white:wifi"; - gpios = <&qcom_pinmux 67 GPIO_ACTIVE_HIGH>; - }; }; }; -- cgit v1.2.3