Merge tag 'soc-dt-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[sfrench/cifs-2.6.git] / arch / arm64 / boot / dts / qcom / msm8916.dtsi
index 834e0b66b7f2e68a477a9443894e80e9a1002dad..7582c7d748fe9a6c191e2ba9c72a552279134012 100644 (file)
        #address-cells = <2>;
        #size-cells = <2>;
 
-       aliases {
-               mmc0 = &sdhc_1; /* SDC1 eMMC slot */
-               mmc1 = &sdhc_2; /* SDC2 SD card slot */
-       };
-
        chosen { };
 
        memory@80000000 {
                        };
                };
 
-               msmgpio: pinctrl@1000000 {
+               tlmm: pinctrl@1000000 {
                        compatible = "qcom,msm8916-pinctrl";
                        reg = <0x01000000 0x300000>;
                        interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>;
                        gpio-controller;
-                       gpio-ranges = <&msmgpio 0 0 122>;
+                       gpio-ranges = <&tlmm 0 0 122>;
                        #gpio-cells = <2>;
                        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 {
+                               /* TX, RX, CTS_N, RTS_N */
+                               pins = "gpio0", "gpio1", "gpio2", "gpio3";
+                               function = "blsp_uart1";
+                               drive-strength = <16>;
+                               bias-disable;
+                       };
+
+                       blsp_uart1_sleep: blsp-uart1-sleep-state {
+                               pins = "gpio0", "gpio1", "gpio2", "gpio3";
+                               function = "gpio";
+                               drive-strength = <2>;
+                               bias-pull-down;
+                       };
+
+                       blsp_uart2_default: blsp-uart2-default-state {
+                               pins = "gpio4", "gpio5";
+                               function = "blsp_uart2";
+                               drive-strength = <16>;
+                               bias-disable;
+                       };
+
+                       blsp_uart2_sleep: blsp-uart2-sleep-state {
+                               pins = "gpio4", "gpio5";
+                               function = "gpio";
+                               drive-strength = <2>;
+                               bias-pull-down;
+                       };
+
+                       camera_front_default: camera-front-default-state {
+                               pwdn-pins {
+                                       pins = "gpio33";
+                                       function = "gpio";
+                                       drive-strength = <16>;
+                                       bias-disable;
+                               };
+                               rst-pins {
+                                       pins = "gpio28";
+                                       function = "gpio";
+                                       drive-strength = <16>;
+                                       bias-disable;
+                               };
+                               mclk1-pins {
+                                       pins = "gpio27";
+                                       function = "cam_mclk1";
+                                       drive-strength = <16>;
+                                       bias-disable;
+                               };
+                       };
+
+                       camera_rear_default: camera-rear-default-state {
+                               pwdn-pins {
+                                       pins = "gpio34";
+                                       function = "gpio";
+                                       drive-strength = <16>;
+                                       bias-disable;
+                               };
+                               rst-pins {
+                                       pins = "gpio35";
+                                       function = "gpio";
+                                       drive-strength = <16>;
+                                       bias-disable;
+                               };
+                               mclk0-pins {
+                                       pins = "gpio26";
+                                       function = "cam_mclk0";
+                                       drive-strength = <16>;
+                                       bias-disable;
+                               };
+                       };
+
+                       cci0_default: cci0-default-state {
+                               pins = "gpio29", "gpio30";
+                               function = "cci_i2c";
+                               drive-strength = <16>;
+                               bias-disable;
+                       };
+
+                       cdc_dmic_default: cdc-dmic-default-state {
+                               clk-pins {
+                                       pins = "gpio0";
+                                       function = "dmic0_clk";
+                                       drive-strength = <8>;
+                               };
+                               data-pins {
+                                       pins = "gpio1";
+                                       function = "dmic0_data";
+                                       drive-strength = <8>;
+                               };
+                       };
+
+                       cdc_dmic_sleep: cdc-dmic-sleep-state {
+                               clk-pins {
+                                       pins = "gpio0";
+                                       function = "dmic0_clk";
+                                       drive-strength = <2>;
+                                       bias-disable;
+                               };
+                               data-pins {
+                                       pins = "gpio1";
+                                       function = "dmic0_data";
+                                       drive-strength = <2>;
+                                       bias-disable;
+                               };
+                       };
+
+                       cdc_pdm_default: cdc-pdm-default-state {
+                               pins = "gpio63", "gpio64", "gpio65", "gpio66",
+                                      "gpio67", "gpio68";
+                               function = "cdc_pdm0";
+                               drive-strength = <8>;
+                               bias-disable;
+                       };
+
+                       cdc_pdm_sleep: cdc-pdm-sleep-state {
+                               pins = "gpio63", "gpio64", "gpio65", "gpio66",
+                                      "gpio67", "gpio68";
+                               function = "cdc_pdm0";
+                               drive-strength = <2>;
+                               bias-pull-down;
+                       };
+
+                       pri_mi2s_default: mi2s-pri-default-state {
+                               pins = "gpio113", "gpio114", "gpio115", "gpio116";
+                               function = "pri_mi2s";
+                               drive-strength = <8>;
+                               bias-disable;
+                       };
+
+                       pri_mi2s_sleep: mi2s-pri-sleep-state {
+                               pins = "gpio113", "gpio114", "gpio115", "gpio116";
+                               function = "pri_mi2s";
+                               drive-strength = <2>;
+                               bias-disable;
+                       };
+
+                       pri_mi2s_mclk_default: mi2s-pri-mclk-default-state {
+                               pins = "gpio116";
+                               function = "pri_mi2s";
+                               drive-strength = <8>;
+                               bias-disable;
+                       };
+
+                       pri_mi2s_mclk_sleep: mi2s-pri-mclk-sleep-state {
+                               pins = "gpio116";
+                               function = "pri_mi2s";
+                               drive-strength = <2>;
+                               bias-disable;
+                       };
+
+                       pri_mi2s_ws_default: mi2s-pri-ws-default-state {
+                               pins = "gpio110";
+                               function = "pri_mi2s_ws";
+                               drive-strength = <8>;
+                               bias-disable;
+                       };
+
+                       pri_mi2s_ws_sleep: mi2s-pri-ws-sleep-state {
+                               pins = "gpio110";
+                               function = "pri_mi2s_ws";
+                               drive-strength = <2>;
+                               bias-disable;
+                       };
+
+                       sec_mi2s_default: mi2s-sec-default-state {
+                               pins = "gpio112", "gpio117", "gpio118", "gpio119";
+                               function = "sec_mi2s";
+                               drive-strength = <8>;
+                               bias-disable;
+                       };
+
+                       sec_mi2s_sleep: mi2s-sec-sleep-state {
+                               pins = "gpio112", "gpio117", "gpio118", "gpio119";
+                               function = "sec_mi2s";
+                               drive-strength = <2>;
+                               bias-disable;
+                       };
+
+                       sdc1_default: sdc1-default-state {
+                               clk-pins {
+                                       pins = "sdc1_clk";
+                                       bias-disable;
+                                       drive-strength = <16>;
+                               };
+                               cmd-pins {
+                                       pins = "sdc1_cmd";
+                                       bias-pull-up;
+                                       drive-strength = <10>;
+                               };
+                               data-pins {
+                                       pins = "sdc1_data";
+                                       bias-pull-up;
+                                       drive-strength = <10>;
+                               };
+                       };
+
+                       sdc1_sleep: sdc1-sleep-state {
+                               clk-pins {
+                                       pins = "sdc1_clk";
+                                       bias-disable;
+                                       drive-strength = <2>;
+                               };
+                               cmd-pins {
+                                       pins = "sdc1_cmd";
+                                       bias-pull-up;
+                                       drive-strength = <2>;
+                               };
+                               data-pins {
+                                       pins = "sdc1_data";
+                                       bias-pull-up;
+                                       drive-strength = <2>;
+                               };
+                       };
+
+                       sdc2_default: sdc2-default-state {
+                               clk-pins {
+                                       pins = "sdc2_clk";
+                                       bias-disable;
+                                       drive-strength = <16>;
+                               };
+                               cmd-pins {
+                                       pins = "sdc2_cmd";
+                                       bias-pull-up;
+                                       drive-strength = <10>;
+                               };
+                               data-pins {
+                                       pins = "sdc2_data";
+                                       bias-pull-up;
+                                       drive-strength = <10>;
+                               };
+                       };
+
+                       sdc2_sleep: sdc2-sleep-state {
+                               clk-pins {
+                                       pins = "sdc2_clk";
+                                       bias-disable;
+                                       drive-strength = <2>;
+                               };
+                               cmd-pins {
+                                       pins = "sdc2_cmd";
+                                       bias-pull-up;
+                                       drive-strength = <2>;
+                               };
+                               data-pins {
+                                       pins = "sdc2_data";
+                                       bias-pull-up;
+                                       drive-strength = <2>;
+                               };
+                       };
+
+                       wcss_wlan_default: wcss-wlan-default-state {
+                               pins = "gpio40", "gpio41", "gpio42", "gpio43", "gpio44";
+                               function = "wcss_wlan";
+                               drive-strength = <6>;
+                               bias-pull-up;
+                       };
                };
 
                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>;
                        #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";
 
                                        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>;
 
                                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>,
                                              "byte",
                                              "pixel",
                                              "core";
-                               phys = <&dsi_phy0>;
+                               phys = <&mdss_dsi0_phy>;
 
                                #address-cells = <1>;
                                #size-cells = <0>;
 
                                        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>,
                        };
                };
 
-               camss: camss@1b00000 {
+               camss: camss@1b0ac00 {
                        compatible = "qcom,msm8916-camss";
                        reg = <0x01b0ac00 0x200>,
                                <0x01b00030 0x4>,
                         * Primary/Secondary MI2S both use the PRI_I2S_CLK.
                         */
                        clocks = <&gcc GCC_ULTAUDIO_AHBFABRIC_IXFABRIC_CLK>,
-                                <&gcc GCC_ULTAUDIO_PCNOC_MPORT_CLK>,
-                                <&gcc GCC_ULTAUDIO_PCNOC_SWAY_CLK>,
                                 <&gcc GCC_ULTAUDIO_LPAIF_PRI_I2S_CLK>,
                                 <&gcc GCC_ULTAUDIO_LPAIF_PRI_I2S_CLK>,
                                 <&gcc GCC_ULTAUDIO_LPAIF_SEC_I2S_CLK>,
-                                <&gcc GCC_ULTAUDIO_LPAIF_AUX_I2S_CLK>;
+                                <&gcc GCC_ULTAUDIO_LPAIF_AUX_I2S_CLK>,
+                                <&gcc GCC_ULTAUDIO_PCNOC_MPORT_CLK>,
+                                <&gcc GCC_ULTAUDIO_PCNOC_SWAY_CLK>;
 
                        clock-names = "ahbix-clk",
-                                       "pcnoc-mport-clk",
-                                       "pcnoc-sway-clk",
                                        "mi2s-bit-clk0",
                                        "mi2s-bit-clk1",
                                        "mi2s-bit-clk2",
-                                       "mi2s-bit-clk3";
+                                       "mi2s-bit-clk3",
+                                       "pcnoc-mport-clk",
+                                       "pcnoc-sway-clk";
                        #sound-dai-cells = <1>;
 
                        interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>;
                                 <&gcc GCC_CODEC_DIGCODEC_CLK>;
                        clock-names = "ahbix-clk", "mclk";
                        #sound-dai-cells = <1>;
+                       status = "disabled";
                };
 
-               sdhc_1: mmc@7824000 {
+               sdhc_1: mmc@7824900 {
                        compatible = "qcom,msm8916-sdhci", "qcom,sdhci-msm-v4";
                        reg = <0x07824900 0x11c>, <0x07824000 0x800>;
                        reg-names = "hc", "core";
                                 <&gcc GCC_SDCC1_APPS_CLK>,
                                 <&xo_board>;
                        clock-names = "iface", "core", "xo";
+                       pinctrl-0 = <&sdc1_default>;
+                       pinctrl-1 = <&sdc1_sleep>;
+                       pinctrl-names = "default", "sleep";
                        mmc-ddr-1_8v;
                        bus-width = <8>;
                        non-removable;
                        status = "disabled";
                };
 
-               sdhc_2: mmc@7864000 {
+               sdhc_2: mmc@7864900 {
                        compatible = "qcom,msm8916-sdhci", "qcom,sdhci-msm-v4";
                        reg = <0x07864900 0x11c>, <0x07864000 0x800>;
                        reg-names = "hc", "core";
                                 <&gcc GCC_SDCC2_APPS_CLK>,
                                 <&xo_board>;
                        clock-names = "iface", "core", "xo";
+                       pinctrl-0 = <&sdc2_default>;
+                       pinctrl-1 = <&sdc2_sleep>;
+                       pinctrl-names = "default", "sleep";
                        bus-width = <4>;
                        status = "disabled";
                };
                        qcom,ee = <0>;
                };
 
-               blsp1_uart1: serial@78af000 {
+               blsp_uart1: serial@78af000 {
                        compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
                        reg = <0x078af000 0x200>;
                        interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
                        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 = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
                        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";
                };
 
                        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";
                        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";
                        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";
                        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";
                        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";
                        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";
                        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";
                        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";
                        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";
                        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";
                        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";
                        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";
                        };
                };
 
-               wcnss: remoteproc@a21b000 {
+               wcnss: remoteproc@a204000 {
                        compatible = "qcom,pronto-v2-pil", "qcom,pronto";
                        reg = <0x0a204000 0x2000>, <0x0a202000 0x1000>, <0x0a21b000 0x3000>;
                        reg-names = "ccu", "dxe", "pmu";
                        qcom,smem-state-names = "stop";
 
                        pinctrl-names = "default";
-                       pinctrl-0 = <&wcnss_pin_a>;
+                       pinctrl-0 = <&wcss_wlan_default>;
 
                        status = "disabled";
 
                             <GIC_PPI 1 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
        };
 };
-
-#include "msm8916-pins.dtsi"