On 9.01.2023 12:01, Nikita Travkin wrote:
> It's agreed that the status property should always be the last.
> Move it in all msm8916 dts.
>
> Signed-off-by: Nikita Travkin <nikita@xxxxxxx>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
Konrad
> 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 = <KEY_VOLUMEDOWN>;
> + 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 = <KEY_VOLUMEDOWN>;
> + 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 = <KEY_VOLUMEDOWN>;
> + 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 = <KEY_VOLUMEDOWN>;
> + 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 = <KEY_VOLUMEDOWN>;
> + 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 = <KEY_VOLUMEDOWN>;
> + 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 = <KEY_VOLUMEDOWN>;
> + 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 = <KEY_VOLUMEDOWN>;
> + 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 = <KEY_VOLUMEDOWN>;
> + 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 {
