From patchwork Fri Aug 9 16:33:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 170962 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp10236786ile; Fri, 9 Aug 2019 09:34:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqzi34t+F8zxhYcqB9aTGxpxyxMOdWtTUMvFgCPBN9Ofu1KUSbt+7tytcy+UVsAf+kiCQCmM X-Received: by 2002:a17:90a:898e:: with SMTP id v14mr10272210pjn.119.1565368453313; Fri, 09 Aug 2019 09:34:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565368453; cv=none; d=google.com; s=arc-20160816; b=LlNlKfAST5I8x6TztIEdXyNvKI6WxVuDHSlqPBba5KGYHSeycAu6lBYNzfEkJIAvki SPwG4SdxJJlKPutuNLDjtRlJFEri/QwYJmlXiDvcc7b/rZ9yB4CgZ0l1GUag9pHJkIBB d2rfPKiNu8RZ1XA0JkCqa0NyYfEdBpZinmzdsoq9ACJw5MeiZaKogyj4BY9DMdsIc4PH HYrfkahUqE5fnaaSPJWGtVyIXpZa4xRYGDelKRLnwpbtvhWblVUGDHok3Fq9DDAuVroL BIa8Too3/+KcoIw3hd1JtZUlRh0p31CwJXzptbZ6suVS6+JYWfDaYcq/aQsFKQvTHx1e h9WQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=78CNmuUIiR0ZI+QbZywdcB4zBE+3dRCHqPgB/ELimtI=; b=0QujQPfFGudfnnGK1jJpQ0iLDput0x5j8WL2KTEDfmtJwOubd+NYIsjD9ZigqcUIeO Mn6/+rvzEZCyxdW0xS5UTa1N7niH8BKe2LJ0sEITAebzCz4BmKU2M2FO8Gr+jMuuhv3t cR2+YjvifRs+cfvSs7OtfQq/xUB7ImdioOVQRybJHiJWuZZMsZ68XjNZswu7XScaoF31 sMdL1a8nwY1WDRJZdWLTL0WDw9rpN5W8QDnh1Gxtwaur+0fgp2/+CthBROBWzmgRipUJ otvKiEUp7+kBXp9QxDK2DyEALaCzBkxHUaeNK8cuXoePo1b7E0HL5ydNWihE0s/Sfa0x 9GzA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of dmaengine-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=dmaengine-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 x4si4676938pjn.93.2019.08.09.09.34.13; Fri, 09 Aug 2019 09:34:13 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dmaengine-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 dmaengine-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=dmaengine-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2437238AbfHIQeM (ORCPT + 3 others); Fri, 9 Aug 2019 12:34:12 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:34229 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726516AbfHIQeE (ORCPT ); Fri, 9 Aug 2019 12:34:04 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.129]) with ESMTPA (Nemesis) id 1N2Unv-1iJPbx03ep-013rP0; Fri, 09 Aug 2019 18:33:54 +0200 From: Arnd Bergmann To: soc@kernel.org Cc: Arnd Bergmann , Russell King , Dan Williams , Vinod Koul , Linus Walleij , Bartosz Golaszewski , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, linux-gpio@vger.kernel.org, linux-i2c@vger.kernel.org Subject: [PATCH 6/7] ARM: iop32x: make mach/uncompress.h independent of mach/hardware.h Date: Fri, 9 Aug 2019 18:33:20 +0200 Message-Id: <20190809163334.489360-6-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190809163334.489360-1-arnd@arndb.de> References: <20190809162956.488941-1-arnd@arndb.de> <20190809163334.489360-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:vI8dtEjZnzwjq2sWL8d5fbMPZeZEV7AvW59MnNKT2uhvW6Kjd4+ QOBkKhwEY9azPiKocWLoN574G7bvFZsJ4nOPkqLfmzxeSVwcFhzfQ0JOtSGKa8iDPx/KThd TMGllJRSWZY65qV4DjOqg2L4+9LOEf+gmG01q5n2GW2PEpZW47K4PK4kCQfoxu3mdrKP62T Y4DxEjvGN/6JC5oXKg3Jg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:R8VBPo7GS74=:ak4pWH17CjBan7Jv8I0xTE PIAFwppEm1A3IRTBsM35Id6qfBh/wGR5EWYKsptcsgDSiEPj8uLo3tvEbQmu4aogQQfanUBRw ec6HQjPzNLXdXbJFCNHcdM3WgfIhVxyvnii6xXjPIhhxizJUK1/w6S5lIpgDiSNenX9lTdzx6 PGGEJF926WXnFBe5J8mV7WM0Qc6x3OwgW1bfkrgTculBAGdAtIdlCotRzOJVZeUiiQSc9Y5mb dFVMH57p5cB6JE53vy5YKR23yZCq+lLg04xSTwfXEMId58QYyIsuZR/OBLBcSN2L5SOF/R1cS 9PEhxBXDgx04Fb42oV8eJAXGKCDlPOKZTqsBGbupDWte4b1+vbbO0DAAHUzmQoZ7QW3E2F5AS WdzkRtW0GakUXzPo1hggUyEZMQ9cG445/+0Gxn5ueOXi0NBIgK2qzlCkfgYFzPqjkPkCzJ7Wz 66EeDd0BvJWrn8SrbzAiiCDJCYuXtgYq3thXXmMF0vyIdwDM5nfAGQwsoWSwHPDwF/D4wqNrt lqky1W4IwL7IP7sJQspXT1F0G/YbHd25e7sQ2oaV3+OsVwtiwOBL0pYMl8he8OaZTOBRrzqHt LffMwccDCho231N3Tlzr4zve/UkmrsqydZ4w2Vv1KGkxSPUr/cKHapjHKfr+aB+a4pbQnz0C6 Wh+vO2Ox24XvBnngmzChO+3Xq7I1QG+DTZNt1Y2qmyPoZ80MJRi5nE3OP3EE7i5QKJ53BMwPo vVZC+WLPECLeIdpiDVyM1KXUhsMwy37TNHPCbA== Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org All supported uarts use the same address: IQ80321_UART and IQ31244_UART are both defined to the default value of 0xfe800000. By using that as the address unconditionally, all dependencies on other machine headers can be avoided. Signed-off-by: Arnd Bergmann --- arch/arm/mach-iop32x/include/mach/uncompress.h | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) -- 2.20.0 diff --git a/arch/arm/mach-iop32x/include/mach/uncompress.h b/arch/arm/mach-iop32x/include/mach/uncompress.h index ed4ac3e28fa1..c8548875d942 100644 --- a/arch/arm/mach-iop32x/include/mach/uncompress.h +++ b/arch/arm/mach-iop32x/include/mach/uncompress.h @@ -6,9 +6,8 @@ #include #include #include -#include -volatile u8 *uart_base; +#define uart_base ((volatile u8 *)0xfe800000) #define TX_DONE (UART_LSR_TEMT | UART_LSR_THRE) @@ -23,17 +22,4 @@ static inline void flush(void) { } -static __inline__ void __arch_decomp_setup(unsigned long arch_id) -{ - if (machine_is_iq80321()) - uart_base = (volatile u8 *)IQ80321_UART; - else if (machine_is_iq31244() || machine_is_em7210()) - uart_base = (volatile u8 *)IQ31244_UART; - else - uart_base = (volatile u8 *)0xfe800000; -} - -/* - * nothing to do - */ -#define arch_decomp_setup() __arch_decomp_setup(arch_id) +#define arch_decomp_setup() do { } while (0)