From patchwork Thu May 21 12:11:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 6454541 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C2F2D9F1CC for ; Thu, 21 May 2015 12:11:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B648420459 for ; Thu, 21 May 2015 12:11:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9DA2720457 for ; Thu, 21 May 2015 12:11:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754253AbbEUML5 (ORCPT ); Thu, 21 May 2015 08:11:57 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:59257 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751750AbbEUML4 (ORCPT ); Thu, 21 May 2015 08:11:56 -0400 Received: from wuerfel.localnet ([149.172.15.242]) by mrelayeu.kundenserver.de (mreue002) with ESMTPSA (Nemesis) id 0Lup4D-1ZLMF2387d-0101li; Thu, 21 May 2015 14:11:49 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: Tony Lindgren , arm@kernel.org, linux-omap@vger.kernel.org Subject: Re: [GIT PULL 2/2] omap1 sparse irq support for v4.2 Date: Thu, 21 May 2015 14:11:48 +0200 Message-ID: <80194352.chs4cqVdmg@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V03:K0:raBwPtLKbKxx1mPt4Y4INY0jJgo+uXmncUJzr3Fr+BC3tZ7xlje EngfNWQEwYX5/Lylu0u0e1Znw15rz1j8Y+PitIhPoDCeEvIE+VD0qqb2wAc9SLwNlnzlRIM X98FnVfgon4Z9aJRo9KckJG3bFw9rJZOWOADXJOEcofsSJjeW+QSKOFa6IhtdVBhi35YhjB 4vBc6NnJWTVH6squYzPnA== X-UI-Out-Filterresults: notjunk:1; Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Wednesday 20 May 2015 15:36:05 Tony Lindgren wrote: > Add support for CONFIG_SPARSE_IRQ for omap1. This takes us a bit closer > to making omap1 support multiarch. After this series we still need to > make omap1 use the common clock framework and fix up the drivers to not > rely on includes from mach and plat directories. > > Note that this branch depends on a GPIO driver fix in v4.1-rc3 > d2d05c65c40e ("gpio: omap: Fix regression for MPUIO interrupts"). > I'm getting lots of build errors in linux-next, which I think are caused by this series. Here is my fixup. Unfortunately, this again gets us a little further from making the drivers standalone, or at least it documents the dependencies. Arnd --- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm/mach-omap1/board-htcherald.c b/arch/arm/mach-omap1/board-htcherald.c index 9525ef9bc6c0..ac9bd88c6b05 100644 --- a/arch/arm/mach-omap1/board-htcherald.c +++ b/arch/arm/mach-omap1/board-htcherald.c @@ -42,6 +42,7 @@ #include #include +#include #include #include "mmc.h" diff --git a/arch/arm/mach-omap1/gpio16xx.c b/arch/arm/mach-omap1/gpio16xx.c index 6e6ec93dcbb3..404f3f55726f 100644 --- a/arch/arm/mach-omap1/gpio16xx.c +++ b/arch/arm/mach-omap1/gpio16xx.c @@ -19,6 +19,7 @@ #include #include +#include #include #define OMAP1610_GPIO1_BASE 0xfffbe400 diff --git a/arch/arm/mach-omap1/gpio7xx.c b/arch/arm/mach-omap1/gpio7xx.c index 4612d2506a2d..1bb38a4aec8f 100644 --- a/arch/arm/mach-omap1/gpio7xx.c +++ b/arch/arm/mach-omap1/gpio7xx.c @@ -19,6 +19,7 @@ #include #include +#include #include #define OMAP7XX_GPIO1_BASE 0xfffbc000 diff --git a/arch/arm/mach-omap1/iomap.h b/arch/arm/mach-omap1/iomap.h index f4e2d7a21365..23686204df45 100644 --- a/arch/arm/mach-omap1/iomap.h +++ b/arch/arm/mach-omap1/iomap.h @@ -27,6 +27,7 @@ * Omap1 specific IO mapping * ---------------------------------------------------------------------------- */ +#include #define OMAP1_IO_PHYS 0xFFFB0000 #define OMAP1_IO_SIZE 0x40000 diff --git a/arch/arm/mach-omap1/serial.c b/arch/arm/mach-omap1/serial.c index d1ac08016f0b..652ba6b9385e 100644 --- a/arch/arm/mach-omap1/serial.c +++ b/arch/arm/mach-omap1/serial.c @@ -22,6 +22,7 @@ #include +#include #include #include "pm.h" diff --git a/arch/arm/mach-omap1/usb.c b/arch/arm/mach-omap1/usb.c index 4118db50d5e8..1f28b5e8d6ca 100644 --- a/arch/arm/mach-omap1/usb.c +++ b/arch/arm/mach-omap1/usb.c @@ -26,6 +26,7 @@ #include +#include #include #include diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c index 7502e46165fa..32c8fc0fdc15 100644 --- a/drivers/input/keyboard/omap-keypad.c +++ b/drivers/input/keyboard/omap-keypad.c @@ -38,6 +38,10 @@ #include #include +#ifdef CONFIG_ARCH_OMAP1 +#include +#endif + #undef NEW_BOARD_LEARNING_MODE static void omap_kp_tasklet(unsigned long); diff --git a/drivers/tty/serial/8250/8250.h b/drivers/tty/serial/8250/8250.h index c43f74c53cd9..c73297bd7ed4 100644 --- a/drivers/tty/serial/8250/8250.h +++ b/drivers/tty/serial/8250/8250.h @@ -15,6 +15,10 @@ #include #include +#ifdef CONFIG_ARCH_OMAP1 +#include +#endif + struct uart_8250_dma { int (*tx_dma)(struct uart_8250_port *p); int (*rx_dma)(struct uart_8250_port *p, unsigned int iir); diff --git a/drivers/usb/phy/phy-isp1301-omap.c b/drivers/usb/phy/phy-isp1301-omap.c index 3af263cc0caa..1c05541bbeee 100644 --- a/drivers/usb/phy/phy-isp1301-omap.c +++ b/drivers/usb/phy/phy-isp1301-omap.c @@ -36,6 +36,7 @@ #include #include +#include #include #include diff --git a/drivers/video/fbdev/omap/lcdc.c b/drivers/video/fbdev/omap/lcdc.c index 6efa2591eaa8..4e01fbbeb52f 100644 --- a/drivers/video/fbdev/omap/lcdc.c +++ b/drivers/video/fbdev/omap/lcdc.c @@ -30,6 +30,7 @@ #include #include +#include #include #include diff --git a/drivers/video/fbdev/omap/sossi.c b/drivers/video/fbdev/omap/sossi.c index d4e7684e7045..39d9d7050d78 100644 --- a/drivers/video/fbdev/omap/sossi.c +++ b/drivers/video/fbdev/omap/sossi.c @@ -27,6 +27,8 @@ #include +#include + #include "omapfb.h" #include "lcdc.h"