From patchwork Thu Feb 4 13:59:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Lobakin X-Patchwork-Id: 12067421 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 84608C433DB for ; Thu, 4 Feb 2021 14:15:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4B1CB64F51 for ; Thu, 4 Feb 2021 14:15:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236381AbhBDOPB (ORCPT ); Thu, 4 Feb 2021 09:15:01 -0500 Received: from mail-40136.protonmail.ch ([185.70.40.136]:17018 "EHLO mail-40136.protonmail.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236558AbhBDOA1 (ORCPT ); Thu, 4 Feb 2021 09:00:27 -0500 Date: Thu, 04 Feb 2021 13:59:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail; t=1612447179; bh=rmmBjANsrPQKuDrbBEFPqO9DZ+qrmSLUVcFP//W9JMY=; h=Date:To:From:Cc:Reply-To:Subject:From; b=mm4htUZOTZY1dDsuJF1AVE430nlfigwx7F231kg4S+Hg6lHSY1F5qiZWEoGiPvTit JXvjOW5G4pscwjHm579c3AGSBDnzGbCFuh2HOsAjcue3g3IcNEgmB7tFrfO2asqH4w SXTEp3dp4+jyr/0Yax/7MlLHnDr2dTun1UbYvLRgJX8X10yS1c+yn2ZbheZ+bdgcKJ ohoBqgUCFZlW6Zhc2nQSsav/jgXiguAvQ/qRz8ufEDk66knTaNF1jN779Cb+XwQeT5 9cvE5+LAanB9sqWoqN76zPSmtg9V3SMG9utUqhmSp3L5kLZ8CrNCKKfR52bYxw4gq7 SNuiLH9yN2OBA== To: Thomas Bogendoerfer From: Alexander Lobakin Cc: James Hartley , bibo mao , Alexander Lobakin , linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org Reply-To: Alexander Lobakin Subject: [PATCH mips-next] MIPS: pistachio: remove obsolete include/asm/mach-pistachio Message-ID: <20210204135902.10361-1-alobakin@pm.me> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org Since commit 02bd530f888c ("MIPS: generic: Increase NR_IRQS to 256") include/asm/mach-pistachio/irq.h just does nothing. Remove the file along with mach-pistachio folder and include compiler directive. Signed-off-by: Alexander Lobakin --- MAINTAINERS | 1 - arch/mips/include/asm/mach-pistachio/irq.h | 15 --------------- arch/mips/pistachio/Platform | 2 -- 3 files changed, 18 deletions(-) delete mode 100644 arch/mips/include/asm/mach-pistachio/irq.h diff --git a/MAINTAINERS b/MAINTAINERS index 6add29cb2060..3e58787907d4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14099,7 +14099,6 @@ L: linux-mips@vger.kernel.org S: Odd Fixes F: arch/mips/boot/dts/img/pistachio* F: arch/mips/configs/pistachio*_defconfig -F: arch/mips/include/asm/mach-pistachio/ F: arch/mips/pistachio/ PKTCDVD DRIVER diff --git a/arch/mips/include/asm/mach-pistachio/irq.h b/arch/mips/include/asm/mach-pistachio/irq.h deleted file mode 100644 index 74ac016503ad..000000000000 --- a/arch/mips/include/asm/mach-pistachio/irq.h +++ /dev/null @@ -1,15 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * Pistachio IRQ setup - * - * Copyright (C) 2014 Google, Inc. - */ - -#ifndef __ASM_MACH_PISTACHIO_IRQ_H -#define __ASM_MACH_PISTACHIO_IRQ_H - -#define NR_IRQS 256 - -#include - -#endif /* __ASM_MACH_PISTACHIO_IRQ_H */ diff --git a/arch/mips/pistachio/Platform b/arch/mips/pistachio/Platform index f73a1a929965..c59de86dbddf 100644 --- a/arch/mips/pistachio/Platform +++ b/arch/mips/pistachio/Platform @@ -1,8 +1,6 @@ # # IMG Pistachio SoC # -cflags-$(CONFIG_MACH_PISTACHIO) += \ - -I$(srctree)/arch/mips/include/asm/mach-pistachio load-$(CONFIG_MACH_PISTACHIO) += 0xffffffff80400000 zload-$(CONFIG_MACH_PISTACHIO) += 0xffffffff81000000 all-$(CONFIG_MACH_PISTACHIO) := uImage.gz