From patchwork Mon Dec 11 05:06:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 10104247 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B09D4602D8 for ; Mon, 11 Dec 2017 05:35:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A22AB292AF for ; Mon, 11 Dec 2017 05:35:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9542A2932C; Mon, 11 Dec 2017 05:35:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 039AB292AF for ; Mon, 11 Dec 2017 05:35:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=hB8CJCnrhVWiFyiLRrVKQAOJxMBFE3VdlhcZg0Ba+I0=; b=d9crApOYZquw1ZrTG8Rbn1t1xU p3qM4uWekKAC+GTl3UYZME+VUeSwGXz8rhWMUkMtYjjrUCohVaULpRUkHckFWTAPegGTTcjfezueQ xUxF69NiPIkeeP++HwVD176riJF8cb9wp0adBrU7UOfRmQ64YtUM6uj4fMN9QJhQKI8f2y65sl9Xy qxoxOXVzT9Vf6GG/qE6r87VVXmz93zBZEWnUJQ3FIFFI46B3svD3NwoLbL5KJ5TKiNaJJn1H2QmGz oWRrlXvBe4jL7MN5dBGFeC6obyDJVsBxtkcJFjV1Sh1+rZQvJ33ZGY0fomW98VdjjhCAn6Ejrg+kU VIKNdLVw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eOGkS-0007jC-3U; Mon, 11 Dec 2017 05:35:28 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eOGjY-0005TD-K6 for linux-arm-kernel@bombadil.infradead.org; Mon, 11 Dec 2017 05:34:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=aRlU5Ks8NNMvyjzX5ok3fAh3aZjAOHXvIOO5buaccdU=; b=yIoxL8CqDLwovZ5g54Tr6kOAi OsvM2X0yHqfo1DZTEymWGBoinOIxTkpDMJGum8P3E6hCGQAKHm5XaAT0gmu1NAkBBq9nYgeEqs+zK Lo6gR0E8ipaKtYhSsRDbfy6VtYP9Uao0cE1PEs/30KH9k/m/StmVJS6ehBie8GcwPGnZ6KQSdb/Zk 9H0klCNbqbtjk4d3j9Z0iAU6Fveysq/BKsCBdnXYDYr3DU0+9lXG83segqYnsswFQIo03zI0CveNC tgo9enIAlnlKlQZ+hWMYo2gW4/lujpdg+Ew5nUkqhJ/VSrCYu9VJM77FC/unraq1Jr5srLSRcilGy SFQFdLHsg==; Received: from mail-pg0-x244.google.com ([2607:f8b0:400e:c05::244]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eOGKz-0006Fl-BF for linux-arm-kernel@lists.infradead.org; Mon, 11 Dec 2017 05:09:11 +0000 Received: by mail-pg0-x244.google.com with SMTP id y6so10149483pgp.4 for ; Sun, 10 Dec 2017 21:08:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=aRlU5Ks8NNMvyjzX5ok3fAh3aZjAOHXvIOO5buaccdU=; b=H/WXlyxh83rntZCLyWCURkhstxY3eTY08+gGG/Ngi7LwwEbh54AvAxGFy5SUpomQuW zo8ffK0tTnHLD19F74V/apa8YwCUjOXSCsHjFmLGyI1uW2fxbrh8TYJyuhLCqaU4Ge05 Qwbct3knaj9yO8O3nEPpHYgxKY5PRq1zowFwC2NZ8BQgSC6bFNgWEHIakDDNRu26rWHU s5Bg5AUSeZNYP4pBIIaytG1VL9bcnpEVD1TqmSUQ6AczZl4y7vm/ld0UDo41kW53KyWV NQxnGrxXzCVceLjFnP+DmKfWkpQ9IM/UW3uaXN0SeCNsq97h3RCg4W0IRVoPxL0r/mI3 mhOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=aRlU5Ks8NNMvyjzX5ok3fAh3aZjAOHXvIOO5buaccdU=; b=Uep33SE2oycCkovOkmI1hKrXmliksVcyKj4A0OBvMHaESTB1UoQH8EDXPArfkGs70n ZDw7MCFk72k+Fbrc/A2wrZFPuynCh84Ol+92jyVwaQ5hN22dtKrmLXdgcCnl/9qawL2e srJxhY17AFGggBlcVS9M3xqeb+uWoY9wswrAokCk8KTajUUUgoS0zmNrzdqFZ0zR8Lmh H/150+SpjRDDc3g52JcfjamH+aA48VUwWQezxsYMWzkFDEOPC8aPzF65SzhdXoW1oB85 I/Y6IlEluK4EEBKu2F4ygYGLxxpaZBCKuLygom3fNe8OXA5mYXPXQ18ov3fcD4RdXqU2 26Cg== X-Gm-Message-State: AKGB3mJyvWfccUuwkHVqFfWnH9ClQeThtCW7cWMZx1wMY9eNznERb2g+ v+iXlofULfL0lxBTG+hcUDM= X-Google-Smtp-Source: AGs4zMZAFMVYp1dEpLtcCPmSujWF9MdUMNEQmcUEp14s6aKUqlJHjy3PP5MfMYskFaOr74iqyqo5Sw== X-Received: by 10.98.211.73 with SMTP id q70mr6217996pfg.107.1512968923426; Sun, 10 Dec 2017 21:08:43 -0800 (PST) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id z5sm20182977pgb.6.2017.12.10.21.08.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 10 Dec 2017 21:08:42 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Mon, 11 Dec 2017 15:38:33 +1030 From: Joel Stanley To: Rob Herring , Mark Rutland , Arnd Bergmann , Andrew Jeffery , Patrick Venture , Xo Wang , Lei YU Subject: [PATCH 04/20] ARM: dts: aspeed: Add LPC and child devices Date: Mon, 11 Dec 2017 15:36:48 +1030 Message-Id: <20171211050704.20621-5-joel@jms.id.au> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171211050704.20621-1-joel@jms.id.au> References: <20171211050704.20621-1-joel@jms.id.au> X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-aspeed@lists.ozlabs.org, Benjamin Herrenschmidt , linux-kernel@vger.kernel.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , linux-arm-kernel@lists.infradead.org, Jeremy Kerr MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Andrew Jeffery Ensure the ordering is correct and add all of the children in the SoC device trees for the ast2400 and ast2500. Signed-off-by: Andrew Jeffery Signed-off-by: Joel Stanley --- arch/arm/boot/dts/aspeed-g4.dtsi | 35 +++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/aspeed-g5.dtsi | 27 +++++++++++++++++---------- 2 files changed, 52 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index 9ebf90f34709..b6d01523555a 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -226,6 +226,41 @@ status = "disabled"; }; + lpc: lpc@1e789000 { + compatible = "aspeed,ast2400-lpc", "simple-mfd"; + reg = <0x1e789000 0x1000>; + + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x1e789000 0x1000>; + + lpc_bmc: lpc-bmc@0 { + compatible = "aspeed,ast2400-lpc-bmc"; + reg = <0x0 0x80>; + }; + + lpc_host: lpc-host@80 { + compatible = "aspeed,ast2400-lpc-host", "simple-mfd", "syscon"; + reg = <0x80 0x1e0>; + reg-io-width = <4>; + + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x80 0x1e0>; + + lpc_ctrl: lpc-ctrl@0 { + compatible = "aspeed,ast2400-lpc-ctrl"; + reg = <0x0 0x80>; + status = "disabled"; + }; + + lhc: lhc@20 { + compatible = "aspeed,ast2500-lhc"; + reg = <0x20 0x24 0x48 0x8>; + }; + }; + }; + uart2: serial@1e78d000 { compatible = "ns16550a"; reg = <0x1e78d000 0x20>; diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index 1f9d28313f82..7861631940fe 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -266,6 +266,16 @@ status = "disabled"; }; + vuart: serial@1e787000 { + compatible = "aspeed,ast2500-vuart"; + reg = <0x1e787000 0x40>; + reg-shift = <2>; + interrupts = <10>; + clocks = <&clk_uart>; + no-loopback-test; + status = "disabled"; + }; + lpc: lpc@1e789000 { compatible = "aspeed,ast2500-lpc", "simple-mfd"; reg = <0x1e789000 0x1000>; @@ -289,6 +299,13 @@ reg-io-width = <4>; + lpc_ctrl: lpc-ctrl@0 { + compatible = "aspeed,ast2500-lpc-ctrl"; + reg = <0x0 0x80>; + status = "disabled"; + }; + + lhc: lhc@20 { compatible = "aspeed,ast2500-lhc"; reg = <0x20 0x24 0x48 0x8>; @@ -296,16 +313,6 @@ }; }; - vuart: serial@1e787000 { - compatible = "aspeed,ast2500-vuart"; - reg = <0x1e787000 0x40>; - reg-shift = <2>; - interrupts = <10>; - clocks = <&clk_uart>; - no-loopback-test; - status = "disabled"; - }; - uart2: serial@1e78d000 { compatible = "ns16550a"; reg = <0x1e78d000 0x20>;