From patchwork Mon Oct 26 06:01:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 7485461 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 2F0F2BEEA4 for ; Mon, 26 Oct 2015 06:02:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 36ACC206C0 for ; Mon, 26 Oct 2015 06:02:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 618B5206CC for ; Mon, 26 Oct 2015 06:02:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753064AbbJZGCO (ORCPT ); Mon, 26 Oct 2015 02:02:14 -0400 Received: from kirsty.vergenet.net ([202.4.237.240]:49142 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753002AbbJZGCN (ORCPT ); Mon, 26 Oct 2015 02:02:13 -0400 Received: from reginn.isobedori.kobe.vergenet.net (p2250-ipbfp1101kobeminato.hyogo.ocn.ne.jp [122.22.210.250]) by kirsty.vergenet.net (Postfix) with ESMTPA id A24D925BE05; Mon, 26 Oct 2015 17:02:03 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1445839323; bh=0ZXW9MyahWbnzf4CS7tQUV/p7VaBQzXSbEG6P0Bk3xs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lozQXlhw0P68sznSHUkgcaZ0QVqdRA839cJTZtsAJM91DCtDDjIvNR9iz2I1wKfkj 660Xjzqdeqazkfsbbkbz6GKXIQsz4ACesFKONAUKKNDvUai7DNnBlwQaf5Dw06MNdL wypoVkGkSV1rEDzAgeEhC07EeG4zUVZ81TZfg/eY= Received: by reginn.isobedori.kobe.vergenet.net (Postfix, from userid 7100) id 0A5D294054E; Mon, 26 Oct 2015 15:02:02 +0900 (JST) From: Simon Horman To: linux-sh@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Magnus Damm Subject: [PATCH v12 5/7] arm64: renesas: add Salvator-X board support on DTS Date: Mon, 26 Oct 2015 15:01:50 +0900 Message-Id: <1445839312-8874-6-git-send-email-horms+renesas@verge.net.au> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1445839312-8874-1-git-send-email-horms+renesas@verge.net.au> References: <1445839312-8874-1-git-send-email-horms+renesas@verge.net.au> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 From: Kuninori Morimoto Add initial board support for r8a7795 Salvator-X. At this point only DEBUG0 and DEBUG1 serial ports are supported. Signed-off-by: Kuninori Morimoto Signed-off-by: Gaku Inami Signed-off-by: Takeshi Kihara Signed-off-by: Geert Uytterhoeven Signed-off-by: Magnus Damm Signed-off-by: Simon Horman --- TODO: - Conclude discussion with Mark Rutland on: + Presence of ignore_loglevel in bootargs + Absence of rate in stdout-path Changes since v10: - None Changes since V9: (Magnus Damm ) - Added board specific EXTAL information by folding in: [PATCH][RFC] arm64: renesas: Add EXTAL configuration to Salvator-X Changes since V8: (Magnus Damm ) - None Changes since V7: (Magnus Damm ) - Added changelog Based on: [PATCH 15/25] arm64: renesas: add Salvator-X board support on DTS [PATCH 5/5] arm64: renesas: salvator-x: Update SCIF2 pin group [PATCH 5/6] arm64: renesas: salvator-x: Enable SCIF1 on serial1 --- Documentation/devicetree/bindings/arm/shmobile.txt | 2 + arch/arm64/boot/dts/renesas/Makefile | 2 + arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 62 ++++++++++++++++++++++ 3 files changed, 66 insertions(+) create mode 100644 arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts diff --git a/Documentation/devicetree/bindings/arm/shmobile.txt b/Documentation/devicetree/bindings/arm/shmobile.txt index 8d696a0d62b3..95d0aea4c701 100644 --- a/Documentation/devicetree/bindings/arm/shmobile.txt +++ b/Documentation/devicetree/bindings/arm/shmobile.txt @@ -59,6 +59,8 @@ Boards: compatible = "renesas,lager", "renesas,r8a7790" - Marzen compatible = "renesas,marzen", "renesas,r8a7779" + - Salvator-X + compatible = "renesas,salvator-x", "renesas,r8a7795"; Note: Reference Device Tree Implementations are temporary implementations to ease the migration from platform devices to Device Tree, and are diff --git a/arch/arm64/boot/dts/renesas/Makefile b/arch/arm64/boot/dts/renesas/Makefile index fec69f46d65b..9ce1890a650e 100644 --- a/arch/arm64/boot/dts/renesas/Makefile +++ b/arch/arm64/boot/dts/renesas/Makefile @@ -1,2 +1,4 @@ +dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-salvator-x.dtb + always := $(dtb-y) clean-files := *.dtb diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts new file mode 100644 index 000000000000..f522fda7843a --- /dev/null +++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts @@ -0,0 +1,62 @@ +/* + * Device Tree Source for the Salvator-X board + * + * Copyright (C) 2015 Renesas Electronics Corp. + * + * This file is licensed under the terms of the GNU General Public License + * version 2. This program is licensed "as is" without any warranty of any + * kind, whether express or implied. + */ + +/dts-v1/; +#include "r8a7795.dtsi" + +/ { + model = "Renesas Salvator-X board based on r8a7795"; + compatible = "renesas,salvator-x", "renesas,r8a7795"; + + aliases { + serial0 = &scif2; + serial1 = &scif1; + }; + + chosen { + bootargs = "ignore_loglevel"; + stdout-path = &scif2; + }; + + memory@48000000 { + device_type = "memory"; + /* first 128MB is reserved for secure area. */ + reg = <0x0 0x48000000 0x0 0x38000000>; + }; +}; + +&extal_clk { + clock-frequency = <16666666>; +}; + +&pfc { + scif1_pins: scif1 { + renesas,groups = "scif1_data_a", "scif1_ctrl"; + renesas,function = "scif1"; + }; + scif2_pins: scif2 { + renesas,groups = "scif2_data_a"; + renesas,function = "scif2"; + }; +}; + +&scif1 { + pinctrl-0 = <&scif1_pins>; + pinctrl-names = "default"; + + status = "okay"; +}; + +&scif2 { + pinctrl-0 = <&scif2_pins>; + pinctrl-names = "default"; + + status = "okay"; +};