From patchwork Fri Feb 8 14:42:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 10803217 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 25198746 for ; Fri, 8 Feb 2019 14:42:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 152502DADD for ; Fri, 8 Feb 2019 14:42:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 07C5E2E636; Fri, 8 Feb 2019 14:42:35 +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 59A032DADD for ; Fri, 8 Feb 2019 14:42:34 +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: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:In-Reply-To:References: List-Owner; bh=YopO2vduMKcvI6ctOGqcJKf/+YL2v9BOZnrkgDRO3G4=; b=VaBNdkudZK0LF+ iaTudN7yvL6Czgudqj76wsxMg7wQujk0RssbwXbpu1tdTWMcVC/QVX4GJ32g45LXFExfTQoozR3e5 V9bq8Qk7AgytdHhnioLO7PXu+TqmRzAPJ3AsaqTxGF2xBwE+PDrbZnYE4YDfuiWBy+1mybMwUScYo hHLCdTZA8wTYyZaGckIox3o9aHdUCoBSerUnkTV46sUkG75i+UvzjFz5weWXQSa/Fp96lfk3mCOR9 oqAU9ulmBo4KBS3C0xKVDiahQaPznpmt8zYIbbOxf5Ng/v/3oD7lYpE3Gc8Q3G9BoL4Vu+6UIsyD0 dONQm0LOyWdJodQzyjqw==; 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 1gs7MO-0005Rx-BR; Fri, 08 Feb 2019 14:42:32 +0000 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gs7ML-0005QX-1U for linux-arm-kernel@lists.infradead.org; Fri, 08 Feb 2019 14:42:30 +0000 Received: by mail-pf1-x442.google.com with SMTP id i12so1754047pfo.7 for ; Fri, 08 Feb 2019 06:42:28 -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:mime-version :content-transfer-encoding; bh=DztFhUbqBiBoiZBM0psbBi9/K4S0FwqEup8z3SPQ1iM=; b=qQxtFI3/Dlox1aoePvHCBqsxKDKy7lA5nNT/xbpSTgJ0I2Jg2aZwh7hkBpUuwvYp/f ARyq1LaQPmhrU+JIWAAZmuLh2ovqwdhS2swxeoieTxR7az3HDMWWszy746Bjv57KGzE7 na0Ldjq/LHHRy28Q4GyZP9HP97vZSIRPsz9C/GrRQbXTczRRYhY4XZnDwYQV0QaL4zq6 JCjZnl/4A0Pjge8ffIJtHKLFo0KPTH+xB6Pds1TXQX/sBY9cBM1Y0f2ixeJmm5YI1mgT cLn1VRqiG10s0FiRNXW8QU4PC6STjxH3MZhciw21Q5F0OxXMhIKwohTRLHIA6DrDnPbw dy5Q== 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:mime-version :content-transfer-encoding; bh=DztFhUbqBiBoiZBM0psbBi9/K4S0FwqEup8z3SPQ1iM=; b=p5GD/hzbL/2/4sSWSdW8pB6XmuXG+8TSLT37HgiJr45JBvo85a6YkDrIVhcbifax4e yzXrdzLA3RtAOqlfRCq5O8ZqDh1/MgI2G3Hx3RxEerX2ONO+aXhoOUGwoc3PFJXlzt07 8DfV6QlWae9J/3IgSD4iqQ8rhcLw0HHcElblZK9E5IWmldzysvG25E7sAydHW1hccjMb II7DbUrKSOPrc+r6es5EkVWKP6bc28cwFNkP71abLojojUZIoD3n/T0aXzNjbmuEUSgT PrKLK2uW95/wq1PK7Rq9p0x8ZdtZ01lwnZQ5RtzWJE3e94M3DiCC4HTyGfjDOVZeEuwv MaiQ== X-Gm-Message-State: AHQUAuYagNl+kPFiyyxECJfAPIH9l1w+o0etqO13iiaII9/A7eHk192y XJdkGjjJV2LLLCv1HFu86F9scQ== X-Google-Smtp-Source: AHgI3IZccgBJ2lYamzT34UGYuVamn2T+EakenUEa8BfOLpLMyj9sGEzVoDgN0DsRMQCvI5uI+iZ7yQ== X-Received: by 2002:aa7:8759:: with SMTP id g25mr13568517pfo.248.1549636947453; Fri, 08 Feb 2019 06:42:27 -0800 (PST) Received: from localhost ([2601:602:9200:a1a5:da9d:67ff:fec6:ee6b]) by smtp.gmail.com with ESMTPSA id n15sm2220478pgu.9.2019.02.08.06.42.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Feb 2019 06:42:26 -0800 (PST) From: Kevin Hilman To: linux-amlogic@lists.infradead.org Subject: [PATCH v3 1/2] dt-bindings: arm: amlogic: add amediatech x96-max bindings Date: Fri, 8 Feb 2019 06:42:25 -0800 Message-Id: <20190208144226.15102-1-khilman@baylibre.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190208_064229_225412_28532612 X-CRM114-Status: GOOD ( 10.03 ) 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: Martin Blumenstingl , linux-arm-kernel@lists.infradead.org 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 Add new vendor for amediatech, and initial board: x96-max Signed-off-by: Kevin Hilman Reviewed-by: Martin Blumenstingl --- v3: fixed the SoC name Documentation/devicetree/bindings/arm/amlogic.txt | 1 + Documentation/devicetree/bindings/vendor-prefixes.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/amlogic.txt b/Documentation/devicetree/bindings/arm/amlogic.txt index 8dbc259081e4..7f40cb5f490b 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.txt +++ b/Documentation/devicetree/bindings/arm/amlogic.txt @@ -109,6 +109,7 @@ Board compatible values (alphabetically, grouped by SoC): - "amlogic,s400" (Meson axg a113d) - "amlogic,u200" (Meson g12a s905d2) + - "amediatech,x96-max" (Meson g12a s905x2) Amlogic Meson Firmware registers Interface ------------------------------------------ diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index 389508584f48..4615d4b9d11e 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -24,6 +24,7 @@ amarula Amarula Solutions amazon Amazon.com, Inc. amcc Applied Micro Circuits Corporation (APM, formally AMCC) amd Advanced Micro Devices (AMD), Inc. +amediatech Shenzhen Amediatech Technology Co., Ltd amlogic Amlogic, Inc. ampire Ampire Co., Ltd. ams AMS AG From patchwork Fri Feb 8 14:42:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 10803221 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 A210313A4 for ; Fri, 8 Feb 2019 14:42:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9050E2E5CA for ; Fri, 8 Feb 2019 14:42:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 848CD2E659; Fri, 8 Feb 2019 14:42:46 +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 24A722E5CA for ; Fri, 8 Feb 2019 14:42:46 +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=qWEMVwgK1CU/nGf8JjioejuaXiQjryHiTa5WeJs9Qt8=; b=ILFK6ceejNznmZ 2R1NzIQO89OVGh1Gixg5/ZuJH3IBDzIubWP9cqX2Wq6KOLgLGyHyU4K3ZgflCVTQ4FFaj7vaooKmT Zu07BSOTONjdDmDdDUQ48VV+sKvmw4Fucj7eibLPRDeaHThV0P0RNt6d9VEL6KIX4GRyGa04nV/v3 IrUJX2YSmK6tj1iA9dDPxRezTyibYI/L4Fkn0SOR/ztqDsUn4nt5nXMqSkdFCfiXZYKeFwEMU4LtO iK2btSgti6VjAO8l2prJYmXkk7g3rHznnBK2GWEvjCupi4FzhCUfjKIoybA475HcJFuJgQikLQMce 310YWoGzJt8KBZS8oIOQ==; 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 1gs7Mb-0005f9-1S; Fri, 08 Feb 2019 14:42:45 +0000 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gs7MM-0005RI-Js for linux-arm-kernel@lists.infradead.org; Fri, 08 Feb 2019 14:42:32 +0000 Received: by mail-pg1-x541.google.com with SMTP id c25so1667637pgb.4 for ; Fri, 08 Feb 2019 06:42:30 -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=tyT92C3dEmrnaIfaPycI37ukcjwYqWOVbzH9NVAKCkQ=; b=hQgcIPkNJWUasAOAsWSBAai28MX3Htbs9EmKAbkONioNSb+u7oHDsYprgR9YQoTwjK s1SJVnOLPFhAbaXk6MEXjtnTxLbsNwDJQEquojEvSWCU9DsX8g6SRiAcJp2YZLMw8ovo bZSrwI0Q2jmFuw5zveKpBnlcB4Zzj5/DHCWQWC3ngbp5zwvcZxjei9wteMcuLILyibOA TMsAvMZK6UOzvIDhWfYKrMY3fLfNR9K/3eV+YqRLdzsPyT2uTCQdoNzYSXQz4F8Ng3ct rPdI18hCJD+AkaIPJg/60F3UbZhIDQNVwQGtj61JvQwHRYy5VPS7KXp2hiZLKw/3auYB AktA== 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=tyT92C3dEmrnaIfaPycI37ukcjwYqWOVbzH9NVAKCkQ=; b=S408d7AnG+Ex+ocPXoTQEzbRUdtViI3NTZAoE9hnitIyJmKUrBFVdKDmkXgPtEZhvy xAvUJkvjr05ZnMMK6QD9rMcTxX5tm1fjnMwnLq+ys+AuU/TejGhFFMOGNlWBUB7uJA1X NboK4+3QIHJ0QrxjdXs462aEu+ySOwqPLKKVpiAW0rFLDLXhDv5UK8HL6LAf+k7pnrdH vPHsup5pxpBRdp2j2xFROP5J/xc9y2Av6FSxD0WiH3m7GNMuWzVWYjC7E74NgZVeY5+d 1A8bClb9TSh0o11rXCx1jK9Jd3wpUFcRMIHjeyndP3g2o0dpeDOMv0wq/CblUA3gxCv5 Ozsg== X-Gm-Message-State: AHQUAubjTEmdSqojB6freeFCzvd6FdKFPn8KNVa4ctPsISIyUA3m2K2Z Ct9mInBKDSPfrg0i5iAwZfjxyw== X-Google-Smtp-Source: AHgI3IYPcloHlBmDINdKrbNSwZUcZvoiLV3Q353/5/Rs/7JJ2cgni7ENzaNsPzF5TB6SMJzOkQV3pg== X-Received: by 2002:a62:5658:: with SMTP id k85mr22411480pfb.231.1549636949149; Fri, 08 Feb 2019 06:42:29 -0800 (PST) Received: from localhost ([2601:602:9200:a1a5:da9d:67ff:fec6:ee6b]) by smtp.gmail.com with ESMTPSA id e11sm2425573pgs.53.2019.02.08.06.42.27 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Feb 2019 06:42:28 -0800 (PST) From: Kevin Hilman To: linux-amlogic@lists.infradead.org Subject: [PATCH v3 2/2] arm64: dts: meson: add g12a x96 max board Date: Fri, 8 Feb 2019 06:42:26 -0800 Message-Id: <20190208144226.15102-2-khilman@baylibre.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190208144226.15102-1-khilman@baylibre.com> References: <20190208144226.15102-1-khilman@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190208_064230_649776_1B007D27 X-CRM114-Status: GOOD ( 14.96 ) 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: Martin Blumenstingl , linux-arm-kernel@lists.infradead.org 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 Add the G12a (S905X2) based X96 Max board[1]. There is no branding for the manufacturer anywhere on the product, so it took some digging[2] to find the manufacturer. But since there's nothing about the maker on the product I've left it out of the DT name because 1) nobody will know that name and 2) keeps the DT filename shorter. [1] https://www.cnx-software.com/2018/09/25/x96-max-amlogic-s905x2-tv-box/ [2] https://fccid.io/2AI6D-X96MAX Acked-by: Martin Blumenstingl Signed-off-by: Kevin Hilman --- v3: - add dtb to Makefile - add link to FCC info arch/arm64/boot/dts/amlogic/Makefile | 1 + .../boot/dts/amlogic/meson-g12a-x96-max.dts | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile index f12efa27c636..0821fed4c074 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 dtb-$(CONFIG_ARCH_MESON) += meson-axg-s400.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12a-u200.dtb +dtb-$(CONFIG_ARCH_MESON) += meson-g12a-x96-max.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nanopi-k2.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nexbox-a95x.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-odroidc2.dtb diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts new file mode 100644 index 000000000000..c62d3d5706ff --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts @@ -0,0 +1,28 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2018 BayLibre SAS. All rights reserved. + */ + +/dts-v1/; + +#include "meson-g12a.dtsi" + +/ { + compatible = "amediatech,x96-max", "amlogic,u200", "amlogic,g12a"; + model = "Shenzhen Amediatech Technology Co., Ltd X96 Max"; + + aliases { + serial0 = &uart_AO; + }; + chosen { + stdout-path = "serial0:115200n8"; + }; + memory@0 { + device_type = "memory"; + reg = <0x0 0x0 0x0 0x40000000>; + }; +}; + +&uart_AO { + status = "okay"; +};