From patchwork Fri Aug 4 07:53:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kumar, Udit" X-Patchwork-Id: 131019 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:44a:b0:3f2:4152:657d with SMTP id ez10csp118196vqb; Fri, 4 Aug 2023 01:47:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGfcaWir7drZgtCnqWe4EiIlJppW5M7OKJ5c2FDaze8sO1mTrFcamaexBb7zZGngeXrOTHT X-Received: by 2002:a05:6a21:3294:b0:13f:53b1:c05d with SMTP id yt20-20020a056a21329400b0013f53b1c05dmr1142939pzb.47.1691138823506; Fri, 04 Aug 2023 01:47:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691138823; cv=none; d=google.com; s=arc-20160816; b=gbecRNVUjfv92Q2FIScOIapMfsrEuIg9FHLigcHBN3iEmb6GSt1I2QSa1Fml7Zjm60 vc5H0YCeipLfqmX7Q90WeWOMp0CUu7bxGARTgj4ARGPn6iB4fJo0+F08lwrwbQiGTy7y StCI/yy1ltr1J+nZfVcmHFd2EmRgB3gDzxT808lxCbT6gTRtQrfrFUOo1dSpNW8GQVid PIMxOmxFNCHbBa7NuiclhYu1aBU5RLUZpV45zzFDStZNQdX19F+1cmI1WGRPX7eiaLJA 0InS2FETnWZdTMB2aXcWopoxKj+cCqr8cM1JOtxGgQbS6I+8H2X2SfQEbJSZ4+7pBSY4 /TPw== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=PMXgapMkSvNeLPU1BlGgnxC2b0f+OZimPpo2yjtl2vo=; fh=ksJeDaOC77KWyz/CisMhMYp+5g+tH1wbdXwGbFNr7IY=; b=x16oyhATo4ydJSZtY7Tduw62znZbN9kK3S+xusCB8IjOxrjI9dI1rXuYa11HuGSio0 b8xsGnueWwl2AudONtYgXw+TlyFUs/lkfwEyBL4ZWVYlVidtZ9RQHBGQNCSgRO7htOL/ 3FAH5walQp8F7NhvWHwhhndles4zsktfIGYEE5ZCzIM7VsqqDTT7PdpBk8CC+rR6rqab 4rBObNWXKSyOr4Ap8MslwyFkZwrLm229ETy62U73W2uLX5LJmw3TvZzeJhspLIUNQMow VVOtDEkMANUMy4bwZxVUSAKaQnjwQa1b5pBoggxlCJpsTGgvgZPo9LYHIRDYyfAQ7Ql2 9btQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=hdKRRrwp; 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=NONE dis=NONE) header.from=ti.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k3-20020a056a00134300b006669351f328si1450261pfu.388.2023.08.04.01.46.50; Fri, 04 Aug 2023 01:47:03 -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=@ti.com header.s=ti-com-17Q1 header.b=hdKRRrwp; 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=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234174AbjHDHyG (ORCPT + 99 others); Fri, 4 Aug 2023 03:54:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44210 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230286AbjHDHyA (ORCPT ); Fri, 4 Aug 2023 03:54:00 -0400 Received: from lelv0143.ext.ti.com (lelv0143.ext.ti.com [198.47.23.248]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 97D4C12B; Fri, 4 Aug 2023 00:53:59 -0700 (PDT) Received: from fllv0034.itg.ti.com ([10.64.40.246]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 3747roab100435; Fri, 4 Aug 2023 02:53:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1691135630; bh=PMXgapMkSvNeLPU1BlGgnxC2b0f+OZimPpo2yjtl2vo=; h=From:To:CC:Subject:Date; b=hdKRRrwpHxxlLfQZvxVNeQemVGunIANo+kt1UrFKYpmhT9NCBwenQXlHdnkU0DbKY HfuHUdBgF1tl6Jt618N/1y80g1FeM847D/zJoOTlNQOwebDKcTGqKHu0i0CPawpNlV GrKc1u68F1/IRDSBG4U6ABB5Ecz51rckg/rraebI= Received: from DLEE112.ent.ti.com (dlee112.ent.ti.com [157.170.170.23]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 3747robs107449 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 4 Aug 2023 02:53:50 -0500 Received: from DLEE105.ent.ti.com (157.170.170.35) by DLEE112.ent.ti.com (157.170.170.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Fri, 4 Aug 2023 02:53:50 -0500 Received: from fllv0040.itg.ti.com (10.64.41.20) by DLEE105.ent.ti.com (157.170.170.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Fri, 4 Aug 2023 02:53:50 -0500 Received: from udit-HP-Z2-Tower-G9-Workstation-Desktop-PC.dhcp.ti.com (ileaxei01-snat.itg.ti.com [10.180.69.5]) by fllv0040.itg.ti.com (8.15.2/8.15.2) with ESMTP id 3747rjvx055067; Fri, 4 Aug 2023 02:53:46 -0500 From: Udit Kumar To: , , , , , , , , , , , , CC: Udit Kumar Subject: [PATCH v4] arm64: dts: ti: k3-j721s2: correct pinmux offset for ospi Date: Fri, 4 Aug 2023 13:23:41 +0530 Message-ID: <20230804075341.3858488-1-u-kumar1@ti.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,SPF_PASS,URIBL_BLOCKED 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: INBOX X-GMAIL-THRID: 1773287582693477551 X-GMAIL-MSGID: 1773287582693477551 Due to non-addressable regions in J721S2 SOC wkup_pmx was split into four regions from wkup_pmx0 to wkup_pmx3. Correcting OSPI1 pin mux, which now falls under wkup_pmx1. Along with that removing unused pin mux for OSPI-0. Fixes: 6bc829ceea41 ("arm64: dts: ti: k3-j721s2: Fix wkup pinmux range") Signed-off-by: Udit Kumar Reviewed-by: Vaishnav Achath --- Logs with v4 https://gist.github.com/uditkumarti/84a18d9c9a62fe0d22ee7c650340b12e line 980 and 983 Both flashes are detected Logs with original tree https://gist.github.com/uditkumarti/41d3d7ccf278d4e00e6da349478e58aa (line 1192) pin mux error, line 1209 and 1212 flashes are not detected dtbs_check run after applying https://lore.kernel.org/all/20230721082654.27036-1-tony@atomide.com/ Change log: Changes in v4: - Removed unused CS pin mux - Rebased and tested with next-20230804 - v3 : https://lore.kernel.org/all/20230803145655.806001-1-u-kumar1@ti.com/ Changes in v3: - Corrected wkup_pmx for ospi1 - Removed unused pin MCU_OSPI1_CSn1, shared with pmic - v2: https://lore.kernel.org/all/20230802113500.162276-1-u-kumar1@ti.com/ Changes in v2: - Changed name of pin mux to align with https://lore.kernel.org/all/20230721082654.27036-1-tony@atomide.com/ patch - v1: https://lore.kernel.org/all/20230801125626.3287306-1-u-kumar1@ti.com/ .../dts/ti/k3-j721s2-common-proc-board.dts | 19 ++++++++++--------- arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi | 3 --- 2 files changed, 10 insertions(+), 12 deletions(-) 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 20b32563c0ed..e81ef8a7a8a2 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 @@ -282,18 +282,19 @@ J721S2_WKUP_IOPAD(0x104, PIN_INPUT, 0) /* (N26) MCU_ADC1_AIN6 */ J721S2_WKUP_IOPAD(0x108, PIN_INPUT, 0) /* (N27) MCU_ADC1_AIN7 */ >; }; +}; +&wkup_pmx1 { mcu_fss0_ospi1_pins_default: mcu-fss0-ospi1-default-pins { pinctrl-single,pins = < - J721S2_WKUP_IOPAD(0x040, PIN_OUTPUT, 0) /* (A19) MCU_OSPI1_CLK */ - J721S2_WKUP_IOPAD(0x05c, PIN_OUTPUT, 0) /* (D20) MCU_OSPI1_CSn0 */ - J721S2_WKUP_IOPAD(0x060, PIN_OUTPUT, 0) /* (C21) MCU_OSPI1_CSn1 */ - J721S2_WKUP_IOPAD(0x04c, PIN_INPUT, 0) /* (D21) MCU_OSPI1_D0 */ - J721S2_WKUP_IOPAD(0x050, PIN_INPUT, 0) /* (G20) MCU_OSPI1_D1 */ - J721S2_WKUP_IOPAD(0x054, PIN_INPUT, 0) /* (C20) MCU_OSPI1_D2 */ - J721S2_WKUP_IOPAD(0x058, PIN_INPUT, 0) /* (A20) MCU_OSPI1_D3 */ - J721S2_WKUP_IOPAD(0x048, PIN_INPUT, 0) /* (B19) MCU_OSPI1_DQS */ - J721S2_WKUP_IOPAD(0x044, PIN_INPUT, 0) /* (B20) MCU_OSPI1_LBCLKO */ + J721S2_WKUP_IOPAD(0x008, PIN_OUTPUT, 0) /* (A19) MCU_OSPI1_CLK */ + J721S2_WKUP_IOPAD(0x024, PIN_OUTPUT, 0) /* (D20) MCU_OSPI1_CSn0 */ + J721S2_WKUP_IOPAD(0x014, PIN_INPUT, 0) /* (D21) MCU_OSPI1_D0 */ + J721S2_WKUP_IOPAD(0x018, PIN_INPUT, 0) /* (G20) MCU_OSPI1_D1 */ + J721S2_WKUP_IOPAD(0x01c, PIN_INPUT, 0) /* (C20) MCU_OSPI1_D2 */ + J721S2_WKUP_IOPAD(0x020, PIN_INPUT, 0) /* (A20) MCU_OSPI1_D3 */ + J721S2_WKUP_IOPAD(0x010, PIN_INPUT, 0) /* (B19) MCU_OSPI1_DQS */ + J721S2_WKUP_IOPAD(0x00c, PIN_INPUT, 0) /* (B20) MCU_OSPI1_LBCLKO */ >; }; }; diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi b/arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi index 594766482071..a4006f328027 100644 --- a/arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi +++ b/arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi @@ -56,9 +56,6 @@ mcu_fss0_ospi0_pins_default: mcu-fss0-ospi0-default-pins { pinctrl-single,pins = < J721S2_WKUP_IOPAD(0x000, PIN_OUTPUT, 0) /* (D19) MCU_OSPI0_CLK */ J721S2_WKUP_IOPAD(0x02c, PIN_OUTPUT, 0) /* (F15) MCU_OSPI0_CSn0 */ - J721S2_WKUP_IOPAD(0x030, PIN_OUTPUT, 0) /* (G17) MCU_OSPI0_CSn1 */ - J721S2_WKUP_IOPAD(0x038, PIN_OUTPUT, 0) /* (F14) MCU_OSPI0_CSn2 */ - J721S2_WKUP_IOPAD(0x03c, PIN_OUTPUT, 0) /* (F17) MCU_OSPI0_CSn3 */ J721S2_WKUP_IOPAD(0x00c, PIN_INPUT, 0) /* (C19) MCU_OSPI0_D0 */ J721S2_WKUP_IOPAD(0x010, PIN_INPUT, 0) /* (F16) MCU_OSPI0_D1 */ J721S2_WKUP_IOPAD(0x014, PIN_INPUT, 0) /* (G15) MCU_OSPI0_D2 */