From patchwork Tue Mar 13 11:09:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 885073 X-Patchwork-Delegate: zajec5@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="BbOkuOK7"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="XZzFW97Y"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 400sZs1b27z9sTH for ; Tue, 13 Mar 2018 22:10:13 +1100 (AEDT) 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=lYOICsNyswvtrry7YISr09cgbIN/79fEF4y4ZiVtpq4=; b=BbOkuOK7r7J0NZ wZ9NhHLJ3OFlpHq3CRz77Y9xk3Hel9gwrGv2Tk+iSh4AgfCQPBRl7UBMwDmumBsjMMBh7AtFqyVe1 fYaIfRSS8piHrvw8bTxv+e7EFFfqIYA4u2LFBbxLitUQMyoT0E0DMT1pB3a1dbaWRZYHjpi5doooT AB8cwqV310k88MGQx5SnO0I5nyIpKvq7LshoavJnDcpbyYD6g2bPTsdO216RYRBrAR0Aul4/TW7rY lJxEvOhzchP/xn0KSwL03jro4Fby1k2NakpXNfTMGv4yW4ri42VDAC+six09wuIeIzh1GzS4wsamm YhTmRHDVkTdUhLzAiRFQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1evhoZ-00073u-9K; Tue, 13 Mar 2018 11:09:55 +0000 Received: from mail-lf0-x243.google.com ([2a00:1450:4010:c07::243]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1evhoU-00070u-5E for lede-dev@lists.infradead.org; Tue, 13 Mar 2018 11:09:52 +0000 Received: by mail-lf0-x243.google.com with SMTP id f75-v6so28114021lfg.6 for ; Tue, 13 Mar 2018 04:09:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=4k12lw1gRoJPGUx1A2lnGL/9SmT9laqAda3A8CGs2Dc=; b=XZzFW97YlYA5eCPUwf9MgQB73B8SpZp3nznoROTD8E60vkL3Zq9qWEd1RfjlKHDxw2 6LH60zpHLpvsDUB3cz+NNweAxBOeVggZrRFTfcDguAv7APmOA3AwZti6SkW8kr3INslx 0JBKGjz4qAfJapSlVueNTIQoXABEbAyTFw9OcPUMZcylaLj+uRGWFJLCdPXB9xgh2qHQ f0Hq61lTbOLxPK74JbqrAFXHZcN9OEPqftRgom15hb8GKBgm6oCVMHoYYsTuXPt/oZQz d3Y2yc4p7Q2NZY0ImZB6oP5sYghWpLAdiPcnEBW6Dg7pERKPHJ/RMXlRafAvtGjFK/hj kfrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=4k12lw1gRoJPGUx1A2lnGL/9SmT9laqAda3A8CGs2Dc=; b=JIiJFjSzbt/c47acMy81Q4AMrrRSxV4aV0UvGpruchagvrUbey8sJu2Y8IZIpXpK4I 1VvJs9G5FZm2h7jyWBdbVs1s4lAp40wndOZc8h+rsaZyijwF+b1kbKf3YWFC9b8g1lsN 7iiK06CjaotgxI8VdsN0+hnujpscMONpdYkxpEf1R+h2SJnmEpJpH4oDGdJnPloAAXeJ 1IXRAo5xNpEN9+heSdC5vbdP+ywb9RQm5TVKGeozyj+ctMZjSJolbpkEv47bUN2vbTgb wMPnbvIoawh+jvjL+28jpkUSYm6rZ5hiGdSfsVD5ql5K4wDJwP0ifmm+z9KWBU0UDXj9 VBpg== X-Gm-Message-State: AElRT7HM5upJzBtTKF9ZNp4D9u78gi7xAB1hZ2+06lea1h1pUbX8wQLg LkGF028LV2L3PKKNIn5w0IsjKQ== X-Google-Smtp-Source: AG47ELuhmxjicwl87S0SMG2Kx1dF5Ll1imcFc4+aj80O+OKFn84Q/JiQaN1MjFZAptdcOkyMhJ+ppQ== X-Received: by 2002:a19:8e95:: with SMTP id a21-v6mr180940lfl.140.1520939378038; Tue, 13 Mar 2018 04:09:38 -0700 (PDT) Received: from linux-samsung.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id l1sm21810ljc.91.2018.03.13.04.09.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Mar 2018 04:09:37 -0700 (PDT) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: Jonas Gorski , lede-dev@lists.infradead.org Date: Tue, 13 Mar 2018 12:09:20 +0100 Message-Id: <20180313110920.30783-1-zajec5@gmail.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180313_040950_256106_01774692 X-CRM114-Status: GOOD ( 10.68 ) X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:4010:c07:0:0:0:243 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (zajec5[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (zajec5[at]gmail.com) -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 -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain Subject: [LEDE-DEV] [PATCH] kernel: b53: look for NVRAM's "robo_reset" entry on every platform X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Rafał Miłecki Since kernel 4.1 bcm47xx_nvram_gpio_pin() is now defined in a global header and can be safely called even on non-Broadcom platforms. This change makes b53 look for "robo_reset" on ARCH_BCM_5301X and slightly simplifies the code. Signed-off-by: Rafał Miłecki --- target/linux/generic/files/drivers/net/phy/b53/b53_priv.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/target/linux/generic/files/drivers/net/phy/b53/b53_priv.h b/target/linux/generic/files/drivers/net/phy/b53/b53_priv.h index 0c0358206d..d148c03349 100644 --- a/target/linux/generic/files/drivers/net/phy/b53/b53_priv.h +++ b/target/linux/generic/files/drivers/net/phy/b53/b53_priv.h @@ -311,6 +311,7 @@ static inline int b53_write64(struct b53_device *dev, u8 page, u8 reg, #ifdef CONFIG_BCM47XX #include +#endif #include #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0)) @@ -318,20 +319,21 @@ static inline int b53_write64(struct b53_device *dev, u8 page, u8 reg, #endif static inline int b53_switch_get_reset_gpio(struct b53_device *dev) { +#ifdef CONFIG_BCM47XX enum bcm47xx_board board = bcm47xx_board_get(); switch (board) { case BCM47XX_BOARD_LINKSYS_WRT300NV11: case BCM47XX_BOARD_LINKSYS_WRT310NV1: return 8; - default: - return bcm47xx_nvram_gpio_pin("robo_reset"); } -} +#endif + +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0)) + return bcm47xx_nvram_gpio_pin("robo_reset"); #else -static inline int b53_switch_get_reset_gpio(struct b53_device *dev) -{ return -ENOENT; -} #endif +} + #endif