From patchwork Mon Sep 11 07:28:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 721551 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 856C4EE801F for ; Mon, 11 Sep 2023 07:29:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234524AbjIKH3I (ORCPT ); Mon, 11 Sep 2023 03:29:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48252 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234312AbjIKH3H (ORCPT ); Mon, 11 Sep 2023 03:29:07 -0400 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D987DCEB for ; Mon, 11 Sep 2023 00:28:51 -0700 (PDT) Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-31f915c3c42so1489895f8f.0 for ; Mon, 11 Sep 2023 00:28:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694417330; x=1695022130; 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=vNUj62/M4tmKX/2DqRZP4HVxTwSJsxlX5VsGMGceMUs=; b=lK7poQ18MK++qPsAXx7ZqN75o7S/a/uj0MKVNs6zq22AK/oJL+yX23XoAf792LpDc3 GYOgg/W9dr67XFOE8vX/aifw+ikEAFF185mpI1gpV4wLr7oSIgbyeTX13UM6+Yvxjbik wPVY4mdtmL2vE984Clo88UIZJ79K09WEBS00ixn0V7OB1PuQSnGB7sBK7PADMEcpQLkV Vo4Vo5EdwRpEmp96SX4ECCXfoLd8xxnAIgZdspweDrLUnTeR9dDlIHnrZhr3Q59UC5qh 3f/xX1pTLAdgSRHa19gLkqRITK1amPJlvqNCgCn9ghYv264mCVLxEBh5mCm53rkESYD4 o0cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694417330; x=1695022130; 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=vNUj62/M4tmKX/2DqRZP4HVxTwSJsxlX5VsGMGceMUs=; b=hlvJjhQsPzQQN6Hl/ZwoW0E/zf6wXlj6uzb0eN3xs6JHlMW/St4iZIYdA3aFuwgMQk oJW8VJE5wJgY9D5YHfSZ4XpVf2eVwg8RezIahCdgyDq0klJ0CEEvl3b9DT9Q1Ayle01N 9E1r8voMTZHx4ZGAjD18sdKEOueJUMEWuAon5CMeuYrRqK6tPo0Dn+uoycZoQQ6Ii7gE 8IanaljKFFAYziU1WJJfWEi/twlXsh+MuJ8PIzEaMukXuWEUKqB4e0Ai1qiOseFQmQAe 5elGupL6PGXyMauFqzshi8Ma1ZcF6zxLAWO5/9krtK/Mg4qmo5pV+A6F0ZWn4rmho2dx hHRA== X-Gm-Message-State: AOJu0Yyk+2alCLX4quRJkrO763f3pHR2Xou5Gzdm1QKLZ99dXrDTPSc5 bIStKaxtPBS8ElL2hpyuUYSynwiqWTk4Y0ibydleIf9q X-Google-Smtp-Source: AGHT+IGmSjX3IT75Zk0BefGyDnNOjOY7Ph0JzDqH960D2dH81wBL7UvgbQdZDJe5WPDVElegXjiV5A== X-Received: by 2002:adf:ce89:0:b0:31a:d4d0:6e98 with SMTP id r9-20020adfce89000000b0031ad4d06e98mr6689874wrn.8.1694417330310; Mon, 11 Sep 2023 00:28:50 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id c17-20020adfed91000000b0031779a6b451sm9250075wro.83.2023.09.11.00.28.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Sep 2023 00:28:49 -0700 (PDT) From: Neil Armstrong Date: Mon, 11 Sep 2023 09:28:46 +0200 Subject: [PATCH v4 1/2] arm64: dts: qcom: sm8550: add UART14 nodes MIME-Version: 1.0 Message-Id: <20230911-topic-sm8550-upstream-bt-v4-1-a5a428c77418@linaro.org> References: <20230911-topic-sm8550-upstream-bt-v4-0-a5a428c77418@linaro.org> In-Reply-To: <20230911-topic-sm8550-upstream-bt-v4-0-a5a428c77418@linaro.org> To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski , Neil Armstrong X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1882; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=Jx1oOXLodxCtBg0nzOzN4S7TEr0xljs+0VicKiw5/8s=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBk/sGvH3WKMfgPSq8J2S4r3oh8huQzx4NBfptxOJMx uJU2tTSJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZP7BrwAKCRB33NvayMhJ0cfZD/ 9ctPinjqGvGoh6dcZRRS5G8tFV6B4YpQjbrPW65UpzZfI/5I1O7cAkRcyZP+lQ59Gdop20r7FTRMRR Bk0MUvlTZXsWngXT9ut56mHTiL8XD4GBAfGdPxZ/gFM4HuzB78qHpT9i+tQulj500Mb1bjSt83T6Kq Kq1HPL2jbKu6FJUa5SbNM7VjkakkJnrn7oEHe7u6Tb0yeALZbCHrV/4JFIUn6h0TA9ezJ5dhmHpAHN y4qHTj+2iy85z9OmGEkqlDOCPp4p39Q+32JKTCCdcT3UUZCa15r80aVrzqzHQTK5zqilQNmVkt8rG0 m2Y+VZQMtjiPOXW1HxdHirj5OG73smRRu5AuqfWxo3V13OJTtVX9cukziXLpoFfDHZB8D9BBjudS4L FV2tmXj5PAngFQOEPdnj8wkieJuwYW/47nHs2UCUqs3hNCpVBuq4/TydtI8SkBhGlOB6BpeOIeoTkO O8a+ue9sFBSsxfOtvlkpOSNWs6Yaq8lh4wfi7JHxx3KKh+QYgIIMWKBhqTo9X8WvmGlsZ2KDLue+vF kigMjtI5Dk4ctWQLtDVSxGgAGSrB7PgOABnFVdyiyzma/LR7ydSt+z3SlJCwf7R5Ul8+86zqOlOHuq YIIdSHSMZh1g2OtpBAiYsswtHW8MEgi/0FUoZbjuwTV/S7rRikvumoIeutSw== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add the Geni High Speed UART QUP instance 2 element 6 node and associated default pinctrl. Reviewed-by: Krzysztof Kozlowski Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/qcom/sm8550.dtsi | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qcom/sm8550.dtsi index d115960bdeec..4be10a9bf933 100644 --- a/arch/arm64/boot/dts/qcom/sm8550.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi @@ -1054,6 +1054,20 @@ spi13: spi@894000 { status = "disabled"; }; + uart14: uart@898000 { + compatible = "qcom,geni-uart"; + reg = <0 0x898000 0 0x4000>; + clock-names = "se"; + clocks = <&gcc GCC_QUPV3_WRAP2_S6_CLK>; + pinctrl-names = "default"; + pinctrl-0 = <&qup_uart14_default>, <&qup_uart14_cts_rts>; + interrupts = ; + interconnects = <&clk_virt MASTER_QUP_CORE_2 0 &clk_virt SLAVE_QUP_CORE_2 0>, + <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_QUP_2 0>; + interconnect-names = "qup-core", "qup-config"; + status = "disabled"; + }; + i2c15: i2c@89c000 { compatible = "qcom,geni-i2c"; reg = <0 0x0089c000 0 0x4000>; @@ -3498,6 +3512,22 @@ qup_uart7_default: qup-uart7-default-state { bias-disable; }; + qup_uart14_default: qup-uart14-default-state { + /* TX, RX */ + pins = "gpio78", "gpio79"; + function = "qup2_se6"; + drive-strength = <2>; + bias-pull-up; + }; + + qup_uart14_cts_rts: qup-uart14-cts-rts-state { + /* CTS, RTS */ + pins = "gpio76", "gpio77"; + function = "qup2_se6"; + drive-strength = <2>; + bias-pull-down; + }; + sdc2_sleep: sdc2-sleep-state { clk-pins { pins = "sdc2_clk"; From patchwork Mon Sep 11 07:28:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 722267 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 840C2EEB58C for ; Mon, 11 Sep 2023 07:29:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234501AbjIKH3J (ORCPT ); Mon, 11 Sep 2023 03:29:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48272 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234492AbjIKH3H (ORCPT ); Mon, 11 Sep 2023 03:29:07 -0400 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC3C7CF2 for ; Mon, 11 Sep 2023 00:28:52 -0700 (PDT) Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-401da71b85eso44858725e9.1 for ; Mon, 11 Sep 2023 00:28:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694417331; x=1695022131; 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=N2ERWb9EP2wbLVPEmQQJrogyBK+euZUPANjJZI/IjIk=; b=b1nnKXDmMLG95KDdf05pGtNLCDPhx1512Bg2o7GAr3reEiNIL66Ntdc+6+mEJqz/cB 7puyOZma33lafvnnRnkEwx+tPTSeHt0tNTSUrHgh6KBuWk1hYuGZprErnCn1355tG4Ay X2gspWnLaHViYA/ORB2lEPBfZhcmv6LLF6V+NeHMIpUoMNwUcmjfrr/HG9NAvP65nLA1 ZM2lPXj/9iUe1zuUvh4TZcX94a6rVqfvQf5cQrxlHJM9UPxmccR4XjvewHz62cLIuV4c CHRaNDdqX0uMFWmsdPPbyALLTkhBHMveMVY9u490STiiTEhcZq+cS9t8ziUie3GjjQg/ PSBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694417331; x=1695022131; 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=N2ERWb9EP2wbLVPEmQQJrogyBK+euZUPANjJZI/IjIk=; b=wXYubtmiCPQxbAc8qVQkw9GwqlX6uH6dQDeIAPQxYnKCvv3kQHklNChDWRYsvCN9Ww UxAxXgL1F/k4qYSHWeOGtLTUrLISMArdCcAbXYKXFLSJvIRXaBj1iS5Bkir0pjs2aDrE rkO2GVtpaZn2Q5POgKooM/Xq+USv62oWgDF8B9w/gw13XrP27X3t4UNgBeQXyBw+Ly22 z9v8SiOSsj9+Sz2IVo1BUHQS6J3pea4MXQDOSsMRtaGNMtrxT12Zv2qSz9rGmYlCfyQz k1cr8Gb3bViaIcKbVUhVp+RqbPnwr8UbbNddhTVFx1kdZWGzFiWZTL5R7rsHg6/MpOQ2 pm8w== X-Gm-Message-State: AOJu0YxIXNyl7nS1ljyBdjbzppokY+MjigF79phJbPA891pipfEAzqUL 9Hm2SdGo9chbqwRNSc7SSpDYhhARC0Bzo8UxVthIivYi X-Google-Smtp-Source: AGHT+IEDXyRveRYDT8DWyZrzv+jc25qYJbZxtmrgzcoHngd66DHeaSr99XU9qrRdI0C0KSARbPGaow== X-Received: by 2002:a5d:5103:0:b0:319:731f:748c with SMTP id s3-20020a5d5103000000b00319731f748cmr7222888wrt.34.1694417331293; Mon, 11 Sep 2023 00:28:51 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id c17-20020adfed91000000b0031779a6b451sm9250075wro.83.2023.09.11.00.28.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Sep 2023 00:28:50 -0700 (PDT) From: Neil Armstrong Date: Mon, 11 Sep 2023 09:28:47 +0200 Subject: [PATCH v4 2/2] arm64: dts: qcom: sm8550-qrd: add bluetooth support MIME-Version: 1.0 Message-Id: <20230911-topic-sm8550-upstream-bt-v4-2-a5a428c77418@linaro.org> References: <20230911-topic-sm8550-upstream-bt-v4-0-a5a428c77418@linaro.org> In-Reply-To: <20230911-topic-sm8550-upstream-bt-v4-0-a5a428c77418@linaro.org> To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski , Neil Armstrong X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1993; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=ry788gkwGyMiucuT9UDQVWPWstQIHueAK1m9wMljm1o=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBk/sGvC4CADHe3m/AYFjlwujZVWROkmob76NT7SCEc QWwZUDyJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZP7BrwAKCRB33NvayMhJ0Y+AD/ 9cRhy01hAqGDrbGBY2f/9f/nbv9qAVAODSwCL59hy+9Fs+xgzd8PxhSo7BPz4XjuoFbrWJGjGiBAbS xjDMv520nUpAM/F/PT93ewCCDMrx9mS/j1Gb/aXKi/jOZVkxTTEvygln48n0I2pQawbZDDutCzgfob DPIj+rbfVLYP0eMB5Ik/OFBtRpJ5IcMKpqNVS4bKJRBT3GCVwDhIqfFAlWvhgPe7ikat97JmVbGxcb 6CV2xpySToO5xghJ+r8+fbhNbxAQKg4pNVJv45ek1Z1H+RcE9qZutv6I9SwRWgOU+C8s/QhNqgSLwi Z4hyj7qJtlsQsK4qmt4aRrNfJ6fPpOIxnzN4P0hb58A7hatXPSbWApiiL4ZvIdytb+tuXWhEeyAPaS 2zUhbnoC81ADuWAJU7aXZCuYkc0+wAUkTBu5dKNLxjco23kTc0+llIPQmt6vkpj5f5AdmJtRDRweZw 0sPYjzcDXwgQT1BgBtjGt7Gbr/Tf9/3d/FgGYs2A8Fi50lGIfDWiLzvKnD75+YYn8OplK8PWmATYlW XzhsSOh4bQq+QPx8oJer1b3p6XIka7e8o0GNhPgQRJbzcYVN341zUwTNfflsiUBhUz4MO5ZO9+4bJ6 x8Cp2B0hb2mLYP1uhlc88C/pD6Unua0wO/UvqvbPq5V/A+BNzhDGpW+Vhmqg== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Enable the WCN7850 bluetooth over the UART14 link. Reviewed-by: Krzysztof Kozlowski Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 43 +++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts index 2c09ce8aeafd..a17c9f4f713f 100644 --- a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts +++ b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts @@ -23,6 +23,7 @@ / { aliases { serial0 = &uart7; + serial1 = &uart14; }; wcd938x: audio-codec { @@ -765,6 +766,10 @@ &qupv3_id_0 { status = "okay"; }; +&qupv3_id_1 { + status = "okay"; +}; + &remoteproc_adsp { firmware-name = "qcom/sm8550/adsp.mbn", "qcom/sm8550/adsp_dtb.mbn"; @@ -842,6 +847,21 @@ wcd_tx: codec@0,3 { &tlmm { gpio-reserved-ranges = <32 8>; + bt_default: bt-default-state { + bt-en-pins { + pins = "gpio81"; + function = "gpio"; + drive-strength = <16>; + bias-disable; + }; + + sw-ctrl-pins { + pins = "gpio82"; + function = "gpio"; + bias-pull-down; + }; + }; + sde_dsi_active: sde-dsi-active-state { pins = "gpio133"; function = "gpio"; @@ -883,6 +903,29 @@ &uart7 { status = "okay"; }; +&uart14 { + status = "okay"; + + bluetooth { + compatible = "qcom,wcn7850-bt"; + + vddio-supply = <&vreg_l15b_1p8>; + vddaon-supply = <&vreg_s4e_0p95>; + vdddig-supply = <&vreg_s4e_0p95>; + vddrfa0p8-supply = <&vreg_s4e_0p95>; + vddrfa1p2-supply = <&vreg_s4g_1p25>; + vddrfa1p9-supply = <&vreg_s6g_1p86>; + + max-speed = <3200000>; + + enable-gpios = <&tlmm 81 GPIO_ACTIVE_HIGH>; + swctrl-gpios = <&tlmm 82 GPIO_ACTIVE_HIGH>; + + pinctrl-0 = <&bt_default>; + pinctrl-names = "default"; + }; +}; + &ufs_mem_hc { reset-gpios = <&tlmm 210 GPIO_ACTIVE_LOW>; vcc-supply = <&vreg_l17b_2p5>;