From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B7CD98801; Tue, 30 Apr 2024 11:22:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714476159; cv=none; b=avacNUEtqHhpPW+idVlmcgXhQqxyBHTRqQjBJSDnXlLcLwsvWfGPAXlJpgxKJB4ZJt1G78yfhgIBiKhQ5oGKzWhJf8cFqIaARFewRU+qPsz2aIUpBjISzcc94EzvnlHeNFC3ZnNVhxOtoK66LZ8HuPf65eVg+HxOTyNOL2mtjws= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714476159; c=relaxed/simple; bh=mfzMJrE64t4RHLZ4XMmIsMMqFeSHYp/9+mZPDDrYkMM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Suk7JJIgziYlIck8+hkQWc+PYyafJi+PwEJeGxmtyVOZuhgxMAq45U5/rQw52BRCWvtwG4yw7CHfVULu+y5Lf4x4N1MTECO/3laPOgg1tRT8122eTeFJynXvuQFdTyZSvBXJQV6cjQlz7PBsyCCzLCBVGWUqy72NxwrFnL9zA18= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=HmCyk54j; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="HmCyk54j" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 31193C2BBFC; Tue, 30 Apr 2024 11:22:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1714476159; bh=mfzMJrE64t4RHLZ4XMmIsMMqFeSHYp/9+mZPDDrYkMM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HmCyk54jPVRlV57kvJ3V1+vn2QamiD2NbmV7Tlf09a46+CtUVSQ1jHQLWxolUfyEh Y8lSt+UraUu3xrDidrmbEKt3E1dM0lcbrZDJbQt8OCLi8xBs4dl6xDhX5g5CXRs55q nN/MxWe4o4pIGbLJWw+PbWpI5tDICz6nEdedinBc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Quentin Schulz , Heiko Stuebner , Sasha Levin Subject: [PATCH 5.4 053/107] arm64: dts: rockchip: enable internal pull-up on PCIE_WAKE# for RK3399 Puma Date: Tue, 30 Apr 2024 12:40:13 +0200 Message-ID: <20240430103046.222787291@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240430103044.655968143@linuxfoundation.org> References: <20240430103044.655968143@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Quentin Schulz [ Upstream commit 945a7c8570916650a415757d15d83e0fa856a686 ] The PCIE_WAKE# has a diode used as a level-shifter, and is used as an input pin. While the SoC default is to enable the pull-up, the core rk3399 pinconf for this pin opted for pull-none. So as to not disturb the behaviour of other boards which may rely on pull-none instead of pull-up, set the needed pull-up only for RK3399 Puma. Fixes: 60fd9f72ce8a ("arm64: dts: rockchip: add Haikou baseboard with RK3399-Q7 SoM") Signed-off-by: Quentin Schulz Link: https://lore.kernel.org/r/20240308-puma-diode-pu-v2-2-309f83da110a@theobroma-systems.com Signed-off-by: Heiko Stuebner Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi index ecef3d9b0b93e..5382c2f0b6421 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi @@ -425,6 +425,11 @@ gpio1830-supply = <&vcc_1v8>; }; +&pcie_clkreqn_cpm { + rockchip,pins = + <2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_up>; +}; + &pinctrl { i2c8 { i2c8_xfer_a: i2c8-xfer { -- 2.43.0