From patchwork Thu Jul 20 15:45:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 108390 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp2301119qge; Thu, 20 Jul 2017 08:47:09 -0700 (PDT) X-Received: by 10.84.137.1 with SMTP id 1mr4671234plm.75.1500565629483; Thu, 20 Jul 2017 08:47:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500565629; cv=none; d=google.com; s=arc-20160816; b=h0N7F5Xe89sf4pRX6sJVR61UA+UeVbmFNPhJi5Yo3XFOAnRAkAO4H5E8fzaZkFulbd iOObPSMRO4iLVAy4ZZRED7VSKohnP6bsY5j33GvAEqCdhzAxQUwPDcCappk3gYe8X+7P a02nJXOBmvxjGTYtw3i+D1UKRC1mZpeVAHyWsKAfhHZ+Sj8mROUOctRuN/71vt17JKVn g24vTqSMjPD2XinG9zfi3o0WLh9aEIP7nv2Q+E4+rWQb/Ly1Ohk/Fvdyz3aAnNDXSRra 1cpEsPlBIJHIxYVmf3mR+boy9ScuQjW2cEIf87jMGt1LMmZW+h0Uu6iMVhBXJXWjKOgZ 7+Ew== 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=lhMOyZxiEsfOQcGrpwCj6mb3xwtqzN7ZxEJwB6+HW7g=; b=BZf6Bx4Z81XXfb6jxPJ2ypI8OSre0K86LXjrXIxSkCe5cCWjaCkZFDNMje/dvN0rc8 bz25iXHG3Y7ozW+bC5Pmwz4t4w+8fLAdw4WUAVCpylDidC6TJyN+EP1ei9EA2Kb1Vb/i +56599YM4BXEnwDyApwwvYQIls2anoo71TwhwqAYISOijs9yR3s+ltyze8bv4m1tTeP1 bVf0v4rxB08vRU6AqeHixByLrHHipVRpj88fiK1pbFCPqoCj6tATe8KxgG2eiHW/1gHu obxnWYS65lDd3+Vl4aVfy7SR4D6w+V+PE91UQBqmr3QDqRbm2jO2ee6n+cPuFCkfvaXB 17Uw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 o17si1711063pli.542.2017.07.20.08.47.09; Thu, 20 Jul 2017 08:47:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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 linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965554AbdGTPrH (ORCPT + 25 others); Thu, 20 Jul 2017 11:47:07 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:56705 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934781AbdGTPrF (ORCPT ); Thu, 20 Jul 2017 11:47:05 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.145]) with ESMTPA (Nemesis) id 0MX0aK-1d4TQI1JkC-00W1g5; Thu, 20 Jul 2017 17:47:02 +0200 From: Arnd Bergmann To: Imre Kaloz , Krzysztof Halasa Cc: Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 01/12] ARM: ixp4xx: fix ioport_unmap definition Date: Thu, 20 Jul 2017 17:45:55 +0200 Message-Id: <20170720154616.3250481-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170720154616.3250481-1-arnd@arndb.de> References: <20170720154616.3250481-1-arnd@arndb.de> X-Provags-ID: V03:K0:jZbP+XXynauxDRHgRvTD+GeNJUzkNh2Vlwp6kbVtKFT4pcQ9zZB PoYX+hmEXVU69cNGLHAcyOHASVT83q2j91fYl2vD69ldHUlmB1V/5lHt9rMvj0hmaugYF6k NUmX1Q6fZRvsiNGwSwQMnyfbA3fz+J8yW4oSadhEWu+yR8k6Jy2FaqgrLwuDEa2PAJ0Tyl3 jxy4ERTidEV3eSrgH8wag== X-UI-Out-Filterresults: notjunk:1; V01:K0:uJ9UgK5PlGY=:F9AOVE3LRYWAId9DW1rEoU 8xUr0/vCr3nuOZN62IwngLcUTrs9unGOz03tYrWpHYpNtXiP3e6cy22vJh7ALvcEeGkaYXvii WVqfuofgS8o5To6UXm+P4hvHgFwRLkpACR/imLQvS2T68ogg9YkRCrim4WLfFmby6HsQY2lxc K7hD1HOmAIC3czWRTYa+1Tdt/stEVIy3Ah68WIrPJVdrRLsSMe3ogmbStpo6HDv3Dyyf5lTHo eVveeXnbEIGmLFeLxbOVAXnNH5/AKqoKG2m1bwhxHWzjdwXTRTg9M2wm4bmMweNXZHpdq2xfx HW3HcD+hJyBDs5qDbVtoNwHu2T1P7UdMJEsmLwxSCg/rTx3XJq34Sb+2fu3kqVXu1TeYw1wYO ZRAtIKEJCCYg5+dvAeMcgDElMyaQZDmxPuqIxl0SU4IZCC62jdlCvKgvYx8YvCdRnxmahUI0Q TIQYlvZ1tKKyBtpl2sUwFmdKCSMYPd8DdRXWdPK1peUZGyGZvEJd+7seaJT3YyGF25bCuffb4 oqMmtX3h9yMEaRw4rQuV/WIkLE7LoINqDzwVRzuNbRPejv3TRijfwzYHPiszDN7BY2Z0Bk9q9 zPSA+RKtz3MT9M9u75KtoSriQbRT3ROM3hSOwi4Gt8EqLI0kzfH4ePTvSa0lxIkRAegSeY2In +jEgH1tAzvuXoozmGwgflWsb0ruLBv0VVfjyIwGqRtuDvsBGsTS5xOS0tFDvpORZ1BoLJYRyN p7YxCPow9ZpiEbzkkzHPynW4Sq2svtBJ96vR/w== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org An empty macro definition can cause unexpected behavior, in case of the ixp4xx ioport_unmap, we get two warnings: drivers/net/wireless/marvell/libertas/if_cs.c: In function 'if_cs_release': drivers/net/wireless/marvell/libertas/if_cs.c:826:3: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body] ioport_unmap(card->iobase); drivers/vfio/pci/vfio_pci_rdwr.c: In function 'vfio_pci_vga_rw': drivers/vfio/pci/vfio_pci_rdwr.c:230:15: error: the omitted middle operand in ?: will always be 'true', suggest explicit middle operand [-Werror=parentheses] is_ioport ? ioport_unmap(iomem) : iounmap(iomem); This uses an inline function to define the macro in a safer way. Signed-off-by: Arnd Bergmann --- arch/arm/mach-ixp4xx/include/mach/io.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) -- 2.9.0 Acked-by: Krzysztof Halasa diff --git a/arch/arm/mach-ixp4xx/include/mach/io.h b/arch/arm/mach-ixp4xx/include/mach/io.h index 7a0c13bf4269..2f84c26a6758 100644 --- a/arch/arm/mach-ixp4xx/include/mach/io.h +++ b/arch/arm/mach-ixp4xx/include/mach/io.h @@ -523,8 +523,15 @@ static inline void iowrite32_rep(void __iomem *addr, const void *vaddr, #endif } -#define ioport_map(port, nr) ((void __iomem*)(port + PIO_OFFSET)) -#define ioport_unmap(addr) +#define ioport_map(port, nr) ioport_map(port, nr) +static inline void __iomem *ioport_map(unsigned long port, unsigned int nr) +{ + return ((void __iomem*)((port) + PIO_OFFSET)); +} +#define ioport_unmap(addr) ioport_unmap(addr) +static inline void ioport_unmap(void __iomem *addr) +{ +} #endif /* CONFIG_PCI */ #endif /* __ASM_ARM_ARCH_IO_H */ From patchwork Thu Jul 20 15:49:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 108392 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp2304758qge; Thu, 20 Jul 2017 08:50:20 -0700 (PDT) X-Received: by 10.101.85.79 with SMTP id t15mr4348468pgr.95.1500565819796; Thu, 20 Jul 2017 08:50:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500565819; cv=none; d=google.com; s=arc-20160816; b=OIXmV9D9HnSzTwQ9teQmz+AQ79bsDFUXKKh4N1w8ZasmbsY1Yi4ISie7SkkXd5l09J DN8+LrbqGG24ge85AzYHcY9TN4lCEogZ5BZdgOAuCEdrzF7U+x0zCz8SZHhZwhmtAL+3 Bh1uM18bW1DKAzXwO3YW5tgBBwLmva76mwJiiareDK1zc7xMZoCTmv5u8QtER27nga7f IUJ/6alA2PJGJYZntZViiFvnsCGj8+a4jhZSATT3f+po79oUb3skY65ibA6761tfv03l qPphC51Z0/bVqAV9o24OrcRwZvVVURCrOSBuFIBkVm+pQIV5VfRmgs966JwWwT6LpfbL eIcg== 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=ZNXUrbs/OKNDZD6+1zDQW6dSzZ/QbzZNubWsXSwc/ws=; b=gEC5Rr9m2o9FSspz11R76UTKUblZyDDGO1Z2B9D1u7NPM424iwK1jiZCD/S9zUQDzK aDHlVUWI1Oy06tmyKc9he41I+kg9aCkpEiCOkEBQIzARThxG2B0RNwYqwceBUDVz0w+Y /L1iNyrR0a2WtqtqVO3VG+94XQd3F1UDBpeXTidwQhyH5iraTrUy0Q1lzpuy1q+427xq ez73lQ57qMmAlusFh1u0t72ypFU7uLbypojMdcgsPYbGXIlknRh+5IZiABGsijhF2r40 6m0UxFfyJbndR3SeL/OJp0Qq3YkuFYSpK/dM9Zg4PXThU+D6INJoZ0QIqdAcbPQE6acX tI0w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 f72si1745551pff.403.2017.07.20.08.50.19; Thu, 20 Jul 2017 08:50:19 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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 linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965658AbdGTPuR (ORCPT + 25 others); Thu, 20 Jul 2017 11:50:17 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:62008 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936288AbdGTPuO (ORCPT ); Thu, 20 Jul 2017 11:50:14 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.129]) with ESMTPA (Nemesis) id 0MTsps-1d7muC1N8S-00QROX; Thu, 20 Jul 2017 17:49:40 +0200 From: Arnd Bergmann To: Alexander Sverdlin Cc: Hartley Sweeten , Arnd Bergmann , Linus Walleij , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 02/12] ARM: ep93xx: use ARM_PATCH_PHYS_VIRT Date: Thu, 20 Jul 2017 17:49:27 +0200 Message-Id: <20170720154939.3250697-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170720154616.3250481-1-arnd@arndb.de> References: <20170720154616.3250481-1-arnd@arndb.de> X-Provags-ID: V03:K0:rv1UCwKPdU7/HWWac/nU844n1YUsvUnQIFWrwVk/0gdC/qhIRJd 0WnmgIwkejvk0DNLdQakUW+Zkxc9Oih7pNs86p1CIWSJ1p+l66hvmLFwOtz5EzFXowbdltW WR5byUYC81l8i6MiMkTmj+ra45i4Hh714rq/m7HzlKZ2L8Ocutz3n+OHEM6M10gzNLAckEx vVRPunuVRdBNJ1aEvUkAA== X-UI-Out-Filterresults: notjunk:1; V01:K0:t5fNKh5yYQo=:nKSpdMOgCmQQo3b0INtTfg eGX6jY82jZDVepFA6N2LUBM2orSUXoLataIDAOnV3DXtnsElZqY85L/TA7+05vZzrbSfY/89p dT3HfjG2NLx4WSHWcazqqzhftpmIef0mxGFcpCzd0qw7vSLoOJIFurpwArNeIELOaUSXM5E4H +bM4SrzUR/s4CGm38tv+huhQgnX25IR2aNS2g/ss2gKALNd2mexzqAGsKYbrb9I06/AVTIqnX 8D2NS79AOFYVT468KtGlLzqQpDQvqJHup3UJuiguWtWml0hPa258IIoACf4RgPohnC/+pYKbG WWuLlHoBHvpc//d9ehXexV13acnN29uA5rSuvUN6oGM5E1n/vXfBKS3+jwvu8FzTh56azjmcE JDFLBntK/+60u2UI4Wh9pqHq1YcjoICo21XszKy8tTrq4RS4avwN3MZr33N95adv2t+DfjmUo VrLD0A//qlEXSteLIMsPta3BjSG8HX4cCUx7mRP4ECOvFQ7y+7wuTZVrzbu/BnUMmW+FrrUxK MLHyexqVUTM2F+6w5fhyraW7taQIoqWHqLr4e1JgrB+3IxM4I3pkxTRBnEhM/jF9I1ajiYLt6 ncxsAu2FTlIHmwkJvy0Dnnr+Gvv3OuG/5l+YP9XOwAbYoppWAWerdx+1JjSltqqQdikSn6c27 OnfjLD/NeY+CAAfzjdu4Ai7EOBYmaPivXw/Wq+wmy8UK8GJ64xFLulrPgjahyDoZ0vkdQh9wr WpV4nxLDiGh5AnlDDV08S661db+PFMirCxmSFQ== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Just like ARCH_MULTIPLATFORM, we want to use ARM_PATCH_PHYS_VIRT when possible, but that fails for NOMMU or XIP_KERNEL configurations. Using 'imply' instead of 'select' gets this right and only uses the symbol when we don't have to hardcode the address anyway. Signed-off-by: Arnd Bergmann --- arch/arm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 Acked-by: Alexander Sverdlin Acked-by: Linus Walleij diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index d6e6f40addf6..db856355bd24 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -406,7 +406,7 @@ config ARCH_EP93XX bool "EP93xx-based" select ARCH_HAS_HOLES_MEMORYMODEL select ARM_AMBA - select ARM_PATCH_PHYS_VIRT + imply ARM_PATCH_PHYS_VIRT select ARM_VIC select AUTO_ZRELADDR select CLKDEV_LOOKUP From patchwork Thu Jul 20 15:50:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 108393 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp2306934qge; Thu, 20 Jul 2017 08:52:25 -0700 (PDT) X-Received: by 10.84.176.131 with SMTP id v3mr4966346plb.142.1500565945057; Thu, 20 Jul 2017 08:52:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500565945; cv=none; d=google.com; s=arc-20160816; b=PUeqBXt/FFxaICNOzp5ZCRtytVqr5CnUNE45R0agvfmhiCZzHdXepT9JWANWxdo8fM BIB6OZ0Cvu2C20S4EURnXoBNfQSoXxJpxO3LMwUmdDM89aRY5/IBOFEG2pGBvPkfIsjq jb1DXu22lNZ2h8isGpmUw+v4tXBGRaLd/m6yvQG5+8lFDpdfbxHAo/9gM9oG0MzYACau tD/8CucV2IHEILhYRvqN2+UNdd1TSfJPYDeSPMsYy1arsO9RBowzHu7y9uFlMl7ct336 qiMkUWiwqertc7uQZ4iMyVvFhC7ddly/Draw+qAjRvBdT9UBpWDmvkJ332a2H1DDtiJ+ ZTTw== 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=R0ecV/rxGj+e/fysbQin8jJmNHLUt1bPEdKHmgeBhZo=; b=q2X/KU8UImOrAdFsOEC/98d1CPaz8oku8C/C13V8dIObZR6GNmV6GkwRS1hYzvNWBv t8uVXaxO5QjkTBCK4pKBwSIZr2EcZwYrVExqrKs0a7ERmgox8sxWxF4uPo6eS3twhhjr Rut/Gtialc0CYv0Q9pzg/QLuaG2dn5P2DuIyHcKpCR29zYFD+glkdGaG2hOX49eMJ/7c bSQyTBp1J6+NObwzu6vzh17fZ2GOUxAzg6Om/BOW/fdC9rNK9EzHTLfpLXDFB5wLD9z7 OvDrPbJn8yyIhe44JQYq8JpoZBU/PtQJudkWCCFcDG0fmUhSRq/ZvcGFpsw9obCkD6qn DPiA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 b99si1726614pli.879.2017.07.20.08.52.24; Thu, 20 Jul 2017 08:52:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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 linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965744AbdGTPwV (ORCPT + 25 others); Thu, 20 Jul 2017 11:52:21 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:59603 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965727AbdGTPwS (ORCPT ); Thu, 20 Jul 2017 11:52:18 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.145]) with ESMTPA (Nemesis) id 0MT92U-1d9Rcv0Rzq-00S62C; Thu, 20 Jul 2017 17:51:35 +0200 From: Arnd Bergmann To: Sekhar Nori , Kevin Hilman , Hartley Sweeten , Alexander Sverdlin , Eric Miao , Haojian Zhuang , Wan ZongShun Cc: linux-clk@vger.kernel.org, Stephen Boyd , Michael Turquette , Arnd Bergmann , Russell King , Alexandre Bailon , Masahiro Yamada , Dmitry Eremin-Solenikov , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 03/12] ARM: normalize clk API for older platforms Date: Thu, 20 Jul 2017 17:50:46 +0200 Message-Id: <20170720155132.3250812-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170720154616.3250481-1-arnd@arndb.de> References: <20170720154616.3250481-1-arnd@arndb.de> X-Provags-ID: V03:K0:20TnyH58LouFp+nlEuA4xN4jqxdDz24Bxq7fvXKYISKQSSbsCt4 OEAzD57UZnbJqm3jcRIUEqVONVfCmpQhprPrEx2y8ZRU7vGZ3yMOe616jflDzgj4v9chXTx 9wxg7paJM9z0rH5uNIYYBjqZv/IV9RfLW478S47AgRAw2uUE35TX4uNivkEOIT9QsbUJiii stRxSOkidw9XqXA3QvuOg== X-UI-Out-Filterresults: notjunk:1; V01:K0:7oqAnAQfl8E=:h4dHUck3FS27ZDkaak0fxn 8rC2UgEZd2+selJFynykFNwEfVtui9bX5De6h+90UGx/OVa+sssxKq2yOWKzYRWgRn3IPRKjS W8BUm8o3wTpzgq/ykz1rRAuxHtJ5u6VsbCijfOA/hY9EwLXdW7wYQPQlFz8VH3rVwqjSofIwq 9N9OL+2q+m4gyVWbjrQwsa8mIPjE6c9Bw1pn1xogJ0tp4piX5739fGJgqjf9RXEWxvhEcdEkt ygzdACV3vmW1zAysggzLropbRJNjck3ApQP8lo9Tgtwdsr7RQnCxpl/45+Mzi2rvAhDO2o58w ijt9cS6n0TFRHXBwVcIjP6RPbLeO/aLDeNCP/zSlI5S4FouZheIB/faTtz8QXo/uSIfOWSN9f AXhpHh/u6aKFLDLkuRcs6LCBBEeWdawdkFxsKipVsOUpATP7GOqyGmn5OzULt0pkDOm6YH2bk PqxZjvkY5X3GwCIKsKx2zY/uMvjMWA8GeH3/230ITelK/HrgcQl/6V722ls3l0ECyKhVU4Uf+ bs4U5WoC35NsSOXqD/8KgsPPaXOdgW58wpQakXsub53A1O2oYgVYJGRQNymu6X6KeeUmYKr2g K/GIVnZufFaM7F7XHkBdAP20tJs0PCD2JIK3HLx9Ls8WPz+nBi9L2AfYvhEPXQwGuFcLR1HOS RhWdXN8lkiQ9QMLsYinj+PjDcMODDdZETCrTqoTEUOy7UOonSBHnXRhRJTm1GNQRXR/qJO6rS MGoDqQKb3Gxv+coD/W3yw02Sk06FBY27GtvzJQ== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Six ARM platforms still provide their own variant of the clk API rather than using the generic COMMON_CLK API. This generally works, but it causes some link errors with drivers using the clk_set_rate, clk_get_parent, clk_set_parent or clk_round_rate functions when a platform lacks those interfaces. OMAP1 implements the whole set already, but davinci, ep93xx, mmp, sa1100 and w90x900 all lack at least one of the functions. This adds empty stub implementations for each of them, and I don't even try to do something useful here but instead just print a WARN() message to make it obvious what is going on if they ever end up being called. The drivers that call these won't be used on these platforms (otherwise we'd get a link error today), so the added code is harmless bloat and will warn about accidental use. Signed-off-by: Arnd Bergmann --- arch/arm/mach-davinci/clock.c | 6 ++++++ arch/arm/mach-ep93xx/clock.c | 21 +++++++++++++++++++++ arch/arm/mach-mmp/clock.c | 22 ++++++++++++++++++++++ arch/arm/mach-sa1100/clock.c | 29 +++++++++++++++++++++++++++++ arch/arm/mach-w90x900/clock.c | 29 +++++++++++++++++++++++++++++ 5 files changed, 107 insertions(+) -- 2.9.0 Acked-by: Sekhar Nori diff --git a/arch/arm/mach-davinci/clock.c b/arch/arm/mach-davinci/clock.c index f5dce9b4e617..89586779526c 100644 --- a/arch/arm/mach-davinci/clock.c +++ b/arch/arm/mach-davinci/clock.c @@ -218,6 +218,12 @@ int clk_set_parent(struct clk *clk, struct clk *parent) } EXPORT_SYMBOL(clk_set_parent); +struct clk *clk_get_parent(struct clk *clk) +{ + return clk->parent; +} +EXPORT_SYMBOL(clk_get_parent); + int clk_register(struct clk *clk) { if (clk == NULL || IS_ERR(clk)) diff --git a/arch/arm/mach-ep93xx/clock.c b/arch/arm/mach-ep93xx/clock.c index 39ef3b613912..c1c91fc6e178 100644 --- a/arch/arm/mach-ep93xx/clock.c +++ b/arch/arm/mach-ep93xx/clock.c @@ -323,6 +323,27 @@ unsigned long clk_get_rate(struct clk *clk) } EXPORT_SYMBOL(clk_get_rate); +long clk_round_rate(struct clk *clk, unsigned long rate) +{ + WARN_ON(clk); + return 0; +} +EXPORT_SYMBOL(clk_round_rate); + +int clk_set_parent(struct clk *clk, struct clk *parent) +{ + WARN_ON(clk); + return 0; +} +EXPORT_SYMBOL(clk_set_parent); + +struct clk *clk_get_parent(struct clk *clk) +{ + WARN_ON(clk); + return NULL; +} +EXPORT_SYMBOL(clk_get_parent); + static int set_keytchclk_rate(struct clk *clk, unsigned long rate) { u32 val; diff --git a/arch/arm/mach-mmp/clock.c b/arch/arm/mach-mmp/clock.c index 28fe64c6e2f5..78513f74ae8d 100644 --- a/arch/arm/mach-mmp/clock.c +++ b/arch/arm/mach-mmp/clock.c @@ -106,3 +106,25 @@ int clk_set_rate(struct clk *clk, unsigned long rate) return ret; } EXPORT_SYMBOL(clk_set_rate); + +/* Dummy clk routine to build generic kernel parts that may be using them */ +long clk_round_rate(struct clk *clk, unsigned long rate) +{ + WARN_ON(clk); + return 0; +} +EXPORT_SYMBOL(clk_round_rate); + +int clk_set_parent(struct clk *clk, struct clk *parent) +{ + WARN_ON(clk); + return 0; +} +EXPORT_SYMBOL(clk_set_parent); + +struct clk *clk_get_parent(struct clk *clk) +{ + WARN_ON(clk); + return NULL; +} +EXPORT_SYMBOL(clk_get_parent); diff --git a/arch/arm/mach-sa1100/clock.c b/arch/arm/mach-sa1100/clock.c index 0db46895c82a..a602d876c231 100644 --- a/arch/arm/mach-sa1100/clock.c +++ b/arch/arm/mach-sa1100/clock.c @@ -35,6 +35,35 @@ struct clk clk_##_name = { \ static DEFINE_SPINLOCK(clocks_lock); +/* Dummy clk routine to build generic kernel parts that may be using them */ +long clk_round_rate(struct clk *clk, unsigned long rate) +{ + WARN_ON(clk); + return 0; +} +EXPORT_SYMBOL(clk_round_rate); + +int clk_set_rate(struct clk *clk, unsigned long rate) +{ + WARN_ON(clk); + return 0; +} +EXPORT_SYMBOL(clk_set_rate); + +int clk_set_parent(struct clk *clk, struct clk *parent) +{ + WARN_ON(clk); + return 0; +} +EXPORT_SYMBOL(clk_set_parent); + +struct clk *clk_get_parent(struct clk *clk) +{ + WARN_ON(clk); + return NULL; +} +EXPORT_SYMBOL(clk_get_parent); + static void clk_gpio27_enable(struct clk *clk) { /* diff --git a/arch/arm/mach-w90x900/clock.c b/arch/arm/mach-w90x900/clock.c index ac6fd1a2cb59..3f93fac98d97 100644 --- a/arch/arm/mach-w90x900/clock.c +++ b/arch/arm/mach-w90x900/clock.c @@ -93,3 +93,32 @@ void nuc900_subclk_enable(struct clk *clk, int enable) __raw_writel(clken, W90X900_VA_CLKPWR + SUBCLK); } + +/* dummy functions, should not be called */ +long clk_round_rate(struct clk *clk, unsigned long rate) +{ + WARN_ON(clk); + return 0; +} +EXPORT_SYMBOL(clk_round_rate); + +int clk_set_rate(struct clk *clk, unsigned long rate) +{ + WARN_ON(clk); + return 0; +} +EXPORT_SYMBOL(clk_set_rate); + +int clk_set_parent(struct clk *clk, struct clk *parent) +{ + WARN_ON(clk); + return 0; +} +EXPORT_SYMBOL(clk_set_parent); + +struct clk *clk_get_parent(struct clk *clk) +{ + WARN_ON(clk); + return NULL; +} +EXPORT_SYMBOL(clk_get_parent); From patchwork Thu Jul 20 15:51:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 108394 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp2307306qge; Thu, 20 Jul 2017 08:52:48 -0700 (PDT) X-Received: by 10.99.185.75 with SMTP id v11mr4495555pgo.44.1500565968087; Thu, 20 Jul 2017 08:52:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500565968; cv=none; d=google.com; s=arc-20160816; b=bLBdO1LlP4tiVwqCBK10NyveawZSRrLRrzK8clOT6Jh3PsR9M/hJbOB2N857tXUd6l h5fponpJgua9TpeRsfAokq7m30WuH4J7eprT7/SkXR0OJi8yOqijitNN0r8zeAV3FcCN d5uUTLb+FcD2M4Umx+AxUdzMGQg2f3llH3UIHz6iTdccI+T9Rl87X8gSAbC3syHRQRth G7tT142HEzVHh+n6mICZlcEHNkWpX7pT1jd+obt2g84celuY97SjMn0XUj13496DnvBt qhITw2wxmr/Nj3Lmc7kl4168y43PF3iZrRzPOeUx1w/XeG2UNbWyk7YcTri5q4xuQrZW 7rOA== 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=U6fdTEidNAfn0Py8eBFzp+iIP1AnwWaqa/yTMBpO1Xs=; b=sLcaS7os5yHBPTXhT/j5ELOPEzX1Uv7RgHEg+CMhMdt+tm8uMMQMSqZxb1AgvYlHTB RpyEpjGr/2OMpVjrSdP1L1TtaocatsqdgCrRU0j/1dhZCxUdDcqLpIoSvW88Wbia/dc8 TesBEy1rwaVPQGgWyQzpwKiCndA0gLBMI/7Ez0gnljycJFGcU0QCQNObKb6tuH/hy7BS J+fr15RfTugANLECnV9+gpPjnBrAYiTHvBL/ldWEf3S1Du7IcsTrwobScyxIvbSZszZZ Jwe9ovwoy6iOpuqGaFzeWKclFEBwQKLwmtU+UipZ4EW3g8V8dZnpqcYxFBJEE3DSdGs/ oShw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 e8si1823867pgf.560.2017.07.20.08.52.47; Thu, 20 Jul 2017 08:52:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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 linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965773AbdGTPwo (ORCPT + 25 others); Thu, 20 Jul 2017 11:52:44 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:62311 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965731AbdGTPwm (ORCPT ); Thu, 20 Jul 2017 11:52:42 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MXR93-1d4kWm3S8j-00WBe2; Thu, 20 Jul 2017 17:52:13 +0200 From: Arnd Bergmann To: Daniel Mack , Haojian Zhuang , Robert Jarzmik Cc: Arnd Bergmann , Russell King , Russell King , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 04/12] ARM: sa1100/pxa: fix MTD_XIP build Date: Thu, 20 Jul 2017 17:51:42 +0200 Message-Id: <20170720155209.3250880-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170720154616.3250481-1-arnd@arndb.de> References: <20170720154616.3250481-1-arnd@arndb.de> X-Provags-ID: V03:K0:nsAPDsax1514ewxSL4MwFu0e26zpLw6em6Se8cawkSRHFXKvOJ9 75a0YQ8LKnFb1nPwb53pDN3oSjSgHLeVQ5kvkpIyggZKf18eIQoTCs/d7z0d62KE5biAy0c lCjQ2rT1hkkLZcw3hNhUc6osIIvTAznWlJHtl6w1ydvgMNrQ0AVGnrzETrd+UBfoVHxthxW FIrOLcHZ5opgQigzj8Cww== X-UI-Out-Filterresults: notjunk:1; V01:K0:XYAzemTyLZU=:9JfVBBLkoy6iyyuKLxbEy2 /e8RsLxkIDZp7HqMscV5fnSct7zcffzD+PG5GEoPxrgrErI6ewuNojI/8yIaUKq4e5fb+P7Aq UHCWVRRZCRWHhgA3qlMUeF9RXdX7sDh73j8kyr11R/lU7jaNVYKQYj4ik81bdFVOEp9+bHV56 tvTgMjXC6eDvC/Iu5V2oPEgtnWg4VdCmL3gHnybB1CFhiA5PtmMNfdLOBZQFeOl0tT4qK2Hc2 Vu+hX8ekiIHQTk1eSAp0Q08+erQygBBIop70qEFwcYzq3aHKg0rRhQ+sgqDIXkghxlEuwm/uU ucVuDNkEA8qVD+VlHvVPLLjsQvuqF8/ps2FH5g9yjlcA1UBoR3A/mmyQDr3n45G47yuLrUur+ rn8wYnOTy0Xq3WxUk56tt8pTXyY+QPhnGaz2y+gFq8Fq42H92NhpXctH7yiL1nI1xihwKMema NclmKaJaS43xfgeuWJmQMWe1U+R6v6KNPrFsheqXD08rNcED++vieKM/UTZluw7EAjeC2i3s5 4RuztN7EJtt6YWl0Sc8gLJLpI5SCMkDWAagh0hfNQv3D73cO7ynSYfpppYnPMv0ut8X9Gg+TM q9upKY2CK8239fFX3IS7d6QY0XfGx636FleCz94AEvPK9RhA6EoVlashSI/eQD5G6DwGVuw+d Fui9tL9RHwUDKVkbqL95h8ZCUsempWV4YIybJMs/Cu6otYx3KidT1gZv8r2qyBK9yTzJR54sT B+nyWKCd5JWg7g4jAWd4c6IGBQKAsTh3+XIZcg== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In commit 3169663ac5902 "ARM: sa11x0/pxa: convert OS timer registers to IOMEM", the definition of the OSCR macro was changed to be an __iomem pointer, but the same register is also used by the XIP code. This patch does the corresponding change here as well. On PXA, the IRQ register definitions were removed even earlier, in commit 5d284e353eb1 ("ARM: pxa: avoid accessing interrupt registers directly"). This patch unfortunately brings some of that back. An earlier version of my patch moved the code into an external function, which could not work for CONFIG_XIP_KERNEL+CONFIG_MTD_XIP, so this restores something close to the original code. Link: http://lists.infradead.org/pipermail/linux-arm-kernel/2014-March/241716.html Signed-off-by: Arnd Bergmann Cc: Russell King --- --- arch/arm/mach-pxa/include/mach/mtd-xip.h | 10 +++++++--- arch/arm/mach-sa1100/include/mach/mtd-xip.h | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) -- 2.9.0 diff --git a/arch/arm/mach-pxa/include/mach/mtd-xip.h b/arch/arm/mach-pxa/include/mach/mtd-xip.h index 990d2bf2fb45..f0d40bd36bac 100644 --- a/arch/arm/mach-pxa/include/mach/mtd-xip.h +++ b/arch/arm/mach-pxa/include/mach/mtd-xip.h @@ -17,11 +17,15 @@ #include -#define xip_irqpending() (ICIP & ICMR) +/* restored July 2017, this did not build since 2011! */ + +#define ICIP io_p2v(0x40d00000) +#define ICMR io_p2v(0x40d00004) +#define xip_irqpending() readl(ICIP) & readl(ICMR) /* we sample OSCR and convert desired delta to usec (1/4 ~= 1000000/3686400) */ -#define xip_currtime() (OSCR) -#define xip_elapsed_since(x) (signed)((OSCR - (x)) / 4) +#define xip_currtime() readl(OSCR) +#define xip_elapsed_since(x) (signed)((readl(OSCR) - (x)) / 4) /* * xip_cpu_idle() is used when waiting for a delay equal or larger than diff --git a/arch/arm/mach-sa1100/include/mach/mtd-xip.h b/arch/arm/mach-sa1100/include/mach/mtd-xip.h index b3d684098fbf..cb76096a2e36 100644 --- a/arch/arm/mach-sa1100/include/mach/mtd-xip.h +++ b/arch/arm/mach-sa1100/include/mach/mtd-xip.h @@ -20,7 +20,7 @@ #define xip_irqpending() (ICIP & ICMR) /* we sample OSCR and convert desired delta to usec (1/4 ~= 1000000/3686400) */ -#define xip_currtime() (OSCR) -#define xip_elapsed_since(x) (signed)((OSCR - (x)) / 4) +#define xip_currtime() readl_relaxed(OSCR) +#define xip_elapsed_since(x) (signed)((readl_relaxed(OSCR) - (x)) / 4) #endif /* __ARCH_SA1100_MTD_XIP_H__ */ From patchwork Thu Jul 20 15:51:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 108395 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp2307619qge; Thu, 20 Jul 2017 08:53:05 -0700 (PDT) X-Received: by 10.98.72.216 with SMTP id q85mr4280763pfi.23.1500565985127; Thu, 20 Jul 2017 08:53:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500565985; cv=none; d=google.com; s=arc-20160816; b=SmWYsV0tkn61VblvRLiCgdIoH82uJzxP5yzZLX9jZIFmq2wWSe+r+50hoh5T5XvDZL bnJGGyVhVh8o10E10h8db1RSe1w9yDz5B5LHMHx3CdwRHVNW7raXCMquTWUCdJuLrpYZ WhCbcjKBffrTabavYjXloT/aNPwBbpZV/Qbd/3a+yuIBr3vDsJkbsL4U2RDlLzbBRc+l VPCnFuWF4YUYySvjUwciYt6YxXcq/sBZ6I/oafsjq4BbA/pC/kMyaAuXqkn3H808eIXK pxE/rSjY/B+ZNACSeGeekVKDzcJsHaNxEeK0D2nBsZsLJUrKTVlCHkxjrVRNLmLydbv+ efAg== 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=KwrLKMZLwwnSXFJgid2o5HYMRNvq4TkHhEMh5ruCK3Y=; b=SCSkN0tSMPB+Q3Kzs/vkkN19zbqBr7G8TTekt6UhPz7UYdUPXCoGssrP0cQsyfObd4 G8wv3np/kidBVKINitpqdyUgG6mjezWLBmg7Ot4qylRYZABs4nS3uj0/wtc8p4b8iPUk f5ZFm5HJmJwvWGsby0BudFq5WsF7eqwn5mYYnGcCBnh4meizRAXQE4SFSfr/ynx7jYZR zEGCrVhTNYz/HwKdj/vGqfhPTYe+xs4Sy+xUUoj11ZIyniGDPjO8fF2cudDn+OkcEFOD ydb3sMsPBohjKa4+fiOB7ZfA5NTQrd6+BPCKZZXoZ5U4GD5yAcBPstIfava/UItfYtb0 /9hw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 e8si1823867pgf.560.2017.07.20.08.53.04; Thu, 20 Jul 2017 08:53:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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 linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965788AbdGTPxC (ORCPT + 25 others); Thu, 20 Jul 2017 11:53:02 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:57457 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965731AbdGTPw7 (ORCPT ); Thu, 20 Jul 2017 11:52:59 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0Lelxf-1dyEkw176t-00qjbA; Thu, 20 Jul 2017 17:52:25 +0200 From: Arnd Bergmann To: Eric Miao , Haojian Zhuang Cc: Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 05/12] ARM: mmp: mark usb_dma_mask as __maybe_unused Date: Thu, 20 Jul 2017 17:51:43 +0200 Message-Id: <20170720155209.3250880-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170720154616.3250481-1-arnd@arndb.de> References: <20170720154616.3250481-1-arnd@arndb.de> X-Provags-ID: V03:K0:jH8pnlR/1jVUFQVAXZghpIIccTc2BJ5yMBrfkoLFcSTPpQmyizH 3jg8hku1Q3qOxEYkfBCsc8duDGm+dh9E9rT+dtME2TKOT0ryzzb2Q1WvrFEej+2tYfbtu1C KHiOK3TlZRcM8JFLJ3gaiiAgBXA3HajgafWAZRydrt9iIOZrV0qP/4Tw/Yeml/mX8MNS1AY CBI9yXZ1hpTevGMEvcqmg== X-UI-Out-Filterresults: notjunk:1; V01:K0:elHzbqkXsXY=:XKJigWSuyv1/LcRpOB31YX +O9KcNPrzotEQfpsKtBhMcWykatluuI9ISutm3tUBDigd5S6TW2NwXU+iM+vW6KMMBVLXeYVd yji8fbhOD71MMQUimC9vAZDB/dKa4j/Td32ULkd73jOFIUVODx/+5gEHEKt12adwWeO7dwC4A luqk5UXsWMxvOvziLUU/v8bffKwCuZ3F867E6CIlNQ66JunjFfm/CQ59oORlM7lubOBG6zKMv BgCU55+SHKLdIWmEpTFgldd0WK6fVarSbFDOFmzZ+1qEXlJASb1x7MpslJ7jLh2pH3iYmEckp ZwpQ1yMGxmT3VNrhjDy8iE1Zk5sSF8rW7pKQjot/FBIrX9kgp7aslLPl+qswHwmtD6Z5eQPFZ GxC5R2rT5leBSTylIFOPHXF2bQPun55jfE/Xml+3e3bc3wsNVImZcoFoX6PFbREds3ddnd0mQ t0iRlQsGdNQIbKtrYiIIVtF644Yg9FFbDuux8NlS1682ioRfnfDBQ83a2YYjU2l8d63M/P58F If81FkHz58XCkV1rMoJSglYLgYgVauCVeYGnjgqjCC/ZRtVjnOfRJsmad6Vdnp2gQsThhpt+H p31+rVFEVB/PlKb7+UmaaS5OBuKjzsTaC6UFRX3h46+83DfVC4eYhXo3A3bQsg0OmpHijFnWa 5a9XmilCthz1/qnpxiTxolGqcDfVd4Q2YaHxnuy2zUAXjSqDLp4oU+inzf9qzo4MaV+GQs5Xs 7YvBSmS5RMQRzIRP46n4eLn6LQXIrKC4k7k9Yw== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This variable may be used by some devices that each have their on Kconfig symbol, or by none of them, and that causes a build warning: arch/arm/mach-mmp/devices.c:241:12: error: 'usb_dma_mask' defined but not used [-Werror=unused-variable] Marking it __maybe_unused avoids the warning. Signed-off-by: Arnd Bergmann --- Originally sent in Feb 2016, this went missing for some reason. --- arch/arm/mach-mmp/devices.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/arch/arm/mach-mmp/devices.c b/arch/arm/mach-mmp/devices.c index 3330ac7cfbef..671c7a09ab3d 100644 --- a/arch/arm/mach-mmp/devices.c +++ b/arch/arm/mach-mmp/devices.c @@ -238,7 +238,7 @@ void pxa_usb_phy_deinit(void __iomem *phy_reg) #endif #if IS_ENABLED(CONFIG_USB_SUPPORT) -static u64 usb_dma_mask = ~(u32)0; +static u64 __maybe_unused usb_dma_mask = ~(u32)0; #if IS_ENABLED(CONFIG_USB_MV_UDC) struct resource pxa168_u2o_resources[] = { From patchwork Thu Jul 20 15:51:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 108396 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp2307757qge; Thu, 20 Jul 2017 08:53:12 -0700 (PDT) X-Received: by 10.84.224.195 with SMTP id k3mr4878503pln.72.1500565992045; Thu, 20 Jul 2017 08:53:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500565992; cv=none; d=google.com; s=arc-20160816; b=qzm0Ccju2OFp/YS/VVNoF/HBPtwr3xOPRYJUH6O0Qjlth1agmQ3A2UbXvNGryW3vAQ LPvVdLAgwRhkXni/WgFUYsG5koUlCMpaEYiJkE2M/wkrJ5esLdZg0U2SytjDZs31KxMo DsckQlGoz9uccgB8wnKVyhYrYSOiO+dkriGLufdvRV4iV8RwD5jsRxzAnNQ5es7YZY22 sS1tHsYmWHH18V7Lfy9eHNhPJLrh1BeEJ8kmmWTJRiKQC1xjf4vI8ttM4gmPc3xP/a60 bwF/u1DPKUHDph7fnrlHzCpvn6ddbfydyXOXuia7j7vHkoTgf9nk662SAcYQUhtN8557 8hQw== 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=ndcOiNh1Ri6aQUZokaXgiFEOsultqmrkWjwHO0RN3Rw=; b=CghFQo5+ANgUb2lyNI/+POPHVZkPgCOMDsgA7GkHh+FnbVdqQ7KlltbhiuKEHlds+t qB/9AMkLFkHawPkw9lMdnR9/LyvuxZzkc9L0U0QBdL7HRnmBtEbzoX8ruAsoSJDRN0kM 6RE5vOgjv7l94wmuOacc/h7Y2gIox8kO2+ukreU8NgGGcpYfJFTaK/Amg/jeUIONCgHL ZNIuWxWIWjoUcScCBfvdTCCsCgbUnnlBVRmn5NBnKOceVMQn+7FDu/NKu7Txpb35ztks vPMJ0oaB4w+MhxmJgu2/8He6gRffpBLzYpobyXDGK0X2vQtWbAki62XZAWFEMMwCajyr VTuQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 q3si1781038pgf.627.2017.07.20.08.53.10; Thu, 20 Jul 2017 08:53:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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 linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965804AbdGTPxI (ORCPT + 25 others); Thu, 20 Jul 2017 11:53:08 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:52644 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965731AbdGTPxG (ORCPT ); Thu, 20 Jul 2017 11:53:06 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MgTYM-1dDnBs1SWk-00NhKn; Thu, 20 Jul 2017 17:52:58 +0200 From: Arnd Bergmann To: Tony Lindgren Cc: Arnd Bergmann , Lokesh Vutla , Keerthy , Grygorii Strashko , Laurent Pinchart , Sebastian Reichel , Santosh Shilimkar , linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 06/12] ARM: omap2: mark unused functions as __maybe_unused Date: Thu, 20 Jul 2017 17:51:44 +0200 Message-Id: <20170720155209.3250880-3-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170720154616.3250481-1-arnd@arndb.de> References: <20170720154616.3250481-1-arnd@arndb.de> X-Provags-ID: V03:K0:Mlo5ZjoP5w7YAEzAIcj1EasSNEBBlGKMohHsZnRrjBFKx1y9HJS EVacMMEIGCV49x6M8umXcgr+jN3ToMUp7EUbjyL0bx0Xh0yh2poVVlsBd3G7s/zShROGRDF 3FkC9g5Wqmx5ezmTnvQYY/B/nPMY569xwpWyw9buTeuJ5vFs17PoNoDI40qZimYzx4dhPAe 5/6VCAJxtYHfMod/fnsqA== X-UI-Out-Filterresults: notjunk:1; V01:K0:sbuHBaUulXw=:vSWkXHXFFwYOmevPLDTMAg wgzkw23aHUN9cSUFpCXtMNSof/tQRZCLZwfxfJzexf6vYcsv0IVek8a28YsVeZEk3ThuAb4lD XoieE1IEk8Aw5EB16gY0uzev6oGoLAVfF7gUy3aJyC4ZB1ES4umyWEZhSf+mNVkK21rHXv03q W5S9Tn8irKii5VN5DW1AsFieADjRGuwnRXk078wkwRkSeiZeuqNXc3Awur+WLRJTDHV63B5CE gk1UaJMrBlyPJIJrgOYr/dHZutLg56C3/vqeWikqWYeaZdk77zdMW2Taxzb1QgW7omnRYI+yo M952Hq6jUsj0RzUiepSnxgwTG8T22IlbspiVGR8MCAKfMryHyRLQ3AVRJCEzcVYl0PWQn8LVB kKBv1BmYgF4y5+SGny0QBSbmRLfH4pLvrZAgUKFVLGxKHNKonml99I44n0R/Nw/mp+LK5jbDJ kbNPdS0uyQ3OkaulmRtYKKPdxYt3wce5rDqiZlhuUW9A5FcQVFsPvdacBEmJ9tHdz9tmanvww JZNo4tzEnkO2i9AjtK/mvDQWTm7rzYp6AQ4TKjkv1/RtItLSVUkEXwe56DGllcfaWA12WewEh PfphMPLyZAZslGr8ETytvUQVbPrfHR0fjRhAjcULqKwge3nk5KyOro6TSY5iThA0Wd01AcQRV i/rGOftoMd3ijHEal0nuxHq1UmN09B0o5BpX568Iua4AoqTB5nR7qSz0PtdmB1HTkemRvg/eg ICBvjHQjYCJf4pf+ZkTnjfXSOIyf/LeqYtGlow== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The omap_generic_init() and omap_hwmod_init_postsetup() functions are used in the initialization for all OMAP2+ SoC types, but in the extreme case that those are all disabled, we get a warning about unused code: arch/arm/mach-omap2/io.c:412:123: error: 'omap_hwmod_init_postsetup' defined but not used [-Werror=unused-function] arch/arm/mach-omap2/board-generic.c:30:123: error: 'omap_generic_init' defined but not used [-Werror=unused-function] This annotates both as __maybe_unused to shut up that warning. Signed-off-by: Arnd Bergmann Acked-by: Tony Lindgren --- Originally sent in Feb 2016, but it got lost for some reason. --- arch/arm/mach-omap2/board-generic.c | 2 +- arch/arm/mach-omap2/io.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.9.0 Reviewed-by: Sebastian Reichel diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index dc9e34e670a2..b1e661bb5521 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c @@ -28,7 +28,7 @@ static const struct of_device_id omap_dt_match_table[] __initconst = { { } }; -static void __init omap_generic_init(void) +static void __init __maybe_unused omap_generic_init(void) { pdata_quirks_init(omap_dt_match_table); diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 1d739d1a0a65..1cd20e4d56b0 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c @@ -410,7 +410,7 @@ static int _set_hwmod_postsetup_state(struct omap_hwmod *oh, void *data) return omap_hwmod_set_postsetup_state(oh, *(u8 *)data); } -static void __init omap_hwmod_init_postsetup(void) +static void __init __maybe_unused omap_hwmod_init_postsetup(void) { u8 postsetup_state; From patchwork Thu Jul 20 15:51:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 108399 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp2308955qge; Thu, 20 Jul 2017 08:54:30 -0700 (PDT) X-Received: by 10.99.5.1 with SMTP id 1mr4470561pgf.222.1500566070017; Thu, 20 Jul 2017 08:54:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500566070; cv=none; d=google.com; s=arc-20160816; b=ySnIkRw05V1/cbvAXAq6EMxeKnXk9V4TnF6ZvJRDb7o4eySuTudc6v67v+53tzhIPT j6uredkQ9FB08kX9W8k4m8xE/5j9hxCOIH/wjtgESBU6GTo2Bc+Bq3dmg1ZtHPnrGcX/ zscayGxVaCK4Cz1JjOxVOq3S6ugsy0iXqYZhfFo1mXD97pryHSWs6Xc1P9fQMxrPkUdj IDhJKNGEDFISZQwLdoBZtVmGsN1fAFR6PTHDWGRFdmLzQof4mn8o1KtWqofoSlZt2K6u 67ZXJqWHUxuMJJb8dM8nDJ6vFSjvrvxoza8f5wPXT0vUjapUm9WPEOSvwOIxb1B750zO DJug== 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=N+wE+UE/Ou5QLYI9eAfDLRaj51aHe5pMqnK5AMrYtUo=; b=PQdkfPVFfWpCkzFRixub5LtgH/EsdhCPDILn0a1uNPjU7gcIrni9N5iRtZTadpE4EI fR6Pe5LTxQIK5zh1DX+8G0sDKHZqLHVJFJ1BGjtT9F5eYVcD+A8tLoO1Rr0KIuPZhVn8 AsAnPCtHyFQ7NLCOD9b3UU5yH4QIiDAyZiqgyJHnyCrZa8Esz5UN7hSygFVklkz5eQfC /xa8ggSXPueJ6OSLC7YftNz2qXuop9dBZtoNLV/PljGBio64uHIAeSQKOJAL7Hv13sUl 3U8Y0QFWWjyaLNejA1EhP2LZBUitzMWC8d1zpJko1vR89y9ByNRKUex+hcrXTTCUEhzX cWTw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 k13si1663137pln.442.2017.07.20.08.54.29; Thu, 20 Jul 2017 08:54:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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 linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936504AbdGTPy2 (ORCPT + 25 others); Thu, 20 Jul 2017 11:54:28 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:61929 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934344AbdGTPyY (ORCPT ); Thu, 20 Jul 2017 11:54:24 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MgkXH-1dE4BB12ox-00NyRw; Thu, 20 Jul 2017 17:53:22 +0200 From: Arnd Bergmann To: Barry Song Cc: Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 08/12] ARM: sirf: mark sirfsoc_init_late as __maybe_unused Date: Thu, 20 Jul 2017 17:51:46 +0200 Message-Id: <20170720155209.3250880-5-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170720154616.3250481-1-arnd@arndb.de> References: <20170720154616.3250481-1-arnd@arndb.de> X-Provags-ID: V03:K0:AuzTKd8onbs2Z5/VaAPTLqEEAW9dUaZGz7HoMlnACigw7cvJqxG ksDfiQrE2iMi0QkeuNFht1kbSo94foyLD4NTrgT6bKGXZgGONsBYrflSxU14RaRj2TPr1VW ZUs2nbqd0IRLKDT/a7J2Bu5tGTw9/QXXRAVy86PohejW08pK1tH05w89yrv9a+tutuffnXQ wbzS5aLQi8AtWAPCtfEOA== X-UI-Out-Filterresults: notjunk:1; V01:K0:+kvi3nsk3js=:C4P4gIqiCmlYUdPIP8nxN8 zI8FwGa6xJU8HGT7NmMZY2xd9grBjNhTNyZwWvVjwlyZ6yBBCvdJ7b+90ONonnqGmjVzC3xNe UFaJ3DFuxRgOE9eWdCkjo2mPXeqWsMIRpUMOaigbqrsdpEkgBzpln9NRAyhgrRxOwL/SWy9M2 g99jm0RXVzJdgIPeLuG45at9y1rjIc0EK5vB5QRefLjtdF/WJ9CaaDFVkRXazZMtwHebvjQS8 uTN7mjJuW8qygsRq52K4fCy7u7rS8XCxJofRXTJgy3CAVT49b8Rnm2s1pozH/CPz6Y0pajumJ cjRs8eRafn0DQVv73UICQRS+h4avqziqcfnTKohYnUzQeFYfe+w5rzD9+DwRz2kfKxtcVINk8 mnQASB8kfRG8H8SjtSx5/h34LR3weYYE7CMdBpbG4dcdmxEmO1qJ/Xs1NF6x0K5+VSutsMw8Z H0Q4dE+DkFgP6tf5+oDFg1WMKEqEfGiUlbOiKK5oGMdoFu7KgYmNKwDJ8c0V8q2IFL8FrYXeS BbZ4iKN8KTPGS0f3SBhqqJgBbRcNraWXtFYC2AUy5I+clNlMsUTsNVJKVXeYtqdqHaXXP3mSn rZ/qMa/U87vTgsdWKj/VlnVFVLFcDUG13aBHWHUyxmf48UdqRqwfTUBgEjOIhxY2BvM5xCEN4 hT2EJoblYft6MHtmO572QY1folwA1YewLO9LGo71CM95XMScPw88zRILgnW1fzDpsyZCA5ZX/ 2o95RQhezdZ4PgMT0MLiURXjfbxUz0p+NB4Mmg== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org sirfsoc_init_late is called by each of the three individual SoC definitions, but in a randconfig build, we can encounter a situation where they are all disabled: arch/arm/mach-prima2/common.c:18:123: warning: 'sirfsoc_init_late' defined but not used [-Wunused-function] While that is not a useful configuration, the warning also doesn't help, so this patch marks the function as __maybe_unused to let the compiler know it is there intentionally. Signed-off-by: Arnd Bergmann --- Originally submitted Feb 2016, but it got lost --- arch/arm/mach-prima2/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/arch/arm/mach-prima2/common.c b/arch/arm/mach-prima2/common.c index 8cadb302a7d2..ffe05c27087e 100644 --- a/arch/arm/mach-prima2/common.c +++ b/arch/arm/mach-prima2/common.c @@ -15,7 +15,7 @@ #include #include "common.h" -static void __init sirfsoc_init_late(void) +static void __init __maybe_unused sirfsoc_init_late(void) { sirfsoc_pm_init(); } From patchwork Thu Jul 20 15:51:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 108397 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp2308212qge; Thu, 20 Jul 2017 08:53:41 -0700 (PDT) X-Received: by 10.84.229.72 with SMTP id d8mr4933956pln.12.1500566021208; Thu, 20 Jul 2017 08:53:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500566021; cv=none; d=google.com; s=arc-20160816; b=lBR2a3x772BsIbAk+sGEpP0Lg+pFCke0lIVvcEyD0TU8AWO4ndtctnFqUFtWe7bf4P 9Fc67l0yVGdW9RUGZgJMZv7MygTGkQJBUhuD4fvdND/dAz7mIFVCzFoHK9WdkhwbVukO dohlaMIaYsJZDrgANZwt1dHHfpu1lnPIR1qqaHtU/1/7FZ6VP/57LQgP5TNCiprXBkMJ W38tKDWrD7TtmJmDtIhlOqqZBCfxgEiC3+gNu7lp808zrkp9OmxbglnHsDkB1b6eJMDb op92YvQiNVn2uob3Z9zpdHAhWBwXRYTQ1laD8LijfAZBvx/aDDbX1ESLWmWqNRSzi3Dz Y5qg== 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=I10RoRFK3OkAH09u9qqnF2WuDvZU95GgPC/fU10lAgA=; b=pXkHRQW0GogBlSJhQZUhfI+ElAwsmHtCFe2tpQQFYh9rd5QqKrJS9sWyzNP78AoT0z qNt1+KWmkT9MXW+vgccdpaAr275It0eA8zA4zTGjtaJlCupuQyKUy1HVrsHo4gbbrKhX tbkQJC/QmrONaxUCwSeT7GlIWuI15PYvkCy4ujBIQFmdU6vMEKU5MXDd9RUlzYBhV8tk yXspYlYYndQbSf5Jqs5KV22/uUK7Fg10VSnG1mQLcWlu2pICe1BVU/jvTjTpyLSvMIx6 qZ7cqVnjCv8oAfDGC8zW1OeavO+2hkgOqjUTe+xi6Yqnm0loQXnVL7v16mtwDAOKrSsI cH0g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 o89si1749557pfk.208.2017.07.20.08.53.40; Thu, 20 Jul 2017 08:53:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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 linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965815AbdGTPxi (ORCPT + 25 others); Thu, 20 Jul 2017 11:53:38 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:51360 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934344AbdGTPxg (ORCPT ); Thu, 20 Jul 2017 11:53:36 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0LfsQF-1dx8JJ0FER-00pd8S; Thu, 20 Jul 2017 17:53:34 +0200 From: Arnd Bergmann To: Imre Kaloz , Krzysztof Halasa , Arnd Bergmann Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 09/12] ARM: ixp4xx: use normal prototype for {read, write}s{b, w, l} Date: Thu, 20 Jul 2017 17:51:47 +0200 Message-Id: <20170720155209.3250880-6-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170720154616.3250481-1-arnd@arndb.de> References: <20170720154616.3250481-1-arnd@arndb.de> X-Provags-ID: V03:K0:57I9buRgPvSTB3dT5v5stUddWaqaqu4d+NU6i22IKSJtgya+KL8 E0BvEWrU/l2IQxumyyiXoVFOvdg+mFQMYCJBeko1RcpmjA71dLRGVCsuAQYDJzn/JrRIKYa If6+trqmlREsjla1UsjHWqZoTcFM3+0dDMVhIuUzg1fV5zwwhs++Sj58xVPlY9xt8lCqbgj h0WZDQFFNuZql3rFhcWhQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:AjX6+COo6O0=:qeMTM6jkbe7Lw4KxGTqrCO EMfBjl9x/XuHqMtClfHH5k6dMe3cF8UmaYE6bDKd4eoXVpysRdRTOUYXCzZKNlZm+2Dg6jhMO tJNPL+TiYr08y5aK7v5A1lExqgwyTQAI3UKAfIUt2YWKm/tz43LV61IhRNMDge+OcvfiLug09 TZvzPofrq8iLHfJUuLU8Y2V0Mhrs/PSYqLlqUnyTMQvnP+Ckzlcuj3EHFwOG312x4bFmZbRCk hZWLdKRkL6IiNbiQnHceBWOGJ+dtCCCxKAKIYIViuNzwbWfHeFurZAFgRw/JwMT/rOwhif2Dn +uWMWfoDsGqYkhbObNwgkpjEmLwQxHP/8B+8iIhDUsStOE4Wb1Xu84gywlvWbOkpVtSfH9oQI 3elK2xGEAEodbTBnMEdkM7+wZ8G5QVGgH9D8TILkYt5qdAwamcYpMUWo3O0BBgndgU+rs3E+m FZz/lUIfmjXdGD+kI7Y4Yo8Skj5ZUixA+nimSSLLRBq2gIzmO5Chm8CL9LIxfzF7gns+P/zSc YJVtRIxXzHSFtCnAWzn+Q+8QOy26U2mdu35WnxZJPqfFWe/kPdOi99Sq+aDn58ubl6O4rJwrF ryTp+lakubDN+Z8hCUbNwRPzU2JQDckk735sykLMe1496T2/wJfXFWd1I4KmlEnvutRe9O+o5 kyS/VhvMf9NQt4rs3Uf8H43/fRl4ulVesonDlnspQGxVHxiRkiTOXKFXzhZESKKoqtv0flcr7 DCZV+MfHZTtFjtVe9f5e+bN/UKxMLRyDzSoo9Q== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ixp4xx defines the arguments to its __indirect_writesb() and other functions as pointers to fixed-size data. This is not necessarily wrong, and it works most of the time, but it causes warnings in at least one driver: drivers/net/ethernet/smsc/smc91x.c: In function 'smc_rcv': drivers/net/ethernet/smsc/smc91x.c:495:21: error: passing argument 2 of '__indirect_readsw' from incompatible pointer type [-Werror=incompatible-pointer-types] SMC_PULL_DATA(lp, data, packet_len - 4); All other definitions of the same functions pass void pointers, so doing the same here avoids the warnings. Signed-off-by: Arnd Bergmann Acked-by: Krzysztof Halasa --- Originally sent on Feb 2016, but it got lost --- arch/arm/mach-ixp4xx/include/mach/io.h | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) -- 2.9.0 diff --git a/arch/arm/mach-ixp4xx/include/mach/io.h b/arch/arm/mach-ixp4xx/include/mach/io.h index 2f84c26a6758..844e8ac593e2 100644 --- a/arch/arm/mach-ixp4xx/include/mach/io.h +++ b/arch/arm/mach-ixp4xx/include/mach/io.h @@ -95,8 +95,10 @@ static inline void __indirect_writeb(u8 value, volatile void __iomem *p) } static inline void __indirect_writesb(volatile void __iomem *bus_addr, - const u8 *vaddr, int count) + const void *p, int count) { + const u8 *vaddr = p; + while (count--) writeb(*vaddr++, bus_addr); } @@ -118,8 +120,10 @@ static inline void __indirect_writew(u16 value, volatile void __iomem *p) } static inline void __indirect_writesw(volatile void __iomem *bus_addr, - const u16 *vaddr, int count) + const void *p, int count) { + const u16 *vaddr = p; + while (count--) writew(*vaddr++, bus_addr); } @@ -137,8 +141,9 @@ static inline void __indirect_writel(u32 value, volatile void __iomem *p) } static inline void __indirect_writesl(volatile void __iomem *bus_addr, - const u32 *vaddr, int count) + const void *p, int count) { + const u32 *vaddr = p; while (count--) writel(*vaddr++, bus_addr); } @@ -160,8 +165,10 @@ static inline u8 __indirect_readb(const volatile void __iomem *p) } static inline void __indirect_readsb(const volatile void __iomem *bus_addr, - u8 *vaddr, u32 count) + void *p, u32 count) { + u8 *vaddr = p; + while (count--) *vaddr++ = readb(bus_addr); } @@ -183,8 +190,10 @@ static inline u16 __indirect_readw(const volatile void __iomem *p) } static inline void __indirect_readsw(const volatile void __iomem *bus_addr, - u16 *vaddr, u32 count) + void *p, u32 count) { + u16 *vaddr = p; + while (count--) *vaddr++ = readw(bus_addr); } @@ -204,8 +213,10 @@ static inline u32 __indirect_readl(const volatile void __iomem *p) } static inline void __indirect_readsl(const volatile void __iomem *bus_addr, - u32 *vaddr, u32 count) + void *p, u32 count) { + u32 *vaddr = p; + while (count--) *vaddr++ = readl(bus_addr); } From patchwork Thu Jul 20 15:53:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 108400 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp2309141qge; Thu, 20 Jul 2017 08:54:41 -0700 (PDT) X-Received: by 10.101.69.135 with SMTP id o7mr4305822pgq.242.1500566080915; Thu, 20 Jul 2017 08:54:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500566080; cv=none; d=google.com; s=arc-20160816; b=f4wlQHqfrPZ8kF1zRkiMJFZZVRLy9zvvgnL3ZDIY0yoKSZHtp+vYD5i9I0dh/TgYT6 o/Wc3gXeoAZQso48muOAdWF2Wbw3vh7UaVqJkfTGBOzb8ybNryhiH9+CgDt19a2rlmLQ jgMpbVzEh175Y5fuGeUifZP6swZSW2oLr6PLZO359KLTQ7ob3cdtFgmiaLIFZyqXlpgv 2zL7srD9TZ1KGg3OyuiIxcvWw2Grqx2cSPAdKCOp2PeU5b/XL3erZP3edhVJnbcHDZ/j C/TiEKpSTPL4lykgUl2lVQ5Qizcoa5wyoyXq0WtEzD8oQFsR892iZSPP8ED35g/4saZp v2OQ== 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=JaNTAVw4BAPLWC2+6w3x+C7FwgPI7I0J0mEbEsfRxrw=; b=pLEJTbIvYG1TRDX3Ua6GMQRdFNxtqPG3qQRhtCvbCEZWMPLHzfTeHOaxcR0g4VPboR atY6+pWqBObxMjGgGJ09wO98yQ70V5PB4ZbtCQYMkMHnpddaxLfClGlOMFNFkOv0RCi/ JpMiehnKzCSyMBDHI/4z4SVTNI2EhdJ6OA5I59FNmEPmyAfFQvc90cDwtT7piv2w5Q5g aZWrfCYji9NaNt60wd7NtJvje+5Cts+6HQyMzoop8QhhLbYXAWYYeU2xFy5+8MQKYupj Uk8srQ42x5PKwHkOWdeC67FKvCiswYrzeiB/xpkQd+F7m75NInDA8k6nLxe/Kutmzz9k wepQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 a7si1707231pli.710.2017.07.20.08.54.40; Thu, 20 Jul 2017 08:54:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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 linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936526AbdGTPyh (ORCPT + 25 others); Thu, 20 Jul 2017 11:54:37 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:62184 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934344AbdGTPyf (ORCPT ); Thu, 20 Jul 2017 11:54:35 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.145]) with ESMTPA (Nemesis) id 0MhUV0-1dCgWB415u-00MZor; Thu, 20 Jul 2017 17:54:26 +0200 From: Arnd Bergmann To: Aaro Koskinen , Tony Lindgren Cc: Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 11/12] ARM: omap1/ams-delta: warn about failed regulator enable Date: Thu, 20 Jul 2017 17:53:44 +0200 Message-Id: <20170720155410.3251043-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170720154616.3250481-1-arnd@arndb.de> References: <20170720154616.3250481-1-arnd@arndb.de> X-Provags-ID: V03:K0:6HwnaJ84zOYCAlhUNMmm89G3kOxuoRgRquwZ18OivjJ5u/Eibpx WMmhKaooBYZdiESY+b0T5nqVHRbTZGMhgpUQSv8KiAM8528rGPc7O+wcEzA9pxMxOAVFOzE XG2qPiYmoXJkm+VFWgWML4PKpr8mioVr94V6cnmjg9U61ZblnH+b7PbFFRslq8Yhze1VIvk 7PW1oOuia/WFAkAN+emZg== X-UI-Out-Filterresults: notjunk:1; V01:K0:1p+WNOW+2kU=:UffuASmKOopQz50qLIVw1/ XjqWffCuUD5w6+CPGRtW09sGHsF4LojNisZeNv+W7LubvWV8YcLUpWXGjOVXNBRBGtnnrFhIn N7ohl43PdOQ2xe2sgGhAfzd1xCEPs/vSZpuW/X5WKo/xO4EV7O/OOkI+daY/Qtnf589nhGjDn JJHozL9XYCMm0mZl5pixn5Kffxw3y4McO/vFto5xaW88xZyz2bs0zfN1HSpqwVTjjZVGtY14R iOiL/dVIAfdRsPhpSRz4Lp4WEqSOG3yRHHRiHmVqDQ1nystmw6EGeeq3uHh/ZCyOaKSSlhBQ5 6eF1sNMnEccSemSDk7Sra47dRC7UKc+VLgWEP1X9Eh3qqxkGz+Ddp84dG1AKYqRv3434iRJv2 XRE1fHyFfVYvZJFN9NHuesjr0OgGmWWMwNbQqN1lBgQuvRMhbYarU2NXwWyCXYF8Bb6eJmzy3 nzFviRP6FuoulvjssOe8jF5/9LDp8Vf4A8+WqYzfbWVj87Gs+rjdKsKXG0JEKQO2OJWEh9pjY hQgr0AKRml54W4dIJ+1ZZDROilCe9u0gIozBfS1mm3r1XU19dzFK1OEwWW5fqYsLJKc29xRNh vUd4m+OHzPpS1zcWl17TMxcsBvWPRpV9CjMbICqRZ2nhWOECRlAQ9Ll/sqaBQNxQLRFr5MWJG nP1ne0hK4EOYRNySffZzu3kLDE/DbEqXuAVz58NxvXGY7+0vTz0OwitJR/TMKeesNXVzsRhgL 0zkIDGB8PCzQFN6O31XHrHmJdTaS767bHFlFng== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The modem pm handler in the ams-delta board uses regulator_enable() but does not check for a successful return code: board-ams-delta.c:521:3: error: ignoring return value of 'regulator_enable', declared with attribute warn_unused_result [-Werror=unused-result] It is not easy to propagate that return code to the callers in uart_configure_port/uart_suspend_port/uart_resume_port, unless we change all UART drivers, and it is unclear what those would do with the return code. Instead, this patch uses a runtime warning to replace the compiletime warning. I have checked that the regulator in question is hardcoded to a fixed-voltage GPIO regulator, and that should never fail to get enabled if I understand the code right. Acked-by: Tony Lindgren Acked-by: Aaro Koskinen Link: https://patchwork.kernel.org/patch/8391981/ Signed-off-by: Arnd Bergmann --- Originally sent in Feb 2016, but it got lost for some reason --- arch/arm/mach-omap1/board-ams-delta.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) -- 2.9.0 diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c index 6613a6ff5dbc..6cbc69c92913 100644 --- a/arch/arm/mach-omap1/board-ams-delta.c +++ b/arch/arm/mach-omap1/board-ams-delta.c @@ -510,6 +510,7 @@ static void __init ams_delta_init(void) static void modem_pm(struct uart_port *port, unsigned int state, unsigned old) { struct modem_private_data *priv = port->private_data; + int ret; if (IS_ERR(priv->regulator)) return; @@ -518,9 +519,16 @@ static void modem_pm(struct uart_port *port, unsigned int state, unsigned old) return; if (state == 0) - regulator_enable(priv->regulator); + ret = regulator_enable(priv->regulator); else if (old == 0) - regulator_disable(priv->regulator); + ret = regulator_disable(priv->regulator); + else + ret = 0; + + if (ret) + dev_warn(port->dev, + "ams_delta modem_pm: failed to %sable regulator: %d\n", + state ? "dis" : "en", ret); } static struct plat_serial8250_port ams_delta_modem_ports[] = { From patchwork Thu Jul 20 15:53:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 108402 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp2310031qge; Thu, 20 Jul 2017 08:55:38 -0700 (PDT) X-Received: by 10.101.86.68 with SMTP id m4mr4334764pgs.46.1500566138836; Thu, 20 Jul 2017 08:55:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500566138; cv=none; d=google.com; s=arc-20160816; b=eM6WDvzc7JnjLurIxj79O70u2DA+3Ud0lcrdiaAMz07fATKSpocAZF0P+He4Rk1Tek t8QxmNOTeO76VovSHPgyXi85+Rl+crJAVdK3aiMmu98MFydVk4s8Idab26KZvuXn2EJ3 4HDBZDDXr/86AHoNt+cJ01cwfqMOYj3pWaKzbagiOQQ/y6Bm/a/9ZRz9JurJaHcjycKD sPB0mu94V1DZ3cf5AaolU5DEjyZKW8JvgrRSgHO3/JrEi7KbHDQsIa0DA2rfg/M/TqRx ls2C0Dnbgin4/6IIXVkYQJD3urdd4YRDaakPD38lfaf5OgQ5gdsM1nCslaw0Vn+8/PzX PXfQ== 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=gKhKNpoi6ugz7oQ7GLzKmDiMCKexodHeB8L41ukij0g=; b=tAAsl/ZAGtC3qF7NT7/Qfg6jN1iUE0I1S8wYd6foCQjNig+FTlyWv0blfhuhNkkfRo hqub2ofq8pQSSu4CF/4Lst2jIE7WW0eIN65lSomKWDU0JMDw7eNkQKiY99Vlq6YqsjjF COGOgRvNImBqJM7uS26Gh3Pl60OnKfFAomMKRqg4M2DgxMR4HLOTyyMMRNUEdmw7epvy ggnpb/cIwJXRmcWI1PYUeFz9OOtrJU8dqwPRkxbbuYMIQO16NUKPTYYIELcN6jQUciHA MgHwZgt38A03VYAI90hRf2YF4Mc7aswvtoFwHoTcV8bC10QTXV0FRl0NSCAkA7tfnrq/ a3MA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 t207si213331pgb.740.2017.07.20.08.55.38; Thu, 20 Jul 2017 08:55:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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 linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936541AbdGTPzf (ORCPT + 25 others); Thu, 20 Jul 2017 11:55:35 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:57034 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934802AbdGTPze (ORCPT ); Thu, 20 Jul 2017 11:55:34 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.145]) with ESMTPA (Nemesis) id 0LjJi3-1eBQ1W1smV-00dXF2; Thu, 20 Jul 2017 17:54:41 +0200 From: Arnd Bergmann To: Russell King Cc: Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 12/12] ARM: rpc: rename RAM_SIZE macro Date: Thu, 20 Jul 2017 17:53:45 +0200 Message-Id: <20170720155410.3251043-3-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170720154616.3250481-1-arnd@arndb.de> References: <20170720154616.3250481-1-arnd@arndb.de> X-Provags-ID: V03:K0:BJu2VtNORP02mTgPy0kKk4+9lFo6eFeWBc4rJahZxT1geb0i71U HwJlJig2vImOxwTXrudbZ6vnfZPtlELa8rJLM1Pu85iZnKGTWr3RNcZXqpspzaFoNyyjSmg h+ArCKc9OfNMKLde6/GaVGzE5DSR69NXXkko1UMK5rljAA0nHqXf+W2dYZxW870QvmjWmjt Pv6C2AkPtIFWRg7ouTXXw== X-UI-Out-Filterresults: notjunk:1; V01:K0:rGPG7D7c57I=:+VGefJ1a2EX5LlzGuEV81Y l4Vbj/waZVVIWQdf7KkwVxevFqSpxgyyOFlVkWhfBAYWk16nEE1GWwyDsdeOMNfgrlKZCY7Gq uxf+wNEClZ14iqbamG5BEu7Nyr9D63+iBtbGoTpDk5tgggq68YY/OopE90cptFkp2AXOdGGBt YyxfO7si9vKcKvS33t3VlfBBC3Zi8Azf+5f/5J1jgjWKzsWkBZPKK+9G8c6YZjPMzdaFkDVV8 E5SoLq7/iKRGSGvA7jbYWSFxtxM9ZkwQ2o7JQNw/eev5JF114T61uymj+FVR0qs4/m0ANN/kA kzT9nISokX3aWR4mAg08+BtzoJhKJmnSiU2XMnLhfsY3wmLnQHe9s1E2EIwIjTrxL96cC7ngR utRQAJdz7gZa8TjchMbhRTDewQ5wmRO16Yz/eVJP3oLApN1Nrf/Z+ynmDd0gWciEqpVdvCggj CwbLior5+oCTxAO2O6b9jiZpo58Y4YsPKDV+Ogs6LkxyoQ9swAYbAdL2/THBh2MLQKB8CoTJe WtbvirQFZW8Q+h0T+0Z+44iB8kQqdiSM3LetTCjc1ax7fBYOVjnF//EPKU/bcqfbJbKw63+bW MdFtnQzKKfbc9eRb7PcmrJkIQClA1k/aebc7p3yY7lc3GpnxTSX9+KfRnxksjZSlqDC18D6O/ bsSA7c1dqUcNxddZc0QceB1q2NCeeW31Ix9bGGGWGBjJmcw9IUYQ62ZIlpPFg6ie6nXC3wNE4 fFgOIJEX7EmX/lUFmXlgmOBN9MviPKbhec4qYg== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The RAM_SIZE macro in mach/hardware.h conflicts with macros of the same name in multiple drivers, leading to annoying build warnings: In file included from drivers/net/ethernet/cirrus/cs89x0.c:79:0: drivers/net/ethernet/cirrus/cs89x0.h:324:0: error: "RAM_SIZE" redefined [-Werror] #define RAM_SIZE 0x1000 /* The card has 4k bytes or RAM */ ^ In file included from /git/arm-soc/arch/arm/mach-rpc/include/mach/io.h:16:0, from /git/arm-soc/arch/arm/include/asm/io.h:194, from /git/arm-soc/include/linux/scatterlist.h:8, from /git/arm-soc/include/linux/dmaengine.h:24, from /git/arm-soc/include/linux/netdevice.h:38, from /git/arm-soc/drivers/net/ethernet/cirrus/cs89x0.c:54: arch/arm/mach-rpc/include/mach/hardware.h:28:0: note: this is the location of the previous definition #define RAM_SIZE 0x10000000 We don't use RAM_SIZE/RAM_START at all, so we could just remove them, but it might be nice to leave them for documentation purposes, so this renames them to RPC_RAM_SIZE/RPC_RAM_START in order to avoid the build warnings Signed-off-by: Arnd Bergmann --- I originally sent this in Feb 2016, but it got lost for some reason. --- arch/arm/mach-rpc/include/mach/hardware.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.0 diff --git a/arch/arm/mach-rpc/include/mach/hardware.h b/arch/arm/mach-rpc/include/mach/hardware.h index aa79fa47373a..622d4e5df029 100644 --- a/arch/arm/mach-rpc/include/mach/hardware.h +++ b/arch/arm/mach-rpc/include/mach/hardware.h @@ -25,8 +25,8 @@ * *_SIZE is the size of the region * *_BASE is the virtual address */ -#define RAM_SIZE 0x10000000 -#define RAM_START 0x10000000 +#define RPC_RAM_SIZE 0x10000000 +#define RPC_RAM_START 0x10000000 #define EASI_SIZE 0x08000000 /* EASI I/O */ #define EASI_START 0x08000000