From patchwork Mon Sep 10 17:47:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz Krzysztofik X-Patchwork-Id: 10594659 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7CC1D14E0 for ; Mon, 10 Sep 2018 17:47:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 696EF292C9 for ; Mon, 10 Sep 2018 17:47:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5D55729363; Mon, 10 Sep 2018 17:47:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DAAC9292C9 for ; Mon, 10 Sep 2018 17:47:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=xhCkxvq2R4bBNJxAPfN/tsRbCpzaDVw9SFUGmVgo5ZI=; b=TcX hQF07dfbrGj1q15Od4LHN2FJi2BtBP5iHvkfQAvuXZxwgzp62o6I9Gpa/0tYwmcDZNwCekWYXEk8w kSVL4jhQfwcHhMMC/ywTVNcyWanWhcq5MS/yE/GlVi+af472mooPfwAmG2eFX3zJGsqqwFvdwvbzc Rn6CiQ4dTbLdU1ymbD8yCDZj4n9yLFI5VbSyn1mpdpU/BXciC66QcqKobRTbvwT37YDajnNRMt+0A S+JaYZU+ru6tMlKcQLHYIL6BNHfKXnB3NkcHtg5WP63NteX5r9cO/YPfKUrG3cwiQuo/RG9M6oM46 hmTUMWrsjZSuq2gQqS8q6p8IhTnoWIA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fzQHB-0004dh-JM; Mon, 10 Sep 2018 17:47:05 +0000 Received: from mail-lj1-x242.google.com ([2a00:1450:4864:20::242]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fzQGY-0004Jq-4h for linux-arm-kernel@lists.infradead.org; Mon, 10 Sep 2018 17:46:39 +0000 Received: by mail-lj1-x242.google.com with SMTP id v9-v6so18657290ljk.4 for ; Mon, 10 Sep 2018 10:46:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Wtk+EBGKaQy0nbRlL54eNI7K87OTLBPD4Q9HDrFpXJ4=; b=t7nzvgkeXSonzrbIT2+hc1gBVe3n/ZHeeWuroKnTwb74HaDaPrrC8LDWNA+pN1NR4a llFYDeCdHNYpO02Jox8LOgaRiIGQxqYb75Ybig/0diIiZ+JwCgeNsY1eCkrcLL83g37D 3KlJcZ30x+s76kYIaXI6Ijxyie+WJ8iiJm2WqWmFQHp9sgoXo2J4/JTV9VX6fZa1Oq9o CDp/TWJsCCUcz4LcfgqgQX3Yz09zUO1qiPdDIIRCbzLAMwfR2MwWmGrplFIIZfp+t8se M1afx+qtD7dYZOwc8MeuGHrTalSro28h7vlXARhwwJ/i2y0BExYMqZI3ppb5LkKe6gl+ a6Ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Wtk+EBGKaQy0nbRlL54eNI7K87OTLBPD4Q9HDrFpXJ4=; b=Ri8MgLaGjtTadTT2nKTBC/XAAt4pLuElltrn3cY1y0kARb8SLh9MTWfnk5LwAcnBVL uJw+fuYs7p/e4Kpaa/HuY97mJMtY1HEWbQOhHPrh5oKijLm7aZKHgqBoavFjyOAqcSiD XLU6wFUkRYzZeOfK/UfGCTZ4x8jE7P6/UfubrY+0/r3P8mtuZVFt7N7oO1nH4lz2jFrb Wu9w3oyo67412UKUi0nLt51HQHJVeZ4jiRghquDrUCZP5u3cshZwCDJP7Sho2RQju0qT vz4TfNKvYAEc6rfSyihTcbsM/UUSWSM1HQ0XlO/jMzh3Xq7teGR3GUEQ5KuJ27v/CtDT TL7A== X-Gm-Message-State: APzg51CEmB0wlv7DngGhHuIzqrx2FRoHr8ErLV8Qd1xYi6atKmX1r1uT b9406pydwiNo5HP4PxKt9r8vjq/Cdd4KpA== X-Google-Smtp-Source: ANB0VdYmBnJ3qtPp2YxBtlk9TRRSOU6q6u486u/IPmLKHBoVajASWmLaQ9qF9FmoqhEJyn4ajyaCdw== X-Received: by 2002:a2e:9448:: with SMTP id o8-v6mr12992151ljh.34.1536601573506; Mon, 10 Sep 2018 10:46:13 -0700 (PDT) Received: from z50.lan (93-181-165-181.internetia.net.pl. [93.181.165.181]) by smtp.gmail.com with ESMTPSA id r63-v6sm2897896lja.18.2018.09.10.10.46.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Sep 2018 10:46:12 -0700 (PDT) From: Janusz Krzysztofik To: Tony Lindgren Subject: [PATCH] ARM: OMAP1: ams-delta-fiq: Use Date: Mon, 10 Sep 2018 19:47:22 +0200 Message-Id: <20180910174722.15679-1-jmkrzyszt@gmail.com> X-Mailer: git-send-email 2.16.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180910_104626_279323_E88D52C3 X-CRM114-Status: GOOD ( 13.22 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-omap@vger.kernel.org, Janusz Krzysztofik , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Aaro Koskinen MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Instead of defining symbols already defined in linux/platform_data/gpio-omap.h, use that header file. Since we include the header into an assembler code, prevent C only bits from being read in. Signed-off-by: Janusz Krzysztofik --- arch/arm/mach-omap1/ams-delta-fiq-handler.S | 12 +++--------- include/linux/platform_data/gpio-omap.h | 4 ++++ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/arch/arm/mach-omap1/ams-delta-fiq-handler.S b/arch/arm/mach-omap1/ams-delta-fiq-handler.S index 2e2a17364dc9..7c9fb7fe0070 100644 --- a/arch/arm/mach-omap1/ams-delta-fiq-handler.S +++ b/arch/arm/mach-omap1/ams-delta-fiq-handler.S @@ -15,6 +15,7 @@ #include #include +#include #include @@ -24,17 +25,10 @@ #include "soc.h" /* - * GPIO related definitions, copied from arch/arm/plat-omap/gpio.c. - * Unfortunately, those were not placed in a separate header file. + * OMAP1510 GPIO related symbol copied from arch/arm/mach-omap1/gpio15xx.c. + * Unfortunately, it was not placed in a separate header file. */ #define OMAP1510_GPIO_BASE 0xFFFCE000 -#define OMAP1510_GPIO_DATA_INPUT 0x00 -#define OMAP1510_GPIO_DATA_OUTPUT 0x04 -#define OMAP1510_GPIO_DIR_CONTROL 0x08 -#define OMAP1510_GPIO_INT_CONTROL 0x0c -#define OMAP1510_GPIO_INT_MASK 0x10 -#define OMAP1510_GPIO_INT_STATUS 0x14 -#define OMAP1510_GPIO_PIN_CONTROL 0x18 /* GPIO register bitmasks */ #define KEYBRD_DATA_MASK (0x1 << AMS_DELTA_GPIO_PIN_KEYBRD_DATA) diff --git a/include/linux/platform_data/gpio-omap.h b/include/linux/platform_data/gpio-omap.h index 8612855691b2..ed071f76b642 100644 --- a/include/linux/platform_data/gpio-omap.h +++ b/include/linux/platform_data/gpio-omap.h @@ -24,8 +24,10 @@ #ifndef __ASM_ARCH_OMAP_GPIO_H #define __ASM_ARCH_OMAP_GPIO_H +#ifndef __ASSEMBLER__ #include #include +#endif #define OMAP1_MPUIO_BASE 0xfffb5000 @@ -157,6 +159,7 @@ #define OMAP_MPUIO(nr) (OMAP_MAX_GPIO_LINES + (nr)) #define OMAP_GPIO_IS_MPUIO(nr) ((nr) >= OMAP_MAX_GPIO_LINES) +#ifndef __ASSEMBLER__ struct omap_gpio_reg_offs { u16 revision; u16 direction; @@ -215,5 +218,6 @@ static inline void omap2_gpio_resume_after_idle(void) { } #endif +#endif /* __ASSEMBLER__ */ #endif