From patchwork Tue Mar 29 18:23:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 64610 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp2175397lbc; Tue, 29 Mar 2016 11:23:33 -0700 (PDT) X-Received: by 10.66.231.100 with SMTP id tf4mr5805766pac.44.1459275813037; Tue, 29 Mar 2016 11:23:33 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f3si16775pas.21.2016.03.29.11.23.32; Tue, 29 Mar 2016 11:23:33 -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 S1753746AbcC2SXb (ORCPT + 29 others); Tue, 29 Mar 2016 14:23:31 -0400 Received: from mail-qk0-f173.google.com ([209.85.220.173]:33352 "EHLO mail-qk0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752834AbcC2SX3 (ORCPT ); Tue, 29 Mar 2016 14:23:29 -0400 Received: by mail-qk0-f173.google.com with SMTP id s5so9795403qkd.0; Tue, 29 Mar 2016 11:23:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=8/8uJENdCwDAGr8Z1Dyj1YbpbATxLhpT/RuTEaGgiIU=; b=QfdoLEa+4sVG5QRU6OOZ8OfQTxdtuIHTQ17bVev/a76OLb3pb8G8o9bhx73/Y9FNWM k6k3nwpxUhyxYUCf1vE5OzDNPA3Ku8btSm48bSbL09geaoWAQENYeR2ALRDA4gocVuEg 0aXbAt6kuJhRQT6ClRqtYcqEPYaULtLYamGkrQ8YZwcCLmpvFNhNIDNn2fpOHaUCKy8y NHvomK3fPce+UlG6v5OrF/24duaDRU4CLHSGND0uI/wVLMvHVV09ig7YOyXXO49fReIq YlOD6SNOxxu1iJFzNs7sRKCzLc7NecG5wU6SzLVN4cKVek1ZRXLIk77rIlFUWaDMYJb1 UQCA== X-Gm-Message-State: AD7BkJJ+TCAf8hYHVXI/ZUXjDJhsAIV7V6S5TYrxamo4HUAZSgYMLLGgsSB9P//D83W5Tg== X-Received: by 10.182.66.116 with SMTP id e20mr2139527obt.42.1459275807896; Tue, 29 Mar 2016 11:23:27 -0700 (PDT) Received: from rob-hp-laptop.herring.priv (72-48-98-129.dyn.grandenetworks.net. [72.48.98.129]) by smtp.googlemail.com with ESMTPSA id s7sm9766057obk.17.2016.03.29.11.23.27 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 29 Mar 2016 11:23:27 -0700 (PDT) From: Rob Herring To: Lee Jones Cc: Arnd Bergmann , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org Subject: [PATCH 1/2] asm-generic/io.h: provide default ioremap/iounmap for !HAS_IOMEM Date: Tue, 29 Mar 2016 13:23:00 -0500 Message-Id: <1459275781-3863-1-git-send-email-robh@kernel.org> X-Mailer: git-send-email 2.5.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Drivers shouldn't have to care about HAS_IOMEM to compile and having to causes a Kconfig mess: warning: (MEDIA_SUBDRV_AUTOSELECT && VIDEO_CX231XX && INV_MPU6050_I2C) selects I2C_MUX which has unmet direct dependencies (I2C && HAS_IOMEM) warning: (ST_IRQCHIP && STMMAC_PLATFORM && DWMAC_IPQ806X && DWMAC_LPC18XX && DWMAC_ROCKCHIP && DWMAC_SOCFPGA && DWMAC_STI && TI_CPSW && PINCTRL_ROCKCHIP && PINCTRL_DOVE && POWER_RESET_KEYSTONE && S3C2410_WATCHDOG && VIDEO_OMAP3 && VIDEO_S5P_FIMC && USB_XHCI_MTK && RTC_DRV_AT91SAM9 && LPC18XX_DMAMUX && VIDEO_OMAP4 && HWSPINLOCK_QCOM && ATMEL_ST && QCOM_GSBI && PHY_HI6220_USB) selects MFD_SYSCON which has unmet direct dependencies (HAS_IOMEM) Reuse the !MMU variants for !HAS_IOMEM as they are sufficient for our needs. This fixes build errors for UM allyesconfig: drivers/mfd/syscon.c:89:2: error: implicit declaration of function 'iounmap' [-Werror=implicit-function-declaration] iounmap(base); Reported-by: Fengguang Wu Cc: Arnd Bergmann Cc: linux-arch@vger.kernel.org Signed-off-by: Rob Herring --- include/asm-generic/io.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.5.0 Tested-by: Krzysztof Kozlowski diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h index eed3bbe..03160b0 100644 --- a/include/asm-generic/io.h +++ b/include/asm-generic/io.h @@ -753,7 +753,7 @@ static inline void *phys_to_virt(unsigned long address) * ioremap_*() variant as defined to itself to avoid the default NULL return. */ -#ifdef CONFIG_MMU +#if defined(CONFIG_MMU) && defined(CONFIG_HAS_IOMEM) #ifndef ioremap_uc #define ioremap_uc ioremap_uc