From patchwork Sun May 6 09:21:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 10382683 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 48EA760467 for ; Sun, 6 May 2018 09:22:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3D2A428969 for ; Sun, 6 May 2018 09:22:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2F6FD28C63; Sun, 6 May 2018 09:22:03 +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=-2.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, MAILING_LIST_MULTI 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 90E1A28969 for ; Sun, 6 May 2018 09:22:02 +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=MBnaTP6LUUJKZ1i5IxUPwfTCczVjaX+gjxFFztMPXf8=; b=p2uhGhQJuiByeciQ1NGRQbei/3 e8eDMmihDZnm19xAEaZo4mBSBF/Z/pUZasgzl59FEjNn1FspAhdDu88MmCE3KXF/gzVWfQBgBRPCR swcXkfsALefObTKacE/jN1R2gFYdVYpq9Tb87BKOFAGgdd+nXwPe5ec/FVipcKnGlkysW3MS2x5cl pC/HRw0UmtxJcqB8Sc1rrofkLw1nUeTTHbpMVCoDn2Y+6Igawz6P13tibjoO/rtOvftbqVZhyAslg oHXzJnEEn3Vjw0wJBxEQyfa/5tbQBl7Rr/LdzFfOKmWa3c+pycNqMzQBKHXAxo7gyPcxVWfFf1aXY QAemCmsQ==; 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 1fFFrh-000305-Sl; Sun, 06 May 2018 09:21:57 +0000 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fFFrS-0002pF-Tf for linux-amlogic@lists.infradead.org; Sun, 06 May 2018 09:21:45 +0000 Received: by mail-wr0-x241.google.com with SMTP id g21-v6so24966196wrb.8 for ; Sun, 06 May 2018 02:21:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7B0zZtobXhoMK/zsE1h7Zo1CMP2L04NgENuZDspY4tY=; b=IN+6SQGkiGntgTKReVTAXY17WT8zRdfduiIA5RrR/6hlFJ4EVBlAMZlfsOBmg4V+/4 y8XpwTou0rCaGUjhkGpB+EkPl6L8FI758uhk4+t92Q9xN8z1Sk0+5awsf6zO6OCl5iFu 2bW0tjRh16/b+8xHMDKNWyhGXjBQEbmxOrniiWpF5YC2ggfmhyuGzgDYf7cEZfR9TeSq PrHP0Uy++0bGZyiG+puBvVmhijxf9f3xPLET3xJGyr8nAJjyL3xUuc7K9lpikYxNp919 PqITkM3t1KmS1Y8KbDArBHDGztSXzzjzW4vQKA3LYUVzIhtlPfNzRVYmjqnyAvj/g6rS bVgg== 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; bh=7B0zZtobXhoMK/zsE1h7Zo1CMP2L04NgENuZDspY4tY=; b=gvRwue/Vi/bpLERIXrZmkhp7uylZ3nHVhnpdkix4ifdRABMObM5vSDtZLWZc5cN1gF UZUsXFm1kGF+E4no1x8oR3JRmS57sqm90fhFe7vHGyjoRgwSpYhXn13AJmjTI84qIg/b wZocyLqCiCTS/vsoeqeTGjCuLmUu0VdlEJFffQWXfxLPkQFb/oZP3iOvbycoWeY/mwdS IMh8iF7QEuWa0U2Y9n93l3Mt3OWcZOTS2IZvTkItl/i7tSai2c+7o4BLuxh1oirfrBsu tUOVurrGH1JSEju0Y1u6tz8+Kosy1I4feDx+QjkUVY2xS7uwkEL7bRlUtHsdLuI/29lE YHfw== X-Gm-Message-State: ALQs6tAzmQSGVuZ84iR+t3uzogkwoHP6QjsMGToO7Wdm4i1tBRPxGMjt UKDl2QdJxDJd9XLFnqeuDFMWUSnv X-Google-Smtp-Source: AB8JxZp9oMnVZ+jn0RL38qyEIpYKNY1aFuBmIVeFfzndCEtfR6C1a7eryoXo/611V2DBNyY7phEQTQ== X-Received: by 2002:adf:bbce:: with SMTP id z14-v6mr27389222wrg.183.1525598492119; Sun, 06 May 2018 02:21:32 -0700 (PDT) Received: from blackbox.darklights.net (p5B0567E9.dip0.t-ipconnect.de. [91.5.103.233]) by smtp.googlemail.com with ESMTPSA id u20-v6sm30347288wru.33.2018.05.06.02.21.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 06 May 2018 02:21:31 -0700 (PDT) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org, devicetree@vger.kernel.org, khilman@baylibre.com, carlo@caione.org, robh+dt@kernel.org, mark.rutland@arm.com Subject: [PATCH 4/6] ARM: dts: meson: add support for the Meson8m2 SoC Date: Sun, 6 May 2018 11:21:17 +0200 Message-Id: <20180506092119.467-5-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180506092119.467-1-martin.blumenstingl@googlemail.com> References: <20180506092119.467-1-martin.blumenstingl@googlemail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180506_022142_973445_5119135E X-CRM114-Status: GOOD ( 15.44 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: balbes-150@yandex.ru, Martin Blumenstingl MIME-Version: 1.0 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This adds a meson8m2.dtsi which simply inherits meson8.dtsi as both SoCs share most peripherals. The known differences are: - Meson8m2's hardware video decoder additionally supports H.265 decoding - Meson8m2 has the same Gigabit MAC as Meson8b (instead of the 10/100M MAC that Meson8 uses) - Meson8m2 uses the same watchdog register layout/bits as Meson8b (using the Meson8 watchdog compatible leads to an infinite hang when rebooting the machine) - Meson8m2 uses the same SAR ADC register layout/bits as Meson8b. However, it uses the temperature sensor calibration formula (and registers) Meson8b which differ from Meson8. This however is currently not supported by the meson-saradc driver yet. - the pin controller is mostly compatible with Meson8, Meson8m2 has an additional function on eight pins and removes the "VGA" function. So there's a total of 10 pins which are slightly changed, which is why there's a separate compatible for the pin controller - a separate compatible for the clock controller is used because at least the Mali clock tree (not supported yet) is the same as on GXBB while Meson8 and Meson8b have a reduced/older version of the Mali clock tree. Signed-off-by: Martin Blumenstingl --- arch/arm/boot/dts/meson8m2.dtsi | 54 +++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 arch/arm/boot/dts/meson8m2.dtsi diff --git a/arch/arm/boot/dts/meson8m2.dtsi b/arch/arm/boot/dts/meson8m2.dtsi new file mode 100644 index 000000000000..3e1f92273d7b --- /dev/null +++ b/arch/arm/boot/dts/meson8m2.dtsi @@ -0,0 +1,54 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2017 Martin Blumenstingl . + */ + +#include "meson8.dtsi" + +/ { + model = "Amlogic Meson8m2 SoC"; + compatible = "amlogic,meson8m2"; +}; /* end of / */ + +&clkc { + compatible = "amlogic,meson8m2-clkc", "amlogic,meson8-clkc"; +}; + +ðmac { + compatible = "amlogic,meson8m2-dwmac", "snps,dwmac"; + reg = <0xc9410000 0x10000 + 0xc1108140 0x8>; + clocks = <&clkc CLKID_ETH>, + <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL2>; + clock-names = "stmmaceth", "clkin0", "clkin1"; + resets = <&reset RESET_ETHERNET>; + reset-names = "stmmaceth"; +}; + +&pinctrl_aobus { + compatible = "amlogic,meson8m2-aobus-pinctrl", + "amlogic,meson8-aobus-pinctrl"; +}; + +&pinctrl_cbus { + compatible = "amlogic,meson8m2-cbus-pinctrl", + "amlogic,meson8-cbus-pinctrl"; + + eth_rgmii_pins: ethernet { + mux { + groups = "eth_tx_clk_50m", "eth_tx_en", + "eth_txd3", "eth_txd2", + "eth_txd1", "eth_txd0", + "eth_rx_clk_in", "eth_rx_dv", + "eth_rxd3", "eth_rxd2", + "eth_rxd1", "eth_rxd0", + "eth_mdio", "eth_mdc"; + function = "ethernet"; + }; + }; +}; + +&wdt { + compatible = "amlogic,meson8m2-wdt", "amlogic,meson8b-wdt"; +};