From patchwork Wed Dec 20 03:23:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 10124875 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 1E318603B5 for ; Wed, 20 Dec 2017 03:26:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0955E296C6 for ; Wed, 20 Dec 2017 03:26:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F1D45296C9; Wed, 20 Dec 2017 03:26:13 +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=ham 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 9798E296C6 for ; Wed, 20 Dec 2017 03:26:13 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=HC5YkHNwDLUPQ0akjFbCYaqGstB9GaNWBORsfh2Qy4I=; b=We5Ee1RZPM4ew7 4xIwZnyXu8VGyi2N8Jg5fldr/gK81u0i/44zAWPjK+uwxFj8RH25TMfaAv+t0QBNK6Jnz1h4WXDgz FrtWzUViQyZOXr0KJSVD2lNgGS18xMCw/NxDY+5RO6VbrRad/bgMI0/tSyCWzc0OgcuKuUWd/TTFZ fS0FCyMaCZU7khOtREXPBP4DxTm+3HJ/HMxnutBnk/kAGxKqv0Pnp18BS1tey6Q0KNuqqC+ncfZCk e/7w+8TtBMHYpJrbAUifWeDRGizlfO5tSunDKxtrMtLHnfG7TWl/8e+MjbhGbbfVdEPGChttzol93 FmcdibiggsIPFihPaUhw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eRV1F-0004FN-Uc; Wed, 20 Dec 2017 03:26:09 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eRUzh-0002xv-9t for linux-arm-kernel@bombadil.infradead.org; Wed, 20 Dec 2017 03:24:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To: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=Uc41YSmCbf9e/JHG4oPWkJ4qmL2lsMQJg7WfyPdtuTk=; b=JFLJ4YibwL9/ajHqRLLi29bMTd j7++LXZV7N9et+YXPpuMd2j0rEDg8+/p54VxaLN1CRg7VyF4rVoR7UoqkWZEWmVBqx++JPJT6drpx A/AbkpuWf4pfx3WM/zvB05L8Ij5csvExP9mcFAWMo1IAnafy9TNRR/w07CZ8TbU2meSgvb7x2vDRZ +y9vJ2rXBhmSzQHBD63r6GP5uxMUHOx8fqnmx/xCJWGvtx1KP5kCK3lVhFipg0j/ORCvqgS4Xvq0C ck3wV0zg6cULQZRarCIOhkPSXwd6D/q9i9yludKv0Dy5ekfPYEyeK7/MkOF9p9Hd4S99dT/IB8/n4 Dh+lQ0uw==; Received: from mail-pl0-x244.google.com ([2607:f8b0:400e:c01::244]) by merlin.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eRUze-0004Rj-Fr for linux-arm-kernel@lists.infradead.org; Wed, 20 Dec 2017 03:24:31 +0000 Received: by mail-pl0-x244.google.com with SMTP id bd8so8249145plb.9 for ; Tue, 19 Dec 2017 19:24:19 -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 :mime-version:content-transfer-encoding; bh=Uc41YSmCbf9e/JHG4oPWkJ4qmL2lsMQJg7WfyPdtuTk=; b=oRanezNK5m4DuLDENcc7rND1xgy23jf+c4OBRJG/Ha8GkCUTgpvAsog8Cj0f5ECACN rdTK50X2+UeT/99hBkb2EmstGUXRRaMKQNV/1UIdE89qb5/05rHlN71ILSq2fv0396Mv +Nj1fFxugDwVZ9EclXv9NyFMD1Yc+bN4SpKfLU7m1UB8U8mdl+l8QJS3AOgT6knX+gcv PDfrP3NOg2Yxw3PyTtUQCvhGcUq+qnqgpoOITM6qTgSfu5rfRx5WUrVNjmK6WDVlaBuF gQ5rF7GFuCH0cb0wOb1VOY0+oa0kcLam8Q1IWzbbdXZCoRbkYAJ3kukLgoHU5xYQ8TIh Llhg== 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:mime-version:content-transfer-encoding; bh=Uc41YSmCbf9e/JHG4oPWkJ4qmL2lsMQJg7WfyPdtuTk=; b=PS4ruqJYUjSq9U40c2KimiiVY5lIyXI1xmVzDa6kL0gw4nY0xgTKPXMzO6/l6uRpfL Hg7xwilGZpNbwRh6KlseSg63SXUupegLni0MeC18fEjVdYqGCa/0fc3JO6auRWGUV7sn st1XF3p3wOlfRlo8hV9fJZHChbt/bW/+KAbd3dVlXxRrWB/YgNdYsl+mrxbCGJpz8bqw RDBLXAtIJcUdnziNzxBtYmtKPmt5UTFDuno/tPk/PTsPO+kwG5bnWoRNWH8en04eXDOb t7fHLkJexG39xWxRpk7inWxwOHK2WJmJZWVyu1EiD8DeI/Q1PYBMPkBNkojGzEUxY9ZW 6Pjg== X-Gm-Message-State: AKGB3mJKKB7Fet5bnsKt4HGb67yxzXXIJRLdjTQy1m92C3yIkZWLovQI 4AL9+5uKok5f/ElCjI03vog= X-Google-Smtp-Source: ACJfBov8fpA7iALYOdhpgV1X7WOVtF45rWX7wcfjVXlsYWV61hlqTeTiF+XHfZaQfhaoraHyw9Ffqg== X-Received: by 10.84.128.45 with SMTP id 42mr5482357pla.44.1513740257858; Tue, 19 Dec 2017 19:24:17 -0800 (PST) Received: from aurora.jms.id.au ([45.124.203.15]) by smtp.gmail.com with ESMTPSA id k2sm28577205pff.150.2017.12.19.19.24.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Dec 2017 19:24:16 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Wed, 20 Dec 2017 13:54:07 +1030 From: Joel Stanley To: Rob Herring , Mark Rutland , Arnd Bergmann , Andrew Jeffery , Patrick Venture , Xo Wang , Lei YU Subject: [PATCH v3 03/20] ARM: dts: aspeed: Add LPC and child devices Date: Wed, 20 Dec 2017 13:53:11 +1030 Message-Id: <20171220032328.30584-4-joel@jms.id.au> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171220032328.30584-1-joel@jms.id.au> References: <20171220032328.30584-1-joel@jms.id.au> MIME-Version: 1.0 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 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 Reviewed-by: Cédric Le Goater Signed-off-by: Joel Stanley --- v3: - Fix ast2400 compatible string --- 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 45d815a86d42..9422f9cb1e11 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -225,6 +225,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,ast2400-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 5c4ecdba3a6b..069f13df19d1 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -265,6 +265,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>; @@ -288,6 +298,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>; @@ -295,16 +312,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>;