From patchwork Fri Aug 23 07:00:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Birger Koblitz X-Patchwork-Id: 1152000 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=birger-koblitz.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="gQH1do8N"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46FCL92lp3z9sBp for ; Fri, 23 Aug 2019 17:13:37 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Date:Message-ID: From:To:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=QgvUkW4I/CS9MuzDfwGzAvIV+e6bnb9CICsOqJXeBfE=; b=gQH1do8NQSsHpl s83V7/3/0a3Z5BRkNtdqO7b2Vf292rtN0cxrviwOMOlGbAg5PqRELCOZkMoBjo0jpSgO0F4/mm1Jf RY9HsgTpfiw8RCZfBmzQXFn9GkNhCG+QkPJv+B7rArSyV3ZH/Jz2GGqAW73px+Eh1wiAiLvSOZ/pU tmzR0KCQumV/jVLFmn9KKTJY3mTya6f/eGaxAnz/ztmIP+iuB5tBFBHEgdas4HhWKyjvZ/SyKMKpr pyOUuFEGeCYJWQLsI5PgMaEFAG1CCbMNzQbjuRlrg7ysWRISx/XKpJLU0WcwdzpWrehPEDYesy9+x e+ZUhpaC6xqGtzqCvD9A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1i13l7-0006oD-Lb; Fri, 23 Aug 2019 07:13:17 +0000 Received: from wp175.webpack.hosteurope.de ([2a01:488:42:1000:50ed:84b6::]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1i13ZA-0000O5-11 for openwrt-devel@lists.openwrt.org; Fri, 23 Aug 2019 07:00:59 +0000 Received: from p4fcf952c.dip0.t-ipconnect.de ([79.207.149.44] helo=[192.168.2.103]); authenticated by wp175.webpack.hosteurope.de running ExIM with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) id 1i13Z4-0003Yx-1F; Fri, 23 Aug 2019 09:00:50 +0200 To: 'OpenWrt Development List' From: Birger Koblitz Openpgp: preference=signencrypt Autocrypt: addr=mail@birger-koblitz.de; prefer-encrypt=mutual; keydata= mQGiBELb9iURBAD7URWZY2HQ38IvWh1pUBiOJMoMi3/qImwhh2hWCgfVPP2FsKD+84zNqJgi bIgCWeiHeyQ5fcUnpnn2aPNwMznRxmwjCfb4a6AUPKjZIETGREaWathA9kVAkIlnrZI16QpY cz9gWXenVe2bPTny723pQNhLKNhmTQySjQikSMiSAwCgvLxjtDu3gckDzjmA8qs25c6nxRsE ANZI7xZqR7wcvzs5/UxNd43UsAN8NYLaOd7E5jgjfaDUu6fxUgmZmWdM+F1Xkp91a4ZHQpMC NSAF+vPWiGEGJLhpNYDME/UhqQMDx95v6VvOiH2n4MC0ReW2YkhSCCP1uXVt2/Z7d7jmNtD9 G8oRE1e/fdRmDMYsdcqN6DmkoJdGBADrr4sVPd6mywEL8kZVfwwPw1i3xMXk5GiAEHj+awo+ eFTkS6F0K7IAuixm/qizf8zsUob0TRn4VCmFoyT3fkNLxjbi94g9koVQ2cUTCwmkRZkH3fUR /jX5ybnKUKO+jyAL2loVnYcC1I3EVzt0NFNx4siG3uzgfAdBF0bNEXjwOrQxQmlyZ2VyIEtv YmxpdHogKHByaXZhdGUpIDxtYWlsQGJpcmdlci1rb2JsaXR6LmRlPohaBBMRAgAaBQJMo3rM ApsPBosJCAcDAgSVAggDBJYCAwEACgkQ0SJkb/ufpr4lRQCgukvkUqWZ6FbRa6bPdutUcW08 PacAn0rBrMyYzdUo/cvD7LTjOBH8eW6RuQENBELb9igQBAD//o2rYN5fVDYLPTWyRJj9di9e Cwp3T9s+AnY9R7s6U6MDaLfFSzCwpJZTeYkN8V/n5C2iTIQomUkhrc8v4YMlI71XHs+qoSsu lvzjlu9eRHysSWbtmeNjGPRKrJHfQCywifrSgY3xJzteY1Ks9JAnW4QKhZQvgHi920f3KL63 5wADBQP6AuAqbvBdXAoxLuJmiCojzsqF+J4ZBMFvuXd8md2EYtQV74ZqxbAcDo9ELNh+2VNd vnsn05NswHNBpaSnhTNzr0TkNkRRQAhZ8rwNbNh0iVuT4PADlyDkEWdNfBl1MUfs8OyCj1tB l2UGeJ+DNp1+X8AiNyGmdEicozb90I7UBVyISQQYEQIACQUCTKN6zAKbDAAKCRDRImRv+5+m vg64AJwISUIlauuw6sMaWhGtqGzBc96pAACeKH15f9ssxrnwYSzk1spOsw8ejpM= Message-ID: Date: Fri, 23 Aug 2019 09:00:36 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 Content-Language: en-US X-bounce-key: webpack.hosteurope.de; mail@birger-koblitz.de; 1566543656; 84039423; X-HE-SMSGID: 1i13Z4-0003Yx-1F X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190823_000056_411942_ECA4BFA2 X-CRM114-Status: GOOD ( 10.20 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 NUMERIC_HTTP_ADDR URI: Uses a numeric IP address in URL Subject: [OpenWrt-Devel] [PATCH v5] ramips: add support for Edimax RG21S X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org ramips: add Edimax RG21S SoC:    MediaTek MT7621AT dual-core @ 880MHz RAM:    256M (Nanya NT5CC128M) FLASH:    16MB (Macronix MX25L12835F) WiFi:    - 2.4GHz MediaTek MT7615N bgn     - 5GHz MediaTek MT7615N nac Switch: SoC integrated Gigabit Switch (4 x LAN, 1 x WAN) USB:    No BTN:    Reset, WPS LED:    4 red LEDs, indistinguishable when casing closed UART:     UART is present as Pads marked J1 on the PCB.     3.3V - RX - GND - TX / 57600-8N1     3.3V is the square pad Installation ------------ Update the factory image via the OEM web-interface (by default:http://192.168.1.1) The sysupgrade image can be installed via TFTP from the U-Boot bootloader. Connect ethernet port 2. Signed-off-by: Birger Koblitz --- v3: Update to DEVICE_VENDOR / DEVICE_MODEL in mt7621.mk     renamed .dts according to new conventions     Removed memory node from .dts     Correct image size     Whitespace fixes v4: Added wifi0/1 labels to wifi nodes     Model name corrected in dts     Comments removed from .dts v5: Corrected MT7615N PCI IDs     Unnecessary kernel-modules removed from image  define Build/iodata-factory    $(eval fw_size=$(word 1,$(1)))    $(eval fw_type=$(word 2,$(1))) @@ -173,6 +192,20 @@ define Device/d-team_pbr-m1  endef  TARGET_DEVICES += d-team_pbr-m1   +define Device/edimax_rg21s +  MTK_SOC := mt7621 +  IMAGE_SIZE := 16064k +  DEVICE_VENDOR := EDIMAX +  DEVICE_MODEL := RG21S +  IMAGES += factory.bin +  IMAGE/factory.bin := \ +    $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ +    elx-header 02020038 8844A2D168B45A2D +  DEVICE_PACKAGES := \ +        kmod-mt7615e wpad-basic +endef +TARGET_DEVICES += edimax_rg21s +  define Device/elecom_wrc-1167ghbk2-s    MTK_SOC := mt7621    IMAGE_SIZE := 15488k diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network index c0de9d4e50..91685508db 100755 --- a/target/linux/ramips/base-files/etc/board.d/02_network +++ b/target/linux/ramips/base-files/etc/board.d/02_network @@ -336,6 +336,10 @@ ramips_setup_interfaces()          ucidef_add_switch "switch0" \              "0:lan" "4:wan" "6@eth0"          ;; +    edimax,rg21s) +        ucidef_add_switch "switch0" \ +            "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "0:wan" "6@eth0" +        ;;      gehua,ghl-r-001)          ucidef_add_switch "switch0" \              "0:lan" "1:lan" "2:lan" "4:wan" "6@eth0" @@ -594,6 +598,10 @@ ramips_setup_macs()      edimax,br-6478ac-v2)          wan_mac=$(macaddr_add "$(cat /sys/class/net/eth0/address)" 2)          ;; +    edimax,rg21s) +        lan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr) +        wan_mac=$(mtd_get_mac_ascii u-boot-env wanaddr) +        ;;      elecom,wrc-1167ghbk2-s|\      elecom,wrc-1900gst|\      elecom,wrc-2533gst|\ diff --git a/target/linux/ramips/dts/mt7621_edimax_rg21s.dts b/target/linux/ramips/dts/mt7621_edimax_rg21s.dts new file mode 100644 index 0000000000..dfccae102b --- /dev/null +++ b/target/linux/ramips/dts/mt7621_edimax_rg21s.dts @@ -0,0 +1,157 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include "mt7621.dtsi" + +#include +#include + +/ { +    compatible = "edimax,rg21s", "mediatek,mt7621-soc"; +    model = "Edimax RG21S"; + +    aliases { +        led-boot = &led_power; +        led-failsafe = &led_power; +        led-running = &led_power; +        led-upgrade = &led_power; +    }; + +    chosen { +        bootargs = "console=ttyS0,57600"; +    }; + +    palmbus: palmbus@1E000000 { +        i2c@900 { +            status = "okay"; +        }; +    }; + +    keys { +        compatible = "gpio-keys"; + +        reset { +            label = "reset"; +            gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; +            linux,code = ; +        }; + +        wps { +            label = "wps"; +            gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; +            linux,code = ; +        }; +    }; + +    leds { +        compatible = "gpio-leds"; + +        led_power: led_1 { +            label = "rg21s:red:led1"; +            gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>; +        }; + +        led_2 { +            label = "rg21s:red:led2"; +            gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; +        }; + +        led_3 { +            label = "rg21s:red:led3"; +            gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; +        }; + +        led_4 { +            label = "rg21s:red:led4"; +            gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; +        }; +    }; +}; + +&sdhci { +    status = "okay"; +}; + +&spi0 { +    status = "okay"; + +    m25p80@0 { +        compatible = "jedec,spi-nor"; +        reg = <0>; +        spi-max-frequency = <10000000>; + +        partitions { +            compatible = "fixed-partitions"; +            #address-cells = <1>; +            #size-cells = <1>; + +            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 { +                compatible = "denx,uimage"; +                label = "firmware"; +                reg = <0x50000 0xfb0000>; +            }; +        }; +    }; +}; + +&pcie { +    status = "okay"; +}; + +&pcie0 { +    wifi0: wifi@0,0 { +        compatible = "pci14c3,7615"; +        reg = <0x0000 0 0 0 0>; +        mediatek,mtd-eeprom = <&factory 0x0000>; +        ieee80211-freq-limit = <2400000 2500000>; +        mtd-mac-address = <&factory 0x4>; +    }; +}; + +&pcie1 { +    wifi1: wifi@0,0 { +        compatible = "pci14c3,7615"; +        reg = <0x0000 0 0 0 0>; +        mediatek,mtd-eeprom = <&factory 0x8000>; +        ieee80211-freq-limit = <5000000 6000000>; +        mtd-mac-address = <&factory 0x8004>; +    }; +}; + +ðernet { +    mediatek,portmap = "wllll"; +    port@5 { +        status = "disabled"; +    }; +}; + +&pinctrl { +    state_default: pinctrl0 { +        gpio { +            ralink,group = "wdt", "rgmii2", "jtag", "mdio"; +            ralink,function = "gpio"; +        }; +    }; +}; + +&xhci { +    status = "disabled"; +}; diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index d32feb7eab..06c5369514 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -30,6 +30,25 @@ define Build/elecom-wrc-factory    mv $@.new $@  endef   +define Build/elx-header +  $(eval hw_id=$(word 1,$(1))) +  $(eval xor_pattern=$(word 2,$(1))) +  ( \ +    echo -ne "\x00\x00\x00\x00\x00\x00\x00\x03" | \ +      dd bs=42 count=1 conv=sync; \ +    hw_id="$(hw_id)"; \ +    echo -ne "\x$${hw_id:0:2}\x$${hw_id:2:2}\x$${hw_id:4:2}\x$${hw_id:6:2}" | \ +      dd bs=20 count=1 conv=sync; \ +    echo -ne "$$(printf '%08x' $$(stat -c%s $@) | fold -s2 | xargs -I {} echo \\x{} | tr -d '\n')" | \ +      dd bs=8 count=1 conv=sync; \ +    echo -ne "$$($(STAGING_DIR_HOST)/bin/mkhash md5 $@ | fold -s2 | xargs -I {} echo \\x{} | tr -d '\n')" | \ +      dd bs=58 count=1 conv=sync; \ +  ) > $(KDIR)/tmp/$(DEVICE_NAME).header +  $(call Build/xor-image,-p $(xor_pattern) -x) +  cat $(KDIR)/tmp/$(DEVICE_NAME).header $@ > $@.new +  mv $@.new $@ +endef +