From patchwork Fri Dec 20 02:52:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 3385591 Return-Path: X-Original-To: patchwork-linux-arm@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 DF581C0D4B for ; Fri, 20 Dec 2013 02:53:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 09643206AA for ; Fri, 20 Dec 2013 02:53:50 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D075C206AD for ; Fri, 20 Dec 2013 02:53:48 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VtqDe-0001Ph-FV; Fri, 20 Dec 2013 02:53:42 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VtqDc-00056g-Gx; Fri, 20 Dec 2013 02:53:40 +0000 Received: from mail-pb0-f47.google.com ([209.85.160.47]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VtqDY-00054d-Qu for linux-arm-kernel@lists.infradead.org; Fri, 20 Dec 2013 02:53:37 +0000 Received: by mail-pb0-f47.google.com with SMTP id um1so1986775pbc.34 for ; Thu, 19 Dec 2013 18:53:12 -0800 (PST) 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; bh=VH5JAFj4RSICVHcRzRXvC7rtGxvtbtpa8HIKye1RuPM=; b=RUBZ0pUkBu1FUyoyiORPoOIsnrqfblTlTRZpzZC8OEd5bvYBADbfXb87tSzxpOtbie DPgJfSMuFNIPXWdRZt7X/OljuEBTqPqgfgcF+mRitbM80i4Bjnzlou9Xv91Fib8en2Kt kFww/QtbCMhN1d9N9o26UN9m27KDEu4sDzT00e9oGfzL3ADybXbBSPXuDrSIaf0A7DCE qBF6oMluKV68+/8JtF/BhOvLViOsFg+/t7b0lEy/tZnPhzLm3bu8s3bBCs9uiJFxKCTM p2nV3lusgJIMl0IBQCHTNG5ENuWZzIjdYz430OEPY5Y5gBYkmJGWbn7VT7pKg09w6TWS k+6g== X-Gm-Message-State: ALoCoQmn0cbusBVkQgSBxtRFPhlH1FVw+pXhxJu6mp7kE22cP3PDhoSbhoeS/C+bv7Is3hlV4wAg X-Received: by 10.66.8.66 with SMTP id p2mr5498601paa.129.1387507992355; Thu, 19 Dec 2013 18:53:12 -0800 (PST) Received: from localhost.localdomain ([140.206.182.114]) by mx.google.com with ESMTPSA id ic7sm10521866pbc.29.2013.12.19.18.53.08 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 19 Dec 2013 18:53:11 -0800 (PST) From: Haojian Zhuang To: olof@lixom.net, xuwei5@hisilicon.com, khilman@linaro.org, arnd@arndb.de, linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/3] ARM: hisi: rename hi3xxx to hisi Date: Fri, 20 Dec 2013 10:52:56 +0800 Message-Id: <1387507978-4485-1-git-send-email-haojian.zhuang@gmail.com> X-Mailer: git-send-email 1.8.3.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131219_215336_941127_5599C791 X-CRM114-Status: GOOD ( 10.72 ) X-Spam-Score: -2.6 (--) Cc: Haojian Zhuang X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Since some new Hisilicon SoCs are not named as hi3xxx, rename mach-hi3xxx to mach-hisi instead. And the pronounciation of "hisi" is similar to the chinese pronounciation of Hisilicon. So Hisilicon guys like this name. ARCH_HI3xxx will be renamed later since other drivers are using it and they are still in linux-next git tree. So rename ARCH_HI3xxx later. Signed-off-by: Haojian Zhuang --- arch/arm/Kconfig | 4 ++-- arch/arm/Makefile | 2 +- arch/arm/{mach-hi3xxx => mach-hisi}/Kconfig | 0 arch/arm/{mach-hi3xxx => mach-hisi}/Makefile | 4 ++-- arch/arm/{mach-hi3xxx => mach-hisi}/core.h | 0 arch/arm/{mach-hi3xxx/hi3xxx.c => mach-hisi/hisilicon.c} | 2 +- arch/arm/{mach-hi3xxx => mach-hisi}/hotplug.c | 0 arch/arm/{mach-hi3xxx => mach-hisi}/platsmp.c | 0 8 files changed, 6 insertions(+), 6 deletions(-) rename arch/arm/{mach-hi3xxx => mach-hisi}/Kconfig (100%) rename arch/arm/{mach-hi3xxx => mach-hisi}/Makefile (51%) rename arch/arm/{mach-hi3xxx => mach-hisi}/core.h (100%) rename arch/arm/{mach-hi3xxx/hi3xxx.c => mach-hisi/hisilicon.c} (96%) rename arch/arm/{mach-hi3xxx => mach-hisi}/hotplug.c (100%) rename arch/arm/{mach-hi3xxx => mach-hisi}/platsmp.c (100%) diff --git a/arch/arm/mach-hi3xxx/hotplug.c b/arch/arm/mach-hisi/hotplug.c similarity index 100% rename from arch/arm/mach-hi3xxx/hotplug.c rename to arch/arm/mach-hisi/hotplug.c diff --git a/arch/arm/mach-hi3xxx/platsmp.c b/arch/arm/mach-hisi/platsmp.c similarity index 100% rename from arch/arm/mach-hi3xxx/platsmp.c rename to arch/arm/mach-hisi/platsmp.c diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index a95e067..db8ddd1 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -928,10 +928,10 @@ source "arch/arm/mach-footbridge/Kconfig" source "arch/arm/mach-gemini/Kconfig" -source "arch/arm/mach-hi3xxx/Kconfig" - source "arch/arm/mach-highbank/Kconfig" +source "arch/arm/mach-hisi/Kconfig" + source "arch/arm/mach-integrator/Kconfig" source "arch/arm/mach-iop32x/Kconfig" diff --git a/arch/arm/Makefile b/arch/arm/Makefile index dfe2bc4..69a6613 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -156,8 +156,8 @@ machine-$(CONFIG_ARCH_EBSA110) += ebsa110 machine-$(CONFIG_ARCH_EP93XX) += ep93xx machine-$(CONFIG_ARCH_EXYNOS) += exynos machine-$(CONFIG_ARCH_GEMINI) += gemini -machine-$(CONFIG_ARCH_HI3xxx) += hi3xxx machine-$(CONFIG_ARCH_HIGHBANK) += highbank +machine-$(CONFIG_ARCH_HI3xxx) += hisi machine-$(CONFIG_ARCH_INTEGRATOR) += integrator machine-$(CONFIG_ARCH_IOP13XX) += iop13xx machine-$(CONFIG_ARCH_IOP32X) += iop32x diff --git a/arch/arm/mach-hi3xxx/Kconfig b/arch/arm/mach-hisi/Kconfig similarity index 100% rename from arch/arm/mach-hi3xxx/Kconfig rename to arch/arm/mach-hisi/Kconfig diff --git a/arch/arm/mach-hi3xxx/Makefile b/arch/arm/mach-hisi/Makefile similarity index 51% rename from arch/arm/mach-hi3xxx/Makefile rename to arch/arm/mach-hisi/Makefile index c9919e8..6870058 100644 --- a/arch/arm/mach-hi3xxx/Makefile +++ b/arch/arm/mach-hisi/Makefile @@ -1,7 +1,7 @@ # -# Makefile for Hisilicon Hi36xx/Hi37xx processors line +# Makefile for Hisilicon processors family # -obj-y += hi3xxx.o +obj-y += hisilicon.o obj-$(CONFIG_SMP) += platsmp.o obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o diff --git a/arch/arm/mach-hi3xxx/core.h b/arch/arm/mach-hisi/core.h similarity index 100% rename from arch/arm/mach-hi3xxx/core.h rename to arch/arm/mach-hisi/core.h diff --git a/arch/arm/mach-hi3xxx/hi3xxx.c b/arch/arm/mach-hisi/hisilicon.c similarity index 96% rename from arch/arm/mach-hi3xxx/hi3xxx.c rename to arch/arm/mach-hisi/hisilicon.c index 661a912..685d9eb 100644 --- a/arch/arm/mach-hi3xxx/hi3xxx.c +++ b/arch/arm/mach-hisi/hisilicon.c @@ -1,5 +1,5 @@ /* - * (Hisilicon's Hi36xx/Hi37xx SoC based) flattened device tree enabled machine + * (Hisilicon's SoC based) flattened device tree enabled machine * * Copyright (c) 2012-2013 Hisilicon Ltd. * Copyright (c) 2012-2013 Linaro Ltd.