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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7095CC2BD09 for ; Fri, 12 Jul 2024 06:42:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EE01A6B0095; Fri, 12 Jul 2024 02:42:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E8F136B0098; Fri, 12 Jul 2024 02:42:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D568B6B0099; Fri, 12 Jul 2024 02:42:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id B76696B0095 for ; Fri, 12 Jul 2024 02:42:44 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 2E8071A095B for ; Fri, 12 Jul 2024 06:42:44 +0000 (UTC) X-FDA: 82330157448.15.0A6C9D0 Received: from fout1-smtp.messagingengine.com (fout1-smtp.messagingengine.com [103.168.172.144]) by imf20.hostedemail.com (Postfix) with ESMTP id 1543E1C0021 for ; Fri, 12 Jul 2024 06:42:41 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=arndb.de header.s=fm2 header.b=QJN29OHp; dkim=pass header.d=messagingengine.com header.s=fm2 header.b=v54ihLbQ; spf=pass (imf20.hostedemail.com: domain of arnd@arndb.de designates 103.168.172.144 as permitted sender) smtp.mailfrom=arnd@arndb.de; dmarc=pass (policy=none) header.from=arndb.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1720766528; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=kA+mlMK4nslRzk/Foy9FPc6aVy+bUIWN+/xIUkmQGXg=; b=rjRHrHse2X951F8hQnWAg6uOppI9BDciLWxLwhhZha3OttyrVwP9dPLq9Ab42Mw6jDEhlF Z+x1Qg+SExOre9MC9hvcXoXoBKYo+XKcppMl3c2mOvP4GPVuem/v3KKGcMKZDFJ4SU/WHC YyEFIu77uaqXL0COUL4n8gfCmAFsgF4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720766528; a=rsa-sha256; cv=none; b=ekomL9l82t49WLbHZkoMGqG+e0m3y9argW5FD9BuQMNFLWJkh3J99IhtVk6/E/3uuefONd lNb3GV868R0/K8Jqwa7vGCYfWEhkU8cBg1XVFlgTd7pJXTGRfyVl81SAhDMutFtTK6/krL fAdunlzrUK+w4qNKjJU9u3CfIWjvH3c= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=arndb.de header.s=fm2 header.b=QJN29OHp; dkim=pass header.d=messagingengine.com header.s=fm2 header.b=v54ihLbQ; spf=pass (imf20.hostedemail.com: domain of arnd@arndb.de designates 103.168.172.144 as permitted sender) smtp.mailfrom=arnd@arndb.de; dmarc=pass (policy=none) header.from=arndb.de Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailfout.nyi.internal (Postfix) with ESMTP id 442EB13810FB; Fri, 12 Jul 2024 02:42:41 -0400 (EDT) Received: from imap51 ([10.202.2.101]) by compute5.internal (MEProxy); Fri, 12 Jul 2024 02:42:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arndb.de; h=cc :cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm2; t=1720766561; x=1720852961; bh=kA+mlMK4ns lRzk/Foy9FPc6aVy+bUIWN+/xIUkmQGXg=; b=QJN29OHpS3sm6iIxfH0pgLcosh 8mMDeWYOusxLy4n6rltHCSFGTVCIf8CWbEGRGObHZIbDBQ28/2WHczNz4cr5n+yy Zmg16PdxBsGYypr8m9GHHeJVi8VY+fE01u+klgyseHfw0EAQv60zSYjp8aEV8v2y qpex+p+ig9YalVxjWLoS1DJQlQ4MDyt/62O3TStlBtWUZlWl2PkHNLKEngICBK0W 6a/aqlhbJaFSnsiuW22pYQEKcXZPS5hORBDHnc6TiUmLDOSyfHyfU2IiqwBcjrGW LIZx9COBFH1Nqk8Ab0AzaPWXi0uDC6u6P66dNyuJu0th26m6743TtEAJyQ8g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1720766561; x=1720852961; bh=kA+mlMK4nslRzk/Foy9FPc6aVy+b UIWN+/xIUkmQGXg=; b=v54ihLbQWUXMplZOwkzaFGguiKpnEW1CvUvN7Zjmh0Lx ZqceloeGTKr7g2zeQoVinwq98CZhl79jWEeUmUFmx8mSzJ56MITWC67PTRT5KD5S yUmg+TO9TaIQOKEXFreoOwpTlg0gqYVZptb3kSf9le9KOUvuYMSf/dpl3qHj6DnM W7tLcLPPy1gNuBlV6KJ4HhLQJK6SuWF8yo5be2krP6m2F7xWdBNySCPkgZmT71nA 2HuKC4JdAnTVn1ZkC4DSiCuxLH2KWW4AIK3E643vhMKa+4NFtSlMclGhQJHjcWr9 jfFPuOV9PuZJiHMkNUxONxX9Z43AkmlgmJRl97OD8g== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrfeehgdduuddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepofgfggfkjghffffhvfevufgtsehttdertderredtnecuhfhrohhmpedftehr nhguuceuvghrghhmrghnnhdfuceorghrnhgusegrrhhnuggsrdguvgeqnecuggftrfgrth htvghrnhepffehueegteeihfegtefhjefgtdeugfegjeelheejueethfefgeeghfektdek teffnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheprg hrnhgusegrrhhnuggsrdguvg X-ME-Proxy: Feedback-ID: i56a14606:Fastmail Received: by mailuser.nyi.internal (Postfix, from userid 501) id DCCC0B6008D; Fri, 12 Jul 2024 02:42:39 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.11.0-alpha0-568-g843fbadbe-fm-20240701.003-g843fbadb MIME-Version: 1.0 Message-Id: <0de0aeba-da02-4fa6-a1f8-a468dcbfac58@app.fastmail.com> In-Reply-To: References: <202407112039.cyyIQ3Js-lkp@intel.com> Date: Fri, 12 Jul 2024 08:41:58 +0200 From: "Arnd Bergmann" To: "Dmitry Torokhov" Cc: oe-kbuild-all@lists.linux.dev, "Linux Memory Management List" , "Linus Walleij" , "kernel test robot" Subject: Re: [linux-next:master 11606/12643] arm-linux-gnueabi-ld: arch/arm/mach-pxa/devices.o:undefined reference to `gpio_set_wake' Content-Type: text/plain X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 1543E1C0021 X-Stat-Signature: g4zwkd33ktq75fpnaznk9dupkiz8rho6 X-HE-Tag: 1720766561-812347 X-HE-Meta: U2FsdGVkX1811oKDFium7dgNWc0Tg7CP4KjyCEg8sfiR6/MIRIFZHJ+8zLrGh7M51i8Cj1Ull1IrO8YdcnG10tsc9Ibr3fhLYvcCZ0culmAeMo+QVSP5pGbD6i2IDYs5WX2yh+BxGOHqaAYZn3as2KJW4XMqOeJKuel9/IQ9NBBxDfhpR2wK27i5031PPYzb8Jy7dJuKg7QjyF55U4pfsKZaQTTqzJ8OLiL0w13TUA55lsdbAvBPrIYpjKmPvOsnMxNmdnfnW0rxoRhWqPaYfoJiTQGcCHBaGOOzAXYJS5gon3WmblZO3DMtgFOLBJj2Fiqp+JBNxtOgnM2SS7Pv1ftSMeQuvlFAruL0Waf4q7iWllGs6YWXiaqJBjGTVzUnZ02W6iaCAkEWJ39U+lXtGO9xNb7A8zQq+wJNgGLFoEt155shbBn6SFzLfs81byGtPfvHZCwSm8ugdtcGA/xWNg/QkllF6z1U/Y6FQaBLANCgFT3YE3DG078LZiK1X3hVamrT0+U08JPIJtQSoNuhxTxUlpKNvt8bf3Y+7JHyzWdh0CR9owUHHHyFTq0sNc30srQYvxbcu3c6S0MHJx+DwQNO/kH28H+gwLVDL4zk7JkRPraNCVc7BLmTjX0agJDNk77s1rvJOOsa+wfyG6Kizwu2xAwXVzAtQ9uUpwUgnvdgcq4tli1JcxDgMYKzvKW+0nVxU6idnWql+/ZnIZbW99kQ6EnahxluzqqrThwyjpK75nbNr+xuL20QdK+2bE2WtFFm1u3EIYU9N9mgoWZ5xZcMpPYG86M0hYq9RcFE2Hf1be5bwW7Qt4vS3tJ120Pk8VRLz5aysW5AnusvNImzByH/RongMHvQ+Iuu68KVTwJPdwNmEt386r6K4t1iFFIfhg8q3Biv8TP7wqES+vpWgPimD27/fAQgRxB+MNHbZSwhNavfhpuDhMMFaSo4fAdUjDlD+21r8s+m3W75Z9O onxeNnSJ kEi+vxu2USqUtHty2sbRF+3pzUlJk7t3iv0dLH1tDfrkXO6qdZ1NGJ2ClAXPwUWt+123GlLibOFm34sPciSmFRFGdHx6YCZio+vPJKGxc6T1cArxHWlbpzz4D59cjmN9/9makd8dkvcn6Q+xURiwMfbtqYn0tWSKY7O4GaDGEJl+DGna9p1q5Ezcxe9bp1g8UKQP8qTbA4bH70FOmYPvGgDUxafgE7vQ2kd5OwGkR4FNBJaTBYRshiRo2Lzad3IDNIQXHu/JJWW+3qoGCxM9pHJnehTbGuYm/mf2E68ub6655siOSRCeaEMWvUA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Fri, Jul 12, 2024, at 07:31, Dmitry Torokhov wrote: > @@ -684,6 +685,7 @@ struct platform_device pxa27x_device_gpio = { > .platform_data = &pxa2xx_gpio_info, > }, > }; > +#endif /* CONFIG_PXA25x || CONFIG_PXA27x */ > > static struct resource pxa_dma_resource[] = { > [0] = { > > If you are OK with this I'll submit proper patch. Right, that's probably the easiest way. I was trying a more elaborate change (see below), but there is a good chance I introduce another regression in that, so let's go with your patch. Please send it directly to soc@kernel.org Cc:linux-arm-kernel and I'll pick it up. One more thing I noticed: if you are doing more patches to convert devices in board files to use software nodes, we should probably try to move them away from static platform_device definitions towards a dynamic platform_device_register_simple() or similar interface at the same time. Arnd diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c index d050a4c78f97..8813a5d179ed 100644 --- a/arch/arm/mach-pxa/devices.c +++ b/arch/arm/mach-pxa/devices.c @@ -633,58 +633,6 @@ struct platform_device pxa27x_device_pwm1 = { }; #endif /* CONFIG_PXA27x || CONFIG_PXA3xx */ -const struct software_node pxa2xx_gpiochip_node = { - .name = "gpio-pxa", -}; - -struct resource pxa_resource_gpio[] = { - { - .start = 0x40e00000, - .end = 0x40e0ffff, - .flags = IORESOURCE_MEM, - }, { - .start = IRQ_GPIO0, - .end = IRQ_GPIO0, - .name = "gpio0", - .flags = IORESOURCE_IRQ, - }, { - .start = IRQ_GPIO1, - .end = IRQ_GPIO1, - .name = "gpio1", - .flags = IORESOURCE_IRQ, - }, { - .start = IRQ_GPIO_2_x, - .end = IRQ_GPIO_2_x, - .name = "gpio_mux", - .flags = IORESOURCE_IRQ, - }, -}; - -static struct pxa_gpio_platform_data pxa2xx_gpio_info = { - .irq_base = PXA_GPIO_TO_IRQ(0), - .gpio_set_wake = gpio_set_wake, -}; - -struct platform_device pxa25x_device_gpio = { - .name = "pxa25x-gpio", - .id = -1, - .num_resources = ARRAY_SIZE(pxa_resource_gpio), - .resource = pxa_resource_gpio, - .dev = { - .platform_data = &pxa2xx_gpio_info, - }, -}; - -struct platform_device pxa27x_device_gpio = { - .name = "pxa27x-gpio", - .id = -1, - .num_resources = ARRAY_SIZE(pxa_resource_gpio), - .resource = pxa_resource_gpio, - .dev = { - .platform_data = &pxa2xx_gpio_info, - }, -}; - static struct resource pxa_dma_resource[] = { [0] = { .start = 0x40000000, diff --git a/arch/arm/mach-pxa/mfp-pxa2xx.c b/arch/arm/mach-pxa/mfp-pxa2xx.c index f5a3d890f682..e0ac1f525f77 100644 --- a/arch/arm/mach-pxa/mfp-pxa2xx.c +++ b/arch/arm/mach-pxa/mfp-pxa2xx.c @@ -15,12 +15,16 @@ #include #include #include +#include +#include +#include #include #include #include "pxa2xx-regs.h" #include "mfp-pxa2xx.h" #include "mfp-pxa27x.h" +#include "irqs.h" #include "generic.h" @@ -151,24 +155,6 @@ void pxa2xx_mfp_config(unsigned long *mfp_cfgs, int num) } } -void pxa2xx_mfp_set_lpm(int mfp, unsigned long lpm) -{ - unsigned long flags, c; - int gpio; - - gpio = __mfp_validate(mfp); - if (gpio < 0) - return; - - local_irq_save(flags); - - c = gpio_desc[gpio].config; - c = (c & ~MFP_LPM_STATE_MASK) | lpm; - __mfp_config_gpio(gpio, c); - - local_irq_restore(flags); -} - int gpio_set_wake(unsigned int gpio, unsigned int on) { struct gpio_desc *d; @@ -221,7 +207,49 @@ int gpio_set_wake(unsigned int gpio, unsigned int on) return 0; } +const struct software_node pxa2xx_gpiochip_node = { + .name = "gpio-pxa", +}; + +struct resource pxa_resource_gpio[] = { + { + .start = 0x40e00000, + .end = 0x40e0ffff, + .flags = IORESOURCE_MEM, + }, { + .start = IRQ_GPIO0, + .end = IRQ_GPIO0, + .name = "gpio0", + .flags = IORESOURCE_IRQ, + }, { + .start = IRQ_GPIO1, + .end = IRQ_GPIO1, + .name = "gpio1", + .flags = IORESOURCE_IRQ, + }, { + .start = IRQ_GPIO_2_x, + .end = IRQ_GPIO_2_x, + .name = "gpio_mux", + .flags = IORESOURCE_IRQ, + }, +}; + +static struct pxa_gpio_platform_data pxa2xx_gpio_info = { + .irq_base = PXA_GPIO_TO_IRQ(0), + .gpio_set_wake = gpio_set_wake, +}; + #ifdef CONFIG_PXA25x +struct platform_device pxa25x_device_gpio = { + .name = "pxa25x-gpio", + .id = -1, + .num_resources = ARRAY_SIZE(pxa_resource_gpio), + .resource = pxa_resource_gpio, + .dev = { + .platform_data = &pxa2xx_gpio_info, + }, +}; + static void __init pxa25x_mfp_init(void) { int i; @@ -247,6 +275,16 @@ static inline void pxa25x_mfp_init(void) {} #endif /* CONFIG_PXA25x */ #ifdef CONFIG_PXA27x +struct platform_device pxa27x_device_gpio = { + .name = "pxa27x-gpio", + .id = -1, + .num_resources = ARRAY_SIZE(pxa_resource_gpio), + .resource = pxa_resource_gpio, + .dev = { + .platform_data = &pxa2xx_gpio_info, + }, +}; + static int pxa27x_pkwr_gpio[] = { 13, 16, 17, 34, 36, 37, 38, 39, 90, 91, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102