From patchwork Mon Nov 27 18:46:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Bee X-Patchwork-Id: 170359 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3373327vqx; Mon, 27 Nov 2023 10:47:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IFl+OwvZgbO2NBzHBf4eieWovXDvjWuCmv7tKpmA7h0kzXaPsyPTGObnyDon2POLkVCamzf X-Received: by 2002:aa7:88ce:0:b0:6cb:d24b:878c with SMTP id k14-20020aa788ce000000b006cbd24b878cmr13594630pff.12.1701110864509; Mon, 27 Nov 2023 10:47:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701110864; cv=none; d=google.com; s=arc-20160816; b=awrt9pJtKcjtlLaqjXEdqsbMIrkg3K5ZpOeFHFniMdZu131ql7iTcXob6i3rsHuVjI TG9i/n8S5X9bmVkaX7qRAPABr4th9VQeAwmmyWcwvj+TvV2W6uT4f102xvpnPu2va6YJ /jv1LH5lWQoXDrHJM0Hb8mJqnk1SrCAk0kh4HB3Ap5InqxncFxsmtIyio9TtGz/vwz/K CK+w4c3GgUHwEdSXedUqjNvKAXaF9vqQ4QXh+dc0vEi2Vr+GRCv+Oot6ii66XwJp4C/t ELpNBJhPkG5UcY7RYjV2o8ZM5n8jC+auyb70ZG2mMIFakfFO3Ky1LNsHaotlushAgvns el7Q== 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=feoucnNh3cnG002IsGWyER4iW7pfsWcNc8v7OfR+1cU=; fh=K3bwozZaqnqgYpUTfo24/c5PzIBEqdZLjFfhFBKORSk=; b=zerLRa7iknm47JwFhxhfU8PhGMqqvCfed0JJVXKmJIf3l387v8oYYCFDMST7bPo7s1 iZn/GyYLEqPQMUiLaJo5Z5mFmyMBS5wYB4D+axexjuLkb8xOBE5CWpxIa446/q2a0Hlq tSCexpYgXJ1FfwbrwW6HSVFvLg6H51vRUP91p7eKTcslCSqJUgf4Ev3B/cieb6c3qGNu cUuXoBNpab/ARvk7sUUgAlykpo2fjZ5efA29EvxAEn9GNeKr3V+1nxcpmZINcrESVSJe 672RTz/RamvmL7ww4131Q9FcjMfCCo1ib6HzS92bkfbTss5LrQP29hI1KiNaUX6Q93jQ waVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="bdP8QAj/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id y126-20020a62ce84000000b006cd8454cbbcsi4213239pfg.212.2023.11.27.10.47.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 10:47:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="bdP8QAj/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 6B3C280E7091; Mon, 27 Nov 2023 10:47:41 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230051AbjK0Src (ORCPT + 99 others); Mon, 27 Nov 2023 13:47:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229531AbjK0Srb (ORCPT ); Mon, 27 Nov 2023 13:47:31 -0500 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 83F8C1A1; Mon, 27 Nov 2023 10:47:37 -0800 (PST) Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-9fcfd2a069aso635984366b.1; Mon, 27 Nov 2023 10:47:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701110856; x=1701715656; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=feoucnNh3cnG002IsGWyER4iW7pfsWcNc8v7OfR+1cU=; b=bdP8QAj/qLSJL8501SKkxcefdV2GDw+y2AnbQyAjoafEfyttgQL2THiXEviedljJtD OtRVp9NZT2c8yC+c1bdG9xFqI8qxoZzgO+faTs0b8Qeqav4EnZp1PE4xrCT4zA43dQJU Bx+Mdbghsisku2/lwNCXNU4C5WbXJwWXEIF7Wc4cysEgKCjHXm9kt/Bfk1vxG8kTts0C D41Db+iSyc6dViERmxBJtIBA4nLtX3+kE9uZmiNKkIREmVko5Y8n3yQf8+mULSyRL78i tuDw/h9au0+S7RZVymPnlBey0AqeiYeqdNwFcYTT42PXDYuUDFX78ezicRPy8SdynhxV mofA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701110856; x=1701715656; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=feoucnNh3cnG002IsGWyER4iW7pfsWcNc8v7OfR+1cU=; b=EPK++922wb7JsngS1skNytvdqwLPLOUMCxTP+8iFKHe+9+2KtsNRgOeHQt1Z1W7ymX UV5ThhGS67OyJvkyW9rxQrDN8xkkX+umesjbjH+x7sLsgpcRrLX05KRoV1L72xBOfNpg ZbFTaUXDptH1QRuaCMsUORX+eKhCQZbYzrO9XlikLT55JsVk3qyLs7z2Il2Zkdauxw+c 9fj/NtdxUZIvkIOM+aw8SNQ1UTezYcBKJ+J4L2YTY6+KlLSYQwF1au9a5jaLmUza3CWv sU+g972m/wIrl9b/+dWQB4qFwzy+ikLGYN63WsMj+RV1gR3b9GHArWU5uR3XV2oib9d4 JLxw== X-Gm-Message-State: AOJu0YyW+Pn2ZKXMObKWDmN3GztdTITANRYpZ9YFLKHE1Ej03h77BYiu RiTPgHfuIYEiUyOBEm8e1Q== X-Received: by 2002:a17:907:a092:b0:9fd:ab4:5859 with SMTP id hu18-20020a170907a09200b009fd0ab45859mr10100668ejc.66.1701110855697; Mon, 27 Nov 2023 10:47:35 -0800 (PST) Received: from U4.lan ([2a02:810b:f40:4300:370c:d8f:2dce:7367]) by smtp.gmail.com with ESMTPSA id 26-20020a170906009a00b009b9aa8fffdasm5907725ejc.131.2023.11.27.10.47.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 10:47:35 -0800 (PST) From: Alex Bee To: Heiko Stuebner , Conor Dooley , Krzysztof Kozlowski , Rob Herring Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Alex Bee Subject: [PATCH] ARM: dts: rockchip: Fix sdmmc_pwren's pinmux setting for RK3128 Date: Mon, 27 Nov 2023 19:46:44 +0100 Message-ID: <20231127184643.13314-2-knaerzche@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,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 morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Mon, 27 Nov 2023 10:47:41 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783744025982534898 X-GMAIL-MSGID: 1783744025982534898 RK3128's reference design uses sdmmc_pwren pincontrol as GPIO - see [0]. Let's change it in the SoC DT as well. [0] https://github.com/rockchip-linux/kernel/commit/8c62deaf6025 Fixes: a0201bff6259 ("ARM: dts: rockchip: add rk3128 soc dtsi") Signed-off-by: Alex Bee --- This should have been part of my XPI-3128 board submission - it uses this pin as GPIO and adapts the reference design in this regard. Originally I had this as an override in the board DT, but later noticed this relatively new commit in vendor's kernel. I simply forgot to add that commit. arch/arm/boot/dts/rockchip/rk3128.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/rockchip/rk3128.dtsi b/arch/arm/boot/dts/rockchip/rk3128.dtsi index 4e8b38604ecd..b16786e81c08 100644 --- a/arch/arm/boot/dts/rockchip/rk3128.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3128.dtsi @@ -859,7 +859,7 @@ sdmmc_wp: sdmmc-wp { }; sdmmc_pwren: sdmmc-pwren { - rockchip,pins = <1 RK_PB6 1 &pcfg_pull_default>; + rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_default>; }; sdmmc_bus4: sdmmc-bus4 {