From patchwork Mon Feb 19 10:13:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 128787 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp3330403ljc; Mon, 19 Feb 2018 02:14:49 -0800 (PST) X-Google-Smtp-Source: AH8x227M5B6F4K99xO8qCwKKeCwYzZWm6DsG3TTERDbkGbtW1ZdaLC8q+axYlPn+Ex5nstv84uzu X-Received: by 2002:a17:902:e65:: with SMTP id 92-v6mr341497plw.268.1519035289009; Mon, 19 Feb 2018 02:14:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519035289; cv=none; d=google.com; s=arc-20160816; b=ePxV90q63bCYmo8YmUDJns7n2TZs8yBq14n7vXgIOSFGqYjfzyk0CWuspx/O3/cBLE yvdCnWEcOoWhjEA9Fnng6jTVAAh7x7SymDpJejUn5OfDSplrs/HsICZ1BQSVo4vDerHX Q5APSZHlp8y9kij8pGJg6VzvGy7CCSZau4HmfqfIQxWmTIlvS4EEFAXo0oobmRmHOhly Wq8moEH0xUwH6ubTYZgSWZw64upbZQSSWElPCu0O2UOrgp2Fr30VuRyXeiIQPrxQ/Sar hpfklhRfHSgd2oCS96de5JL0aOThHgInp9dmEQkQVZEH6MzPafjMoj0s/Uj43kB1dJ8x aadQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=YypF0AsCEGINYErsUqxl6taiwphy9R62gNPfwBm3g2s=; b=FlYBA1IFqXMBiBxWxfmFUx9S30571KYSPDZ2Pk8qifdizOa/Hgwyek4YxKGSyG+8ZQ 8EUX9vlWP5ADo0q8QzPvp1rDx0sUPHlLwcqNhr0uUsDdHKV3QwNo9dKDDOGGONPV02lz pa5gDRpPTThnwFzz89tT6Oo2jteSOIWuBtSB29kgzmOjKgs6IDTWZggH7IhtpAzk+TO9 ROjxhrkod/HZLTQcGIWjgsicbOxMqG8TjwWymGYFgxFQlG27Urhc4HyXInkwxw2K+QPJ SpxxXSwGUnM/qxqzpnaiGjX6x0iUBNU9Rs0K3tXvSzqdL6mMTgzuzWiKb7a+N7IBiUzF z0lw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l11-v6si645433pln.323.2018.02.19.02.14.48; Mon, 19 Feb 2018 02:14:49 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752474AbeBSKOr (ORCPT + 10 others); Mon, 19 Feb 2018 05:14:47 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:51893 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752580AbeBSKOq (ORCPT ); Mon, 19 Feb 2018 05:14:46 -0500 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue006 [212.227.15.129]) with ESMTPA (Nemesis) id 0MK8g5-1ep5uO2TZd-001RQh; Mon, 19 Feb 2018 11:14:25 +0100 From: Arnd Bergmann To: stable@vger.kernel.org Cc: Greg KH , linux-kernel@vger.kernel.org, Arnd Bergmann , Catalin Marinas , Will Deacon , Maxime Ripard , linux-arm-kernel@lists.infradead.org Subject: [4.9-stable 3/9] arm64: sunxi: always enable reset controller Date: Mon, 19 Feb 2018 11:13:22 +0100 Message-Id: <20180219101343.2922561-4-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180219101343.2922561-1-arnd@arndb.de> References: <20180219101343.2922561-1-arnd@arndb.de> X-Provags-ID: V03:K0:tMCeZj4ZxRzuXKk+bs225PbrCm1K75mbKhfmWB6ArkiQeGAn+S9 CJXPaDoBa7BcmNUrUy+eC9EHtDa/8tpoMoAgiJjPU/L3WUlLJwuUV+Yt9pbvrml3cnAKYwJ MMw/Fd4b4jZpeu+cNLtIWVlU+NlHzPpEr0qBsExUIj3lXa2RbEfqpbKdyi5+n/6Vxkd4/ns O5yvh609TJLk2PPd0O98w== X-UI-Out-Filterresults: notjunk:1; V01:K0:2Tny1puwKZI=:Efxnl/p8rvwDrebzszd8/u Xh/n+Sia56i4+Gr2kzOr8bgMoFOwwsvZdEIChnaXR8gL/2KM9wHdGQTXGDUXlFvlBZWiFJk1c UuNGxyE7J4sdXGu3X6vTrc1u4bwPzVaUr6lIZpaBHXxEas5OqKYKPrBNmOiO7PunYu4qrC1EF KhB3zPbf1RHR9+3r3EpCu1PWtBx1YQlkCN2Kt9QxJ8neN0pes4S1+b7FXlO0+GMmq9gYzza6W 5J5ddzufaRvTzeHFV0D8BJX+HWCXjWlIYOAuaKl3RN9m2qr/URWZPviB34UEPalcNIMyYvOdW L8UlBaw5gthWp5SPrfIYuXT0dnCcOocGBckc2kPCzvJxFH09Xv+SOXtVEtyPWaGkXY/V9n9U3 ZafvkcYlNd4TYc7YVnX6YCXX3KAUIq3TMKO6uJl0FN9cIavqbufWjB8aukE4RpMLP9L8xxdMc UUZFRIZMF14yOTtCUwGE7m5766Y66qXDEeiviU9Tni9H/0Kif56bIzvYBzeoq3T7JqYlYCYYp Yh3oeMswB97NwluwGv84oe+yE/NTSszZt28Lajc9TX07F/oYMWw+g6Y+ChLrjxkUYbiBfvdAd aK77x7BO37nGaXlO3r8jXnpDn0nonSbfsRFoqbGrzRUt/4PRUIwdI7NXV8Z3ETJY6Hb9yBoT/ /NqnKAz/7rS/Qr2AeGpKk+cJfdWODW486z5zRygQg7tpC5IYAoR6H1daz03EceGvbKyFf5KNX ogzlth8vonxfx1KHAcrY2gorvc1JCcuY4ofd1g== Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org commit 900a9020af7a023f9b64c919fddf8a7486108962 upstream. The sunxi clk driver causes a link error when the reset controller subsystem is disabled: drivers/clk/built-in.o: In function `sun4i_ve_clk_setup': :(.init.text+0xd040): undefined reference to `reset_controller_register' drivers/clk/built-in.o: In function `sun4i_a10_display_init': :(.init.text+0xe5e0): undefined reference to `reset_controller_register' drivers/clk/built-in.o: In function `sunxi_usb_clk_setup': :(.init.text+0x10074): undefined reference to `reset_controller_register' We already force it to be enabled on arm32 and some other arm64 platforms, but not on arm64/sunxi. This adds the respective Kconfig statements to also select it here. Signed-off-by: Arnd Bergmann Acked-by: Maxime Ripard [arnd: manually rebased to 4.9] Signed-off-by: Arnd Bergmann --- arch/arm64/Kconfig.platforms | 2 ++ 1 file changed, 2 insertions(+) -- 2.9.0 diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 101794f5ce10..08a4497f70a6 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -2,9 +2,11 @@ menu "Platform selection" config ARCH_SUNXI bool "Allwinner sunxi 64-bit SoC Family" + select ARCH_HAS_RESET_CONTROLLER select GENERIC_IRQ_CHIP select PINCTRL select PINCTRL_SUN50I_A64 + select RESET_CONTROLLER help This enables support for Allwinner sunxi based SoCs like the A64.