From patchwork Tue Feb 10 07:24:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "L. D. Pinney" X-Patchwork-Id: 438272 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 BE26A14016A for ; Tue, 10 Feb 2015 18:22:25 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id ACDE5289C58; Tue, 10 Feb 2015 08:19:37 +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 23499284986 for ; Tue, 10 Feb 2015 08:19:33 +0100 (CET) X-policyd-weight: using cached result; rate: -8.5 Received: from mail-ob0-f181.google.com (mail-ob0-f181.google.com [209.85.214.181]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Tue, 10 Feb 2015 08:19:32 +0100 (CET) Received: by mail-ob0-f181.google.com with SMTP id vb8so30148259obc.12 for ; Mon, 09 Feb 2015 23:22:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=bpCt2XWBhRagY7xNWi8vtM1zhgJ4AkXK28bG/SP+1cs=; b=Sk89Dk65STAWZydiBhPV1uS2DJKnV3BF7NoOKFer0HLBQuBc9I/L7J37n2utjCmTOL CZbKxnUdBePTqDtUNYX3oEkmz3sZk8qg1vIbAr0akr+lf8ONrk85AQbDh8k5pk+ZIhQZ PIkW0q1+mV/O3q0JWKx2XdeLs7BF3lvWDnD4l4X8gnsfPenRr2cGDuSK6lhpNcAGYhR5 WlLTQVkh1vI+DBRGbanIiedGMgt51tDDiMriNv2wHha8G0cUl6rirme3fvyUOWwFV3Vg mgAQhmcres0L2sVRpWrVKKBdQWxVG007A2kKi5zicK1Di/UTYwM4Jcp9hRdFX+AgNLkG cvhw== X-Received: by 10.202.178.131 with SMTP id b125mr3155943oif.80.1423552928597; Mon, 09 Feb 2015 23:22:08 -0800 (PST) Received: from brown.lan ([72.192.76.134]) by mx.google.com with ESMTPSA id c65sm6685392oig.21.2015.02.09.23.22.07 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 09 Feb 2015 23:22:08 -0800 (PST) From: "L. D. Pinney" To: OpenWrt Development List Date: Tue, 10 Feb 2015 01:24:55 -0600 Message-Id: <1423553095-3738-1-git-send-email-ldpinney@gmail.com> X-Mailer: git-send-email 2.1.3 Subject: [OpenWrt-Devel] [PATCH] BB:ramips:Kingston MLW221 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: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" MLW221 dts use tabs NOT spaces. Cleanup uci-defaults and diag.sh Signed-off-by: L. D. Pinney --- target/linux/ramips/base-files/etc/diag.sh | 4 +- target/linux/ramips/base-files/etc/uci-defaults/01_leds | 5 +- target/linux/ramips/base-files/etc/uci-defaults/02_network | 5 +- target/linux/ramips/dts/MLW221.dts | 226 +++++++++++++++++++++++++++++++++++++------------------------------------- 4 files changed, 116 insertions(+), 124 deletions(-) diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh index bd3779a..74b8867 100755 --- a/target/linux/ramips/base-files/etc/diag.sh +++ b/target/linux/ramips/base-files/etc/diag.sh @@ -73,9 +73,7 @@ get_status_led() { m4) status_led="m4:blue:status" ;; - mlw221) - status_led="kingston:blue:status" - ;; + mlw221|\ mlwg2) status_led="kingston:blue:system" ;; diff --git a/target/linux/ramips/base-files/etc/uci-defaults/01_leds b/target/linux/ramips/base-files/etc/uci-defaults/01_leds index f5b5b01..5d6ed2b 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/01_leds +++ b/target/linux/ramips/base-files/etc/uci-defaults/01_leds @@ -113,10 +113,7 @@ case $board in hw550-3g) set_usb_led "hw550-3g:green:usb" ;; - mlw221) - set_wifi_led "kingston:blue:wifi" - ucidef_set_led_default "system" "system" "kingston:blue:system" "1" - ;; + mlw221|\ mlwg2) set_wifi_led "kingston:blue:wifi" ucidef_set_led_default "system" "system" "kingston:blue:system" "1" diff --git a/target/linux/ramips/base-files/etc/uci-defaults/02_network b/target/linux/ramips/base-files/etc/uci-defaults/02_network index 91bedcc..c3ea489 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/02_network +++ b/target/linux/ramips/base-files/etc/uci-defaults/02_network @@ -55,10 +55,7 @@ ramips_setup_interfaces() ucidef_set_interface_lan "eth0.2" ;; - mlwg2) - ucidef_set_interface_lan "eth0.1" - ;; - + mlwg2 | \ wl-330n | \ wmr300) ucidef_set_interface_lan "eth0.1" diff --git a/target/linux/ramips/dts/MLW221.dts b/target/linux/ramips/dts/MLW221.dts index f220e97..83467dc 100644 --- a/target/linux/ramips/dts/MLW221.dts +++ b/target/linux/ramips/dts/MLW221.dts @@ -3,117 +3,117 @@ /include/ "mt7620n.dtsi" / { - compatible = "mlw221", "ralink,mt7620n-soc"; - model = "Kingston MLW221"; - - palmbus@10000000 { - gpio0: gpio@600 { - status = "okay"; - }; - - gpio2: gpio@660 { - status = "okay"; - }; - - gpio3: gpio@688 { - status = "okay"; - }; - - spi@b00 { - status = "okay"; - - m25p80@0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "s25fl129p1"; - reg = <0 0>; - linux,modalias = "m25p80", "s25fl129p1"; - spi-max-frequency = <10000000>; - - partition@0 { - label = "u-boot"; - reg = <0x0 0x30000>; - read-only; - }; - - partition@30000 { - label = "u-boot-env"; - reg = <0x30000 0x10000>; - read-only; - }; - - factory: partition@40000 { - label = "factory"; - reg = <0x40000 0x10000>; - read-only; - }; - - partition@50000 { - label = "firmware"; - reg = <0x50000 0xf60000>; - }; - - partition@fb0000 { - label = "user-config"; - reg = <0xfb0000 0x50000>; - - }; - }; - }; - }; - - ehci@101c0000 { - status = "okay"; - }; - - ohci@101c1000 { - status = "okay"; - }; - - ethernet@10100000 { - mtd-mac-address = <&factory 0x4>; - ralink,port-map = "wllll"; - }; - - wmac@10180000 { - ralink,mtd-eeprom = <&factory 0>; - }; - - pinctrl { - state_default: pinctrl0 { - default { - ralink,group = "i2c", "ephy", "wled"; - ralink,function = "gpio"; - }; - }; - }; - - gpio-leds { - compatible = "gpio-leds"; - system { - label = "kingston:blue:system"; - gpios = <&gpio2 3 1>; - }; - wifi { - label = "kingston:blue:wifi"; - gpios = <&gpio3 0 1>; - }; - }; - - gpio-keys-polled { - compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; - poll-interval = <20>; - reset { - label = "reset"; - gpios = <&gpio0 1 1>; - linux,code = <0x198>; - }; - system { - label = "system"; - gpios = <&gpio0 2 1>; - linux,code = <0x211>; - }; - }; + compatible = "mlw221", "ralink,mt7620n-soc"; + model = "Kingston MLW221"; + + palmbus@10000000 { + gpio0: gpio@600 { + status = "okay"; + }; + + gpio2: gpio@660 { + status = "okay"; + }; + + gpio3: gpio@688 { + status = "okay"; + }; + + spi@b00 { + status = "okay"; + + m25p80@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "s25fl129p1"; + reg = <0 0>; + linux,modalias = "m25p80", "s25fl129p1"; + spi-max-frequency = <10000000>; + + partition@0 { + label = "u-boot"; + reg = <0x0 0x30000>; + read-only; + }; + + partition@30000 { + label = "u-boot-env"; + reg = <0x30000 0x10000>; + read-only; + }; + + factory: partition@40000 { + label = "factory"; + reg = <0x40000 0x10000>; + read-only; + }; + + partition@50000 { + label = "firmware"; + reg = <0x50000 0xf60000>; + }; + + partition@fb0000 { + label = "user-config"; + reg = <0xfb0000 0x50000>; + + }; + }; + }; + }; + + ehci@101c0000 { + status = "okay"; + }; + + ohci@101c1000 { + status = "okay"; + }; + + ethernet@10100000 { + mtd-mac-address = <&factory 0x4>; + ralink,port-map = "wllll"; + }; + + wmac@10180000 { + ralink,mtd-eeprom = <&factory 0>; + }; + + pinctrl { + state_default: pinctrl0 { + default { + ralink,group = "i2c", "ephy", "wled"; + ralink,function = "gpio"; + }; + }; + }; + + gpio-leds { + compatible = "gpio-leds"; + system { + label = "kingston:blue:system"; + gpios = <&gpio2 3 1>; + }; + wifi { + label = "kingston:blue:wifi"; + gpios = <&gpio3 0 1>; + }; + }; + + gpio-keys-polled { + compatible = "gpio-keys-polled"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <20>; + reset { + label = "reset"; + gpios = <&gpio0 1 1>; + linux,code = <0x198>; + }; + system { + label = "system"; + gpios = <&gpio0 2 1>; + linux,code = <0x211>; + }; + }; };