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: 33231 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f199.google.com (mail-ig0-f199.google.com [209.85.213.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 747EE20969 for ; Tue, 8 Jul 2014 15:12:29 +0000 (UTC) Received: by mail-ig0-f199.google.com with SMTP id l13sf1189255iga.2 for ; Tue, 08 Jul 2014 08:12:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=srg6r/UBGdq95kkaOmN5DoTiFGL+00uPaFly03c53iY=; b=gbiA18tHHtfk7qWo58AppLhVDhjNsvssoxdNX9TCUqEw7exK+YxTOSWL0xUge9PblV aleifXJLxVFZs8qfzmLhbxFYZMwMt2j3ymZhHIfhVGeMM/Ow5HY2niNXSLTSme79jRVt 5CB5SIbg8mxVgmpX0hzZr+2/6s34MvOai0M0jV30imkCLXnGCTk4c4g6txrz43Spa55T Cei1WcFxPqHz+T5bFtQesiGV4NJ/iNHuG3x4H8Q50GsTRUEyJMf2Yn5miTxqOAj36OS0 octprJ6un8I8rTQqli769XJ7uhhZrm9RetNYUZiWX8+8JpuadfPReBiyBLb7nFpmc21U 8mbA== X-Gm-Message-State: ALoCoQlD25Br/N/HrJ3fvDAY7wOnSEpEykOIyvYjzDIjN/nmWWDwIMoe+P3RzV+sxRpO2WSeDbpY X-Received: by 10.182.213.37 with SMTP id np5mr18067799obc.36.1404832348970; Tue, 08 Jul 2014 08:12:28 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.94.163 with SMTP id g32ls2097771qge.17.gmail; Tue, 08 Jul 2014 08:12:28 -0700 (PDT) X-Received: by 10.52.17.129 with SMTP id o1mr28928754vdd.0.1404832348845; Tue, 08 Jul 2014 08:12:28 -0700 (PDT) Received: from mail-ve0-f171.google.com (mail-ve0-f171.google.com [209.85.128.171]) by mx.google.com with ESMTPS id xx2si4513131vdc.54.2014.07.08.08.12.28 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 08 Jul 2014 08:12:28 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.171 as permitted sender) client-ip=209.85.128.171; Received: by mail-ve0-f171.google.com with SMTP id db12so1154265veb.2 for ; Tue, 08 Jul 2014 08:12:28 -0700 (PDT) X-Received: by 10.220.15.8 with SMTP id i8mr915856vca.45.1404832348758; Tue, 08 Jul 2014 08:12:28 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp778526vcb; Tue, 8 Jul 2014 08:12:28 -0700 (PDT) X-Received: by 10.68.174.33 with SMTP id bp1mr36093810pbc.74.1404832347864; Tue, 08 Jul 2014 08:12:27 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id cl2si6169495pdb.280.2014.07.08.08.12.27; Tue, 08 Jul 2014 08:12:27 -0700 (PDT) Received-SPF: none (google.com: linux-arm-msm-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753980AbaGHPM0 (ORCPT + 3 others); 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-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: list List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.171 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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