From patchwork Mon Nov 5 23:11:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz Krzysztofik X-Patchwork-Id: 10669327 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 5024B14BD for ; Mon, 5 Nov 2018 23:10:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 451AF29FBA for ; Mon, 5 Nov 2018 23:10:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 39B6829FBE; Mon, 5 Nov 2018 23:10:10 +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.6 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,HK_RANDOM_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_LOW 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 D359029FBA for ; Mon, 5 Nov 2018 23:10:09 +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=8a3+y6qpRNckNOEeu5RtjTMiwZtxv6znzpxDCYBQVdY=; b=ofK irQ2tD9EDD9Cb7kafbTCvK36xtXOiUkCARu5R7kYpD+MYa7/8I/Tcw+CvOMtntxqrGKFRqddDRthx BscOCNHmkNej+lTqX9fmOx7njQu/22Ym9ltATnmX1eGONBLflLj0nX2MAp7s3h+eiTGH2hr7D+Da3 2DGEGtXFgEJ1DdIXlybbVhJoaAvCXo3GvEGJW1sC5VflRei6u1yQTmBptXawmp5ep7izn5pHkbxxL Kac8nbyyivNLSp10HsuNmUhauHtzJ8oFxDi2BxJfRBt8UTEeBCbkyw+75jmdS5HQlO/vDuBVxl1Fk 1EghkYvGEjFRgl5Nx+aXLt+P3VgDpJw==; 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 1gJo0W-0006Q2-Mp; Mon, 05 Nov 2018 23:10:08 +0000 Received: from mail-lf1-x143.google.com ([2a00:1450:4864:20::143]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gJo0O-0005ss-8R for linux-arm-kernel@lists.infradead.org; Mon, 05 Nov 2018 23:10:01 +0000 Received: by mail-lf1-x143.google.com with SMTP id n18so7438362lfh.6 for ; Mon, 05 Nov 2018 15:09:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=tJLRr6QbnqdTTEgIJ98Np6XMLsOvBj9N2cxclNb6K2c=; b=H7JVkYmZZwHQGgOOm3HYDLMMitw8SCx7TZep2F79ApE/7QcwbtIAcPEfuSEnVF+RaT cg8WSU8/SEG0EAypqdxEJ+a6SCbwMD5GoiRMsztMdEgCm7ZEq+oxIYOwpNP34fV2A1XA O//O4ouUDF6VAi2qjBJhBpQX0daGF3h97Ueh01ottJghcFHAEA+wAUvfWNewv0ox2Ogs CF6fww6ELD/Cq8CqerXq2A02ZIjNPXsB5vjqtZRNlOpzwnmx3tVjaoptkvU6o8T1ama6 wEUsrtIGed/JpGCmTsdHGU+byWNDWQXWk4DPKXXkWAPcPgkWY9aDe34xojiMDm1Zs7fz qOPg== 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=tJLRr6QbnqdTTEgIJ98Np6XMLsOvBj9N2cxclNb6K2c=; b=GBv6uu/nX79f28em+Wnsr8ZvKbOKsNJa31qF6BLkgSPk0+IKdrrYrEAww/9ZMmgLc4 TriHcQCfytcsjGHFd9+saoNXh2VNguUo/PZewPpihvkOz8g2l++Sn1E94dYzfGPfoN7g UcSZbl1kCXkoIS6EmU5F3H64mjE5Sv2umcFn3v4p7it1oyBJhcZtnrBK1M3mLVdFRerW 9IN1EMsdVg+kcNfnKkLKCwemnitS8Y+ZZrCEXvYCrD6mSRFeQcr+nNMtO6a5XfyTc7cl crwy8BUVm5pxY01sozQiIHJS5X9w1PZ05JwSqb0KrCsO1HFds0DYEbZo1G9C+yaRKsYx kpQA== X-Gm-Message-State: AGRZ1gJKvEK2iyxKteprJms3GpkXdC9anGRPmesIh1DWF6ZlvZhs53VS kGFkd3Qw4DLJ9OeVaV+a8+I= X-Google-Smtp-Source: AJdET5dnhXI/QIdh0ybsXT0jiIiZ5BWiBsqK3ncYm/fpUg1bXDH7qvzpWUM6/pJJ7DWSATQK5Lt/4Q== X-Received: by 2002:a19:6e0b:: with SMTP id j11mr2457029lfc.124.1541459385891; Mon, 05 Nov 2018 15:09:45 -0800 (PST) Received: from z50.lan (93-181-165-181.internetia.net.pl. [93.181.165.181]) by smtp.gmail.com with ESMTPSA id k68-v6sm99387ljb.35.2018.11.05.15.09.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Nov 2018 15:09:44 -0800 (PST) From: Janusz Krzysztofik To: Tony Lindgren Subject: [PATCH] ARM: OMAP1: ams-delta: make board header file local to mach-omap1 Date: Tue, 6 Nov 2018 00:11:26 +0100 Message-Id: <20181105231126.12674-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-20181105_151000_336750_388FD23E X-CRM114-Status: GOOD ( 13.90 ) 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 Now as the board header file is no longer included by drivers, move it to the root directory of mach-omap1. Signed-off-by: Janusz Krzysztofik --- Changelog: v4: - rebased on top of v4.20-rc1 - resubmitted as a standalone patch, other patches of the series it depended on have been already applied v3: - rebased on top of v4.19-rc1 - submitted as PATCH v3 3/3 v2: - resent as PATCH v2 3/3 Initially submitted in series as PATCH 6/6 arch/arm/mach-omap1/ams-delta-fiq-handler.S | 2 +- arch/arm/mach-omap1/ams-delta-fiq.c | 3 +-- arch/arm/mach-omap1/board-ams-delta.c | 2 +- arch/arm/mach-omap1/{include/mach => }/board-ams-delta.h | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) rename arch/arm/mach-omap1/{include/mach => }/board-ams-delta.h (97%) diff --git a/arch/arm/mach-omap1/ams-delta-fiq-handler.S b/arch/arm/mach-omap1/ams-delta-fiq-handler.S index e3faa0274b56..7c9fb7fe0070 100644 --- a/arch/arm/mach-omap1/ams-delta-fiq-handler.S +++ b/arch/arm/mach-omap1/ams-delta-fiq-handler.S @@ -18,9 +18,9 @@ #include #include -#include #include "ams-delta-fiq.h" +#include "board-ams-delta.h" #include "iomap.h" #include "soc.h" diff --git a/arch/arm/mach-omap1/ams-delta-fiq.c b/arch/arm/mach-omap1/ams-delta-fiq.c index b0dc7ddf5877..14c3d3f5255e 100644 --- a/arch/arm/mach-omap1/ams-delta-fiq.c +++ b/arch/arm/mach-omap1/ams-delta-fiq.c @@ -22,11 +22,10 @@ #include #include -#include - #include #include "ams-delta-fiq.h" +#include "board-ams-delta.h" static struct fiq_handler fh = { .name = "ams-delta-fiq" diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c index 3d191fd52910..b8acc9912a58 100644 --- a/arch/arm/mach-omap1/board-ams-delta.c +++ b/arch/arm/mach-omap1/board-ams-delta.c @@ -36,7 +36,6 @@ #include #include -#include #include #include @@ -45,6 +44,7 @@ #include #include "ams-delta-fiq.h" +#include "board-ams-delta.h" #include "iomap.h" #include "common.h" diff --git a/arch/arm/mach-omap1/include/mach/board-ams-delta.h b/arch/arm/mach-omap1/board-ams-delta.h similarity index 97% rename from arch/arm/mach-omap1/include/mach/board-ams-delta.h rename to arch/arm/mach-omap1/board-ams-delta.h index 3b2d8019238a..a74a306d7e77 100644 --- a/arch/arm/mach-omap1/include/mach/board-ams-delta.h +++ b/arch/arm/mach-omap1/board-ams-delta.h @@ -1,5 +1,5 @@ /* - * arch/arm/plat-omap/include/mach/board-ams-delta.h + * arch/arm/mach-omap1/board-ams-delta.h * * Copyright (C) 2006 Jonathan McDowell *