From patchwork Mon May 29 12:46:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 100241 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1486737vqr; Mon, 29 May 2023 05:51:35 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ764/0pewb6nDClhWRb4IUukXHiBiidx2sN+JKShmCGXpv6HPiWodWCzAmZM5cCrJDd8Tzv X-Received: by 2002:a05:6a20:3955:b0:10f:243c:a6e7 with SMTP id r21-20020a056a20395500b0010f243ca6e7mr9936137pzg.13.1685364695445; Mon, 29 May 2023 05:51:35 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1685364695; cv=pass; d=google.com; s=arc-20160816; b=qPPLaX+0CwK08UZH0iwU1geIxaG0C1LuKEMQDrK47GhHujdvR1+tQGk42RvjVM7wYq 4RePOZS3KsYGxu4GuiQjqEagnrwXfpmog0ojq7Do/qX/DbbTDIq+b40lZFWXjmodRneD 0ugToE3guvWikDMV1uCaHANVnHsFR50jJFJQ0vs2vp0kzMTiOhMCiQGv18ROQbbxbjEG TsVJPq5Y62ClaTZP83CO8COOVhUP592wikggyIN6oA7L75vDhQ7aml0LNd4PP40rStqW 8zYCnWGbXhqHLwCiwnrdxml1EfJOaZjMPmYuqnRNMi+Y6oWdHYsPKxgrQ77G58NADn+V zyYw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature:dkim-signature; bh=0O0F7J+bWFnrNk3PMNsrOZgTJpVzJGIvb5uQkiMN4r0=; b=gds0+H1TOAixTik3Q+3DKWR6OIrTO0BRf0hdWg7UsJ1ahNMFk0rOY6hHhfxifK1GpT ACXRi2Q8VLe90mPZZEOyx+R0eXIe3vGexQQLHexBA2YNua+2cOkwYdzQb/W3jepKwJTv t2n9RR9TvFl8sG4cZ8MNrjGgatKoo8sMQ+4H0s9eQ4SpIxOqVdi5asb/2oCxIKBnOKb8 8ioQUs94bJOEs+iH+I721yDAHRthPhlpZ3Gx5e9BROk7cKR4J09lX70qUwSMoF51/0z4 ikpnldScyIUuAFAC/uwimK9rNJdDF6U7Yfj0T7MhiKPfJyFFoPpL9qa4s5Vz+1CBhc/t nuKg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gerhold.net header.s=strato-dkim-0002 header.b=TZjyHquA; dkim=neutral (no key) header.i=@gerhold.net; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j20-20020a637a54000000b0053592294fc0si9215370pgn.256.2023.05.29.05.51.21; Mon, 29 May 2023 05:51:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gerhold.net header.s=strato-dkim-0002 header.b=TZjyHquA; dkim=neutral (no key) header.i=@gerhold.net; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231821AbjE2Mrc (ORCPT + 99 others); Mon, 29 May 2023 08:47:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55924 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231801AbjE2MrW (ORCPT ); Mon, 29 May 2023 08:47:22 -0400 Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [81.169.146.219]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B45A2BE; Mon, 29 May 2023 05:47:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685364424; cv=none; d=strato.com; s=strato-dkim-0002; b=jQOk+F4qfb/6cl+eoIfJJOT8eGdpA8QPwOCHY4BZwbcMxc4gSrI2OT3AGtE+CGbAWe 9pCqafuj5NJPcn379YGGiKohbBZ0c7sd2HjfrVLWuNGPNwaG8U8EELsq82dh7IvK91C3 1Twt9fJa9V2Fdd4Upnv+0CQUcMvmeR2azTVWKPuXKyl113O03X8B3ceCz62e3amSFnnz i7BsZaLgxSBMcz/c9/F8p6gYYXeQT7qf6Tt3/+y81uUriwpC4ua1oHhZLngESE00dEof spkADx107Imj+bLeNyqaPdiSifg/fiwmbmbLnKRMr2lUi/XmWKovbVJWnAjpMqNKeCJK PqUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1685364424; s=strato-dkim-0002; d=strato.com; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=0O0F7J+bWFnrNk3PMNsrOZgTJpVzJGIvb5uQkiMN4r0=; b=Fic5heeC0ym4rgKqSB1ZdbJhHc07cvf9v557XQumDGMXRZYH8LJs/Y/rWDDpmFVacV bBuRombiF99TZEs7kGmVlwkhP3WimEy2MTVQ5+eHLbUyFV5217kujESyMyQKwfMX7awJ lVL1yIrdLBUjPkSVZWkoZS4MkLbz9NKXeYwXtTwvZKRkULNO7Q8MKyojHkMmWBlKW/Mr +XN62k91Dot2WfGGHJe467DcDOllr7d4iG4aOGX5a57TGkYn05v2u3y4x9+MZXk58juV r9L5LtdRs/50wst3MdM3wT70ogfyMkefC6nLeIETIW7JiFpTeMeK6oe8j88gxztywv/M xRLQ== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo00 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1685364424; s=strato-dkim-0002; d=gerhold.net; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=0O0F7J+bWFnrNk3PMNsrOZgTJpVzJGIvb5uQkiMN4r0=; b=TZjyHquAC76lROrt19EZ3F86+b+YZVgZK7FTLMveA2TRf4c1e3O9NZaX3J6MJawBkZ 7OH/Sg3WV9QetGvtX/VDdU96LMkxcnhJ4au8aQg4tBY2qCXvbYHpeflgAtEs6hnaIlUC Sp54eCj5mvbLiWTp9Y61FPlhauTZbgQidcGexJGGwiRe4O8WLorwyw+AcNygKg+ta9Ab g73PPNSc+LJ2eENnBIY/PbQJaarjgp9D68zQFoYCM+Toh+Ilfhs/7gbHxABpzP7lFyBU ETqe6gw92iHBfEKh/SVS7qDF9IoJDqEfhK9G0i7qtYckoOhgK4CfsotZIbtnGgQIZYHc 7Wrw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1685364424; s=strato-dkim-0003; d=gerhold.net; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=0O0F7J+bWFnrNk3PMNsrOZgTJpVzJGIvb5uQkiMN4r0=; b=JZOuOIrsxkdRB8wQZRlvGnQuogLnkLMqXv5nc05M548kG/ZY4SOyDirRhLC2TAI0Um 0CoizuvmSUlnpg92ADDQ== X-RZG-AUTH: ":P3gBZUipdd93FF5ZZvYFPugejmSTVR2nRPhVOQjVd4CteZ/7jYgS+mLFY+H0JAn9VOH8mT0=" Received: from [192.168.244.3] by smtp.strato.de (RZmta 49.4.0 DYNA|AUTH) with ESMTPSA id j6420az4TCl3f8U (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Mon, 29 May 2023 14:47:03 +0200 (CEST) From: Stephan Gerhold Date: Mon, 29 May 2023 14:46:58 +0200 Subject: [PATCH 1/6] arm64: dts: qcom: msm8916: Rename &msmgpio -> &tlmm MIME-Version: 1.0 Message-Id: <20230525-msm8916-labels-v1-1-bec0f5fb46fb@gerhold.net> References: <20230525-msm8916-labels-v1-0-bec0f5fb46fb@gerhold.net> In-Reply-To: <20230525-msm8916-labels-v1-0-bec0f5fb46fb@gerhold.net> To: Bjorn Andersson Cc: Konrad Dybcio , Andy Gross , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue , Stephan Gerhold X-Mailer: b4 0.12.2 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767232970840331836?= X-GMAIL-MSGID: =?utf-8?q?1767232970840331836?= MSM8916 is the only ARM64 Qualcomm SoC that is still using the old &msmgpio name. Change this to &tlmm to avoid confusion. Note that the node ordering does not change because the MSM8916 device trees have pinctrl separated at the bottom (similar to sc7180). Signed-off-by: Stephan Gerhold Reviewed-by: Bryan O'Donoghue --- arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 24 ++++++------- arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts | 14 ++++---- .../boot/dts/qcom/msm8916-alcatel-idol347.dts | 24 ++++++------- arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts | 20 +++++------ arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts | 20 +++++------ arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts | 34 +++++++++--------- .../boot/dts/qcom/msm8916-longcheer-l8150.dts | 20 +++++------ .../boot/dts/qcom/msm8916-longcheer-l8910.dts | 16 ++++----- arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 2 +- .../dts/qcom/msm8916-samsung-a2015-common.dtsi | 40 ++++++++++----------- .../boot/dts/qcom/msm8916-samsung-a3u-eur.dts | 12 +++---- .../boot/dts/qcom/msm8916-samsung-a5u-eur.dts | 6 ++-- .../dts/qcom/msm8916-samsung-e2015-common.dtsi | 6 ++-- .../boot/dts/qcom/msm8916-samsung-grandmax.dts | 6 ++-- .../boot/dts/qcom/msm8916-samsung-gt5-common.dtsi | 14 ++++---- arch/arm64/boot/dts/qcom/msm8916-samsung-gt510.dts | 12 +++---- arch/arm64/boot/dts/qcom/msm8916-samsung-gt58.dts | 8 ++--- .../boot/dts/qcom/msm8916-samsung-j5-common.dtsi | 16 ++++----- .../boot/dts/qcom/msm8916-samsung-serranove.dts | 42 +++++++++++----------- arch/arm64/boot/dts/qcom/msm8916-thwc-uf896.dts | 8 ++--- arch/arm64/boot/dts/qcom/msm8916-thwc-ufi001c.dts | 10 +++--- arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi | 2 +- .../boot/dts/qcom/msm8916-wingtech-wt88047.dts | 16 ++++----- .../arm64/boot/dts/qcom/msm8916-yiming-uz801v3.dts | 8 ++--- arch/arm64/boot/dts/qcom/msm8916.dtsi | 4 +-- 25 files changed, 192 insertions(+), 192 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts index 1c5d55854893..82f141b55eb3 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts @@ -75,7 +75,7 @@ usb2513 { usb_id: usb-id { compatible = "linux,extcon-usb-gpio"; - id-gpio = <&msmgpio 121 GPIO_ACTIVE_HIGH>; + id-gpio = <&tlmm 121 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&usb_id_default>; }; @@ -101,13 +101,13 @@ gpio-keys { button { label = "Volume Up"; linux,code = ; - gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>; + gpios = <&tlmm 107 GPIO_ACTIVE_LOW>; }; }; leds { pinctrl-names = "default"; - pinctrl-0 = <&msmgpio_leds>, + pinctrl-0 = <&tlmm_leds>, <&pm8916_gpios_leds>, <&pm8916_mpps_leds>; @@ -117,7 +117,7 @@ led@1 { label = "apq8016-sbc:green:user1"; function = LED_FUNCTION_HEARTBEAT; color = ; - gpios = <&msmgpio 21 GPIO_ACTIVE_HIGH>; + gpios = <&tlmm 21 GPIO_ACTIVE_HIGH>; linux,default-trigger = "heartbeat"; default-state = "off"; }; @@ -126,7 +126,7 @@ led@2 { label = "apq8016-sbc:green:user2"; function = LED_FUNCTION_DISK_ACTIVITY; color = ; - gpios = <&msmgpio 120 GPIO_ACTIVE_HIGH>; + gpios = <&tlmm 120 GPIO_ACTIVE_HIGH>; linux,default-trigger = "mmc0"; default-state = "off"; }; @@ -186,14 +186,14 @@ adv_bridge: bridge@39 { compatible = "adi,adv7533"; reg = <0x39>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <31 IRQ_TYPE_EDGE_FALLING>; adi,dsi-lanes = <4>; clocks = <&rpmcc RPM_SMD_BB_CLK2>; clock-names = "cec"; - pd-gpios = <&msmgpio 32 GPIO_ACTIVE_HIGH>; + pd-gpios = <&tlmm 32 GPIO_ACTIVE_HIGH>; avdd-supply = <&pm8916_l6>; v1p2-supply = <&pm8916_l6>; @@ -276,8 +276,8 @@ camera_rear@3b { compatible = "ovti,ov5640"; reg = <0x3b>; - enable-gpios = <&msmgpio 34 GPIO_ACTIVE_HIGH>; - reset-gpios = <&msmgpio 35 GPIO_ACTIVE_LOW>; + enable-gpios = <&tlmm 34 GPIO_ACTIVE_HIGH>; + reset-gpios = <&tlmm 35 GPIO_ACTIVE_LOW>; pinctrl-names = "default"; pinctrl-0 = <&camera_rear_default>; @@ -373,7 +373,7 @@ &sdhc_2 { pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>; pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>; - cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>; + cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>; }; &sound { @@ -515,7 +515,7 @@ &i2c6_default { * ones actually used for GPIO. */ -&msmgpio { +&tlmm { gpio-line-names = "[UART0_TX]", /* GPIO_0, LSEC pin 5 */ "[UART0_RX]", /* GPIO_1, LSEC pin 7 */ @@ -640,7 +640,7 @@ &msmgpio { "USR_LED_2_CTRL", /* GPIO 120 */ "SB_HS_ID"; - msmgpio_leds: msmgpio-leds-state { + tlmm_leds: tlmm-leds-state { pins = "gpio21", "gpio120"; function = "gpio"; 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 753413b48751..7b77a80f049c 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts @@ -39,14 +39,14 @@ gpio-keys { button-volume-up { label = "Volume Up"; - gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>; + gpios = <&tlmm 107 GPIO_ACTIVE_LOW>; linux,code = ; }; }; usb_id: usb-id { compatible = "linux,extcon-usb-gpio"; - id-gpio = <&msmgpio 110 GPIO_ACTIVE_HIGH>; + id-gpio = <&tlmm 110 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&usb_id_default>; }; @@ -58,7 +58,7 @@ &blsp_i2c2 { accelerometer@10 { compatible = "bosch,bmc150_accel"; reg = <0x10>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <115 IRQ_TYPE_EDGE_RISING>; vdd-supply = <&pm8916_l17>; @@ -89,10 +89,10 @@ touchscreen@38 { compatible = "edt,edt-ft5406"; reg = <0x38>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <13 IRQ_TYPE_LEVEL_LOW>; - reset-gpios = <&msmgpio 12 GPIO_ACTIVE_LOW>; + reset-gpios = <&tlmm 12 GPIO_ACTIVE_LOW>; vcc-supply = <&pm8916_l16>; iovcc-supply = <&pm8916_l6>; @@ -143,7 +143,7 @@ &sdhc_2 { pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on>; pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>; - cd-gpios = <&msmgpio 38 GPIO_ACTIVE_HIGH>; + cd-gpios = <&tlmm 38 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -165,7 +165,7 @@ &wcnss_iris { compatible = "qcom,wcn3620"; }; -&msmgpio { +&tlmm { accel_int_default: accel-int-default-state { pins = "gpio115"; function = "gpio"; diff --git a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts index 4bfbad669b1e..d2abbdec5fe6 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts @@ -30,7 +30,7 @@ gpio-keys { button-volume-up { label = "Volume Up"; - gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>; + gpios = <&tlmm 107 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -42,7 +42,7 @@ gpio-leds { pinctrl-0 = <&gpio_leds_default>; led-0 { - gpios = <&msmgpio 32 GPIO_ACTIVE_HIGH>; + gpios = <&tlmm 32 GPIO_ACTIVE_HIGH>; linux,default-trigger = "torch"; function = LED_FUNCTION_TORCH; }; @@ -50,7 +50,7 @@ led-0 { usb_id: usb-id { compatible = "linux,extcon-usb-gpio"; - id-gpio = <&msmgpio 69 GPIO_ACTIVE_HIGH>; + id-gpio = <&tlmm 69 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&usb_id_default>; }; @@ -66,9 +66,9 @@ &blsp_i2c4 { touchscreen@26 { compatible = "mstar,msg2638"; reg = <0x26>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <13 IRQ_TYPE_EDGE_FALLING>; - reset-gpios = <&msmgpio 100 GPIO_ACTIVE_LOW>; + reset-gpios = <&tlmm 100 GPIO_ACTIVE_LOW>; pinctrl-names = "default"; pinctrl-0 = <&ts_int_reset_default>; vdd-supply = <&pm8916_l17>; @@ -86,7 +86,7 @@ magnetometer@c { reg = <0x0c>; vdd-supply = <&pm8916_l17>; vid-supply = <&pm8916_l6>; - reset-gpios = <&msmgpio 8 GPIO_ACTIVE_LOW>; + reset-gpios = <&tlmm 8 GPIO_ACTIVE_LOW>; pinctrl-names = "default"; pinctrl-0 = <&mag_reset_default>; mount-matrix = "0", "1", "0", @@ -99,7 +99,7 @@ accelerometer@f { reg = <0x0f>; vdd-supply = <&pm8916_l17>; vddio-supply = <&pm8916_l6>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <31 IRQ_TYPE_EDGE_RISING>; pinctrl-names = "default"; pinctrl-0 = <&accel_int_default>; @@ -111,7 +111,7 @@ accelerometer@f { proximity@48 { compatible = "sensortek,stk3310"; reg = <0x48>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <12 IRQ_TYPE_EDGE_FALLING>; pinctrl-names = "default"; pinctrl-0 = <&proximity_int_default>; @@ -122,7 +122,7 @@ gyroscope@68 { reg = <0x68>; vdd-supply = <&pm8916_l17>; vddio-supply = <&pm8916_l6>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <97 IRQ_TYPE_EDGE_RISING>, <98 IRQ_TYPE_EDGE_RISING>; pinctrl-names = "default"; @@ -136,7 +136,7 @@ &blsp_i2c6 { led-controller@68 { compatible = "si-en,sn3190"; reg = <0x68>; - shutdown-gpios = <&msmgpio 89 GPIO_ACTIVE_HIGH>; + shutdown-gpios = <&tlmm 89 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&led_enable_default &led_shutdown_default>; #address-cells = <1>; @@ -182,7 +182,7 @@ &sdhc_2 { pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>; pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>; - cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>; + cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>; }; &usb { @@ -202,7 +202,7 @@ &wcnss_iris { compatible = "qcom,wcn3620"; }; -&msmgpio { +&tlmm { accel_int_default: accel-int-default-state { pins = "gpio31"; function = "gpio"; diff --git a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts index 37755e885395..c58a70fdf36f 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts @@ -30,14 +30,14 @@ gpio-keys { button-volume-up { label = "Volume Up"; - gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>; + gpios = <&tlmm 107 GPIO_ACTIVE_LOW>; linux,code = ; debounce-interval = <15>; }; button-volume-down { label = "Volume Down"; - gpios = <&msmgpio 117 GPIO_ACTIVE_LOW>; + gpios = <&tlmm 117 GPIO_ACTIVE_LOW>; linux,code = ; debounce-interval = <15>; }; @@ -49,7 +49,7 @@ reg_sd_vmmc: regulator-sdcard-vmmc { regulator-min-microvolt = <2950000>; regulator-max-microvolt = <2950000>; - gpio = <&msmgpio 87 GPIO_ACTIVE_HIGH>; + gpio = <&tlmm 87 GPIO_ACTIVE_HIGH>; enable-active-high; startup-delay-us = <200>; @@ -60,7 +60,7 @@ reg_sd_vmmc: regulator-sdcard-vmmc { usb_id: usb-id { compatible = "linux,extcon-usb-gpio"; - id-gpios = <&msmgpio 110 GPIO_ACTIVE_HIGH>; + id-gpios = <&tlmm 110 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&usb_id_default>; }; @@ -76,7 +76,7 @@ magnetometer@c { vdd-supply = <&pm8916_l8>; vid-supply = <&pm8916_l6>; - reset-gpios = <&msmgpio 112 GPIO_ACTIVE_LOW>; + reset-gpios = <&tlmm 112 GPIO_ACTIVE_LOW>; pinctrl-names = "default"; pinctrl-0 = <&mag_reset_default>; @@ -86,7 +86,7 @@ imu@68 { compatible = "invensense,mpu6515"; reg = <0x68>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <36 IRQ_TYPE_EDGE_RISING>; vdd-supply = <&pm8916_l17>; @@ -108,10 +108,10 @@ touchscreen@38 { compatible = "edt,edt-ft5306"; reg = <0x38>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <13 IRQ_TYPE_EDGE_FALLING>; - reset-gpios = <&msmgpio 12 GPIO_ACTIVE_LOW>; + reset-gpios = <&tlmm 12 GPIO_ACTIVE_LOW>; vcc-supply = <&pm8916_l11>; iovcc-supply = <&pm8916_l6>; @@ -150,7 +150,7 @@ &sdhc_2 { pinctrl-names = "default", "sleep"; pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>; pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>; - cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>; + cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>; }; &usb { @@ -170,7 +170,7 @@ &wcnss_iris { compatible = "qcom,wcn3620"; }; -&msmgpio { +&tlmm { gpio_keys_default: gpio-keys-default-state { pins = "gpio107", "gpio117"; function = "gpio"; diff --git a/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts b/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts index 4a6bf99c755f..221db7edec5e 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts @@ -24,8 +24,8 @@ chosen { flash-led-controller { /* Actually qcom,leds-gpio-flash */ compatible = "sgmicro,sgm3140"; - enable-gpios = <&msmgpio 31 GPIO_ACTIVE_HIGH>; - flash-gpios = <&msmgpio 32 GPIO_ACTIVE_HIGH>; + enable-gpios = <&tlmm 31 GPIO_ACTIVE_HIGH>; + flash-gpios = <&tlmm 32 GPIO_ACTIVE_HIGH>; pinctrl-0 = <&camera_flash_default>; pinctrl-names = "default"; @@ -45,7 +45,7 @@ gpio-keys { button-volume-up { label = "Volume Up"; - gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>; + gpios = <&tlmm 107 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -59,21 +59,21 @@ gpio-leds { led-red { function = LED_FUNCTION_CHARGING; color = ; - gpios = <&msmgpio 117 GPIO_ACTIVE_HIGH>; + gpios = <&tlmm 117 GPIO_ACTIVE_HIGH>; retain-state-suspended; }; led-green { function = LED_FUNCTION_CHARGING; color = ; - gpios = <&msmgpio 118 GPIO_ACTIVE_HIGH>; + gpios = <&tlmm 118 GPIO_ACTIVE_HIGH>; retain-state-suspended; }; }; usb_id: usb-id { compatible = "linux,extcon-usb-gpio"; - id-gpio = <&msmgpio 110 GPIO_ACTIVE_HIGH>; + id-gpio = <&tlmm 110 GPIO_ACTIVE_HIGH>; pinctrl-0 = <&usb_id_default>; pinctrl-names = "default"; }; @@ -87,10 +87,10 @@ touchscreen@38 { compatible = "edt,edt-ft5406"; reg = <0x38>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <13 IRQ_TYPE_EDGE_FALLING>; - reset-gpios = <&msmgpio 12 GPIO_ACTIVE_LOW>; + reset-gpios = <&tlmm 12 GPIO_ACTIVE_LOW>; vcc-supply = <&pm8916_l17>; iovcc-supply = <&pm8916_l6>; @@ -138,7 +138,7 @@ &sdhc_2 { pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>; pinctrl-names = "default", "sleep"; - cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>; + cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>; status = "okay"; }; @@ -160,7 +160,7 @@ &wcnss_iris { compatible = "qcom,wcn3620"; }; -&msmgpio { +&tlmm { camera_flash_default: camera-flash-default-state { pins = "gpio31", "gpio32"; function = "gpio"; diff --git a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts index 29aaa35438a3..b02e8f9a8ca0 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts @@ -43,7 +43,7 @@ gpio-keys { button-volume-up { label = "Volume Up"; - gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>; + gpios = <&tlmm 107 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -55,21 +55,21 @@ leds { pinctrl-0 = <&gpio_leds_default>; led-0 { - gpios = <&msmgpio 8 GPIO_ACTIVE_HIGH>; + gpios = <&tlmm 8 GPIO_ACTIVE_HIGH>; color = ; default-state = "off"; function = LED_FUNCTION_INDICATOR; }; led-1 { - gpios = <&msmgpio 9 GPIO_ACTIVE_HIGH>; + gpios = <&tlmm 9 GPIO_ACTIVE_HIGH>; color = ; default-state = "off"; function = LED_FUNCTION_INDICATOR; }; led-2 { - gpios = <&msmgpio 10 GPIO_ACTIVE_HIGH>; + gpios = <&tlmm 10 GPIO_ACTIVE_HIGH>; color = ; default-state = "off"; function = LED_FUNCTION_INDICATOR; @@ -78,7 +78,7 @@ led-2 { usb_id: usb-id { compatible = "linux,extcon-usb-gpio"; - id-gpio = <&msmgpio 117 GPIO_ACTIVE_HIGH>; + id-gpio = <&tlmm 117 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&usb_id_default>; }; @@ -94,7 +94,7 @@ magnetometer@c { vdd-supply = <&pm8916_l17>; vid-supply = <&pm8916_l6>; - reset-gpios = <&msmgpio 36 GPIO_ACTIVE_LOW>; + reset-gpios = <&tlmm 36 GPIO_ACTIVE_LOW>; pinctrl-names = "default"; pinctrl-0 = <&mag_reset_default>; @@ -104,7 +104,7 @@ accelerometer@1e { compatible = "kionix,kx023-1025"; reg = <0x1e>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <115 IRQ_TYPE_EDGE_RISING>; vdd-supply = <&pm8916_l17>; @@ -122,7 +122,7 @@ proximity@39 { compatible = "avago,apds9930"; reg = <0x39>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <113 IRQ_TYPE_EDGE_FALLING>; vdd-supply = <&pm8916_l17>; @@ -146,7 +146,7 @@ reg_lcd_pos: outp { regulator-name = "outp"; regulator-min-microvolt = <5400000>; regulator-max-microvolt = <5400000>; - enable-gpios = <&msmgpio 97 GPIO_ACTIVE_HIGH>; + enable-gpios = <&tlmm 97 GPIO_ACTIVE_HIGH>; regulator-active-discharge = <1>; }; @@ -154,7 +154,7 @@ reg_lcd_neg: outn { regulator-name = "outn"; regulator-min-microvolt = <5400000>; regulator-max-microvolt = <5400000>; - enable-gpios = <&msmgpio 32 GPIO_ACTIVE_HIGH>; + enable-gpios = <&tlmm 32 GPIO_ACTIVE_HIGH>; regulator-active-discharge = <1>; }; }; @@ -169,7 +169,7 @@ rmi4@70 { #address-cells = <1>; #size-cells = <0>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <13 IRQ_TYPE_EDGE_FALLING>; vdd-supply = <&pm8916_l17>; @@ -199,11 +199,11 @@ nfc@28 { compatible = "nxp,pn547", "nxp,nxp-nci-i2c"; reg = <0x28>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <21 IRQ_TYPE_EDGE_RISING>; - enable-gpios = <&msmgpio 20 GPIO_ACTIVE_HIGH>; - firmware-gpios = <&msmgpio 2 GPIO_ACTIVE_HIGH>; + enable-gpios = <&tlmm 20 GPIO_ACTIVE_HIGH>; + firmware-gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&nfc_default>; @@ -264,7 +264,7 @@ &sdhc_2 { pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdhc2_cd_default>; /* - * The Huawei device tree sets cd-gpios = <&msmgpio 38 GPIO_ACTIVE_HIGH>. + * The Huawei device tree sets cd-gpios = <&tlmm 38 GPIO_ACTIVE_HIGH>. * However, gpio38 does not change its state when inserting/removing the * SD card, it's just low all the time. The Huawei kernel seems to use * polling for SD card detection instead. @@ -276,7 +276,7 @@ &sdhc_2 { * Maybe Huawei decided to replace the second SIM card slot with the * SD card slot and forgot to re-route to gpio38. */ - cd-gpios = <&msmgpio 56 GPIO_ACTIVE_LOW>; + cd-gpios = <&tlmm 56 GPIO_ACTIVE_LOW>; }; &sound { @@ -338,7 +338,7 @@ &wcnss_iris { compatible = "qcom,wcn3620"; }; -&msmgpio { +&tlmm { accel_irq_default: accel-irq-default-state { pins = "gpio115"; function = "gpio"; diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts index b7b1f1ceaf1f..56f74a892764 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts @@ -41,7 +41,7 @@ gpio-keys { button-volume-up { label = "Volume Up"; - gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>; + gpios = <&tlmm 107 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -53,7 +53,7 @@ reg_ctp: regulator-ctp { regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>; - gpio = <&msmgpio 17 GPIO_ACTIVE_HIGH>; + gpio = <&tlmm 17 GPIO_ACTIVE_HIGH>; enable-active-high; pinctrl-names = "default"; @@ -62,8 +62,8 @@ reg_ctp: regulator-ctp { flash-led-controller { compatible = "sgmicro,sgm3140"; - flash-gpios = <&msmgpio 31 GPIO_ACTIVE_HIGH>; - enable-gpios = <&msmgpio 32 GPIO_ACTIVE_HIGH>; + flash-gpios = <&tlmm 31 GPIO_ACTIVE_HIGH>; + enable-gpios = <&tlmm 32 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&camera_flash_default>; @@ -122,7 +122,7 @@ accelerometer@10 { * to the BMC156. However, there are two pads next to the chip * that can be shorted to make it work if needed. * - * interrupt-parent = <&msmgpio>; + * interrupt-parent = <&tlmm>; * interrupts = <116 IRQ_TYPE_EDGE_RISING>; */ @@ -141,7 +141,7 @@ magnetometer@12 { compatible = "bosch,bmc156_magn"; reg = <0x12>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <113 IRQ_TYPE_EDGE_RISING>; pinctrl-names = "default"; @@ -156,7 +156,7 @@ light-sensor@23 { reg = <0x23>; proximity-near-level = <75>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <115 IRQ_TYPE_EDGE_FALLING>; pinctrl-names = "default"; @@ -170,7 +170,7 @@ gyroscope@68 { compatible = "bosch,bmg160"; reg = <0x68>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <23 IRQ_TYPE_EDGE_RISING>, <22 IRQ_TYPE_EDGE_RISING>; @@ -191,7 +191,7 @@ rmi4@20 { #address-cells = <1>; #size-cells = <0>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <13 IRQ_TYPE_EDGE_FALLING>; vdd-supply = <®_ctp>; @@ -274,7 +274,7 @@ &wcnss_iris { compatible = "qcom,wcn3620"; }; -&msmgpio { +&tlmm { accel_int_default: accel-int-default-state { pins = "gpio116"; function = "gpio"; diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts index 630727ed1ed5..a1208c8e0620 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts @@ -22,8 +22,8 @@ chosen { flash-led-controller { compatible = "ocs,ocp8110"; - enable-gpios = <&msmgpio 49 GPIO_ACTIVE_HIGH>; - flash-gpios = <&msmgpio 119 GPIO_ACTIVE_HIGH>; + enable-gpios = <&tlmm 49 GPIO_ACTIVE_HIGH>; + flash-gpios = <&tlmm 119 GPIO_ACTIVE_HIGH>; pinctrl-0 = <&camera_front_flash_default>; pinctrl-names = "default"; @@ -45,7 +45,7 @@ gpio-keys { button-volume-up { label = "Volume Up"; - gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>; + gpios = <&tlmm 107 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -54,7 +54,7 @@ leds { compatible = "gpio-leds"; led-0 { - gpios = <&msmgpio 17 GPIO_ACTIVE_HIGH>; + gpios = <&tlmm 17 GPIO_ACTIVE_HIGH>; color = ; default-state = "off"; function = LED_FUNCTION_KBD_BACKLIGHT; @@ -66,7 +66,7 @@ led-0 { usb_id: usb-id { compatible = "linux,extcon-usb-gpio"; - id-gpio = <&msmgpio 110 GPIO_ACTIVE_HIGH>; + id-gpio = <&tlmm 110 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&usb_id_default>; }; @@ -82,7 +82,7 @@ magnetometer@d { vdd-supply = <&pm8916_l17>; vid-supply = <&pm8916_l6>; - reset-gpios = <&msmgpio 111 GPIO_ACTIVE_LOW>; + reset-gpios = <&tlmm 111 GPIO_ACTIVE_LOW>; pinctrl-names = "default"; pinctrl-0 = <&mag_reset_default>; @@ -136,7 +136,7 @@ &sdhc_2 { pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>; pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>; - cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>; + cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>; }; &usb { @@ -156,7 +156,7 @@ &wcnss_iris { compatible = "qcom,wcn3620"; }; -&msmgpio { +&tlmm { button_backlight_default: button-backlight-default-state { pins = "gpio17"; function = "gpio"; diff --git a/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi b/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi index 33dfcf318a81..1e07f70768f4 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi @@ -3,7 +3,7 @@ * Copyright (c) 2013-2015, The Linux Foundation. All rights reserved. */ -&msmgpio { +&tlmm { blsp1_uart1_default: blsp1-uart1-default-state { /* TX, RX, CTS_N, RTS_N */ 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 37a872949851..550ba6b9d4cd 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi @@ -44,13 +44,13 @@ gpio-keys { button-volume-up { label = "Volume Up"; - gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>; + gpios = <&tlmm 107 GPIO_ACTIVE_LOW>; linux,code = ; }; button-home { label = "Home"; - gpios = <&msmgpio 109 GPIO_ACTIVE_LOW>; + gpios = <&tlmm 109 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -65,7 +65,7 @@ gpio-hall-sensor { event-hall-sensor { label = "Hall Effect Sensor"; - gpios = <&msmgpio 52 GPIO_ACTIVE_LOW>; + gpios = <&tlmm 52 GPIO_ACTIVE_LOW>; linux,input-type = ; linux,code = ; linux,can-disable; @@ -83,7 +83,7 @@ reg_motor_vdd: regulator-motor-vdd { regulator-min-microvolt = <3000000>; regulator-max-microvolt = <3000000>; - gpio = <&msmgpio 76 GPIO_ACTIVE_HIGH>; + gpio = <&tlmm 76 GPIO_ACTIVE_HIGH>; enable-active-high; pinctrl-names = "default"; @@ -96,7 +96,7 @@ reg_vdd_tsp_a: regulator-vdd-tsp-a { regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - gpio = <&msmgpio 73 GPIO_ACTIVE_HIGH>; + gpio = <&tlmm 73 GPIO_ACTIVE_HIGH>; enable-active-high; pinctrl-names = "default"; @@ -105,8 +105,8 @@ reg_vdd_tsp_a: regulator-vdd-tsp-a { i2c-muic { compatible = "i2c-gpio"; - sda-gpios = <&msmgpio 105 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; - scl-gpios = <&msmgpio 106 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; + sda-gpios = <&tlmm 105 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; + scl-gpios = <&tlmm 106 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; pinctrl-names = "default"; pinctrl-0 = <&muic_i2c_default>; @@ -118,7 +118,7 @@ muic: extcon@25 { compatible = "siliconmitus,sm5502-muic"; reg = <0x25>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <12 IRQ_TYPE_EDGE_FALLING>; pinctrl-names = "default"; @@ -128,8 +128,8 @@ muic: extcon@25 { i2c-tkey { compatible = "i2c-gpio"; - sda-gpios = <&msmgpio 16 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; - scl-gpios = <&msmgpio 17 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; + sda-gpios = <&tlmm 16 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; + scl-gpios = <&tlmm 17 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; pinctrl-names = "default"; pinctrl-0 = <&tkey_i2c_default>; @@ -142,7 +142,7 @@ touchkey: touchkey@20 { compatible = "coreriver,tc360-touchkey"; reg = <0x20>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <98 IRQ_TYPE_EDGE_FALLING>; /* vcc/vdd-supply are board-specific */ @@ -157,8 +157,8 @@ touchkey: touchkey@20 { i2c-nfc { compatible = "i2c-gpio"; - sda-gpios = <&msmgpio 0 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; - scl-gpios = <&msmgpio 1 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; + sda-gpios = <&tlmm 0 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; + scl-gpios = <&tlmm 1 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; pinctrl-names = "default"; pinctrl-0 = <&nfc_i2c_default>; @@ -170,11 +170,11 @@ nfc@27 { compatible = "samsung,s3fwrn5-i2c"; reg = <0x27>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <21 IRQ_TYPE_EDGE_RISING>; - en-gpios = <&msmgpio 20 GPIO_ACTIVE_LOW>; - wake-gpios = <&msmgpio 49 GPIO_ACTIVE_HIGH>; + en-gpios = <&tlmm 20 GPIO_ACTIVE_LOW>; + wake-gpios = <&tlmm 49 GPIO_ACTIVE_HIGH>; clocks = <&rpmcc RPM_SMD_BB_CLK2_PIN>; @@ -200,7 +200,7 @@ &blsp_i2c2 { accelerometer: accelerometer@10 { compatible = "bosch,bmc150_accel"; reg = <0x10>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <115 IRQ_TYPE_EDGE_RISING>; vdd-supply = <&pm8916_l17>; @@ -225,7 +225,7 @@ &blsp_i2c4 { battery@35 { compatible = "richtek,rt5033-battery"; reg = <0x35>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <121 IRQ_TYPE_EDGE_BOTH>; pinctrl-names = "default"; @@ -274,7 +274,7 @@ &sdhc_2 { pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>; pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>; - cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>; + cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>; }; &usb { @@ -286,7 +286,7 @@ &usb_hs_phy { extcon = <&muic>; }; -&msmgpio { +&tlmm { accel_int_default: accel-int-default-state { pins = "gpio115"; function = "gpio"; diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts index a1ca4d883420..9068aa6f7b29 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts @@ -15,7 +15,7 @@ reg_panel_vdd3: regulator-panel-vdd3 { regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; - gpio = <&msmgpio 9 GPIO_ACTIVE_HIGH>; + gpio = <&tlmm 9 GPIO_ACTIVE_HIGH>; enable-active-high; pinctrl-names = "default"; @@ -28,7 +28,7 @@ reg_touch_key: regulator-touch-key { regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>; - gpio = <&msmgpio 86 GPIO_ACTIVE_HIGH>; + gpio = <&tlmm 86 GPIO_ACTIVE_HIGH>; enable-active-high; pinctrl-names = "default"; @@ -41,7 +41,7 @@ reg_key_led: regulator-key-led { regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - gpio = <&msmgpio 60 GPIO_ACTIVE_HIGH>; + gpio = <&tlmm 60 GPIO_ACTIVE_HIGH>; enable-active-high; pinctrl-names = "default"; @@ -67,7 +67,7 @@ touchscreen@20 { compatible = "zinitix,bt541"; reg = <0x20>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <13 IRQ_TYPE_EDGE_FALLING>; touchscreen-size-x = <540>; @@ -93,7 +93,7 @@ panel@0 { vdd3-supply = <®_panel_vdd3>; vci-supply = <&pm8916_l17>; - reset-gpios = <&msmgpio 25 GPIO_ACTIVE_HIGH>; + reset-gpios = <&tlmm 25 GPIO_ACTIVE_HIGH>; port { panel_in: endpoint { @@ -120,7 +120,7 @@ &wcnss_iris { compatible = "qcom,wcn3620"; }; -&msmgpio { +&tlmm { panel_vdd3_default: panel-vdd3-default-state { pins = "gpio9"; function = "gpio"; diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts index 4e10b8a5e9f9..388482a1e3d9 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts @@ -15,7 +15,7 @@ reg_touch_key: regulator-touch-key { regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - gpio = <&msmgpio 97 GPIO_ACTIVE_HIGH>; + gpio = <&tlmm 97 GPIO_ACTIVE_HIGH>; enable-active-high; pinctrl-names = "default"; @@ -36,7 +36,7 @@ touchscreen@48 { compatible = "melfas,mms345l"; reg = <0x48>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <13 IRQ_TYPE_EDGE_FALLING>; touchscreen-size-x = <720>; @@ -71,7 +71,7 @@ &wcnss_iris { compatible = "qcom,wcn3660b"; }; -&msmgpio { +&tlmm { tkey_en_default: tkey-en-default-state { pins = "gpio97"; function = "gpio"; diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi index f6c4a011fdfd..0cdd6af7817f 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi @@ -18,7 +18,7 @@ muic: extcon@14 { compatible = "siliconmitus,sm5504-muic"; reg = <0x14>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <12 IRQ_TYPE_EDGE_FALLING>; pinctrl-names = "default"; @@ -32,7 +32,7 @@ reg_touch_key: regulator-touch-key { regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - gpio = <&msmgpio 97 GPIO_ACTIVE_HIGH>; + gpio = <&tlmm 97 GPIO_ACTIVE_HIGH>; enable-active-high; pinctrl-names = "default"; @@ -66,7 +66,7 @@ &wcnss_iris { compatible = "qcom,wcn3620"; }; -&msmgpio { +&tlmm { tkey_en_default: tkey-en-default-state { pins = "gpio97"; function = "gpio"; diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-grandmax.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-grandmax.dts index 4cbd68b89448..3f145dde4059 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-grandmax.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-grandmax.dts @@ -33,7 +33,7 @@ led-keyled { function = LED_FUNCTION_KBD_BACKLIGHT; color = ; - gpios = <&msmgpio 60 GPIO_ACTIVE_HIGH>; + gpios = <&tlmm 60 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&gpio_leds_default>; @@ -42,14 +42,14 @@ led-keyled { }; ®_motor_vdd { - gpio = <&msmgpio 72 GPIO_ACTIVE_HIGH>; + gpio = <&tlmm 72 GPIO_ACTIVE_HIGH>; }; ®_touch_key { status = "disabled"; }; -&msmgpio { +&tlmm { gpio_leds_default: gpio-led-default-state { pins = "gpio60"; function = "gpio"; 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 a49e1641e59b..cb1b6318a246 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi @@ -34,13 +34,13 @@ gpio-keys { volume-up-button { label = "Volume Up"; - gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>; + gpios = <&tlmm 107 GPIO_ACTIVE_LOW>; linux,code = ; }; home-button { label = "Home"; - gpios = <&msmgpio 109 GPIO_ACTIVE_LOW>; + gpios = <&tlmm 109 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -55,7 +55,7 @@ gpio-hall-sensor { hall-sensor-switch { label = "Hall Effect Sensor"; - gpios = <&msmgpio 52 GPIO_ACTIVE_LOW>; + gpios = <&tlmm 52 GPIO_ACTIVE_LOW>; linux,input-type = ; linux,code = ; linux,can-disable; @@ -74,7 +74,7 @@ fuelgauge@36 { maxim,over-heat-temp = <600>; maxim,over-volt = <4400>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <121 IRQ_TYPE_EDGE_FALLING>; pinctrl-0 = <&fuelgauge_int_default>; @@ -97,7 +97,7 @@ accelerometer@1d { vdd-supply = <&pm8916_l17>; vddio-supply = <&pm8916_l5>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <115 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "INT1"; @@ -145,7 +145,7 @@ &sdhc_2 { pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>; pinctrl-names = "default", "sleep"; - cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>; + cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>; status = "okay"; }; @@ -169,7 +169,7 @@ &wcnss_iris { compatible = "qcom,wcn3660b"; }; -&msmgpio { +&tlmm { accel_int_default: accel-int-default-state { pins = "gpio115"; function = "gpio"; diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt510.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt510.dts index 607a5dc8a534..48111c6a2c78 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt510.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt510.dts @@ -25,7 +25,7 @@ reg_motor_vdd: regulator-motor-vdd { regulator-min-microvolt = <3000000>; regulator-max-microvolt = <3000000>; - gpio = <&msmgpio 76 GPIO_ACTIVE_HIGH>; + gpio = <&tlmm 76 GPIO_ACTIVE_HIGH>; enable-active-high; pinctrl-0 = <&motor_en_default>; @@ -38,7 +38,7 @@ reg_tsp_1p8v: regulator-tsp-1p8v { regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; - gpio = <&msmgpio 73 GPIO_ACTIVE_HIGH>; + gpio = <&tlmm 73 GPIO_ACTIVE_HIGH>; enable-active-high; pinctrl-0 = <&tsp_en_default>; @@ -51,7 +51,7 @@ reg_tsp_3p3v: regulator-tsp-3p3v { regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - gpio = <&msmgpio 73 GPIO_ACTIVE_HIGH>; + gpio = <&tlmm 73 GPIO_ACTIVE_HIGH>; enable-active-high; }; @@ -71,20 +71,20 @@ &blsp_i2c5 { touchscreen@4a { compatible = "atmel,maxtouch"; reg = <0x4a>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <13 IRQ_TYPE_LEVEL_LOW>; vdd-supply = <®_tsp_1p8v>; vdda-supply = <®_tsp_3p3v>; - reset-gpios = <&msmgpio 114 GPIO_ACTIVE_LOW>; + reset-gpios = <&tlmm 114 GPIO_ACTIVE_LOW>; pinctrl-0 = <&tsp_int_rst_default>; pinctrl-names = "default"; }; }; -&msmgpio { +&tlmm { motor_en_default: motor-en-default-state { pins = "gpio76"; function = "gpio"; diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt58.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt58.dts index 5d6f8383306b..98ceaad7fcea 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt58.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt58.dts @@ -15,7 +15,7 @@ reg_vdd_tsp: regulator-vdd-tsp { regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - gpio = <&msmgpio 73 GPIO_ACTIVE_HIGH>; + gpio = <&tlmm 73 GPIO_ACTIVE_HIGH>; enable-active-high; pinctrl-0 = <®_tsp_en_default>; @@ -24,7 +24,7 @@ reg_vdd_tsp: regulator-vdd-tsp { vibrator { compatible = "gpio-vibrator"; - enable-gpios = <&msmgpio 76 GPIO_ACTIVE_HIGH>; + enable-gpios = <&tlmm 76 GPIO_ACTIVE_HIGH>; pinctrl-0 = <&vibrator_en_default>; pinctrl-names = "default"; @@ -37,7 +37,7 @@ &blsp_i2c5 { touchscreen@20 { compatible = "zinitix,bt532"; reg = <0x20>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <13 IRQ_TYPE_EDGE_FALLING>; touchscreen-size-x = <768>; @@ -51,7 +51,7 @@ touchscreen@20 { }; }; -&msmgpio { +&tlmm { reg_tsp_en_default: reg-tsp-en-default-state { pins = "gpio73"; function = "gpio"; 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 6192d04a58ae..b2d2bc205ef2 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi @@ -32,7 +32,7 @@ gpio_hall_sensor: gpio-hall-sensor { event-hall-sensor { label = "Hall Effect Sensor"; - gpios = <&msmgpio 52 GPIO_ACTIVE_LOW>; + gpios = <&tlmm 52 GPIO_ACTIVE_LOW>; linux,input-type = ; linux,code = ; linux,can-disable; @@ -49,21 +49,21 @@ gpio-keys { button-volume-up { label = "Volume Up"; - gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>; + gpios = <&tlmm 107 GPIO_ACTIVE_LOW>; linux,code = ; }; button-home { label = "Home Key"; - gpios = <&msmgpio 109 GPIO_ACTIVE_LOW>; + gpios = <&tlmm 109 GPIO_ACTIVE_LOW>; linux,code = ; }; }; i2c_muic: i2c-muic { compatible = "i2c-gpio"; - sda-gpios = <&msmgpio 105 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; - scl-gpios = <&msmgpio 106 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; + sda-gpios = <&tlmm 105 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; + scl-gpios = <&tlmm 106 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; pinctrl-names = "default"; pinctrl-0 = <&muic_i2c_default>; @@ -75,7 +75,7 @@ muic: extcon@25 { compatible = "siliconmitus,sm5703-muic"; reg = <0x25>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <12 IRQ_TYPE_EDGE_FALLING>; pinctrl-names = "default"; @@ -108,7 +108,7 @@ &sdhc_2 { pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>; pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>; - cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>; + cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>; }; &usb { @@ -128,7 +128,7 @@ &wcnss_iris { compatible = "qcom,wcn3620"; }; -&msmgpio { +&tlmm { gpio_hall_sensor_default: gpio-hall-sensor-default-state { pins = "gpio52"; function = "gpio"; diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts index fc4c61c4e1e6..13a1d8828447 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts @@ -53,13 +53,13 @@ gpio-keys { button-volume-up { label = "Volume Up"; - gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>; + gpios = <&tlmm 107 GPIO_ACTIVE_LOW>; linux,code = ; }; button-home { label = "Home"; - gpios = <&msmgpio 109 GPIO_ACTIVE_LOW>; + gpios = <&tlmm 109 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -74,7 +74,7 @@ gpio-hall-sensor { event-hall-sensor { label = "Hall Effect Sensor"; - gpios = <&msmgpio 52 GPIO_ACTIVE_LOW>; + gpios = <&tlmm 52 GPIO_ACTIVE_LOW>; linux,input-type = ; linux,code = ; linux,can-disable; @@ -87,7 +87,7 @@ reg_vdd_tsp: regulator-vdd-tsp { regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - gpio = <&msmgpio 73 GPIO_ACTIVE_HIGH>; + gpio = <&tlmm 73 GPIO_ACTIVE_HIGH>; enable-active-high; pinctrl-names = "default"; @@ -100,7 +100,7 @@ reg_touch_key: regulator-touch-key { regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>; - gpio = <&msmgpio 86 GPIO_ACTIVE_HIGH>; + gpio = <&tlmm 86 GPIO_ACTIVE_HIGH>; enable-active-high; pinctrl-names = "default"; @@ -113,7 +113,7 @@ reg_key_led: regulator-key-led { regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - gpio = <&msmgpio 60 GPIO_ACTIVE_HIGH>; + gpio = <&tlmm 60 GPIO_ACTIVE_HIGH>; enable-active-high; pinctrl-names = "default"; @@ -122,8 +122,8 @@ reg_key_led: regulator-key-led { i2c-muic { compatible = "i2c-gpio"; - sda-gpios = <&msmgpio 105 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; - scl-gpios = <&msmgpio 106 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; + sda-gpios = <&tlmm 105 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; + scl-gpios = <&tlmm 106 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; pinctrl-names = "default"; pinctrl-0 = <&muic_i2c_default>; @@ -135,7 +135,7 @@ muic: extcon@14 { compatible = "siliconmitus,sm5504-muic"; reg = <0x14>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <12 IRQ_TYPE_EDGE_FALLING>; pinctrl-names = "default"; @@ -145,8 +145,8 @@ muic: extcon@14 { i2c-tkey { compatible = "i2c-gpio"; - sda-gpios = <&msmgpio 16 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; - scl-gpios = <&msmgpio 17 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; + sda-gpios = <&tlmm 16 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; + scl-gpios = <&tlmm 17 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; pinctrl-names = "default"; pinctrl-0 = <&tkey_i2c_default>; @@ -158,7 +158,7 @@ touchkey@20 { compatible = "coreriver,tc360-touchkey"; reg = <0x20>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <98 IRQ_TYPE_EDGE_FALLING>; vcc-supply = <®_touch_key>; @@ -174,8 +174,8 @@ touchkey@20 { i2c-nfc { compatible = "i2c-gpio"; - sda-gpios = <&msmgpio 0 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; - scl-gpios = <&msmgpio 1 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; + sda-gpios = <&tlmm 0 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; + scl-gpios = <&tlmm 1 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; pinctrl-names = "default"; pinctrl-0 = <&nfc_i2c_default>; @@ -187,11 +187,11 @@ nfc@2b { compatible = "nxp,pn547", "nxp,nxp-nci-i2c"; reg = <0x2b>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <21 IRQ_TYPE_EDGE_RISING>; - enable-gpios = <&msmgpio 20 GPIO_ACTIVE_HIGH>; - firmware-gpios = <&msmgpio 49 GPIO_ACTIVE_HIGH>; + enable-gpios = <&tlmm 20 GPIO_ACTIVE_HIGH>; + firmware-gpios = <&tlmm 49 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&nfc_default>; @@ -206,7 +206,7 @@ imu@6b { compatible = "st,lsm6ds3"; reg = <0x6b>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <115 IRQ_TYPE_EDGE_RISING>; pinctrl-names = "default"; @@ -230,7 +230,7 @@ battery@35 { compatible = "richtek,rt5033-battery"; reg = <0x35>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <121 IRQ_TYPE_EDGE_FALLING>; pinctrl-names = "default"; @@ -245,7 +245,7 @@ touchscreen@20 { compatible = "zinitix,bt541"; reg = <0x20>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <13 IRQ_TYPE_EDGE_FALLING>; touchscreen-size-x = <540>; @@ -320,7 +320,7 @@ &wcnss_iris { compatible = "qcom,wcn3660b"; }; -&msmgpio { +&tlmm { fg_alert_default: fg-alert-default-state { pins = "gpio121"; function = "gpio"; diff --git a/arch/arm64/boot/dts/qcom/msm8916-thwc-uf896.dts b/arch/arm64/boot/dts/qcom/msm8916-thwc-uf896.dts index 82e260375174..6fe1850ba20e 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-thwc-uf896.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-thwc-uf896.dts @@ -10,19 +10,19 @@ / { }; &button_restart { - gpios = <&msmgpio 35 GPIO_ACTIVE_LOW>; + gpios = <&tlmm 35 GPIO_ACTIVE_LOW>; }; &led_r { - gpios = <&msmgpio 82 GPIO_ACTIVE_HIGH>; + gpios = <&tlmm 82 GPIO_ACTIVE_HIGH>; }; &led_g { - gpios = <&msmgpio 83 GPIO_ACTIVE_HIGH>; + gpios = <&tlmm 83 GPIO_ACTIVE_HIGH>; }; &led_b { - gpios = <&msmgpio 81 GPIO_ACTIVE_HIGH>; + gpios = <&tlmm 81 GPIO_ACTIVE_HIGH>; }; &button_default { diff --git a/arch/arm64/boot/dts/qcom/msm8916-thwc-ufi001c.dts b/arch/arm64/boot/dts/qcom/msm8916-thwc-ufi001c.dts index 978f0abcdf8f..16d4a91022be 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-thwc-ufi001c.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-thwc-ufi001c.dts @@ -10,19 +10,19 @@ / { }; &button_restart { - gpios = <&msmgpio 37 GPIO_ACTIVE_HIGH>; + gpios = <&tlmm 37 GPIO_ACTIVE_HIGH>; }; &led_r { - gpios = <&msmgpio 22 GPIO_ACTIVE_HIGH>; + gpios = <&tlmm 22 GPIO_ACTIVE_HIGH>; }; &led_g { - gpios = <&msmgpio 21 GPIO_ACTIVE_HIGH>; + gpios = <&tlmm 21 GPIO_ACTIVE_HIGH>; }; &led_b { - gpios = <&msmgpio 20 GPIO_ACTIVE_HIGH>; + gpios = <&tlmm 20 GPIO_ACTIVE_HIGH>; }; &mpss { @@ -40,7 +40,7 @@ &gpio_leds_default { }; /* This selects the external SIM card slot by default */ -&msmgpio { +&tlmm { sim_ctrl_default: sim-ctrl-default-state { esim-sel-pins { pins = "gpio0", "gpio3"; diff --git a/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi b/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi index 6a9219039572..f5613107ad1f 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi @@ -126,7 +126,7 @@ &wcnss_iris { compatible = "qcom,wcn3620"; }; -&msmgpio { +&tlmm { /* pins are board-specific */ button_default: button-default-state { function = "gpio"; diff --git a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts index 323590598113..12ce4dc236c6 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts @@ -25,8 +25,8 @@ chosen { flash-led-controller { compatible = "ocs,ocp8110"; - enable-gpios = <&msmgpio 31 GPIO_ACTIVE_HIGH>; - flash-gpios = <&msmgpio 32 GPIO_ACTIVE_HIGH>; + enable-gpios = <&tlmm 31 GPIO_ACTIVE_HIGH>; + flash-gpios = <&tlmm 32 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&camera_flash_default>; @@ -47,14 +47,14 @@ gpio-keys { button-volume-up { label = "Volume Up"; - gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>; + gpios = <&tlmm 107 GPIO_ACTIVE_LOW>; linux,code = ; }; }; usb_id: usb-id { compatible = "linux,extcon-usb-gpio"; - id-gpio = <&msmgpio 110 GPIO_ACTIVE_HIGH>; + id-gpio = <&tlmm 110 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&usb_id_default>; }; @@ -67,7 +67,7 @@ imu@68 { compatible = "invensense,mpu6880"; reg = <0x68>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <115 IRQ_TYPE_EDGE_RISING>; vdd-supply = <&pm8916_l17>; @@ -90,10 +90,10 @@ touchscreen@38 { compatible = "edt,edt-ft5506"; reg = <0x38>; - interrupt-parent = <&msmgpio>; + interrupt-parent = <&tlmm>; interrupts = <13 IRQ_TYPE_EDGE_FALLING>; - reset-gpios = <&msmgpio 12 GPIO_ACTIVE_LOW>; + reset-gpios = <&tlmm 12 GPIO_ACTIVE_LOW>; vcc-supply = <&pm8916_l17>; iovcc-supply = <&pm8916_l6>; @@ -204,7 +204,7 @@ &wcnss_iris { compatible = "qcom,wcn3620"; }; -&msmgpio { +&tlmm { camera_flash_default: camera-flash-default-state { pins = "gpio31", "gpio32"; function = "gpio"; diff --git a/arch/arm64/boot/dts/qcom/msm8916-yiming-uz801v3.dts b/arch/arm64/boot/dts/qcom/msm8916-yiming-uz801v3.dts index 74ce6563be18..5e6ba8c58bb5 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-yiming-uz801v3.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-yiming-uz801v3.dts @@ -10,19 +10,19 @@ / { }; &button_restart { - gpios = <&msmgpio 23 GPIO_ACTIVE_LOW>; + gpios = <&tlmm 23 GPIO_ACTIVE_LOW>; }; &led_r { - gpios = <&msmgpio 7 GPIO_ACTIVE_HIGH>; + gpios = <&tlmm 7 GPIO_ACTIVE_HIGH>; }; &led_g { - gpios = <&msmgpio 8 GPIO_ACTIVE_HIGH>; + gpios = <&tlmm 8 GPIO_ACTIVE_HIGH>; }; &led_b { - gpios = <&msmgpio 6 GPIO_ACTIVE_HIGH>; + gpios = <&tlmm 6 GPIO_ACTIVE_HIGH>; }; &button_default { diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi index 97ad2a5ea0d5..56f35015746b 100644 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi @@ -993,12 +993,12 @@ etm3_out: endpoint { }; }; - msmgpio: pinctrl@1000000 { + tlmm: pinctrl@1000000 { compatible = "qcom,msm8916-pinctrl"; reg = <0x01000000 0x300000>; interrupts = ; gpio-controller; - gpio-ranges = <&msmgpio 0 0 122>; + gpio-ranges = <&tlmm 0 0 122>; #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; From patchwork Mon May 29 12:46:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 100246 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1493627vqr; Mon, 29 May 2023 06:02:11 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7ZhefczVHV5GewV6aZXlkcmj6dcEmCdPnuL+XMod3DKiIBCGk8iSbfUDgQK2uGFoYMX4pb X-Received: by 2002:a05:6a20:7486:b0:10e:d4fb:b03a with SMTP id p6-20020a056a20748600b0010ed4fbb03amr9301638pzd.43.1685365331309; Mon, 29 May 2023 06:02:11 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1685365331; cv=pass; d=google.com; s=arc-20160816; b=0EVFU1FsfYt31Dbmn6qwjdpAjIUagjMJ6zcIw4BvT6Cga+WLn4IS5ZL9NxtFXUZQdz VVaYtZdTtcsDFP485MDK39c574bZKUU/j9sKNgjLfrfQDqUGu8drM5EZIXbtmtkI5kZH OFiuRWn3Zpge5fA31iE+zCLJCXJVgNdpKhkrODhNa78uELDFTQ1g0wfaILidT/NWNUF0 XXzckmfzzVqK5DFgZrPX/ecZKlwlFQ7hp6RtrlwL7gfuItW2N7UMJaDeBIM0MdP/dgDq rlP/d4I1i3QB9GPB88BfjNlpIUmwMDpdHX4ARul3lVLZW/CjRrqGRhOFtTV3H3f0Sw+y /Ogg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature:dkim-signature; bh=PG3Vvxdb6ipyPUNA80D6O5EF3cp8L275oAv71JJ8NZs=; b=UPJbN4iCrrzwgfdHjODRTpZ0wAr44llcfbLEoMbaO4LCg158II6oXnkY/bgJg9uUX8 ASv3+BTnRtDCYXgjL5b0AL6/98/71iSMi/wwDO15eNiyUkxHvzV3oHLZAA5N6//55ATU UjVJbJKEWgMWTbbSq+ybLDjUEthw+T4YdECdKra26mWekEUEBn6vjK+3AlwDTb1dT4Xm qptyNszow8d2/iDPSA9b+0ftJj/40B3sX8ZaQHs7Ydqdtn7FYOSECDOxpCICDqXWIs3v q1K+cm9G62IN1kA1c9Xox5iSHLQt8hMbEGCbcDD2NWIqUrsTAHw0p8H+ypk489/1uBt/ esVA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gerhold.net header.s=strato-dkim-0002 header.b=bSjCW53c; dkim=neutral (no key) header.i=@gerhold.net; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id pi5-20020a17090b1e4500b002535e5e607asi10373273pjb.150.2023.05.29.06.01.59; Mon, 29 May 2023 06:02:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gerhold.net header.s=strato-dkim-0002 header.b=bSjCW53c; dkim=neutral (no key) header.i=@gerhold.net; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231796AbjE2MrU (ORCPT + 99 others); Mon, 29 May 2023 08:47:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230328AbjE2MrR (ORCPT ); Mon, 29 May 2023 08:47:17 -0400 Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [85.215.255.21]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B4338B5; Mon, 29 May 2023 05:47:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685364424; cv=none; d=strato.com; s=strato-dkim-0002; b=taM72ECVkkoHzP+ZVai9Ze2heXH7SrsCcG5An2SLZ9k/eeBfY/MOEFh7XQwTBUftNq SO/5WU7gY2Y5nlhY+BcHsvrecdNsFC1+7WSFcbfOlwW6SJE5a9W+/3vp0/YDpQuYoy+i /LRO/bFpdJzKHq/80CznpMolCq94wEYL5xUOxzF8zjOvLlDBbdU+fyLImRUVqBtwmVzY HHefnPWRRIiibPlNsJ3lPZYNLeHc4m9HXuh5wTRVfuLjGXYrb67VnYvP6fCqmRw+9DFG IQSvHRmzGozqNMqewFcmTklGX0/zfkwlixq/7tc1SkCpgkXRyxOOS4p+ACE9HgrpLwFM EcPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1685364424; s=strato-dkim-0002; d=strato.com; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=PG3Vvxdb6ipyPUNA80D6O5EF3cp8L275oAv71JJ8NZs=; b=L3sHf4yI/l28KIrd+AnYV56wnZJdVTLYstg4kY3vfmllpj+lqNFzFD3AdxWAHFWVsT vToav4nOhUMH7APX3PuN2Y8tFeXw6bPqMaFNi9PLfZHJurQaRRM1m1+ycurSjJh8Zr3l 21/5+Le3QsVWEYh/lrarqRBCV8J1V6EcFqn/lveImiXLG51wegbCDWty7paDJSWGa1eH Ko8U5T7NxxEcbdsEZGise29tlXWtbMEmy5OyAUqODu5QOaAja3Iw+cum/X9hS31PmiBZ kv8H9Qi+cTJ4LXhg5rhjfgO4NfzBW4QtU4clsDGXturyURjj98nuV+jqWS+SFF5pfuK2 dhuQ== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo00 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1685364424; s=strato-dkim-0002; d=gerhold.net; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=PG3Vvxdb6ipyPUNA80D6O5EF3cp8L275oAv71JJ8NZs=; b=bSjCW53ccxJCxDzx+6ZsFuRX+gJq50oEAhr1q7pdCJMW20VZJqgFq3dS+vqG5eZP31 er+lEM0ROSeVr4gfXrtbjJOfJh4dfFf50EkGLeRGRMST7+hZZo1kSaGR2pSs3zU2BC/I DxdlEjt6OMYg2TRj+wSMEw19CDzolt6am92V8E1Wn71RuOkO/v5+i1e9tzMmPhEnQRtf 2VdRAD7HoJbRwaMG/6vXVWzQEHionEIr4LoCMFj1rh6OJk4wLGPLMm3txKCtJClV93HC TCx9urkyBAEXG0cBvIi1i9bmXa1/6x1ROAfKsMDvQb4ymLLKKfQdfXlhbFXL8Wz55XYH Y8Jw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1685364424; s=strato-dkim-0003; d=gerhold.net; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=PG3Vvxdb6ipyPUNA80D6O5EF3cp8L275oAv71JJ8NZs=; b=e7U9vI5wW/YX+CoFKhESHy4NwpMr/HsLWm968vpwH2LETGJ2vPbtb4ufz88mqveh4C zvm0VnTDsgJ7Apzx1ZBg== X-RZG-AUTH: ":P3gBZUipdd93FF5ZZvYFPugejmSTVR2nRPhVOQjVd4CteZ/7jYgS+mLFY+H0JAn9VOH8mT0=" Received: from [192.168.244.3] by smtp.strato.de (RZmta 49.4.0 DYNA|AUTH) with ESMTPSA id j6420az4TCl4f8V (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Mon, 29 May 2023 14:47:04 +0200 (CEST) From: Stephan Gerhold Date: Mon, 29 May 2023 14:46:59 +0200 Subject: [PATCH 2/6] arm64: dts: qcom: msm8916/39: Rename &blsp1_uartN -> &blsp_uartN MIME-Version: 1.0 Message-Id: <20230525-msm8916-labels-v1-2-bec0f5fb46fb@gerhold.net> References: <20230525-msm8916-labels-v1-0-bec0f5fb46fb@gerhold.net> In-Reply-To: <20230525-msm8916-labels-v1-0-bec0f5fb46fb@gerhold.net> To: Bjorn Andersson Cc: Konrad Dybcio , Andy Gross , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue , Stephan Gerhold X-Mailer: b4 0.12.2 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_PASS,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767233637649863969?= X-GMAIL-MSGID: =?utf-8?q?1767233637649863969?= For some reason the BLSP UART controllers have a label with a number behind blsp (&blsp1_uartN) while I2C/SPI are named without (&blsp_i2cN). This is confusing, especially for proper node ordering in board DTs. Right now all board DTs are ordered as if the number behind blsp does not exist (&blsp_i2cN comes before &blsp1_uartN). Strictly speaking correct ordering would be the other way around ('1' comes before '_'). End this confusion by giving the UART controllers consistent labels. There is just one BLSP on MSM8916/39 so the number is redundant. Signed-off-by: Stephan Gerhold Reviewed-by: Bryan O'Donoghue --- arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 8 ++++---- arch/arm64/boot/dts/qcom/apq8039-t2.dts | 12 ++++++------ 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-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-pins.dtsi | 8 ++++---- .../boot/dts/qcom/msm8916-samsung-a2015-common.dtsi | 4 ++-- .../boot/dts/qcom/msm8916-samsung-gt5-common.dtsi | 4 ++-- .../boot/dts/qcom/msm8916-samsung-j5-common.dtsi | 4 ++-- .../boot/dts/qcom/msm8916-samsung-serranove.dts | 4 ++-- arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi | 4 ++-- .../arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts | 4 ++-- arch/arm64/boot/dts/qcom/msm8916.dtsi | 12 ++++++------ .../dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts | 2 +- arch/arm64/boot/dts/qcom/msm8939.dtsi | 20 ++++++++++---------- 20 files changed, 59 insertions(+), 59 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts index 82f141b55eb3..19bf429a973e 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts @@ -18,8 +18,8 @@ / { compatible = "qcom,apq8016-sbc", "qcom,apq8016"; aliases { - serial0 = &blsp1_uart2; - serial1 = &blsp1_uart1; + serial0 = &blsp_uart2; + serial1 = &blsp_uart1; usid0 = &pm8916_0; i2c0 = &blsp_i2c2; i2c1 = &blsp_i2c6; @@ -243,12 +243,12 @@ &blsp_spi5 { label = "LS-SPI0"; }; -&blsp1_uart1 { +&blsp_uart1 { status = "okay"; label = "LS-UART0"; }; -&blsp1_uart2 { +&blsp_uart2 { status = "okay"; label = "LS-UART1"; }; diff --git a/arch/arm64/boot/dts/qcom/apq8039-t2.dts b/arch/arm64/boot/dts/qcom/apq8039-t2.dts index e75ee34cb014..07f4c6398b41 100644 --- a/arch/arm64/boot/dts/qcom/apq8039-t2.dts +++ b/arch/arm64/boot/dts/qcom/apq8039-t2.dts @@ -24,8 +24,8 @@ / { aliases { mmc0 = &sdhc_1; mmc1 = &sdhc_2; - serial0 = &blsp1_uart1; - serial1 = &blsp1_uart2; + serial0 = &blsp_uart1; + serial1 = &blsp_uart2; }; bl: backlight { @@ -115,19 +115,19 @@ &blsp_i2c5 { status = "okay"; }; -&blsp1_uart1 { +&blsp_uart1 { status = "okay"; }; -&blsp1_uart1_default { +&blsp_uart1_default { pins = "gpio0", "gpio1"; }; -&blsp1_uart1_sleep { +&blsp_uart1_sleep { pins = "gpio0", "gpio1"; }; -&blsp1_uart2 { +&blsp_uart2 { 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 7b77a80f049c..c864ce12c1f1 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts @@ -22,7 +22,7 @@ / { chassis-type = "tablet"; aliases { - serial0 = &blsp1_uart2; + serial0 = &blsp_uart2; }; chosen { @@ -105,7 +105,7 @@ touchscreen@38 { }; }; -&blsp1_uart2 { +&blsp_uart2 { 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 d2abbdec5fe6..47580bd243eb 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts @@ -13,7 +13,7 @@ / { chassis-type = "handset"; aliases { - serial0 = &blsp1_uart2; + serial0 = &blsp_uart2; }; chosen { @@ -56,7 +56,7 @@ usb_id: usb-id { }; }; -&blsp1_uart2 { +&blsp_uart2 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts index c58a70fdf36f..ad71695652c2 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts @@ -13,7 +13,7 @@ / { chassis-type = "handset"; aliases { - serial0 = &blsp1_uart2; + serial0 = &blsp_uart2; }; chosen { @@ -124,7 +124,7 @@ touchscreen@38 { }; }; -&blsp1_uart2 { +&blsp_uart2 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts b/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts index 221db7edec5e..a2be985052a5 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts @@ -14,7 +14,7 @@ / { chassis-type = "tablet"; aliases { - serial0 = &blsp1_uart2; + serial0 = &blsp_uart2; }; chosen { @@ -105,7 +105,7 @@ touchscreen@38 { }; }; -&blsp1_uart2 { +&blsp_uart2 { 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 b02e8f9a8ca0..cbf53de44ef3 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts @@ -26,7 +26,7 @@ / { chassis-type = "handset"; aliases { - serial0 = &blsp1_uart2; + serial0 = &blsp_uart2; }; chosen { @@ -210,7 +210,7 @@ nfc@28 { }; }; -&blsp1_uart2 { +&blsp_uart2 { 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 56f74a892764..facb44892dd5 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts @@ -14,7 +14,7 @@ / { chassis-type = "handset"; aliases { - serial0 = &blsp1_uart2; + serial0 = &blsp_uart2; }; chosen { @@ -214,7 +214,7 @@ rmi4-f12@12 { }; }; -&blsp1_uart2 { +&blsp_uart2 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts index a1208c8e0620..707288b7eca8 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts @@ -13,7 +13,7 @@ / { chassis-type = "handset"; aliases { - serial0 = &blsp1_uart2; + serial0 = &blsp_uart2; }; chosen { @@ -101,7 +101,7 @@ imu@68 { }; }; -&blsp1_uart2 { +&blsp_uart2 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-mtp.dts b/arch/arm64/boot/dts/qcom/msm8916-mtp.dts index 7c0ceb3cff45..438eb1faee1d 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-mtp.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-mtp.dts @@ -12,7 +12,7 @@ / { compatible = "qcom,msm8916-mtp", "qcom,msm8916-mtp/1", "qcom,msm8916"; aliases { - serial0 = &blsp1_uart2; + serial0 = &blsp_uart2; usid0 = &pm8916_0; }; @@ -21,6 +21,6 @@ chosen { }; }; -&blsp1_uart2 { +&blsp_uart2 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi b/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi index 1e07f70768f4..3539d9029bed 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi @@ -5,7 +5,7 @@ &tlmm { - blsp1_uart1_default: blsp1-uart1-default-state { + blsp_uart1_default: blsp-uart1-default-state { /* TX, RX, CTS_N, RTS_N */ pins = "gpio0", "gpio1", "gpio2", "gpio3"; function = "blsp_uart1"; @@ -14,7 +14,7 @@ blsp1_uart1_default: blsp1-uart1-default-state { bias-disable; }; - blsp1_uart1_sleep: blsp1-uart1-sleep-state { + blsp_uart1_sleep: blsp-uart1-sleep-state { pins = "gpio0", "gpio1", "gpio2", "gpio3"; function = "gpio"; @@ -22,7 +22,7 @@ blsp1_uart1_sleep: blsp1-uart1-sleep-state { bias-pull-down; }; - blsp1_uart2_default: blsp1-uart2-default-state { + blsp_uart2_default: blsp-uart2-default-state { pins = "gpio4", "gpio5"; function = "blsp_uart2"; @@ -30,7 +30,7 @@ blsp1_uart2_default: blsp1-uart2-default-state { bias-disable; }; - blsp1_uart2_sleep: blsp1-uart2-sleep-state { + blsp_uart2_sleep: blsp-uart2-sleep-state { pins = "gpio4", "gpio5"; function = "gpio"; 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 550ba6b9d4cd..497fc83803ef 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi @@ -8,7 +8,7 @@ / { aliases { - serial0 = &blsp1_uart2; + serial0 = &blsp_uart2; }; chosen { @@ -233,7 +233,7 @@ battery@35 { }; }; -&blsp1_uart2 { +&blsp_uart2 { 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 cb1b6318a246..82d94d62fbe6 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi @@ -9,7 +9,7 @@ / { aliases { - serial0 = &blsp1_uart2; + serial0 = &blsp_uart2; }; chosen { @@ -111,7 +111,7 @@ accelerometer@1d { }; }; -&blsp1_uart2 { +&blsp_uart2 { 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 b2d2bc205ef2..78935205ea9d 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi @@ -7,7 +7,7 @@ / { aliases { - serial0 = &blsp1_uart2; + serial0 = &blsp_uart2; }; chosen { @@ -84,7 +84,7 @@ muic: extcon@25 { }; }; -&blsp1_uart2 { +&blsp_uart2 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts index 13a1d8828447..bd1e1e1153c0 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts @@ -28,7 +28,7 @@ / { chassis-type = "handset"; aliases { - serial0 = &blsp1_uart2; + serial0 = &blsp_uart2; }; chosen { @@ -259,7 +259,7 @@ touchscreen@20 { }; }; -&blsp1_uart2 { +&blsp_uart2 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi b/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi index f5613107ad1f..898722ee86a5 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi @@ -9,7 +9,7 @@ / { chassis-type = "embedded"; aliases { - serial0 = &blsp1_uart2; + serial0 = &blsp_uart2; }; chosen { @@ -82,7 +82,7 @@ &bam_dmux_dma { status = "okay"; }; -&blsp1_uart2 { +&blsp_uart2 { 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 12ce4dc236c6..930318a443a8 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts @@ -16,7 +16,7 @@ / { chassis-type = "handset"; aliases { - serial0 = &blsp1_uart2; + serial0 = &blsp_uart2; }; chosen { @@ -140,7 +140,7 @@ led@2 { }; }; -&blsp1_uart2 { +&blsp_uart2 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi index 56f35015746b..8081e2611e3c 100644 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi @@ -1599,7 +1599,7 @@ blsp_dma: dma-controller@7884000 { qcom,ee = <0>; }; - blsp1_uart1: serial@78af000 { + blsp_uart1: serial@78af000 { compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm"; reg = <0x078af000 0x200>; interrupts = ; @@ -1608,12 +1608,12 @@ blsp1_uart1: serial@78af000 { dmas = <&blsp_dma 0>, <&blsp_dma 1>; dma-names = "tx", "rx"; pinctrl-names = "default", "sleep"; - pinctrl-0 = <&blsp1_uart1_default>; - pinctrl-1 = <&blsp1_uart1_sleep>; + pinctrl-0 = <&blsp_uart1_default>; + pinctrl-1 = <&blsp_uart1_sleep>; status = "disabled"; }; - blsp1_uart2: serial@78b0000 { + blsp_uart2: serial@78b0000 { compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm"; reg = <0x078b0000 0x200>; interrupts = ; @@ -1622,8 +1622,8 @@ blsp1_uart2: serial@78b0000 { dmas = <&blsp_dma 2>, <&blsp_dma 3>; dma-names = "tx", "rx"; pinctrl-names = "default", "sleep"; - pinctrl-0 = <&blsp1_uart2_default>; - pinctrl-1 = <&blsp1_uart2_sleep>; + pinctrl-0 = <&blsp_uart2_default>; + pinctrl-1 = <&blsp_uart2_sleep>; status = "disabled"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts b/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts index 951d01674b78..85a8d8fe212f 100644 --- a/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts +++ b/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts @@ -23,7 +23,7 @@ / { aliases { mmc0 = &sdhc_1; /* SDC1 eMMC slot */ mmc1 = &sdhc_2; /* SDC2 SD card slot */ - serial0 = &blsp1_uart2; + serial0 = &blsp_uart2; }; chosen { diff --git a/arch/arm64/boot/dts/qcom/msm8939.dtsi b/arch/arm64/boot/dts/qcom/msm8939.dtsi index 778d24c8aee5..a44f7e829513 100644 --- a/arch/arm64/boot/dts/qcom/msm8939.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8939.dtsi @@ -660,28 +660,28 @@ tlmm: pinctrl@1000000 { interrupt-controller; #interrupt-cells = <2>; - blsp1_uart1_default: blsp1-uart1-default-state { + blsp_uart1_default: blsp-uart1-default-state { pins = "gpio0", "gpio1", "gpio2", "gpio3"; function = "blsp_uart1"; drive-strength = <16>; bias-disable; }; - blsp1_uart1_sleep: blsp1-uart1-sleep-state { + blsp_uart1_sleep: blsp-uart1-sleep-state { pins = "gpio0", "gpio1", "gpio2", "gpio3"; function = "gpio"; drive-strength = <2>; bias-pull-down; }; - blsp1_uart2_default: blsp1-uart2-default-state { + blsp_uart2_default: blsp-uart2-default-state { pins = "gpio4", "gpio5"; function = "blsp_uart2"; drive-strength = <16>; bias-disable; }; - blsp1_uart2_sleep: blsp1-uart2-sleep-state { + blsp_uart2_sleep: blsp-uart2-sleep-state { pins = "gpio4", "gpio5"; function = "gpio"; drive-strength = <2>; @@ -1679,7 +1679,7 @@ blsp_dma: dma-controller@7884000 { qcom,ee = <0>; }; - blsp1_uart1: serial@78af000 { + blsp_uart1: serial@78af000 { compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm"; reg = <0x078af000 0x200>; interrupts = ; @@ -1687,13 +1687,13 @@ blsp1_uart1: serial@78af000 { clock-names = "core", "iface"; dmas = <&blsp_dma 0>, <&blsp_dma 1>; dma-names = "tx", "rx"; - pinctrl-0 = <&blsp1_uart1_default>; - pinctrl-1 = <&blsp1_uart1_sleep>; + pinctrl-0 = <&blsp_uart1_default>; + pinctrl-1 = <&blsp_uart1_sleep>; pinctrl-names = "default", "sleep"; status = "disabled"; }; - blsp1_uart2: serial@78b0000 { + blsp_uart2: serial@78b0000 { compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm"; reg = <0x078b0000 0x200>; interrupts = ; @@ -1701,8 +1701,8 @@ blsp1_uart2: serial@78b0000 { clock-names = "core", "iface"; dmas = <&blsp_dma 2>, <&blsp_dma 3>; dma-names = "tx", "rx"; - pinctrl-0 = <&blsp1_uart2_default>; - pinctrl-1 = <&blsp1_uart2_sleep>; + pinctrl-0 = <&blsp_uart2_default>; + pinctrl-1 = <&blsp_uart2_sleep>; pinctrl-names = "default", "sleep"; status = "disabled"; }; From patchwork Mon May 29 12:47:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 100243 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1487168vqr; Mon, 29 May 2023 05:52:16 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6Z+cNTknDmTqhALDhFq2b0DodQGmj8G64+ia3VwUw+TU/6hKGkSerJ7CwitPIPxN1x9Lke X-Received: by 2002:a05:6a20:8e27:b0:100:c3fe:a653 with SMTP id y39-20020a056a208e2700b00100c3fea653mr8670980pzj.29.1685364735864; Mon, 29 May 2023 05:52:15 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1685364735; cv=pass; d=google.com; s=arc-20160816; b=mxJ3GcIEkqrCq6Xe1atZZV+OFT7DcJI0KfsnwZBF4wxJ1ge0bp13ZNbx0FciT6CHFp AO+s2JF4+HbrvNxuR1t5P/GDHFArAO5w4niWK12CXl3YhIBXKZzx6c6HAXbaajZ43Bk/ vUk+YdzTR6wI9IpWBlI/8CjsI3eX53Oh1MZ/SlEBUOANRkzrObXEKoQCIhD3g5Kqmgz0 jalYz7eJqwEGlWABT3kV1hrPbmxqFBLZQV1aPSBv0XZzy/X2NY3h3qrlcMz6jpBFqWgX DxZhiPFOKVuUpS4FKGTk2hYspd55h9UcJ2bsvwaGWUh84SLqBUOrcEpDlw0WtZ2rhU7Y 4cAA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature:dkim-signature; bh=wzxg7bcXhPYJgolV6k/GYwUK51DPEW4MNFWgMVrEs3w=; b=t1d+AhEOBRG5dIfqZnViAc07pE//y69x7pcAmBk8Xi6Kxay61HSBZp3uo2raIOdc1g SSx0BGpCUGzQsO9B7VwTqoyL1IpKNwqCrex4D5AQRqEXFltf7aUEWOOVhQJaPaqQcxnd UFpTJXF28Fdj9qNsrSZDFezfudSldFu4U67SJhWpx6kcsRghlz5s+jTtxaGUaYEyNfh/ 1lb7leKiNneeDV5GcuLzIj8ccStD7or+zMgIk1HpMvcWEctnndqXr1QpWpGY6ug047+0 rSZXkKn/5/O7+wgyTthEOIcFHMNdBPRmrmr+dUu0nnvur0OUXfhgk2SwXpoP5gr0Dt3S Xpaw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gerhold.net header.s=strato-dkim-0002 header.b=NVCm9Rtl; dkim=neutral (no key) header.i=@gerhold.net header.s=strato-dkim-0003 header.b=GesPLK1w; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r1-20020aa79621000000b0064f3917aed4si10154460pfg.93.2023.05.29.05.52.03; Mon, 29 May 2023 05:52:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gerhold.net header.s=strato-dkim-0002 header.b=NVCm9Rtl; dkim=neutral (no key) header.i=@gerhold.net header.s=strato-dkim-0003 header.b=GesPLK1w; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231861AbjE2Mrf (ORCPT + 99 others); Mon, 29 May 2023 08:47:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55942 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231804AbjE2MrW (ORCPT ); Mon, 29 May 2023 08:47:22 -0400 Received: from mo4-p01-ob.smtp.rzone.de (mo4-p01-ob.smtp.rzone.de [85.215.255.50]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 94BE7B5; Mon, 29 May 2023 05:47:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685364424; cv=none; d=strato.com; s=strato-dkim-0002; b=BIuMWY2+8SNTq0bTFPK1Qe6ZfOCTLHRBbT8wiCxGRkjZIgPfNP4OxEhHIxqVi4zj0z +2D3vWSDA+bN/Qp+9PygQSgOV2ya7YGngIakGlY8yHnPwMFmAaetz3bAOmlTeBWD/WJM YS6Vt/qzzWV9UM1I0o34h70W8L8yDHE7qNh9pWwZw+qFNf08b54lm+mgRuuWxh6DYb2L SnLuedCc+bKPmwWT/mHib4eZKKFX1sRx0ZIfgyhb8v7W2lNCGXk2GtV5zPXVQcmBHb+t +IKbqqv6MIL/SlZOr9c8XZ60Xv4fsSGb7BKe5UWSaO1NHquiJ30ulPqkBTmz5LNxTTDC KSqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1685364424; s=strato-dkim-0002; d=strato.com; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=wzxg7bcXhPYJgolV6k/GYwUK51DPEW4MNFWgMVrEs3w=; b=l8m/9ZOFL/S2vW6neoc3BBP3gCBPD4kTZEbIV6RtfLCuKbWe21fVXAv+NdzSDazkMm ZjNQ593kIRB3L0ODWjd/YFHOSqUTjy6dec4dmFxFgGspS2hxbS/9v8vwS1pap4qyAyuD KxZbB5AzQpiGAu9cm0Ji/zLc3t8lT9tS9Ykoqa1XkYi3J/TFPFCkN3kyP6TQmRoai9St fNGF+uN9jhXe9PzNVYOG3V1gylVBx8eIefl2/o5EYa1NVXecwCTuHhI0EKI7GnjoJxEO HI5LNQVxvMqnKz3OCplBnOUbGookTUaIOIy33bH2Pt4ZbBTwGiTAAF/6WMvwDlJbyokb SuWw== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo01 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1685364424; s=strato-dkim-0002; d=gerhold.net; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=wzxg7bcXhPYJgolV6k/GYwUK51DPEW4MNFWgMVrEs3w=; b=NVCm9RtlMNGy3zPCjSlutli3y2qnQeDPe5qvFULlX9ChHz02gMP6yd5PQJt7bbn8ED +1B9sR5HpPsippEAIk6pdhc8jwZMNw4ThI8uLpisjONdTWanKUjbMpkkjIhs7DtszowO Gz+vyop5KUJDdMpYTLATpFtxt8wMardfAg5GQvKTPxyIpXq0UWnXnSu7cBx/mTRpp6Tr 3n4nd4MARMIgBHxDLZDEzGRCj15T1xcLav6SHiWvJBQ/ODKxBeKCmlXoEMy1hQbnGUhe /zdWhkQkOaLJxyrNosJoZwOGea0AyNtHz8m6SkF+PQetMb8sZiROIk4caGv5n7TMl8UP ct3A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1685364424; s=strato-dkim-0003; d=gerhold.net; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=wzxg7bcXhPYJgolV6k/GYwUK51DPEW4MNFWgMVrEs3w=; b=GesPLK1wqot/a+5ZYHRqLFy8b5KfF0QfOStoipKPGccFI2BkOQo9DkUnbD7blnRwPK O6bO1GUFeFKrvS0quABA== X-RZG-AUTH: ":P3gBZUipdd93FF5ZZvYFPugejmSTVR2nRPhVOQjVd4CteZ/7jYgS+mLFY+H0JAn9VOH8mT0=" Received: from [192.168.244.3] by smtp.strato.de (RZmta 49.4.0 DYNA|AUTH) with ESMTPSA id j6420az4TCl4f8W (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Mon, 29 May 2023 14:47:04 +0200 (CEST) From: Stephan Gerhold Date: Mon, 29 May 2023 14:47:00 +0200 Subject: [PATCH 3/6] arm64: dts: qcom: msm8916/39: Use consistent name for I2C/SPI pinctrl MIME-Version: 1.0 Message-Id: <20230525-msm8916-labels-v1-3-bec0f5fb46fb@gerhold.net> References: <20230525-msm8916-labels-v1-0-bec0f5fb46fb@gerhold.net> In-Reply-To: <20230525-msm8916-labels-v1-0-bec0f5fb46fb@gerhold.net> To: Bjorn Andersson Cc: Konrad Dybcio , Andy Gross , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue , Stephan Gerhold X-Mailer: b4 0.12.2 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_PASS,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767233013380411628?= X-GMAIL-MSGID: =?utf-8?q?1767233013380411628?= Make the labels for the BLSP I2C/SPI pinctrl consistent with the one used for UART by adding the missing blsp_ prefix. This allows having them properly grouped together. The nodes are only reordered in msm8939.dtsi for now since the pinctrl definitions in msm8916-pins.dtsi are currently still unordered anyway. (I will try fixing this in a future patch.) Signed-off-by: Stephan Gerhold Reviewed-by: Bryan O'Donoghue --- arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 6 +- arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 48 +-- arch/arm64/boot/dts/qcom/msm8916.dtsi | 48 +-- arch/arm64/boot/dts/qcom/msm8939.dtsi | 504 ++++++++++++++--------------- 4 files changed, 303 insertions(+), 303 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts index 19bf429a973e..4f3d837578fd 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts @@ -479,15 +479,15 @@ &wcnss_iris { * 2mA drive strength is not enough when connecting multiple * I2C devices with different pull up resistors. */ -&i2c2_default { +&blsp_i2c2_default { drive-strength = <16>; }; -&i2c4_default { +&blsp_i2c4_default { drive-strength = <16>; }; -&i2c6_default { +&blsp_i2c6_default { drive-strength = <16>; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi b/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi index 3539d9029bed..1b60d42a13c7 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi @@ -38,7 +38,7 @@ blsp_uart2_sleep: blsp-uart2-sleep-state { bias-pull-down; }; - spi1_default: spi1-default-state { + blsp_spi1_default: blsp-spi1-default-state { spi-pins { pins = "gpio0", "gpio1", "gpio3"; function = "blsp_spi1"; @@ -56,7 +56,7 @@ cs-pins { }; }; - spi1_sleep: spi1-sleep-state { + blsp_spi1_sleep: blsp-spi1-sleep-state { pins = "gpio0", "gpio1", "gpio2", "gpio3"; function = "gpio"; @@ -64,7 +64,7 @@ spi1_sleep: spi1-sleep-state { bias-pull-down; }; - spi2_default: spi2-default-state { + blsp_spi2_default: blsp-spi2-default-state { spi-pins { pins = "gpio4", "gpio5", "gpio7"; function = "blsp_spi2"; @@ -82,7 +82,7 @@ cs-pins { }; }; - spi2_sleep: spi2-sleep-state { + blsp_spi2_sleep: blsp-spi2-sleep-state { pins = "gpio4", "gpio5", "gpio6", "gpio7"; function = "gpio"; @@ -90,7 +90,7 @@ spi2_sleep: spi2-sleep-state { bias-pull-down; }; - spi3_default: spi3-default-state { + blsp_spi3_default: blsp-spi3-default-state { spi-pins { pins = "gpio8", "gpio9", "gpio11"; function = "blsp_spi3"; @@ -108,7 +108,7 @@ cs-pins { }; }; - spi3_sleep: spi3-sleep-state { + blsp_spi3_sleep: blsp-spi3-sleep-state { pins = "gpio8", "gpio9", "gpio10", "gpio11"; function = "gpio"; @@ -116,7 +116,7 @@ spi3_sleep: spi3-sleep-state { bias-pull-down; }; - spi4_default: spi4-default-state { + blsp_spi4_default: blsp-spi4-default-state { spi-pins { pins = "gpio12", "gpio13", "gpio15"; function = "blsp_spi4"; @@ -134,7 +134,7 @@ cs-pins { }; }; - spi4_sleep: spi4-sleep-state { + blsp_spi4_sleep: blsp-spi4-sleep-state { pins = "gpio12", "gpio13", "gpio14", "gpio15"; function = "gpio"; @@ -142,7 +142,7 @@ spi4_sleep: spi4-sleep-state { bias-pull-down; }; - spi5_default: spi5-default-state { + blsp_spi5_default: blsp-spi5-default-state { spi-pins { pins = "gpio16", "gpio17", "gpio19"; function = "blsp_spi5"; @@ -160,7 +160,7 @@ cs-pins { }; }; - spi5_sleep: spi5-sleep-state { + blsp_spi5_sleep: blsp-spi5-sleep-state { pins = "gpio16", "gpio17", "gpio18", "gpio19"; function = "gpio"; @@ -168,7 +168,7 @@ spi5_sleep: spi5-sleep-state { bias-pull-down; }; - spi6_default: spi6-default-state { + blsp_spi6_default: blsp-spi6-default-state { spi-pins { pins = "gpio20", "gpio21", "gpio23"; function = "blsp_spi6"; @@ -186,7 +186,7 @@ cs-pins { }; }; - spi6_sleep: spi6-sleep-state { + blsp_spi6_sleep: blsp-spi6-sleep-state { pins = "gpio20", "gpio21", "gpio22", "gpio23"; function = "gpio"; @@ -194,7 +194,7 @@ spi6_sleep: spi6-sleep-state { bias-pull-down; }; - i2c1_default: i2c1-default-state { + blsp_i2c1_default: blsp-i2c1-default-state { pins = "gpio2", "gpio3"; function = "blsp_i2c1"; @@ -202,7 +202,7 @@ i2c1_default: i2c1-default-state { bias-disable; }; - i2c1_sleep: i2c1-sleep-state { + blsp_i2c1_sleep: blsp-i2c1-sleep-state { pins = "gpio2", "gpio3"; function = "gpio"; @@ -210,7 +210,7 @@ i2c1_sleep: i2c1-sleep-state { bias-disable; }; - i2c2_default: i2c2-default-state { + blsp_i2c2_default: blsp-i2c2-default-state { pins = "gpio6", "gpio7"; function = "blsp_i2c2"; @@ -218,7 +218,7 @@ i2c2_default: i2c2-default-state { bias-disable; }; - i2c2_sleep: i2c2-sleep-state { + blsp_i2c2_sleep: blsp-i2c2-sleep-state { pins = "gpio6", "gpio7"; function = "gpio"; @@ -226,7 +226,7 @@ i2c2_sleep: i2c2-sleep-state { bias-disable; }; - i2c3_default: i2c3-default-state { + blsp_i2c3_default: blsp-i2c3-default-state { pins = "gpio10", "gpio11"; function = "blsp_i2c3"; @@ -234,7 +234,7 @@ i2c3_default: i2c3-default-state { bias-disable; }; - i2c3_sleep: i2c3-sleep-state { + blsp_i2c3_sleep: blsp-i2c3-sleep-state { pins = "gpio10", "gpio11"; function = "gpio"; @@ -242,7 +242,7 @@ i2c3_sleep: i2c3-sleep-state { bias-disable; }; - i2c4_default: i2c4-default-state { + blsp_i2c4_default: blsp-i2c4-default-state { pins = "gpio14", "gpio15"; function = "blsp_i2c4"; @@ -250,7 +250,7 @@ i2c4_default: i2c4-default-state { bias-disable; }; - i2c4_sleep: i2c4-sleep-state { + blsp_i2c4_sleep: blsp-i2c4-sleep-state { pins = "gpio14", "gpio15"; function = "gpio"; @@ -258,7 +258,7 @@ i2c4_sleep: i2c4-sleep-state { bias-disable; }; - i2c5_default: i2c5-default-state { + blsp_i2c5_default: blsp-i2c5-default-state { pins = "gpio18", "gpio19"; function = "blsp_i2c5"; @@ -266,7 +266,7 @@ i2c5_default: i2c5-default-state { bias-disable; }; - i2c5_sleep: i2c5-sleep-state { + blsp_i2c5_sleep: blsp-i2c5-sleep-state { pins = "gpio18", "gpio19"; function = "gpio"; @@ -274,7 +274,7 @@ i2c5_sleep: i2c5-sleep-state { bias-disable; }; - i2c6_default: i2c6-default-state { + blsp_i2c6_default: blsp-i2c6-default-state { pins = "gpio22", "gpio23"; function = "blsp_i2c6"; @@ -282,7 +282,7 @@ i2c6_default: i2c6-default-state { bias-disable; }; - i2c6_sleep: i2c6-sleep-state { + blsp_i2c6_sleep: blsp-i2c6-sleep-state { pins = "gpio22", "gpio23"; function = "gpio"; diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi index 8081e2611e3c..7e6a60e6edef 100644 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi @@ -1637,8 +1637,8 @@ blsp_i2c1: i2c@78b5000 { dmas = <&blsp_dma 4>, <&blsp_dma 5>; dma-names = "tx", "rx"; pinctrl-names = "default", "sleep"; - pinctrl-0 = <&i2c1_default>; - pinctrl-1 = <&i2c1_sleep>; + pinctrl-0 = <&blsp_i2c1_default>; + pinctrl-1 = <&blsp_i2c1_sleep>; #address-cells = <1>; #size-cells = <0>; status = "disabled"; @@ -1654,8 +1654,8 @@ blsp_spi1: spi@78b5000 { dmas = <&blsp_dma 4>, <&blsp_dma 5>; dma-names = "tx", "rx"; pinctrl-names = "default", "sleep"; - pinctrl-0 = <&spi1_default>; - pinctrl-1 = <&spi1_sleep>; + pinctrl-0 = <&blsp_spi1_default>; + pinctrl-1 = <&blsp_spi1_sleep>; #address-cells = <1>; #size-cells = <0>; status = "disabled"; @@ -1671,8 +1671,8 @@ blsp_i2c2: i2c@78b6000 { dmas = <&blsp_dma 6>, <&blsp_dma 7>; dma-names = "tx", "rx"; pinctrl-names = "default", "sleep"; - pinctrl-0 = <&i2c2_default>; - pinctrl-1 = <&i2c2_sleep>; + pinctrl-0 = <&blsp_i2c2_default>; + pinctrl-1 = <&blsp_i2c2_sleep>; #address-cells = <1>; #size-cells = <0>; status = "disabled"; @@ -1688,8 +1688,8 @@ blsp_spi2: spi@78b6000 { dmas = <&blsp_dma 6>, <&blsp_dma 7>; dma-names = "tx", "rx"; pinctrl-names = "default", "sleep"; - pinctrl-0 = <&spi2_default>; - pinctrl-1 = <&spi2_sleep>; + pinctrl-0 = <&blsp_spi2_default>; + pinctrl-1 = <&blsp_spi2_sleep>; #address-cells = <1>; #size-cells = <0>; status = "disabled"; @@ -1705,8 +1705,8 @@ blsp_i2c3: i2c@78b7000 { dmas = <&blsp_dma 8>, <&blsp_dma 9>; dma-names = "tx", "rx"; pinctrl-names = "default", "sleep"; - pinctrl-0 = <&i2c3_default>; - pinctrl-1 = <&i2c3_sleep>; + pinctrl-0 = <&blsp_i2c3_default>; + pinctrl-1 = <&blsp_i2c3_sleep>; #address-cells = <1>; #size-cells = <0>; status = "disabled"; @@ -1722,8 +1722,8 @@ blsp_spi3: spi@78b7000 { dmas = <&blsp_dma 8>, <&blsp_dma 9>; dma-names = "tx", "rx"; pinctrl-names = "default", "sleep"; - pinctrl-0 = <&spi3_default>; - pinctrl-1 = <&spi3_sleep>; + pinctrl-0 = <&blsp_spi3_default>; + pinctrl-1 = <&blsp_spi3_sleep>; #address-cells = <1>; #size-cells = <0>; status = "disabled"; @@ -1739,8 +1739,8 @@ blsp_i2c4: i2c@78b8000 { dmas = <&blsp_dma 10>, <&blsp_dma 11>; dma-names = "tx", "rx"; pinctrl-names = "default", "sleep"; - pinctrl-0 = <&i2c4_default>; - pinctrl-1 = <&i2c4_sleep>; + pinctrl-0 = <&blsp_i2c4_default>; + pinctrl-1 = <&blsp_i2c4_sleep>; #address-cells = <1>; #size-cells = <0>; status = "disabled"; @@ -1756,8 +1756,8 @@ blsp_spi4: spi@78b8000 { dmas = <&blsp_dma 10>, <&blsp_dma 11>; dma-names = "tx", "rx"; pinctrl-names = "default", "sleep"; - pinctrl-0 = <&spi4_default>; - pinctrl-1 = <&spi4_sleep>; + pinctrl-0 = <&blsp_spi4_default>; + pinctrl-1 = <&blsp_spi4_sleep>; #address-cells = <1>; #size-cells = <0>; status = "disabled"; @@ -1773,8 +1773,8 @@ blsp_i2c5: i2c@78b9000 { dmas = <&blsp_dma 12>, <&blsp_dma 13>; dma-names = "tx", "rx"; pinctrl-names = "default", "sleep"; - pinctrl-0 = <&i2c5_default>; - pinctrl-1 = <&i2c5_sleep>; + pinctrl-0 = <&blsp_i2c5_default>; + pinctrl-1 = <&blsp_i2c5_sleep>; #address-cells = <1>; #size-cells = <0>; status = "disabled"; @@ -1790,8 +1790,8 @@ blsp_spi5: spi@78b9000 { dmas = <&blsp_dma 12>, <&blsp_dma 13>; dma-names = "tx", "rx"; pinctrl-names = "default", "sleep"; - pinctrl-0 = <&spi5_default>; - pinctrl-1 = <&spi5_sleep>; + pinctrl-0 = <&blsp_spi5_default>; + pinctrl-1 = <&blsp_spi5_sleep>; #address-cells = <1>; #size-cells = <0>; status = "disabled"; @@ -1807,8 +1807,8 @@ blsp_i2c6: i2c@78ba000 { dmas = <&blsp_dma 14>, <&blsp_dma 15>; dma-names = "tx", "rx"; pinctrl-names = "default", "sleep"; - pinctrl-0 = <&i2c6_default>; - pinctrl-1 = <&i2c6_sleep>; + pinctrl-0 = <&blsp_i2c6_default>; + pinctrl-1 = <&blsp_i2c6_sleep>; #address-cells = <1>; #size-cells = <0>; status = "disabled"; @@ -1824,8 +1824,8 @@ blsp_spi6: spi@78ba000 { dmas = <&blsp_dma 14>, <&blsp_dma 15>; dma-names = "tx", "rx"; pinctrl-names = "default", "sleep"; - pinctrl-0 = <&spi6_default>; - pinctrl-1 = <&spi6_sleep>; + pinctrl-0 = <&blsp_spi6_default>; + pinctrl-1 = <&blsp_spi6_sleep>; #address-cells = <1>; #size-cells = <0>; status = "disabled"; diff --git a/arch/arm64/boot/dts/qcom/msm8939.dtsi b/arch/arm64/boot/dts/qcom/msm8939.dtsi index a44f7e829513..1196a962897f 100644 --- a/arch/arm64/boot/dts/qcom/msm8939.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8939.dtsi @@ -660,6 +660,234 @@ tlmm: pinctrl@1000000 { interrupt-controller; #interrupt-cells = <2>; + blsp_i2c1_default: blsp-i2c1-default-state { + pins = "gpio2", "gpio3"; + function = "blsp_i2c1"; + drive-strength = <2>; + bias-disable; + }; + + blsp_i2c1_sleep: blsp-i2c1-sleep-state { + pins = "gpio2", "gpio3"; + function = "gpio"; + drive-strength = <2>; + bias-disable; + }; + + blsp_i2c2_default: blsp-i2c2-default-state { + pins = "gpio6", "gpio7"; + function = "blsp_i2c2"; + drive-strength = <2>; + bias-disable; + }; + + blsp_i2c2_sleep: blsp-i2c2-sleep-state { + pins = "gpio6", "gpio7"; + function = "gpio"; + drive-strength = <2>; + bias-disable; + }; + + blsp_i2c3_default: blsp-i2c3-default-state { + pins = "gpio10", "gpio11"; + function = "blsp_i2c3"; + drive-strength = <2>; + bias-disable; + }; + + blsp_i2c3_sleep: blsp-i2c3-sleep-state { + pins = "gpio10", "gpio11"; + function = "gpio"; + drive-strength = <2>; + bias-disable; + }; + + blsp_i2c4_default: blsp-i2c4-default-state { + pins = "gpio14", "gpio15"; + function = "blsp_i2c4"; + drive-strength = <2>; + bias-disable; + }; + + blsp_i2c4_sleep: blsp-i2c4-sleep-state { + pins = "gpio14", "gpio15"; + function = "gpio"; + drive-strength = <2>; + bias-disable; + }; + + blsp_i2c5_default: blsp-i2c5-default-state { + pins = "gpio18", "gpio19"; + function = "blsp_i2c5"; + drive-strength = <2>; + bias-disable; + }; + + blsp_i2c5_sleep: blsp-i2c5-sleep-state { + pins = "gpio18", "gpio19"; + function = "gpio"; + drive-strength = <2>; + bias-disable; + }; + + blsp_i2c6_default: blsp-i2c6-default-state { + pins = "gpio22", "gpio23"; + function = "blsp_i2c6"; + drive-strength = <2>; + bias-disable; + }; + + blsp_i2c6_sleep: blsp-i2c6-sleep-state { + pins = "gpio22", "gpio23"; + function = "gpio"; + drive-strength = <2>; + bias-disable; + }; + + blsp_spi1_default: blsp-spi1-default-state { + spi-pins { + pins = "gpio0", "gpio1", "gpio3"; + function = "blsp_spi1"; + drive-strength = <12>; + bias-disable; + }; + + cs-pins { + pins = "gpio2"; + function = "gpio"; + drive-strength = <16>; + bias-disable; + output-high; + }; + }; + + blsp_spi1_sleep: blsp-spi1-sleep-state { + pins = "gpio0", "gpio1", "gpio2", "gpio3"; + function = "gpio"; + drive-strength = <2>; + bias-pull-down; + }; + + blsp_spi2_default: blsp-spi2-default-state { + spi-pins { + pins = "gpio4", "gpio5", "gpio7"; + function = "blsp_spi2"; + drive-strength = <12>; + bias-disable; + }; + + cs-pins { + pins = "gpio6"; + function = "gpio"; + drive-strength = <16>; + bias-disable; + output-high; + }; + }; + + blsp_spi2_sleep: blsp-spi2-sleep-state { + pins = "gpio4", "gpio5", "gpio6", "gpio7"; + function = "gpio"; + drive-strength = <2>; + bias-pull-down; + }; + + blsp_spi3_default: blsp-spi3-default-state { + spi-pins { + pins = "gpio8", "gpio9", "gpio11"; + function = "blsp_spi3"; + drive-strength = <12>; + bias-disable; + }; + + cs-pins { + pins = "gpio10"; + function = "gpio"; + drive-strength = <16>; + bias-disable; + output-high; + }; + }; + + blsp_spi3_sleep: blsp-spi3-sleep-state { + pins = "gpio8", "gpio9", "gpio10", "gpio11"; + function = "gpio"; + drive-strength = <2>; + bias-pull-down; + }; + + blsp_spi4_default: blsp-spi4-default-state { + spi-pins { + pins = "gpio12", "gpio13", "gpio15"; + function = "blsp_spi4"; + drive-strength = <12>; + bias-disable; + }; + + cs-pins { + pins = "gpio14"; + function = "gpio"; + drive-strength = <16>; + bias-disable; + output-high; + }; + }; + + blsp_spi4_sleep: blsp-spi4-sleep-state { + pins = "gpio12", "gpio13", "gpio14", "gpio15"; + function = "gpio"; + drive-strength = <2>; + bias-pull-down; + }; + + blsp_spi5_default: blsp-spi5-default-state { + spi-pins { + pins = "gpio16", "gpio17", "gpio19"; + function = "blsp_spi5"; + drive-strength = <12>; + bias-disable; + }; + + cs-pins { + pins = "gpio18"; + function = "gpio"; + drive-strength = <16>; + bias-disable; + output-high; + }; + }; + + blsp_spi5_sleep: blsp-spi5-sleep-state { + pins = "gpio16", "gpio17", "gpio18", "gpio19"; + function = "gpio"; + drive-strength = <2>; + bias-pull-down; + }; + + blsp_spi6_default: blsp-spi6-default-state { + spi-pins { + pins = "gpio20", "gpio21", "gpio23"; + function = "blsp_spi6"; + drive-strength = <12>; + bias-disable; + }; + + cs-pins { + pins = "gpio22"; + function = "gpio"; + drive-strength = <16>; + bias-disable; + output-high; + }; + }; + + blsp_spi6_sleep: blsp-spi6-sleep-state { + pins = "gpio20", "gpio21", "gpio22", "gpio23"; + function = "gpio"; + drive-strength = <2>; + bias-pull-down; + }; + blsp_uart1_default: blsp-uart1-default-state { pins = "gpio0", "gpio1", "gpio2", "gpio3"; function = "blsp_uart1"; @@ -852,90 +1080,6 @@ ext_sec_tlmm_lines_sus: tlmm-lines-off-pins { }; }; - i2c1_default: i2c1-default-state { - pins = "gpio2", "gpio3"; - function = "blsp_i2c1"; - drive-strength = <2>; - bias-disable; - }; - - i2c1_sleep: i2c1-sleep-state { - pins = "gpio2", "gpio3"; - function = "gpio"; - drive-strength = <2>; - bias-disable; - }; - - i2c2_default: i2c2-default-state { - pins = "gpio6", "gpio7"; - function = "blsp_i2c2"; - drive-strength = <2>; - bias-disable; - }; - - i2c2_sleep: i2c2-sleep-state { - pins = "gpio6", "gpio7"; - function = "gpio"; - drive-strength = <2>; - bias-disable; - }; - - i2c3_default: i2c3-default-state { - pins = "gpio10", "gpio11"; - function = "blsp_i2c3"; - drive-strength = <2>; - bias-disable; - }; - - i2c3_sleep: i2c3-sleep-state { - pins = "gpio10", "gpio11"; - function = "gpio"; - drive-strength = <2>; - bias-disable; - }; - - i2c4_default: i2c4-default-state { - pins = "gpio14", "gpio15"; - function = "blsp_i2c4"; - drive-strength = <2>; - bias-disable; - }; - - i2c4_sleep: i2c4-sleep-state { - pins = "gpio14", "gpio15"; - function = "gpio"; - drive-strength = <2>; - bias-disable; - }; - - i2c5_default: i2c5-default-state { - pins = "gpio18", "gpio19"; - function = "blsp_i2c5"; - drive-strength = <2>; - bias-disable; - }; - - i2c5_sleep: i2c5-sleep-state { - pins = "gpio18", "gpio19"; - function = "gpio"; - drive-strength = <2>; - bias-disable; - }; - - i2c6_default: i2c6-default-state { - pins = "gpio22", "gpio23"; - function = "blsp_i2c6"; - drive-strength = <2>; - bias-disable; - }; - - i2c6_sleep: i2c6-sleep-state { - pins = "gpio22", "gpio23"; - function = "gpio"; - drive-strength = <2>; - bias-disable; - }; - sdc1_default_state: sdc1-default-state { clk-pins { pins = "sdc1_clk"; @@ -1030,150 +1174,6 @@ cd-pins { }; }; - spi1_default: spi1-default-state { - spi-pins { - pins = "gpio0", "gpio1", "gpio3"; - function = "blsp_spi1"; - drive-strength = <12>; - bias-disable; - }; - - cs-pins { - pins = "gpio2"; - function = "gpio"; - drive-strength = <16>; - bias-disable; - output-high; - }; - }; - - spi1_sleep: spi1-sleep-state { - pins = "gpio0", "gpio1", "gpio2", "gpio3"; - function = "gpio"; - drive-strength = <2>; - bias-pull-down; - }; - - spi2_default: spi2-default-state { - spi-pins { - pins = "gpio4", "gpio5", "gpio7"; - function = "blsp_spi2"; - drive-strength = <12>; - bias-disable; - }; - - cs-pins { - pins = "gpio6"; - function = "gpio"; - drive-strength = <16>; - bias-disable; - output-high; - }; - }; - - spi2_sleep: spi2-sleep-state { - pins = "gpio4", "gpio5", "gpio6", "gpio7"; - function = "gpio"; - drive-strength = <2>; - bias-pull-down; - }; - - spi3_default: spi3-default-state { - spi-pins { - pins = "gpio8", "gpio9", "gpio11"; - function = "blsp_spi3"; - drive-strength = <12>; - bias-disable; - }; - - cs-pins { - pins = "gpio10"; - function = "gpio"; - drive-strength = <16>; - bias-disable; - output-high; - }; - }; - - spi3_sleep: spi3-sleep-state { - pins = "gpio8", "gpio9", "gpio10", "gpio11"; - function = "gpio"; - drive-strength = <2>; - bias-pull-down; - }; - - spi4_default: spi4-default-state { - spi-pins { - pins = "gpio12", "gpio13", "gpio15"; - function = "blsp_spi4"; - drive-strength = <12>; - bias-disable; - }; - - cs-pins { - pins = "gpio14"; - function = "gpio"; - drive-strength = <16>; - bias-disable; - output-high; - }; - }; - - spi4_sleep: spi4-sleep-state { - pins = "gpio12", "gpio13", "gpio14", "gpio15"; - function = "gpio"; - drive-strength = <2>; - bias-pull-down; - }; - - spi5_default: spi5-default-state { - spi-pins { - pins = "gpio16", "gpio17", "gpio19"; - function = "blsp_spi5"; - drive-strength = <12>; - bias-disable; - }; - - cs-pins { - pins = "gpio18"; - function = "gpio"; - drive-strength = <16>; - bias-disable; - output-high; - }; - }; - - spi5_sleep: spi5-sleep-state { - pins = "gpio16", "gpio17", "gpio18", "gpio19"; - function = "gpio"; - drive-strength = <2>; - bias-pull-down; - }; - - spi6_default: spi6-default-state { - spi-pins { - pins = "gpio20", "gpio21", "gpio23"; - function = "blsp_spi6"; - drive-strength = <12>; - bias-disable; - }; - - cs-pins { - pins = "gpio22"; - function = "gpio"; - drive-strength = <16>; - bias-disable; - output-high; - }; - }; - - spi6_sleep: spi6-sleep-state { - pins = "gpio20", "gpio21", "gpio22", "gpio23"; - function = "gpio"; - drive-strength = <2>; - bias-pull-down; - }; - wcnss_pin_a: wcnss-active-state { pins = "gpio40", "gpio41", "gpio42", "gpio43", "gpio44"; function = "wcss_wlan"; @@ -1716,8 +1716,8 @@ blsp_i2c1: i2c@78b5000 { clock-names = "core", "iface"; dmas = <&blsp_dma 4>, <&blsp_dma 5>; dma-names = "tx", "rx"; - pinctrl-0 = <&i2c1_default>; - pinctrl-1 = <&i2c1_sleep>; + pinctrl-0 = <&blsp_i2c1_default>; + pinctrl-1 = <&blsp_i2c1_sleep>; pinctrl-names = "default", "sleep"; #address-cells = <1>; #size-cells = <0>; @@ -1733,8 +1733,8 @@ blsp_spi1: spi@78b5000 { clock-names = "core", "iface"; dmas = <&blsp_dma 4>, <&blsp_dma 5>; dma-names = "tx", "rx"; - pinctrl-0 = <&spi1_default>; - pinctrl-1 = <&spi1_sleep>; + pinctrl-0 = <&blsp_spi1_default>; + pinctrl-1 = <&blsp_spi1_sleep>; pinctrl-names = "default", "sleep"; #address-cells = <1>; #size-cells = <0>; @@ -1750,8 +1750,8 @@ blsp_i2c2: i2c@78b6000 { clock-names = "core", "iface"; dmas = <&blsp_dma 6>, <&blsp_dma 7>; dma-names = "tx", "rx"; - pinctrl-0 = <&i2c2_default>; - pinctrl-1 = <&i2c2_sleep>; + pinctrl-0 = <&blsp_i2c2_default>; + pinctrl-1 = <&blsp_i2c2_sleep>; pinctrl-names = "default", "sleep"; #address-cells = <1>; #size-cells = <0>; @@ -1767,8 +1767,8 @@ blsp_spi2: spi@78b6000 { clock-names = "core", "iface"; dmas = <&blsp_dma 6>, <&blsp_dma 7>; dma-names = "tx", "rx"; - pinctrl-0 = <&spi2_default>; - pinctrl-1 = <&spi2_sleep>; + pinctrl-0 = <&blsp_spi2_default>; + pinctrl-1 = <&blsp_spi2_sleep>; pinctrl-names = "default", "sleep"; #address-cells = <1>; #size-cells = <0>; @@ -1784,8 +1784,8 @@ blsp_i2c3: i2c@78b7000 { clock-names = "core", "iface"; dmas = <&blsp_dma 8>, <&blsp_dma 9>; dma-names = "tx", "rx"; - pinctrl-0 = <&i2c3_default>; - pinctrl-1 = <&i2c3_sleep>; + pinctrl-0 = <&blsp_i2c3_default>; + pinctrl-1 = <&blsp_i2c3_sleep>; pinctrl-names = "default", "sleep"; #address-cells = <1>; #size-cells = <0>; @@ -1801,8 +1801,8 @@ blsp_spi3: spi@78b7000 { clock-names = "core", "iface"; dmas = <&blsp_dma 8>, <&blsp_dma 9>; dma-names = "tx", "rx"; - pinctrl-0 = <&spi3_default>; - pinctrl-1 = <&spi3_sleep>; + pinctrl-0 = <&blsp_spi3_default>; + pinctrl-1 = <&blsp_spi3_sleep>; pinctrl-names = "default", "sleep"; #address-cells = <1>; #size-cells = <0>; @@ -1818,8 +1818,8 @@ blsp_i2c4: i2c@78b8000 { clock-names = "core", "iface"; dmas = <&blsp_dma 10>, <&blsp_dma 11>; dma-names = "tx", "rx"; - pinctrl-0 = <&i2c4_default>; - pinctrl-1 = <&i2c4_sleep>; + pinctrl-0 = <&blsp_i2c4_default>; + pinctrl-1 = <&blsp_i2c4_sleep>; pinctrl-names = "default", "sleep"; #address-cells = <1>; #size-cells = <0>; @@ -1835,8 +1835,8 @@ blsp_spi4: spi@78b8000 { clock-names = "core", "iface"; dmas = <&blsp_dma 10>, <&blsp_dma 11>; dma-names = "tx", "rx"; - pinctrl-0 = <&spi4_default>; - pinctrl-1 = <&spi4_sleep>; + pinctrl-0 = <&blsp_spi4_default>; + pinctrl-1 = <&blsp_spi4_sleep>; pinctrl-names = "default", "sleep"; #address-cells = <1>; #size-cells = <0>; @@ -1852,8 +1852,8 @@ blsp_i2c5: i2c@78b9000 { clock-names = "core", "iface"; dmas = <&blsp_dma 12>, <&blsp_dma 13>; dma-names = "tx", "rx"; - pinctrl-0 = <&i2c5_default>; - pinctrl-1 = <&i2c5_sleep>; + pinctrl-0 = <&blsp_i2c5_default>; + pinctrl-1 = <&blsp_i2c5_sleep>; pinctrl-names = "default", "sleep"; #address-cells = <1>; #size-cells = <0>; @@ -1869,8 +1869,8 @@ blsp_spi5: spi@78b9000 { clock-names = "core", "iface"; dmas = <&blsp_dma 12>, <&blsp_dma 13>; dma-names = "tx", "rx"; - pinctrl-0 = <&spi5_default>; - pinctrl-1 = <&spi5_sleep>; + pinctrl-0 = <&blsp_spi5_default>; + pinctrl-1 = <&blsp_spi5_sleep>; pinctrl-names = "default", "sleep"; #address-cells = <1>; #size-cells = <0>; @@ -1886,8 +1886,8 @@ blsp_i2c6: i2c@78ba000 { clock-names = "core", "iface"; dmas = <&blsp_dma 14>, <&blsp_dma 15>; dma-names = "tx", "rx"; - pinctrl-0 = <&i2c6_default>; - pinctrl-1 = <&i2c6_sleep>; + pinctrl-0 = <&blsp_i2c6_default>; + pinctrl-1 = <&blsp_i2c6_sleep>; pinctrl-names = "default", "sleep"; #address-cells = <1>; #size-cells = <0>; @@ -1903,8 +1903,8 @@ blsp_spi6: spi@78ba000 { clock-names = "core", "iface"; dmas = <&blsp_dma 14>, <&blsp_dma 15>; dma-names = "tx", "rx"; - pinctrl-0 = <&spi6_default>; - pinctrl-1 = <&spi6_sleep>; + pinctrl-0 = <&blsp_spi6_default>; + pinctrl-1 = <&blsp_spi6_sleep>; pinctrl-names = "default", "sleep"; #address-cells = <1>; #size-cells = <0>; From patchwork Mon May 29 12:47:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 100242 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1486998vqr; Mon, 29 May 2023 05:52:01 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5a958GIOaREqSOeor5LdnETUC49nPQgNatXalW5O7poU4dL8JA7sY8bwOLtmYZW0UYSHMz X-Received: by 2002:a17:902:f543:b0:1a6:45e5:a26a with SMTP id h3-20020a170902f54300b001a645e5a26amr14526148plf.27.1685364720612; Mon, 29 May 2023 05:52:00 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1685364720; cv=pass; d=google.com; s=arc-20160816; b=libVJASFShXC/qZYFnCG9dzySdygxfWnfDHIJ3SXCcUz4jJuGsCAh2hKFqQlb/GUkr IK6mZX+MUIbcWpv4GWlewYHZW2KrK8OeUvsXqR1CwNNVsRM1ADVrbOhquLBdBKnRMHfg GNs/gBT7Kvl3ZxKpx/XMsZjb6vsyGucfEhWiyGcHo+6OoTNJBACVe8H+p5wl+3D2ARIk Q6w4LDcVy1L+TwQSflUqhK2q0mNZYr+7q2VdsjUzdR/PwjsbRFBIIZT8mAxWxiAls7V+ qh0QxwntWG9kzet6AJIvPLGoEh2pn0vOsiKGWPE4d0NDAzk1+E+KH4R9NbyiPThJEH0r a50g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature:dkim-signature; bh=CSTcyj+JqHppxYOAbdu6RvABYxoBKY4oykvFnZcC9PU=; b=fCLNbam97hzbv5IxBV9hEFSexb7fKdym/1i2H6CiRlTO0mpCvUepkleYyBV+9wuY2+ ZhpgkR6IkRej2I0vEZg1GnwZNh8XWyF7XGWsA7p1DvsQU2ifuH1xe1Oj4j/qu4SMu1fC qjMKc3t4z+bZJaacEF1lE9QhfHCPvTb5hmistnz/93wii11YwrSNLaWZY+U1Y/1O5gzJ ZOQ+N8GvoahqZS6enXU4mBJYHqNCUuwIknEHotC7j/sucxRZv6B7dDm7LHJFmr17WIYD je20T8h8LZ7NnaHN2NjZeStV9UMA8bxPb4cb1EMCb4Pvcae1+hm2PxCTLaDNTS/2L3xu iHnA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gerhold.net header.s=strato-dkim-0002 header.b=CMayYYLQ; dkim=neutral (no key) header.i=@gerhold.net header.s=strato-dkim-0003 header.b=L+nIymEg; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z12-20020a170903018c00b001b03a1a316fsi170445plg.349.2023.05.29.05.51.48; Mon, 29 May 2023 05:52:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gerhold.net header.s=strato-dkim-0002 header.b=CMayYYLQ; dkim=neutral (no key) header.i=@gerhold.net header.s=strato-dkim-0003 header.b=L+nIymEg; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231841AbjE2Mra (ORCPT + 99 others); Mon, 29 May 2023 08:47:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231702AbjE2MrU (ORCPT ); Mon, 29 May 2023 08:47:20 -0400 Received: from mo4-p01-ob.smtp.rzone.de (mo4-p01-ob.smtp.rzone.de [85.215.255.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18413CD; Mon, 29 May 2023 05:47:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685364425; cv=none; d=strato.com; s=strato-dkim-0002; b=R1YB+bp0giO0BNhUdGnGcL9Iva4oQyuzqbDoTfWI6ocsfA2aJiZC9zMmEq64/WyCrb DMokZYoz13P/UM4rc67FV1XXis/cY2TxFtza/AJF/Sl80fE4+xFZ0mXmGIWCYx7vtFcz x/y9LT21ETClh7b9bTmfV49uIIW0cfZrEh2sXaGkPOeECV38UBW/zDFCTZMk1LxmG/xM E95tu2nvruls7ZKYYjPC8QdZvpd3BLbfvQKI8T02yHTC3roa7yqs+898TOwS7fA/UjXP M/oiDCa1WsBDvk00CVr33Jl8rBpwc1r1DtedhR7geplSM26aHDsKOSbJ9CIwrrPc41CG m1TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1685364425; s=strato-dkim-0002; d=strato.com; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=CSTcyj+JqHppxYOAbdu6RvABYxoBKY4oykvFnZcC9PU=; b=jIjagWswO9JZ65oIpBBBAMa5joFUKBalOZ+AIgSHuJIPNE/1pDih34T9EwgTYy7i6W K7N/WOKp5kp3G1Eq3qBjAN9o9d3Clb0MY9nISFwuPxIjI7GlCHpEe0j3u9gCfqfQhD37 cdoWSmmHYMGVZ+D83vEF0zyNGU+UiIxVkX5ouXONosnTVnhN7yfgZD6HUNGGuTDBDfrk j6QNO4TVMFzHBIgH0azho5I4pZajXgWWeP9JlE+YJT645wiXoa/ApU7JaBsw2+Ea4pxC UDCTMM80KoJuyD2oeece6vjhrTvHLOVfzTBNYbvakMVUteOgKFLd9plTgoOKglWZaGIt 5tpA== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo01 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1685364425; s=strato-dkim-0002; d=gerhold.net; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=CSTcyj+JqHppxYOAbdu6RvABYxoBKY4oykvFnZcC9PU=; b=CMayYYLQK9Q5/EIrjP+A0dzYUYD3mPEO19HemPvv7Ce4/F3PERBR07T1xwdxFVVEpp 9UqFwCanz8xTYfU7Nj03vUkO2XX4CDPQbGWMSKbJE3BxpBjWucvBZxSHntZTEAOteJBv HsM9z1swZlZ6de3uFVrNG9YfZMjiUPLB1R4SMmU93DAgTr60sSUX7Yk04kQtn0n1HBvQ 4rkpFlsFJYLndHM1OsukOtBpTjo+ivwlecWkl+d4wBZuOgpNgvtZ5ptNbKxfwZc1MmjZ UwKzcnhODsarmz3iHaTciTmlg2POLT3D8GTTxzjjk85IaW38eZu4rQP9nbZk1fFLoSIf 2iLA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1685364425; s=strato-dkim-0003; d=gerhold.net; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=CSTcyj+JqHppxYOAbdu6RvABYxoBKY4oykvFnZcC9PU=; b=L+nIymEg7vkndBxHmLz+GdLPv7P9k4MIeJuC8kTen/K5cZ2DgEBOy6BBf+lqB4Wn1A iZMX9dDK0GMGjBelqYDQ== X-RZG-AUTH: ":P3gBZUipdd93FF5ZZvYFPugejmSTVR2nRPhVOQjVd4CteZ/7jYgS+mLFY+H0JAn9VOH8mT0=" Received: from [192.168.244.3] by smtp.strato.de (RZmta 49.4.0 DYNA|AUTH) with ESMTPSA id j6420az4TCl4f8X (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Mon, 29 May 2023 14:47:04 +0200 (CEST) From: Stephan Gerhold Date: Mon, 29 May 2023 14:47:01 +0200 Subject: [PATCH 4/6] arm64: dts: qcom: msm8916/39: Clean up MDSS labels MIME-Version: 1.0 Message-Id: <20230525-msm8916-labels-v1-4-bec0f5fb46fb@gerhold.net> References: <20230525-msm8916-labels-v1-0-bec0f5fb46fb@gerhold.net> In-Reply-To: <20230525-msm8916-labels-v1-0-bec0f5fb46fb@gerhold.net> To: Bjorn Andersson Cc: Konrad Dybcio , Andy Gross , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue , Stephan Gerhold X-Mailer: b4 0.12.2 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_PASS,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767232996809249011?= X-GMAIL-MSGID: =?utf-8?q?1767232996809249011?= Right now MDSS related definitions cannot be properly grouped together in board DTs because the labels do not use consistent prefixes. The DSI PHY label is particularly weird because the DSI number is at the end (&dsi_phy0) while DSI itself is called &dsi0. Follow the example of more recent SoCs and give all the MDSS related nodes a consistent label that allows proper grouping. Signed-off-by: Stephan Gerhold --- arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 12 +++--- arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi | 4 +- .../dts/qcom/msm8916-samsung-a2015-common.dtsi | 10 ++--- .../boot/dts/qcom/msm8916-samsung-a3u-eur.dts | 6 +-- arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi | 2 +- arch/arm64/boot/dts/qcom/msm8916.dtsi | 26 ++++++------ arch/arm64/boot/dts/qcom/msm8939-pm8916.dtsi | 10 ++--- arch/arm64/boot/dts/qcom/msm8939.dtsi | 46 +++++++++++----------- 8 files changed, 58 insertions(+), 58 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts index 4f3d837578fd..9081825c9574 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts @@ -211,7 +211,7 @@ ports { port@0 { reg = <0>; adv7533_in: endpoint { - remote-endpoint = <&dsi0_out>; + remote-endpoint = <&mdss_dsi0_out>; }; }; @@ -301,11 +301,6 @@ ov5640_ep: endpoint { }; }; -&dsi0_out { - data-lanes = <0 1 2 3>; - remote-endpoint = <&adv7533_in>; -}; - &lpass { status = "okay"; }; @@ -318,6 +313,11 @@ &mdss { status = "okay"; }; +&mdss_dsi0_out { + data-lanes = <0 1 2 3>; + remote-endpoint = <&adv7533_in>; +}; + &mpss { status = "okay"; diff --git a/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi index 64d7228bee07..4e7289e6d22d 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi @@ -15,12 +15,12 @@ &camss { vdda-supply = <&pm8916_l2>; }; -&dsi0 { +&mdss_dsi0 { vdda-supply = <&pm8916_l2>; vddio-supply = <&pm8916_l6>; }; -&dsi_phy0 { +&mdss_dsi0_phy { vddio-supply = <&pm8916_l6>; }; 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 497fc83803ef..b1af9c5d07b2 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi @@ -237,16 +237,16 @@ &blsp_uart2 { status = "okay"; }; -&dsi0 { +&mdss { + status = "okay"; +}; + +&mdss_dsi0 { pinctrl-names = "default", "sleep"; pinctrl-0 = <&mdss_default>; pinctrl-1 = <&mdss_sleep>; }; -&mdss { - status = "okay"; -}; - &pm8916_resin { status = "okay"; linux,code = ; diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts index 9068aa6f7b29..e5a569698c4f 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts @@ -85,7 +85,7 @@ &clk_pwm { status = "okay"; }; -&dsi0 { +&mdss_dsi0 { panel@0 { reg = <0>; @@ -97,13 +97,13 @@ panel@0 { port { panel_in: endpoint { - remote-endpoint = <&dsi0_out>; + remote-endpoint = <&mdss_dsi0_out>; }; }; }; }; -&dsi0_out { +&mdss_dsi0_out { data-lanes = <0 1>; remote-endpoint = <&panel_in>; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi b/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi index 898722ee86a5..ac39ac6a21c1 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi @@ -86,7 +86,7 @@ &blsp_uart2 { status = "okay"; }; -/* Remove &dsi_phy0 from clocks to make sure that gcc probes with display disabled */ +/* Remove &mdss_dsi0_phy from clocks to make sure that gcc probes with display disabled */ &gcc { clocks = <&xo_board>, <&sleep_clk>, <0>, <0>, <0>, <0>, <0>; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi index 7e6a60e6edef..0028a405e3ec 100644 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi @@ -1012,8 +1012,8 @@ gcc: clock-controller@1800000 { reg = <0x01800000 0x80000>; clocks = <&xo_board>, <&sleep_clk>, - <&dsi_phy0 1>, - <&dsi_phy0 0>, + <&mdss_dsi0_phy 1>, + <&mdss_dsi0_phy 0>, <0>, <0>, <0>; @@ -1062,7 +1062,7 @@ mdss: display-subsystem@1a00000 { #size-cells = <1>; ranges; - mdp: display-controller@1a01000 { + mdss_mdp: display-controller@1a01000 { compatible = "qcom,msm8916-mdp5", "qcom,mdp5"; reg = <0x01a01000 0x89000>; reg-names = "mdp_phys"; @@ -1087,14 +1087,14 @@ ports { port@0 { reg = <0>; - mdp5_intf1_out: endpoint { - remote-endpoint = <&dsi0_in>; + mdss_mdp_intf1_out: endpoint { + remote-endpoint = <&mdss_dsi0_in>; }; }; }; }; - dsi0: dsi@1a98000 { + mdss_dsi0: dsi@1a98000 { compatible = "qcom,msm8916-dsi-ctrl", "qcom,mdss-dsi-ctrl"; reg = <0x01a98000 0x25c>; @@ -1105,8 +1105,8 @@ dsi0: dsi@1a98000 { assigned-clocks = <&gcc BYTE0_CLK_SRC>, <&gcc PCLK0_CLK_SRC>; - assigned-clock-parents = <&dsi_phy0 0>, - <&dsi_phy0 1>; + assigned-clock-parents = <&mdss_dsi0_phy 0>, + <&mdss_dsi0_phy 1>; clocks = <&gcc GCC_MDSS_MDP_CLK>, <&gcc GCC_MDSS_AHB_CLK>, @@ -1120,7 +1120,7 @@ dsi0: dsi@1a98000 { "byte", "pixel", "core"; - phys = <&dsi_phy0>; + phys = <&mdss_dsi0_phy>; #address-cells = <1>; #size-cells = <0>; @@ -1131,20 +1131,20 @@ ports { port@0 { reg = <0>; - dsi0_in: endpoint { - remote-endpoint = <&mdp5_intf1_out>; + mdss_dsi0_in: endpoint { + remote-endpoint = <&mdss_mdp_intf1_out>; }; }; port@1 { reg = <1>; - dsi0_out: endpoint { + mdss_dsi0_out: endpoint { }; }; }; }; - dsi_phy0: phy@1a98300 { + mdss_dsi0_phy: phy@1a98300 { compatible = "qcom,dsi-phy-28nm-lp"; reg = <0x01a98300 0xd4>, <0x01a98500 0x280>, diff --git a/arch/arm64/boot/dts/qcom/msm8939-pm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8939-pm8916.dtsi index 24393a159058..33e02f42f5e4 100644 --- a/arch/arm64/boot/dts/qcom/msm8939-pm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8939-pm8916.dtsi @@ -3,21 +3,21 @@ #include "msm8939.dtsi" #include "pm8916.dtsi" -&dsi0 { +&mdss_dsi0 { vdda-supply = <&pm8916_l2>; vddio-supply = <&pm8916_l6>; }; -&dsi1 { - vdda-supply = <&pm8916_l2>; +&mdss_dsi0_phy { vddio-supply = <&pm8916_l6>; }; -&dsi_phy0 { +&mdss_dsi1 { + vdda-supply = <&pm8916_l2>; vddio-supply = <&pm8916_l6>; }; -&dsi_phy1 { +&mdss_dsi1_phy { vddio-supply = <&pm8916_l6>; }; diff --git a/arch/arm64/boot/dts/qcom/msm8939.dtsi b/arch/arm64/boot/dts/qcom/msm8939.dtsi index 1196a962897f..0d9f8b951b66 100644 --- a/arch/arm64/boot/dts/qcom/msm8939.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8939.dtsi @@ -1187,8 +1187,8 @@ gcc: clock-controller@1800000 { reg = <0x01800000 0x80000>; clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>, <&sleep_clk>, - <&dsi_phy0 1>, - <&dsi_phy0 0>, + <&mdss_dsi0_phy 1>, + <&mdss_dsi0_phy 0>, <0>, <0>, <0>; @@ -1240,7 +1240,7 @@ mdss: display-subsystem@1a00000 { status = "disabled"; - mdp: display-controller@1a01000 { + mdss_mdp: display-controller@1a01000 { compatible = "qcom,mdp5"; reg = <0x01a01000 0x89000>; reg-names = "mdp_phys"; @@ -1269,21 +1269,21 @@ ports { port@0 { reg = <0>; - mdp5_intf1_out: endpoint { - remote-endpoint = <&dsi0_in>; + mdss_mdp_intf1_out: endpoint { + remote-endpoint = <&mdss_dsi0_in>; }; }; port@1 { reg = <1>; - mdp5_intf2_out: endpoint { - remote-endpoint = <&dsi1_in>; + mdss_mdp_intf2_out: endpoint { + remote-endpoint = <&mdss_dsi1_in>; }; }; }; }; - dsi0: dsi@1a98000 { + mdss_dsi0: dsi@1a98000 { compatible = "qcom,msm8916-dsi-ctrl", "qcom,mdss-dsi-ctrl"; reg = <0x01a98000 0x25c>; @@ -1306,10 +1306,10 @@ dsi0: dsi@1a98000 { "core"; assigned-clocks = <&gcc BYTE0_CLK_SRC>, <&gcc PCLK0_CLK_SRC>; - assigned-clock-parents = <&dsi_phy0 0>, - <&dsi_phy0 1>; + assigned-clock-parents = <&mdss_dsi0_phy 0>, + <&mdss_dsi0_phy 1>; - phys = <&dsi_phy0>; + phys = <&mdss_dsi0_phy>; status = "disabled"; #address-cells = <1>; @@ -1321,20 +1321,20 @@ ports { port@0 { reg = <0>; - dsi0_in: endpoint { - remote-endpoint = <&mdp5_intf1_out>; + mdss_dsi0_in: endpoint { + remote-endpoint = <&mdss_mdp_intf1_out>; }; }; port@1 { reg = <1>; - dsi0_out: endpoint { + mdss_dsi0_out: endpoint { }; }; }; }; - dsi_phy0: phy@1a98300 { + mdss_dsi0_phy: phy@1a98300 { compatible = "qcom,dsi-phy-28nm-lp"; reg = <0x01a98300 0xd4>, <0x01a98500 0x280>, @@ -1352,7 +1352,7 @@ dsi_phy0: phy@1a98300 { status = "disabled"; }; - dsi1: dsi@1aa0000 { + mdss_dsi1: dsi@1aa0000 { compatible = "qcom,msm8916-dsi-ctrl", "qcom,mdss-dsi-ctrl"; reg = <0x01aa0000 0x25c>; @@ -1375,9 +1375,9 @@ dsi1: dsi@1aa0000 { "core"; assigned-clocks = <&gcc BYTE1_CLK_SRC>, <&gcc PCLK1_CLK_SRC>; - assigned-clock-parents = <&dsi_phy0 0>, - <&dsi_phy0 1>; - phys = <&dsi_phy1>; + assigned-clock-parents = <&mdss_dsi0_phy 0>, + <&mdss_dsi0_phy 1>; + phys = <&mdss_dsi1_phy>; status = "disabled"; ports { @@ -1386,20 +1386,20 @@ ports { port@0 { reg = <0>; - dsi1_in: endpoint { - remote-endpoint = <&mdp5_intf2_out>; + mdss_dsi1_in: endpoint { + remote-endpoint = <&mdss_mdp_intf2_out>; }; }; port@1 { reg = <1>; - dsi1_out: endpoint { + mdss_dsi1_out: endpoint { }; }; }; }; - dsi_phy1: phy@1aa0300 { + mdss_dsi1_phy: phy@1aa0300 { compatible = "qcom,dsi-phy-28nm-lp"; reg = <0x01aa0300 0xd4>, <0x01aa0500 0x280>, From patchwork Mon May 29 12:47:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 100245 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1491925vqr; Mon, 29 May 2023 06:00:36 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5xAwIzUTksQKbVZjqcWpV96r3CdBFcrntk5BaGOxBvx0Zw+X9xT5CUQ1rODCiPs+bD2PE6 X-Received: by 2002:a17:902:da8b:b0:1af:de3d:bbe3 with SMTP id j11-20020a170902da8b00b001afde3dbbe3mr12345142plx.26.1685365235495; Mon, 29 May 2023 06:00:35 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1685365235; cv=pass; d=google.com; s=arc-20160816; b=kubo+xXpEWG/XKOmjUJNHaTw2HqJYbLigP7EL/s99/tg6NV8XClwQMqMkadFnNrYHz QScaqZIrE2Vahhq/TtO1m80oFkkctHS+0N8CRH/9yHS65TMx228mksvQGuWz1B4imljE jVyxxKYJWmt8WJ6oa1TwfVDdxudqGgMTPrjj/La9PcctSC2sbo2EKWAJaKgjAPm+iJpB B8fHK23qi6itPbLOcQXV3QAMnoSAofbBEj0WlXF3H0chBFx/pTZK5xmVQq2/I+cM6Vph 3ydPD7LTiT30LQc0zI56Z2Ejla0XFr1rJwy15UN1akXJACl6UR+phBrxyXDexFqMJuLl NkGg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature:dkim-signature; bh=oCE7duxpJ+L+TbayDAFlqf4orcOYvvGX1dSAeHvQNfU=; b=v6wUc3g8QOHMeRU2KXkQzDqIVm+PfN2OjXGWpEoLn1NXV1ydRZBbSZyvMsDOcXrzfE 9qopiedHsvrg1kyV43IY0BooAdcU1dCtYy3L+ATGg5Xh4K/ZBBC1rBtnmc1TbJkZ0eNf 6UGBhqMgP4h/lBTDIli82Ciy/u1DvfQFhnnxpLYKSNzGDdr7gW4f+FVsXtzjWJSIhgmi EMdoQIHIPSWF5pLz5uFlIysCRwSDbTdz8mc6/wZeUg9jaRHoYCyOfeTtTmsyRptFxBuo h9ZhbljGTmdEyd76mM3xZyTFJLpvbQAwiJe02oCBEbmK3ayVLucyMfjJl9y9AIIMrvJS +Gbw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gerhold.net header.s=strato-dkim-0002 header.b=QyrXAoAz; dkim=neutral (no key) header.i=@gerhold.net header.s=strato-dkim-0003; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b10-20020a170902d88a00b001afd4fceea5si9250957plz.617.2023.05.29.06.00.22; Mon, 29 May 2023 06:00:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gerhold.net header.s=strato-dkim-0002 header.b=QyrXAoAz; dkim=neutral (no key) header.i=@gerhold.net header.s=strato-dkim-0003; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231812AbjE2Mr1 (ORCPT + 99 others); Mon, 29 May 2023 08:47:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55902 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231694AbjE2MrT (ORCPT ); Mon, 29 May 2023 08:47:19 -0400 Received: from mo4-p01-ob.smtp.rzone.de (mo4-p01-ob.smtp.rzone.de [81.169.146.164]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 19C76D8; Mon, 29 May 2023 05:47:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685364425; cv=none; d=strato.com; s=strato-dkim-0002; b=NQbDS+ZcMPBOIraFHREPjuyEeEoXCcvInprgV4TZ16yYmC9paLseGMxv8QKbTYsv58 KMI3NIl4lKWe0ru8VicIYPdolZapwR7/0S6FEcuD1eB0DrpaWf96Xjqk+5nbUeyA3PPU N1pKNll4gHGKEPcCCg1spC5UyQGwcV5qBM+p1WkOgud/XklwntmpPyKmo5WhWxxeEuQ2 u7ThxmjjLGFhxPNlFvWvsmU5erAz3eoXzWz4lc5DKwG1QlM72JNmH73LB86tJps9ZK/L DtOz7v8mPj7scVZlXHRjMMfLI0Pfp8kblFL8OMp5+S3yoTjC/6YvEgYd+jKKjvKsR+VX peQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1685364425; s=strato-dkim-0002; d=strato.com; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=oCE7duxpJ+L+TbayDAFlqf4orcOYvvGX1dSAeHvQNfU=; b=C6ws3eoFV1haKvDkZJIJsTFhihG+RJZXomUiyz4YT8Oz1C3aD6atGroW9Ayv2RjIUY gISiQknvGmNCH6AKnlg/O9hkOg9ggBq3HHYSecDS4rlig0EoYh2uXvCMRYybyiyTfBow +sWT7LZsXLx0Kv9TR/qgqdVk2TtDAqnKt2zEIDWrrOCmUt/TtSLtNySc7WyfDvlGbxO5 h9tPQLKKcMIg6oxUjYbTfJ5zh5XGzKOT8XJlR/+CIwsImMJ28wR9JzqMtFz5Dhkr8QrM JoOD8vxBO8wMqg5qFN3uTeZfNdQGQ8fabxxpD/Cy7Cgzu75VOwhWhm9hPjcbHlrd5MWL s1vw== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo01 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1685364425; s=strato-dkim-0002; d=gerhold.net; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=oCE7duxpJ+L+TbayDAFlqf4orcOYvvGX1dSAeHvQNfU=; b=QyrXAoAzHU9STw9Dfxgbnxm2DHfyQewcZyVcLT4pS6qZl+hqSq2wbNulWbqJhQMAdb Jo1gYC17zxjpgOBKYkzYrxTvEoaeneqfeNhTlMrnim9KMB9NJglY9Fa8Lc53flKa+7KB 8/t4JZahul187e3Rb+iOQX6Inag6syDl5x8xY7XRQ6QWYDiIJThqGUpQ3jvkEZxkaBEw jHmCUcmsiGtDs5iCC76eRWYX0SNurqvbTfVN2alcMPaGE7bggqv6stQhmcEr5sePBShz Rc/XQ5rdkr4bdLC7ORyEJOsK+BaBBJAgb7aUL2N+/fn7VJxrJd1bvnLBvxI3Q4FQwnNx +vWw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1685364425; s=strato-dkim-0003; d=gerhold.net; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=oCE7duxpJ+L+TbayDAFlqf4orcOYvvGX1dSAeHvQNfU=; b=7ryxh1lorBRz3iCuCbL9tBo7SWLaxymZTV4n1sCao8RPR0pfBP5w34OI8qhyh+19Wa 5b5B5y7QjYnwlR8FeqAw== X-RZG-AUTH: ":P3gBZUipdd93FF5ZZvYFPugejmSTVR2nRPhVOQjVd4CteZ/7jYgS+mLFY+H0JAn9VOH8mT0=" Received: from [192.168.244.3] by smtp.strato.de (RZmta 49.4.0 DYNA|AUTH) with ESMTPSA id j6420az4TCl5f8Y (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Mon, 29 May 2023 14:47:05 +0200 (CEST) From: Stephan Gerhold Date: Mon, 29 May 2023 14:47:02 +0200 Subject: [PATCH 5/6] arm64: dts: qcom: pm8916: Rename &wcd_codec -> &pm8916_codec MIME-Version: 1.0 Message-Id: <20230525-msm8916-labels-v1-5-bec0f5fb46fb@gerhold.net> References: <20230525-msm8916-labels-v1-0-bec0f5fb46fb@gerhold.net> In-Reply-To: <20230525-msm8916-labels-v1-0-bec0f5fb46fb@gerhold.net> To: Bjorn Andersson Cc: Konrad Dybcio , Andy Gross , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue , Stephan Gerhold X-Mailer: b4 0.12.2 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767233536301587455?= X-GMAIL-MSGID: =?utf-8?q?1767233536301587455?= All definitions in pm8916.dtsi use the &pm8916_ label suffix, only the codec uses the &wcd_codec label. &wcd_codec is confusing because the codec on MSM8916 is split into a "wcd-digital" and "wcd-analog" part and both could be described with &wcd_codec. Let's just name it &pm8916_codec so it's consistent with all other PMIC device nodes. Signed-off-by: Stephan Gerhold Reviewed-by: Bryan O'Donoghue --- arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 20 ++++++++++---------- arch/arm64/boot/dts/qcom/apq8039-t2.dts | 18 +++++++++--------- arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts | 20 ++++++++++---------- arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi | 12 ++++++------ arch/arm64/boot/dts/qcom/pm8916.dtsi | 2 +- 5 files changed, 36 insertions(+), 36 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts index 9081825c9574..923646766ef1 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts @@ -324,6 +324,14 @@ &mpss { firmware-name = "qcom/apq8016/mba.mbn", "qcom/apq8016/modem.mbn"; }; +&pm8916_codec { + status = "okay"; + clocks = <&gcc GCC_CODEC_DIGCODEC_CLK>; + clock-names = "mclk"; + qcom,mbhc-vthreshold-low = <75 150 237 450 500>; + qcom,mbhc-vthreshold-high = <75 150 237 450 500>; +}; + &pm8916_resin { status = "okay"; linux,code = ; @@ -403,7 +411,7 @@ cpu { sound-dai = <&lpass MI2S_PRIMARY>; }; codec { - sound-dai = <&lpass_codec 0>, <&wcd_codec 0>; + sound-dai = <&lpass_codec 0>, <&pm8916_codec 0>; }; }; @@ -413,7 +421,7 @@ cpu { sound-dai = <&lpass MI2S_TERTIARY>; }; codec { - sound-dai = <&lpass_codec 1>, <&wcd_codec 1>; + sound-dai = <&lpass_codec 1>, <&pm8916_codec 1>; }; }; }; @@ -431,14 +439,6 @@ &usb_hs_phy { extcon = <&usb_id>; }; -&wcd_codec { - status = "okay"; - clocks = <&gcc GCC_CODEC_DIGCODEC_CLK>; - clock-names = "mclk"; - qcom,mbhc-vthreshold-low = <75 150 237 450 500>; - qcom,mbhc-vthreshold-high = <75 150 237 450 500>; -}; - &wcnss { status = "okay"; firmware-name = "qcom/apq8016/wcnss.mbn"; diff --git a/arch/arm64/boot/dts/qcom/apq8039-t2.dts b/arch/arm64/boot/dts/qcom/apq8039-t2.dts index 07f4c6398b41..e783b0af355e 100644 --- a/arch/arm64/boot/dts/qcom/apq8039-t2.dts +++ b/arch/arm64/boot/dts/qcom/apq8039-t2.dts @@ -139,6 +139,13 @@ &mdss { status = "okay"; }; +&pm8916_codec { + qcom,hphl-jack-type-normally-open; + qcom,mbhc-vthreshold-low = <75 150 237 450 500>; + qcom,mbhc-vthreshold-high = <75 150 237 450 500>; + status = "okay"; +}; + &pm8916_gpios { gpio-line-names = "PM_GPIO1", /* WIFI_GPIO1_PRE */ @@ -265,7 +272,7 @@ cpu { sound-dai = <&lpass MI2S_PRIMARY>; }; codec { - sound-dai = <&lpass_codec 0>, <&wcd_codec 0>; + sound-dai = <&lpass_codec 0>, <&pm8916_codec 0>; }; }; @@ -275,7 +282,7 @@ cpu { sound-dai = <&lpass MI2S_TERTIARY>; }; codec { - sound-dai = <&lpass_codec 1>, <&wcd_codec 1>; + sound-dai = <&lpass_codec 1>, <&pm8916_codec 1>; }; }; }; @@ -476,13 +483,6 @@ otg_ep: endpoint { }; }; -&wcd_codec { - qcom,hphl-jack-type-normally-open; - qcom,mbhc-vthreshold-low = <75 150 237 450 500>; - qcom,mbhc-vthreshold-high = <75 150 237 450 500>; - status = "okay"; -}; - &wcnss { 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 cbf53de44ef3..1334bfcf3cee 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts @@ -222,6 +222,14 @@ &lpass_codec { status = "okay"; }; +&pm8916_codec { + status = "okay"; + qcom,micbias-lvl = <2800>; + qcom,mbhc-vthreshold-low = <75 150 237 450 500>; + qcom,mbhc-vthreshold-high = <75 150 237 450 500>; + qcom,hphl-jack-type-normally-open; +}; + &pm8916_l8 { regulator-min-microvolt = <2950000>; regulator-max-microvolt = <2950000>; @@ -298,7 +306,7 @@ cpu { sound-dai = <&lpass MI2S_PRIMARY>; }; codec { - sound-dai = <&lpass_codec 0>, <&wcd_codec 0>; + sound-dai = <&lpass_codec 0>, <&pm8916_codec 0>; }; }; @@ -308,7 +316,7 @@ cpu { sound-dai = <&lpass MI2S_TERTIARY>; }; codec { - sound-dai = <&lpass_codec 1>, <&wcd_codec 1>; + sound-dai = <&lpass_codec 1>, <&pm8916_codec 1>; }; }; }; @@ -322,14 +330,6 @@ &usb_hs_phy { extcon = <&usb_id>; }; -&wcd_codec { - status = "okay"; - qcom,micbias-lvl = <2800>; - qcom,mbhc-vthreshold-low = <75 150 237 450 500>; - qcom,mbhc-vthreshold-high = <75 150 237 450 500>; - qcom,hphl-jack-type-normally-open; -}; - &wcnss { status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi index 4e7289e6d22d..b1a7eafbee31 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi @@ -28,6 +28,12 @@ &mpss { pll-supply = <&pm8916_l7>; }; +&pm8916_codec { + vdd-cdc-io-supply = <&pm8916_l5>; + vdd-cdc-tx-rx-cx-supply = <&pm8916_l5>; + vdd-micbias-supply = <&pm8916_l13>; +}; + &sdhc_1 { vmmc-supply = <&pm8916_l8>; vqmmc-supply = <&pm8916_l5>; @@ -43,12 +49,6 @@ &usb_hs_phy { v3p3-supply = <&pm8916_l13>; }; -&wcd_codec { - vdd-cdc-io-supply = <&pm8916_l5>; - vdd-cdc-tx-rx-cx-supply = <&pm8916_l5>; - vdd-micbias-supply = <&pm8916_l13>; -}; - &wcnss { vddpx-supply = <&pm8916_l7>; }; diff --git a/arch/arm64/boot/dts/qcom/pm8916.dtsi b/arch/arm64/boot/dts/qcom/pm8916.dtsi index 864bb1cd68db..1ea8920ff369 100644 --- a/arch/arm64/boot/dts/qcom/pm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/pm8916.dtsi @@ -139,7 +139,7 @@ pm8916_vib: vibrator@c000 { status = "disabled"; }; - wcd_codec: audio-codec@f000 { + pm8916_codec: audio-codec@f000 { compatible = "qcom,pm8916-wcd-analog-codec"; reg = <0xf000>; reg-names = "pmic-codec-core"; From patchwork Mon May 29 12:47:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 100240 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1486300vqr; Mon, 29 May 2023 05:50:48 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4YACnwqyGhvTRyEie/01LlWLI4ItGQDKJh9gCtVrhUqWg8uZ1SWw3dGLy4IPohPLAqvnkv X-Received: by 2002:a17:90b:fc2:b0:253:3e9d:f925 with SMTP id gd2-20020a17090b0fc200b002533e9df925mr10392054pjb.31.1685364647924; Mon, 29 May 2023 05:50:47 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1685364647; cv=pass; d=google.com; s=arc-20160816; b=lk9mMShYOA2wG4nyF09gPO2TuKxtk5OqP38+v45ueCGxsO/nF5Ho2mndXIuu9FHUVF j55i9lVBl7peC9gzHLU01WUYh7kgFB6oecTMwomXKPA5SOrgde/Q0OAOng85P1RNM9aV j04ZYnIctrAgARXJMgwjsA8q4Z9q8VIF3nWk0a82l7IajgtN6DEw82XjJL+hzERDYVCg jmIsNyYR6pVidyx8HRaZZMG2NDwhOcGFaK1xm/daFXI8MR538T78chCm8Ua0pZhkKb8+ 34UTbPuZr9SFWJM7J7XOGvFR5HxaaPbknIzeNaJD8ttK8UJX2v2AuL9yIp3nMRHN3VlJ ZPUw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature:dkim-signature; bh=6/CMisvfnMRE8G0DiZyOyMITYBIkvc89VlwZlZVc3Co=; b=eQ7+SlytMdp/gXD6J/yzctZQ96u0dantb5YjNuqklmLFmTV2z50Zi4XBSdDBEJNFi5 ffOsuQ5aYpyL43hv2gqiTlGvNIodw2zmWPZJ75jyXbzHUqsa43lbmbKPu3zlvcK7Lupd sw/L+iM4s+Yz2jxbVMQ43zvhhazBbkRcVaOytzsbKFp4s9wmQ/VuBUwwhCC9ssXbPC7z vb+GT7ThwA+Gon9v3d8BmBeXsg6d7WyIl7rb2cUiTBGdUwMbS4YIz80CYoGL16qiYypI 3aXlvHhauaxlQ1e5NzxBVQ9f4ZCAqoGx96C1bQn/sY1RkNI2KrBeWDuvkDI6Bcc6mL90 EUig== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gerhold.net header.s=strato-dkim-0002 header.b=YBqrV46L; dkim=neutral (no key) header.i=@gerhold.net; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lx3-20020a17090b4b0300b0025682a65734si1632441pjb.9.2023.05.29.05.50.35; Mon, 29 May 2023 05:50:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gerhold.net header.s=strato-dkim-0002 header.b=YBqrV46L; dkim=neutral (no key) header.i=@gerhold.net; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231809AbjE2MrX (ORCPT + 99 others); Mon, 29 May 2023 08:47:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55900 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231575AbjE2MrS (ORCPT ); Mon, 29 May 2023 08:47:18 -0400 Received: from mo4-p01-ob.smtp.rzone.de (mo4-p01-ob.smtp.rzone.de [85.215.255.50]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA8DCC7; Mon, 29 May 2023 05:47:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685364425; cv=none; d=strato.com; s=strato-dkim-0002; b=A/LJrk9NnckQbTcjwlOGxmm5gwhKaaKqNu34+CS61n0tGP1obPbnBzyEUzaN1C3AqY XZeZkrDVExHCiMnt0ghem/qgdfCApatCqhMBBAQQz+3zpm5BobWqTISiatrC5jrvumC4 yxde40NAN/GU5SBNWDYZxBYCOPlxVNHiYoztMOq/4K/xqH0lUtAuffpCRZNm3eLWIy28 0iD2lpzoSDHsowB6/kO+nDt7cuIEoQ8Nv0qGXm+M2Qqg1nq2lVZ3kxiAa3h+fy98t0hK TvunHaVqwMKPlwdGE9vrREkE7SfiEOrLNZsKT18nmmdH52lsb8um8F9bQ97ClM3ogdkm gYnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1685364425; s=strato-dkim-0002; d=strato.com; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=6/CMisvfnMRE8G0DiZyOyMITYBIkvc89VlwZlZVc3Co=; b=e/fH7v+yOBwf5C7EDahzWhvuJxeTIt+4Q8yqfQmXKtrwhtBKE4GkiXiiJoURpx8Xip VnCegt80bmWuL4Mwo81pZjkUPijVMLz3RRSrHdqNyJf6V4K+do6K4YayO4jBlme0S3u+ zse/fZV2y0QbCQFuuYcQbcl18heoAkWrhpTUXfaXpIlY7yLW9E7S4QB5+7Lblj88jPod UZ7BnUI0AZr5/6/PJBNnQ5H/cUKTtgJmxNWGPGpTJcwjyOgCYtBAHbOrxwk+4h9OW7JF dMOFZej3sK2YumvOrYeyaA9AFqxTWczWEb+Yuy7DMh9oFcvFdkRimmNq11KzKacSNOYl YgZw== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo01 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1685364425; s=strato-dkim-0002; d=gerhold.net; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=6/CMisvfnMRE8G0DiZyOyMITYBIkvc89VlwZlZVc3Co=; b=YBqrV46LQa+GW0EUWPS7q+6ojEdln9VoQZVif7oR1+iycvUdfe7zXszGHr5u9dj+zK 5yMzaa2ydaCd1SOXHgD0tMqiUBeOKRJ9p9dzb8NPMA5Bqf7k5JwbejidtNTNIwO7NmIj wwNOf/90m/pPYkSIpSFkWZYd8tIneDQ7d9uORQawiGnP6Jy++fJe3FYZns7y45Zontrw vomIQchqjYNwbvLP8/mutXrct0UwZwrvhQtsvoTCWsxswUvbfuRFCFSIESFBDkFwVEPr J3JO2F8vO+S2ZbQ+SAOK2yOD9LxYyD18rPRIHXpuAddMnm/nuZKt8e44syiUPuSfmsdr VpSA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1685364425; s=strato-dkim-0003; d=gerhold.net; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=6/CMisvfnMRE8G0DiZyOyMITYBIkvc89VlwZlZVc3Co=; b=6A917zZ7joHwYfu69AqpBfiprfuK3neISzqlWFH56UOO+p034iTlLLHwZTXZD3i3bc W6ZoQ8vVos5SdJawzNAw== X-RZG-AUTH: ":P3gBZUipdd93FF5ZZvYFPugejmSTVR2nRPhVOQjVd4CteZ/7jYgS+mLFY+H0JAn9VOH8mT0=" Received: from [192.168.244.3] by smtp.strato.de (RZmta 49.4.0 DYNA|AUTH) with ESMTPSA id j6420az4TCl5f8Z (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Mon, 29 May 2023 14:47:05 +0200 (CEST) From: Stephan Gerhold Date: Mon, 29 May 2023 14:47:03 +0200 Subject: [PATCH 6/6] arm64: dts: qcom: msm8916: Move aliases to boards MIME-Version: 1.0 Message-Id: <20230525-msm8916-labels-v1-6-bec0f5fb46fb@gerhold.net> References: <20230525-msm8916-labels-v1-0-bec0f5fb46fb@gerhold.net> In-Reply-To: <20230525-msm8916-labels-v1-0-bec0f5fb46fb@gerhold.net> To: Bjorn Andersson Cc: Konrad Dybcio , Andy Gross , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue , Stephan Gerhold X-Mailer: b4 0.12.2 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_PASS,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767232920678725314?= X-GMAIL-MSGID: =?utf-8?q?1767232920678725314?= MSM8939 has the aliases defined separately for each board (because there could be (theoretically) a board where the slots are numbered differently. To make MSM8916 and MSM8939 more consistent do the same for all MSM8916 boards and move aliases there. Signed-off-by: Stephan Gerhold Reviewed-by: Bryan O'Donoghue --- arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 2 ++ arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts | 2 ++ arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts | 2 ++ arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts | 2 ++ arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts | 2 ++ arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts | 2 ++ arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts | 2 ++ arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts | 2 ++ arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi | 2 ++ arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi | 2 ++ arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi | 2 ++ arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts | 2 ++ arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi | 1 + arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts | 2 ++ arch/arm64/boot/dts/qcom/msm8916.dtsi | 5 ----- 15 files changed, 27 insertions(+), 5 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts index 923646766ef1..56dfca61253e 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts @@ -18,6 +18,8 @@ / { compatible = "qcom,apq8016-sbc", "qcom,apq8016"; aliases { + mmc0 = &sdhc_1; /* eMMC */ + mmc1 = &sdhc_2; /* SD card */ serial0 = &blsp_uart2; serial1 = &blsp_uart1; usid0 = &pm8916_0; 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 c864ce12c1f1..5025c08e4817 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts @@ -22,6 +22,8 @@ / { chassis-type = "tablet"; aliases { + mmc0 = &sdhc_1; /* eMMC */ + mmc1 = &sdhc_2; /* SD card */ serial0 = &blsp_uart2; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts index 47580bd243eb..7b629243ef0d 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts @@ -13,6 +13,8 @@ / { chassis-type = "handset"; aliases { + mmc0 = &sdhc_1; /* eMMC */ + mmc1 = &sdhc_2; /* SD card */ serial0 = &blsp_uart2; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts index ad71695652c2..b8c217b04a3b 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts @@ -13,6 +13,8 @@ / { chassis-type = "handset"; aliases { + mmc0 = &sdhc_1; /* eMMC */ + mmc1 = &sdhc_2; /* SD card */ serial0 = &blsp_uart2; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts b/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts index a2be985052a5..56c42b0c9733 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts @@ -14,6 +14,8 @@ / { chassis-type = "tablet"; aliases { + mmc0 = &sdhc_1; /* eMMC */ + mmc1 = &sdhc_2; /* SD card */ serial0 = &blsp_uart2; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts index 1334bfcf3cee..175ca011998c 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts @@ -26,6 +26,8 @@ / { chassis-type = "handset"; aliases { + mmc0 = &sdhc_1; /* eMMC */ + mmc1 = &sdhc_2; /* SD card */ serial0 = &blsp_uart2; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts index facb44892dd5..9560ba632c6f 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts @@ -14,6 +14,8 @@ / { chassis-type = "handset"; aliases { + mmc0 = &sdhc_1; /* eMMC */ + mmc1 = &sdhc_2; /* SD card */ serial0 = &blsp_uart2; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts index 707288b7eca8..f23cfb2bf793 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts @@ -13,6 +13,8 @@ / { chassis-type = "handset"; aliases { + mmc0 = &sdhc_1; /* eMMC */ + mmc1 = &sdhc_2; /* SD card */ serial0 = &blsp_uart2; }; 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 b1af9c5d07b2..895036fb6eb8 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi @@ -8,6 +8,8 @@ / { aliases { + mmc0 = &sdhc_1; /* eMMC */ + mmc1 = &sdhc_2; /* SD card */ serial0 = &blsp_uart2; }; 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 82d94d62fbe6..94cfb3200496 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi @@ -9,6 +9,8 @@ / { aliases { + mmc0 = &sdhc_1; /* eMMC */ + mmc1 = &sdhc_2; /* SD card */ serial0 = &blsp_uart2; }; 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 78935205ea9d..f2a5800f1605 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi @@ -7,6 +7,8 @@ / { aliases { + mmc0 = &sdhc_1; /* eMMC */ + mmc1 = &sdhc_2; /* SD card */ serial0 = &blsp_uart2; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts index bd1e1e1153c0..3637e7d80d0a 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts @@ -28,6 +28,8 @@ / { chassis-type = "handset"; aliases { + mmc0 = &sdhc_1; /* eMMC */ + mmc1 = &sdhc_2; /* SD card */ serial0 = &blsp_uart2; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi b/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi index ac39ac6a21c1..dafa5bd82328 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi @@ -9,6 +9,7 @@ / { chassis-type = "embedded"; aliases { + mmc0 = &sdhc_1; /* eMMC */ serial0 = &blsp_uart2; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts index 930318a443a8..733917531218 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts @@ -16,6 +16,8 @@ / { chassis-type = "handset"; aliases { + mmc0 = &sdhc_1; /* eMMC */ + mmc1 = &sdhc_2; /* SD card */ serial0 = &blsp_uart2; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi index 0028a405e3ec..9494b6512d87 100644 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi @@ -18,11 +18,6 @@ / { #address-cells = <2>; #size-cells = <2>; - aliases { - mmc0 = &sdhc_1; /* SDC1 eMMC slot */ - mmc1 = &sdhc_2; /* SDC2 SD card slot */ - }; - chosen { }; memory@80000000 {