From patchwork Mon Jul 6 07:02:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 6719971 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7995DC05AC for ; Mon, 6 Jul 2015 06:59:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 93E1A206D6 for ; Mon, 6 Jul 2015 06:59:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3FFAA206BD for ; Mon, 6 Jul 2015 06:59:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751215AbbGFG7L (ORCPT ); Mon, 6 Jul 2015 02:59:11 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:36004 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750931AbbGFG7K (ORCPT ); Mon, 6 Jul 2015 02:59:10 -0400 Received: by pacgz10 with SMTP id gz10so16801819pac.3 for ; Sun, 05 Jul 2015 23:59:10 -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=MeIcQlUQakZMuuoMkarJxFeuJC3dN0sofaH5O9kwMvw=; b=qAOHIXLuukcETkndbuxxz2SflPbPoy3sAPtjm+H89WivKLt6SYl+7b3LXyVAgNdWkb 3z8Z12aD3HMZPwK7sLxNJw8+EY2izZ2hKgV23LjrGdw4anGrxDWQw0YEXaQawX8jYShq U2MzkCkbp/18Vnqk/5FqmTqf2ZEG5og6VDfa8iIlK7toY5kbgUtJKVW9cl6z4lmH7oW+ nTS8P7hLrd8QCFA3Xt8FimZxzGScsa0bj9oMcrn9PsyLKKvLaHihZrnMP/nDHYCIhqyo sEKyiZ2W0IWGLOCsFq1OvTk8Qrl3b6vffOZuXNjWUK0dyzbYegD9dKDLdNCN/z0AfMB3 OFxw== X-Received: by 10.68.190.41 with SMTP id gn9mr100245833pbc.113.1436165950230; Sun, 05 Jul 2015 23:59:10 -0700 (PDT) Received: from [127.0.0.1] (s214090.ppp.asahi-net.or.jp. [220.157.214.90]) by mx.google.com with ESMTPSA id e2sm16999771pdi.14.2015.07.05.23.59.06 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 05 Jul 2015 23:59:08 -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: Mon, 06 Jul 2015 16:02:16 +0900 Message-Id: <20150706070216.25453.35953.sendpatchset@little-apple> Subject: [PATCH] ARM: shmobile: r8a7779 Marzen legacy fix Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.5 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 exclude the TWD DT instance 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 --- Built on top of renesas-devel-20150629-v4.1 arch/arm/boot/dts/r8a7779.dtsi | 4 ++-- arch/arm/mach-shmobile/setup-r8a7779.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) -- 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/boot/dts/r8a7779.dtsi +++ work/arch/arm/boot/dts/r8a7779.dtsi 2015-07-06 15:42:28.182366518 +0900 @@ -62,7 +62,7 @@ reg = <0xf0001000 0x1000>, <0xf0000100 0x100>; }; - +#ifndef CONFIG_ARCH_SHMOBILE_LEGACY /* TWD defined in C code for legacy case */ timer@f0000600 { compatible = "arm,cortex-a9-twd-timer"; reg = <0xf0000600 0x20>; @@ -70,7 +70,7 @@ (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; clocks = <&cpg_clocks R8A7779_CLK_ZS>; }; - +#endif gpio0: gpio@ffc40000 { compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar"; reg = <0xffc40000 0x2c>; --- 0001/arch/arm/mach-shmobile/setup-r8a7779.c +++ work/arch/arm/mach-shmobile/setup-r8a7779.c 2015-07-06 15:43:58.472366518 +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));