Received: by 2002:a05:6358:a55:b0:ec:fcf4:3ecf with SMTP id 21csp3358579rwb; Mon, 16 Jan 2023 07:04:36 -0800 (PST) X-Google-Smtp-Source: AMrXdXtQLTi9VemNpdPCF4rWyK1LQB+6ES+NsOLa7a+3gn+0wNiikmYfkd9dS6ErQ0mYD6lXrg3I X-Received: by 2002:a17:907:6d04:b0:871:cba6:4bb1 with SMTP id sa4-20020a1709076d0400b00871cba64bb1mr2034364ejc.70.1673881476152; Mon, 16 Jan 2023 07:04:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673881476; cv=none; d=google.com; s=arc-20160816; b=x9U6uS34TNxrIdxJV5nLBKAiaGgsXyRjzww53U2yRBQI0JzEWxOXL/6+EhBlp9bk/u MIc1M2HK21JyLn1EqwaaJg46Q4EKL9CpLu3U9nQxRNadq35iFqLHt/9ArPyDiKutYOoL jlL14N87wNRiZstJHrpFtoS3alf3JHusXhxanrdlJUnK0fXNcVtDNpX3/1hT5TcRvFES oxlypn4urzzvfJaiIWlgKIjY71EnxxUOt2XRFv2L3lv9fUK46vFhHbQaow+uBrO3uON1 ss1PHXgIFErRP3+ETiMKeyXfnt86DpOULm+uSucaN3LU63aOFeRC/bsIuY6st3DAOILg p5BQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/fIBiXy8X+BcNgtao4Kkz6FPiqIUyNGrQQqkedqb8F8=; b=R0/WY+UHQutslsq0OdsjB0NAY32J2TYxVfV4BiHjFnNeJRBaWKtfHFwEWhA2TGCIEu JCpNbNiun9Aem7Vzs/fU0OU7bFe9ah6WuQJ+dM3R6qytkjbKjIvV2NgzINLaENwR6QSQ T7XfxIlTwfmudlAhDiw02d5DmxKzsGkQE3pXJJ1ICbBDEzsEcRWYHZiwoM5iB0+AHiXV 6ZhJ0ecMhBo2b5lZp4Q25BNsbXYAyNoDkMAGaiP/+Qsaq3AW7geST4zGM6b/icXayeJJ JZq6Rddel3/7cf/2xWsS3ryL9NXsUcXx8vEKd0hpz+uI42tnoW8qwZt0GbGLAwOucXNR jF4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@trvn.ru header.s=mail header.b=5Lmj0ov4; 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; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=trvn.ru Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hp31-20020a1709073e1f00b00870e5bcbee1si2826318ejc.874.2023.01.16.07.04.22; Mon, 16 Jan 2023 07:04:36 -0800 (PST) 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=@trvn.ru header.s=mail header.b=5Lmj0ov4; 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; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=trvn.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233014AbjAPPBY (ORCPT + 50 others); Mon, 16 Jan 2023 10:01:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232733AbjAPPAg (ORCPT ); Mon, 16 Jan 2023 10:00:36 -0500 Received: from box.trvn.ru (box.trvn.ru [194.87.146.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E7A10222E0; Mon, 16 Jan 2023 06:51:03 -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 AB90B418F4; Mon, 16 Jan 2023 19:51:00 +0500 (+05) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=trvn.ru; s=mail; t=1673880661; bh=Z21o6vZENwNgsIHqVAbVcoLM3j2YLhcpgZDrzH8B2aM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=5Lmj0ov4WicEnY2X8+QmdL6BjP2dueJxzdEdwqug0ukMt1kY8Zal1BJhQqT9bc0iJ CnGs+IjsAkctZNBJ953lguhQaWJKAWBZ8Xh5XyI+t1Ss/I34/bIZ4nR7j2l3/ATxJy zq8yMlUJxf4D55Cw/OMLyeaWLVvFKP9be7VtDgGnolmSvhoBgW5pPtiSBajW1DBbhY 0wk45mflwk8DjsxSvb0h1J43XkREIDgTUrSpZXMglIYD/I6QZWwydckzzMGWs17+IN bHjqlQZm02Lg0ctKRpU47ImAxzxguIFB/21w7/Me4YQVty0tWmI8hwc3GO90TaBdtT fPuoBToGtll1w== 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 v2 1/4] arm64: dts: qcom: msm/apq8x16-*: Move status property last Date: Mon, 16 Jan 2023 19:50:50 +0500 Message-Id: <20230116145053.1412501-2-nikita@trvn.ru> In-Reply-To: <20230116145053.1412501-1-nikita@trvn.ru> References: <20230116145053.1412501-1-nikita@trvn.ru> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS 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 It's agreed that the status property should always be the last. Move it in all msm8916 dts. Reviewed-by: Konrad Dybcio Signed-off-by: Nikita Travkin --- arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 44 ++++++++++--------- .../boot/dts/qcom/msm8916-alcatel-idol347.dts | 12 ++--- .../arm64/boot/dts/qcom/msm8916-asus-z00l.dts | 9 ++-- .../arm64/boot/dts/qcom/msm8916-huawei-g7.dts | 16 +++---- .../boot/dts/qcom/msm8916-longcheer-l8150.dts | 12 ++--- .../boot/dts/qcom/msm8916-longcheer-l8910.dts | 12 ++--- .../qcom/msm8916-samsung-a2015-common.dtsi | 12 ++--- .../boot/dts/qcom/msm8916-samsung-j5.dts | 12 ++--- .../dts/qcom/msm8916-samsung-serranove.dts | 12 ++--- .../dts/qcom/msm8916-wingtech-wt88047.dts | 12 ++--- 10 files changed, 78 insertions(+), 75 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts index c52d79a55d80..110d22f6968b 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts @@ -171,18 +171,16 @@ led@6 { &blsp_i2c2 { /* On Low speed expansion */ - status = "okay"; label = "LS-I2C0"; + status = "okay"; }; &blsp_i2c4 { /* On High speed expansion */ - status = "okay"; label = "HS-I2C2"; + status = "okay"; adv_bridge: bridge@39 { - status = "okay"; - compatible = "adi,adv7533"; reg = <0x39>; @@ -204,6 +202,8 @@ adv_bridge: bridge@39 { pinctrl-1 = <&adv7533_int_suspend &adv7533_switch_suspend>; #sound-dai-cells = <1>; + status = "okay"; + ports { #address-cells = <1>; #size-cells = <0>; @@ -227,34 +227,35 @@ adv7533_out: endpoint { &blsp_i2c6 { /* On Low speed expansion */ - status = "okay"; label = "LS-I2C1"; + status = "okay"; }; &blsp_spi3 { /* On High speed expansion */ - status = "okay"; label = "HS-SPI1"; + status = "okay"; }; &blsp_spi5 { /* On Low speed expansion */ - status = "okay"; label = "LS-SPI0"; + status = "okay"; }; &blsp1_uart1 { - status = "okay"; label = "LS-UART0"; + status = "okay"; }; &blsp1_uart2 { - status = "okay"; label = "LS-UART1"; + status = "okay"; }; &camss { status = "okay"; + ports { port@0 { reg = <0>; @@ -315,43 +316,41 @@ &mdss { }; &mpss { - status = "okay"; - firmware-name = "qcom/apq8016/mba.mbn", "qcom/apq8016/modem.mbn"; + + status = "okay"; }; &pm8916_resin { - status = "okay"; linux,code = ; + status = "okay"; }; &pronto { - status = "okay"; - firmware-name = "qcom/apq8016/wcnss.mbn"; -}; -&sdhc_1 { status = "okay"; +}; +&sdhc_1 { pinctrl-names = "default", "sleep"; pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>; pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>; -}; -&sdhc_2 { status = "okay"; +}; +&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>; -}; -&sound { status = "okay"; +}; +&sound { pinctrl-0 = <&cdc_pdm_lines_act &ext_sec_tlmm_lines_act &ext_mclk_tlmm_lines_act>; pinctrl-1 = <&cdc_pdm_lines_sus &ext_sec_tlmm_lines_sus &ext_mclk_tlmm_lines_sus>; pinctrl-names = "default", "sleep"; @@ -360,6 +359,8 @@ &sound { "AMIC2", "MIC BIAS Internal2", "AMIC3", "MIC BIAS External1"; + status = "okay"; + quaternary-dai-link { link-name = "ADV7533"; cpu { @@ -392,12 +393,13 @@ codec { }; &usb { - status = "okay"; extcon = <&usb_id>, <&usb_id>; pinctrl-names = "default", "device"; pinctrl-0 = <&usb_sw_sel_pm &usb_hub_reset_pm>; pinctrl-1 = <&usb_sw_sel_pm_device &usb_hub_reset_pm_device>; + + status = "okay"; }; &usb_hs_phy { diff --git a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts index 701a5585d77e..20301eaa3b95 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts @@ -152,8 +152,8 @@ led@1 { }; &pm8916_resin { - status = "okay"; linux,code = ; + status = "okay"; }; &pm8916_vib { @@ -165,26 +165,26 @@ &pronto { }; &sdhc_1 { - status = "okay"; - pinctrl-names = "default", "sleep"; pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>; pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>; -}; -&sdhc_2 { status = "okay"; +}; +&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>; + + status = "okay"; }; &usb { - status = "okay"; extcon = <&usb_id>, <&usb_id>; + status = "okay"; }; &usb_hs_phy { diff --git a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts index 3618704a5330..a0f868854d53 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts @@ -133,26 +133,27 @@ &pronto { }; &sdhc_1 { - status = "okay"; - pinctrl-names = "default", "sleep"; pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>; pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>; + + status = "okay"; }; &sdhc_2 { - status = "okay"; vmmc-supply = <®_sd_vmmc>; 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>; + + status = "okay"; }; &usb { - status = "okay"; extcon = <&usb_id>, <&usb_id>; + status = "okay"; }; &usb_hs_phy { diff --git a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts index 8c07eca900d3..2d266fd417f8 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts @@ -219,8 +219,8 @@ &lpass { }; &pm8916_resin { - status = "okay"; linux,code = ; + status = "okay"; }; &pm8916_vib { @@ -232,16 +232,14 @@ &pronto { }; &sdhc_1 { - status = "okay"; - pinctrl-names = "default", "sleep"; pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>; pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>; -}; -&sdhc_2 { status = "okay"; +}; +&sdhc_2 { pinctrl-names = "default", "sleep"; pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdhc2_cd_default>; pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdhc2_cd_default>; @@ -260,11 +258,11 @@ &sdhc_2 { * SD card slot and forgot to re-route to gpio38. */ cd-gpios = <&msmgpio 56 GPIO_ACTIVE_LOW>; -}; -&sound { status = "okay"; +}; +&sound { model = "msm8916"; audio-routing = "AMIC1", "MIC BIAS External1", @@ -275,6 +273,8 @@ &sound { pinctrl-0 = <&cdc_pdm_lines_act>; pinctrl-1 = <&cdc_pdm_lines_sus>; + status = "okay"; + primary-dai-link { link-name = "WCD"; cpu { @@ -297,8 +297,8 @@ codec { }; &usb { - status = "okay"; extcon = <&usb_id>, <&usb_id>; + status = "okay"; }; &usb_hs_phy { diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts index d1e8cf2f50c0..f63f0fb797b4 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts @@ -219,8 +219,8 @@ &blsp1_uart2 { }; &pm8916_resin { - status = "okay"; linux,code = ; + status = "okay"; }; &pm8916_usbin { @@ -236,27 +236,27 @@ &pronto { }; &sdhc_1 { - status = "okay"; - pinctrl-names = "default", "sleep"; pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>; pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>; -}; -&sdhc_2 { status = "okay"; +}; +&sdhc_2 { pinctrl-names = "default", "sleep"; pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on>; pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>; non-removable; + + status = "okay"; }; &usb { - status = "okay"; dr_mode = "peripheral"; extcon = <&pm8916_usbin>; + status = "okay"; }; &usb_hs_phy { diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts index 3899e11b9843..4d627d06f87b 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts @@ -91,8 +91,8 @@ &blsp1_uart2 { }; &pm8916_resin { - status = "okay"; linux,code = ; + status = "okay"; }; &pm8916_vib { @@ -104,26 +104,26 @@ &pronto { }; &sdhc_1 { - status = "okay"; - pinctrl-names = "default", "sleep"; pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>; pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>; -}; -&sdhc_2 { status = "okay"; +}; +&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>; + + status = "okay"; }; &usb { - status = "okay"; extcon = <&usb_id>, <&usb_id>; + status = "okay"; }; &usb_hs_phy { 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 d600916a0e55..13c586079e50 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi @@ -248,8 +248,8 @@ &mdss { }; &pm8916_resin { - status = "okay"; linux,code = ; + status = "okay"; }; &pronto { @@ -257,26 +257,26 @@ &pronto { }; &sdhc_1 { - status = "okay"; - pinctrl-names = "default", "sleep"; pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>; pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>; -}; -&sdhc_2 { status = "okay"; +}; +&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>; + + status = "okay"; }; &usb { - status = "okay"; extcon = <&muic>, <&muic>; + status = "okay"; }; &usb_hs_phy { diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts index 7ac49a021563..8eb68bb6607c 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts @@ -53,8 +53,8 @@ &blsp1_uart2 { }; &pm8916_resin { - status = "okay"; linux,code = ; + status = "okay"; }; /* FIXME: Replace with SM5703 MUIC when driver is available */ @@ -67,27 +67,27 @@ &pronto { }; &sdhc_1 { - status = "okay"; - pinctrl-names = "default", "sleep"; pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>; pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>; -}; -&sdhc_2 { status = "okay"; +}; +&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>; + + status = "okay"; }; &usb { - status = "okay"; dr_mode = "peripheral"; extcon = <&pm8916_usbin>; + status = "okay"; }; &usb_hs_phy { diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts index d4984b3af802..34bee5211413 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts @@ -264,8 +264,8 @@ &blsp1_uart2 { }; &pm8916_resin { - status = "okay"; linux,code = ; + status = "okay"; }; &pm8916_vib { @@ -281,16 +281,14 @@ iris { }; &sdhc_1 { - status = "okay"; - pinctrl-names = "default", "sleep"; pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>; pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>; -}; -&sdhc_2 { status = "okay"; +}; +&sdhc_2 { pinctrl-names = "default", "sleep"; pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on>; pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>; @@ -309,11 +307,13 @@ &sdhc_2 { * (without tuning), so maybe only tuning is broken? */ no-1-8-v; + + status = "okay"; }; &usb { - status = "okay"; extcon = <&muic>, <&muic>; + status = "okay"; }; &usb_hs_phy { diff --git a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts index a87be1d95b14..24a5c3486beb 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts @@ -145,8 +145,8 @@ &blsp1_uart2 { }; &pm8916_resin { - status = "okay"; linux,code = ; + status = "okay"; }; &pm8916_vib { @@ -158,26 +158,26 @@ &pronto { }; &sdhc_1 { - status = "okay"; - pinctrl-names = "default", "sleep"; pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>; pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>; -}; -&sdhc_2 { status = "okay"; +}; +&sdhc_2 { pinctrl-names = "default", "sleep"; pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on>; pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>; non-removable; + + status = "okay"; }; &usb { - status = "okay"; extcon = <&usb_id>, <&usb_id>; + status = "okay"; }; &usb_hs_phy { -- 2.38.1