From patchwork Tue Jul 14 07:25:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 6784041 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2BB1A9F38C for ; Tue, 14 Jul 2015 07:22:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4B9ED205B4 for ; Tue, 14 Jul 2015 07:22:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5B7F6205B3 for ; Tue, 14 Jul 2015 07:22:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752135AbbGNHWI (ORCPT ); Tue, 14 Jul 2015 03:22:08 -0400 Received: from mail-pd0-f171.google.com ([209.85.192.171]:35092 "EHLO mail-pd0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752112AbbGNHWH (ORCPT ); Tue, 14 Jul 2015 03:22:07 -0400 Received: by pdrg1 with SMTP id g1so1112831pdr.2 for ; Tue, 14 Jul 2015 00:22:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:subject; bh=UvQuYIZazQFUUGhaG5OK5wWDdNYDFkjZpQdOfjL64lQ=; b=gm6Q8EfQg2d5PDJt9lfGGWnUCP49iQ2dkngVihBTR4N3yGJTwftD6A5xPuOKEyFs2I G51wX3YBwX47a5C+02rlxkS7pBo/dbm8I7vNO6YC1ZVIa6MAmsQEFFUBv7i1c9kOFlfP MTKmFjtKOsy/lEkAuy+4JziNjttMmNnHnggmrMyJWe2eKMygAHUVBfUvEsEHelUYhO1w dqhD8rQ8oEJxPCyt8oCoaMR6vzKSSjL9D0ZoCyY1sAxc7wp7x+/tzJ++Kh3sqEfyLdFd qx3sIBwXE72OxbVjfSsmBnnZ3NxYTJxJCtcD120RKZC9dn1XUCd5nGQFEef0N1RwTGAM rHyA== X-Received: by 10.70.63.1 with SMTP id c1mr77126481pds.88.1436858527001; Tue, 14 Jul 2015 00:22:07 -0700 (PDT) Received: from [127.0.0.1] (s214090.ppp.asahi-net.or.jp. [220.157.214.90]) by smtp.gmail.com with ESMTPSA id wa17sm180242pac.48.2015.07.14.00.22.03 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Jul 2015 00:22:05 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: Magnus Damm , horms@verge.net.au, laurent.pinchart+renesas@ideasonboard.com, geert+renesas@glider.be Date: Tue, 14 Jul 2015 16:25:22 +0900 Message-Id: <20150714072522.2854.69938.sendpatchset@little-apple> Subject: [PATCH v2] ARM: shmobile: r8a7779 Marzen legacy fix V2 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 From: Magnus Damm Unbreak the r8a7779 Marzen legacy code provided by marzen_defconfig. As it is today Marzen multiplatform is working, but the legacy code is broken. This patch intends to leave multiplatform as-is but do a simple one-shot fix to unbreak the legacy code base. Without this patch there is no preset delay and the TWD is defined both in C code and in DT. Solve the delay by invoking shmobile_init_delay() and simply disable TWD in case of building for legacy. Marzen legacy code will be removed in the near future, but until then we may as well avoid breaking it. Signed-off-by: Magnus Damm Tested-by: Simon Horman --- Developed and tested on top of renesas-devel-20150706-v4.2-rc1 arch/arm/Kconfig | 1 - arch/arm/mach-shmobile/setup-r8a7779.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 0001/arch/arm/Kconfig +++ work/arch/arm/Kconfig 2015-07-14 16:00:38.902366518 +0900 @@ -626,7 +626,6 @@ config ARCH_SHMOBILE_LEGACY select CPU_V7 select GENERIC_CLOCKEVENTS select HAVE_ARM_SCU if SMP - select HAVE_ARM_TWD if SMP select HAVE_SMP select MIGHT_HAVE_CACHE_L2X0 select MULTI_IRQ_HANDLER --- 0003/arch/arm/mach-shmobile/setup-r8a7779.c +++ work/arch/arm/mach-shmobile/setup-r8a7779.c 2015-07-13 15:18:50.000000000 +0900 @@ -677,6 +677,8 @@ void __init r8a7779_add_standard_devices void __init r8a7779_add_early_devices(void) { + shmobile_init_delay(); + early_platform_add_devices(r8a7779_early_devices, ARRAY_SIZE(r8a7779_early_devices));