From patchwork Mon Jan 9 11:01:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Travkin X-Patchwork-Id: 40795 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2089611wrt; Mon, 9 Jan 2023 03:02:57 -0800 (PST) X-Google-Smtp-Source: AMrXdXtG83qTtDg0L8ibc748jfMDGoQoSwcZltSJM10ohUFEHFnyF4wUCXXirYa3IqgKdG8saEAm X-Received: by 2002:a17:906:6dcb:b0:7e7:4dd7:bbcc with SMTP id j11-20020a1709066dcb00b007e74dd7bbccmr55803032ejt.73.1673262177167; Mon, 09 Jan 2023 03:02:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673262177; cv=none; d=google.com; s=arc-20160816; b=tX8kjeutwHZ3y1vdkEj/RkexIJQd8yqnqUo2L7HwnDB+TC7RrXuJ/Az+9T2Dxvd8Jr O6yEhv9MGRWOYMx0eTl+ZAPAAI3Fbk3eWBMczYJjQy2O1cePGRzFSfAIWrr258wP9+ln gVRtFu3K1YR0QxT/+E2VjeabzgQzu4OJzzv0rz5jFSzoJLOOIXHauILJ4fMEG7OvPFLG TDuw56GpRWZwmp0faFwQLg3Gr0HfTUKVnF2y4m3jodCVpmQSghA8s/hH0tw44+LlIvFQ I88IQnXRx1FVuMAlNd8Ed0OFkCy1NxRNuHFIbsCCe9I/940HOPSNok8Ncyg5Ux/ck/8d afBQ== 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=ldabh+k7jFIHH/9tF0TMzi75tuEpAqyEzfpYTQMU7EY=; b=WrfqjDx3UQql/BFh9Q+ZCAR4VYuBopCAyyzi0vip0L1iQI4N7wECvCuCbVUnBoBc8a 3PhwU+ZGNXA3yIIhCT1tLDE3YmRxuuWs3U/kkSbydhAlWaRGWgrny8ajfjMr8oYlQRkf NjX40StKTHKunIWH43f79k0+DBmUVlyxCir1xsZz5qN4ip2oj1umeXev/3IQ2K4CMr6A UKEbrorVCqQ/8w27L+N3Ho2KNiIVI8NeSG9hJW/K9ma53sCeG9pKROOvaQwBUaumzN9f GESbSrYbkpAI8z/7MnySNWScD+yUUqsA/k1G5H5SjlaRYa7uuZRIcq7soiTYgtYMp0d3 4I8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@trvn.ru header.s=mail header.b=gSwu2QfX; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o13-20020a170906974d00b0084d44692e13si3594826ejy.471.2023.01.09.03.02.32; Mon, 09 Jan 2023 03:02:57 -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=gSwu2QfX; 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 S237125AbjAILCP (ORCPT + 99 others); Mon, 9 Jan 2023 06:02:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236909AbjAILBw (ORCPT ); Mon, 9 Jan 2023 06:01:52 -0500 Received: from box.trvn.ru (box.trvn.ru [194.87.146.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 72FD7120AD; 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 85C4E41515; Mon, 9 Jan 2023 16:01:37 +0500 (+05) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=trvn.ru; s=mail; t=1673262097; bh=mNPVzVUlLTeoB329mkvbiid3rcwKaJ4wP/dX+YtpReo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gSwu2QfXOAJRmmVnirxL/3GtIcj/cbI7p6zLPrLek7oEPHZoic0/4nQ67KcGTYoMV ZtzK63Xn4PHiS+yE9mouzOJQYmBAIDjNqhfjknJscEdqiOVet3M4OrZU/AHLEcQB0T AaQfn0xE85aOPpBNkF+IS6a94x8fuCl9DEBOhQ2OdwZvaAd150j07J3N6OAW+fRXQm XsEBWW5SWDVJIc2xl4H8syf3LJA598klHGc0PKmfOldCMnuLFnrfXg/TdaN50LZV// 07jRzpgJ//Waw0y2u5X1tPwz9dQxosJnuQRJMgJJkWfz5n3LRTeP1jnGAYOOEHYOm3 ltRHa9ZWax5Sg== 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 1/4] arm64: dts: qcom: msm/apq8x16-*: Move status property last Date: Mon, 9 Jan 2023 16:01:04 +0500 Message-Id: <20230109110107.3016323-2-nikita@trvn.ru> In-Reply-To: <20230109110107.3016323-1-nikita@trvn.ru> References: <20230109110107.3016323-1-nikita@trvn.ru> MIME-Version: 1.0 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754542560471624031?= X-GMAIL-MSGID: =?utf-8?q?1754542560471624031?= It's agreed that the status property should always be the last. Move it in all msm8916 dts. Signed-off-by: Nikita Travkin Reviewed-by: Konrad Dybcio --- 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 ef5b39ba1238..3586f373d511 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts @@ -175,18 +175,16 @@ &blsp_dma { &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>; @@ -208,6 +206,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>; @@ -231,34 +231,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>; @@ -319,43 +320,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"; @@ -364,6 +363,8 @@ &sound { "AMIC2", "MIC BIAS Internal2", "AMIC3", "MIC BIAS External1"; + status = "okay"; + quaternary-dai-link { link-name = "ADV7533"; cpu { @@ -396,12 +397,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 {