From 7659f9ad9e5d6ffea93bd73989535346f0b14131 Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Wed, 5 Oct 2016 08:16:08 +0200 Subject: [PATCH] lantiq: fix usb leds/trigger Add USB led aliases to boards having an led which is meant to be used as USB led according to the manuals. Remove the kmod-ledtrig-usbdev from the default package selection for boards not having an USB led. Add the kmod-ledtrig-usbdev to boards where it is missing. Signed-off-by: Mathias Kresin --- target/linux/lantiq/dts/ARV7510PW22.dts | 3 ++- target/linux/lantiq/dts/ARV752DPW.dts | 3 ++- target/linux/lantiq/dts/ARV752DPW22.dts | 3 ++- target/linux/lantiq/image/Makefile | 10 +++++----- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/target/linux/lantiq/dts/ARV7510PW22.dts b/target/linux/lantiq/dts/ARV7510PW22.dts index ac974091dd..90a55fe448 100644 --- a/target/linux/lantiq/dts/ARV7510PW22.dts +++ b/target/linux/lantiq/dts/ARV7510PW22.dts @@ -15,6 +15,7 @@ led-running = &power; led-internet = &internet; + led-usb = &umts; led-wifi = &wlan; }; @@ -178,7 +179,7 @@ label = "wlan"; gpios = <&gpio 10 1>; }; - 3g { + umts: 3g { label = "3g"; gpios = <&gpio 15 1>; }; diff --git a/target/linux/lantiq/dts/ARV752DPW.dts b/target/linux/lantiq/dts/ARV752DPW.dts index e37c795197..913f831832 100644 --- a/target/linux/lantiq/dts/ARV752DPW.dts +++ b/target/linux/lantiq/dts/ARV752DPW.dts @@ -15,6 +15,7 @@ led-running = &power_red; led-internet = &internet_red; + led-usb = &umts; led-wifi = &wifi; }; @@ -201,7 +202,7 @@ label = "arv752dpw:red:voice"; gpios = <&gpio 8 1>; }; - microphone { + umts: umts { label = "arv752dpw:red:umts"; gpios = <&gpiomm 3 1>; }; diff --git a/target/linux/lantiq/dts/ARV752DPW22.dts b/target/linux/lantiq/dts/ARV752DPW22.dts index db4a639b41..2ec634f61b 100644 --- a/target/linux/lantiq/dts/ARV752DPW22.dts +++ b/target/linux/lantiq/dts/ARV752DPW22.dts @@ -15,6 +15,7 @@ led-running = &power_red; led-internet = &internet_red; + led-usb = &umts; led-wifi = &wifi; }; @@ -205,7 +206,7 @@ label = "arv752dpw22:red:voice"; gpios = <&gpio 8 1>; }; - microphone { + umts: umts { label = "arv752dpw22:red:umts"; gpios = <&gpiomm 3 1>; }; diff --git a/target/linux/lantiq/image/Makefile b/target/linux/lantiq/image/Makefile index 8e06a99c22..54a6caf23e 100644 --- a/target/linux/lantiq/image/Makefile +++ b/target/linux/lantiq/image/Makefile @@ -249,7 +249,7 @@ TARGET_DEVICES += ARV4525PW define Device/ARV452CQW IMAGE_SIZE := 3776k DEVICE_TITLE := Easybox 801 - ARV452CQW - DEVICE_PACKAGES := kmod-ltq-hcd-danube \ + DEVICE_PACKAGES := kmod-ltq-hcd-danube kmod-ledtrig-usbdev \ kmod-ath5k wpad-mini \ kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ @@ -291,7 +291,7 @@ ifeq ($(SUBTARGET),xway) define Device/BTHOMEHUBV2B $(Device/NAND) DEVICE_TITLE := BT Home Hub 2B - DEVICE_PACKAGES := kmod-ltq-hcd-danube kmod-ledtrig-usbdev \ + DEVICE_PACKAGES := kmod-ltq-hcd-danube \ kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ kmod-ltq-deu-danube \ @@ -391,7 +391,7 @@ TARGET_DEVICES += ARV7518PW define Device/ARV7519PW IMAGE_SIZE := 15488k DEVICE_TITLE := Astoria - ARV7519PW - DEVICE_PACKAGES := kmod-ltq-hcd-danube kmod-ledtrig-usbdev \ + DEVICE_PACKAGES := kmod-ltq-hcd-danube \ kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ ltq-adsl-app ppp-mod-pppoa \ @@ -441,7 +441,7 @@ TARGET_DEVICES += ARV8539PW22 define Device/GIGASX76X IMAGE_SIZE := 7680k DEVICE_TITLE := Gigaset sx76x - DEVICE_PACKAGES := kmod-ltq-hcd-danube kmod-ledtrig-usbdev \ + DEVICE_PACKAGES := kmod-ltq-hcd-danube \ kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ ltq-adsl-app ppp-mod-pppoe \ @@ -456,7 +456,7 @@ TARGET_DEVICES += GIGASX76X define Device/BTHOMEHUBV3A $(Device/NAND) DEVICE_TITLE := BT Home Hub 3A - DEVICE_PACKAGES := kmod-usb-dwc2 kmod-ledtrig-usbdev \ + DEVICE_PACKAGES := kmod-usb-dwc2 \ kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ kmod-ltq-adsl-ar9-fw-a kmod-ltq-atm-ar9 \ kmod-ltq-deu-ar9 \