From patchwork Fri Dec 20 02:52:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 3385611 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 E5C09C0D4A for ; Fri, 20 Dec 2013 02:54:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 277F7206AD for ; Fri, 20 Dec 2013 02:54:30 +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 280E3206AA for ; Fri, 20 Dec 2013 02:54:29 +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 1VtqDt-0001V6-7o; Fri, 20 Dec 2013 02:53:57 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VtqDm-00057N-5l; Fri, 20 Dec 2013 02:53:50 +0000 Received: from mail-pb0-f41.google.com ([209.85.160.41]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VtqDZ-00054n-EM for linux-arm-kernel@lists.infradead.org; Fri, 20 Dec 2013 02:53:37 +0000 Received: by mail-pb0-f41.google.com with SMTP id jt11so2000147pbb.28 for ; Thu, 19 Dec 2013 18:53:16 -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:in-reply-to :references; bh=etHp7LyYuvwgkKANdSZQ1myRgFzkqx/cU90J6SWgCP4=; b=eVyGsgkIsK4K4z7bfeS+V3PMTnoA/IXp+UxpdImuP99PJrhaAOhsKvWkGo69p8V9wM +Im0pF5IwI/1uQmfsdebg2AKT6hvr/ycGwznvrX+Uu/2BqCpGODN6jupZfnVFQj4fK5H GED0e5TUYvM9OravhovBz1s6cL81nGjXGtcKRbk9PLAyxnjmJCxTZQgnmMBVmu0GS1Ru zV47CShsssnFbj6BR+ejW+yXYp3lNPTa16sPao9nF/lI5AttDt8MMrqaXCiXnZRKiUJg yM5mKq7ofyrfmnnhIK2YI+pIIa2UP/8XtfhVROJZ3EK9hhXqJcc+w34b5batolu+6EWm yQ6w== X-Gm-Message-State: ALoCoQnogLwBfCqoVwGv54GJbSkZHGJwi2qg0OigetHRPkXT3ejBA89NFO+MAxL/qbW+htlmi0F3 X-Received: by 10.68.241.5 with SMTP id we5mr5678612pbc.34.1387507996038; Thu, 19 Dec 2013 18:53:16 -0800 (PST) Received: from localhost.localdomain ([140.206.182.114]) by mx.google.com with ESMTPSA id ic7sm10521866pbc.29.2013.12.19.18.53.12 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 19 Dec 2013 18:53:15 -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 2/3] ARM: hisi: remove init_time Date: Fri, 20 Dec 2013 10:52:57 +0800 Message-Id: <1387507978-4485-2-git-send-email-haojian.zhuang@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1387507978-4485-1-git-send-email-haojian.zhuang@gmail.com> References: <1387507978-4485-1-git-send-email-haojian.zhuang@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131219_215337_550342_35622D90 X-CRM114-Status: UNSURE ( 9.39 ) X-CRM114-Notice: Please train this message. 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 init_time in machine descriptor is already covered by arch/arm/kernel/time.c by default. We needn't to append it any more. Signed-off-by: Haojian Zhuang --- arch/arm/mach-hisi/hisilicon.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/arch/arm/mach-hisi/hisilicon.c b/arch/arm/mach-hisi/hisilicon.c index 685d9eb..741faf3 100644 --- a/arch/arm/mach-hisi/hisilicon.c +++ b/arch/arm/mach-hisi/hisilicon.c @@ -51,12 +51,6 @@ static void __init hi3620_map_io(void) iotable_init(hi3620_io_desc, ARRAY_SIZE(hi3620_io_desc)); } -static void __init hi3xxx_timer_init(void) -{ - of_clk_init(NULL); - clocksource_of_init(); -} - static void hi3xxx_restart(enum reboot_mode mode, const char *cmd) { struct device_node *np; @@ -90,7 +84,6 @@ static const char *hi3xxx_compat[] __initconst = { DT_MACHINE_START(HI3620, "Hisilicon Hi3620 (Flattened Device Tree)") .map_io = hi3620_map_io, - .init_time = hi3xxx_timer_init, .dt_compat = hi3xxx_compat, .smp = smp_ops(hi3xxx_smp_ops), .restart = hi3xxx_restart,