From patchwork Tue Apr 15 13:52:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 881952 Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6E6B11A255C for ; Tue, 15 Apr 2025 13:53:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744725203; cv=none; b=pqjtfmxWeGumaerYdNJVNTksI8OWe0bvfBghoflO31SUV0K4EDulCG2LyRvK7Y/HuyPlrolLW/Ztw81riWU3HwDfZ6CN6CxVZ5ksZfD7hCY1H0kbUkcnAynByBGNIOEUTB0KHMS8gZZ76XwvnjjEqup1R8vx5s5OCtJPG2gtUCQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744725203; c=relaxed/simple; bh=7rT0DnZ40BX0chd62YZIMarCtZkIZTK+AlWOSsnMwGU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=k2tq+SH7RVeGdvFwLtR7YV/SalSt5Fc9pwGeWbmgC2CH/1Ty6awVjPV3fBRaMvZQCPMts0wxR9Je0LaEtzfau1OmnR2LrYHqLlhddAL0G272Jc9k/YQZINCiJ689DcoIoRnQ7blKdlTyNHChURmm78vhadj7UVWBV52kUBxq0qg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=y7IMz9/t; arc=none smtp.client-ip=209.85.218.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="y7IMz9/t" Received: by mail-ej1-f46.google.com with SMTP id a640c23a62f3a-ac73723b2d5so1112580566b.3 for ; Tue, 15 Apr 2025 06:53:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744725199; x=1745329999; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=S6tYxjgZnNiRfOX1HagPvU4+OfIiUTK0uIOiDBKkMjM=; b=y7IMz9/tz7QC4qUgfMWO0TWDSiNTNhL4gduoy/OHKLrBiVNzu1OyGP8P5FD7i68Rjw sb/M9r33+hrgykmJDPuMYKCrlXShESp5+TAwbG34Yboym2ZIqvaU7gI+F2ipF9YQ5Hii bgk4DDr6iAKRyYiB+shAy1QC0vqN2JmOJ+2c2Y/ZzluCdMrf9xu+OjfD9JAJUSZzIj4V lVZY3x/Pz/koSA6M4wKlq1PJSf94vb/Rf2gEyKuJPZsIHgzCVkSCE++m3SvmaZTgom+x asDo4fdIq9NTdjxRnO5LOHlbYtRto1Du1eMLPDNf++GZl4UB983ga22yiBqlPi0dOdb6 jAQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744725199; x=1745329999; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=S6tYxjgZnNiRfOX1HagPvU4+OfIiUTK0uIOiDBKkMjM=; b=Ym89+4VCYr0UFFMtTbeywrgfgQzth/0kaTztey+FYzZdauZv+9lmLbij6moeL2jHdy G1UuHM5uFfl4vyh2fPGQ+IKqn9U4cDbcRQ8w8Ro8X+0E5fW961YTmA3E3rNdu69oc9Zf BmX8XgoSszp6x3fK79wbYUPpPRE7i7Esm8a79g/+/yX/NxSQm8BBxQ/k7T6VQoSneA2B BB5NiLcrGW7v+zocwPd+Pnk/Q590F6R0ngF0cFYnVvzQdrLa0/74ZvFBXAk8E1wPewfA 7T93B1/YMFRVDE+XZUmEYyEv9QkC3OJuIsRTBKkcfIVruqipDH1TM8jvVVxY5sBTIKOY M7cQ== X-Forwarded-Encrypted: i=1; AJvYcCVHULyxxOa8Ogy2XKsxdzBIL+ojvwY8myzqIi2GDUu4nEmbX+7n98ioLm/jB+2C6yWurUHzC6yArtCFjPtz@vger.kernel.org X-Gm-Message-State: AOJu0YyjoWYZ2P9UxvTST9EDw97epPZAYPcHZvMaOIGcShuYkcVbbjYz Vs77Z29diHEx6kuZOzQ7eHcLec/MvHL+LJlAPUfG8dBUZwa+a+Oy1SVoOgCRX6c= X-Gm-Gg: ASbGncsT0p+UVe39wdV582fNk5gMXrn7gjNDM6frCANqb2tpHOz8zlVScJ0r5b/r4Ya WS6VDO/G95H6HeLdUxltUf7UBCj0MZm2EX5OTdEDEHv2N20CwDmix+EU23vlrN51xG2gai2BzC6 zNH0gUcz/nnuQj3cSmDzCK56ECpyHhv0+Jr28Pq7YZiNu+4Ey18odufbO8oG+QzPwyxDUZxRjcS wg4Rztd2ZPwB2/3gZi7zMqG1k/Hs5vJa2oQrv4u0NvzbRMI5ZVdg08DxiA+K7CZGhXWn5Bvdcle 0j0Y64ulXzBckMYUfDBSSOBz8BJsKI2/YvJNXN3QdS5MmjVMyur+tEc= X-Google-Smtp-Source: AGHT+IFj4BGzQDL0tZmOUj1gbsZcM1OSfHV0iPjzyd8vrIYlrHFKk2z6XvkElZnyILkNERPUmwhmrw== X-Received: by 2002:a17:907:940a:b0:abf:6ec7:65e9 with SMTP id a640c23a62f3a-acad36a6206mr1463236066b.43.1744725198568; Tue, 15 Apr 2025 06:53:18 -0700 (PDT) Received: from [127.0.0.2] ([2a02:2454:ff21:ef41:7b18:2529:5ce1:343d]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-acadcc21a44sm681379166b.177.2025.04.15.06.53.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Apr 2025 06:53:18 -0700 (PDT) From: Stephan Gerhold Date: Tue, 15 Apr 2025 15:52:44 +0200 Subject: [PATCH 1/8] arm64: dts: qcom: msm8916/39: Move UART pinctrl to board files Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250415-msm8916-console-pinctrl-v1-1-a1d33ea994b9@linaro.org> References: <20250415-msm8916-console-pinctrl-v1-0-a1d33ea994b9@linaro.org> In-Reply-To: <20250415-msm8916-console-pinctrl-v1-0-a1d33ea994b9@linaro.org> To: Bjorn Andersson , Konrad Dybcio Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sam Day , Casey Connolly X-Mailer: b4 0.14.2 In preparation of adding a new console UART specific pinctrl template, move the pinctrl reference to the board DT part. This forces people porting new boards to consider what exactly they need for their board. No functional change for the boards upstream. Signed-off-by: Stephan Gerhold --- The ordering of the pinctrl before/after the "status" property matches the existing style of the files. --- arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 6 ++++++ arch/arm64/boot/dts/qcom/apq8016-schneider-hmibsc.dts | 6 ++++++ arch/arm64/boot/dts/qcom/apq8039-t2.dts | 6 ++++++ arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts | 3 +++ arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts | 3 +++ arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts | 3 +++ arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts | 3 +++ arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts | 3 +++ arch/arm64/boot/dts/qcom/msm8916-lg-c50.dts | 3 +++ arch/arm64/boot/dts/qcom/msm8916-lg-m216.dts | 3 +++ arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts | 3 +++ arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts | 3 +++ arch/arm64/boot/dts/qcom/msm8916-motorola-common.dtsi | 3 +++ arch/arm64/boot/dts/qcom/msm8916-mtp.dts | 3 +++ arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi | 3 +++ arch/arm64/boot/dts/qcom/msm8916-samsung-fortuna-common.dtsi | 3 +++ arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi | 3 +++ arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi | 3 +++ arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts | 3 +++ arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi | 3 +++ arch/arm64/boot/dts/qcom/msm8916-wingtech-wt865x8.dtsi | 3 +++ arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts | 3 +++ arch/arm64/boot/dts/qcom/msm8916.dtsi | 6 ------ arch/arm64/boot/dts/qcom/msm8939-huawei-kiwi.dts | 3 +++ arch/arm64/boot/dts/qcom/msm8939-longcheer-l9100.dts | 3 +++ arch/arm64/boot/dts/qcom/msm8939-samsung-a7.dts | 3 +++ arch/arm64/boot/dts/qcom/msm8939-wingtech-wt82918.dtsi | 3 +++ arch/arm64/boot/dts/qcom/msm8939.dtsi | 6 ------ 28 files changed, 87 insertions(+), 12 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts index aba08424aa38439952f959f79a9ded2201de1f7c..6175b1b9d7c6e82ef8ed3b6198b4b8cef81514d8 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts @@ -222,11 +222,17 @@ &blsp_spi5 { &blsp_uart1 { status = "okay"; label = "LS-UART0"; + pinctrl-0 = <&blsp_uart1_default>; + pinctrl-1 = <&blsp_uart1_sleep>; + pinctrl-names = "default", "sleep"; }; &blsp_uart2 { status = "okay"; label = "LS-UART1"; + pinctrl-0 = <&blsp_uart2_default>; + pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-names = "default", "sleep"; }; &camss { diff --git a/arch/arm64/boot/dts/qcom/apq8016-schneider-hmibsc.dts b/arch/arm64/boot/dts/qcom/apq8016-schneider-hmibsc.dts index 75c6137e5a11dd5c738681d676dfc9b014efb34c..7a03893530c7b89705f5544491c14edd7120acdc 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-schneider-hmibsc.dts +++ b/arch/arm64/boot/dts/qcom/apq8016-schneider-hmibsc.dts @@ -190,11 +190,17 @@ tpm@0 { }; &blsp_uart1 { + pinctrl-0 = <&blsp_uart1_default>; + pinctrl-1 = <&blsp_uart1_sleep>; + pinctrl-names = "default", "sleep"; label = "UART0"; status = "okay"; }; &blsp_uart2 { + pinctrl-0 = <&blsp_uart2_default>; + pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-names = "default", "sleep"; label = "UART1"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/apq8039-t2.dts b/arch/arm64/boot/dts/qcom/apq8039-t2.dts index 4f82bb668616f942d65f59a6f418cf38f404df32..f656eca59ee23a6d19450b4d3fee7a661b002709 100644 --- a/arch/arm64/boot/dts/qcom/apq8039-t2.dts +++ b/arch/arm64/boot/dts/qcom/apq8039-t2.dts @@ -116,6 +116,9 @@ &blsp_i2c5 { }; &blsp_uart1 { + pinctrl-0 = <&blsp_uart1_default>; + pinctrl-1 = <&blsp_uart1_sleep>; + pinctrl-names = "default", "sleep"; status = "okay"; }; @@ -128,6 +131,9 @@ &blsp_uart1_sleep { }; &blsp_uart2 { + pinctrl-0 = <&blsp_uart2_default>; + pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-names = "default", "sleep"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts b/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts index b4ce14a79370bc16b7d8fe144e56f4bb27e01534..9b82468ace3edfe8d808492b83e7753d3314e7af 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts @@ -133,6 +133,9 @@ touchscreen@38 { }; &blsp_uart2 { + pinctrl-0 = <&blsp_uart2_default>; + pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-names = "default", "sleep"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts index 3459145516a12ae8e054e24b3ed9b73f9d79905a..1c2f8e8f9b263b024cc7c239447e7158262b0c1c 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts @@ -214,6 +214,9 @@ led@1 { &blsp_uart2 { status = "okay"; + pinctrl-0 = <&blsp_uart2_default>; + pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-names = "default", "sleep"; }; &mpss_mem { diff --git a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts index 77618c7374dfe29cf5660e0834aa2b0fa6f3d67c..f7a9ee0dba09eef83e9b4149856cdefa0ae3fd4b 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts @@ -130,6 +130,9 @@ touchscreen@38 { &blsp_uart2 { status = "okay"; + pinctrl-0 = <&blsp_uart2_default>; + pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-names = "default", "sleep"; }; &mpss_mem { diff --git a/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts b/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts index f7be7e3718209b9ca96afb13ea1aca05e1388225..e5ca1ca0d9976a0d36af5359e705ca7b2070122b 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts @@ -131,6 +131,9 @@ touchscreen@38 { }; &blsp_uart2 { + pinctrl-0 = <&blsp_uart2_default>; + pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-names = "default", "sleep"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts index bf7fc89dd106f670e7cda270c7284a6a3d7d052d..f75e60b5d1b3b40673cb0639a3f8d0056d037a02 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts @@ -214,6 +214,9 @@ nfc@28 { &blsp_uart2 { status = "okay"; + pinctrl-0 = <&blsp_uart2_default>; + pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-names = "default", "sleep"; }; &lpass { diff --git a/arch/arm64/boot/dts/qcom/msm8916-lg-c50.dts b/arch/arm64/boot/dts/qcom/msm8916-lg-c50.dts index a823a1c4020894edf845130e72803b48dbd24ac8..7c49b4cb27cb5a9914b38865596eb27541f390fd 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-lg-c50.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-lg-c50.dts @@ -59,6 +59,9 @@ reg_sd_vmmc: regulator-sdcard-vmmc { }; &blsp_uart2 { + pinctrl-0 = <&blsp_uart2_default>; + pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-names = "default", "sleep"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-lg-m216.dts b/arch/arm64/boot/dts/qcom/msm8916-lg-m216.dts index 07345e694f6f46bbf71ed3c551b2a80d5f352d2c..6e55d37f588c9b829bb594ff156cda6cb8b6caf2 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-lg-m216.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-lg-m216.dts @@ -112,6 +112,9 @@ touchscreen@34 { }; &blsp_uart2 { + pinctrl-0 = <&blsp_uart2_default>; + pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-names = "default", "sleep"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts index 7f0c2c1b8a94b2c4d79e5e0b2b7188f4e2b2d281..4576178cc9b0936a7356b9852fc003fe949ed903 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts @@ -254,6 +254,9 @@ rmi4-f12@12 { &blsp_uart2 { status = "okay"; + pinctrl-0 = <&blsp_uart2_default>; + pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-names = "default", "sleep"; }; &pm8916_bms { diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts index 2cc54eaf72027a213f9d779c57fa22386bda934a..e0dacdf552452a36cbdb041b37d68eb4d661e6c8 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts @@ -178,6 +178,9 @@ imu@68 { &blsp_uart2 { status = "okay"; + pinctrl-0 = <&blsp_uart2_default>; + pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-names = "default", "sleep"; }; &mpss_mem { diff --git a/arch/arm64/boot/dts/qcom/msm8916-motorola-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-motorola-common.dtsi index 6a27d0ecd2ad23b462191a5a328a49a76ab13b42..48134e5ff524fd5708db7b9c3a567ec3f751868c 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-motorola-common.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-motorola-common.dtsi @@ -69,6 +69,9 @@ rmi4-f11@11 { }; &blsp_uart1 { + pinctrl-0 = <&blsp_uart1_default>; + pinctrl-1 = <&blsp_uart1_sleep>; + pinctrl-names = "default", "sleep"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-mtp.dts b/arch/arm64/boot/dts/qcom/msm8916-mtp.dts index c11a845e91bb5029e89905ec7dee3b07646dd4cb..c115142df364e99a4f566775d4d1679e6a8920e2 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-mtp.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-mtp.dts @@ -23,5 +23,8 @@ chosen { }; &blsp_uart2 { + pinctrl-0 = <&blsp_uart2_default>; + pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-names = "default", "sleep"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi index e6355e5e2177df9e3beba6b2d96a15fb069ce57a..58a548d220a485e9a92c012c1529e3fe838d6c9f 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi @@ -302,6 +302,9 @@ charger: charger { &blsp_uart2 { status = "okay"; + pinctrl-0 = <&blsp_uart2_default>; + pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-names = "default", "sleep"; }; &gpu { diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-fortuna-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-fortuna-common.dtsi index 7a7e99b015d9bf9686d2b41f7efb76a093c1730d..4290ae7782d659eb0d2594825717ffaf4c84076b 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-fortuna-common.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-fortuna-common.dtsi @@ -304,6 +304,9 @@ charger: charger { }; &blsp_uart2 { + pinctrl-0 = <&blsp_uart2_default>; + pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-names = "default", "sleep"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi index fbd2caf405d5f686a40a59ff7e0bfc78f164e03c..30e34574999c52f7ea99c9bd7af41101e5d4d4d0 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi @@ -116,6 +116,9 @@ fuelgauge@36 { }; &blsp_uart2 { + pinctrl-0 = <&blsp_uart2_default>; + pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-names = "default", "sleep"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi index 5ca2ada266f495e4584a5143a8cce6f1f1c4ad78..d4af7856f5f3a70160774d1637e39e19d163725d 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi @@ -135,6 +135,9 @@ touchscreen: touchscreen@50 { &blsp_uart2 { status = "okay"; + pinctrl-0 = <&blsp_uart2_default>; + pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-names = "default", "sleep"; }; &mpss_mem { diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts index caad1dead2e03c30dd6eb09b457439a9b0446126..45c3b3387b52030a6475ae0da2a2c89ea98ca6c1 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts @@ -319,6 +319,9 @@ rt5033_charger: charger { &blsp_uart2 { status = "okay"; + pinctrl-0 = <&blsp_uart2_default>; + pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-names = "default", "sleep"; }; &gpu { diff --git a/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi b/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi index c77ed04bb6c36dbc0cb7c0b09f50d1f18aafa4c9..2bfe56da8f6c624ed97d8a5750d12c59c039c874 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi @@ -72,6 +72,9 @@ &bam_dmux_dma { }; &blsp_uart2 { + pinctrl-0 = <&blsp_uart2_default>; + pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-names = "default", "sleep"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt865x8.dtsi b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt865x8.dtsi index 1a7c347dc3f08409f7db3b246c04687c666bba32..f5caac42bbad106f86448c217aa1472a32fbeaa6 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt865x8.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt865x8.dtsi @@ -93,6 +93,9 @@ touchscreen@38 { }; &blsp_uart2 { + pinctrl-0 = <&blsp_uart2_default>; + pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-names = "default", "sleep"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts index 510b3b3c4e3c4223c64bcfa563e0e080d033d7b7..10d0974334abf0e501ec97e2de487f40c1507f82 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts @@ -169,6 +169,9 @@ led@2 { &blsp_uart2 { status = "okay"; + pinctrl-0 = <&blsp_uart2_default>; + pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-names = "default", "sleep"; }; &mpss_mem { diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi index c89f9e92e832eae8f630555e9e7f5817d6731d4d..733c17d0495617e683d362d7b7aae59078f2a0b0 100644 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi @@ -2159,9 +2159,6 @@ blsp_uart1: serial@78af000 { clock-names = "core", "iface"; dmas = <&blsp_dma 0>, <&blsp_dma 1>; dma-names = "tx", "rx"; - pinctrl-names = "default", "sleep"; - pinctrl-0 = <&blsp_uart1_default>; - pinctrl-1 = <&blsp_uart1_sleep>; status = "disabled"; }; @@ -2173,9 +2170,6 @@ blsp_uart2: serial@78b0000 { clock-names = "core", "iface"; dmas = <&blsp_dma 2>, <&blsp_dma 3>; dma-names = "tx", "rx"; - pinctrl-names = "default", "sleep"; - pinctrl-0 = <&blsp_uart2_default>; - pinctrl-1 = <&blsp_uart2_sleep>; status = "disabled"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8939-huawei-kiwi.dts b/arch/arm64/boot/dts/qcom/msm8939-huawei-kiwi.dts index 3cec51891aed95968f7b5cb099ae2107691635fb..9f647027d082864ccaa240f7118f20a8d19f6a4a 100644 --- a/arch/arm64/boot/dts/qcom/msm8939-huawei-kiwi.dts +++ b/arch/arm64/boot/dts/qcom/msm8939-huawei-kiwi.dts @@ -126,6 +126,9 @@ touchscreen@1c { }; &blsp_uart2 { + pinctrl-0 = <&blsp_uart2_default>; + pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-names = "default", "sleep"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8939-longcheer-l9100.dts b/arch/arm64/boot/dts/qcom/msm8939-longcheer-l9100.dts index b845da4fa23e612f04cf8a8f15b8892e396a8c41..f59647b5b7dfdd7bf630f9d180bb56a10a3ea0a3 100644 --- a/arch/arm64/boot/dts/qcom/msm8939-longcheer-l9100.dts +++ b/arch/arm64/boot/dts/qcom/msm8939-longcheer-l9100.dts @@ -243,6 +243,9 @@ touchscreen@4a { }; &blsp_uart2 { + pinctrl-0 = <&blsp_uart2_default>; + pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-names = "default", "sleep"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8939-samsung-a7.dts b/arch/arm64/boot/dts/qcom/msm8939-samsung-a7.dts index ceba6e73b2112687d16ee595003c80ea1a93143a..3d9cbe7fdad8808968190d7a744bab29eeb0e827 100644 --- a/arch/arm64/boot/dts/qcom/msm8939-samsung-a7.dts +++ b/arch/arm64/boot/dts/qcom/msm8939-samsung-a7.dts @@ -373,6 +373,9 @@ charger: charger { }; &blsp_uart2 { + pinctrl-0 = <&blsp_uart2_default>; + pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-names = "default", "sleep"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8939-wingtech-wt82918.dtsi b/arch/arm64/boot/dts/qcom/msm8939-wingtech-wt82918.dtsi index 800e0747a2f79f6ef9a7d86d56c1a2006207b1c7..cbefe34327ba7b04ea57032c68dd69642e6d1685 100644 --- a/arch/arm64/boot/dts/qcom/msm8939-wingtech-wt82918.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8939-wingtech-wt82918.dtsi @@ -126,6 +126,9 @@ touchscreen: touchscreen@38 { }; &blsp_uart2 { + pinctrl-0 = <&blsp_uart2_default>; + pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-names = "default", "sleep"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8939.dtsi b/arch/arm64/boot/dts/qcom/msm8939.dtsi index ca478db63be4578b92d85e178548c5e16b29bf03..67ff2ffc6e455fa5ad8a664a161873507cab6391 100644 --- a/arch/arm64/boot/dts/qcom/msm8939.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8939.dtsi @@ -1770,9 +1770,6 @@ blsp_uart1: serial@78af000 { clock-names = "core", "iface"; dmas = <&blsp_dma 0>, <&blsp_dma 1>; dma-names = "tx", "rx"; - pinctrl-0 = <&blsp_uart1_default>; - pinctrl-1 = <&blsp_uart1_sleep>; - pinctrl-names = "default", "sleep"; status = "disabled"; }; @@ -1784,9 +1781,6 @@ blsp_uart2: serial@78b0000 { clock-names = "core", "iface"; dmas = <&blsp_dma 2>, <&blsp_dma 3>; dma-names = "tx", "rx"; - pinctrl-0 = <&blsp_uart2_default>; - pinctrl-1 = <&blsp_uart2_sleep>; - pinctrl-names = "default", "sleep"; status = "disabled"; }; From patchwork Tue Apr 15 13:52:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 881406 Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5FE971A315E for ; Tue, 15 Apr 2025 13:53:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744725203; cv=none; b=pX71NuXOcIWgMSK6MBXi3HKRyuokV4WtNgy3o/SJNsAjeS8YLEhUMOGom1d5R5OjsI/SRLvgyO1+naEiQFYPIW81zaND6LteEUCzKXh3modQfY6nCaMPEEETZi8pm81jsnSkzoxaoM/nfPAAOewIMhoh/KV9y65AVjwHM9xStAE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744725203; c=relaxed/simple; bh=w3WlQcntpBe85wnKizplsb4utHZXddeF30YcBF9V6T8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=eExr32pxOGeaf22/x2jdl4pbC3YeAf5DDrfvNPfIQgE7ekGENwaHDKigBj7PsHn6H4QeksmNMKjR79SUB595DwkfdGxkf9c6QK4pvTBNWFYoYt7rh2n1uCw8e0ieU82+wxKJnKYC7yrgg2Tj4C4wOE3q38jOYjxTv9pyR9oykIg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=b39IGyYt; arc=none smtp.client-ip=209.85.218.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="b39IGyYt" Received: by mail-ej1-f51.google.com with SMTP id a640c23a62f3a-ac289147833so1115570166b.2 for ; Tue, 15 Apr 2025 06:53:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744725200; x=1745330000; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=ocL8C9B6DxFYTI+XzvW6PxhfaIdPqGvVLvHUq+LfZSU=; b=b39IGyYtzYgWVp5z94ltAzxWIBdr8G9zrWjiQgksA4wJsnvSiRxX/Fp30cOrTfyfEg F125IAbH0dS0GTwvfyCHnxXSzudu0fzrFQ4kNNnBSPzyR0pSb0AoASbz4Yv51gF37J8x DTiel4E3sdX705I7giNRpLoaih4NmCtJANjbH/gUtCGjpzidY/nGGtToauAtw9DibDLO ps5WcAeD+kx5+O2cKx/5UteuiK9ecEvQi0voiWPisxSofVDTfwSitrD/9XgxGR6nIENP On9EvncqfGkRXhBo/5cK771bSW/Sp5Bf+5JMzWbURf+ZfDNNdNXxgeinjNG+UUeJPGvg 7ZgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744725200; x=1745330000; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ocL8C9B6DxFYTI+XzvW6PxhfaIdPqGvVLvHUq+LfZSU=; b=Vg1Hul2OrmmnLIm35b39WepmCk+78tX1jS3t2LOMam0XdJS5KRpVoxX2Dj7UNoq/eK 8GMe5+W3zew1t7+hzurQD6+b4++27O/D6QZQCauOBJjGkom7ilt1kaYJgJeSfK8nEp6p oi+R9QcNEzucrTkhcaTV0Xe0txfzxJ9nbEVbBSFxnJuCplVemYWXMSHzngSefsKExU+K XVuTyMT8/gCXRwJvu3USnVp2OllbL4tb7NW1g7j131f7uXGRK+nQtlug+1sJEGi633gY qScH171qnboDwjBKfDSmudqtlwc6n/M0H8PmlUfFSjApg1RUXEYa3z4yhXDGnLn7JCuc F7xQ== X-Forwarded-Encrypted: i=1; AJvYcCXQVzyMB4RDcfzNCnUF0KUENpbQJu8Hjm1ZFV8QnWdaU6HehLVlTJHMx8cCtTmHfcrpag6pJC29+5sFHgqY@vger.kernel.org X-Gm-Message-State: AOJu0YzWQWOVhrVjiep2oP8O2eTF30xbSZFWAV/JZrdWOyX9pb4ZrCjf en8KAZ1xrxZKGyBtCw7l8ZQBPNeiYHhmJxGx4xohATsjRjY7AAE3P+8Wgl113Sg= X-Gm-Gg: ASbGncsDnUOSeFtKv7DuGnwrNbSJBhkqcxxR5yzgEs8ePoNGWo4tOKFgdczTvSmfmI/ 6cVCHEu3LizmHj29hP2bFpRUdqYPr98uTokjBgZx9eeOXp093tC50aZpVNg0sehvuIG8cObyKcU drCg0bC5BAuyagE7n24DPCWX0eH8M82Bbi2lCOFhbjbsOEatwR6jNyhjNl/8vYJtub6sgHvmqEx lzMK4V4b2xMG7ClodBAhaows2QmAnnOhTer0JBDvUZh5sk0dvgczYZRS5NmE6Ce+dzNr9PXLdrF JDqMsCUl8MaqY751R8bz0/uQ0KP5EtR5Q8If/4O/ux3UJZG/SK13B/g= X-Google-Smtp-Source: AGHT+IHifoGCkv9G/x2m8KFU82j44OhfqXR3++NsCbFcIC9nGr6wuzzt7fHwhztGOnXT0wraoravHg== X-Received: by 2002:a17:907:1b09:b0:aca:96b6:a0f4 with SMTP id a640c23a62f3a-acad34a1c31mr1190134866b.23.1744725199514; Tue, 15 Apr 2025 06:53:19 -0700 (PDT) Received: from [127.0.0.2] ([2a02:2454:ff21:ef41:7b18:2529:5ce1:343d]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-acadcc21a44sm681379166b.177.2025.04.15.06.53.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Apr 2025 06:53:19 -0700 (PDT) From: Stephan Gerhold Date: Tue, 15 Apr 2025 15:52:45 +0200 Subject: [PATCH 2/8] arm64: dts: qcom: msm8916/39: Introduce new UART console pinctrl Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250415-msm8916-console-pinctrl-v1-2-a1d33ea994b9@linaro.org> References: <20250415-msm8916-console-pinctrl-v1-0-a1d33ea994b9@linaro.org> In-Reply-To: <20250415-msm8916-console-pinctrl-v1-0-a1d33ea994b9@linaro.org> To: Bjorn Andersson , Konrad Dybcio Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sam Day , Casey Connolly X-Mailer: b4 0.14.2 At the moment, msm8916/39.dtsi have two inconsistent UART pinctrl templates that are used by all the boards: - &blsp_uart1_default configures all 4 pins (TX, RX, CTS, RTS), some boards then limit this to just RX and TX - &blsp_uart2_default only configures 2 pins (TX, RX), even though UART2 also supports CTS/RTS It's difficult to define a generic pinctrl template for all UART use cases, since they are quite different in practice. The main use case for most of the 40+ MSM8916/39-based boards upstream is the UART debug console. The current generic template is lacking some properties to work properly: - bias-pull-up for RX: Generally, UART is push-pull and does not need pull up/down. Both sides drive TX, so RX should never be floating. This is why the current pinctrl in msm8916/39.dtsi uses bias-disable. However, this assumes that UART is always connected. For the debug console this will be rarely the case on mobile devices, only during debugging sessions. The rest of the time, the RX pin is floating. This has never caused massive problems, but it's obvious now that this needs fixing: (1) In U-Boot, we have been fighting with problems with autoboot for years. Most of the time, there is a single \0 byte ("break event") read during boot, which interrupts the autoboot process. I tried to work around that by inserting some random delay [1], but it turned out this is also not working reliably on all boards. What happens is: Since RX is floating, it switches randomly between high or low. A long low state is interpreted as "break event" (\0). (2) In postmarketOS, we used to have the "magic SysRq key" enabled by default for the serial console. We had to disable this at some point, because there was a small number of users who were reporting sysrq spam in the kernel log, possibly even crashes/panics triggered by sysrq. What likely happened is: SysRq is triggered by sending a "break event", like in (1). With enough luck, you could even trigger any of the SysRq actions if the RX pin switches between high and low (e.g. because of noise introduced by the LTE radio close by). We can fix this using bias-pull-up, but this may be unneeded, unexpected, or even unwanted for other UART use cases. - bootph-all: U-Boot needs to know which pinctrl to apply during early boot stages, so we should specify "bootph-all" for the console UART pinctrl. Without bootph-all, the bias-pull-up won't be applied early enough in U-Boot to avoid the problem with autoboot in point (1) above. It doesn't make sense to specify this for the other UART instances. bootph-all is a generic property documented in dt-schema bootph.yaml. Define these two additional properties only for the debug UART console, by defining a new pinctrl template specifically for that. In the following commits, boards will be converted to use these where appropriate. [1]: https://source.denx.de/u-boot/u-boot/-/commit/ad7e967738a9c639e07cf50b83ffccdf9a8537b0 Signed-off-by: Stephan Gerhold Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/msm8916.dtsi | 43 ++++++++++++++++++++++++++++++++++- arch/arm64/boot/dts/qcom/msm8939.dtsi | 43 ++++++++++++++++++++++++++++++++++- 2 files changed, 84 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi index 733c17d0495617e683d362d7b7aae59078f2a0b0..9f1796222c597afd45dd31131b198f3574e97885 100644 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi @@ -1247,6 +1247,30 @@ blsp_uart1_sleep: blsp-uart1-sleep-state { bias-pull-down; }; + blsp_uart1_console_default: blsp-uart1-console-default-state { + tx-pins { + pins = "gpio0"; + function = "blsp_uart1"; + drive-strength = <16>; + bias-disable; + bootph-all; + }; + rx-pins { + pins = "gpio1"; + function = "blsp_uart1"; + drive-strength = <16>; + bias-pull-up; + bootph-all; + }; + }; + + blsp_uart1_console_sleep: blsp-uart1-console-sleep-state { + pins = "gpio0", "gpio1"; + function = "gpio"; + drive-strength = <2>; + bias-pull-down; + }; + blsp_uart2_default: blsp-uart2-default-state { pins = "gpio4", "gpio5"; function = "blsp_uart2"; @@ -1254,7 +1278,24 @@ blsp_uart2_default: blsp-uart2-default-state { bias-disable; }; - blsp_uart2_sleep: blsp-uart2-sleep-state { + blsp_uart2_console_default: blsp-uart2-console-default-state { + tx-pins { + pins = "gpio4"; + function = "blsp_uart2"; + drive-strength = <16>; + bias-disable; + bootph-all; + }; + rx-pins { + pins = "gpio5"; + function = "blsp_uart2"; + drive-strength = <16>; + bias-pull-up; + bootph-all; + }; + }; + + blsp_uart2_sleep: blsp_uart2_console_sleep: blsp-uart2-sleep-state { pins = "gpio4", "gpio5"; function = "gpio"; drive-strength = <2>; diff --git a/arch/arm64/boot/dts/qcom/msm8939.dtsi b/arch/arm64/boot/dts/qcom/msm8939.dtsi index 67ff2ffc6e455fa5ad8a664a161873507cab6391..16c16ec0f4560a7102f8ffef20c58fbec81dee38 100644 --- a/arch/arm64/boot/dts/qcom/msm8939.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8939.dtsi @@ -919,6 +919,30 @@ blsp_uart1_sleep: blsp-uart1-sleep-state { bias-pull-down; }; + blsp_uart1_console_default: blsp-uart1-console-default-state { + tx-pins { + pins = "gpio0"; + function = "blsp_uart1"; + drive-strength = <16>; + bias-disable; + bootph-all; + }; + rx-pins { + pins = "gpio1"; + function = "blsp_uart1"; + drive-strength = <16>; + bias-pull-up; + bootph-all; + }; + }; + + blsp_uart1_console_sleep: blsp-uart1-console-sleep-state { + pins = "gpio0", "gpio1"; + function = "gpio"; + drive-strength = <2>; + bias-pull-down; + }; + blsp_uart2_default: blsp-uart2-default-state { pins = "gpio4", "gpio5"; function = "blsp_uart2"; @@ -926,7 +950,24 @@ blsp_uart2_default: blsp-uart2-default-state { bias-disable; }; - blsp_uart2_sleep: blsp-uart2-sleep-state { + blsp_uart2_console_default: blsp-uart2-console-default-state { + tx-pins { + pins = "gpio4"; + function = "blsp_uart2"; + drive-strength = <16>; + bias-disable; + bootph-all; + }; + rx-pins { + pins = "gpio5"; + function = "blsp_uart2"; + drive-strength = <16>; + bias-pull-up; + bootph-all; + }; + }; + + blsp_uart2_sleep: blsp_uart2_console_sleep: blsp-uart2-sleep-state { pins = "gpio4", "gpio5"; function = "gpio"; drive-strength = <2>; From patchwork Tue Apr 15 13:52:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 881951 Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 652C61AC44D for ; Tue, 15 Apr 2025 13:53:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744725205; cv=none; b=If94Fn+t+efzBro5ZUvV04IREy/Pl0iA2sEQfUFxgl+ZAsg1dcKgVLHjpv9nLPiaD1N0DrMvw+XWG4+nwhF/nl53HE0UugFx2LyURYwqZt2q4frAKo6xefynvOi7OZ8lb3h6vesSYhmLvxVHc42zS4j0VS5zRj2xszk5PeU4XPU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744725205; c=relaxed/simple; bh=90veFZYkI7tOsSfYhPXPr8MTVtRlDMrsdewxWsLlM80=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=kUSil39NfejSIOjwCLfC/DwCzYNpGRXErm1vVcj1Fqu1TDrR6WWATWDZwXCL9BeP/9O2iwI04enDAvVAEIesJRi0lR/9gOCWdZfz3kw4I83ZlHl0oAAFflMWU4+UO34qXVdcV3ZRM6aY3zBIQteIX/rtk4cKJZJRAY5LG9Yj/5A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=E22lVqLC; arc=none smtp.client-ip=209.85.218.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="E22lVqLC" Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-ac3b12e8518so932474066b.0 for ; Tue, 15 Apr 2025 06:53:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744725201; x=1745330001; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=F+VemoH6JbPZfntDzSZfUEE9eySHn4jqOWYpmcA1Ep4=; b=E22lVqLCWgIyMQhFIuvRgrk+20nIID2RaFGBhhv2CNbURJwiQSVYU1RnWT/j1vMBKf 4rdN7ty57EEKEqyTB2oTJuWQOzuxlFHLDVGqRM4/mHzsMnsTfWVCvIBpvG5ScSVeF0TK ytWWgbncjBdlGNLGJgrfOTJ+NJdw4XtHWN1MGqQeh4PRmJvCoY/2b905Y6Nlctr7XNBz W5zxcBH3JcrC28e1XVU3nKqcy1KRijsFCnZ5JCu1K7i53S8rBPzvM94qhlaFO/n8oPl9 2mL10gXSsh2c8NZRnpCs34LNBPkqAjH+w7fN+5BrQ6ERpd3Z/w8P3L608wrINTYSAz6e 8/eQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744725201; x=1745330001; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=F+VemoH6JbPZfntDzSZfUEE9eySHn4jqOWYpmcA1Ep4=; b=UugNUbg2sZYpQ21ek0hP9B+UguOyaBhkJSnu/A72qr5uLgwgWY2QWuoVdw4izh99Cj fZvbFUYF4VbiN54K3wcDFFqbjH4V9vus81m7yZd5Ls9o6bzjMGvCeqYfWu/ZGbc1v19b uSejd7paRRvTWxEPPacFVQM7NBDooKQIIDsJd8ILXVZk1bdvdUY5x7ez80VhAEdNSCrx GoTpSU2ex2Qlc4TQE8NDR1iyfIOHi/HgWpjzk11d9cLkvIxnmnotlULASSypBhriFV3L jhlgy5FmkN4acf+ki1AbWvDHIBcTiFHwVFJxpPHTpZcHcY/Y+LumUCfTKXNgWZO7k/kE Xjqw== X-Forwarded-Encrypted: i=1; AJvYcCWOHrrM6m4BBNQeWQkCxsvw567iKvXMk0heTCHT8UAiiVjAelL+XilsCEBDS30XriFGJPuWf4kBzVDF+miA@vger.kernel.org X-Gm-Message-State: AOJu0YwazXlQChdosBbCB8lmIBHj42P7GwHN9hISwJrc5nyPfXNCcM80 U7IWbIQ2abYoQLgEzlzDV6SDDM33g5AqjSVpGqpC+0agO9ugChDmWbnzjgzS4cY= X-Gm-Gg: ASbGncuNv+5uL13x/jgRRrAwSOk9+MjDNYN4aa/KrlEHM5iq/minb2MNO7tm2TKNsKG rIw99een3ozMgoFi3jpValtWMu17GFKj+84ExQmy6PCEJzoAlkZPgXMbFjX2j0369gGFHDM5pbu P7HNg0zEQfMbUpR0bwm55VB6e5kdjsVqg+p0+mwr7d1jiwx+NlXBznqwfXu2XpUnDw7KlAvgDf8 Ijr+/cnKsQqLDVvJO2olPxyvXUnMsrNW3xivbAedB9enyLESC5bHPRR2Th282Om9M69dsH/MsMB r3K+wMDkq1lgwuScTk8JTmf6D88S7zLR0Z0PKaInlWIHusR4o+E5QFo= X-Google-Smtp-Source: AGHT+IHCes0G+xk/lOar09FklsVADVO86cU+eaDfU0dbj2bA77b5QNHnjabmqTqpe+Ix/13ytNhHTw== X-Received: by 2002:a17:907:1b1e:b0:ac7:4f1:65c5 with SMTP id a640c23a62f3a-acad36d7ac0mr1453544966b.54.1744725200534; Tue, 15 Apr 2025 06:53:20 -0700 (PDT) Received: from [127.0.0.2] ([2a02:2454:ff21:ef41:7b18:2529:5ce1:343d]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-acadcc21a44sm681379166b.177.2025.04.15.06.53.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Apr 2025 06:53:20 -0700 (PDT) From: Stephan Gerhold Date: Tue, 15 Apr 2025 15:52:46 +0200 Subject: [PATCH 3/8] arm64: dts: qcom: msm8919/39: Use UART2 console pinctrl where appropriate Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250415-msm8916-console-pinctrl-v1-3-a1d33ea994b9@linaro.org> References: <20250415-msm8916-console-pinctrl-v1-0-a1d33ea994b9@linaro.org> In-Reply-To: <20250415-msm8916-console-pinctrl-v1-0-a1d33ea994b9@linaro.org> To: Bjorn Andersson , Konrad Dybcio Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sam Day , Casey Connolly X-Mailer: b4 0.14.2 Convert the majority of MSM8916/39-based boards, which use UART2 with 2 pins (TX, RX) for the debug UART console. This adds the needed bias-pull-up and bootph-all properties to avoid garbage input when UART is disconnected. apq8016-schneider-hmibsc.dts does not use UART2 as a debug console, so it's left as-is in this commit. Signed-off-by: Stephan Gerhold --- arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 4 ++-- arch/arm64/boot/dts/qcom/apq8039-t2.dts | 4 ++-- arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts | 4 ++-- arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts | 4 ++-- arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts | 4 ++-- arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts | 4 ++-- arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts | 4 ++-- arch/arm64/boot/dts/qcom/msm8916-lg-c50.dts | 4 ++-- arch/arm64/boot/dts/qcom/msm8916-lg-m216.dts | 4 ++-- arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts | 4 ++-- arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts | 4 ++-- arch/arm64/boot/dts/qcom/msm8916-mtp.dts | 4 ++-- arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi | 4 ++-- arch/arm64/boot/dts/qcom/msm8916-samsung-fortuna-common.dtsi | 4 ++-- arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi | 4 ++-- arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi | 4 ++-- arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts | 4 ++-- arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi | 4 ++-- arch/arm64/boot/dts/qcom/msm8916-wingtech-wt865x8.dtsi | 4 ++-- arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts | 4 ++-- arch/arm64/boot/dts/qcom/msm8939-huawei-kiwi.dts | 4 ++-- arch/arm64/boot/dts/qcom/msm8939-longcheer-l9100.dts | 4 ++-- arch/arm64/boot/dts/qcom/msm8939-samsung-a7.dts | 4 ++-- arch/arm64/boot/dts/qcom/msm8939-wingtech-wt82918.dtsi | 4 ++-- 24 files changed, 48 insertions(+), 48 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts index 6175b1b9d7c6e82ef8ed3b6198b4b8cef81514d8..f12a5e2b1e8c2cce6e85b8444c97a7e0d7b7c58f 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts @@ -230,8 +230,8 @@ &blsp_uart1 { &blsp_uart2 { status = "okay"; label = "LS-UART1"; - pinctrl-0 = <&blsp_uart2_default>; - pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-0 = <&blsp_uart2_console_default>; + pinctrl-1 = <&blsp_uart2_console_sleep>; pinctrl-names = "default", "sleep"; }; diff --git a/arch/arm64/boot/dts/qcom/apq8039-t2.dts b/arch/arm64/boot/dts/qcom/apq8039-t2.dts index f656eca59ee23a6d19450b4d3fee7a661b002709..4aa0ad19bc0f7fde6f5f3a93cdb6be19fb4f1f65 100644 --- a/arch/arm64/boot/dts/qcom/apq8039-t2.dts +++ b/arch/arm64/boot/dts/qcom/apq8039-t2.dts @@ -131,8 +131,8 @@ &blsp_uart1_sleep { }; &blsp_uart2 { - pinctrl-0 = <&blsp_uart2_default>; - pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-0 = <&blsp_uart2_console_default>; + pinctrl-1 = <&blsp_uart2_console_sleep>; pinctrl-names = "default", "sleep"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts b/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts index 9b82468ace3edfe8d808492b83e7753d3314e7af..3a6eba904641c65ee8e982774f4122ef9ddb3704 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts @@ -133,8 +133,8 @@ touchscreen@38 { }; &blsp_uart2 { - pinctrl-0 = <&blsp_uart2_default>; - pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-0 = <&blsp_uart2_console_default>; + pinctrl-1 = <&blsp_uart2_console_sleep>; pinctrl-names = "default", "sleep"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts index 1c2f8e8f9b263b024cc7c239447e7158262b0c1c..2de8b6f9531b25f1ee745c5e298d1cab806f0391 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts @@ -214,8 +214,8 @@ led@1 { &blsp_uart2 { status = "okay"; - pinctrl-0 = <&blsp_uart2_default>; - pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-0 = <&blsp_uart2_console_default>; + pinctrl-1 = <&blsp_uart2_console_sleep>; pinctrl-names = "default", "sleep"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts index f7a9ee0dba09eef83e9b4149856cdefa0ae3fd4b..29d61f8d5dc9c8099524ecbfdb80ab7afaa811c4 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts @@ -130,8 +130,8 @@ touchscreen@38 { &blsp_uart2 { status = "okay"; - pinctrl-0 = <&blsp_uart2_default>; - pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-0 = <&blsp_uart2_console_default>; + pinctrl-1 = <&blsp_uart2_console_sleep>; pinctrl-names = "default", "sleep"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts b/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts index e5ca1ca0d9976a0d36af5359e705ca7b2070122b..742a325245c5c09dcb6227ae262865b17ee5ef46 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts @@ -131,8 +131,8 @@ touchscreen@38 { }; &blsp_uart2 { - pinctrl-0 = <&blsp_uart2_default>; - pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-0 = <&blsp_uart2_console_default>; + pinctrl-1 = <&blsp_uart2_console_sleep>; pinctrl-names = "default", "sleep"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts index f75e60b5d1b3b40673cb0639a3f8d0056d037a02..aa414b5d7ee47a0e20ca2341c9a3250503184a69 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts @@ -214,8 +214,8 @@ nfc@28 { &blsp_uart2 { status = "okay"; - pinctrl-0 = <&blsp_uart2_default>; - pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-0 = <&blsp_uart2_console_default>; + pinctrl-1 = <&blsp_uart2_console_sleep>; pinctrl-names = "default", "sleep"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-lg-c50.dts b/arch/arm64/boot/dts/qcom/msm8916-lg-c50.dts index 7c49b4cb27cb5a9914b38865596eb27541f390fd..22bc73b94344aff42f560304c99cbb7b8995fdfd 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-lg-c50.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-lg-c50.dts @@ -59,8 +59,8 @@ reg_sd_vmmc: regulator-sdcard-vmmc { }; &blsp_uart2 { - pinctrl-0 = <&blsp_uart2_default>; - pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-0 = <&blsp_uart2_console_default>; + pinctrl-1 = <&blsp_uart2_console_sleep>; pinctrl-names = "default", "sleep"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-lg-m216.dts b/arch/arm64/boot/dts/qcom/msm8916-lg-m216.dts index 6e55d37f588c9b829bb594ff156cda6cb8b6caf2..c50374979939c26186e97d19047de77356a9c3c1 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-lg-m216.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-lg-m216.dts @@ -112,8 +112,8 @@ touchscreen@34 { }; &blsp_uart2 { - pinctrl-0 = <&blsp_uart2_default>; - pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-0 = <&blsp_uart2_console_default>; + pinctrl-1 = <&blsp_uart2_console_sleep>; pinctrl-names = "default", "sleep"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts index 4576178cc9b0936a7356b9852fc003fe949ed903..eb449112a22684492e6b6f9705389d44f2cec379 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts @@ -254,8 +254,8 @@ rmi4-f12@12 { &blsp_uart2 { status = "okay"; - pinctrl-0 = <&blsp_uart2_default>; - pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-0 = <&blsp_uart2_console_default>; + pinctrl-1 = <&blsp_uart2_console_sleep>; pinctrl-names = "default", "sleep"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts index e0dacdf552452a36cbdb041b37d68eb4d661e6c8..887764dc55b21a5892510f822004b054eb65fa0a 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts @@ -178,8 +178,8 @@ imu@68 { &blsp_uart2 { status = "okay"; - pinctrl-0 = <&blsp_uart2_default>; - pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-0 = <&blsp_uart2_console_default>; + pinctrl-1 = <&blsp_uart2_console_sleep>; pinctrl-names = "default", "sleep"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-mtp.dts b/arch/arm64/boot/dts/qcom/msm8916-mtp.dts index c115142df364e99a4f566775d4d1679e6a8920e2..63d476523544babc9213e34e227870a447410eca 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-mtp.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-mtp.dts @@ -23,8 +23,8 @@ chosen { }; &blsp_uart2 { - pinctrl-0 = <&blsp_uart2_default>; - pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-0 = <&blsp_uart2_console_default>; + pinctrl-1 = <&blsp_uart2_console_sleep>; pinctrl-names = "default", "sleep"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi index 58a548d220a485e9a92c012c1529e3fe838d6c9f..6f75707b6f9b4707cbed7e12ab60fa888d6a1f06 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi @@ -302,8 +302,8 @@ charger: charger { &blsp_uart2 { status = "okay"; - pinctrl-0 = <&blsp_uart2_default>; - pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-0 = <&blsp_uart2_console_default>; + pinctrl-1 = <&blsp_uart2_console_sleep>; pinctrl-names = "default", "sleep"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-fortuna-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-fortuna-common.dtsi index 4290ae7782d659eb0d2594825717ffaf4c84076b..fb790b02736acff017d12318de1c01100a33c808 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-fortuna-common.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-fortuna-common.dtsi @@ -304,8 +304,8 @@ charger: charger { }; &blsp_uart2 { - pinctrl-0 = <&blsp_uart2_default>; - pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-0 = <&blsp_uart2_console_default>; + pinctrl-1 = <&blsp_uart2_console_sleep>; pinctrl-names = "default", "sleep"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi index 30e34574999c52f7ea99c9bd7af41101e5d4d4d0..ff9679d3f664cbb203ff42b4cf27468622cc5cf3 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi @@ -116,8 +116,8 @@ fuelgauge@36 { }; &blsp_uart2 { - pinctrl-0 = <&blsp_uart2_default>; - pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-0 = <&blsp_uart2_console_default>; + pinctrl-1 = <&blsp_uart2_console_sleep>; pinctrl-names = "default", "sleep"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi index d4af7856f5f3a70160774d1637e39e19d163725d..697f25d51d9d05087500231f4d9ad77fe81ea3b3 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi @@ -135,8 +135,8 @@ touchscreen: touchscreen@50 { &blsp_uart2 { status = "okay"; - pinctrl-0 = <&blsp_uart2_default>; - pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-0 = <&blsp_uart2_console_default>; + pinctrl-1 = <&blsp_uart2_console_sleep>; pinctrl-names = "default", "sleep"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts index 45c3b3387b52030a6475ae0da2a2c89ea98ca6c1..71b5c98458ff475e101a0a40d3601b5ca144ec92 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts @@ -319,8 +319,8 @@ rt5033_charger: charger { &blsp_uart2 { status = "okay"; - pinctrl-0 = <&blsp_uart2_default>; - pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-0 = <&blsp_uart2_console_default>; + pinctrl-1 = <&blsp_uart2_console_sleep>; pinctrl-names = "default", "sleep"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi b/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi index 2bfe56da8f6c624ed97d8a5750d12c59c039c874..5719933fa8e01b0b90ef7477c0bf181af379a524 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi @@ -72,8 +72,8 @@ &bam_dmux_dma { }; &blsp_uart2 { - pinctrl-0 = <&blsp_uart2_default>; - pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-0 = <&blsp_uart2_console_default>; + pinctrl-1 = <&blsp_uart2_console_sleep>; pinctrl-names = "default", "sleep"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt865x8.dtsi b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt865x8.dtsi index f5caac42bbad106f86448c217aa1472a32fbeaa6..ebe85cd85ddf30b9905975318746403e0cecf7ee 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt865x8.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt865x8.dtsi @@ -93,8 +93,8 @@ touchscreen@38 { }; &blsp_uart2 { - pinctrl-0 = <&blsp_uart2_default>; - pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-0 = <&blsp_uart2_console_default>; + pinctrl-1 = <&blsp_uart2_console_sleep>; pinctrl-names = "default", "sleep"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts index 10d0974334abf0e501ec97e2de487f40c1507f82..68c8856d4c2ed22370822eb295c0000fd80226f5 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts @@ -169,8 +169,8 @@ led@2 { &blsp_uart2 { status = "okay"; - pinctrl-0 = <&blsp_uart2_default>; - pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-0 = <&blsp_uart2_console_default>; + pinctrl-1 = <&blsp_uart2_console_sleep>; pinctrl-names = "default", "sleep"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8939-huawei-kiwi.dts b/arch/arm64/boot/dts/qcom/msm8939-huawei-kiwi.dts index 9f647027d082864ccaa240f7118f20a8d19f6a4a..18381a66daef8642da27b3ea8c48964c1ccf121b 100644 --- a/arch/arm64/boot/dts/qcom/msm8939-huawei-kiwi.dts +++ b/arch/arm64/boot/dts/qcom/msm8939-huawei-kiwi.dts @@ -126,8 +126,8 @@ touchscreen@1c { }; &blsp_uart2 { - pinctrl-0 = <&blsp_uart2_default>; - pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-0 = <&blsp_uart2_console_default>; + pinctrl-1 = <&blsp_uart2_console_sleep>; pinctrl-names = "default", "sleep"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8939-longcheer-l9100.dts b/arch/arm64/boot/dts/qcom/msm8939-longcheer-l9100.dts index f59647b5b7dfdd7bf630f9d180bb56a10a3ea0a3..13422a19c26a15812657e92ab0b52d6f53f5c944 100644 --- a/arch/arm64/boot/dts/qcom/msm8939-longcheer-l9100.dts +++ b/arch/arm64/boot/dts/qcom/msm8939-longcheer-l9100.dts @@ -243,8 +243,8 @@ touchscreen@4a { }; &blsp_uart2 { - pinctrl-0 = <&blsp_uart2_default>; - pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-0 = <&blsp_uart2_console_default>; + pinctrl-1 = <&blsp_uart2_console_sleep>; pinctrl-names = "default", "sleep"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8939-samsung-a7.dts b/arch/arm64/boot/dts/qcom/msm8939-samsung-a7.dts index 3d9cbe7fdad8808968190d7a744bab29eeb0e827..07613080e79e9bfb21493a0b61c85bc172d5e3f6 100644 --- a/arch/arm64/boot/dts/qcom/msm8939-samsung-a7.dts +++ b/arch/arm64/boot/dts/qcom/msm8939-samsung-a7.dts @@ -373,8 +373,8 @@ charger: charger { }; &blsp_uart2 { - pinctrl-0 = <&blsp_uart2_default>; - pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-0 = <&blsp_uart2_console_default>; + pinctrl-1 = <&blsp_uart2_console_sleep>; pinctrl-names = "default", "sleep"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8939-wingtech-wt82918.dtsi b/arch/arm64/boot/dts/qcom/msm8939-wingtech-wt82918.dtsi index cbefe34327ba7b04ea57032c68dd69642e6d1685..a5187355f9fa09148b9f04970da6855a49cdd059 100644 --- a/arch/arm64/boot/dts/qcom/msm8939-wingtech-wt82918.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8939-wingtech-wt82918.dtsi @@ -126,8 +126,8 @@ touchscreen: touchscreen@38 { }; &blsp_uart2 { - pinctrl-0 = <&blsp_uart2_default>; - pinctrl-1 = <&blsp_uart2_sleep>; + pinctrl-0 = <&blsp_uart2_console_default>; + pinctrl-1 = <&blsp_uart2_console_sleep>; pinctrl-names = "default", "sleep"; status = "okay"; }; From patchwork Tue Apr 15 13:52:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 881405 Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 774981B4F3D for ; Tue, 15 Apr 2025 13:53:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744725206; cv=none; b=t+SHUfm2hTugV8K23nzvOrLv5zSd0Jd7iCwa9EqVDlvSPnin60XAy0yReRrSJ2Kib+9q1I0S0hv+xQURbSrvV5ai8d5PXsKCyySKNSdoHzpwnFLPOaoYcmZw0EmHG4ZRUHYbhRJO86ia0E1xmZpxvMaC3e7z9XR4OO38YGZqnCQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744725206; c=relaxed/simple; bh=JWwoxEMK2A5kDbhJ080c6MdZJuqktgRFVi8Ef7ShjQk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ZvZ/5VwDmduRXt0iYjrhGlXqUWBVRV+1yaI3aNcID7/0hpM/s0xpmo28UHC67c3koSGov0d20ZmyNbKnFSJJzFKoM8rKshkOSHLRUoLLBzCiSoVtN/lYzbIjWCT6++COrF140rO47MUehHUPPWFW88TkFZaQcuCsvYzBvpyFvHM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=ySUlPsEB; arc=none smtp.client-ip=209.85.208.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="ySUlPsEB" Received: by mail-ed1-f53.google.com with SMTP id 4fb4d7f45d1cf-5e6167d0536so10297906a12.1 for ; Tue, 15 Apr 2025 06:53:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744725201; x=1745330001; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=IzowgvGIaxdQmiDRDdrZTttLqfGAIGHXMByDo47trxw=; b=ySUlPsEB3vYBsGS1xVnFdaphSHt7LRYeQAyYfwPYNT9teyB71pHVb9/KQhP9rl9w16 0yzbXnHY7LKNYG/z+WaL94p1ljxIDOo1KWJt3jWkLfwQAfZ+QdwU+jcUhZS2SaQeCOP2 GsXTNfetQElNS8j96kZZG+MyllcNvhQK8srYh4PbOXCaRmCj27Fv+/lDzAtntww2omiA WaJECwzXpMK78Lb20cT9+f+/nAVSqVkWGJLm7MeZ0qwKQXuPKBIKTx8LhFND998yuLn5 dS1NQfYfHG8vyNeiZhNHoCRizAUkNr2kyV/lFfWVwNxyoQ66cBQIdW8a2n2RxsW5bDYq XSBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744725201; x=1745330001; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IzowgvGIaxdQmiDRDdrZTttLqfGAIGHXMByDo47trxw=; b=ivjhNPSjPUy3c3u9XM8B1Z++wuLtZhloTetTRFT015VOWZpehQQcIzqycBf2gtdXQD koNkRm6LQFiDiA/i4snq8qDG2yai190bBjjKj/1e3rOlm76Vi0BIERoTtX2AlcZcTDt1 QxLQUGyImPLqcAIchtHwQqr6sBYHceMAQ1+eTpTfWa+ia9kH/uukPdJaUu3F1Jvqgac+ 1mPSdWT1kyPwBT8fOryF5FI/lNgEtUjZE4JnMGaAncXZdo12Pob3Pqh+0rKpVz6fgl9K MnpzXo0Pj9T081KUKGaQUJXAL9Bq7rxHfVEO7kxqrMHhk7lJWhzT9Wfzzq4tLqjEEmuV hGvg== X-Forwarded-Encrypted: i=1; AJvYcCX5UkjS4i7EkJXvfR1PhceRg7vgGQQqKtsDVPUgclvvCNc6ZxdjzqJPNQ9Asoixf5SliOGU9fbJo7V6weK2@vger.kernel.org X-Gm-Message-State: AOJu0Ywp3DhPHhFOW8kLp/DFR6cSA4GL1OPB+DvtHKAQubE2ZjpdvAvm 6pgw427murx3sDltflLN9J0Y2Ta9Jg1Pv1YSMTPQSayhJ1tFejFFuR9ljFkjLmY= X-Gm-Gg: ASbGnctcdhZIYa6+JExiLEqeLHEl7iGzrAzV0OrsEJOFNk/FB4XMqibReZuahI47rcR 3pB6DTPLzyqZtV0vdovU6n6rIEE9vgGTs9Y6zh9FkqHNidTlVMUvCaF3zm+LFkvs4mci3bnTw0/ sUjSj7kj96ndv6T6XIrdFC7iokmL3PTHwbn8KtUiBL6ZHhqzhYWGsSE7snnRUxFWokME0VkfvV0 jdHCNorYTK+O/xt0ntpb1f5TxaGkf8KPHOCu+vQqzrUiPpQrb5YGIO3fTnRyS7TV6VgCbQ59uvO NEfBACF0Vdi1CmA60S131zTwBSh2eR1XnGYbXTXMP7b7hDg0diH+F+8= X-Google-Smtp-Source: AGHT+IE675xAbbKMbD4WeLidcu5LWshKzXZX5noo05D93crI/D9lMfCT+vddCc2faeoXBgbbVScKiw== X-Received: by 2002:a17:907:972a:b0:ac6:f4c1:b797 with SMTP id a640c23a62f3a-acad349c39cmr1352690966b.19.1744725201472; Tue, 15 Apr 2025 06:53:21 -0700 (PDT) Received: from [127.0.0.2] ([2a02:2454:ff21:ef41:7b18:2529:5ce1:343d]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-acadcc21a44sm681379166b.177.2025.04.15.06.53.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Apr 2025 06:53:21 -0700 (PDT) From: Stephan Gerhold Date: Tue, 15 Apr 2025 15:52:47 +0200 Subject: [PATCH 4/8] arm64: dts: qcom: msm8916-motorola: Use UART1 console pinctrl Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250415-msm8916-console-pinctrl-v1-4-a1d33ea994b9@linaro.org> References: <20250415-msm8916-console-pinctrl-v1-0-a1d33ea994b9@linaro.org> In-Reply-To: <20250415-msm8916-console-pinctrl-v1-0-a1d33ea994b9@linaro.org> To: Bjorn Andersson , Konrad Dybcio Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sam Day , Casey Connolly X-Mailer: b4 0.14.2 The Motorola MSM8916-based smartphones all use UART1 with 2 pins (TX, RX) as debug UART console, so make use of the new &blsp_uart1_console_default template. This applies the needed bias-pull-up to avoid garbage input, bootph-all for U-Boot and avoids having to override the UART pins. Signed-off-by: Stephan Gerhold Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/msm8916-motorola-common.dtsi | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8916-motorola-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-motorola-common.dtsi index 48134e5ff524fd5708db7b9c3a567ec3f751868c..4e202e7ed7db1921f347ca8b4a01ccec593a8d8e 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-motorola-common.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-motorola-common.dtsi @@ -69,8 +69,8 @@ rmi4-f11@11 { }; &blsp_uart1 { - pinctrl-0 = <&blsp_uart1_default>; - pinctrl-1 = <&blsp_uart1_sleep>; + pinctrl-0 = <&blsp_uart1_console_default>; + pinctrl-1 = <&blsp_uart1_console_sleep>; pinctrl-names = "default", "sleep"; status = "okay"; }; @@ -132,14 +132,6 @@ &wcnss_mem { status = "okay"; }; -/* CTS/RTX are not used */ -&blsp_uart1_default { - pins = "gpio0", "gpio1"; -}; -&blsp_uart1_sleep { - pins = "gpio0", "gpio1"; -}; - &tlmm { gpio_keys_default: gpio-keys-default-state { pins = "gpio107"; From patchwork Tue Apr 15 13:52:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 881950 Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DFC691CDA2E for ; Tue, 15 Apr 2025 13:53:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744725207; cv=none; b=OFqYvPM4MjOcMnNsH3gezBImKkcB+89hIjyPqSFn8Gs77rm9ZqMkCSfnNvkwefH2szfnC7flDZu9tks2vLXCA44CafCQQapzZGXqtwJWHUzBTMj8BuzEJr9lo9dGGumjslMBIL0Qh4g/SF6Fsf41KQI+NKK8eRzHcM3SgnDxuiM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744725207; c=relaxed/simple; bh=pasHWSU2nGmm0wTdGpnA+YTR6fwTfPInkJzIhRwnGrU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=XfUjNJZecdaVaa02LiPNAPeqHbI3kK31YKIkXHxGqMWHyhxX4b7G8p5aY0bqI0N1vmQlzRfD18XQw9Eh0UAtDWzIgpJ0jTM6jEwmBJ4z6CiFnKjl4lxzlYACF0uDL2aA8Y2niDoUrPNjYINOtDi6I2Y92UZCdd4lFenatWx4QpY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=sZodQFyT; arc=none smtp.client-ip=209.85.218.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="sZodQFyT" Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-ac41514a734so925860466b.2 for ; Tue, 15 Apr 2025 06:53:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744725203; x=1745330003; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Pge4o9cHBqaAOg3mTeBAmeDqZJrFMUn1AiEvtXGp2iw=; b=sZodQFyTYNLUZRpUCuitXLY+BSkEaorU/T4H5fH/Rssv/lS4V6PShnYl1o29z8sB1L wmeZW8WbXCsL67hLx8tJ2wrhaq10LQLEE7vrFeD++rNUKZI/jeLMAHP+HYjw5BdLWeni 4ulHd7JDgLrsjys43xDcam/HskijsdS7DeLnMRv4kKq2ccMyYTXDgKQ1D4Gj3WlHR/0r dAnOJc2mrUENEpEGajh2A+1YWi+l+EzJpRnXhkXT2872alHWFVEnm57Ka0K+HxpMHiSx mGpn9xWh4nHeqLOl3QTjgzK+UoZIUXerSuMsiiWEftjmju71DCEZB9207iUUN6mXMhI0 NHVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744725203; x=1745330003; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Pge4o9cHBqaAOg3mTeBAmeDqZJrFMUn1AiEvtXGp2iw=; b=EJwxz7IkmgoT/V/+5kQIezwh0avJmRfnXkyrqywiHXwBcvt0ZYRo4hhmwGfZwTGGH/ jkhQTKKTcs7FJlzl8lrpsfRkULM5m8PUnL1SHW4AGufuqEN1HTcMhS6bQoyKlvG2p6Y9 To0FSO7G0+xOlVMleJsXaqmnK0HzN06wv00OGFQyWq89RAi+dSKfmQ8TW35KIuu3DJHz C8s3NfQlM7Xmin2Ozrxvlt4O3EE1QhLK8qeNJ6qnIDrtijPk6CUGQ1viu/oQoK2A5oEv 8++PZEosCAmMd7SJkIB85Toxt5SyvmiaTO5KwH+katmw2WTH7XQb1GQbQBDdvSB56Bcb 4pVQ== X-Forwarded-Encrypted: i=1; AJvYcCWW7Sl6Hl3G6hjO12SDRFzuJnWXJKPwChWVeOI36EDbXnNSSUVewxKQMVQ+HeWgnN1mfFMHWLboivnnynHj@vger.kernel.org X-Gm-Message-State: AOJu0YyJPLPvdoSM+Odu8h3ecsCE1d3r9gW40diWXmrPMHDqwymDe96V FoHg6kssZfhiNNOuL84GPENXMw+GTFrpu4P8TALtP5a6p9VMgaC6gq7Fd9Ia3ho= X-Gm-Gg: ASbGncv3f8y1L+RqPeJ4vJSCNUZ1h7LWQFvX7doxjUBdWXm9Wo/ZrgC9crCuAc3SS2/ T3e0MP9bIB8Cdqvvo1yCklJ7MgmzgzJA4yjtXsSAYTnuw2k0IIhCY0MdB2qya57SWDZxjSgaode eU9VheHq4m3Yy63Sg2lRgzKaEllFRXkMCAOGHRD0diuBK2cUlSUuXQ5Fczm3bsDK3e25TUaqIbt 8AvbxUiVMEfRQJHwXq84jm3Fc5FqI5VEu4JBvZ9PuxMIx9yijUEqCFfA14G4X07XaAvpVqCz1p2 lp3Wcu6vp3sFayDhJcLCPmJUU9H7m22uGT9w3MxeozTcNho6+1ImDDA= X-Google-Smtp-Source: AGHT+IFzbpbH4GLJ5InXnSEyFRv0wczgq6f5oEy25Mu0yL/aDFPOfMB7Jlpd8NTCxr4BmMOv9fFWgw== X-Received: by 2002:a17:907:8690:b0:ac3:446d:142 with SMTP id a640c23a62f3a-acad3445e2fmr1369567166b.2.1744725202370; Tue, 15 Apr 2025 06:53:22 -0700 (PDT) Received: from [127.0.0.2] ([2a02:2454:ff21:ef41:7b18:2529:5ce1:343d]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-acadcc21a44sm681379166b.177.2025.04.15.06.53.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Apr 2025 06:53:22 -0700 (PDT) From: Stephan Gerhold Date: Tue, 15 Apr 2025 15:52:48 +0200 Subject: [PATCH 5/8] arm64: dts: qcom: apq8016-sbc: Move non-console UART pinctrl to board Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250415-msm8916-console-pinctrl-v1-5-a1d33ea994b9@linaro.org> References: <20250415-msm8916-console-pinctrl-v1-0-a1d33ea994b9@linaro.org> In-Reply-To: <20250415-msm8916-console-pinctrl-v1-0-a1d33ea994b9@linaro.org> To: Bjorn Andersson , Konrad Dybcio Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sam Day , Casey Connolly X-Mailer: b4 0.14.2 Prepare for removing the generic UART pinctrl templates from msm8916.dtsi by copying the definition for the 4 pin UART1 instance into apq8016-sbc.dts Having it defined separately in the board DT file makes it clear that the set of pins/pull etc are specific to the board and UART use case. No functional change. Signed-off-by: Stephan Gerhold --- arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts index f12a5e2b1e8c2cce6e85b8444c97a7e0d7b7c58f..b0c594c5f236c9c1d334e6acfcaa7e41c1f9f3a5 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts @@ -597,6 +597,21 @@ &tlmm { "USR_LED_2_CTRL", /* GPIO 120 */ "SB_HS_ID"; + blsp_uart1_default: blsp-uart1-default-state { + /* TX, RX, CTS_N, RTS_N */ + pins = "gpio0", "gpio1", "gpio2", "gpio3"; + function = "blsp_uart1"; + drive-strength = <16>; + bias-disable; + }; + + blsp_uart1_sleep: blsp-uart1-sleep-state { + pins = "gpio0", "gpio1", "gpio2", "gpio3"; + function = "gpio"; + drive-strength = <2>; + bias-pull-down; + }; + sdc2_cd_default: sdc2-cd-default-state { pins = "gpio38"; function = "gpio"; From patchwork Tue Apr 15 13:52:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 881404 Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 20DE81D9A41 for ; Tue, 15 Apr 2025 13:53:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744725207; cv=none; b=BrpclFXkHX7EBnwMyCn62DeY7icsxXn+YbDJFr9DCKjnPXl/L5fwUTOdIHYxErOdLy+H3RObZ21SatM5tSesa8/pa5C7FUWaFPitls7EI2/nSaySBmQV/Q+5uiZDFNEc2vQ/X/JYT4kv9DZqcEyMbG8p64joKWYVBIhrkgN+bOI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744725207; c=relaxed/simple; bh=2KwIlvvGECXFrETJCT6z2gk+hxmBfBaHfHMjOZSbJew=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SMgiDj2XsLwl6E286TK0HEEd2Uy+Uklg+urssxhLeEUJOpXEszujqqR2tzDqPfhubd6LCRyM0a7rGG0TqozxhE9fixapsQrdWz2nkNsRvmqg+oKBlrWA3DklenyDAbQBazKxrk1uM1zJRV/wLn09rsk0O/It4F8SB0ImnN/JZxA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=ow4Iftyv; arc=none smtp.client-ip=209.85.218.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="ow4Iftyv" Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-acacb8743a7so835990866b.1 for ; Tue, 15 Apr 2025 06:53:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744725203; x=1745330003; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=IzromOuf9zzJyEBnUnC0UIApSp7seWmK6Swkwn2TE30=; b=ow4IftyvpsLLhLr7EM9k4WQnLD38TPJD0GMXoSHK6tEddkfqBDwasXqc6AcA9DY/aE sXuplFWIQTB6wA0Tbe+ApnedhZ9exwiKI0vG25lMDi7PWkHUzF3eGaAs3DfAGK8cIZ3n mwuCzDyerdEXCBpMuz8oOX96UyuJxMSWgRhoLvkHgPl5Xbqei7xe1zQufImgGQV06WRX A6cByR6fPOeb94Z02/R7bXPL3o5X+yqgebCQEWyuz9eTA50xLm8Z/4gzMWwbmeS6lp0L PbjuzsmOi+gn8czrdGoZLU94jc+hU1jaAYpqyM17E1i8X6k4K007dMv3zqwUyZHu81j1 tdWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744725203; x=1745330003; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IzromOuf9zzJyEBnUnC0UIApSp7seWmK6Swkwn2TE30=; b=QX6ew8lR6hs2/y45U1fTRvTVhCWdYLrEonPPY7IckUvZmgpfNK82zZfxiWWPX/JcMF GYg9VG5TmqiAho5CO/da8Clbkqiqo+EJtpV9PdJthknqU8vn2H4+aWV4ZjKKxJbCfWln PxE/I/rTneNQYr0Ile8SN3kHLzvGulVYqEZ6BQpCryojXIAXmviL+3LOmT7rvH77tyLm VdIeVBAgewb2DxSdCTM9tEFJyD1T6ZJvyLjfXzOAfdOmfJIusrJ1E7hQ51yRqnRZhbna Aia1HL1cEogKMLOsJvp+HpF2+f/ySCH8IFPSpdZkGJc9AjPo4+bWMxtPLngptLgDTjPZ fmZA== X-Forwarded-Encrypted: i=1; AJvYcCUPkEkEX2JTqxJppPzmd9IJp8Uhj8gBtKrcztcuY9hFScZM7s4XWXqKpjWzgooKDS/TcoQRarxhj1b4jD+F@vger.kernel.org X-Gm-Message-State: AOJu0Yx22oTLI+qkGoGlJSSyiy6srbr9Wn7FPHftcrp9FCdNHmLWuXbl QqNNOJWqrLy+vv9EMRXNaWGfCb5HEJTvXTRv0n1Z5a4hrXPr3oLPVXseTxgRQSI= X-Gm-Gg: ASbGncv5uqtb6DwqMq1tOw2djk8Vbn3LNdlyCRb5AV5vL/IpfjyUXxF+4/JuEZzkFWc sjVoDPs2jq6YqfXanVEP54DxklDIIZKCOiU4uLdHFPRETXDnuvVaFqeAmKfWi3xfU/omsL3ZvGz pq8ZVcARNxMS3ia9KSkpFXSosgUtXIlG/WGsuE7ac0/zYrtNqzoeWztzagxZ16ShXimEbXs7pd2 GU75J2wnO9CQPU+cpwasi1UilkmDdC3Qu95iXFQKcgtDD4QE1THy9Z99jn/nRAOR5iy+dYa2ssm GjCrXp1TFgUREZVo8RNqvV5l2pvQjFB5wbExS5HdEUroEAWWS5PXZqM= X-Google-Smtp-Source: AGHT+IFwlxOkxM+FSTXk89qNtD3AqxVqNDqmG63ewdt7FIeooDU3A2bPFLmNB60nWDT25K0clFz4aQ== X-Received: by 2002:a17:907:d15:b0:aca:d48c:916 with SMTP id a640c23a62f3a-acb166d6d5fmr282910266b.9.1744725203245; Tue, 15 Apr 2025 06:53:23 -0700 (PDT) Received: from [127.0.0.2] ([2a02:2454:ff21:ef41:7b18:2529:5ce1:343d]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-acadcc21a44sm681379166b.177.2025.04.15.06.53.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Apr 2025 06:53:22 -0700 (PDT) From: Stephan Gerhold Date: Tue, 15 Apr 2025 15:52:49 +0200 Subject: [PATCH 6/8] arm64: dts: qcom: apq8016-schneider-hmibsc: Move UART pinctrl to board Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250415-msm8916-console-pinctrl-v1-6-a1d33ea994b9@linaro.org> References: <20250415-msm8916-console-pinctrl-v1-0-a1d33ea994b9@linaro.org> In-Reply-To: <20250415-msm8916-console-pinctrl-v1-0-a1d33ea994b9@linaro.org> To: Bjorn Andersson , Konrad Dybcio Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sam Day , Casey Connolly X-Mailer: b4 0.14.2 Prepare for removing the generic UART pinctrl templates from msm8916.dtsi by copying the definition for the 4 pin UART1 and 2 pin UART2 instance into apq8016-schneider-hmibsc.dts. Having it defined separately in the board DT file makes it clear that the set of pins/pull etc are specific to the board and UART use case. No functional change. Signed-off-by: Stephan Gerhold --- .../boot/dts/qcom/apq8016-schneider-hmibsc.dts | 35 +++++++++++++++++++--- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/apq8016-schneider-hmibsc.dts b/arch/arm64/boot/dts/qcom/apq8016-schneider-hmibsc.dts index 7a03893530c7b89705f5544491c14edd7120acdc..ce75046ffdac48a206d14499bc711f8f4a777fe5 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-schneider-hmibsc.dts +++ b/arch/arm64/boot/dts/qcom/apq8016-schneider-hmibsc.dts @@ -373,6 +373,37 @@ adv7533_switch_suspend: adv7533-switch-suspend-state { bias-disable; }; + blsp_uart1_default: blsp-uart1-default-state { + /* TX, RX, CTS_N, RTS_N */ + pins = "gpio0", "gpio1", "gpio2", "gpio3"; + function = "blsp_uart1"; + drive-strength = <16>; + bias-disable; + bootph-all; + }; + + blsp_uart1_sleep: blsp-uart1-sleep-state { + pins = "gpio0", "gpio1", "gpio2", "gpio3"; + function = "gpio"; + drive-strength = <2>; + bias-pull-down; + }; + + blsp_uart2_default: blsp-uart2-default-state { + /* TX, RX */ + pins = "gpio4", "gpio5"; + function = "blsp_uart2"; + drive-strength = <16>; + bias-disable; + }; + + blsp_uart2_sleep: blsp-uart2-sleep-state { + pins = "gpio4", "gpio5"; + function = "gpio"; + drive-strength = <2>; + bias-pull-down; + }; + msm_key_volp_n_default: msm-key-volp-n-default-state { pins = "gpio107"; function = "gpio"; @@ -469,10 +500,6 @@ &blsp_i2c6_default { drive-strength = <16>; }; -&blsp_uart1_default { - bootph-all; -}; - /* Enable CoreSight */ &cti0 { status = "okay"; }; &cti1 { status = "okay"; }; From patchwork Tue Apr 15 13:52:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 881403 Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F2E401E8327 for ; Tue, 15 Apr 2025 13:53:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744725209; cv=none; b=QPZNJqBzo+b2WcmQoX4b7tvr0Aougzv64BDzroHPPYggcW1FHSwnnuXKiM/azSQeBFFajA5S/pH1k0hx2j/bKv6n8JCgoTKCOcie9vgz32Qqdh0jRlr4sLiLmnqBOA6BqaqjZO2mFxkGQBGgG5e6oiSdOoaCER6+7ws9hoVO9yg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744725209; c=relaxed/simple; bh=ZIi3kcYiMso2WJn9cew3pYXvwn9ZXc1TLzpsXS99dGU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=oJ019oOHPG2yFbYxin/Mv5S89492bniz5rS5wQp4tNYO3iwAAQEb9p6VbGuu7eY7jkMiK1DN6ibpr8j3AQyrNhTHvYYn64k4FzoLYZvMd8lD0EDI5lVLV01FtTmLQCs8LkoVx16kFu4pTe89uYbYw+JQXW8ex57+8GB9I/V3sYU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=v9jvvfyW; arc=none smtp.client-ip=209.85.208.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="v9jvvfyW" Received: by mail-ed1-f45.google.com with SMTP id 4fb4d7f45d1cf-5e5e34f4e89so2550075a12.1 for ; Tue, 15 Apr 2025 06:53:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744725204; x=1745330004; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=/MYD5mLPfBJwtdhmSlhM/n7g0njzNNoiH91RzZwtKY0=; b=v9jvvfyWu6G0l2ckXMU/H8V5aLqKncBMZafm55nGih2VSuAFGtgZhrftroS/wqo3L0 s5GcHpWYI3eshVYJsVddUJDw6XHWb5FT1k3i8mZoMi2mIMzV0a2V6HbDf31T1VbMsuJc leiIdD9BuMaQBPrSXvPGVa+a6375hLPHrSXRTcmhHvCJoV7tp4B0IqRyxv9M+f5LE45L 8US1JaProNJM9M+SqGViI5YObyONRr9fDJxAueb3GJXYQDA0k0JKlCBxz/E/rTKnMoF0 dMv1gxVSGEi9ooqHcXlydc3B0MQvIOAOt7WzO75qo5rT8XKAhnYC3ozCvWSYrIsOwiBf /yzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744725204; x=1745330004; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/MYD5mLPfBJwtdhmSlhM/n7g0njzNNoiH91RzZwtKY0=; b=vnSq4JUFY1n1nxmvfwNRI3L0gECdaSVPUa3F//hC8omiIln/1a3MBiov0Fgb/654Sh O+zCC/386bhxbd9cOun9l37cif2BKc7BododExSq8NQOByZZ1/hhM06oSCsPuDufpLDR oM+flZ4w8s/eXkgfjTWg5i954Zm2Nd51H86loL4lutf4bkrwhuLW712/4BzOaU9H9BUA IfQ3jeUudU2A+n8sn1j9+S1/BPmGJIkzpCd32yn0fvYIg7/PUP30b5nXgzAa21gl3KJ5 eIwoAF0gr9AEZR1EZiGIoL1hsjGsnbT/lDCxbWFa752MdpYOsY5PpYTUUpFAlyVgX0r3 UOuw== X-Forwarded-Encrypted: i=1; AJvYcCXY/y88CEJgmwfFDN7YUbHVAFHRq8UY3VJH7ARnU/4yuwSDdBoZ58tvJjEzQdQjPGSCUVyuz6WRYqk6V8DT@vger.kernel.org X-Gm-Message-State: AOJu0YyMNzKZ7xY/CD69AKvbTrot6NQ2fQ/JrjsY5Hf7w8YDoK4EfjEu NQj+ZvxEJYrlXfLr8l0jPl6DCXXin0+cYGRR/RuDkY/0bdX+23jSTemDIlOc0io= X-Gm-Gg: ASbGnctHI5i8AgdVOIitXwjUBrbf8pBBDSOhPd1G54NL4P1/4BbqxNBcJUl+Fd00OsK g9NiuyzZoCQaq5jHROAJMl2MrpNoEFN6VzeWTTNQr9PBR3bJFOKkK8nfDuf3JzNg7AACmQuofYl SFqYFS6GkI7gEz1rPNrjbV/ZW6scMzeM89H4FLflXNlT9jKd3VfQgxd1+TaR9v6Z2S/MwH0y2pr hvY6fa6a8F8q2Y6377/B+VrY8HiA+EcbFcDCwLRd2EMgkquDNoZt+k3dJ4hOd3Oibml7PLkjDhy 2mA3AhnReYkGWBrh43E4PTR8QKgVqAouFh3GaDNQed85Tx92O39tupM= X-Google-Smtp-Source: AGHT+IEVRudoi2scqh4XMCLq7eGU/gtugjegdf6OGs4JINDcEGAAHxM95AejGZDsKYMpE+VTCck6EQ== X-Received: by 2002:a17:907:3d4d:b0:ac3:8626:615 with SMTP id a640c23a62f3a-acad36d62camr1778426566b.49.1744725204133; Tue, 15 Apr 2025 06:53:24 -0700 (PDT) Received: from [127.0.0.2] ([2a02:2454:ff21:ef41:7b18:2529:5ce1:343d]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-acadcc21a44sm681379166b.177.2025.04.15.06.53.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Apr 2025 06:53:23 -0700 (PDT) From: Stephan Gerhold Date: Tue, 15 Apr 2025 15:52:50 +0200 Subject: [PATCH 7/8] arm64: dts: qcom: apq8039-t2: Move customized pinctrl to board Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250415-msm8916-console-pinctrl-v1-7-a1d33ea994b9@linaro.org> References: <20250415-msm8916-console-pinctrl-v1-0-a1d33ea994b9@linaro.org> In-Reply-To: <20250415-msm8916-console-pinctrl-v1-0-a1d33ea994b9@linaro.org> To: Bjorn Andersson , Konrad Dybcio Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sam Day , Casey Connolly X-Mailer: b4 0.14.2 Prepare for removing the generic UART pinctrl templates from msm8939.dtsi by copying the definition for the 4 pin UART1 instance into apq8039-t2.dts and apply the override to limit it to 2 pins. Having it defined separately in the board DT file makes it clear that the set of pins/pull etc are specific to the board and UART use case. No functional change. Signed-off-by: Stephan Gerhold --- arch/arm64/boot/dts/qcom/apq8039-t2.dts | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/apq8039-t2.dts b/arch/arm64/boot/dts/qcom/apq8039-t2.dts index 4aa0ad19bc0f7fde6f5f3a93cdb6be19fb4f1f65..38c281f0fe65ccfc49de70eaef2a970323ecebc8 100644 --- a/arch/arm64/boot/dts/qcom/apq8039-t2.dts +++ b/arch/arm64/boot/dts/qcom/apq8039-t2.dts @@ -122,14 +122,6 @@ &blsp_uart1 { status = "okay"; }; -&blsp_uart1_default { - pins = "gpio0", "gpio1"; -}; - -&blsp_uart1_sleep { - pins = "gpio0", "gpio1"; -}; - &blsp_uart2 { pinctrl-0 = <&blsp_uart2_console_default>; pinctrl-1 = <&blsp_uart2_console_sleep>; @@ -329,6 +321,20 @@ &tlmm { "USBC_GPIO7_1V8", /* GPIO_120 */ "NC"; + blsp_uart1_default: blsp-uart1-default-state { + pins = "gpio0", "gpio1"; + function = "blsp_uart1"; + drive-strength = <16>; + bias-disable; + }; + + blsp_uart1_sleep: blsp-uart1-sleep-state { + pins = "gpio0", "gpio1"; + function = "gpio"; + drive-strength = <2>; + bias-pull-down; + }; + pinctrl_backlight: backlight-state { pins = "gpio98"; function = "gpio"; From patchwork Tue Apr 15 13:52:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 881949 Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E85CC1F4629 for ; Tue, 15 Apr 2025 13:53:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744725209; cv=none; b=A2sP+DzSKulcQ510eRRy+j42AuWTw/Q7Fg3PbfdNAbJCD79e5mYePJtC/ovNtI9Am384Co4DMzHOm+BLaMWtMQIdOKhxTZ/vYb9jSKz/lfw+wdSjci8jno7EVcxjoeHOcz2eUsnxD/zTebKfujfa/2JJrhn2O6idjTJHC0BIqlg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744725209; c=relaxed/simple; bh=vHHaCmn/9aX14sPYqzMHTDqRNgtEpmUR2XVR9kxw4us=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=R0t/H4f7Fpg9P85b+IHY3D0p7hwn6iB6RCXp3ihqPDvwrMFEyA2zCOYoJdeXpWrNkoOjqM+eAGrb/TYYg7lGxYAe1ammi6Hk17TEKOPnwLvttpW86cplhC/Z0E+15wzPGMuzAkDoUe0FLh0uMF0+czzWqjI1O4211o3pDQIJRIk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=LMZ3lR7U; arc=none smtp.client-ip=209.85.218.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="LMZ3lR7U" Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-ac29af3382dso899150766b.2 for ; Tue, 15 Apr 2025 06:53:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744725205; x=1745330005; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Y4l6FA9ivn6gypUQ5rfKT4sB7wf6dagDvJ3RDh2XcgA=; b=LMZ3lR7UIsJ9tfCDq+sA6fcKM2jFaPcqVG015fmPGAT5WMYmxD2nnLkHWN5wvnMLO7 p5tV7ZsTsgr8HT8/m+ENLr5zCrsQ8ULfFKj+zFRDm6ZF80B0ybYzDK7eIIKPhnBbe/cC AlTl5xWFZ1KfKwHDPIRk84RiPzFGrWQE92G1uY0/GovRkbUaec0o0sV1cNNvJTNSMY1t w6mSoU18P9o9RxbTaPB3muXBJDhFJh9Hu6LSDImktT9q2iibYw/AXbw2FcaQosp5EpGf /0zw64yU6XXaxVXB/8Wg+oAvEGq4ikU8BELQUg5y3Q05p/xBmef2bG4Ji0WYfIikLDzE a4rQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744725205; x=1745330005; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Y4l6FA9ivn6gypUQ5rfKT4sB7wf6dagDvJ3RDh2XcgA=; b=RYHmquTP90ORpG8ZAkCOTF1pCjsnIKmCi3ea3iN22/QPqNhTEklSgB1WOMZIulEbhJ 8Rmk4wHn4ysljVSMVifPQe6gb2YtA6IdgyehfJjay5X1czpu3mOK/lFkBetvQLRWdFL2 5IdPiUn/OEqmys6GSIlLRNsnY6XfpxwZGVa4TcZGQwA83zYQlrZuqfzr70yeBpBPYT3B vjto4CQWw7UUJQ3FYOiBWzUEDMEpqzwoqilHgX/VL/8kMSjrBClkRHicAGvwDprLfR78 au84DFLxTeFJzlmHqXDO8T3l2FxHdSxhlBZiwkD6K727/8S4oIIxf7OKS0ubhF+l0uj/ TrsA== X-Forwarded-Encrypted: i=1; AJvYcCVi7czvGYBkgb02oZcOGbm1iyYk9KuaGtTAZS+yVyGEp8nHZYP6FAgRP38KJ/8nviJQQ9WAo52qWz1X6m+3@vger.kernel.org X-Gm-Message-State: AOJu0YxQ//PA1NRGb4VzMki5GT7k0WICvvWJuKFpKqBW2bJBjuxUkHVt wT4rh/o8kzq4/ta2rSShlEooZ9cZkpb8SZVFn0GKm6E4IBy6yldH6iSFDU8fDbE= X-Gm-Gg: ASbGncvNLeNd0Gc50tRvMqzULO930Lhd+Ps+TveddlV04mFHCpAjWBulJk9NfUmbmkB KLsK6x4gf0c5IBoc2uOWiGJzxluwX8kb7rB94UtbNffpgbdarMkZ996FhQLr4l7kjlqGw0t2APj eS4Bd3pBswCAbwdDA8Vu6+6fEFfvAsXrmJzW/FMsMaedW1EmMeShkta3IcJYgzaRPBvCOw5MzKt CXxt6nchmI865/D16FrN7WdXtKkl8A8rZmvsZKxTanvyU7wpC3GZtiRdr3htcvaStazySFP0ihU VcCBCaEoxPu961SxpHlyfyF+M5s7s3GhKimRXStb/CL8xc/ZfJ1Dyh8= X-Google-Smtp-Source: AGHT+IGLoagUswLH/ZZJxI5K2dTSGE3DxsOQWCM3VHaHo3ThpnYQbzNk4zQXdqBSRKUbftY/ghk2xw== X-Received: by 2002:a17:906:db06:b0:ac6:ecd8:a235 with SMTP id a640c23a62f3a-acad34c1a5bmr1656932066b.28.1744725205043; Tue, 15 Apr 2025 06:53:25 -0700 (PDT) Received: from [127.0.0.2] ([2a02:2454:ff21:ef41:7b18:2529:5ce1:343d]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-acadcc21a44sm681379166b.177.2025.04.15.06.53.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Apr 2025 06:53:24 -0700 (PDT) From: Stephan Gerhold Date: Tue, 15 Apr 2025 15:52:51 +0200 Subject: [PATCH 8/8] arm64: dts: qcom: msm8916/39: Drop generic UART pinctrl templates Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250415-msm8916-console-pinctrl-v1-8-a1d33ea994b9@linaro.org> References: <20250415-msm8916-console-pinctrl-v1-0-a1d33ea994b9@linaro.org> In-Reply-To: <20250415-msm8916-console-pinctrl-v1-0-a1d33ea994b9@linaro.org> To: Bjorn Andersson , Konrad Dybcio Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sam Day , Casey Connolly X-Mailer: b4 0.14.2 Now that all boards use either the customized console UART pinctrl templates or define the UART pinctrl directly in the board DT file, drop the old inconsistent generic pinctrl templates to reduce potential confusion. No functional change. Signed-off-by: Stephan Gerhold --- arch/arm64/boot/dts/qcom/msm8916.dtsi | 24 +----------------------- arch/arm64/boot/dts/qcom/msm8939.dtsi | 23 +---------------------- 2 files changed, 2 insertions(+), 45 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi index 9f1796222c597afd45dd31131b198f3574e97885..4175abc20fa7d26180ea4c69a0e1972222261354 100644 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi @@ -1232,21 +1232,6 @@ blsp_spi6_sleep: blsp-spi6-sleep-state { bias-pull-down; }; - blsp_uart1_default: blsp-uart1-default-state { - /* TX, RX, CTS_N, RTS_N */ - pins = "gpio0", "gpio1", "gpio2", "gpio3"; - function = "blsp_uart1"; - drive-strength = <16>; - bias-disable; - }; - - blsp_uart1_sleep: blsp-uart1-sleep-state { - pins = "gpio0", "gpio1", "gpio2", "gpio3"; - function = "gpio"; - drive-strength = <2>; - bias-pull-down; - }; - blsp_uart1_console_default: blsp-uart1-console-default-state { tx-pins { pins = "gpio0"; @@ -1271,13 +1256,6 @@ blsp_uart1_console_sleep: blsp-uart1-console-sleep-state { bias-pull-down; }; - blsp_uart2_default: blsp-uart2-default-state { - pins = "gpio4", "gpio5"; - function = "blsp_uart2"; - drive-strength = <16>; - bias-disable; - }; - blsp_uart2_console_default: blsp-uart2-console-default-state { tx-pins { pins = "gpio4"; @@ -1295,7 +1273,7 @@ rx-pins { }; }; - blsp_uart2_sleep: blsp_uart2_console_sleep: blsp-uart2-sleep-state { + blsp_uart2_console_sleep: blsp-uart2-console-sleep-state { pins = "gpio4", "gpio5"; function = "gpio"; drive-strength = <2>; diff --git a/arch/arm64/boot/dts/qcom/msm8939.dtsi b/arch/arm64/boot/dts/qcom/msm8939.dtsi index 16c16ec0f4560a7102f8ffef20c58fbec81dee38..3ee61acc0f96aaf79a182d21920b3664a0daa5fc 100644 --- a/arch/arm64/boot/dts/qcom/msm8939.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8939.dtsi @@ -905,20 +905,6 @@ blsp_spi6_sleep: blsp-spi6-sleep-state { bias-pull-down; }; - blsp_uart1_default: blsp-uart1-default-state { - pins = "gpio0", "gpio1", "gpio2", "gpio3"; - function = "blsp_uart1"; - drive-strength = <16>; - bias-disable; - }; - - blsp_uart1_sleep: blsp-uart1-sleep-state { - pins = "gpio0", "gpio1", "gpio2", "gpio3"; - function = "gpio"; - drive-strength = <2>; - bias-pull-down; - }; - blsp_uart1_console_default: blsp-uart1-console-default-state { tx-pins { pins = "gpio0"; @@ -943,13 +929,6 @@ blsp_uart1_console_sleep: blsp-uart1-console-sleep-state { bias-pull-down; }; - blsp_uart2_default: blsp-uart2-default-state { - pins = "gpio4", "gpio5"; - function = "blsp_uart2"; - drive-strength = <16>; - bias-disable; - }; - blsp_uart2_console_default: blsp-uart2-console-default-state { tx-pins { pins = "gpio4"; @@ -967,7 +946,7 @@ rx-pins { }; }; - blsp_uart2_sleep: blsp_uart2_console_sleep: blsp-uart2-sleep-state { + blsp_uart2_console_sleep: blsp-uart2-console-sleep-state { pins = "gpio4", "gpio5"; function = "gpio"; drive-strength = <2>;