From patchwork Tue Aug 2 20:26:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathias Kresin X-Patchwork-Id: 655133 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3s3npk6krWz9t3m for ; Wed, 3 Aug 2016 06:28:46 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=kresin-me.20150623.gappssmtp.com header.i=@kresin-me.20150623.gappssmtp.com header.b=ytT/7K4D; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bUgHB-0006fs-Cx; Tue, 02 Aug 2016 20:26:57 +0000 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bUgGq-0006SS-MQ for lede-dev@lists.infradead.org; Tue, 02 Aug 2016 20:26:38 +0000 Received: by mail-wm0-x244.google.com with SMTP id i5so32809461wmg.2 for ; Tue, 02 Aug 2016 13:26:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kresin-me.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=r4hxfweu0Wr/1lEC5ebqHc9GtVQSCqT25vc0K3yZTxA=; b=ytT/7K4DFTTxEZRg6Qbvr75q16Q1d6znjxO48Sp/1NmEhW5rLLOwVYXjobeDuWSU9M 6Uc4HM/8L4QImq+8e6zUcy4+Z6W7WvUahuEdcaiWvJxtbG4iGeaVEXYgn+GXrvKGqTld iRFk/gh+n3riETe/ws+NtaXxOfCsptEz0+/brkiQ6F/gUTOK+P2uofBgH/2ETWk0j2MN tV53Hrl2gBOuVemRnf+Kvs2Tstvpiy/FVfZmSu3OS5puKHG+eDqJklIPh/WW2D/A9dOv tMV3aN5vyULH01JSZ6qabSDR9lSfFgGZRqOT5MyVRW9AeH55hPqUoMNXkQLBkCDFxXSr QQ5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=r4hxfweu0Wr/1lEC5ebqHc9GtVQSCqT25vc0K3yZTxA=; b=c9ZlCEksuQOY2UnAV0hRlF7kEsQeENnxRLGSE0YBo+8pz59LJE9VzI0aZlHcaRfNex +YqIPF/z/ME+hbKX4gRsO7GVNof4pJAZSK+PAYNwcLT+w9I9yA/KdJxCC+r+uDo4LmMx jAyCDuY2hbx5dY+gJrw4wbr6AavFr3yMOao21WRwHbhv32o2PoAtW0B1jx1ZIcJOQz13 hxONPLnm2HuJXFsEX9ogZXlpb7czmmawIuM+C2myUlfQ/lXQWIPLwXzCLiYtbfzN/7KR 1uw3g4LdCr0miBL6ApiqDBP5zvMIeD9xGW+xO8KYxPz58cHrwwSOlD/6Yzq6WJixmhDS nEbA== X-Gm-Message-State: AEkooutiwkXhxyydfp+CcLhpVxzEYfpMK2yJyUkKhTOoEWX+1ajA0ap10GVNm3mHeUkENQ== X-Received: by 10.28.182.84 with SMTP id g81mr20223911wmf.20.1470169574480; Tue, 02 Aug 2016 13:26:14 -0700 (PDT) Received: from desktop.wvd.kresin.me (p200300454B096D00631C7FC25CD5DED3.dip0.t-ipconnect.de. [2003:45:4b09:6d00:631c:7fc2:5cd5:ded3]) by smtp.gmail.com with ESMTPSA id r13sm4622129wmf.12.2016.08.02.13.26.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 02 Aug 2016 13:26:13 -0700 (PDT) From: Mathias Kresin To: lede-dev@lists.infradead.org Date: Tue, 2 Aug 2016 22:26:02 +0200 Message-Id: <1470169562-26594-5-git-send-email-dev@kresin.me> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1470169562-26594-1-git-send-email-dev@kresin.me> References: <1470169562-26594-1-git-send-email-dev@kresin.me> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160802_132636_955380_4AC115D3 X-CRM114-Status: GOOD ( 11.65 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:400c:c09:0:0:0:244 listed in] [list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid Subject: [LEDE-DEV] [PATCH 5/5] lantiq: drop duplicate and now unused "lantiq, eth-mac" binding X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The device tree binding and the associated code duplicates functionality already patched into the etop driver. The compatible string isn't used any more. Therefore the whole code can be dropped. The "mac-increment" property allowed to increment a mac address received via kernel cmdline. This functionality isn't used by any device and should be added as etop driver device tree property if required again. Signed-off-by: Mathias Kresin --- ...-lantiq-wifi-and-ethernet-eeprom-handling.patch | 53 +--------------------- 1 file changed, 1 insertion(+), 52 deletions(-) diff --git a/target/linux/lantiq/patches-4.4/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch b/target/linux/lantiq/patches-4.4/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch index 6cf1b7c..7a97815 100644 --- a/target/linux/lantiq/patches-4.4/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch +++ b/target/linux/lantiq/patches-4.4/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch @@ -335,7 +335,7 @@ Signed-off-by: John Crispin +device_initcall(of_ath5k_eeprom_init); --- /dev/null +++ b/arch/mips/lantiq/xway/eth_mac.c -@@ -0,0 +1,76 @@ +@@ -0,0 +1,25 @@ +/* + * Copyright (C) 2012 John Crispin + * @@ -345,8 +345,6 @@ Signed-off-by: John Crispin + */ + +#include -+#include -+#include +#include + +static u8 eth_mac[6]; @@ -363,55 +361,6 @@ Signed-off-by: John Crispin + return !eth_mac_set; +} +early_param("ethaddr", setup_ethaddr); -+ -+int __init of_eth_mac_probe(struct platform_device *pdev) -+{ -+ struct device_node *np = pdev->dev.of_node; -+ struct resource *mac_res; -+ void __iomem *mac; -+ u32 mac_inc = 0; -+ -+ if (eth_mac_set) { -+ dev_err(&pdev->dev, "mac was already set by bootloader\n"); -+ return -EINVAL; -+ } -+ mac_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); -+ -+ if (!mac_res) { -+ dev_err(&pdev->dev, "failed to load mac\n"); -+ return -EINVAL; -+ } -+ if (resource_size(mac_res) != 6) { -+ dev_err(&pdev->dev, "mac has an invalid size\n"); -+ return -EINVAL; -+ } -+ mac = ioremap(mac_res->start, resource_size(mac_res)); -+ memcpy_fromio(eth_mac, mac, 6); -+ -+ if (!of_property_read_u32(np, "mac-increment", &mac_inc)) -+ eth_mac[5] += mac_inc; -+ -+ return 0; -+} -+ -+static struct of_device_id eth_mac_ids[] = { -+ { .compatible = "lantiq,eth-mac" }, -+ { /* sentinel */ } -+}; -+ -+static struct platform_driver eth_mac_driver = { -+ .driver = { -+ .name = "lantiq,eth-mac", -+ .owner = THIS_MODULE, -+ .of_match_table = of_match_ptr(eth_mac_ids), -+ }, -+}; -+ -+static int __init of_eth_mac_init(void) -+{ -+ return platform_driver_probe(ð_mac_driver, of_eth_mac_probe); -+} -+device_initcall(of_eth_mac_init); --- /dev/null +++ b/arch/mips/lantiq/xway/pci-ath-fixup.c @@ -0,0 +1,118 @@