From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BA175C48BD3 for ; Sat, 6 Jul 2019 15:31:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8687520856 for ; Sat, 6 Jul 2019 15:31:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=jm0.eu header.i=@jm0.eu header.b="J4mI5LQL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726978AbfGFPbS (ORCPT ); Sat, 6 Jul 2019 11:31:18 -0400 Received: from mo4-p05-ob.smtp.rzone.de ([85.215.255.130]:34980 "EHLO mo4-p05-ob.smtp.rzone.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726698AbfGFPbS (ORCPT ); Sat, 6 Jul 2019 11:31:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1562427076; s=strato-dkim-0002; d=jm0.eu; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: X-RZG-CLASS-ID:X-RZG-AUTH:From:Subject:Sender; bh=+SpY4xus7eP4MPcA3lgfvlER9kX2n6MRDtKqhf0ITkk=; b=J4mI5LQLhuSWuosVTBvx5niBFYzKBa8lyhqmdXOLvR6D78cxXslDP9VqvcPrPYgCJq fwma0KVIVkVF/Ighq3Ka9mTQVHiZsxahO3QI4ysOz3/t3c3BDO50IKmBBCrVoEHCsXAD lWpdktg626r3wq6kqWT8Kpzny7+7UQ8/J6oVES1ucO0M9u03IT8h70f92krftiszDwLe 5z/xCxySMpKA8GvcuJMzNaybBrypev87TH+93Ic+0Gls6n3QgkF1hoLd40R63bm/q5ox SPk5KCLcev4KbEOGBvD1Jh06DdtH48tJjNlI2gClwZQqbdUmkU+U2W1nABTeLUv9jadO kbpw== X-RZG-AUTH: ":JmMXYEHmdv4HaV2cbPh7iS0wbr/uKIfGM0EPWe8EZQbw/dDJ/fVPBaXaSiaF5/mu26zWKwNU" X-RZG-CLASS-ID: mo05 Received: from linux-1tvp.lan by smtp.strato.de (RZmta 44.24 DYNA|AUTH) with ESMTPSA id h0a328v66FJB6MW (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA)) (Client did not present a certificate); Sat, 6 Jul 2019 17:19:11 +0200 (CEST) From: josua@solid-run.com To: netdev@vger.kernel.org Cc: Josua Mayer , stable@vger.kernel.org, "David S. Miller" Subject: [PATCH 2/4] net: mvmdio: allow up to four clocks to be specified for orion-mdio Date: Sat, 6 Jul 2019 17:18:58 +0200 Message-Id: <20190706151900.14355-3-josua@solid-run.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20190706151900.14355-1-josua@solid-run.com> References: <20190706151900.14355-1-josua@solid-run.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Josua Mayer Allow up to four clocks to be specified and enabled for the orion-mdio interface, which are required by the Armada 8k and defined in armada-cp110.dtsi. Fixes a hang in probing the mvmdio driver that was encountered on the Clearfog GT 8K with all drivers built as modules, but also affects other boards such as the MacchiatoBIN. Cc: stable@vger.kernel.org Fixes: 96cb43423822 ("net: mvmdio: allow up to three clocks to be specified for orion-mdio") Signed-off-by: Josua Mayer --- drivers/net/ethernet/marvell/mvmdio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/marvell/mvmdio.c b/drivers/net/ethernet/marvell/mvmdio.c index c5dac6bd2be4..e17d563e97a6 100644 --- a/drivers/net/ethernet/marvell/mvmdio.c +++ b/drivers/net/ethernet/marvell/mvmdio.c @@ -64,7 +64,7 @@ struct orion_mdio_dev { void __iomem *regs; - struct clk *clk[3]; + struct clk *clk[4]; /* * If we have access to the error interrupt pin (which is * somewhat misnamed as it not only reflects internal errors -- 2.16.4