From nobody Tue Sep 16 01:28:03 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 59B60C678DF for ; Mon, 9 Jan 2023 11:02:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237146AbjAILCU (ORCPT ); Mon, 9 Jan 2023 06:02:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34430 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236971AbjAILBy (ORCPT ); Mon, 9 Jan 2023 06:01:54 -0500 Received: from box.trvn.ru (box.trvn.ru [194.87.146.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 731D3120B4; Mon, 9 Jan 2023 03:01:49 -0800 (PST) Received: from authenticated-user (box.trvn.ru [194.87.146.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by box.trvn.ru (Postfix) with ESMTPSA id 79FDB41D3A; Mon, 9 Jan 2023 16:01:38 +0500 (+05) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=trvn.ru; s=mail; t=1673262099; bh=KVOv4yYI8r793HEFlWl/BLlTMualck/DOfQGVdsotVg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tSDijDX0/I+R/PU+TkFoYp+9d2ZpBX6pwaKDkgb47nxz2R0MTEpdBP3pIMjuIqrX5 chT4m0F7PobAU54KpOI9Ua3lR0ftefiwug2Y8s+oTiZq2tZ4pjDaVlInE5vctS37xg KqtefFR8HKad4OjvsXy/y54r1orJKKmJpm0et+eLKgIAyQ4hbZt2u0on2r6Z1rW5mx 4QRRRE0Tvn+x3alo/z0emv5DI0rDumX+y+qDOwhGAd3PwRZb2lWeHZh6HxLCHe3PYd bVU6Q80+2Dl0xsuwc+KJZor1uyY/x1SDGBBVPFw2jBxpVa2ciFKIpjP0DQxfvtp80O ERgUHmZbRLSZQ== From: Nikita Travkin To: Andy Gross , Bjorn Andersson Cc: Rob Herring , Krzysztof Kozlowski , Konrad Dybcio , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, Nikita Travkin Subject: [PATCH 2/4] arm64: dts: qcom: msm/apq8x16-*: Reorder the pinctrl properties. Date: Mon, 9 Jan 2023 16:01:05 +0500 Message-Id: <20230109110107.3016323-3-nikita@trvn.ru> In-Reply-To: <20230109110107.3016323-1-nikita@trvn.ru> References: <20230109110107.3016323-1-nikita@trvn.ru> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" With other property lists that have -names properties, the -names is put last. However pinctrl-names in most msm8916 dts files was first instead. Reorder the pinctrl properties to be in line with other lists. Signed-off-by: Nikita Travkin Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 18 +++++------ .../boot/dts/qcom/msm8916-acer-a1-724.dts | 12 +++---- .../boot/dts/qcom/msm8916-alcatel-idol347.dts | 22 ++++++------- .../arm64/boot/dts/qcom/msm8916-asus-z00l.dts | 16 +++++----- .../arm64/boot/dts/qcom/msm8916-huawei-g7.dts | 24 +++++++------- .../boot/dts/qcom/msm8916-longcheer-l8150.dts | 20 ++++++------ .../boot/dts/qcom/msm8916-longcheer-l8910.dts | 12 +++---- .../qcom/msm8916-samsung-a2015-common.dtsi | 32 +++++++++---------- .../boot/dts/qcom/msm8916-samsung-a3u-eur.dts | 8 ++--- .../boot/dts/qcom/msm8916-samsung-a5u-eur.dts | 4 +-- .../qcom/msm8916-samsung-e2015-common.dtsi | 4 +-- .../dts/qcom/msm8916-samsung-grandmax.dts | 2 +- .../boot/dts/qcom/msm8916-samsung-j5.dts | 6 ++-- .../dts/qcom/msm8916-samsung-serranove.dts | 32 +++++++++---------- .../dts/qcom/msm8916-wingtech-wt88047.dts | 14 ++++---- arch/arm64/boot/dts/qcom/msm8916.dtsi | 32 +++++++++---------- 16 files changed, 129 insertions(+), 129 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts= /qcom/apq8016-sbc.dts index 3586f373d511..a64a8d998f58 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts @@ -76,8 +76,8 @@ usb2513 { usb_id: usb-id { compatible =3D "linux,extcon-usb-gpio"; id-gpio =3D <&msmgpio 121 GPIO_ACTIVE_HIGH>; - pinctrl-names =3D "default"; pinctrl-0 =3D <&usb_id_default>; + pinctrl-names =3D "default"; }; =20 hdmi-out { @@ -95,8 +95,8 @@ gpio-keys { compatible =3D "gpio-keys"; autorepeat; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&msm_key_volp_n_default>; + pinctrl-names =3D "default"; =20 button { label =3D "Volume Up"; @@ -106,10 +106,10 @@ button { }; =20 leds { - pinctrl-names =3D "default"; pinctrl-0 =3D <&msmgpio_leds>, <&pm8916_gpios_leds>, <&pm8916_mpps_leds>; + pinctrl-names =3D "default"; =20 compatible =3D "gpio-leds"; =20 @@ -201,9 +201,9 @@ adv_bridge: bridge@39 { v1p2-supply =3D <&pm8916_l6>; v3p3-supply =3D <&pm8916_l17>; =20 - pinctrl-names =3D "default","sleep"; pinctrl-0 =3D <&adv7533_int_active &adv7533_switch_active>; pinctrl-1 =3D <&adv7533_int_suspend &adv7533_switch_suspend>; + pinctrl-names =3D "default","sleep"; #sound-dai-cells =3D <1>; =20 status =3D "okay"; @@ -283,8 +283,8 @@ camera_rear@3b { =20 enable-gpios =3D <&msmgpio 34 GPIO_ACTIVE_HIGH>; reset-gpios =3D <&msmgpio 35 GPIO_ACTIVE_LOW>; - pinctrl-names =3D "default"; pinctrl-0 =3D <&camera_rear_default>; + pinctrl-names =3D "default"; =20 clocks =3D <&gcc GCC_CAMSS_MCLK0_CLK>; clock-names =3D "xclk"; @@ -337,17 +337,17 @@ &pronto { }; =20 &sdhc_1 { - pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>; pinctrl-1 =3D <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>; + pinctrl-names =3D "default", "sleep"; =20 status =3D "okay"; }; =20 &sdhc_2 { - pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>; pinctrl-1 =3D <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>; + pinctrl-names =3D "default", "sleep"; =20 cd-gpios =3D <&msmgpio 38 GPIO_ACTIVE_LOW>; =20 @@ -399,9 +399,9 @@ codec { &usb { extcon =3D <&usb_id>, <&usb_id>; =20 - pinctrl-names =3D "default", "device"; pinctrl-0 =3D <&usb_sw_sel_pm &usb_hub_reset_pm>; pinctrl-1 =3D <&usb_sw_sel_pm_device &usb_hub_reset_pm_device>; + pinctrl-names =3D "default", "device"; =20 status =3D "okay"; }; @@ -833,8 +833,8 @@ &pm8916_mpps { "BT_LED_CTRL", "GPIO-F"; /* LS_EXP_GPIO_F, LSEC pin 28 */ =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&ls_exp_gpio_f>; + pinctrl-names =3D "default"; =20 ls_exp_gpio_f: pm8916-mpp4-state { pins =3D "mpp4"; 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 ed3fa7b3575b..04bbdc76889c 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts @@ -32,8 +32,8 @@ chosen { gpio-keys { compatible =3D "gpio-keys"; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&gpio_keys_default>; + pinctrl-names =3D "default"; =20 label =3D "GPIO Buttons"; =20 @@ -47,8 +47,8 @@ button-volume-up { usb_id: usb-id { compatible =3D "linux,extcon-usb-gpio"; id-gpio =3D <&msmgpio 110 GPIO_ACTIVE_HIGH>; - pinctrl-names =3D "default"; pinctrl-0 =3D <&usb_id_default>; + pinctrl-names =3D "default"; }; }; =20 @@ -64,8 +64,8 @@ accelerometer@10 { vdd-supply =3D <&pm8916_l17>; vddio-supply =3D <&pm8916_l6>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&accel_int_default>; + pinctrl-names =3D "default"; =20 mount-matrix =3D "0", "-1", "0", "-1", "0", "0", @@ -100,8 +100,8 @@ touchscreen@38 { touchscreen-size-x =3D <720>; touchscreen-size-y =3D <1280>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&touchscreen_default>; + pinctrl-names =3D "default"; }; }; =20 @@ -123,17 +123,17 @@ &pronto { }; =20 &sdhc_1 { - pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>; pinctrl-1 =3D <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>; + pinctrl-names =3D "default", "sleep"; =20 status =3D "okay"; }; =20 &sdhc_2 { - pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on>; pinctrl-1 =3D <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>; + pinctrl-names =3D "default", "sleep"; =20 cd-gpios =3D <&msmgpio 38 GPIO_ACTIVE_HIGH>; =20 diff --git a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts b/arch/ar= m64/boot/dts/qcom/msm8916-alcatel-idol347.dts index 20301eaa3b95..a5690354a2dd 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts @@ -23,8 +23,8 @@ chosen { gpio-keys { compatible =3D "gpio-keys"; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&gpio_keys_default>; + pinctrl-names =3D "default"; =20 label =3D "GPIO Buttons"; =20 @@ -38,8 +38,8 @@ button-volume-up { gpio-leds { compatible =3D "gpio-leds"; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&gpio_leds_default>; + pinctrl-names =3D "default"; =20 led-0 { gpios =3D <&msmgpio 32 GPIO_ACTIVE_HIGH>; @@ -51,8 +51,8 @@ led-0 { usb_id: usb-id { compatible =3D "linux,extcon-usb-gpio"; id-gpio =3D <&msmgpio 69 GPIO_ACTIVE_HIGH>; - pinctrl-names =3D "default"; pinctrl-0 =3D <&usb_id_default>; + pinctrl-names =3D "default"; }; }; =20 @@ -69,8 +69,8 @@ touchscreen@26 { interrupt-parent =3D <&msmgpio>; interrupts =3D <13 IRQ_TYPE_EDGE_FALLING>; reset-gpios =3D <&msmgpio 100 GPIO_ACTIVE_LOW>; - pinctrl-names =3D "default"; pinctrl-0 =3D <&ts_int_reset_default>; + pinctrl-names =3D "default"; vdd-supply =3D <&pm8916_l17>; vddio-supply =3D <&pm8916_l5>; touchscreen-size-x =3D <2048>; @@ -87,8 +87,8 @@ magnetometer@c { vdd-supply =3D <&pm8916_l17>; vid-supply =3D <&pm8916_l6>; reset-gpios =3D <&msmgpio 8 GPIO_ACTIVE_LOW>; - pinctrl-names =3D "default"; pinctrl-0 =3D <&mag_reset_default>; + pinctrl-names =3D "default"; mount-matrix =3D "0", "1", "0", "-1", "0", "0", "0", "0", "1"; @@ -101,8 +101,8 @@ accelerometer@f { vddio-supply =3D <&pm8916_l6>; interrupt-parent =3D <&msmgpio>; interrupts =3D <31 IRQ_TYPE_EDGE_RISING>; - pinctrl-names =3D "default"; pinctrl-0 =3D <&accel_int_default>; + pinctrl-names =3D "default"; mount-matrix =3D "-1", "0", "0", "0", "1", "0", "0", "0", "-1"; @@ -113,8 +113,8 @@ proximity@48 { reg =3D <0x48>; interrupt-parent =3D <&msmgpio>; interrupts =3D <12 IRQ_TYPE_EDGE_FALLING>; - pinctrl-names =3D "default"; pinctrl-0 =3D <&proximity_int_default>; + pinctrl-names =3D "default"; }; =20 gyroscope@68 { @@ -125,8 +125,8 @@ gyroscope@68 { interrupt-parent =3D <&msmgpio>; interrupts =3D <97 IRQ_TYPE_EDGE_RISING>, <98 IRQ_TYPE_EDGE_RISING>; - pinctrl-names =3D "default"; pinctrl-0 =3D <&gyro_int_default>; + pinctrl-names =3D "default"; }; }; =20 @@ -137,8 +137,8 @@ led-controller@68 { compatible =3D "si-en,sn3190"; reg =3D <0x68>; shutdown-gpios =3D <&msmgpio 89 GPIO_ACTIVE_HIGH>; - pinctrl-names =3D "default"; pinctrl-0 =3D <&led_enable_default &led_shutdown_default>; + pinctrl-names =3D "default"; #address-cells =3D <1>; #size-cells =3D <0>; =20 @@ -165,17 +165,17 @@ &pronto { }; =20 &sdhc_1 { - pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>; pinctrl-1 =3D <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>; + pinctrl-names =3D "default", "sleep"; =20 status =3D "okay"; }; =20 &sdhc_2 { - pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>; pinctrl-1 =3D <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>; + pinctrl-names =3D "default", "sleep"; =20 cd-gpios =3D <&msmgpio 38 GPIO_ACTIVE_LOW>; =20 diff --git a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts b/arch/arm64/bo= ot/dts/qcom/msm8916-asus-z00l.dts index a0f868854d53..9b6265d428ce 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts @@ -23,8 +23,8 @@ chosen { gpio-keys { compatible =3D "gpio-keys"; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&gpio_keys_default>; + pinctrl-names =3D "default"; =20 label =3D "GPIO Buttons"; =20 @@ -54,15 +54,15 @@ reg_sd_vmmc: regulator-sdcard-vmmc { =20 startup-delay-us =3D <200>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&sd_vmmc_en_default>; + pinctrl-names =3D "default"; }; =20 usb_id: usb-id { compatible =3D "linux,extcon-usb-gpio"; id-gpios =3D <&msmgpio 110 GPIO_ACTIVE_HIGH>; - pinctrl-names =3D "default"; pinctrl-0 =3D <&usb_id_default>; + pinctrl-names =3D "default"; }; }; =20 @@ -78,8 +78,8 @@ magnetometer@c { =20 reset-gpios =3D <&msmgpio 112 GPIO_ACTIVE_LOW>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&mag_reset_default>; + pinctrl-names =3D "default"; }; =20 imu@68 { @@ -92,8 +92,8 @@ imu@68 { vdd-supply =3D <&pm8916_l17>; vddio-supply =3D <&pm8916_l6>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&imu_default>; + pinctrl-names =3D "default"; =20 mount-matrix =3D "1", "0", "0", "0", "-1", "0", @@ -119,8 +119,8 @@ touchscreen@38 { touchscreen-size-x =3D <720>; touchscreen-size-y =3D <1280>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&touchscreen_default>; + pinctrl-names =3D "default"; }; }; =20 @@ -133,9 +133,9 @@ &pronto { }; =20 &sdhc_1 { - pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>; pinctrl-1 =3D <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>; + pinctrl-names =3D "default", "sleep"; =20 status =3D "okay"; }; @@ -143,9 +143,9 @@ &sdhc_1 { &sdhc_2 { vmmc-supply =3D <®_sd_vmmc>; =20 - pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>; pinctrl-1 =3D <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>; + pinctrl-names =3D "default", "sleep"; cd-gpios =3D <&msmgpio 38 GPIO_ACTIVE_LOW>; =20 status =3D "okay"; diff --git a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts b/arch/arm64/bo= ot/dts/qcom/msm8916-huawei-g7.dts index 2d266fd417f8..ac8b80de1a31 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts @@ -36,8 +36,8 @@ chosen { gpio-keys { compatible =3D "gpio-keys"; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&gpio_keys_default>; + pinctrl-names =3D "default"; =20 label =3D "GPIO Buttons"; =20 @@ -51,8 +51,8 @@ button-volume-up { leds { compatible =3D "gpio-leds"; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&gpio_leds_default>; + pinctrl-names =3D "default"; =20 led-0 { gpios =3D <&msmgpio 8 GPIO_ACTIVE_HIGH>; @@ -79,8 +79,8 @@ led-2 { usb_id: usb-id { compatible =3D "linux,extcon-usb-gpio"; id-gpio =3D <&msmgpio 117 GPIO_ACTIVE_HIGH>; - pinctrl-names =3D "default"; pinctrl-0 =3D <&usb_id_default>; + pinctrl-names =3D "default"; }; }; =20 @@ -96,8 +96,8 @@ magnetometer@c { =20 reset-gpios =3D <&msmgpio 36 GPIO_ACTIVE_LOW>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&mag_reset_default>; + pinctrl-names =3D "default"; }; =20 accelerometer@1e { @@ -110,8 +110,8 @@ accelerometer@1e { vdd-supply =3D <&pm8916_l17>; vddio-supply =3D <&pm8916_l6>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&accel_irq_default>; + pinctrl-names =3D "default"; =20 mount-matrix =3D "-1", "0", "0", "0", "1", "0", @@ -131,16 +131,16 @@ proximity@39 { led-max-microamp =3D <100000>; amstaos,proximity-diodes =3D <1>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&prox_irq_default>; + pinctrl-names =3D "default"; }; =20 regulator@3e { compatible =3D "ti,tps65132"; reg =3D <0x3e>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <®_lcd_en_default>; + pinctrl-names =3D "default"; =20 reg_lcd_pos: outp { regulator-name =3D "outp"; @@ -175,8 +175,8 @@ rmi4@70 { vdd-supply =3D <&pm8916_l17>; vio-supply =3D <&pm8916_l16>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&ts_irq_default>; + pinctrl-names =3D "default"; =20 syna,startup-delay-ms =3D <100>; =20 @@ -205,8 +205,8 @@ nfc@28 { enable-gpios =3D <&msmgpio 20 GPIO_ACTIVE_HIGH>; firmware-gpios =3D <&msmgpio 2 GPIO_ACTIVE_HIGH>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&nfc_default>; + pinctrl-names =3D "default"; }; }; =20 @@ -232,17 +232,17 @@ &pronto { }; =20 &sdhc_1 { - pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>; pinctrl-1 =3D <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>; + pinctrl-names =3D "default", "sleep"; =20 status =3D "okay"; }; =20 &sdhc_2 { - pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdhc2_cd_default>; pinctrl-1 =3D <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdhc2_cd_defau= lt>; + pinctrl-names =3D "default", "sleep"; =20 /* * The Huawei device tree sets cd-gpios =3D <&msmgpio 38 GPIO_ACTIVE_HIGH= >. @@ -269,9 +269,9 @@ &sound { "AMIC2", "MIC BIAS External2", "AMIC3", "MIC BIAS External1"; =20 - pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&cdc_pdm_lines_act>; pinctrl-1 =3D <&cdc_pdm_lines_sus>; + pinctrl-names =3D "default", "sleep"; =20 status =3D "okay"; =20 diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts b/arch/ar= m64/boot/dts/qcom/msm8916-longcheer-l8150.dts index f63f0fb797b4..8fbbfc98900d 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts @@ -34,8 +34,8 @@ wcnss_mem: wcnss@8b600000 { gpio-keys { compatible =3D "gpio-keys"; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&gpio_keys_default>; + pinctrl-names =3D "default"; =20 label =3D "GPIO Buttons"; =20 @@ -56,8 +56,8 @@ reg_ctp: regulator-ctp { gpio =3D <&msmgpio 17 GPIO_ACTIVE_HIGH>; enable-active-high; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&ctp_pwr_en_default>; + pinctrl-names =3D "default"; }; =20 flash-led-controller { @@ -65,8 +65,8 @@ flash-led-controller { flash-gpios =3D <&msmgpio 31 GPIO_ACTIVE_HIGH>; enable-gpios =3D <&msmgpio 32 GPIO_ACTIVE_HIGH>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&camera_flash_default>; + pinctrl-names =3D "default"; =20 flash_led: led { function =3D LED_FUNCTION_FLASH; @@ -126,8 +126,8 @@ accelerometer@10 { * interrupts =3D <116 IRQ_TYPE_EDGE_RISING>; */ =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&accel_int_default>; + pinctrl-names =3D "default"; =20 vdd-supply =3D <&pm8916_l17>; vddio-supply =3D <&pm8916_l6>; @@ -144,8 +144,8 @@ magnetometer@12 { interrupt-parent =3D <&msmgpio>; interrupts =3D <113 IRQ_TYPE_EDGE_RISING>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&magn_int_default>; + pinctrl-names =3D "default"; =20 vdd-supply =3D <&pm8916_l17>; vddio-supply =3D <&pm8916_l6>; @@ -159,8 +159,8 @@ light-sensor@23 { interrupt-parent =3D <&msmgpio>; interrupts =3D <115 IRQ_TYPE_EDGE_FALLING>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&light_int_default>; + pinctrl-names =3D "default"; =20 vdd-supply =3D <&pm8916_l17>; vio-supply =3D <&pm8916_l6>; @@ -174,8 +174,8 @@ gyroscope@68 { interrupts =3D <23 IRQ_TYPE_EDGE_RISING>, <22 IRQ_TYPE_EDGE_RISING>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&gyro_int_default>; + pinctrl-names =3D "default"; =20 vdd-supply =3D <&pm8916_l17>; vddio-supply =3D <&pm8916_l6>; @@ -197,8 +197,8 @@ rmi4@20 { vdd-supply =3D <®_ctp>; vio-supply =3D <&pm8916_l6>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&tp_int_default>; + pinctrl-names =3D "default"; =20 syna,startup-delay-ms =3D <10>; =20 @@ -236,17 +236,17 @@ &pronto { }; =20 &sdhc_1 { - pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>; pinctrl-1 =3D <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>; + pinctrl-names =3D "default", "sleep"; =20 status =3D "okay"; }; =20 &sdhc_2 { - pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on>; pinctrl-1 =3D <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>; + pinctrl-names =3D "default", "sleep"; =20 non-removable; =20 diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts b/arch/ar= m64/boot/dts/qcom/msm8916-longcheer-l8910.dts index 4d627d06f87b..b776a2b4a317 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts @@ -23,8 +23,8 @@ chosen { gpio-keys { compatible =3D "gpio-keys"; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&gpio_keys_default>; + pinctrl-names =3D "default"; =20 label =3D "GPIO Buttons"; =20 @@ -44,16 +44,16 @@ led-0 { default-state =3D "off"; function =3D LED_FUNCTION_KBD_BACKLIGHT; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&button_backlight_default>; + pinctrl-names =3D "default"; }; }; =20 usb_id: usb-id { compatible =3D "linux,extcon-usb-gpio"; id-gpio =3D <&msmgpio 110 GPIO_ACTIVE_HIGH>; - pinctrl-names =3D "default"; pinctrl-0 =3D <&usb_id_default>; + pinctrl-names =3D "default"; }; }; =20 @@ -69,8 +69,8 @@ magnetometer@d { =20 reset-gpios =3D <&msmgpio 111 GPIO_ACTIVE_LOW>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&mag_reset_default>; + pinctrl-names =3D "default"; }; =20 imu@68 { @@ -104,17 +104,17 @@ &pronto { }; =20 &sdhc_1 { - pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>; pinctrl-1 =3D <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>; + pinctrl-names =3D "default", "sleep"; =20 status =3D "okay"; }; =20 &sdhc_2 { - pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>; pinctrl-1 =3D <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>; + pinctrl-names =3D "default", "sleep"; =20 cd-gpios =3D <&msmgpio 38 GPIO_ACTIVE_LOW>; =20 diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi b/a= rch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi index 13c586079e50..dd0e2e586ac1 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi @@ -29,16 +29,16 @@ clk_pwm: pwm { =20 clocks =3D <&gcc GCC_GP2_CLK>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&motor_pwm_default>; + pinctrl-names =3D "default"; status =3D "disabled"; }; =20 gpio-keys { compatible =3D "gpio-keys"; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&gpio_keys_default>; + pinctrl-names =3D "default"; =20 label =3D "GPIO Buttons"; =20 @@ -58,8 +58,8 @@ button-home { gpio-hall-sensor { compatible =3D "gpio-keys"; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&gpio_hall_sensor_default>; + pinctrl-names =3D "default"; =20 label =3D "GPIO Hall Effect Sensor"; =20 @@ -86,8 +86,8 @@ reg_motor_vdd: regulator-motor-vdd { gpio =3D <&msmgpio 76 GPIO_ACTIVE_HIGH>; enable-active-high; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&motor_en_default>; + pinctrl-names =3D "default"; }; =20 reg_vdd_tsp_a: regulator-vdd-tsp-a { @@ -99,8 +99,8 @@ reg_vdd_tsp_a: regulator-vdd-tsp-a { gpio =3D <&msmgpio 73 GPIO_ACTIVE_HIGH>; enable-active-high; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&tsp_en_default>; + pinctrl-names =3D "default"; }; =20 i2c-muic { @@ -108,8 +108,8 @@ i2c-muic { sda-gpios =3D <&msmgpio 105 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; scl-gpios =3D <&msmgpio 106 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&muic_i2c_default>; + pinctrl-names =3D "default"; =20 #address-cells =3D <1>; #size-cells =3D <0>; @@ -121,8 +121,8 @@ muic: extcon@25 { interrupt-parent =3D <&msmgpio>; interrupts =3D <12 IRQ_TYPE_EDGE_FALLING>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&muic_int_default>; + pinctrl-names =3D "default"; }; }; =20 @@ -131,8 +131,8 @@ i2c-tkey { sda-gpios =3D <&msmgpio 16 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; scl-gpios =3D <&msmgpio 17 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&tkey_i2c_default>; + pinctrl-names =3D "default"; =20 #address-cells =3D <1>; #size-cells =3D <0>; @@ -150,8 +150,8 @@ touchkey: touchkey@20 { =20 linux,keycodes =3D ; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&tkey_default>; + pinctrl-names =3D "default"; }; }; =20 @@ -160,8 +160,8 @@ i2c-nfc { sda-gpios =3D <&msmgpio 0 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; scl-gpios =3D <&msmgpio 1 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&nfc_i2c_default>; + pinctrl-names =3D "default"; =20 #address-cells =3D <1>; #size-cells =3D <0>; @@ -178,8 +178,8 @@ nfc@27 { =20 clocks =3D <&rpmcc RPM_SMD_BB_CLK2_PIN>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&nfc_default &nfc_clk_req>; + pinctrl-names =3D "default"; }; }; =20 @@ -206,8 +206,8 @@ accelerometer: accelerometer@10 { vdd-supply =3D <&pm8916_l17>; vddio-supply =3D <&pm8916_l5>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&accel_int_default>; + pinctrl-names =3D "default"; }; =20 magnetometer@12 { @@ -228,8 +228,8 @@ battery@35 { interrupt-parent =3D <&msmgpio>; interrupts =3D <121 IRQ_TYPE_EDGE_BOTH>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&fg_alert_default>; + pinctrl-names =3D "default"; }; }; =20 @@ -238,9 +238,9 @@ &blsp1_uart2 { }; =20 &dsi0 { - pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&mdss_default>; pinctrl-1 =3D <&mdss_sleep>; + pinctrl-names =3D "default", "sleep"; }; =20 &mdss { @@ -257,17 +257,17 @@ &pronto { }; =20 &sdhc_1 { - pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>; pinctrl-1 =3D <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>; + pinctrl-names =3D "default", "sleep"; =20 status =3D "okay"; }; =20 &sdhc_2 { - pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>; pinctrl-1 =3D <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>; + pinctrl-names =3D "default", "sleep"; =20 cd-gpios =3D <&msmgpio 38 GPIO_ACTIVE_LOW>; =20 diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts b/arch/ar= m64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts index c691cca2eb45..2eb06cf626dc 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts @@ -18,8 +18,8 @@ reg_panel_vdd3: regulator-panel-vdd3 { gpio =3D <&msmgpio 9 GPIO_ACTIVE_HIGH>; enable-active-high; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&panel_vdd3_default>; + pinctrl-names =3D "default"; }; =20 reg_touch_key: regulator-touch-key { @@ -31,8 +31,8 @@ reg_touch_key: regulator-touch-key { gpio =3D <&msmgpio 86 GPIO_ACTIVE_HIGH>; enable-active-high; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&tkey_en_default>; + pinctrl-names =3D "default"; }; =20 reg_key_led: regulator-key-led { @@ -44,8 +44,8 @@ reg_key_led: regulator-key-led { gpio =3D <&msmgpio 60 GPIO_ACTIVE_HIGH>; enable-active-high; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&tkey_led_en_default>; + pinctrl-names =3D "default"; }; }; =20 @@ -76,8 +76,8 @@ touchscreen@20 { vcca-supply =3D <®_vdd_tsp_a>; vdd-supply =3D <&pm8916_l6>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&ts_int_default>; + pinctrl-names =3D "default"; }; }; =20 diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts b/arch/ar= m64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts index 3dd819458785..179c872091d8 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts @@ -18,8 +18,8 @@ reg_touch_key: regulator-touch-key { gpio =3D <&msmgpio 97 GPIO_ACTIVE_HIGH>; enable-active-high; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&tkey_en_default>; + pinctrl-names =3D "default"; }; }; =20 @@ -45,8 +45,8 @@ touchscreen@48 { avdd-supply =3D <®_vdd_tsp_a>; vdd-supply =3D <&pm8916_l6>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&ts_int_default>; + pinctrl-names =3D "default"; }; }; =20 diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi b/a= rch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi index c95f0b4bc61f..6c04ca97e98a 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi @@ -21,8 +21,8 @@ muic: extcon@14 { interrupt-parent =3D <&msmgpio>; interrupts =3D <12 IRQ_TYPE_EDGE_FALLING>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&muic_int_default>; + pinctrl-names =3D "default"; }; }; =20 @@ -35,8 +35,8 @@ reg_touch_key: regulator-touch-key { gpio =3D <&msmgpio 97 GPIO_ACTIVE_HIGH>; enable-active-high; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&tkey_en_default>; + pinctrl-names =3D "default"; }; }; =20 diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-grandmax.dts b/arch/a= rm64/boot/dts/qcom/msm8916-samsung-grandmax.dts index 4cbd68b89448..f5ca2d30881f 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-grandmax.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-grandmax.dts @@ -35,8 +35,8 @@ led-keyled { =20 gpios =3D <&msmgpio 60 GPIO_ACTIVE_HIGH>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&gpio_leds_default>; + pinctrl-names =3D "default"; }; }; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts b/arch/arm64/b= oot/dts/qcom/msm8916-samsung-j5.dts index 8eb68bb6607c..882ed9c65d88 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts @@ -29,8 +29,8 @@ tz-apps@85500000 { gpio-keys { compatible =3D "gpio-keys"; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&gpio_keys_default>; + pinctrl-names =3D "default"; =20 label =3D "GPIO Buttons"; =20 @@ -67,17 +67,17 @@ &pronto { }; =20 &sdhc_1 { - pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>; pinctrl-1 =3D <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>; + pinctrl-names =3D "default", "sleep"; =20 status =3D "okay"; }; =20 &sdhc_2 { - pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>; pinctrl-1 =3D <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>; + pinctrl-names =3D "default", "sleep"; =20 cd-gpios =3D <&msmgpio 38 GPIO_ACTIVE_LOW>; =20 diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts b/arch/= arm64/boot/dts/qcom/msm8916-samsung-serranove.dts index 34bee5211413..249519635ba6 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts @@ -46,8 +46,8 @@ tz-apps@85500000 { gpio-keys { compatible =3D "gpio-keys"; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&gpio_keys_default>; + pinctrl-names =3D "default"; =20 label =3D "GPIO Buttons"; =20 @@ -67,8 +67,8 @@ button-home { gpio-hall-sensor { compatible =3D "gpio-keys"; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&gpio_hall_sensor_default>; + pinctrl-names =3D "default"; =20 label =3D "GPIO Hall Effect Sensor"; =20 @@ -90,8 +90,8 @@ reg_vdd_tsp: regulator-vdd-tsp { gpio =3D <&msmgpio 73 GPIO_ACTIVE_HIGH>; enable-active-high; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&tsp_en_default>; + pinctrl-names =3D "default"; }; =20 reg_touch_key: regulator-touch-key { @@ -103,8 +103,8 @@ reg_touch_key: regulator-touch-key { gpio =3D <&msmgpio 86 GPIO_ACTIVE_HIGH>; enable-active-high; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&tkey_en_default>; + pinctrl-names =3D "default"; }; =20 reg_key_led: regulator-key-led { @@ -116,8 +116,8 @@ reg_key_led: regulator-key-led { gpio =3D <&msmgpio 60 GPIO_ACTIVE_HIGH>; enable-active-high; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&tkey_led_en_default>; + pinctrl-names =3D "default"; }; =20 i2c-muic { @@ -125,8 +125,8 @@ i2c-muic { sda-gpios =3D <&msmgpio 105 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; scl-gpios =3D <&msmgpio 106 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&muic_i2c_default>; + pinctrl-names =3D "default"; =20 #address-cells =3D <1>; #size-cells =3D <0>; @@ -138,8 +138,8 @@ muic: extcon@14 { interrupt-parent =3D <&msmgpio>; interrupts =3D <12 IRQ_TYPE_EDGE_FALLING>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&muic_irq_default>; + pinctrl-names =3D "default"; }; }; =20 @@ -148,8 +148,8 @@ i2c-tkey { sda-gpios =3D <&msmgpio 16 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; scl-gpios =3D <&msmgpio 17 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&tkey_i2c_default>; + pinctrl-names =3D "default"; =20 #address-cells =3D <1>; #size-cells =3D <0>; @@ -167,8 +167,8 @@ touchkey@20 { =20 linux,keycodes =3D ; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&tkey_default>; + pinctrl-names =3D "default"; }; }; =20 @@ -177,8 +177,8 @@ i2c-nfc { sda-gpios =3D <&msmgpio 0 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; scl-gpios =3D <&msmgpio 1 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&nfc_i2c_default>; + pinctrl-names =3D "default"; =20 #address-cells =3D <1>; #size-cells =3D <0>; @@ -193,8 +193,8 @@ nfc@2b { enable-gpios =3D <&msmgpio 20 GPIO_ACTIVE_HIGH>; firmware-gpios =3D <&msmgpio 49 GPIO_ACTIVE_HIGH>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&nfc_default>; + pinctrl-names =3D "default"; }; }; }; @@ -209,8 +209,8 @@ imu@6b { interrupt-parent =3D <&msmgpio>; interrupts =3D <115 IRQ_TYPE_EDGE_RISING>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&imu_irq_default>; + pinctrl-names =3D "default"; }; =20 magnetometer@2e { @@ -233,8 +233,8 @@ battery@35 { interrupt-parent =3D <&msmgpio>; interrupts =3D <121 IRQ_TYPE_EDGE_FALLING>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&fg_alert_default>; + pinctrl-names =3D "default"; }; }; =20 @@ -254,8 +254,8 @@ touchscreen@20 { vdd-supply =3D <®_vdd_tsp>; vddo-supply =3D <&pm8916_l6>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&tsp_irq_default>; + pinctrl-names =3D "default"; }; }; =20 @@ -281,17 +281,17 @@ iris { }; =20 &sdhc_1 { - pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>; pinctrl-1 =3D <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>; + pinctrl-names =3D "default", "sleep"; =20 status =3D "okay"; }; =20 &sdhc_2 { - pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on>; pinctrl-1 =3D <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>; + pinctrl-names =3D "default", "sleep"; =20 non-removable; =20 diff --git a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts b/arch/a= rm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts index 24a5c3486beb..e542b48a4fad 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts @@ -28,8 +28,8 @@ flash-led-controller { enable-gpios =3D <&msmgpio 31 GPIO_ACTIVE_HIGH>; flash-gpios =3D <&msmgpio 32 GPIO_ACTIVE_HIGH>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&camera_flash_default>; + pinctrl-names =3D "default"; =20 flash_led: led { function =3D LED_FUNCTION_FLASH; @@ -40,8 +40,8 @@ flash_led: led { gpio-keys { compatible =3D "gpio-keys"; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&gpio_keys_default>; + pinctrl-names =3D "default"; =20 label =3D "GPIO Buttons"; =20 @@ -55,8 +55,8 @@ button-volume-up { usb_id: usb-id { compatible =3D "linux,extcon-usb-gpio"; id-gpio =3D <&msmgpio 110 GPIO_ACTIVE_HIGH>; - pinctrl-names =3D "default"; pinctrl-0 =3D <&usb_id_default>; + pinctrl-names =3D "default"; }; }; =20 @@ -73,8 +73,8 @@ imu@68 { vdd-supply =3D <&pm8916_l17>; vddio-supply =3D <&pm8916_l6>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&imu_default>; + pinctrl-names =3D "default"; =20 mount-matrix =3D "1", "0", "0", "0", "-1", "0", @@ -101,8 +101,8 @@ touchscreen@38 { touchscreen-size-x =3D <720>; touchscreen-size-y =3D <1280>; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&touchscreen_default>; + pinctrl-names =3D "default"; }; }; =20 @@ -158,17 +158,17 @@ &pronto { }; =20 &sdhc_1 { - pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>; pinctrl-1 =3D <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>; + pinctrl-names =3D "default", "sleep"; =20 status =3D "okay"; }; =20 &sdhc_2 { - pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on>; pinctrl-1 =3D <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>; + pinctrl-names =3D "default", "sleep"; =20 non-removable; =20 diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qc= om/msm8916.dtsi index ffb4ce8935b3..a541631e4607 100644 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi @@ -1182,8 +1182,8 @@ cci: cci@1b0c000 { assigned-clocks =3D <&gcc GCC_CAMSS_CCI_AHB_CLK>, <&gcc GCC_CAMSS_CCI_CLK>; assigned-clock-rates =3D <80000000>, <19200000>; - pinctrl-names =3D "default"; pinctrl-0 =3D <&cci0_default>; + pinctrl-names =3D "default"; status =3D "disabled"; =20 cci_i2c0: i2c-bus@0 { @@ -1533,9 +1533,9 @@ blsp1_uart1: serial@78af000 { clock-names =3D "core", "iface"; dmas =3D <&blsp_dma 0>, <&blsp_dma 1>; dma-names =3D "tx", "rx"; - pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&blsp1_uart1_default>; pinctrl-1 =3D <&blsp1_uart1_sleep>; + pinctrl-names =3D "default", "sleep"; status =3D "disabled"; }; =20 @@ -1547,9 +1547,9 @@ blsp1_uart2: serial@78b0000 { clock-names =3D "core", "iface"; dmas =3D <&blsp_dma 2>, <&blsp_dma 3>; dma-names =3D "tx", "rx"; - pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&blsp1_uart2_default>; pinctrl-1 =3D <&blsp1_uart2_sleep>; + pinctrl-names =3D "default", "sleep"; status =3D "disabled"; }; =20 @@ -1560,9 +1560,9 @@ blsp_i2c1: i2c@78b5000 { clocks =3D <&gcc GCC_BLSP1_QUP1_I2C_APPS_CLK>, <&gcc GCC_BLSP1_AHB_CLK>; clock-names =3D "core", "iface"; - pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&i2c1_default>; pinctrl-1 =3D <&i2c1_sleep>; + pinctrl-names =3D "default", "sleep"; #address-cells =3D <1>; #size-cells =3D <0>; status =3D "disabled"; @@ -1577,9 +1577,9 @@ blsp_spi1: spi@78b5000 { clock-names =3D "core", "iface"; dmas =3D <&blsp_dma 4>, <&blsp_dma 5>; dma-names =3D "tx", "rx"; - pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&spi1_default>; pinctrl-1 =3D <&spi1_sleep>; + pinctrl-names =3D "default", "sleep"; #address-cells =3D <1>; #size-cells =3D <0>; status =3D "disabled"; @@ -1592,9 +1592,9 @@ blsp_i2c2: i2c@78b6000 { clocks =3D <&gcc GCC_BLSP1_QUP2_I2C_APPS_CLK>, <&gcc GCC_BLSP1_AHB_CLK>; clock-names =3D "core", "iface"; - pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&i2c2_default>; pinctrl-1 =3D <&i2c2_sleep>; + pinctrl-names =3D "default", "sleep"; #address-cells =3D <1>; #size-cells =3D <0>; status =3D "disabled"; @@ -1609,9 +1609,9 @@ blsp_spi2: spi@78b6000 { clock-names =3D "core", "iface"; dmas =3D <&blsp_dma 6>, <&blsp_dma 7>; dma-names =3D "tx", "rx"; - pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&spi2_default>; pinctrl-1 =3D <&spi2_sleep>; + pinctrl-names =3D "default", "sleep"; #address-cells =3D <1>; #size-cells =3D <0>; status =3D "disabled"; @@ -1624,9 +1624,9 @@ blsp_i2c3: i2c@78b7000 { clocks =3D <&gcc GCC_BLSP1_QUP3_I2C_APPS_CLK>, <&gcc GCC_BLSP1_AHB_CLK>; clock-names =3D "core", "iface"; - pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&i2c3_default>; pinctrl-1 =3D <&i2c3_sleep>; + pinctrl-names =3D "default", "sleep"; #address-cells =3D <1>; #size-cells =3D <0>; status =3D "disabled"; @@ -1641,9 +1641,9 @@ blsp_spi3: spi@78b7000 { clock-names =3D "core", "iface"; dmas =3D <&blsp_dma 8>, <&blsp_dma 9>; dma-names =3D "tx", "rx"; - pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&spi3_default>; pinctrl-1 =3D <&spi3_sleep>; + pinctrl-names =3D "default", "sleep"; #address-cells =3D <1>; #size-cells =3D <0>; status =3D "disabled"; @@ -1656,9 +1656,9 @@ blsp_i2c4: i2c@78b8000 { clocks =3D <&gcc GCC_BLSP1_QUP4_I2C_APPS_CLK>, <&gcc GCC_BLSP1_AHB_CLK>; clock-names =3D "core", "iface"; - pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&i2c4_default>; pinctrl-1 =3D <&i2c4_sleep>; + pinctrl-names =3D "default", "sleep"; #address-cells =3D <1>; #size-cells =3D <0>; status =3D "disabled"; @@ -1673,9 +1673,9 @@ blsp_spi4: spi@78b8000 { clock-names =3D "core", "iface"; dmas =3D <&blsp_dma 10>, <&blsp_dma 11>; dma-names =3D "tx", "rx"; - pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&spi4_default>; pinctrl-1 =3D <&spi4_sleep>; + pinctrl-names =3D "default", "sleep"; #address-cells =3D <1>; #size-cells =3D <0>; status =3D "disabled"; @@ -1688,9 +1688,9 @@ blsp_i2c5: i2c@78b9000 { clocks =3D <&gcc GCC_BLSP1_QUP5_I2C_APPS_CLK>, <&gcc GCC_BLSP1_AHB_CLK>; clock-names =3D "core", "iface"; - pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&i2c5_default>; pinctrl-1 =3D <&i2c5_sleep>; + pinctrl-names =3D "default", "sleep"; #address-cells =3D <1>; #size-cells =3D <0>; status =3D "disabled"; @@ -1705,9 +1705,9 @@ blsp_spi5: spi@78b9000 { clock-names =3D "core", "iface"; dmas =3D <&blsp_dma 12>, <&blsp_dma 13>; dma-names =3D "tx", "rx"; - pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&spi5_default>; pinctrl-1 =3D <&spi5_sleep>; + pinctrl-names =3D "default", "sleep"; #address-cells =3D <1>; #size-cells =3D <0>; status =3D "disabled"; @@ -1720,9 +1720,9 @@ blsp_i2c6: i2c@78ba000 { clocks =3D <&gcc GCC_BLSP1_QUP6_I2C_APPS_CLK>, <&gcc GCC_BLSP1_AHB_CLK>; clock-names =3D "core", "iface"; - pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&i2c6_default>; pinctrl-1 =3D <&i2c6_sleep>; + pinctrl-names =3D "default", "sleep"; #address-cells =3D <1>; #size-cells =3D <0>; status =3D "disabled"; @@ -1737,9 +1737,9 @@ blsp_spi6: spi@78ba000 { clock-names =3D "core", "iface"; dmas =3D <&blsp_dma 14>, <&blsp_dma 15>; dma-names =3D "tx", "rx"; - pinctrl-names =3D "default", "sleep"; pinctrl-0 =3D <&spi6_default>; pinctrl-1 =3D <&spi6_sleep>; + pinctrl-names =3D "default", "sleep"; #address-cells =3D <1>; #size-cells =3D <0>; status =3D "disabled"; @@ -1807,8 +1807,8 @@ pronto: remoteproc@a21b000 { qcom,smem-states =3D <&wcnss_smp2p_out 0>; qcom,smem-state-names =3D "stop"; =20 - pinctrl-names =3D "default"; pinctrl-0 =3D <&wcnss_pin_a>; + pinctrl-names =3D "default"; =20 status =3D "disabled"; =20 --=20 2.38.1