From patchwork Thu May 21 12:47:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 6454741 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4233AC0432 for ; Thu, 21 May 2015 12:47:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5658120456 for ; Thu, 21 May 2015 12:47:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6D3D220435 for ; Thu, 21 May 2015 12:47:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753649AbbEUMrs (ORCPT ); Thu, 21 May 2015 08:47:48 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:62779 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753794AbbEUMrs (ORCPT ); Thu, 21 May 2015 08:47:48 -0400 Received: from wuerfel.localnet ([149.172.15.242]) by mrelayeu.kundenserver.de (mreue001) with ESMTPSA (Nemesis) id 0MXRDB-1YgnHK161d-00WGWM; Thu, 21 May 2015 14:47:15 +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:47:13 +0200 Message-ID: <12764506.jQAKye8BGv@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <4094934.StqYY08vL5@wuerfel> References: <4094934.StqYY08vL5@wuerfel> MIME-Version: 1.0 X-Provags-ID: V03:K0:jKLf2NQ65ylO758Be7DUDESO7cRqsyOZDxviecUVjp5cnuhdyD7 5LLOJMzLzjMtC2dlH3w+P+SBFospLIKv9+/wOc8Y4GdVAgAiwvQkeJWnGmz271SHX3MSnLM Thg+mKHrUveVT+3M5kXGim9mBn8FKi4GOgPWB6yujpJnmGSPY6afDKLY+PTJQHxtWzyBKik JkmnbXWQjmiw29Aob5H1w== 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 Thursday 21 May 2015 14:14:12 Arnd Bergmann wrote: > 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"). > > > > fwiw, I have another patch in my 'multiplatform' series that will add > another baby step. > > 8<--- > ARM: OMAP1: make header files local if possible > > A number of header files in mach-omap1 are never included from outside > of mach-omap1, so we can move them directly to that directory. > > Signed-off-by: Arnd Bergmann and three more: --- 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-h3.h b/arch/arm/mach-omap1/board-h3.h index 78de535be3c5..f70c42801969 100644 --- a/arch/arm/mach-omap1/board-h3.h +++ b/arch/arm/mach-omap1/board-h3.h @@ -27,6 +27,8 @@ #ifndef __ASM_ARCH_OMAP_H3_H #define __ASM_ARCH_OMAP_H3_H +#include + #define H3_TPS_GPIO_BASE (OMAP_MAX_GPIO_LINES + 16 /* MPUIO */) # define H3_TPS_GPIO_MMC_PWR_EN (H3_TPS_GPIO_BASE + 4) diff --git a/drivers/usb/gadget/udc/omap_udc.c b/drivers/usb/gadget/udc/omap_udc.c index e2fcdb8e5596..8a3690b2acbd 100644 --- a/drivers/usb/gadget/udc/omap_udc.c +++ b/drivers/usb/gadget/udc/omap_udc.c @@ -45,6 +45,7 @@ #include +#include #include #include "omap_udc.h" diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c index 6bb623a2a4df..1f6c8d91f738 100644 --- a/sound/soc/omap/omap-pcm.c +++ b/sound/soc/omap/omap-pcm.c @@ -34,6 +34,7 @@ #include #ifdef CONFIG_ARCH_OMAP1 +#include #define pcm_omap1510() cpu_is_omap1510() #else #define pcm_omap1510() 0