From patchwork Tue Jun 14 02:59:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 69958 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp1835869qgf; Mon, 13 Jun 2016 19:59:58 -0700 (PDT) X-Received: by 10.36.39.199 with SMTP id g190mr21694948ita.53.1465873198532; Mon, 13 Jun 2016 19:59:58 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ai12si17776993pac.139.2016.06.13.19.59.58; Mon, 13 Jun 2016 19:59:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423457AbcFNC74 (ORCPT + 30 others); Mon, 13 Jun 2016 22:59:56 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:51494 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933076AbcFNC7x (ORCPT ); Mon, 13 Jun 2016 22:59:53 -0400 Received: from beagle.diag.org (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id u5E2wU0x026058; Tue, 14 Jun 2016 11:58:32 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com u5E2wU0x026058 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1465873113; bh=3fulHxOxhPksFrce2QxDuO4UGpHvs0gvIVSGF+ZPhro=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qiGNez7oPKzTnnMAd0QPVfFGGJWMZBRJ90R40Z18hdDbHOnJlB0R9HWi2usRFVLmY Qp5qmpZGUqkKEP4kCBIZag8p3iiKkTTQcAp6qH+urZwAgPm2Z85Gic0UeGQXSARqP8 VDNGiqXK9jHh9o/gj+IkIudv3D2fN21ntcQd0e0NHZQCg3w1GLvWBa2CnqfTLn/2cE S7mnNh3bUu1Qm17iJ4LH1YXrRZvihmEktvFawp/3zqXU+B4Va0ch72OlZg9C3Do2GU Fl+XXb8eHY39yzXx5emKASVZj99vQBPjXn5/Z2YZck9iKnq6tJ+1VDT1OI9LUDUYmu 4+47j3dsxKtHw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: arm@kernel.org Cc: Masahiro Yamada , linux-arm-kernel@lists.infradead.org, Russell King , linux-kernel@vger.kernel.org Subject: [PATCH 2/3] ARM: dts: uniphier: add SoC-Glue node to UniPhier 32bit SoCs Date: Tue, 14 Jun 2016 11:59:45 +0900 Message-Id: <1465873186-30658-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1465873186-30658-1-git-send-email-yamada.masahiro@socionext.com> References: <1465873186-30658-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This node consists of various system-level configuration registers. Signed-off-by: Masahiro Yamada --- arch/arm/boot/dts/uniphier-common32.dtsi | 10 +++++++--- arch/arm/boot/dts/uniphier-ph1-ld4.dtsi | 2 +- arch/arm/boot/dts/uniphier-ph1-ld6b.dtsi | 2 +- arch/arm/boot/dts/uniphier-ph1-pro4.dtsi | 2 +- arch/arm/boot/dts/uniphier-ph1-pro5.dtsi | 2 +- arch/arm/boot/dts/uniphier-ph1-sld8.dtsi | 2 +- arch/arm/boot/dts/uniphier-proxstream2.dtsi | 2 +- 7 files changed, 13 insertions(+), 9 deletions(-) -- 1.9.1 diff --git a/arch/arm/boot/dts/uniphier-common32.dtsi b/arch/arm/boot/dts/uniphier-common32.dtsi index 891327f..03f60ec 100644 --- a/arch/arm/boot/dts/uniphier-common32.dtsi +++ b/arch/arm/boot/dts/uniphier-common32.dtsi @@ -136,9 +136,13 @@ interrupt-controller; }; - pinctrl: pinctrl@5f801000 { - /* specify compatible in each SoC DTSI */ - reg = <0x5f801000 0xe00>; + soc-glue@5f800000 { + compatible = "simple-mfd", "syscon"; + reg = <0x5f800000 0x2000>; + + pinctrl: pinctrl { + /* specify compatible in each SoC DTSI */ + }; }; }; }; diff --git a/arch/arm/boot/dts/uniphier-ph1-ld4.dtsi b/arch/arm/boot/dts/uniphier-ph1-ld4.dtsi index dadd860..debad7f 100644 --- a/arch/arm/boot/dts/uniphier-ph1-ld4.dtsi +++ b/arch/arm/boot/dts/uniphier-ph1-ld4.dtsi @@ -182,5 +182,5 @@ }; &pinctrl { - compatible = "socionext,ph1-ld4-pinctrl", "syscon"; + compatible = "socionext,uniphier-ld4-pinctrl"; }; diff --git a/arch/arm/boot/dts/uniphier-ph1-ld6b.dtsi b/arch/arm/boot/dts/uniphier-ph1-ld6b.dtsi index 5321152..19c107c 100644 --- a/arch/arm/boot/dts/uniphier-ph1-ld6b.dtsi +++ b/arch/arm/boot/dts/uniphier-ph1-ld6b.dtsi @@ -63,5 +63,5 @@ * which makes the pinctrl driver unshareable. */ &pinctrl { - compatible = "socionext,ph1-ld6b-pinctrl", "syscon"; + compatible = "socionext,uniphier-ld6b-pinctrl"; }; diff --git a/arch/arm/boot/dts/uniphier-ph1-pro4.dtsi b/arch/arm/boot/dts/uniphier-ph1-pro4.dtsi index 20f3f2a..7b9da08 100644 --- a/arch/arm/boot/dts/uniphier-ph1-pro4.dtsi +++ b/arch/arm/boot/dts/uniphier-ph1-pro4.dtsi @@ -200,5 +200,5 @@ }; &pinctrl { - compatible = "socionext,ph1-pro4-pinctrl", "syscon"; + compatible = "socionext,uniphier-pro4-pinctrl"; }; diff --git a/arch/arm/boot/dts/uniphier-ph1-pro5.dtsi b/arch/arm/boot/dts/uniphier-ph1-pro5.dtsi index 24f6f66..7e4aa2f 100644 --- a/arch/arm/boot/dts/uniphier-ph1-pro5.dtsi +++ b/arch/arm/boot/dts/uniphier-ph1-pro5.dtsi @@ -194,5 +194,5 @@ }; &pinctrl { - compatible = "socionext,ph1-pro5-pinctrl", "syscon"; + compatible = "socionext,uniphier-pro5-pinctrl"; }; diff --git a/arch/arm/boot/dts/uniphier-ph1-sld8.dtsi b/arch/arm/boot/dts/uniphier-ph1-sld8.dtsi index 6bfd29a..467f9d8 100644 --- a/arch/arm/boot/dts/uniphier-ph1-sld8.dtsi +++ b/arch/arm/boot/dts/uniphier-ph1-sld8.dtsi @@ -181,5 +181,5 @@ }; &pinctrl { - compatible = "socionext,ph1-sld8-pinctrl", "syscon"; + compatible = "socionext,uniphier-sld8-pinctrl"; }; diff --git a/arch/arm/boot/dts/uniphier-proxstream2.dtsi b/arch/arm/boot/dts/uniphier-proxstream2.dtsi index 4ac484c..d00d6f5 100644 --- a/arch/arm/boot/dts/uniphier-proxstream2.dtsi +++ b/arch/arm/boot/dts/uniphier-proxstream2.dtsi @@ -205,5 +205,5 @@ }; &pinctrl { - compatible = "socionext,proxstream2-pinctrl", "syscon"; + compatible = "socionext,uniphier-pxs2-pinctrl"; };