From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 B70F63F8704; Wed, 20 May 2026 18:12:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779300747; cv=none; b=B/exfVPQy6dYU97mlZlPTqDJek22DoV9eCHXrkEKjPVmFxinsnheneKgrO8rQXcATBCb6ZfRwgG7DdA7xRES1mWBMkkU6kRkPfzcED8cLAWF9j4xlikM80X8Nzc1vrMkorLitu+oXaTLcfdaW7+J1CYcl8dVM7/foo7F0RvKBCU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779300747; c=relaxed/simple; bh=9AQ74svgK98uI4kphHFX9nfIU+gD5H6LQCFiKIOY4tg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=k3PXFBl6FmHk3euk4iat1bZp3kVK+XuMCleiw3hec8+WfpQ1xfUFRGFdz5tEbOwKfh5phENkp8EMxcS7o4oYGVDqyARAA2qDH1BB+9Na5fVrogVgi2gP5PGKUrdWRp424XSZZ4CV4VCmN2a4cvvGbBe9BeM/yzwsPRgJNqZHmLo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=FmpUMxv3; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="FmpUMxv3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BE02C1F000E9; Wed, 20 May 2026 18:12:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779300746; bh=8+dn1MnCQw7w/cTxfS7zl0wm9oJ+2JtXJoEQrdj5zdY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=FmpUMxv3fYiYd7JwoRJhuHrVNVW+z8l/Z5Bqu+0AGBjZSQRh7TMGIPNHcTTsevn9k HZGLON5l7ICc5O31kzsXWAo6OKCZOU9ZNWPmVkS5EqrFLYLj/jVM7+BYg19RcB7ndz +vFUVb7BWMJIsyj0t0+Xe4HLyS0OR68+rIT40ZKA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Conor Dooley , Luca Weiss , Konrad Dybcio , Conor Dooley , Bjorn Andersson , Sasha Levin Subject: [PATCH 6.12 291/666] arm64: dts: qcom: sm7225-fairphone-fp4: Fix conflicting bias pinctrl Date: Wed, 20 May 2026 18:18:22 +0200 Message-ID: <20260520162117.523250279@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260520162111.222830634@linuxfoundation.org> References: <20260520162111.222830634@linuxfoundation.org> User-Agent: quilt/0.69 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 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Luca Weiss [ Upstream commit be7c1badb0b934cfe88427b1d4ec3eb9f52ba587 ] The pinctrl nodes from sm6350.dtsi already contain a bias-* property, so that needs to be deleted, otherwise the dtb will contain two conflicting bias-* properties. Reported-by: Conor Dooley Closes: https://lore.kernel.org/r/20260310-maritime-silly-05e7b7e03aa6@spud/ Fixes: c4ef464b24c5 ("arm64: dts: qcom: sm7225-fairphone-fp4: Add Bluetooth") Signed-off-by: Luca Weiss Reviewed-by: Konrad Dybcio Reviewed-by: Conor Dooley Link: https://lore.kernel.org/r/20260319-fp4-uart1-fix-v1-1-f6b3fedef583@fairphone.com Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts index 52b16a4fdc432..83dac3ca53318 100644 --- a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts +++ b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts @@ -946,12 +946,14 @@ &qup_uart1_cts { * the Bluetooth module drives the pin in either * direction or leaves the pin fully unpowered. */ + /delete-property/ bias-disable; bias-bus-hold; }; &qup_uart1_rts { /* We'll drive RTS, so no pull */ drive-strength = <2>; + /delete-property/ bias-pull-down; bias-disable; }; @@ -962,12 +964,14 @@ &qup_uart1_rx { * in tri-state (module powered off or not driving the * signal yet). */ + /delete-property/ bias-disable; bias-pull-up; }; &qup_uart1_tx { /* We'll drive TX, so no pull */ drive-strength = <2>; + /delete-property/ bias-pull-up; bias-disable; }; -- 2.53.0