Received: by 2002:a05:6602:18e:0:0:0:0 with SMTP id m14csp3865745ioo; Mon, 30 May 2022 11:29:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyDTGr+M0yy5FiKKyQYCmjUwHw1I/gt5VSSwTl42eJSZXJs4UVufXT7fz6bO8GDe8k1B8/M X-Received: by 2002:a05:6402:414f:b0:42d:915f:a48a with SMTP id x15-20020a056402414f00b0042d915fa48amr14410920eda.396.1653935360634; Mon, 30 May 2022 11:29:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653935360; cv=none; d=google.com; s=arc-20160816; b=JqQOyjhvwP0JqtANyFjBCkD0VfiU34ptWzoF1DDoJpuMY7qTzHkx9V/YvVar5gTqPX X2nvaf4I6NQG45bYRH5ynWFQxN31RHeaZdGgAzRj/XZQacOPKJDJAqy5oeredgBXOnjH DU4Zu1jvh6p8BAKJNpebLE/8JUPB2pF4hGsDeFur9H6vf1XldrCDRFOrqr56Fp6gEmhU 8swAIbrRHnCsrOw5vbC925ScTDQktCasxEq2dic5J+TD2lgaG2n9bIZs0hAA8Jr+nJlk QBb3NmQObzM8Lvzzef08qJGuywwC5N7V94D7scjvUG+U7jtDbLSFcDjnu92NHtkolqAX wqKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=E7wlrGz5nMoJok/x4rKN3bauAru3HDzS70uyMws132I=; b=IYRy/ZDUuk9SrcNrzfpHmoyTn0/3Yhc26NxXfHchSuIXafAVQ3hXcf0erNsVbfBW1q XnBrp6xdWd8AOFOMUIpoJih36sFT+RSUqqHKZwCdCcQeAJ5jgnrgENNPGuab8dj/jsCg XztlcMD4FyVN9UoZkcf9Ehol2q5wfg4AXuw7jNif0MfwFGQA/TOLTDbnvaG5sNaV2cl5 VCspanizNq4uU0TpCagwDAlmiPOeKT+Aerm8cg2Sp6ebY10KRPRQ0ytRXlIkn2uYrqVj F/G9MxanSNpvkTYQrxzh+MT4QCW90PvbWqUPJggbchtVxjba3XLo9CM8TDrRt2DJzWvH Q+FQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@semihalf-com.20210112.gappssmtp.com header.s=20210112 header.b=6xoD0R6l; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m9-20020a170906598900b006fec91d3f4dsi6569136ejs.889.2022.05.30.11.28.53; Mon, 30 May 2022 11:29:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@semihalf-com.20210112.gappssmtp.com header.s=20210112 header.b=6xoD0R6l; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236345AbiE3NIy (ORCPT + 99 others); Mon, 30 May 2022 09:08:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34336 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236334AbiE3NIw (ORCPT ); Mon, 30 May 2022 09:08:52 -0400 Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A8E1D70908 for ; Mon, 30 May 2022 06:08:50 -0700 (PDT) Received: by mail-lj1-x233.google.com with SMTP id l11so872419ljb.2 for ; Mon, 30 May 2022 06:08:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=E7wlrGz5nMoJok/x4rKN3bauAru3HDzS70uyMws132I=; b=6xoD0R6lQSSz/q4Y2RcYGBXEbgkNI35pCoAb5P5IIslJEpYkGkhST0ScwNFDRRRcfW 6iiePZpxAkxv6RyunQyjrb27agFhk2YvfK7B0Ov74c6d8T+lmvzz9XTctuby28u5URzR rcveBKbXfsCJo8QUmzSz+KksD9vkk7ZCGNQlcVzu4ZT3fIeZuDGsgrmHR7uZEDPJUKsj cxqmHFkuxZl09a4AEDnWL+L5sMMiU9rj7A6q/krXcwEPKHwucj5y3I3X3M2ATO3o/FFh jMWEbon1w5TwW4Acru1yMjfSVPIoENrZoe2fNiVJUZg6tk96UT3fnIb/Rbe7QT8qw/Qq rHUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=E7wlrGz5nMoJok/x4rKN3bauAru3HDzS70uyMws132I=; b=AtvgZzHiku1BpS8DuqxNXmyPzDm8VpM5d1yrC/BXvDV6jLA36opUuEmMEShVgQkjKY pR36HEUWZHqGIlUGVCvp1afslAICsuTSJJoWaUQk8R3enP/E7jaPViRGmOVNDGs/IS2I ZNS4B1vmpMNk+3M2TG/S3053TaRgL3+JSCQzw7meyOT0YOfyq6MOjs3K95TqsrxxRpM0 FxNmMT1sw7VSbLaWaMsWfckVOmqoE2JJ5oxwA6Sh6Ct18Dt6S15yXZfHG/OYwUfpjmCY HbOF9HSjifK29SibwxU+enCsIFRuv3/T4+S2FpULf/KoUvEMGRfHFLbCjGsSgQEgHNOj XsgQ== X-Gm-Message-State: AOAM530H4rqIp/6Lv+a/6nHjkYQqL8bvsaZ0epIlRbDk0R/aKPI70a69 zjmPqRF22dfudupuyhvPvxQy7Q== X-Received: by 2002:a2e:954f:0:b0:24f:4457:950d with SMTP id t15-20020a2e954f000000b0024f4457950dmr33069308ljh.35.1653916128919; Mon, 30 May 2022 06:08:48 -0700 (PDT) Received: from panikiel.wifi.semihalf.net ([83.142.187.86]) by smtp.gmail.com with ESMTPSA id d22-20020ac25456000000b00477a7c8a0f0sm2295701lfn.295.2022.05.30.06.08.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 May 2022 06:08:48 -0700 (PDT) From: =?UTF-8?q?Pawe=C5=82=20Anikiel?= To: soc@kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, olof@lixom.net, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, dinguyen@kernel.org, =?UTF-8?q?Pawe=C5=82=20Anikiel?= Subject: [PATCH 1/3] dts: socfpga: Change Mercury+ AA1 devicetree to header Date: Mon, 30 May 2022 15:08:37 +0200 Message-Id: <20220530130839.120710-2-pan@semihalf.com> X-Mailer: git-send-email 2.36.1.124.g0e6072fb45-goog In-Reply-To: <20220530130839.120710-1-pan@semihalf.com> References: <20220530130839.120710-1-pan@semihalf.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The Mercury+ AA1 is not a standalone board, rather it's a module with an Arria 10 SoC and some peripherals on it. Remove everything that is not strictly related to the module. Signed-off-by: Paweł Anikiel --- arch/arm/boot/dts/Makefile | 1 - ...1.dts => socfpga_arria10_mercury_aa1.dtsi} | 68 ++++--------------- 2 files changed, 14 insertions(+), 55 deletions(-) rename arch/arm/boot/dts/{socfpga_arria10_mercury_aa1.dts => socfpga_arria10_mercury_aa1.dtsi} (58%) diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index edfbedaa6168..023c8b4ba45c 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1146,7 +1146,6 @@ dtb-$(CONFIG_ARCH_S5PV210) += \ s5pv210-torbreck.dtb dtb-$(CONFIG_ARCH_INTEL_SOCFPGA) += \ socfpga_arria5_socdk.dtb \ - socfpga_arria10_mercury_aa1.dtb \ socfpga_arria10_socdk_nand.dtb \ socfpga_arria10_socdk_qspi.dtb \ socfpga_arria10_socdk_sdmmc.dtb \ diff --git a/arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts b/arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dtsi similarity index 58% rename from arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts rename to arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dtsi index a75c059b6727..fee1fc39bb2b 100644 --- a/arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts +++ b/arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dtsi @@ -1,57 +1,38 @@ // SPDX-License-Identifier: GPL-2.0 -/dts-v1/; - +/* + * Copyright 2022 Google LLC + */ #include "socfpga_arria10.dtsi" / { - - model = "Enclustra Mercury AA1"; - compatible = "enclustra,mercury-aa1", "altr,socfpga-arria10", "altr,socfpga"; - aliases { ethernet0 = &gmac0; serial1 = &uart1; - i2c0 = &i2c0; - i2c1 = &i2c1; - }; - - memory@0 { - name = "memory"; - device_type = "memory"; - reg = <0x0 0x80000000>; /* 2GB */ }; chosen { stdout-path = "serial1:115200n8"; }; -}; -&eccmgr { - sdmmca-ecc@ff8c2c00 { - compatible = "altr,socfpga-sdmmc-ecc"; - reg = <0xff8c2c00 0x400>; - altr,ecc-parent = <&mmc>; - interrupts = <15 IRQ_TYPE_LEVEL_HIGH>, - <47 IRQ_TYPE_LEVEL_HIGH>, - <16 IRQ_TYPE_LEVEL_HIGH>, - <48 IRQ_TYPE_LEVEL_HIGH>; + memory@0 { + name = "memory"; + device_type = "memory"; + reg = <0x0 0x80000000>; /* 2GB */ }; }; &gmac0 { phy-mode = "rgmii"; - phy-addr = <0xffffffff>; /* probe for phy addr */ + phy-handle = <&phy3>; max-frame-size = <3800>; - status = "okay"; - - phy-handle = <&phy3>; mdio { #address-cells = <1>; #size-cells = <0>; compatible = "snps,dwmac-mdio"; phy3: ethernet-phy@3 { + reg = <3>; txd0-skew-ps = <0>; /* -420ps */ txd1-skew-ps = <0>; /* -420ps */ txd2-skew-ps = <0>; /* -420ps */ @@ -64,35 +45,23 @@ phy3: ethernet-phy@3 { txc-skew-ps = <1860>; /* 960ps */ rxdv-skew-ps = <420>; /* 0ps */ rxc-skew-ps = <1680>; /* 780ps */ - reg = <3>; }; }; }; -&gpio0 { - status = "okay"; -}; - -&gpio1 { - status = "okay"; -}; - -&gpio2 { - status = "okay"; -}; - &i2c1 { - status = "okay"; + atsha204a: atsha204a@64 { + compatible = "atmel,atsha204a"; + reg = <0x64>; + }; + isl12022: isl12022@6f { - status = "okay"; compatible = "isil,isl12022"; reg = <0x6f>; }; }; -/* Following mappings are taken from arria10 socdk dts */ &mmc { - status = "okay"; cap-sd-highspeed; broken-cd; bus-width = <4>; @@ -101,12 +70,3 @@ &mmc { &osc1 { clock-frequency = <33330000>; }; - -&uart1 { - status = "okay"; -}; - -&usb0 { - status = "okay"; - dr_mode = "host"; -}; -- 2.36.1.124.g0e6072fb45-goog