From patchwork Tue Sep 22 07:08:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 7235281 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: patchwork-linux-sh@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 83BBDBEEC1 for ; Tue, 22 Sep 2015 07:08:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 97C7820764 for ; Tue, 22 Sep 2015 07:08:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 823D820748 for ; Tue, 22 Sep 2015 07:08:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756890AbbIVHI1 (ORCPT ); Tue, 22 Sep 2015 03:08:27 -0400 Received: from galahad.ideasonboard.com ([185.26.127.97]:34878 "EHLO galahad.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756509AbbIVHI1 (ORCPT ); Tue, 22 Sep 2015 03:08:27 -0400 Received: from avalon.ideasonboard.com (unknown [70.35.39.2]) by galahad.ideasonboard.com (Postfix) with ESMTPSA id CCA0D20B67; Tue, 22 Sep 2015 09:08:11 +0200 (CEST) From: Laurent Pinchart To: linux-sh@vger.kernel.org Cc: Simon Horman , Magnus Damm , Geert Uytterhoeven Subject: [PATCH v2 2/2] ARM: shmobile: Remove legacy mach/irqs.h Date: Tue, 22 Sep 2015 10:08:14 +0300 Message-Id: <1442905694-2317-3-git-send-email-laurent.pinchart+renesas@ideasonboard.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1442905694-2317-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com> References: <1442905694-2317-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 The header isn't needed anymore now that all SoCs use multiplatform kernels. Remove it. Signed-off-by: Laurent Pinchart --- arch/arm/mach-shmobile/include/mach/irqs.h | 10 ---------- arch/arm/mach-shmobile/irqs.h | 15 --------------- arch/arm/mach-shmobile/setup-r8a7778.c | 1 - 3 files changed, 26 deletions(-) delete mode 100644 arch/arm/mach-shmobile/include/mach/irqs.h delete mode 100644 arch/arm/mach-shmobile/irqs.h diff --git a/arch/arm/mach-shmobile/include/mach/irqs.h b/arch/arm/mach-shmobile/include/mach/irqs.h deleted file mode 100644 index 5aee83f079e2..000000000000 --- a/arch/arm/mach-shmobile/include/mach/irqs.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef __ASM_MACH_IRQS_H -#define __ASM_MACH_IRQS_H - -/* Stuck here until drivers/pinctl/sh-pfc gets rid of legacy code */ - -/* External IRQ pins */ -#define IRQPIN_BASE 2000 -#define irq_pin(nr) ((nr) + IRQPIN_BASE) - -#endif /* __ASM_MACH_IRQS_H */ diff --git a/arch/arm/mach-shmobile/irqs.h b/arch/arm/mach-shmobile/irqs.h deleted file mode 100644 index 3070f6d887eb..000000000000 --- a/arch/arm/mach-shmobile/irqs.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef __SHMOBILE_IRQS_H -#define __SHMOBILE_IRQS_H - -#include "include/mach/irqs.h" - -/* GIC */ -#define gic_spi(nr) ((nr) + 32) -#define gic_iid(nr) (nr) /* ICCIAR / interrupt ID */ - -/* GPIO IRQ */ -#define _GPIO_IRQ_BASE 2500 -#define GPIO_IRQ_BASE(x) (_GPIO_IRQ_BASE + (32 * x)) -#define GPIO_IRQ(x, y) (_GPIO_IRQ_BASE + (32 * x) + y) - -#endif /* __SHMOBILE_IRQS_H */ diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c index b0c9986d022d..008ea680fb8a 100644 --- a/arch/arm/mach-shmobile/setup-r8a7778.c +++ b/arch/arm/mach-shmobile/setup-r8a7778.c @@ -22,7 +22,6 @@ #include #include "common.h" -#include "irqs.h" #define MODEMR 0xffcc0020