From patchwork Tue Feb 7 11:06:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Durai Manickam KR X-Patchwork-Id: 53833 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2787014wrn; Tue, 7 Feb 2023 03:13:39 -0800 (PST) X-Google-Smtp-Source: AK7set+8QDJ+JmUHSuEfdqohYPYms2AleU91/awRDB+TdsZKXuBZ5Y0YMfNy3T6pd1Pexn0NnDi+ X-Received: by 2002:a05:6a20:8412:b0:be:da1c:df7c with SMTP id c18-20020a056a20841200b000beda1cdf7cmr3595766pzd.48.1675768418778; Tue, 07 Feb 2023 03:13:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675768418; cv=none; d=google.com; s=arc-20160816; b=mZukds9UQjtXphwg2KKL99K4yeFDWCiZlUQIYCMWVX6sCEyBRrWWVSDn3AAcGGrZUR 6Z62fb9XLJw9PRWHigQkxy80C82t+8mMGHw6B6FDinoetIr6x+VAF6YDDDcSeYCGu/D7 YQqt+nCnHnBuVz9QvQzJ+DcFlZpbXv0ITNRlitp5t5Q9XKZXQd9koupMFksFzotsd4eR QRNxMfcyUerxTL1heOSo9uqn5APtbjn4ba7ZHJSa1n81wDBGGeq1qn9dZGvrt287pW3A UXZXw1SuyEKj7gh1lbX9FmtPIH/Ym5KvEcCK1Q87QQkwyyV//DbHo/Dqb7nke89PZ+Ku yQyg== 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=LGbUBh9Tbv/u+T7L2RSm+rDp4GVvmqY/inmZ3tdagCc=; b=ry/2z3DgTd0qlLx0aS/A8QXnJhit63GReoOpTMVUdtwtlwA72R2czR5QyQunFw/RNl 8H8VJ8rd2Tu7ZMy8/4Sq5xy0vjj5w2N00EThQ6rck55vZk/b/XwO5T8eduLfgaFtVYKJ thouNyQW6ZX7PTNUZzjTK9UzTTStJ4oy8+e0oYQlMbN4z+iC/QTDZ2S/LCxSoEuUQnqo RpRtmDJgFmQCnKrqf1LQmv6IkMPg8z7jCjITNv0U5yGVz27h5jy6SMZFzqB6U9i5h5Wp mUKWdkSaLgCkdKf3SOOiamOngVE3Uq12PuGX4WykgdK9C2KqCZHhB8q3IEpo146Uphop 6rDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microchip.com header.s=mchp header.b=jG7OAO+9; 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; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v15-20020a63b64f000000b004fb0d8abaadsi2426127pgt.141.2023.02.07.03.13.26; Tue, 07 Feb 2023 03:13:38 -0800 (PST) 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=@microchip.com header.s=mchp header.b=jG7OAO+9; 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; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230516AbjBGLHl (ORCPT + 99 others); Tue, 7 Feb 2023 06:07:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231266AbjBGLHj (ORCPT ); Tue, 7 Feb 2023 06:07:39 -0500 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.153.233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CBB4737F2A; Tue, 7 Feb 2023 03:07:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1675768057; x=1707304057; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=mjHwzmjVx5AsDKi0vsPeqIFr4VuECLn5thzx9mG1050=; b=jG7OAO+99gFZsNpY4WOSvsQPAy5JJHWHsLEWN77u2Q/EiFfKSI5d1N7X NBB0BwoMeMnXRlfA/bNHLNHv/ws5/GbUELjzxZHy8XNe6uO0x+WwkXzCi bnd5Kb3TSkPWtXU0+SH30BGB3cf7uttiMMpCiMcgdOLvVy0qjrUYhckRk Ylhb/zEWRyTvIAbUWsWwS/AF0QQI3G9WidCcT6XyQPKP78jmb9Nyjpprn uSEcYOuvsMZ5oYFFdLDMosWIuD93vvwZvz5BTjLlY3lLbkZcLSkEbN87n K3Q5rZXnYZO0r8nEv8RYqzpUKgLZjgt5OySG3XAPe602fsB8mStR+nWVx g==; X-IronPort-AV: E=Sophos;i="5.97,278,1669100400"; d="scan'208";a="210907328" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa1.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 07 Feb 2023 04:07:37 -0700 Received: from chn-vm-ex03.mchp-main.com (10.10.85.151) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Tue, 7 Feb 2023 04:07:36 -0700 Received: from che-lt-i66125lx.microchip.com (10.10.115.15) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server id 15.1.2507.16 via Frontend Transport; Tue, 7 Feb 2023 04:07:27 -0700 From: Durai Manickam KR To: , , , , , , , , , , , , , , , , , , , , , , , , CC: Durai Manickam KR Subject: [PATCH v6 2/8] ARM: dts: at91: sam9x60: move flexcom definitions Date: Tue, 7 Feb 2023 16:36:45 +0530 Message-ID: <20230207110651.197268-3-durai.manickamkr@microchip.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230207110651.197268-1-durai.manickamkr@microchip.com> References: <20230207110651.197268-1-durai.manickamkr@microchip.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757170545372635528?= X-GMAIL-MSGID: =?utf-8?q?1757170545372635528?= From: Manikandan Muralidharan Move the flexcom definitions from board specific DTS file to the SoC specific DTSI file for sam9x60ek. Signed-off-by: Manikandan Muralidharan Signed-off-by: Hari Prasath Gujulan Elango [durai.manickamkr@microchip.com: Logical split-up of this patch and added missing UART5 compatibles] Signed-off-by: Durai Manickam KR Reviewed-by: Claudiu Beznea --- arch/arm/boot/dts/at91-sam9x60ek.dts | 33 +------------------ arch/arm/boot/dts/sam9x60.dtsi | 49 ++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 32 deletions(-) diff --git a/arch/arm/boot/dts/at91-sam9x60ek.dts b/arch/arm/boot/dts/at91-sam9x60ek.dts index cf5d786531f2..4ff84633dd43 100644 --- a/arch/arm/boot/dts/at91-sam9x60ek.dts +++ b/arch/arm/boot/dts/at91-sam9x60ek.dts @@ -207,15 +207,10 @@ &flx0 { status = "okay"; i2c0: i2c@600 { - compatible = "microchip,sam9x60-i2c"; - reg = <0x600 0x200>; - interrupts = <5 IRQ_TYPE_LEVEL_HIGH 7>; #address-cells = <1>; #size-cells = <0>; - clocks = <&pmc PMC_TYPE_PERIPHERAL 5>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_flx0_default>; - atmel,fifo-size = <16>; i2c-analog-filter; i2c-digital-filter; i2c-digital-filter-width-ns = <35>; @@ -235,14 +230,8 @@ &flx4 { status = "disabled"; spi4: spi@400 { - compatible = "microchip,sam9x60-spi", "atmel,at91rm9200-spi"; - reg = <0x400 0x200>; - interrupts = <13 IRQ_TYPE_LEVEL_HIGH 7>; - clocks = <&pmc PMC_TYPE_PERIPHERAL 13>; - clock-names = "spi_clk"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_flx4_default>; - atmel,fifo-size = <16>; #address-cells = <1>; #size-cells = <0>; status = "disabled"; @@ -254,23 +243,8 @@ &flx5 { status = "okay"; uart5: serial@200 { - compatible = "microchip,sam9x60-dbgu", "microchip,sam9x60-usart", "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart"; - reg = <0x200 0x200>; - atmel,usart-mode = ; - interrupts = <14 IRQ_TYPE_LEVEL_HIGH 7>; - dmas = <&dma0 - (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) | - AT91_XDMAC_DT_PERID(10))>, - <&dma0 - (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) | - AT91_XDMAC_DT_PERID(11))>; - dma-names = "tx", "rx"; - clocks = <&pmc PMC_TYPE_PERIPHERAL 14>; - clock-names = "usart"; - pinctrl-0 = <&pinctrl_flx5_default>; pinctrl-names = "default"; - atmel,use-dma-rx; - atmel,use-dma-tx; + pinctrl-0 = <&pinctrl_flx5_default>; status = "okay"; }; }; @@ -280,15 +254,10 @@ &flx6 { status = "okay"; i2c6: i2c@600 { - compatible = "microchip,sam9x60-i2c"; - reg = <0x600 0x200>; - interrupts = <9 IRQ_TYPE_LEVEL_HIGH 7>; #address-cells = <1>; #size-cells = <0>; - clocks = <&pmc PMC_TYPE_PERIPHERAL 9>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_flx6_default>; - atmel,fifo-size = <16>; i2c-analog-filter; i2c-digital-filter; i2c-digital-filter-width-ns = <35>; diff --git a/arch/arm/boot/dts/sam9x60.dtsi b/arch/arm/boot/dts/sam9x60.dtsi index 8f5477e307dd..ee6cc4329ae4 100644 --- a/arch/arm/boot/dts/sam9x60.dtsi +++ b/arch/arm/boot/dts/sam9x60.dtsi @@ -170,6 +170,16 @@ flx4: flexcom@f0000000 { #size-cells = <1>; ranges = <0x0 0xf0000000 0x800>; status = "disabled"; + + spi4: spi@400 { + compatible = "microchip,sam9x60-spi", "atmel,at91rm9200-spi"; + reg = <0x400 0x200>; + interrupts = <13 IRQ_TYPE_LEVEL_HIGH 7>; + clocks = <&pmc PMC_TYPE_PERIPHERAL 13>; + clock-names = "spi_clk"; + atmel,fifo-size = <16>; + status = "disabled"; + }; }; flx5: flexcom@f0004000 { @@ -180,6 +190,27 @@ flx5: flexcom@f0004000 { #size-cells = <1>; ranges = <0x0 0xf0004000 0x800>; status = "disabled"; + + uart5: serial@200 { + compatible = "microchip,sam9x60-dbgu", "microchip,sam9x60-usart", "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart"; + reg = <0x200 0x200>; + atmel,usart-mode = ; + interrupts = <14 IRQ_TYPE_LEVEL_HIGH 7>; + dmas = <&dma0 + (AT91_XDMAC_DT_MEM_IF(0) | + AT91_XDMAC_DT_PER_IF(1) | + AT91_XDMAC_DT_PERID(10))>, + <&dma0 + (AT91_XDMAC_DT_MEM_IF(0) | + AT91_XDMAC_DT_PER_IF(1) | + AT91_XDMAC_DT_PERID(11))>; + dma-names = "tx", "rx"; + clocks = <&pmc PMC_TYPE_PERIPHERAL 14>; + clock-names = "usart"; + atmel,use-dma-rx; + atmel,use-dma-tx; + status = "disabled"; + }; }; dma0: dma-controller@f0008000 { @@ -379,6 +410,15 @@ flx6: flexcom@f8010000 { #size-cells = <1>; ranges = <0x0 0xf8010000 0x800>; status = "disabled"; + + i2c6: i2c@600 { + compatible = "microchip,sam9x60-i2c"; + reg = <0x600 0x200>; + interrupts = <9 IRQ_TYPE_LEVEL_HIGH 7>; + clocks = <&pmc PMC_TYPE_PERIPHERAL 9>; + atmel,fifo-size = <16>; + status = "disabled"; + }; }; flx7: flexcom@f8014000 { @@ -409,6 +449,15 @@ flx0: flexcom@f801c000 { #size-cells = <1>; ranges = <0x0 0xf801c000 0x800>; status = "disabled"; + + i2c0: i2c@600 { + compatible = "microchip,sam9x60-i2c"; + reg = <0x600 0x200>; + interrupts = <5 IRQ_TYPE_LEVEL_HIGH 7>; + clocks = <&pmc PMC_TYPE_PERIPHERAL 5>; + atmel,fifo-size = <16>; + status = "disabled"; + }; }; flx1: flexcom@f8020000 {