From patchwork Sat Jul 13 03:34:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 13732300 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 74E9BC3DA42 for ; Sat, 13 Jul 2024 03:35:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:MIME-Version: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=qtpF82pGCu7wb84OrfErGjGTloI1qsDbavb4Ik1U9k4=; b=JmtTDthUv+U95rzvxdBzZirC+n /wnmrGXIrOvDQmtDX8lktIFWJ6tWZgHJYRmmharODJO4ZqCo3TD/nU1NuMtGJ2rtspXeIyLxHeK14 9o20pWRLvL/GuU7julK2NUepqRO3jtnzVMx/8pOWWj1TFm2grCTpu3ArEOdWKtdGG//0y9uXFwO6w DlW1gTo3MPSHGusTDucO/SR9kWB8v8BqJ1f1sTlBo6LFIT7Lt0T/JC9LI3Vo/8DN7Em2l6zVcrIqv 2WaZdD3MKLfBkGV7err9LA9XCbQYlRo0dtuKlh9DBAoUOuWVpbgkQjvDhl7gFSj1/BjhX1MRjhZBS h0QIV9sA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sSTXW-00000001o6e-2Aai; Sat, 13 Jul 2024 03:35:14 +0000 Received: from mail-oi1-x234.google.com ([2607:f8b0:4864:20::234]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sSTXE-00000001o2O-0Ilm for linux-arm-kernel@lists.infradead.org; Sat, 13 Jul 2024 03:34:57 +0000 Received: by mail-oi1-x234.google.com with SMTP id 5614622812f47-3d9da46ca13so1335260b6e.2 for ; Fri, 12 Jul 2024 20:34:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720841694; x=1721446494; darn=lists.infradead.org; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=qtpF82pGCu7wb84OrfErGjGTloI1qsDbavb4Ik1U9k4=; b=mTyOSzey28MFme91uAmJBXoW3+9sUEWqavfwCo1SlRM2mkdPNR+8jm+KEdMvbDbGNJ gbzV8oZVfoxrneagKdRmggqWsByNBAAtMt0i5ShfBYe521Qb/6q3de16oVJ7l3n9Iv79 HzC/LophqH3bPPcMq9O3pK3hnugOtq89eJVkr1CTRX4Jj7ssqOYfwZcvuXG5RVSMrAT3 BqKXfTTPBvHwKT5NZmnT1myHzIGEpq+8L0cma6h3+d1u61WM3fQFg0kZXvq0fFyDbZ+Q Jq0mEIHDFbtLO5cikJassFfLt9bIV3HizGdR4V/CAqYQGYLZeQ8VWDJ8oVMzM4huDf8D RtDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720841694; x=1721446494; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=qtpF82pGCu7wb84OrfErGjGTloI1qsDbavb4Ik1U9k4=; b=ktRcea0PSSEbz/D1Yj+Lq1KiUgNv9Heh3VVE0SXuOT170MtFbYa3YuREp54wyP/FKe wp7W6KcOp05BctnacnKDcmhmMDtNFYCAGjY7a4HCB82W47swps4cosQ07KMGCBcCYlhi B1op/qDFusi8zYcjPvgcVB0aGu2LELlcN2P7jshWobThfYi58bXDbWBpICceXCOuCHIf T88VLiWuKl6F03Ii/qi7D6Ta1ABMmWe1N9VPlhvHJAxgsv/jLgxTX7ozHyVatWMF68PR 7E90h8s8rWKViIb3fyuSX9kUIGecqdVE6ptmG+aPjPzZLN5ECKtRcu9QS1QaCiG/DFQT lY3w== X-Forwarded-Encrypted: i=1; AJvYcCU6JTlqcpx6YpWcdPBe77PmxxABERCjW0/6xkkdt4fEYmB4WjSVbdmzvW1P/Qdsy5SHqQemtm4KRVBhopfwYbSZ/+zwwNyIn1HJNALHyVSfObB3hVM= X-Gm-Message-State: AOJu0YyaNsHO9AvIzLCfs/Th2n2OLNq0okKcu92XEXmNksgIHDLgfF/h 9xO0icvEozOz9jlJf8nxH2avlqSZ1s6abAQUECyyhBGFEbLL8cG9 X-Google-Smtp-Source: AGHT+IEAQRPKj9vObpjqjTMQ1SxXWHqcDPT6yiLFS2pxj6JuUGMdA2t1ndhQuVrWxaZWwgd/m0HWVw== X-Received: by 2002:a05:6808:191d:b0:3d9:b33e:d3e2 with SMTP id 5614622812f47-3d9b33ed905mr14745793b6e.19.1720841694100; Fri, 12 Jul 2024 20:34:54 -0700 (PDT) Received: from google.com ([2620:15c:9d:2:669e:eb9d:e30c:18b4]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70b7eba4540sm298199b3a.43.2024.07.12.20.34.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jul 2024 20:34:53 -0700 (PDT) Date: Fri, 12 Jul 2024 20:34:51 -0700 From: Dmitry Torokhov To: Arnd Bergmann , soc@kernel.org Cc: Daniel Mack , Haojian Zhuang , Robert Jarzmik , Russell King , Linus Walleij , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] ARM: pxa: fix build breakage on PXA3xx Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240712_203456_156329_B93ABB4C X-CRM114-Status: GOOD ( 15.72 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Commit 917195d6f829 ("ARM: pxa: consolidate GPIO chip platform data") tried to reuse the same instance of platform data for PXA25x and PXA27x GPIO controllers by moving it into arch/arm/mach-pxa/devices.c Unfortunately this file is built for other PXA variants which resulted in the following error: >> arm-linux-gnueabi-ld: arch/arm/mach-pxa/devices.o:(.data+0x167c): undefined reference to `gpio_set_wake' Fix this by using #ifdef around PXA25x and PXA27x GPIO controller device structures and associated data. Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202407112039.cyyIQ3Js-lkp@intel.com/ Fixes: 917195d6f829 ("ARM: pxa: consolidate GPIO chip platform data") Signed-off-by: Dmitry Torokhov --- arch/arm/mach-pxa/devices.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c index d050a4c78f97..7695cfce01a1 100644 --- a/arch/arm/mach-pxa/devices.c +++ b/arch/arm/mach-pxa/devices.c @@ -633,6 +633,7 @@ struct platform_device pxa27x_device_pwm1 = { }; #endif /* CONFIG_PXA27x || CONFIG_PXA3xx */ +#if defined(CONFIG_PXA25x) || defined(CONFIG_PXA27x) const struct software_node pxa2xx_gpiochip_node = { .name = "gpio-pxa", }; @@ -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] = {