From patchwork Wed Feb 11 20:24:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marcin_Miko=C5=82ajczak?= X-Patchwork-Id: 438927 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id AFB0914017A for ; Thu, 12 Feb 2015 07:25:22 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 76AE128A6C8; Wed, 11 Feb 2015 21:22:30 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 6EFDF28755C for ; Wed, 11 Feb 2015 21:22:24 +0100 (CET) X-policyd-weight: using cached result; rate: -8.5 Received: from mail-lb0-f180.google.com (mail-lb0-f180.google.com [209.85.217.180]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Wed, 11 Feb 2015 21:22:23 +0100 (CET) Received: by mail-lb0-f180.google.com with SMTP id z12so5530101lbi.11 for ; Wed, 11 Feb 2015 12:25:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:date:to:subject:message-id:user-agent:mime-version :content-type; bh=J4AtQCedTaz4bRMzhRK5ARwKGzgCmpSPIEbgMPU1WiI=; b=DlUk/ysMNe6mB1NfYvu1vgO294Gj3sqXzBhr+5EIA4TbQgmmcYyqCdMVtKnqsHHGT8 Td8Od1cznb/dm+3416WEYWj+HUIL+NIHJ/Gd4z0uaYJhudqD0gYNdMRFehHfkAa42ftl ubVkurcqzR4vhtDvGPi2fy0aug8DylSEYx4suBQKDuR9pPP1J8oPeaMTyYAXz2okJuaZ dL1pWirT4U9LcZLSLyeHVPmc6Wpx+WI9SXaPB4SbpwsjTFOqxJTRejndnmX6utALyTI+ 6cfvdAhV0jQYLbhrE6LikqmNZ9A/juGMwqn9MKEZKrxPPmLdo6yClW5Rw4x2gShSCMOU JyfA== X-Received: by 10.152.87.168 with SMTP id az8mr355276lab.74.1423686300490; Wed, 11 Feb 2015 12:25:00 -0800 (PST) Received: from Pecet.mikolajczaki.pl (host-79.173.3.190.tesatnet.pl. [79.173.3.190]) by mx.google.com with ESMTPSA id eb8sm355927lbb.28.2015.02.11.12.24.58 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 11 Feb 2015 12:24:59 -0800 (PST) From: Marcin Mikolajczak X-Google-Original-From: Marcin Mikolajczak Date: Wed, 11 Feb 2015 21:24:57 +0100 (CET) X-X-Sender: cinek@phenom To: openwrt-devel@lists.openwrt.org Message-ID: User-Agent: Alpine 2.10 (DEB 1266 2009-07-14) MIME-Version: 1.0 Subject: [OpenWrt-Devel] [PATCH] ar71xx: ZyXEL NBG6716 led/buttons cleanup X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" ZyXEL NBG6716 led/buttons cleanup - improper numbered leds - improper named buttons Signed-off-by: Marcin Mikolajczak Index: target/linux/ar71xx/base-files/etc/uci-defaults/01_leds =================================================================== --- target/linux/ar71xx/base-files/etc/uci-defaults/01_leds (revision 44411) +++ target/linux/ar71xx/base-files/etc/uci-defaults/01_leds (working copy) @@ -220,8 +220,8 @@ ucidef_set_led_netdev "wan" "WAN" "zyxel:white:internet" "eth1" ucidef_set_led_wlan "wlan" "WLAN" "zyxel:white:wifi2g" "phy1tpt" ucidef_set_led_wlan "wlan5" "WLAN5" "zyxel:white:wifi5g" "phy0tpt" - ucidef_set_led_usbdev "usb1" "USB1" "zyxel:white:usb0" "1-1" - ucidef_set_led_usbdev "usb2" "USB2" "zyxel:white:usb1" "2-1" + ucidef_set_led_usbdev "usb1" "USB1" "zyxel:white:usb1" "2-1" + ucidef_set_led_usbdev "usb2" "USB2" "zyxel:white:usb2" "1-1" ;; om2p | \ Index: target/linux/ar71xx/files/arch/mips/ath79/mach-nbg6716.c =================================================================== --- target/linux/ar71xx/files/arch/mips/ath79/mach-nbg6716.c (revision 44411) +++ target/linux/ar71xx/files/arch/mips/ath79/mach-nbg6716.c (working copy) @@ -43,8 +43,8 @@ #define NBG6716_GPIO_LED_INTERNET 18 #define NBG6716_GPIO_LED_POWER 15 -#define NBG6716_GPIO_LED_USB0 13 #define NBG6716_GPIO_LED_USB1 4 +#define NBG6716_GPIO_LED_USB2 13 #define NBG6716_GPIO_LED_WIFI2G 19 #define NBG6716_GPIO_LED_WIFI5G 17 #define NBG6716_GPIO_LED_WPS 21 @@ -51,8 +51,8 @@ #define NBG6716_GPIO_BTN_RESET 23 #define NBG6716_GPIO_BTN_RFKILL 1 -#define NBG6716_GPIO_BTN_USB0 14 #define NBG6716_GPIO_BTN_USB1 0 +#define NBG6716_GPIO_BTN_USB2 14 #define NBG6716_GPIO_BTN_WPS 22 #define NBG6716_KEYS_POLL_INTERVAL 20 /* msecs */ @@ -75,13 +75,13 @@ .active_low = 1, }, { - .name = "zyxel:white:usb0", - .gpio = NBG6716_GPIO_LED_USB0, + .name = "zyxel:white:usb1", + .gpio = NBG6716_GPIO_LED_USB1, .active_low = 1, }, { - .name = "zyxel:white:usb1", - .gpio = NBG6716_GPIO_LED_USB1, + .name = "zyxel:white:usb2", + .gpio = NBG6716_GPIO_LED_USB2, .active_low = 1, }, { @@ -119,19 +119,19 @@ .active_low = 1, }, { - .desc = "USB0 eject button", + .desc = "USB1 eject button", .type = EV_KEY, - .code = BTN_0, + .code = BTN_1, .debounce_interval = NBG6716_KEYS_DEBOUNCE_INTERVAL, - .gpio = NBG6716_GPIO_BTN_USB0, + .gpio = NBG6716_GPIO_BTN_USB1, .active_low = 1, }, { - .desc = "USB1 eject button", + .desc = "USB2 eject button", .type = EV_KEY, - .code = BTN_1, + .code = BTN_2, .debounce_interval = NBG6716_KEYS_DEBOUNCE_INTERVAL, - .gpio = NBG6716_GPIO_BTN_USB1, + .gpio = NBG6716_GPIO_BTN_USB2, .active_low = 1, }, {