From patchwork Thu Mar 7 14:01:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 10842951 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6905D1575 for ; Thu, 7 Mar 2019 14:02:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 544202F0A9 for ; Thu, 7 Mar 2019 14:02:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 529B42F0DD; Thu, 7 Mar 2019 14:02:10 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 DB6BF2F0F4 for ; Thu, 7 Mar 2019 14:02:09 +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=GR1dEZRKolzjKeJyzlXCOttiuSxpn6GsGvFrkvNd73g=; b=TorMTc88d/QIuB W21vTnyG+PXn/9Kx/Dp9v50mejkjTpQOa4NsQN2JKomP8ohOMbNZt8zWcyrPbag9+tO56WbjoiP7T Rno4o/XIp6ozkNFE1lH7Mcp8cmNH/tyXOKh+k+0h6gPI2UJHnJHO0a7oIC2u/6RM2DY0PiGZ++QI3 mDJ/BG+467PlCpntaJ4nj0UNxpbA9mJW8PcJoorUBrLTtrQWWyWaKHVm0RaAoht+yqCAelki3nUoB xl7Wt5I/dRA+L8DfeIEF/A4nidBseytcBv7JDHC2Sm5s1erAlVIlTrwmjSKME98C/4kMpwd42iswW LmqV5J/l3JI1kF7WjJ6w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h1tb5-0004xO-LE; Thu, 07 Mar 2019 14:02:07 +0000 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h1tas-0004iU-6y for linux-arm-kernel@lists.infradead.org; Thu, 07 Mar 2019 14:01:56 +0000 Received: by mail-wm1-x343.google.com with SMTP id f65so9364849wma.2 for ; Thu, 07 Mar 2019 06:01:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=g3rdNZIUpTTqTQJmw0LRepuQplSBP1o3fYoThoCVA3M=; b=rxa6bD5c6GFjEdLxNCwqYuY9O4NG6H+mN7M+a2w8/tGIlq5TKqeCH8mXuEdLXZImdl Nhl7W13NZliJ53EJ6PSn4qZASZln+GrOGBRfGaS0ZaCV3TQ44meqNQRkOMF4iSi8dr83 UYST3ydvZjCQTXo3JcqimBDvV/2MvQWtH7Ykoq7de9WM+/x5F/Q6Q6vnbMD4Px1CFOV5 aTfmmstRM6UmZOFdI57YC1+7EflZBaPhJWHBqxoq342ceo1hY0BoDf4Sjff2W7ZeuaI+ cvTnsTNA+bYaf5vJYA8itX23+o41/a0hA4yTTG/uZV/uFm6ly2Z2Qd48Pe3l1ivKJdTv W+jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=g3rdNZIUpTTqTQJmw0LRepuQplSBP1o3fYoThoCVA3M=; b=B94YDShjxCA2qHcprUJrvl73o6bm3rnBgthH5JR8vEUfaUB3ChKoPQz7/PtDzSq3nC Bqdgelx1zllWwytPJFrUf8IX2tHOcje+r6fbKut4ChJQH1YbHeuLBFW9prJxlz/pTvfR jrKfEFyxTKmAQkBdD0+eDLJOok8TAMklkPBjm20N/k5FLTlSApsnvWpRxaFX1246URKI BZ2c6A37/zT9B2eSjkFTUCz6SE/W+nQNp4ensxh8TqoyqVxA0nSWcboORd6OQ/gNCf1w 0c8eH4X0OnObOEPBujZWb002hiIsooyOrzSoR1M+xLoCziTON8U40iunU+2qFgONCBKK 3GtA== X-Gm-Message-State: APjAAAU2WT0mGydFeXqBXrUgnJ22LHzNmCpwxgk9lazrNgeCaUwAXfU2 0rCmk+0lpCzfvlZbtbqVHlRvOg== X-Google-Smtp-Source: APXvYqwRpHCIfpy2qJgoYVP7dQg+PL/MgGagjqmeJAQOcGP7JdgMqTH2B0dMt/lRHi+DoI90rHPykA== X-Received: by 2002:a1c:f707:: with SMTP id v7mr5848642wmh.109.1551967312309; Thu, 07 Mar 2019 06:01:52 -0800 (PST) Received: from bender.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.gmail.com with ESMTPSA id h137sm9892098wmg.41.2019.03.07.06.01.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Mar 2019 06:01:51 -0800 (PST) From: Neil Armstrong To: khilman@baylibre.com Subject: [PATCH v2 1/3] soc: amlogic: gx-socinfo: Add mask for each SoC packages Date: Thu, 7 Mar 2019 15:01:45 +0100 Message-Id: <20190307140147.22047-2-narmstrong@baylibre.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190307140147.22047-1-narmstrong@baylibre.com> References: <20190307140147.22047-1-narmstrong@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190307_060154_259670_70403280 X-CRM114-Status: GOOD ( 16.31 ) 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: linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Neil Armstrong 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 When updated IDs on f842c41adc04 ("amlogic: meson-gx-socinfo: Update soc ids") we introduced packages ids using the full 8bit value, but in the function socinfo_to_package_id() the id was filtered with the 0xf0 mask. While the 0xf0 mask is valid for most board, it filters out the lower 4 bits which encodes some characteristics of the chip. This patch moves the mask into the meson_gx_package_id table to be applied on each package name independently and add the correct mask for some specific entries. An example is the S905, in the vendor code the S905 is package_id different from 0x20, and S905M is exactly 0x20. Another example are the The Wetek Hub & Play2 boards using a S905-H variant, which is the S905 SoC with some licence bits enabled. These licence bits are encoded in the lower 4bits, so to detect the -H variant, we must detect the id == 0x3 with the 0xf mask. Fixes: f842c41adc04 ("amlogic: meson-gx-socinfo: Update soc ids") Signed-off-by: Neil Armstrong --- drivers/soc/amlogic/meson-gx-socinfo.c | 32 ++++++++++++++------------ 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/drivers/soc/amlogic/meson-gx-socinfo.c b/drivers/soc/amlogic/meson-gx-socinfo.c index 37ea0a1c24c8..1ae339f5eadb 100644 --- a/drivers/soc/amlogic/meson-gx-socinfo.c +++ b/drivers/soc/amlogic/meson-gx-socinfo.c @@ -43,20 +43,21 @@ static const struct meson_gx_package_id { const char *name; unsigned int major_id; unsigned int pack_id; + unsigned int pack_mask; } soc_packages[] = { - { "S905", 0x1f, 0 }, - { "S905H", 0x1f, 0x13 }, - { "S905M", 0x1f, 0x20 }, - { "S905D", 0x21, 0 }, - { "S905X", 0x21, 0x80 }, - { "S905W", 0x21, 0xa0 }, - { "S905L", 0x21, 0xc0 }, - { "S905M2", 0x21, 0xe0 }, - { "S912", 0x22, 0 }, - { "962X", 0x24, 0x10 }, - { "962E", 0x24, 0x20 }, - { "A113X", 0x25, 0x37 }, - { "A113D", 0x25, 0x22 }, + { "S905", 0x1f, 0, 0x20 }, /* pack_id != 0x20 */ + { "S905H", 0x1f, 0x3, 0xf }, /* pack_id & 0xf == 0x3 */ + { "S905M", 0x1f, 0x20, 0xf0 }, /* pack_id == 0x20 */ + { "S905D", 0x21, 0, 0xf0 }, + { "S905X", 0x21, 0x80, 0xf0 }, + { "S905W", 0x21, 0xa0, 0xf0 }, + { "S905L", 0x21, 0xc0, 0xf0 }, + { "S905M2", 0x21, 0xe0, 0xf0 }, + { "S912", 0x22, 0, 0x0 }, /* Only S912 is known for GXM */ + { "962X", 0x24, 0x10, 0xf0 }, + { "962E", 0x24, 0x20, 0xf0 }, + { "A113X", 0x25, 0x37, 0xff }, + { "A113D", 0x25, 0x22, 0xff }, }; static inline unsigned int socinfo_to_major(u32 socinfo) @@ -81,13 +82,14 @@ static inline unsigned int socinfo_to_misc(u32 socinfo) static const char *socinfo_to_package_id(u32 socinfo) { - unsigned int pack = socinfo_to_pack(socinfo) & 0xf0; + unsigned int pack = socinfo_to_pack(socinfo); unsigned int major = socinfo_to_major(socinfo); int i; for (i = 0 ; i < ARRAY_SIZE(soc_packages) ; ++i) { if (soc_packages[i].major_id == major && - soc_packages[i].pack_id == pack) + soc_packages[i].pack_id == + (pack & soc_packages[i].pack_mask)) return soc_packages[i].name; } From patchwork Thu Mar 7 14:01:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 10842965 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6CACB922 for ; Thu, 7 Mar 2019 14:11:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 582022F156 for ; Thu, 7 Mar 2019 14:11:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 539BD2F1B1; Thu, 7 Mar 2019 14:11:48 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 D22B52F180 for ; Thu, 7 Mar 2019 14:11:47 +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=83FtBKnRUBXHppbd0bvfn6B3ChXRM1XTxHuMa9Efn/w=; b=DXRNLQVnnq7z8b 8hSm0dKXRSQpn/DQtY2/ygeXKxi0976uIc/QXIEvC7EgCAOt67y2ZBxpQriB3IZPSLQ3AqCK0m8OU tUW+khlrwvu7b76tTP2H6rDTArN07aCxTYVAh8ZghYebIJHkJ6ESyH9fKH35pAG1hbtq7BroMKYZ7 INhnG1PCNNwLI6D5I/FmCZXRxbpID2bA9SQ/wfMBeljsOChiQjGXwM3+qKg+/mynSbu0HF475O0Xp +HCVZVKGNCbDAklqR8KGRnxPoQdtPYvDbQ1fkQv1P3kbOT/8tF1XROz3Dq7AbW5x+ZYwcwqHAcjAB YAl9KEayEVVizDLdPwfA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h1tkR-0000Yo-3L; Thu, 07 Mar 2019 14:11:47 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h1tas-0004iz-IR for linux-arm-kernel@lists.infradead.org; Thu, 07 Mar 2019 14:02:00 +0000 Received: by mail-wr1-x441.google.com with SMTP id w17so17546176wrn.12 for ; Thu, 07 Mar 2019 06:01:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bF9AZzlBu8fUtOoQqmikOZMaNtULZj7Mnfny5E9VbB4=; b=UxkAYps1T8dKVh4A5qYQ9F+WrOtMCzWwldBcVXUB4df7LukXZBcj8i1w4RbdYsJN1+ rCNjoSCtg1WPyMA86vIuAKu0oUC7rOM2iDfIcov7EH98jFGMDfQ0nh8GClyfYpeL1tOd 2t4Pszo0rQIzRkgnJiec9GTwnXhNqRP1s9J2yuO6emOGWmBfslgBIFjkJeTc5zFB33y1 JYwLS2UH3LkTd8o+oZHPAui8Cy7HfUOXMJMc0jSX1AxvSrDh8aJH1h/YokX4sWJjEE69 R3rqYP6QuWHbjHcbK6NnRkqmH7EY5Au0KmSl9vJzJx0rSCO5wWEFY5+mKHhmFiMGBZ0j E+0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bF9AZzlBu8fUtOoQqmikOZMaNtULZj7Mnfny5E9VbB4=; b=CYLc5F0RS9OT6aQYKVsgVlfkBy5xPQU1J3BOrWQ9rD9wMj9sFd331NVhFpMVAxnoxj Ca9Les5vv8hIsllq8cNsatc2aKQxJTQylaK1Vk64u2pD0ud2DhUZeAL6yqpZFD+izn84 no3RxxgysIGAqI0g+weUwvVEFNnG5rFyeo9DHE2P7lNjm4XSnnwt7k4U1HuObNbktfc9 HT67rw1NFTnH5XY8N6KsnQn0NAijOK4k4gIyEkpcOjCu3LQhNQidQROlvjnvdXPHegJq qMXH6NtQ2z3rlzcaatpywYJ1l1OKxKT0cUA3IHmS4MI+MlJOT8tIRj07+gHUEii6SDGs ygtw== X-Gm-Message-State: APjAAAUcCqJHQ8ygsoU5HvKHkfANQvfo5Q/rxEJa/vTZb20xtIq/Gl/H lISOiDCX6HdYkxwh+uClWMT35A== X-Google-Smtp-Source: APXvYqwhG1xRFbVRSgMiSCarrZZx2xIhmA4EvlY/SwsSDDj0FlXOpI+HLNZNwCrRhTyBAbQtHIUbFw== X-Received: by 2002:a5d:668e:: with SMTP id l14mr6931120wru.198.1551967313024; Thu, 07 Mar 2019 06:01:53 -0800 (PST) Received: from bender.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.gmail.com with ESMTPSA id h137sm9892098wmg.41.2019.03.07.06.01.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Mar 2019 06:01:52 -0800 (PST) From: Neil Armstrong To: khilman@baylibre.com Subject: [PATCH v2 2/3] soc: amlogic: gx-socinfo: Add new SoC IDs and Packages IDs Date: Thu, 7 Mar 2019 15:01:46 +0100 Message-Id: <20190307140147.22047-3-narmstrong@baylibre.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190307140147.22047-1-narmstrong@baylibre.com> References: <20190307140147.22047-1-narmstrong@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190307_060154_604829_7B15A9D7 X-CRM114-Status: GOOD ( 10.89 ) 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: linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Neil Armstrong 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 This adds the: - G12A SoC ID and S905X2, S905D2 package IDs, found booting the X96 Max and U200 Reference Board - G12B SoC ID and S922X package ID, found booting the Odroid-N2 - S805X, S805Y package IDs found in the vendor U-Boot source Signed-off-by: Neil Armstrong --- drivers/soc/amlogic/meson-gx-socinfo.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/soc/amlogic/meson-gx-socinfo.c b/drivers/soc/amlogic/meson-gx-socinfo.c index 1ae339f5eadb..c8d138d85f34 100644 --- a/drivers/soc/amlogic/meson-gx-socinfo.c +++ b/drivers/soc/amlogic/meson-gx-socinfo.c @@ -37,6 +37,8 @@ static const struct meson_gx_soc_id { { "AXG", 0x25 }, { "GXLX", 0x26 }, { "TXHD", 0x27 }, + { "G12A", 0x28 }, + { "G12B", 0x29 }, }; static const struct meson_gx_package_id { @@ -53,11 +55,16 @@ static const struct meson_gx_package_id { { "S905W", 0x21, 0xa0, 0xf0 }, { "S905L", 0x21, 0xc0, 0xf0 }, { "S905M2", 0x21, 0xe0, 0xf0 }, + { "S805X", 0x21, 0x30, 0xf0 }, + { "S805Y", 0x21, 0xb0, 0xf0 }, { "S912", 0x22, 0, 0x0 }, /* Only S912 is known for GXM */ { "962X", 0x24, 0x10, 0xf0 }, { "962E", 0x24, 0x20, 0xf0 }, { "A113X", 0x25, 0x37, 0xff }, { "A113D", 0x25, 0x22, 0xff }, + { "S905D2", 0x28, 0x10, 0xf0 }, + { "S905X2", 0x28, 0x40, 0xf0 }, + { "S922X", 0x29, 0x40, 0xf0 }, }; static inline unsigned int socinfo_to_major(u32 socinfo) From patchwork Thu Mar 7 14:01:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 10842955 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9CE61922 for ; Thu, 7 Mar 2019 14:02:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 879542F0C1 for ; Thu, 7 Mar 2019 14:02:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 790682F0E3; Thu, 7 Mar 2019 14:02:28 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 0E3AB2F0E3 for ; Thu, 7 Mar 2019 14:02:27 +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=2GHBqmYq1zyD0/B3zFY5EOga+LTvlGSkuix4b1u9bRM=; b=PvLMX+Q7aD1dgT 1svGHoQ/dG5W4/GCgEM3Mfybd0COeIqq/Vs5YhFZs0uFoUaMrvaVJA95Ymz7uyDpTC1mBhKWuf7pI 0t+WlzkoRm32amMd10hKes7nHtPuz80gV2hRUg5jA6tZ50dD7SG1Mgp8MV5fuFEnC4ZvTvYmxQGFl c3KLKH3X5E+whdLSDTDRZ7UPGluHAYo3aZJLqTThJR4Y4Bu+N2hMKekpVnoE8wWYkFkHGMBI8hknW H7RAjvmUVDRBXF7jzaCa6ofVUKuncF5xpeUev+6XLx2C0C5fuy2xuxvWIJqgRyuCoO4YTz7AylaPG cBfT3S1gJ0BXfDKgY0KQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h1tbM-0005OY-Jr; Thu, 07 Mar 2019 14:02:24 +0000 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h1tat-0004jc-IK for linux-arm-kernel@lists.infradead.org; Thu, 07 Mar 2019 14:01:58 +0000 Received: by mail-wm1-x341.google.com with SMTP id y15so9391056wma.0 for ; Thu, 07 Mar 2019 06:01:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=l1TMWMcZ2gju9aWPi4sVcpM5P0Y4XnnG91Swh/yLEoM=; b=TnjgW8RibsO5fE6FaPH/e1Q5cPheNQETFNEUQRgcrmVzxEHAXXNxUWdutFr3lOlg25 nO1/k5C9wMKvgqPcgenMK2XzM+uTlcbw79wPjNi2vkNB6Zzvfil2vRNFKkOyxhy9QWqT K5zIzZ9r/WrLBGEPIZgr1TG+q+VvQF1CbnEaOpuvxcpSIPrqPVkoipY5hKQbLUXF5H7W OHg9eFK0aDZuOJJErP6tZOH8YYS39ZSZW/PYKQ6IiW2wF06c0tvGi5Mr7vXBMLcO8494 h1rOe0zW095znRsASSJWgVLe+qpUbzRqPUksg+zT6JVK8oAkCEmItmOKgONUUylgbQPE ZlyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=l1TMWMcZ2gju9aWPi4sVcpM5P0Y4XnnG91Swh/yLEoM=; b=QdB7rMFbC5a08XBTZMuxNhlv641Tsnb+oFJkfvxBzosKTq2fy9nvp43pRytOvgOgOZ nZ91ig429KtlCdRjMtxiufhuPFqXSyLvt2616LNy2v89bmLYNA3EaA0dUixvuaz2pPXZ c9tkoiZotd9ak9DtV5Uv4PGzFMkOWrbdR58lIM1vo80+2Z3gxy0wPa8UTCH/ZMBxPZx+ TRtSQF5R50/wFa3jhPzQE9sLiNDJrcSdT4Ai/NiiSGC/QeR56R4xuQE4MYWYOwwoBuVD 5PUpSGZAsoo7DIBmhSHIZhTfq8hseuq8tAbF/YrUEQ0HrCLYK+vVImoYkiXRdmjmOQnj vDoA== X-Gm-Message-State: APjAAAXbLtAMImV7c1DPza/146TQvc6OLtQs1vJKy5qdiQKpH19rDVyB h2cQzgbNmoVeEb6XXAXzlp4/7yG2pW6FpA== X-Google-Smtp-Source: APXvYqx/9WiONgfX7WxSX0zmZGGa6JptIQyZwOtRi/y+0BqYrz58K0KS478PyRtq6KUlq4uM/Dj6kA== X-Received: by 2002:a1c:e715:: with SMTP id e21mr5775206wmh.122.1551967313763; Thu, 07 Mar 2019 06:01:53 -0800 (PST) Received: from bender.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.gmail.com with ESMTPSA id h137sm9892098wmg.41.2019.03.07.06.01.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Mar 2019 06:01:53 -0800 (PST) From: Neil Armstrong To: khilman@baylibre.com Subject: [PATCH v2 3/3] arm64: dts: meson-g12a: Add AO Secure node Date: Thu, 7 Mar 2019 15:01:47 +0100 Message-Id: <20190307140147.22047-4-narmstrong@baylibre.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190307140147.22047-1-narmstrong@baylibre.com> References: <20190307140147.22047-1-narmstrong@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190307_060155_648302_54BDF443 X-CRM114-Status: GOOD ( 12.20 ) 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: linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Neil Armstrong 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 This adds the Always-On ao-secure system control registers node, which is used by the meson-gx-socinfo driver to detect the SoC IDs. Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi index 191d31db9853..30aa618dce49 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi @@ -122,6 +122,12 @@ #size-cells = <2>; ranges = <0x0 0x0 0x0 0xff800000 0x0 0x100000>; + sec_AO: ao-secure@140 { + compatible = "amlogic,meson-gx-ao-secure", "syscon"; + reg = <0x0 0x140 0x0 0x140>; + amlogic,has-chip-id; + }; + uart_AO: serial@3000 { compatible = "amlogic,meson-gx-uart", "amlogic,meson-ao-uart";