From patchwork Tue Jul 8 15:11:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 4505801 Return-Path: X-Original-To: patchwork-linux-arm-msm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E5421BEEAA for ; Tue, 8 Jul 2014 15:12:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0821F201EF for ; Tue, 8 Jul 2014 15:12:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1C7D1202E5 for ; Tue, 8 Jul 2014 15:12:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753980AbaGHPM0 (ORCPT ); Tue, 8 Jul 2014 11:12:26 -0400 Received: from mail-wg0-f48.google.com ([74.125.82.48]:51082 "EHLO mail-wg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753716AbaGHPMZ (ORCPT ); Tue, 8 Jul 2014 11:12:25 -0400 Received: by mail-wg0-f48.google.com with SMTP id x12so1194448wgg.7 for ; Tue, 08 Jul 2014 08:12:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4TuIXDalstsvfgCZ7P91wfcduc9cnTG0F95d1P7+fsU=; b=lwxxiiD/nXAxiCF02ENZonP8fu6vz+Vr5ssVrMEldc183XGKOQxTDSlW+BsSUMstLc SZ71GVgRoU80uyqOaR93tHQoYItkTh4suKj1sBbeLADNoC/Ehczm/1ck5S7BeLHIv9Bu Cx3r7SHo190jmhqtwr2z5L8EIDt1LpYwzw1GZd1OSlfj5rOTR7rgcHIZ6vOqBmwC6VUK tUhG0t1xka7lFhCKsiPZWGAsdfVOpD4+mBs5tKivqbzCayqs/Dy+OoB+W+C+88YvN1aR 0e6Wuc3oK5tVnxRGF6nroLNpcBbC3Lj7ml8lmtaQ1nHei0ORWADV/FTFUHdMnsCCv7C3 p0JQ== X-Gm-Message-State: ALoCoQmUQbCXRWQjsMsvSuEvwiVqgLOwelRta5Pk4YRoHlzoQ+PdbE3dbsd2zhHCz3wkx5v9yyh+ X-Received: by 10.180.72.43 with SMTP id a11mr4666188wiv.21.1404832344569; Tue, 08 Jul 2014 08:12:24 -0700 (PDT) Received: from localhost.localdomain (LPuteaux-656-01-48-212.w82-127.abo.wanadoo.fr. [82.127.83.212]) by mx.google.com with ESMTPSA id ft2sm8102647wib.1.2014.07.08.08.12.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Jul 2014 08:12:23 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, Daniel Walker Cc: David Brown , Bryan Huntsman , Linus Walleij Subject: [PATCH 1/3] ARM: msm: delete dangling mahimahi board file Date: Tue, 8 Jul 2014 17:11:41 +0200 Message-Id: <1404832303-14850-2-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1404832303-14850-1-git-send-email-linus.walleij@linaro.org> References: <1404832303-14850-1-git-send-email-linus.walleij@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Spam-Status: No, score=-7.6 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 This board file is not compiled, and includes header files that do not even exist so it can't be made to compile easily either. I assume it is a merge mistake, thus deleting it. Signed-off-by: Linus Walleij --- arch/arm/mach-msm/board-mahimahi.c | 83 -------------------------------------- 1 file changed, 83 deletions(-) delete mode 100644 arch/arm/mach-msm/board-mahimahi.c diff --git a/arch/arm/mach-msm/board-mahimahi.c b/arch/arm/mach-msm/board-mahimahi.c deleted file mode 100644 index 873c3ca3cd7e..000000000000 --- a/arch/arm/mach-msm/board-mahimahi.c +++ /dev/null @@ -1,83 +0,0 @@ -/* linux/arch/arm/mach-msm/board-mahimahi.c - * - * Copyright (C) 2009 Google, Inc. - * Copyright (C) 2009 HTC Corporation. - * Author: Dima Zavin - * - * This software is licensed under the terms of the GNU General Public - * License version 2, as published by the Free Software Foundation, and - * may be copied, distributed, and modified under those terms. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#include - -#include "board-mahimahi.h" -#include "devices.h" -#include "proc_comm.h" -#include "common.h" - -static uint debug_uart; - -module_param_named(debug_uart, debug_uart, uint, 0); - -static struct platform_device *devices[] __initdata = { -#if !defined(CONFIG_MSM_SERIAL_DEBUGGER) - &msm_device_uart1, -#endif - &msm_device_uart_dm1, - &msm_device_nand, -}; - -static void __init mahimahi_init(void) -{ - platform_add_devices(devices, ARRAY_SIZE(devices)); -} - -static void __init mahimahi_fixup(struct tag *tags, char **cmdline) -{ - memblock_add(PHYS_OFFSET, 219*SZ_1M); - memblock_add(MSM_HIGHMEM_BASE, MSM_HIGHMEM_SIZE); -} - -static void __init mahimahi_map_io(void) -{ - msm_map_common_io(); - msm_clock_init(); -} - -static void __init mahimahi_init_late(void) -{ - smd_debugfs_init(); -} - -void msm_timer_init(void); - -MACHINE_START(MAHIMAHI, "mahimahi") - .atag_offset = 0x100, - .fixup = mahimahi_fixup, - .map_io = mahimahi_map_io, - .init_irq = msm_init_irq, - .init_machine = mahimahi_init, - .init_late = mahimahi_init_late, - .init_time = msm_timer_init, -MACHINE_END