From patchwork Wed Aug 5 18:30:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Piotr Dymacz X-Patchwork-Id: 504175 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 21E56140D16 for ; Thu, 6 Aug 2015 04:40:38 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=P7UHuOLY; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 5032C28C106; Wed, 5 Aug 2015 20:33:33 +0200 (CEST) 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 3A6E0289C4B for ; Wed, 5 Aug 2015 20:30:48 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .gmail. - helo: .mail-lb0-f169.google. - helo-domain: .google.) FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -8.5 Received: from mail-lb0-f169.google.com (mail-lb0-f169.google.com [209.85.217.169]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Wed, 5 Aug 2015 20:30:48 +0200 (CEST) Received: by lbbpu9 with SMTP id pu9so2090916lbb.3 for ; Wed, 05 Aug 2015 11:31:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=/KZgJA7BtSItU6bH/qpCcSqQjrIa3mNZ9fVNQSDcZnI=; b=P7UHuOLYy4JjB02tHIdQxQVxTLcZKtKB/3YStdQTlm6uCV+V/1dVQsSBaek/rMbulA v93g2h7f1Nzx3cPgoApS+vXYw13ARil1+cQX46m2khO9oTgVATEsJ5mHHLVArWNAkZGT 0dhzW/ZVuwIg7u4EE8PgYZ6ZH0M63SCgrRPTKTYWGiKVCTW1tLez+Kgrj+sCB+P+/xat r9eSOinabkM9kf38bV6t6dMTQqbvw5kO9J1Gh3200TplhKRD5nZlLAfbrvdFPuGwVMDr PaUdfvLNQqxj+MOcTP2w9H0cpQpfFA75SkMBY0qjBrPSeXJe6Osi/Nefn0+30KkS602v kBiw== X-Received: by 10.152.29.97 with SMTP id j1mr10600121lah.104.1438799470595; Wed, 05 Aug 2015 11:31:10 -0700 (PDT) Received: from ubuntu1404vm.lan (178235196055.warszawa.vectranet.pl. [178.235.196.55]) by smtp.gmail.com with ESMTPSA id ao8sm726686lac.38.2015.08.05.11.31.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 05 Aug 2015 11:31:09 -0700 (PDT) From: Piotr Dymacz To: openwrt-devel@lists.openwrt.org Date: Wed, 5 Aug 2015 20:30:13 +0200 Message-Id: <1438799426-24409-13-git-send-email-pepe2k@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438799426-24409-1-git-send-email-pepe2k@gmail.com> References: <1438799426-24409-1-git-send-email-pepe2k@gmail.com> Subject: [OpenWrt-Devel] [PATCH v2 12/25] ramips: fix Aigale Ai-BR100 dts and profile names 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" The following patch changes dts filename and profile name for Aigale Ai-BR100 (for consistency). Signed-off-by: Piotr Dymacz --- target/linux/ramips/dts/AI-BR100.dts | 109 ++++++++++++++++++++++++++ target/linux/ramips/dts/AIBR100.dts | 109 -------------------------- target/linux/ramips/image/Makefile | 4 +- target/linux/ramips/mt7620/profiles/aigale.mk | 6 +- 4 files changed, 114 insertions(+), 114 deletions(-) create mode 100644 target/linux/ramips/dts/AI-BR100.dts delete mode 100644 target/linux/ramips/dts/AIBR100.dts diff --git a/target/linux/ramips/dts/AI-BR100.dts b/target/linux/ramips/dts/AI-BR100.dts new file mode 100644 index 0000000..90195b6 --- /dev/null +++ b/target/linux/ramips/dts/AI-BR100.dts @@ -0,0 +1,109 @@ +/dts-v1/; + +/include/ "mt7620a.dtsi" + +/ { + compatible = "AI-BR100", "ralink,mt7620a-soc"; + model = "Aigale Ai-BR100"; + + palmbus@10000000 { + gpio2: gpio@660 { + status = "okay"; + }; + + gpio3: gpio@688 { + status = "okay"; + }; + + spi@b00 { + status = "okay"; + + m25p80@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "en25q64"; + reg = <0 0>; + linux,modalias = "m25p80", "en25q64"; + spi-max-frequency = <10000000>; + + partition@0 { + label = "u-boot"; + reg = <0x0 0x20000>; + read-only; + }; + + partition@20000 { + label = "u-boot-env"; + reg = <0x20000 0x10000>; + read-only; + }; + + factory: partition@30000 { + label = "factory"; + reg = <0x30000 0x10000>; + read-only; + }; + + partition@40000 { + label = "firmware"; + reg = <0x40000 0x7c0000>; + }; + }; + }; + }; + + ehci@101c0000 { + status = "okay"; + }; + + ohci@101c1000 { + status = "okay"; + }; + + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "ephy", "wled", "nd_sd"; + ralink,function = "gpio"; + }; + }; + }; + + ethernet@10100000 { + pinctrl-names = "default"; + pinctrl-0 = <&ephy_pins>; + mtd-mac-address = <&factory 0x4>; + ralink,port-map = "llllw"; + }; + + wmac@10180000 { + ralink,mtd-eeprom = <&factory 0>; + }; + + gpio-leds { + compatible = "gpio-leds"; + + wan { + label = "aigale:blue:wan"; + gpios = <&gpio2 4 1>; + }; + + wlan { + label = "aigale:blue:wlan"; + 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 12 1>; + linux,code = <0x198>; + }; + }; +}; diff --git a/target/linux/ramips/dts/AIBR100.dts b/target/linux/ramips/dts/AIBR100.dts deleted file mode 100644 index 963e835..0000000 --- a/target/linux/ramips/dts/AIBR100.dts +++ /dev/null @@ -1,109 +0,0 @@ -/dts-v1/; - -/include/ "mt7620a.dtsi" - -/ { - compatible = "AIBR100", "ralink,mt7620a-soc"; - model = "Aigale Ai-BR100"; - - palmbus@10000000 { - gpio2: gpio@660 { - status = "okay"; - }; - - gpio3: gpio@688 { - status = "okay"; - }; - - spi@b00 { - status = "okay"; - - m25p80@0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "en25q64"; - reg = <0 0>; - linux,modalias = "m25p80", "en25q64"; - spi-max-frequency = <10000000>; - - partition@0 { - label = "u-boot"; - reg = <0x0 0x20000>; - read-only; - }; - - partition@20000 { - label = "u-boot-env"; - reg = <0x20000 0x10000>; - read-only; - }; - - factory: partition@30000 { - label = "factory"; - reg = <0x30000 0x10000>; - read-only; - }; - - partition@40000 { - label = "firmware"; - reg = <0x40000 0x7c0000>; - }; - }; - }; - }; - - ehci@101c0000 { - status = "okay"; - }; - - ohci@101c1000 { - status = "okay"; - }; - - pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "ephy", "wled", "nd_sd"; - ralink,function = "gpio"; - }; - }; - }; - - ethernet@10100000 { - pinctrl-names = "default"; - pinctrl-0 = <&ephy_pins>; - mtd-mac-address = <&factory 0x4>; - ralink,port-map = "llllw"; - }; - - wmac@10180000 { - ralink,mtd-eeprom = <&factory 0>; - }; - - gpio-leds { - compatible = "gpio-leds"; - - wan { - label = "aigale:blue:wan"; - gpios = <&gpio2 4 1>; - }; - - wlan { - label = "aigale:blue:wlan"; - 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 12 1>; - linux,code = <0x198>; - }; - }; -}; diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile index e3ff8e6..ae89d6c 100644 --- a/target/linux/ramips/image/Makefile +++ b/target/linux/ramips/image/Makefile @@ -856,7 +856,7 @@ Image/Build/Profile/MT7620a_MT7610e=$(call BuildFirmware/Default8M/$(1),$(1),mt7 Image/Build/Profile/MT7620a_MT7530=$(call BuildFirmware/Default8M/$(1),$(1),mt7620a_mt7530,MT7620a_MT7530) Image/Build/Profile/MT7620a_V22SG=$(call BuildFirmware/Default8M/$(1),$(1),mt7620a_v22sg,MT7620a_V22SG) br100_mtd_size=8126464 -Image/Build/Profile/AIBR100=$(call BuildFirmware/CustomFlash/$(1),$(1),ai-br100,AIBR100,$(br100_mtd_size),Ai-BR) +Image/Build/Profile/AI-BR100=$(call BuildFirmware/CustomFlash/$(1),$(1),ai-br100,AI-BR100,$(br100_mtd_size),Ai-BR) Image/Build/Profile/RP-N53=$(call BuildFirmware/Default8M/$(1),$(1),rp-n53,RP-N53) whr_300hp2_mtd_size=7012352 Image/Build/Profile/WHR300HP2=$(call BuildFirmware/CustomFlash/$(1),$(1),whr-300hp2,WHR-300HP2,$(whr_300hp2_mtd_size)) @@ -894,7 +894,7 @@ define Image/Build/Profile/Default $(call Image/Build/Profile/MT7620a_MT7610e,$(1)) $(call Image/Build/Profile/MT7620a_MT7530,$(1)) $(call Image/Build/Profile/MT7620a_V22SG,$(1)) - $(call Image/Build/Profile/AIBR100,$(1)) + $(call Image/Build/Profile/AI-BR100,$(1)) $(call Image/Build/Profile/CF-WR800N,$(1)) $(call Image/Build/Profile/RP-N53,$(1)) $(call Image/Build/Profile/DIR-810L,$(1)) diff --git a/target/linux/ramips/mt7620/profiles/aigale.mk b/target/linux/ramips/mt7620/profiles/aigale.mk index 475aac9..629a378 100644 --- a/target/linux/ramips/mt7620/profiles/aigale.mk +++ b/target/linux/ramips/mt7620/profiles/aigale.mk @@ -5,12 +5,12 @@ # See /LICENSE for more information. # -define Profile/AIBR100 +define Profile/AI-BR100 NAME:=Aigale Ai-BR100 PACKAGES:=kmod-usb-ohci kmod-usb2 endef -define Profile/AIBR100/Description +define Profile/AI-BR100/Description Default package set for Aigale Ai-BR100. endef -$(eval $(call Profile,AIBR100)) +$(eval $(call Profile,AI-BR100))