From patchwork Mon Apr 24 08:15:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinthu Raja X-Patchwork-Id: 86911 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2610523vqo; Mon, 24 Apr 2023 02:23:37 -0700 (PDT) X-Google-Smtp-Source: AKy350YpYpt0oafaAzmaYQvO7GFwf5lKIdwRQr3ey6Q5rQCf301zstw3Lef2LH2Lscv8tA2OX2ux X-Received: by 2002:a05:6a20:a5a8:b0:f2:4c39:8031 with SMTP id bc40-20020a056a20a5a800b000f24c398031mr13261592pzb.34.1682328216973; Mon, 24 Apr 2023 02:23:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682328216; cv=none; d=google.com; s=arc-20160816; b=HUHVVH4Uta/0DRyTSQ2a0tidu3JJENHI5u7Zzl68IkHSn8s4o7IYNA0H5ZEUIfiK2d MYV5iHnVaeBX2U7o8OAp5EPpEoRwTKUTwbY1oIZx61x1eXDVKUjSUc2CzqthvZUJYlz0 Bfp1ugNRy0hWbetAD/TIFxzu0uKVPojtCDX8m3+R8UvzZRaSdVcu3BjTml7/WPg/b8Zq mTPXb6wcS4gnebGZ7Ye55PlFwRAv7GveBKnIDjlJq6yn4yKJUgDy6xfdHz0GH4SC4t+c 2Vw1ODZ9IiE4Zo73AcAV2dmZAI2XFbDHcF5soGK2XYamyOhzliKwk6CJQs/sfZmP7ypF NOgQ== 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=9p6ILViXkgbP0qQP35EmW/HgzmUgenr3yYXwlIHHq38=; b=onS0nGvMNZ6stexfZFqSZ934YELOLKIEe+K+WbV92DyxsBsXaerdLEgRxe5KptAKRU ReADV+BDe339CuKLNEzDjMAmdOdQaYsCrXk3nauPGaQmqS20w59llgcPI5sKBik53lX2 ha8FrPcUCwAcEm0iWvtffjDCjWhB5Uq+efcDbRLtBrANECz4fEUIMA4lIwcnb/0wUXp8 qpejpUMkkpaoMSv+STF40hWqciPQnLt4tjpeswYC2M68VGDBV+bYchC4C4aH+EnTLtDF i3x5jntKW5aq18i4iwNw0hpAflfCuJgv/Sjyju3plBL/Lgshk8csxWUt4wM3komlBgb1 K6gg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mistralsolutions.com header.s=google header.b=BrB8frXk; 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=mistralsolutions.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n20-20020a6563d4000000b00513f070aa0dsi10847226pgv.655.2023.04.24.02.23.24; Mon, 24 Apr 2023 02:23:36 -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=@mistralsolutions.com header.s=google header.b=BrB8frXk; 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=mistralsolutions.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230451AbjDXIqv (ORCPT + 99 others); Mon, 24 Apr 2023 04:46:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36488 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230311AbjDXIqt (ORCPT ); Mon, 24 Apr 2023 04:46:49 -0400 Received: from egress-ip4a.ess.de.barracuda.com (egress-ip4a.ess.de.barracuda.com [18.184.203.227]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA4229F for ; Mon, 24 Apr 2023 01:46:47 -0700 (PDT) Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx-outbound10-206.eu-central-1a.ess.aws.cudaops.com (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 24 Apr 2023 08:46:05 +0000 Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-74de74a90e7so567795985a.0 for ; Mon, 24 Apr 2023 01:46:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mistralsolutions.com; s=google; t=1682325964; x=1684917964; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9p6ILViXkgbP0qQP35EmW/HgzmUgenr3yYXwlIHHq38=; b=BrB8frXk7NxqzjsMdWP5oU+QjT+jY1Hp1FJG5Kw1+rLYiEwfCyli1s9VL46JZUrz7v an3CV/A7/7yBPnUXeuX7BkYRqCJSJDVqfBKAKQUPgL+gsM2fvHcLKR6qQcj6ymYuX8IL epKVUwF21tzUinF8uFxxSHfuMckVpeKXM/EvM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682325964; x=1684917964; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9p6ILViXkgbP0qQP35EmW/HgzmUgenr3yYXwlIHHq38=; b=D68XObbPo+Oe6TmEU7AKgJe499D2m5fxSkVEE3FH52X57Gscgyfo5WQaBYtdN2bXaC f+UiHu1Qefye3vRoluYZzuha+49qjkmSLVcNNmfgXzfLsTcCiE9TjM0+g8skHbZaeL9Q 2ppXmXbcnWDz4LlccWaSlJVVPJ/4IFtPBtd2OAh6XhKsAb9tyUAW+ZspkTrIHid0DXj/ k0vLGWfOTyJ/55eqIFXCmnlpsNXliQiWU5FuDrKDSQQv6QdWNcVXGwcMZOQ1zUmkqXpR 39vlZfUzS/H2qrTwxpQLk7FCODvkX3eNQMrRD3wkYZEUuskP+OU5o/A6EPRjFwCwAcWf GazA== X-Gm-Message-State: AAQBX9dNvFRSEatXjw2iXzJH1CEzVn2LEdw2Tj2x1v+g/4zT/NMm1y6E Mx91DyeQqUkzPQON8fh6K5TNtUd6bIROQ+0l/1LrR0DqPqBai4yEE7EKAP2q+JMzIvzV8BTFk4H GWf0P+A0K4AIEGm3vxBSO4lq3eOgfCdvktF6PONHh3JVIEnHPZaQyo0zTNTcy X-Received: by 2002:a17:902:ecc6:b0:1a0:422f:39d9 with SMTP id a6-20020a170902ecc600b001a0422f39d9mr15889957plh.39.1682324148173; Mon, 24 Apr 2023 01:15:48 -0700 (PDT) X-Received: by 2002:a17:902:ecc6:b0:1a0:422f:39d9 with SMTP id a6-20020a170902ecc600b001a0422f39d9mr15889932plh.39.1682324147809; Mon, 24 Apr 2023 01:15:47 -0700 (PDT) Received: from localhost.localdomain ([49.207.195.237]) by smtp.gmail.com with ESMTPSA id x10-20020a1709029a4a00b001a9293597efsm6089868plv.246.2023.04.24.01.15.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Apr 2023 01:15:47 -0700 (PDT) From: Sinthu Raja X-Google-Original-From: Sinthu Raja To: Nishanth Menon , Tero Kristo , Rob Herring Cc: Vignesh Raghavendra , Krzysztof Kozlowski , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sinthu Raja Subject: [PATCH V4 1/3] arm64: dts: ti: k3-j721s2: fix main pinmux range Date: Mon, 24 Apr 2023 13:45:34 +0530 Message-Id: <20230424081536.12123-2-sinthu.raja@ti.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230424081536.12123-1-sinthu.raja@ti.com> References: <20230424081536.12123-1-sinthu.raja@ti.com> MIME-Version: 1.0 X-BESS-ID: 1682325964-302766-5454-1463-1 X-BESS-VER: 2019.1_20230419.1731 X-BESS-Apparent-Source-IP: 209.85.222.199 X-BESS-Parts: H4sIAAAAAAACA4uuVkqtKFGyUirNy1bSUcovVrIyMTMyA7IygIJGlsZpSYlJpq aphubmiRbJKZamiYkWFmmWlhZpxgYGKUq1sQAW0Pk6QQAAAA== X-BESS-BRTS-Status: 1 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE, SPF_PASS,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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1764048992310114101?= X-GMAIL-MSGID: =?utf-8?q?1764048992310114101?= From: Sinthu Raja PADCONFIG_64 register is non-addressable in the existing main pinmux region. So only valid registers are included and main pinmux region is split into two ranges as follows. Also update references to old nodes with new ones as per the newly split main_pmx* node. main_pmx0 -> 64 pins (WKUP_PADCONFIG 0 - 63) main_pmx1 -> 7 pins (WKUP_PADCONFIG 65 - 71) Fixes: b8545f9d3a54 ("arm64: dts: ti: Add initial support for J721S2 SoC") Signed-off-by: Sinthu Raja --- arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts | 15 +++++++++++---- .../boot/dts/ti/k3-j721s2-common-proc-board.dts | 16 +++++++++++----- arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi | 11 ++++++++++- 3 files changed, 32 insertions(+), 10 deletions(-) diff --git a/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts b/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts index 27a43a8ecffd..711757997804 100644 --- a/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts +++ b/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts @@ -136,10 +136,8 @@ J721S2_IOPAD(0x0e4, PIN_INPUT, 0) /* (AE24) I2C0_SDA */ >; }; - main_mmc1_pins_default: main-mmc1-pins-default { + main_mmc1_pins0_default: main-mmc1-pins0-default { pinctrl-single,pins = < - J721S2_IOPAD(0x104, PIN_INPUT, 0) /* (P23) MMC1_CLK */ - J721S2_IOPAD(0x108, PIN_INPUT, 0) /* (N24) MMC1_CMD */ J721S2_IOPAD(0x0fc, PIN_INPUT, 0) /* (M23) MMC1_DAT0 */ J721S2_IOPAD(0x0f8, PIN_INPUT, 0) /* (P24) MMC1_DAT1 */ J721S2_IOPAD(0x0f4, PIN_INPUT, 0) /* (R24) MMC1_DAT2 */ @@ -175,6 +173,15 @@ J721S2_IOPAD(0x09c, PIN_INPUT, 0) /* (T24) MCASP0_AXR11.MCAN7_TX */ }; }; +&main_pmx1 { + main_mmc1_pins1_default: main-mmc1-pins1-default { + pinctrl-single,pins = < + J721S2_IOPAD(0x000, PIN_INPUT, 0) /* (P23) MMC1_CLK */ + J721S2_IOPAD(0x004, PIN_INPUT, 0) /* (N24) MMC1_CMD */ + >; + }; +}; + &wkup_pmx0 { mcu_cpsw_pins_default: mcu-cpsw-pins-default { pinctrl-single,pins = < @@ -278,7 +285,7 @@ &main_sdhci0 { &main_sdhci1 { /* SD card */ - pinctrl-0 = <&main_mmc1_pins_default>; + pinctrl-0 = <&main_mmc1_pins0_default &main_mmc1_pins1_default>; pinctrl-names = "default"; disable-wp; vmmc-supply = <&vdd_mmc1>; diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts index b4b9edfe2d12..6141ae487cba 100644 --- a/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts +++ b/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts @@ -126,11 +126,8 @@ J721S2_IOPAD(0x060, PIN_INPUT_PULLUP, 13) /* (AC27) MCASP2_AXR1.I2C3_SDA */ >; }; - main_mmc1_pins_default: main-mmc1-pins-default { + main_mmc1_pins0_default: main-mmc1-pins0-default { pinctrl-single,pins = < - J721S2_IOPAD(0x104, PIN_INPUT, 0) /* (P23) MMC1_CLK */ - J721S2_IOPAD(0x108, PIN_INPUT, 0) /* (N24) MMC1_CMD */ - J721S2_IOPAD(0x100, PIN_INPUT, 0) /* (###) MMC1_CLKLB */ J721S2_IOPAD(0x0fc, PIN_INPUT, 0) /* (M23) MMC1_DAT0 */ J721S2_IOPAD(0x0f8, PIN_INPUT, 0) /* (P24) MMC1_DAT1 */ J721S2_IOPAD(0x0f4, PIN_INPUT, 0) /* (R24) MMC1_DAT2 */ @@ -146,6 +143,15 @@ J721S2_IOPAD(0x020, PIN_INPUT, 7) /* (AA23) MCAN15_RX.GPIO0_8 */ }; }; +&main_pmx1 { + main_mmc1_pins1_default: main-mmc1-pins1-default { + pinctrl-single,pins = < + J721S2_IOPAD(0x000, PIN_INPUT, 0) /* (P23) MMC1_CLK */ + J721S2_IOPAD(0x004, PIN_INPUT, 0) /* (N24) MMC1_CMD */ + >; + }; +}; + &wkup_pmx0 { mcu_cpsw_pins_default: mcu-cpsw-pins-default { pinctrl-single,pins = < @@ -296,7 +302,7 @@ &main_sdhci0 { &main_sdhci1 { /* SD card */ - pinctrl-0 = <&main_mmc1_pins_default>; + pinctrl-0 = <&main_mmc1_pins0_default &main_mmc1_pins1_default>; pinctrl-names = "default"; disable-wp; vmmc-supply = <&vdd_mmc1>; diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi index 2dd7865f7654..a8d9336d1848 100644 --- a/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi +++ b/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi @@ -66,7 +66,16 @@ main_gpio_intr: interrupt-controller@a00000 { main_pmx0: pinctrl@11c000 { compatible = "pinctrl-single"; /* Proxy 0 addressing */ - reg = <0x0 0x11c000 0x0 0x120>; + reg = <0x0 0x11c000 0x0 0x100>; + #pinctrl-cells = <1>; + pinctrl-single,register-width = <32>; + pinctrl-single,function-mask = <0xffffffff>; + }; + + main_pmx1: pinctrl@11c104 { + compatible = "pinctrl-single"; + /* Proxy 0 addressing */ + reg = <0x0 0x11c104 0x0 0x1C>; #pinctrl-cells = <1>; pinctrl-single,register-width = <32>; pinctrl-single,function-mask = <0xffffffff>; From patchwork Mon Apr 24 08:15:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinthu Raja X-Patchwork-Id: 86909 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2608943vqo; Mon, 24 Apr 2023 02:20:02 -0700 (PDT) X-Google-Smtp-Source: AKy350YdrEl2SyeH7WgVAyFgT5Vr4+bj/hnx5q8dBt3jiD0z0VUjtWIkUpksqel0iMPI8HkEouSk X-Received: by 2002:a17:902:da92:b0:1a9:765c:77ac with SMTP id j18-20020a170902da9200b001a9765c77acmr3354590plx.7.1682328002118; Mon, 24 Apr 2023 02:20:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682328002; cv=none; d=google.com; s=arc-20160816; b=R/f2stA1yWini1ZHXoxC2V0KnaywIkeANZuNre/Flh1zDSGgt1pDNn8mPEW/1FWbc8 de3WS4XX/Fwo09axdJ2m42L08ei/2hG4VrqMGDkQcaSJjwZJoAPdV01G9iyynuYEvPZW HHvCAbN0M8R6ITL8BkQ7KrmCTH67VlgyAzeNVccnWCX9V8GL08WwY9/xTxptnUZpp5DE cdXQK7IennsPYwmM7TeQeWIfS3yPmRD8DkVTRsuBv0XA1p8G5PWZYK34IyLqm+XukAl/ emR3qm6mxtLWqv0fYeT8ZsoatwboVSodOCj3uWIFT/RqeOSu3Vj1rB4vfXZyH8j795cS 9AWg== 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=xnGFUMY+UO4rKqbmguhM32hao10ZDlHndxQXqQg7boY=; b=wcbZI0rnGokDXWp6fsTU/beziKlXCDp12q4rgqsq5z5ASjiJaBypgEfq6A2YEvBra6 QjEMuR9NlFFt38cPDpyVBPMvnR28Lat8SaWCZG5vmxZvoUsmqtz1XnEp1Pr2psHiL022 deYUifqvBFbVjUUSIre+uBS3XQKhPY1lVDpdg5JVm9ZEfQquQLcA4+ahRwnktciHSmEr Jaf1I5f6baMnchRG4Itjbffmvytw9XkmPB3pltpv73fK7cMWxx3LENri2/qjVrzsQ6Kd D3vq9urPmmw8G5NHTmpFI9JQAoxPTm0KUQ0meXCIUh1cw48mnQK0npVm7QfL8jLDKbkf eiCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mistralsolutions.com header.s=google header.b=ffuYXhdB; 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=mistralsolutions.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o15-20020a17090ac70f00b002476baf6b4bsi10479914pjt.149.2023.04.24.02.19.49; Mon, 24 Apr 2023 02:20:02 -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=@mistralsolutions.com header.s=google header.b=ffuYXhdB; 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=mistralsolutions.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231326AbjDXImZ (ORCPT + 99 others); Mon, 24 Apr 2023 04:42:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34358 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231208AbjDXImW (ORCPT ); Mon, 24 Apr 2023 04:42:22 -0400 X-Greylist: delayed 1574 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Mon, 24 Apr 2023 01:42:19 PDT Received: from egress-ip4b.ess.de.barracuda.com (egress-ip4b.ess.de.barracuda.com [18.185.115.208]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F9E38E for ; Mon, 24 Apr 2023 01:42:19 -0700 (PDT) Received: from mail-yb1-f197.google.com (mail-yb1-f197.google.com [209.85.219.197]) by mx-outbound16-184.eu-central-1b.ess.aws.cudaops.com (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 24 Apr 2023 08:41:54 +0000 Received: by mail-yb1-f197.google.com with SMTP id 3f1490d57ef6-b8f4c437ce5so7167073276.3 for ; Mon, 24 Apr 2023 01:41:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mistralsolutions.com; s=google; t=1682325714; x=1684917714; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xnGFUMY+UO4rKqbmguhM32hao10ZDlHndxQXqQg7boY=; b=ffuYXhdB4AJMmoxnSiuf6yuhyiCQ4XnsRz9OQlTofYMzyVQQhFwjflc6sNrUjDF1n7 1w66pyEYOre4L4z/4FhXH09zoQ2V3FZ+16dGX2cwdlvMBlJPHPnWZteRiA8h2drnunGn AcF5pVz/aBAo2AJ6mMTbOsbOhyUyqx+DN/v+I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682325714; x=1684917714; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xnGFUMY+UO4rKqbmguhM32hao10ZDlHndxQXqQg7boY=; b=EYrhc5Ez7Qc66UBVsPItQ1grX2i5jWiBZ4Sef/xmBrvKrsNhIvI+X7kapp6VDQbl+C zdvwSCh4Gv1FubPBCI7st0wRe2L8wLI519WNnKKUlcQCZAnQnOty+9h58n470AtiKlJ4 I+FLIJeuqcG6M/HMmSpSmQPJ7GlEE4wJXbenH5ZZSZSPsTLWDTwqNzlvLsSOuuZl3l8v zRZO5YnlTA9ibYGSGO/A/EvT4SMJBI9I7U26YEKnhS5f7d2Wtz57MJjL6sJ1wa3CHKAC hPpX0dD7MSqq8v/RLwSHik0rq1DgbGKAwI6MJzO3Jgnkl/abQ6pDJ8vRDX5PC6bAxhLd Dgnw== X-Gm-Message-State: AAQBX9fvdYwj4qc4BVInvwTxh/2eQ9GOZ6Uc6ku9y028oKLnxojAYgv2 f1ymUzUXif6h6bYgdAjbXS98zyoW5EowbnK2mciyyGH8wU2xkmRpF8ZUCzjItAySCs1Br8AgJpN XaFsB6Mee58StYSxLjcgGjN+xnLP+j8Z67ZvLhqE5MMD119rKJT2WAB4DZicJ X-Received: by 2002:a17:902:fb44:b0:1a5:16fb:628b with SMTP id lf4-20020a170902fb4400b001a516fb628bmr11876323plb.24.1682324151368; Mon, 24 Apr 2023 01:15:51 -0700 (PDT) X-Received: by 2002:a17:902:fb44:b0:1a5:16fb:628b with SMTP id lf4-20020a170902fb4400b001a516fb628bmr11876307plb.24.1682324150996; Mon, 24 Apr 2023 01:15:50 -0700 (PDT) Received: from localhost.localdomain ([49.207.195.237]) by smtp.gmail.com with ESMTPSA id x10-20020a1709029a4a00b001a9293597efsm6089868plv.246.2023.04.24.01.15.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Apr 2023 01:15:50 -0700 (PDT) From: Sinthu Raja X-Google-Original-From: Sinthu Raja To: Nishanth Menon , Tero Kristo , Rob Herring Cc: Vignesh Raghavendra , Krzysztof Kozlowski , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sinthu Raja Subject: [PATCH V4 2/3] arm64: dts: ti: k3-j721s2: fix wkup pinmux range Date: Mon, 24 Apr 2023 13:45:35 +0530 Message-Id: <20230424081536.12123-3-sinthu.raja@ti.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230424081536.12123-1-sinthu.raja@ti.com> References: <20230424081536.12123-1-sinthu.raja@ti.com> MIME-Version: 1.0 X-BESS-ID: 1682325714-304280-5481-1143-1 X-BESS-VER: 2019.1_20230419.1731 X-BESS-Apparent-Source-IP: 209.85.219.197 X-BESS-Parts: H4sIAAAAAAACA4uuVkqtKFGyUirNy1bSUcovVrIyNDIzsgQyM4CiFkZmSYnGpu YmBgYGRqnGlslmBubmiWYGSQYGaaYGBqZKtbEAiaaatUIAAAA= X-BESS-BRTS-Status: 1 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1764048767259851012?= X-GMAIL-MSGID: =?utf-8?q?1764048767259851012?= From: Sinthu Raja The WKUP_PADCONFIG register region in J721S2 has multiple non-addressable regions, accordingly split the existing wkup_pmx region as follows to avoid the non-addressable regions and include the rest of valid WKUP_PADCONFIG registers. Also update references to old nodes with new ones. wkup_pmx0 -> 13 pins (WKUP_PADCONFIG 0 - 12) wkup_pmx1 -> 11 pins (WKUP_PADCONFIG 14 - 24) wkup_pmx2 -> 72 pins (WKUP_PADCONFIG 26 - 97) wkup_pmx3 -> 1 pin (WKUP_PADCONFIG 100) Fixes: b8545f9d3a54 ("arm64: dts: ti: Add initial support for J721S2 SoC") Signed-off-by: Sinthu Raja --- Changes in V4: - Correct the pinctrl node offsets as per the newly split wkup_pmx* nodes Changes in V3: - Added Fix tag Changes in V2: - Update commit description. - Update the offset value to 0x194 because 0x190 is the last register of the IO PADCONFIG register set. .../boot/dts/ti/k3-am68-sk-base-board.dts | 42 +++++----- .../dts/ti/k3-j721s2-common-proc-board.dts | 76 +++++++++---------- .../boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi | 29 ++++++- 3 files changed, 87 insertions(+), 60 deletions(-) diff --git a/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts b/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts index 711757997804..a811a512262b 100644 --- a/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts +++ b/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts @@ -182,49 +182,49 @@ J721S2_IOPAD(0x004, PIN_INPUT, 0) /* (N24) MMC1_CMD */ }; }; -&wkup_pmx0 { +&wkup_pmx2 { mcu_cpsw_pins_default: mcu-cpsw-pins-default { pinctrl-single,pins = < - J721S2_WKUP_IOPAD(0x094, PIN_INPUT, 0) /* (B22) MCU_RGMII1_RD0 */ - J721S2_WKUP_IOPAD(0x090, PIN_INPUT, 0) /* (B21) MCU_RGMII1_RD1 */ - J721S2_WKUP_IOPAD(0x08c, PIN_INPUT, 0) /* (C22) MCU_RGMII1_RD2 */ - J721S2_WKUP_IOPAD(0x088, PIN_INPUT, 0) /* (D23) MCU_RGMII1_RD3 */ - J721S2_WKUP_IOPAD(0x084, PIN_INPUT, 0) /* (D22) MCU_RGMII1_RXC */ - J721S2_WKUP_IOPAD(0x06c, PIN_INPUT, 0) /* (E23) MCU_RGMII1_RX_CTL */ - J721S2_WKUP_IOPAD(0x07c, PIN_OUTPUT, 0) /* (F23) MCU_RGMII1_TD0 */ - J721S2_WKUP_IOPAD(0x078, PIN_OUTPUT, 0) /* (G22) MCU_RGMII1_TD1 */ - J721S2_WKUP_IOPAD(0x074, PIN_OUTPUT, 0) /* (E21) MCU_RGMII1_TD2 */ - J721S2_WKUP_IOPAD(0x070, PIN_OUTPUT, 0) /* (E22) MCU_RGMII1_TD3 */ - J721S2_WKUP_IOPAD(0x080, PIN_OUTPUT, 0) /* (F21) MCU_RGMII1_TXC */ - J721S2_WKUP_IOPAD(0x068, PIN_OUTPUT, 0) /* (F22) MCU_RGMII1_TX_CTL */ + J721S2_WKUP_IOPAD(0x02C, PIN_INPUT, 0) /* (B22) MCU_RGMII1_RD0 */ + J721S2_WKUP_IOPAD(0x028, PIN_INPUT, 0) /* (B21) MCU_RGMII1_RD1 */ + J721S2_WKUP_IOPAD(0x024, PIN_INPUT, 0) /* (C22) MCU_RGMII1_RD2 */ + J721S2_WKUP_IOPAD(0x020, PIN_INPUT, 0) /* (D23) MCU_RGMII1_RD3 */ + J721S2_WKUP_IOPAD(0x01C, PIN_INPUT, 0) /* (D22) MCU_RGMII1_RXC */ + J721S2_WKUP_IOPAD(0x004, PIN_INPUT, 0) /* (E23) MCU_RGMII1_RX_CTL */ + J721S2_WKUP_IOPAD(0x014, PIN_OUTPUT, 0) /* (F23) MCU_RGMII1_TD0 */ + J721S2_WKUP_IOPAD(0x010, PIN_OUTPUT, 0) /* (G22) MCU_RGMII1_TD1 */ + J721S2_WKUP_IOPAD(0x00C, PIN_OUTPUT, 0) /* (E21) MCU_RGMII1_TD2 */ + J721S2_WKUP_IOPAD(0x008, PIN_OUTPUT, 0) /* (E22) MCU_RGMII1_TD3 */ + J721S2_WKUP_IOPAD(0x018, PIN_OUTPUT, 0) /* (F21) MCU_RGMII1_TXC */ + J721S2_WKUP_IOPAD(0x000, PIN_OUTPUT, 0) /* (F22) MCU_RGMII1_TX_CTL */ >; }; mcu_mdio_pins_default: mcu-mdio-pins-default { pinctrl-single,pins = < - J721S2_WKUP_IOPAD(0x09c, PIN_OUTPUT, 0) /* (A21) MCU_MDIO0_MDC */ - J721S2_WKUP_IOPAD(0x098, PIN_INPUT, 0) /* (A22) MCU_MDIO0_MDIO */ + J721S2_WKUP_IOPAD(0x034, PIN_OUTPUT, 0) /* (A21) MCU_MDIO0_MDC */ + J721S2_WKUP_IOPAD(0x030, PIN_INPUT, 0) /* (A22) MCU_MDIO0_MDIO */ >; }; mcu_mcan0_pins_default: mcu-mcan0-pins-default { pinctrl-single,pins = < - J721S2_WKUP_IOPAD(0x0bc, PIN_INPUT, 0) /* (E28) MCU_MCAN0_RX */ - J721S2_WKUP_IOPAD(0x0b8, PIN_OUTPUT, 0) /* (E27) MCU_MCAN0_TX */ + J721S2_WKUP_IOPAD(0x054, PIN_INPUT, 0) /* (E28) MCU_MCAN0_RX */ + J721S2_WKUP_IOPAD(0x050, PIN_OUTPUT, 0) /* (E27) MCU_MCAN0_TX */ >; }; mcu_mcan1_pins_default: mcu-mcan1-pins-default { pinctrl-single,pins = < - J721S2_WKUP_IOPAD(0x0d4, PIN_INPUT, 0) /* (F26) WKUP_GPIO0_5.MCU_MCAN1_RX */ - J721S2_WKUP_IOPAD(0x0d0, PIN_OUTPUT, 0) /* (C23) WKUP_GPIO0_4.MCU_MCAN1_TX*/ + J721S2_WKUP_IOPAD(0x06C, PIN_INPUT, 0) /* (F26) WKUP_GPIO0_5.MCU_MCAN1_RX */ + J721S2_WKUP_IOPAD(0x068, PIN_OUTPUT, 0) /* (C23) WKUP_GPIO0_4.MCU_MCAN1_TX*/ >; }; mcu_i2c1_pins_default: mcu-i2c1-pins-default { pinctrl-single,pins = < - J721S2_WKUP_IOPAD(0x0e0, PIN_INPUT, 0) /* (F24) WKUP_GPIO0_8.MCU_I2C1_SCL */ - J721S2_WKUP_IOPAD(0x0e4, PIN_INPUT, 0) /* (H26) WKUP_GPIO0_9.MCU_I2C1_SDA */ + J721S2_WKUP_IOPAD(0x078, PIN_INPUT, 0) /* (F24) WKUP_GPIO0_8.MCU_I2C1_SCL */ + J721S2_WKUP_IOPAD(0x07c, PIN_INPUT, 0) /* (H26) WKUP_GPIO0_9.MCU_I2C1_SDA */ >; }; }; diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts index 6141ae487cba..c689b22f3899 100644 --- a/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts +++ b/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts @@ -152,81 +152,81 @@ J721S2_IOPAD(0x004, PIN_INPUT, 0) /* (N24) MMC1_CMD */ }; }; -&wkup_pmx0 { +&wkup_pmx2 { mcu_cpsw_pins_default: mcu-cpsw-pins-default { pinctrl-single,pins = < - J721S2_WKUP_IOPAD(0x094, PIN_INPUT, 0) /* (B22) MCU_RGMII1_RD0 */ - J721S2_WKUP_IOPAD(0x090, PIN_INPUT, 0) /* (B21) MCU_RGMII1_RD1 */ - J721S2_WKUP_IOPAD(0x08c, PIN_INPUT, 0) /* (C22) MCU_RGMII1_RD2 */ - J721S2_WKUP_IOPAD(0x088, PIN_INPUT, 0) /* (D23) MCU_RGMII1_RD3 */ - J721S2_WKUP_IOPAD(0x084, PIN_INPUT, 0) /* (D22) MCU_RGMII1_RXC */ - J721S2_WKUP_IOPAD(0x06c, PIN_INPUT, 0) /* (E23) MCU_RGMII1_RX_CTL */ - J721S2_WKUP_IOPAD(0x07c, PIN_OUTPUT, 0) /* (F23) MCU_RGMII1_TD0 */ - J721S2_WKUP_IOPAD(0x078, PIN_OUTPUT, 0) /* (G22) MCU_RGMII1_TD1 */ - J721S2_WKUP_IOPAD(0x074, PIN_OUTPUT, 0) /* (E21) MCU_RGMII1_TD2 */ - J721S2_WKUP_IOPAD(0x070, PIN_OUTPUT, 0) /* (E22) MCU_RGMII1_TD3 */ - J721S2_WKUP_IOPAD(0x080, PIN_OUTPUT, 0) /* (F21) MCU_RGMII1_TXC */ - J721S2_WKUP_IOPAD(0x068, PIN_OUTPUT, 0) /* (F22) MCU_RGMII1_TX_CTL */ + J721S2_WKUP_IOPAD(0x02c, PIN_INPUT, 0) /* (B22) MCU_RGMII1_RD0 */ + J721S2_WKUP_IOPAD(0x028, PIN_INPUT, 0) /* (B21) MCU_RGMII1_RD1 */ + J721S2_WKUP_IOPAD(0x024, PIN_INPUT, 0) /* (C22) MCU_RGMII1_RD2 */ + J721S2_WKUP_IOPAD(0x020, PIN_INPUT, 0) /* (D23) MCU_RGMII1_RD3 */ + J721S2_WKUP_IOPAD(0x01c, PIN_INPUT, 0) /* (D22) MCU_RGMII1_RXC */ + J721S2_WKUP_IOPAD(0x004, PIN_INPUT, 0) /* (E23) MCU_RGMII1_RX_CTL */ + J721S2_WKUP_IOPAD(0x014, PIN_OUTPUT, 0) /* (F23) MCU_RGMII1_TD0 */ + J721S2_WKUP_IOPAD(0x010, PIN_OUTPUT, 0) /* (G22) MCU_RGMII1_TD1 */ + J721S2_WKUP_IOPAD(0x00c, PIN_OUTPUT, 0) /* (E21) MCU_RGMII1_TD2 */ + J721S2_WKUP_IOPAD(0x008, PIN_OUTPUT, 0) /* (E22) MCU_RGMII1_TD3 */ + J721S2_WKUP_IOPAD(0x018, PIN_OUTPUT, 0) /* (F21) MCU_RGMII1_TXC */ + J721S2_WKUP_IOPAD(0x000, PIN_OUTPUT, 0) /* (F22) MCU_RGMII1_TX_CTL */ >; }; mcu_mdio_pins_default: mcu-mdio-pins-default { pinctrl-single,pins = < - J721S2_WKUP_IOPAD(0x09c, PIN_OUTPUT, 0) /* (A21) MCU_MDIO0_MDC */ - J721S2_WKUP_IOPAD(0x098, PIN_INPUT, 0) /* (A22) MCU_MDIO0_MDIO */ + J721S2_WKUP_IOPAD(0x034, PIN_OUTPUT, 0) /* (A21) MCU_MDIO0_MDC */ + J721S2_WKUP_IOPAD(0x030, PIN_INPUT, 0) /* (A22) MCU_MDIO0_MDIO */ >; }; mcu_mcan0_pins_default: mcu-mcan0-pins-default { pinctrl-single,pins = < - J721S2_WKUP_IOPAD(0x0bc, PIN_INPUT, 0) /* (E28) MCU_MCAN0_RX */ - J721S2_WKUP_IOPAD(0x0b8, PIN_OUTPUT, 0) /* (E27) MCU_MCAN0_TX */ + J721S2_WKUP_IOPAD(0x054, PIN_INPUT, 0) /* (E28) MCU_MCAN0_RX */ + J721S2_WKUP_IOPAD(0x050, PIN_OUTPUT, 0) /* (E27) MCU_MCAN0_TX */ >; }; mcu_mcan1_pins_default: mcu-mcan1-pins-default { pinctrl-single,pins = < - J721S2_WKUP_IOPAD(0x0d4, PIN_INPUT, 0) /* (F26) WKUP_GPIO0_5.MCU_MCAN1_RX */ - J721S2_WKUP_IOPAD(0x0d0, PIN_OUTPUT, 0) /* (C23) WKUP_GPIO0_4.MCU_MCAN1_TX */ + J721S2_WKUP_IOPAD(0x06c, PIN_INPUT, 0) /* (F26) WKUP_GPIO0_5.MCU_MCAN1_RX */ + J721S2_WKUP_IOPAD(0x068, PIN_OUTPUT, 0) /*(C23) WKUP_GPIO0_4.MCU_MCAN1_TX */ >; }; mcu_mcan0_gpio_pins_default: mcu-mcan0-gpio-pins-default { pinctrl-single,pins = < - J721S2_WKUP_IOPAD(0x0c0, PIN_INPUT, 7) /* (D26) WKUP_GPIO0_0 */ - J721S2_WKUP_IOPAD(0x0a8, PIN_INPUT, 7) /* (B25) MCU_SPI0_D1.WKUP_GPIO0_69 */ + J721S2_WKUP_IOPAD(0x058, PIN_INPUT, 7) /* (D26) WKUP_GPIO0_0 */ + J721S2_WKUP_IOPAD(0x040, PIN_INPUT, 7) /* (B25) MCU_SPI0_D1.WKUP_GPIO0_69 */ >; }; mcu_mcan1_gpio_pins_default: mcu-mcan1-gpio-pins-default { pinctrl-single,pins = < - J721S2_WKUP_IOPAD(0x0c8, PIN_INPUT, 7) /* (C28) WKUP_GPIO0_2 */ + J721S2_WKUP_IOPAD(0x060, PIN_INPUT, 7) /* (C28) WKUP_GPIO0_2 */ >; }; mcu_adc0_pins_default: mcu-adc0-pins-default { pinctrl-single,pins = < - J721S2_WKUP_IOPAD(0x134, PIN_INPUT, 0) /* (L25) MCU_ADC0_AIN0 */ - J721S2_WKUP_IOPAD(0x138, PIN_INPUT, 0) /* (K25) MCU_ADC0_AIN1 */ - J721S2_WKUP_IOPAD(0x13c, PIN_INPUT, 0) /* (M24) MCU_ADC0_AIN2 */ - J721S2_WKUP_IOPAD(0x140, PIN_INPUT, 0) /* (L24) MCU_ADC0_AIN3 */ - J721S2_WKUP_IOPAD(0x144, PIN_INPUT, 0) /* (L27) MCU_ADC0_AIN4 */ - J721S2_WKUP_IOPAD(0x148, PIN_INPUT, 0) /* (K24) MCU_ADC0_AIN5 */ - J721S2_WKUP_IOPAD(0x14c, PIN_INPUT, 0) /* (M27) MCU_ADC0_AIN6 */ - J721S2_WKUP_IOPAD(0x150, PIN_INPUT, 0) /* (M26) MCU_ADC0_AIN7 */ + J721S2_WKUP_IOPAD(0x0cc, PIN_INPUT, 0) /* (L25) MCU_ADC0_AIN0 */ + J721S2_WKUP_IOPAD(0x0d0, PIN_INPUT, 0) /* (K25) MCU_ADC0_AIN1 */ + J721S2_WKUP_IOPAD(0x0d4, PIN_INPUT, 0) /* (M24) MCU_ADC0_AIN2 */ + J721S2_WKUP_IOPAD(0x0d8, PIN_INPUT, 0) /* (L24) MCU_ADC0_AIN3 */ + J721S2_WKUP_IOPAD(0x0dc, PIN_INPUT, 0) /* (L27) MCU_ADC0_AIN4 */ + J721S2_WKUP_IOPAD(0x0e0, PIN_INPUT, 0) /* (K24) MCU_ADC0_AIN5 */ + J721S2_WKUP_IOPAD(0x0e4, PIN_INPUT, 0) /* (M27) MCU_ADC0_AIN6 */ + J721S2_WKUP_IOPAD(0x0e8, PIN_INPUT, 0) /* (M26) MCU_ADC0_AIN7 */ >; }; mcu_adc1_pins_default: mcu-adc1-pins-default { pinctrl-single,pins = < - J721S2_WKUP_IOPAD(0x154, PIN_INPUT, 0) /* (P25) MCU_ADC1_AIN0 */ - J721S2_WKUP_IOPAD(0x158, PIN_INPUT, 0) /* (R25) MCU_ADC1_AIN1 */ - J721S2_WKUP_IOPAD(0x15c, PIN_INPUT, 0) /* (P28) MCU_ADC1_AIN2 */ - J721S2_WKUP_IOPAD(0x160, PIN_INPUT, 0) /* (P27) MCU_ADC1_AIN3 */ - J721S2_WKUP_IOPAD(0x164, PIN_INPUT, 0) /* (N25) MCU_ADC1_AIN4 */ - J721S2_WKUP_IOPAD(0x168, PIN_INPUT, 0) /* (P26) MCU_ADC1_AIN5 */ - J721S2_WKUP_IOPAD(0x16c, PIN_INPUT, 0) /* (N26) MCU_ADC1_AIN6 */ - J721S2_WKUP_IOPAD(0x170, PIN_INPUT, 0) /* (N27) MCU_ADC1_AIN7 */ + J721S2_WKUP_IOPAD(0x0ec, PIN_INPUT, 0) /* (P25) MCU_ADC1_AIN0 */ + J721S2_WKUP_IOPAD(0x0f0, PIN_INPUT, 0) /* (R25) MCU_ADC1_AIN1 */ + J721S2_WKUP_IOPAD(0x0f4, PIN_INPUT, 0) /* (P28) MCU_ADC1_AIN2 */ + J721S2_WKUP_IOPAD(0x0f8, PIN_INPUT, 0) /* (P27) MCU_ADC1_AIN3 */ + J721S2_WKUP_IOPAD(0x0fc, PIN_INPUT, 0) /* (N25) MCU_ADC1_AIN4 */ + J721S2_WKUP_IOPAD(0x100, PIN_INPUT, 0) /* (P26) MCU_ADC1_AIN5 */ + J721S2_WKUP_IOPAD(0x104, PIN_INPUT, 0) /* (N26) MCU_ADC1_AIN6 */ + J721S2_WKUP_IOPAD(0x108, PIN_INPUT, 0) /* (N27) MCU_ADC1_AIN7 */ >; }; }; diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi index a353705a7463..fa31831e33e8 100644 --- a/arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi +++ b/arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi @@ -50,7 +50,34 @@ mcu_ram: sram@41c00000 { wkup_pmx0: pinctrl@4301c000 { compatible = "pinctrl-single"; /* Proxy 0 addressing */ - reg = <0x00 0x4301c000 0x00 0x178>; + reg = <0x00 0x4301c000 0x00 0x034>; + #pinctrl-cells = <1>; + pinctrl-single,register-width = <32>; + pinctrl-single,function-mask = <0xffffffff>; + }; + + wkup_pmx1: pinctrl@4301c038 { + compatible = "pinctrl-single"; + /* Proxy 0 addressing */ + reg = <0x00 0x4301c038 0x00 0x02C>; + #pinctrl-cells = <1>; + pinctrl-single,register-width = <32>; + pinctrl-single,function-mask = <0xffffffff>; + }; + + wkup_pmx2: pinctrl@4301c068 { + compatible = "pinctrl-single"; + /* Proxy 0 addressing */ + reg = <0x00 0x4301c068 0x00 0x120>; + #pinctrl-cells = <1>; + pinctrl-single,register-width = <32>; + pinctrl-single,function-mask = <0xffffffff>; + }; + + wkup_pmx3: pinctrl@4301c190 { + compatible = "pinctrl-single"; + /* Proxy 0 addressing */ + reg = <0x00 0x4301c190 0x00 0x004>; #pinctrl-cells = <1>; pinctrl-single,register-width = <32>; pinctrl-single,function-mask = <0xffffffff>; From patchwork Mon Apr 24 08:15:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinthu Raja X-Patchwork-Id: 86910 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2609475vqo; Mon, 24 Apr 2023 02:21:09 -0700 (PDT) X-Google-Smtp-Source: AKy350aTxHWR45eLRjO/nMuD3/6bFaughM4BDccx8+cDM74FehXrJd/RipASX7j+5maekup5Fl6G X-Received: by 2002:a17:902:d48e:b0:1a2:8770:bb17 with SMTP id c14-20020a170902d48e00b001a28770bb17mr16260478plg.9.1682328069549; Mon, 24 Apr 2023 02:21:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682328069; cv=none; d=google.com; s=arc-20160816; b=NqJMmDWEJqosc42JvNUA7h9r3S61JOT1JXQci6X1VUJR6rydmeCJ2fc2tsnl1XQmof a2TSgjr+KwAnJ5PWIqFpYhHQqAETmQvKZn3P7hCajxDCtEbj41ZFiuIqoHT+fH96bxcG LuT+Go5pwcs9l4MPrj1eUip9J6uxqs1iq/MiSazBzr1Mkq9uAnBYrW6WQyIbmidiCRdE ER+ckd3Cjefx35N3tWKdOTuMhszO0SImD577V1sKKz6tvbjbPJt1TGI9gaxpADcvgEZy B1rQTYJ1UOae2adX7MPNEBTccpsRZHvGRxz63Yb0bS41H1PzXEZAmDZzwlylyhMiTjy7 vvGw== 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=EiE2A4//DbxZQ7lVU5qUMOosuU5KxI1VpQT9EEvu6k8=; b=lmasid6cJLS8vqN4Y72WRRfX/xdfmOAyXMgiaCK4g+0EQtrXnei84QbIuinQCQEXTo afWW6Z4C5uArpDa2N+PyBO2YMd0iOdX9ZPRL65r5mHV4aDhjcJO41lhsivx5Ng3jUboT HfWZKFLodKA4hN9KomA898mzteEFrjyAEpLP3h/35oyvl93JaX/qZgTFnspzfsKCV3mB QyeTXx4MEyFrRKkpMR2SMndv/kJ1g81TpNXLe/KuAGqVGPKv53pMx/vHMPzFVCvAqLNA OaFp5onPS9vRU1s0pueAbvckuMY0sZQ0Y+MdcqCuZLNRIggfPrcxDHA/CyT6caCUbSUh zhhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mistralsolutions.com header.s=google header.b=Av6dCE6t; 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=mistralsolutions.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s13-20020a170902ea0d00b001a6f0e81ec7si12018817plg.237.2023.04.24.02.20.57; Mon, 24 Apr 2023 02:21:09 -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=@mistralsolutions.com header.s=google header.b=Av6dCE6t; 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=mistralsolutions.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231143AbjDXIkP (ORCPT + 99 others); Mon, 24 Apr 2023 04:40:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32952 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230072AbjDXIkN (ORCPT ); Mon, 24 Apr 2023 04:40:13 -0400 X-Greylist: delayed 1420 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Mon, 24 Apr 2023 01:40:10 PDT Received: from egress-ip4a.ess.de.barracuda.com (egress-ip4a.ess.de.barracuda.com [18.184.203.227]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8BB131FD8 for ; Mon, 24 Apr 2023 01:40:10 -0700 (PDT) Received: from mail-io1-f71.google.com (mail-io1-f71.google.com [209.85.166.71]) by mx-outbound10-206.eu-central-1a.ess.aws.cudaops.com (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 24 Apr 2023 08:39:28 +0000 Received: by mail-io1-f71.google.com with SMTP id ca18e2360f4ac-7606d6b2fddso702259939f.2 for ; Mon, 24 Apr 2023 01:39:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mistralsolutions.com; s=google; t=1682325567; x=1684917567; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EiE2A4//DbxZQ7lVU5qUMOosuU5KxI1VpQT9EEvu6k8=; b=Av6dCE6t80jplcMklvjZubwObZ9F8RwvGgag6D2xKRM5uW85QnvX2ROqzgX3gI7um5 hac9nkaf+2XhV/vJlnhn3wffeb0YqKkbIMgikxTarsOKmo9NjPRxsfScYJ0nB80HtOKy ubSNtIJrSAew7QTbizXyAt9HnpcoLf3NgdbD0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682325567; x=1684917567; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EiE2A4//DbxZQ7lVU5qUMOosuU5KxI1VpQT9EEvu6k8=; b=jIcqYqfA0+k1PYKQq5pF/yYbTMyJdh1vP86pZDQI5GYarXa6BwIJP2SA8ynSLdidgi 8r2YE0829D3KpFLicVAYltcooEHTVbZ/gmHx/JX9sVtbrYSDBwJCHgC5M7bCl2Xw5BUb roEWPJKtIfTFz+uBQce6QCJO8aY2Cg7O/fhb5n6OwN2G/6f2SAZyBQcSP9BR8x5wjmHk ROGb9wQcxD6hnndzFu92wW1/ncZ4zg59PzHq9mp8VGMWb86eb7v7gPco40cD0XVMyqJG GbmwNoPh+OuA5HBGiIwuTXN1tARx3eTlXsJVzY83J5r5X0widpxoQmLhUzyZDyAWtLIs oh7g== X-Gm-Message-State: AAQBX9fuo00HfHB4ohxCGpx5KL4mn886qOUb/0oq1n9kE/0g/Ruhqg66 MHjtjDv+OwCEX7lamGb3i9u5vqPMikKTAyINLV0mB4epJoQn6C1+KUkSth0T6IaVqw29DRQ2VMO tNLjjpVbI4yMaaeYCA8/MPpve4Qi6hYjdV2ycXbiXTfM01RGlfTICnVk3XmHv X-Received: by 2002:a17:902:aa87:b0:1a4:fc40:bef6 with SMTP id d7-20020a170902aa8700b001a4fc40bef6mr12715639plr.36.1682324154589; Mon, 24 Apr 2023 01:15:54 -0700 (PDT) X-Received: by 2002:a17:902:aa87:b0:1a4:fc40:bef6 with SMTP id d7-20020a170902aa8700b001a4fc40bef6mr12715618plr.36.1682324154256; Mon, 24 Apr 2023 01:15:54 -0700 (PDT) Received: from localhost.localdomain ([49.207.195.237]) by smtp.gmail.com with ESMTPSA id x10-20020a1709029a4a00b001a9293597efsm6089868plv.246.2023.04.24.01.15.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Apr 2023 01:15:53 -0700 (PDT) From: Sinthu Raja X-Google-Original-From: Sinthu Raja To: Nishanth Menon , Tero Kristo , Rob Herring Cc: Vignesh Raghavendra , Krzysztof Kozlowski , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sinthu Raja Subject: [PATCH V4 3/3] arm64: dts: ti: k3-am68-sk-base-board: Add pinmux for RPi Header Date: Mon, 24 Apr 2023 13:45:36 +0530 Message-Id: <20230424081536.12123-4-sinthu.raja@ti.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230424081536.12123-1-sinthu.raja@ti.com> References: <20230424081536.12123-1-sinthu.raja@ti.com> MIME-Version: 1.0 X-BESS-ID: 1682325567-302766-5454-1234-1 X-BESS-VER: 2019.1_20230419.1731 X-BESS-Apparent-Source-IP: 209.85.166.71 X-BESS-Parts: H4sIAAAAAAACA4uuVkqtKFGyUirNy1bSUcovVrIyMTU1AbIygIIGBubGBsmpho kWZkaJlolGZuam5gZGaRaG5ikWJpapBkq1sQC+wbMHQQAAAA== X-BESS-BRTS-Status: 1 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE, SPF_PASS,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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1764048837497336243?= X-GMAIL-MSGID: =?utf-8?q?1764048837497336243?= From: Sinthu Raja Add pinmux required to bring out the i2c and gpios on 40-pin RPi expansion header on the AM68 SK board. Signed-off-by: Sinthu Raja --- Changes in V4: * Correct the pinctrl node offsets as per the newly split wkup_pmx* and main_pmx* nodes. .../boot/dts/ti/k3-am68-sk-base-board.dts | 77 ++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts b/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts index a811a512262b..ff859b78def7 100644 --- a/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts +++ b/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts @@ -171,6 +171,32 @@ J721S2_IOPAD(0x0a0, PIN_INPUT, 0) /* (AB25) MCASP0_AXR12.MCAN7_RX */ J721S2_IOPAD(0x09c, PIN_INPUT, 0) /* (T24) MCASP0_AXR11.MCAN7_TX */ >; }; + + main_i2c4_pins_default: main-i2c4-pins-default { + pinctrl-single,pins = < + J721S2_IOPAD(0x010, PIN_INPUT_PULLUP, 8) /* (AF28) MCAN13_RX.I2C4_SDA */ + J721S2_IOPAD(0x014, PIN_INPUT_PULLUP, 8) /* (AD25) MCAN14_TX.I2C4_SCL */ + >; + }; + + rpi_header_gpio0_pins_default: rpi-header-gpio0-pins-default { + pinctrl-single,pins = < + J721S2_IOPAD(0x0a8, PIN_INPUT, 7) /* (U24) MCASP0_AXR14.GPIO0_42 */ + J721S2_IOPAD(0x090, PIN_INPUT, 7) /* (W24) MCASP0_AXR8.GPIO0_36 */ + J721S2_IOPAD(0x0bc, PIN_INPUT, 7) /* (V28) MCASP1_AFSX.GPIO0_47 */ + J721S2_IOPAD(0x06c, PIN_INPUT, 7) /* (V26) MCAN1_TX.GPIO0_27 */ + J721S2_IOPAD(0x004, PIN_INPUT, 7) /* (W25) MCAN12_TX.GPIO0_1 */ + J721S2_IOPAD(0x008, PIN_INPUT, 7) /* (AC24) MCAN12_RX.GPIO0_2 */ + J721S2_IOPAD(0x0b8, PIN_INPUT, 7) /* (AA24) MCASP1_ACLKX.GPIO0_46 */ + J721S2_IOPAD(0x00c, PIN_INPUT, 7) /* (AE28) MCAN13_TX.GPIO0_3 */ + J721S2_IOPAD(0x034, PIN_INPUT, 7) /* (AD24) PMIC_WAKE0.GPIO0_13 */ + J721S2_IOPAD(0x0a4, PIN_INPUT, 7) /* (T23) MCASP0_AXR13.GPIO0_41 */ + J721S2_IOPAD(0x0c0, PIN_INPUT, 7) /* (T28) MCASP1_AXR0.GPIO0_48 */ + J721S2_IOPAD(0x0b4, PIN_INPUT, 7) /* (U25) MCASP1_AXR4.GPIO0_45 */ + J721S2_IOPAD(0x0cc, PIN_INPUT, 7) /* (AE27) SPI0_CS0.GPIO0_51 */ + J721S2_IOPAD(0x08c, PIN_INPUT, 7) /* (T25) MCASP0_AXR7.GPIO0_35 */ + >; + }; }; &main_pmx1 { @@ -221,12 +247,46 @@ J721S2_WKUP_IOPAD(0x068, PIN_OUTPUT, 0) /* (C23) WKUP_GPIO0_4.MCU_MCAN1_TX*/ >; }; + mcu_i2c0_pins_default: mcu-i2c0-pins-default { + pinctrl-single,pins = < + J721S2_WKUP_IOPAD(0x098, PIN_INPUT, 0) /*(H24) WKUP_GPIO0_63.MCU_I2C0_SCL*/ + J721S2_WKUP_IOPAD(0x09C, PIN_INPUT, 0) /*(H27) WKUP_GPIO0_64.MCU_I2C0_SDA*/ + >; + }; + mcu_i2c1_pins_default: mcu-i2c1-pins-default { pinctrl-single,pins = < J721S2_WKUP_IOPAD(0x078, PIN_INPUT, 0) /* (F24) WKUP_GPIO0_8.MCU_I2C1_SCL */ J721S2_WKUP_IOPAD(0x07c, PIN_INPUT, 0) /* (H26) WKUP_GPIO0_9.MCU_I2C1_SDA */ >; }; + + mcu_rpi_header_gpio0_pins0_default: mcu-rpi-header-gpio0-pins0-default { + pinctrl-single,pins = < + J721S2_WKUP_IOPAD(0x118, PIN_INPUT, 7) /* (G25) WKUP_GPIO0_66 */ + J721S2_WKUP_IOPAD(0x05C, PIN_INPUT, 7) /* (E24) MCU_SPI1_D0.WKUP_GPIO0_1 */ + J721S2_WKUP_IOPAD(0x060, PIN_INPUT, 7) /* (C28) MCU_SPI1_D1.WKUP_GPIO0_2 */ + J721S2_WKUP_IOPAD(0x058, PIN_INPUT, 7) /* (D26) MCU_SPI1_CLK.WKUP_GPIO0_0 */ + J721S2_WKUP_IOPAD(0x094, PIN_INPUT, 7) /* (D25) MCU_SPI1_CS2.WKUP_GPIO0_15*/ + J721S2_WKUP_IOPAD(0x0B8, PIN_INPUT, 7) /* (G27) WKUP_GPIO0_56 */ + J721S2_WKUP_IOPAD(0x114, PIN_INPUT, 7) /* (J26) WKUP_GPIO0_57 */ + J721S2_WKUP_IOPAD(0x11C, PIN_INPUT, 7) /* (J27) WKUP_GPIO0_67 */ + J721S2_WKUP_IOPAD(0x064, PIN_INPUT, 7) /* (C27) MCU_SPI1_CS0.WKUP_GPIO0_3 */ + >; + }; +}; + +&wkup_pmx3 { + mcu_rpi_header_gpio0_pins1_default: mcu-rpi-header-gpio0-pins1-default { + pinctrl-single,pins = < + J721S2_WKUP_IOPAD(0x000, PIN_INPUT, 7) /* (K26) WKUP_GPIO0_49 */ + >; + }; +}; + +&main_gpio0 { + pinctrl-names = "default"; + pinctrl-0 = <&rpi_header_gpio0_pins_default>; }; &main_gpio2 { @@ -242,7 +302,8 @@ &main_gpio6 { }; &wkup_gpio0 { - status = "disabled"; + pinctrl-names = "default"; + pinctrl-0 = <&mcu_rpi_header_gpio0_pins0_default &mcu_rpi_header_gpio0_pins1_default>; }; &wkup_gpio1 { @@ -278,6 +339,20 @@ exp1: gpio@21 { }; }; +&main_i2c4 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&main_i2c4_pins_default>; + clock-frequency = <400000>; +}; + +&mcu_i2c0 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&mcu_i2c0_pins_default>; + clock-frequency = <400000>; +}; + &main_sdhci0 { /* Unused */ status = "disabled";