arm64: dts: qcom: Drop unneeded extra device-specific includes
authorStephan Gerhold <stephan@gerhold.net>
Mon, 18 Oct 2021 13:36:56 +0000 (15:36 +0200)
committerBjorn Andersson <bjorn.andersson@linaro.org>
Sun, 24 Oct 2021 18:04:08 +0000 (13:04 -0500)
For some reason apq8016-sbc, apq8096-db820c, msm8916-mtp and msm8996-mtp
were added as separate .dts and .dtsi files where the first only contains
the model name and the latter contains most of the actual definitions.
Perhaps this was done with the expectation that there would be other
devices also making use of exactly the same. However, this has not
been the case until now and it also seems unlikely in the future.
Having the extra .dtsi only clutters the file list and provides
little benefit.

Move the contents of the .dtsi into the .dts file to make this consistent
with most other devices that simply define everything in the .dts.

There are no functional changes introduced by this patch:
The compiled ".dtb"s are completely identical.

Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20211018133656.32649-1-stephan@gerhold.net
arch/arm64/boot/dts/qcom/apq8016-sbc.dts
arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi [deleted file]
arch/arm64/boot/dts/qcom/apq8096-db820c.dts
arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi [deleted file]
arch/arm64/boot/dts/qcom/msm8916-mtp.dts
arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi [deleted file]
arch/arm64/boot/dts/qcom/msm8996-mtp.dts
arch/arm64/boot/dts/qcom/msm8996-mtp.dtsi [deleted file]

index f3c0dbf..a5320d6 100644 (file)
@@ -5,9 +5,839 @@
 
 /dts-v1/;
 
-#include "apq8016-sbc.dtsi"
+#include "msm8916-pm8916.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
+#include <dt-bindings/pinctrl/qcom,pmic-mpp.h>
+#include <dt-bindings/sound/apq8016-lpass.h>
 
 / {
        model = "Qualcomm Technologies, Inc. APQ 8016 SBC";
        compatible = "qcom,apq8016-sbc", "qcom,apq8016";
+
+       aliases {
+               serial0 = &blsp1_uart2;
+               serial1 = &blsp1_uart1;
+               usid0 = &pm8916_0;
+               i2c0    = &blsp_i2c2;
+               i2c1    = &blsp_i2c6;
+               i2c3    = &blsp_i2c4;
+               spi0    = &blsp_spi5;
+               spi1    = &blsp_spi3;
+       };
+
+       chosen {
+               stdout-path = "serial0";
+       };
+
+       camera_vdddo_1v8: camera-vdddo-1v8 {
+               compatible = "regulator-fixed";
+               regulator-name = "camera_vdddo";
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+               regulator-always-on;
+       };
+
+       camera_vdda_2v8: camera-vdda-2v8 {
+               compatible = "regulator-fixed";
+               regulator-name = "camera_vdda";
+               regulator-min-microvolt = <2800000>;
+               regulator-max-microvolt = <2800000>;
+               regulator-always-on;
+       };
+
+       camera_vddd_1v5: camera-vddd-1v5 {
+               compatible = "regulator-fixed";
+               regulator-name = "camera_vddd";
+               regulator-min-microvolt = <1500000>;
+               regulator-max-microvolt = <1500000>;
+               regulator-always-on;
+       };
+
+       reserved-memory {
+               ramoops@bff00000 {
+                       compatible = "ramoops";
+                       reg = <0x0 0xbff00000 0x0 0x100000>;
+
+                       record-size = <0x20000>;
+                       console-size = <0x20000>;
+                       ftrace-size = <0x20000>;
+               };
+       };
+
+       usb2513 {
+               compatible = "smsc,usb3503";
+               reset-gpios = <&pm8916_gpios 3 GPIO_ACTIVE_LOW>;
+               initial-mode = <1>;
+       };
+
+       usb_id: usb-id {
+               compatible = "linux,extcon-usb-gpio";
+               id-gpio = <&msmgpio 121 GPIO_ACTIVE_HIGH>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&usb_id_default>;
+       };
+
+       hdmi-out {
+               compatible = "hdmi-connector";
+               type = "a";
+
+               port {
+                       hdmi_con: endpoint {
+                               remote-endpoint = <&adv7533_out>;
+                       };
+               };
+       };
+
+       gpio-keys {
+               compatible = "gpio-keys";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               autorepeat;
+
+               pinctrl-names = "default";
+               pinctrl-0 = <&msm_key_volp_n_default>;
+
+               button@0 {
+                       label = "Volume Up";
+                       linux,code = <KEY_VOLUMEUP>;
+                       gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;
+               };
+       };
+
+       leds {
+               pinctrl-names = "default";
+               pinctrl-0 = <&msmgpio_leds>,
+                           <&pm8916_gpios_leds>,
+                           <&pm8916_mpps_leds>;
+
+               compatible = "gpio-leds";
+
+               led@1 {
+                       label = "apq8016-sbc:green:user1";
+                       gpios = <&msmgpio 21 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "heartbeat";
+                       default-state = "off";
+               };
+
+               led@2 {
+                       label = "apq8016-sbc:green:user2";
+                       gpios = <&msmgpio 120 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "mmc0";
+                       default-state = "off";
+               };
+
+               led@3 {
+                       label = "apq8016-sbc:green:user3";
+                       gpios = <&pm8916_gpios 1 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "mmc1";
+                       default-state = "off";
+               };
+
+               led@4 {
+                       label = "apq8016-sbc:green:user4";
+                       gpios = <&pm8916_gpios 2 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "none";
+                       panic-indicator;
+                       default-state = "off";
+               };
+
+               led@5 {
+                       label = "apq8016-sbc:yellow:wlan";
+                       gpios = <&pm8916_mpps 2 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "phy0tx";
+                       default-state = "off";
+               };
+
+               led@6 {
+                       label = "apq8016-sbc:blue:bt";
+                       gpios = <&pm8916_mpps 3 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "bluetooth-power";
+                       default-state = "off";
+               };
+       };
+};
+
+&blsp_dma {
+       status = "okay";
+};
+
+&blsp_i2c2 {
+       /* On Low speed expansion */
+       status = "okay";
+       label = "LS-I2C0";
+};
+
+&blsp_i2c4 {
+       /* On High speed expansion */
+       status = "okay";
+       label = "HS-I2C2";
+
+       adv_bridge: bridge@39 {
+               status = "okay";
+
+               compatible = "adi,adv7533";
+               reg = <0x39>;
+
+               interrupt-parent = <&msmgpio>;
+               interrupts = <31 IRQ_TYPE_EDGE_FALLING>;
+
+               adi,dsi-lanes = <4>;
+               clocks = <&rpmcc RPM_SMD_BB_CLK2>;
+               clock-names = "cec";
+
+               pd-gpios = <&msmgpio 32 GPIO_ACTIVE_HIGH>;
+
+               avdd-supply = <&pm8916_l6>;
+               v1p2-supply = <&pm8916_l6>;
+               v3p3-supply = <&pm8916_l17>;
+
+               pinctrl-names = "default","sleep";
+               pinctrl-0 = <&adv7533_int_active &adv7533_switch_active>;
+               pinctrl-1 = <&adv7533_int_suspend &adv7533_switch_suspend>;
+               #sound-dai-cells = <1>;
+
+               ports {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       port@0 {
+                               reg = <0>;
+                               adv7533_in: endpoint {
+                                       remote-endpoint = <&dsi0_out>;
+                               };
+                       };
+
+                       port@1 {
+                               reg = <1>;
+                               adv7533_out: endpoint {
+                                       remote-endpoint = <&hdmi_con>;
+                               };
+                       };
+               };
+       };
+};
+
+&blsp_i2c6 {
+       /* On Low speed expansion */
+       status = "okay";
+       label = "LS-I2C1";
+};
+
+&blsp_spi3 {
+       /* On High speed expansion */
+       status = "okay";
+       label = "HS-SPI1";
+};
+
+&blsp_spi5 {
+       /* On Low speed expansion */
+       status = "okay";
+       label = "LS-SPI0";
+};
+
+&blsp1_uart1 {
+       status = "okay";
+       label = "LS-UART0";
+};
+
+&blsp1_uart2 {
+       status = "okay";
+       label = "LS-UART1";
+};
+
+&camss {
+       status = "okay";
+       ports {
+               port@0 {
+                       reg = <0>;
+                       csiphy0_ep: endpoint {
+                               clock-lanes = <1>;
+                               data-lanes = <0 2>;
+                               remote-endpoint = <&ov5640_ep>;
+                               status = "okay";
+                       };
+               };
+       };
+};
+
+&cci {
+       status = "okay";
+};
+
+&cci_i2c0 {
+       camera_rear@3b {
+               compatible = "ovti,ov5640";
+               reg = <0x3b>;
+
+               enable-gpios = <&msmgpio 34 GPIO_ACTIVE_HIGH>;
+               reset-gpios = <&msmgpio 35 GPIO_ACTIVE_LOW>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&camera_rear_default>;
+
+               clocks = <&gcc GCC_CAMSS_MCLK0_CLK>;
+               clock-names = "xclk";
+               clock-frequency = <23880000>;
+
+               vdddo-supply = <&camera_vdddo_1v8>;
+               vdda-supply = <&camera_vdda_2v8>;
+               vddd-supply = <&camera_vddd_1v5>;
+
+               /* No camera mezzanine by default */
+               status = "disabled";
+
+               port {
+                       ov5640_ep: endpoint {
+                               clock-lanes = <1>;
+                               data-lanes = <0 2>;
+                               remote-endpoint = <&csiphy0_ep>;
+                       };
+               };
+       };
+};
+
+&dsi0_out {
+       data-lanes = <0 1 2 3>;
+       remote-endpoint = <&adv7533_in>;
+};
+
+&lpass {
+       status = "okay";
+};
+
+&mdss {
+       status = "okay";
+};
+
+&mpss {
+       status = "okay";
+
+       firmware-name = "qcom/apq8016/mba.mbn", "qcom/apq8016/modem.mbn";
+};
+
+&pm8916_resin {
+       status = "okay";
+       linux,code = <KEY_VOLUMEDOWN>;
+};
+
+&pronto {
+       status = "okay";
+
+       firmware-name = "qcom/apq8016/wcnss.mbn";
+};
+
+&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";
+
+       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";
+
+       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";
+       qcom,model = "DB410c";
+       qcom,audio-routing =
+               "AMIC2", "MIC BIAS Internal2",
+               "AMIC3", "MIC BIAS External1";
+
+       external-dai-link@0 {
+               link-name = "ADV7533";
+               cpu {
+                       sound-dai = <&lpass MI2S_QUATERNARY>;
+               };
+               codec {
+                       sound-dai = <&adv_bridge 0>;
+               };
+       };
+
+       internal-codec-playback-dai-link@0 {
+               link-name = "WCD";
+               cpu {
+                       sound-dai = <&lpass MI2S_PRIMARY>;
+               };
+               codec {
+                       sound-dai = <&lpass_codec 0>, <&wcd_codec 0>;
+               };
+       };
+
+       internal-codec-capture-dai-link@0 {
+               link-name = "WCD-Capture";
+               cpu {
+                       sound-dai = <&lpass MI2S_TERTIARY>;
+               };
+               codec {
+                       sound-dai = <&lpass_codec 1>, <&wcd_codec 1>;
+               };
+       };
+};
+
+&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>;
+};
+
+&usb_hs_phy {
+       extcon = <&usb_id>;
+};
+
+&wcd_codec {
+       clocks = <&gcc GCC_CODEC_DIGCODEC_CLK>;
+       clock-names = "mclk";
+       qcom,mbhc-vthreshold-low = <75 150 237 450 500>;
+       qcom,mbhc-vthreshold-high = <75 150 237 450 500>;
+};
+
+&wcnss_ctrl {
+       firmware-name = "qcom/apq8016/WCNSS_qcom_wlan_nv_sbc.bin";
+};
+
+/* Enable CoreSight */
+&cti0 { status = "okay"; };
+&cti1 { status = "okay"; };
+&cti12 { status = "okay"; };
+&cti13 { status = "okay"; };
+&cti14 { status = "okay"; };
+&cti15 { status = "okay"; };
+&debug0 { status = "okay"; };
+&debug1 { status = "okay"; };
+&debug2 { status = "okay"; };
+&debug3 { status = "okay"; };
+&etf { status = "okay"; };
+&etm0 { status = "okay"; };
+&etm1 { status = "okay"; };
+&etm2 { status = "okay"; };
+&etm3 { status = "okay"; };
+&etr { status = "okay"; };
+&funnel0 { status = "okay"; };
+&funnel1 { status = "okay"; };
+&replicator { status = "okay"; };
+&stm { status = "okay"; };
+&tpiu { status = "okay"; };
+
+&smd_rpm_regulators {
+       vdd_l1_l2_l3-supply = <&pm8916_s3>;
+       vdd_l4_l5_l6-supply = <&pm8916_s4>;
+       vdd_l7-supply = <&pm8916_s4>;
+
+       s3 {
+               regulator-min-microvolt = <375000>;
+               regulator-max-microvolt = <1562000>;
+       };
+
+       s4 {
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+
+               regulator-always-on;
+               regulator-boot-on;
+       };
+
+       l1 {
+               regulator-min-microvolt = <375000>;
+               regulator-max-microvolt = <1525000>;
+       };
+
+       l2 {
+               regulator-min-microvolt = <1200000>;
+               regulator-max-microvolt = <1200000>;
+       };
+
+       l4 {
+               regulator-min-microvolt = <1750000>;
+               regulator-max-microvolt = <3337000>;
+       };
+
+       l5 {
+               regulator-min-microvolt = <1750000>;
+               regulator-max-microvolt = <3337000>;
+       };
+
+       l6 {
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+       };
+
+       l7 {
+               regulator-min-microvolt = <1750000>;
+               regulator-max-microvolt = <3337000>;
+       };
+
+       l8 {
+               regulator-min-microvolt = <1750000>;
+               regulator-max-microvolt = <3337000>;
+       };
+
+       l9 {
+               regulator-min-microvolt = <1750000>;
+               regulator-max-microvolt = <3337000>;
+       };
+
+       l10 {
+               regulator-min-microvolt = <1750000>;
+               regulator-max-microvolt = <3337000>;
+       };
+
+       l11 {
+               regulator-min-microvolt = <1750000>;
+               regulator-max-microvolt = <3337000>;
+               regulator-allow-set-load;
+               regulator-system-load = <200000>;
+       };
+
+       l12 {
+               regulator-min-microvolt = <1750000>;
+               regulator-max-microvolt = <3337000>;
+       };
+
+       l13 {
+               regulator-min-microvolt = <1750000>;
+               regulator-max-microvolt = <3337000>;
+       };
+
+       l14 {
+               regulator-min-microvolt = <1750000>;
+               regulator-max-microvolt = <3337000>;
+       };
+
+       /**
+        * 1.8v required on LS expansion
+        * for mezzanine boards
+        */
+       l15 {
+               regulator-min-microvolt = <1750000>;
+               regulator-max-microvolt = <3337000>;
+               regulator-always-on;
+       };
+
+       l16 {
+               regulator-min-microvolt = <1750000>;
+               regulator-max-microvolt = <3337000>;
+       };
+
+       l17 {
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+       };
+
+       l18 {
+               regulator-min-microvolt = <1750000>;
+               regulator-max-microvolt = <3337000>;
+       };
+};
+
+/*
+ * 2mA drive strength is not enough when connecting multiple
+ * I2C devices with different pull up resistors.
+ */
+&i2c2_default {
+       drive-strength = <16>;
+};
+
+&i2c4_default {
+       drive-strength = <16>;
+};
+
+&i2c6_default {
+       drive-strength = <16>;
+};
+
+/*
+ * GPIO name legend: proper name = the GPIO line is used as GPIO
+ *         NC = not connected (pin out but not routed from the chip to
+ *              anything the board)
+ *         "[PER]" = pin is muxed for [peripheral] (not GPIO)
+ *         LSEC = Low Speed External Connector
+ *         HSEC = High Speed External Connector
+ *
+ * Line names are taken from the schematic "DragonBoard410c"
+ * dated monday, august 31, 2015. Page 5 in particular.
+ *
+ * For the lines routed to the external connectors the
+ * lines are named after the 96Boards CE Specification 1.0,
+ * Appendix "Expansion Connector Signal Description".
+ *
+ * When the 96Board naming of a line and the schematic name of
+ * the same line are in conflict, the 96Board specification
+ * takes precedence, which means that the external UART on the
+ * LSEC is named UART0 while the schematic and SoC names this
+ * UART3. This is only for the informational lines i.e. "[FOO]",
+ * the GPIO named lines "GPIO-A" thru "GPIO-L" are the only
+ * ones actually used for GPIO.
+ */
+
+&msmgpio {
+       gpio-line-names =
+               "[UART0_TX]", /* GPIO_0, LSEC pin 5 */
+               "[UART0_RX]", /* GPIO_1, LSEC pin 7 */
+               "[UART0_CTS_N]", /* GPIO_2, LSEC pin 3 */
+               "[UART0_RTS_N]", /* GPIO_3, LSEC pin 9 */
+               "[UART1_TX]", /* GPIO_4, LSEC pin 11 */
+               "[UART1_RX]", /* GPIO_5, LSEC pin 13 */
+               "[I2C0_SDA]", /* GPIO_8, LSEC pin 17 */
+               "[I2C0_SCL]", /* GPIO_7, LSEC pin 15 */
+               "[SPI1_DOUT]", /* SPI1_MOSI, HSEC pin 1 */
+               "[SPI1_DIN]", /* SPI1_MISO, HSEC pin 11 */
+               "[SPI1_CS]", /* SPI1_CS_N, HSEC pin 7 */
+               "[SPI1_SCLK]", /* SPI1_CLK, HSEC pin 9 */
+               "GPIO-B", /* LS_EXP_GPIO_B, LSEC pin 24 */
+               "GPIO-C", /* LS_EXP_GPIO_C, LSEC pin 25 */
+               "[I2C3_SDA]", /* HSEC pin 38 */
+               "[I2C3_SCL]", /* HSEC pin 36 */
+               "[SPI0_MOSI]", /* LSEC pin 14 */
+               "[SPI0_MISO]", /* LSEC pin 10 */
+               "[SPI0_CS_N]", /* LSEC pin 12 */
+               "[SPI0_CLK]", /* LSEC pin 8 */
+               "HDMI_HPD_N", /* GPIO 20 */
+               "USR_LED_1_CTRL",
+               "[I2C1_SDA]", /* GPIO_22, LSEC pin 21 */
+               "[I2C1_SCL]", /* GPIO_23, LSEC pin 19 */
+               "GPIO-G", /* LS_EXP_GPIO_G, LSEC pin 29 */
+               "GPIO-H", /* LS_EXP_GPIO_H, LSEC pin 30 */
+               "[CSI0_MCLK]", /* HSEC pin 15 */
+               "[CSI1_MCLK]", /* HSEC pin 17 */
+               "GPIO-K", /* LS_EXP_GPIO_K, LSEC pin 33 */
+               "[I2C2_SDA]", /* HSEC pin 34 */
+               "[I2C2_SCL]", /* HSEC pin 32 */
+               "DSI2HDMI_INT_N",
+               "DSI_SW_SEL_APQ",
+               "GPIO-L", /* LS_EXP_GPIO_L, LSEC pin 34 */
+               "GPIO-J", /* LS_EXP_GPIO_J, LSEC pin 32 */
+               "GPIO-I", /* LS_EXP_GPIO_I, LSEC pin 31 */
+               "GPIO-A", /* LS_EXP_GPIO_A, LSEC pin 23 */
+               "FORCED_USB_BOOT",
+               "SD_CARD_DET_N",
+               "[WCSS_BT_SSBI]",
+               "[WCSS_WLAN_DATA_2]", /* GPIO 40 */
+               "[WCSS_WLAN_DATA_1]",
+               "[WCSS_WLAN_DATA_0]",
+               "[WCSS_WLAN_SET]",
+               "[WCSS_WLAN_CLK]",
+               "[WCSS_FM_SSBI]",
+               "[WCSS_FM_SDI]",
+               "[WCSS_BT_DAT_CTL]",
+               "[WCSS_BT_DAT_STB]",
+               "NC",
+               "NC", /* GPIO 50 */
+               "NC",
+               "NC",
+               "NC",
+               "NC",
+               "NC",
+               "NC",
+               "NC",
+               "NC",
+               "NC",
+               "NC", /* GPIO 60 */
+               "NC",
+               "NC",
+               "[CDC_PDM0_CLK]",
+               "[CDC_PDM0_SYNC]",
+               "[CDC_PDM0_TX0]",
+               "[CDC_PDM0_RX0]",
+               "[CDC_PDM0_RX1]",
+               "[CDC_PDM0_RX2]",
+               "GPIO-D", /* LS_EXP_GPIO_D, LSEC pin 26 */
+               "NC", /* GPIO 70 */
+               "NC",
+               "NC",
+               "NC",
+               "NC", /* GPIO 74 */
+               "NC",
+               "NC",
+               "NC",
+               "NC",
+               "NC",
+               "BOOT_CONFIG_0", /* GPIO 80 */
+               "BOOT_CONFIG_1",
+               "BOOT_CONFIG_2",
+               "BOOT_CONFIG_3",
+               "NC",
+               "NC",
+               "BOOT_CONFIG_5",
+               "NC",
+               "NC",
+               "NC",
+               "NC", /* GPIO 90 */
+               "NC",
+               "NC",
+               "NC",
+               "NC",
+               "NC",
+               "NC",
+               "NC",
+               "NC",
+               "NC",
+               "NC", /* GPIO 100 */
+               "NC",
+               "NC",
+               "NC",
+               "SSBI_GPS",
+               "NC",
+               "NC",
+               "KEY_VOLP_N",
+               "NC",
+               "NC",
+               "[LS_EXP_MI2S_WS]", /* GPIO 110 */
+               "NC",
+               "NC",
+               "[LS_EXP_MI2S_SCK]",
+               "[LS_EXP_MI2S_DATA0]",
+               "GPIO-E", /* LS_EXP_GPIO_E, LSEC pin 27 */
+               "NC",
+               "[DSI2HDMI_MI2S_WS]",
+               "[DSI2HDMI_MI2S_SCK]",
+               "[DSI2HDMI_MI2S_DATA0]",
+               "USR_LED_2_CTRL", /* GPIO 120 */
+               "SB_HS_ID";
+
+       msmgpio_leds: msmgpio-leds {
+               pins = "gpio21", "gpio120";
+               function = "gpio";
+
+               output-low;
+       };
+
+       usb_id_default: usb-id-default {
+               pins = "gpio121";
+               function = "gpio";
+
+               drive-strength = <8>;
+               input-enable;
+               bias-pull-up;
+       };
+
+       adv7533_int_active: adv533-int-active {
+               pins = "gpio31";
+               function = "gpio";
+
+               drive-strength = <16>;
+               bias-disable;
+       };
+
+       adv7533_int_suspend: adv7533-int-suspend {
+               pins = "gpio31";
+               function = "gpio";
+
+               drive-strength = <2>;
+               bias-disable;
+       };
+
+       adv7533_switch_active: adv7533-switch-active {
+               pins = "gpio32";
+               function = "gpio";
+
+               drive-strength = <16>;
+               bias-disable;
+       };
+
+       adv7533_switch_suspend: adv7533-switch-suspend {
+               pins = "gpio32";
+               function = "gpio";
+
+               drive-strength = <2>;
+               bias-disable;
+       };
+
+       msm_key_volp_n_default: msm-key-volp-n-default {
+               pins = "gpio107";
+               function = "gpio";
+
+               drive-strength = <8>;
+               input-enable;
+               bias-pull-up;
+       };
+};
+
+&pm8916_gpios {
+       gpio-line-names =
+               "USR_LED_3_CTRL",
+               "USR_LED_4_CTRL",
+               "USB_HUB_RESET_N_PM",
+               "USB_SW_SEL_PM";
+
+       usb_hub_reset_pm: usb-hub-reset-pm {
+               pins = "gpio3";
+               function = PMIC_GPIO_FUNC_NORMAL;
+
+               input-disable;
+               output-high;
+       };
+
+       usb_hub_reset_pm_device: usb-hub-reset-pm-device {
+               pins = "gpio3";
+               function = PMIC_GPIO_FUNC_NORMAL;
+
+               output-low;
+       };
+
+       usb_sw_sel_pm: usb-sw-sel-pm {
+               pins = "gpio4";
+               function = PMIC_GPIO_FUNC_NORMAL;
+
+               power-source = <PM8916_GPIO_VPH>;
+               input-disable;
+               output-high;
+       };
+
+       usb_sw_sel_pm_device: usb-sw-sel-pm-device {
+               pins = "gpio4";
+               function = PMIC_GPIO_FUNC_NORMAL;
+
+               power-source = <PM8916_GPIO_VPH>;
+               input-disable;
+               output-low;
+       };
+
+       pm8916_gpios_leds: pm8916-gpios-leds {
+               pins = "gpio1", "gpio2";
+               function = PMIC_GPIO_FUNC_NORMAL;
+
+               output-low;
+       };
+};
+
+&pm8916_mpps {
+       gpio-line-names =
+               "VDD_PX_BIAS",
+               "WLAN_LED_CTRL",
+               "BT_LED_CTRL",
+               "GPIO-F"; /* LS_EXP_GPIO_F, LSEC pin 28 */
+
+       pinctrl-names = "default";
+       pinctrl-0 = <&ls_exp_gpio_f>;
+
+       ls_exp_gpio_f: pm8916-mpp4-state {
+               pins = "mpp4";
+               function = "digital";
+
+               output-low;
+               power-source = <PM8916_MPP_L5>; // 1.8V
+       };
+
+       pm8916_mpps_leds: pm8916-mpps-state {
+               pins = "mpp2", "mpp3";
+               function = "digital";
+
+               output-low;
+       };
 };
diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
deleted file mode 100644 (file)
index 1c09709..0000000
+++ /dev/null
@@ -1,838 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright (c) 2015, The Linux Foundation. All rights reserved.
- */
-
-#include "msm8916-pm8916.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
-#include <dt-bindings/pinctrl/qcom,pmic-mpp.h>
-#include <dt-bindings/sound/apq8016-lpass.h>
-
-/ {
-       aliases {
-               serial0 = &blsp1_uart2;
-               serial1 = &blsp1_uart1;
-               usid0 = &pm8916_0;
-               i2c0    = &blsp_i2c2;
-               i2c1    = &blsp_i2c6;
-               i2c3    = &blsp_i2c4;
-               spi0    = &blsp_spi5;
-               spi1    = &blsp_spi3;
-       };
-
-       chosen {
-               stdout-path = "serial0";
-       };
-
-       camera_vdddo_1v8: camera-vdddo-1v8 {
-               compatible = "regulator-fixed";
-               regulator-name = "camera_vdddo";
-               regulator-min-microvolt = <1800000>;
-               regulator-max-microvolt = <1800000>;
-               regulator-always-on;
-       };
-
-       camera_vdda_2v8: camera-vdda-2v8 {
-               compatible = "regulator-fixed";
-               regulator-name = "camera_vdda";
-               regulator-min-microvolt = <2800000>;
-               regulator-max-microvolt = <2800000>;
-               regulator-always-on;
-       };
-
-       camera_vddd_1v5: camera-vddd-1v5 {
-               compatible = "regulator-fixed";
-               regulator-name = "camera_vddd";
-               regulator-min-microvolt = <1500000>;
-               regulator-max-microvolt = <1500000>;
-               regulator-always-on;
-       };
-
-       reserved-memory {
-               ramoops@bff00000 {
-                       compatible = "ramoops";
-                       reg = <0x0 0xbff00000 0x0 0x100000>;
-
-                       record-size = <0x20000>;
-                       console-size = <0x20000>;
-                       ftrace-size = <0x20000>;
-               };
-       };
-
-       usb2513 {
-               compatible = "smsc,usb3503";
-               reset-gpios = <&pm8916_gpios 3 GPIO_ACTIVE_LOW>;
-               initial-mode = <1>;
-       };
-
-       usb_id: usb-id {
-               compatible = "linux,extcon-usb-gpio";
-               id-gpio = <&msmgpio 121 GPIO_ACTIVE_HIGH>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&usb_id_default>;
-       };
-
-       hdmi-out {
-               compatible = "hdmi-connector";
-               type = "a";
-
-               port {
-                       hdmi_con: endpoint {
-                               remote-endpoint = <&adv7533_out>;
-                       };
-               };
-       };
-
-       gpio-keys {
-               compatible = "gpio-keys";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               autorepeat;
-
-               pinctrl-names = "default";
-               pinctrl-0 = <&msm_key_volp_n_default>;
-
-               button@0 {
-                       label = "Volume Up";
-                       linux,code = <KEY_VOLUMEUP>;
-                       gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;
-               };
-       };
-
-       leds {
-               pinctrl-names = "default";
-               pinctrl-0 = <&msmgpio_leds>,
-                           <&pm8916_gpios_leds>,
-                           <&pm8916_mpps_leds>;
-
-               compatible = "gpio-leds";
-
-               led@1 {
-                       label = "apq8016-sbc:green:user1";
-                       gpios = <&msmgpio 21 GPIO_ACTIVE_HIGH>;
-                       linux,default-trigger = "heartbeat";
-                       default-state = "off";
-               };
-
-               led@2 {
-                       label = "apq8016-sbc:green:user2";
-                       gpios = <&msmgpio 120 GPIO_ACTIVE_HIGH>;
-                       linux,default-trigger = "mmc0";
-                       default-state = "off";
-               };
-
-               led@3 {
-                       label = "apq8016-sbc:green:user3";
-                       gpios = <&pm8916_gpios 1 GPIO_ACTIVE_HIGH>;
-                       linux,default-trigger = "mmc1";
-                       default-state = "off";
-               };
-
-               led@4 {
-                       label = "apq8016-sbc:green:user4";
-                       gpios = <&pm8916_gpios 2 GPIO_ACTIVE_HIGH>;
-                       linux,default-trigger = "none";
-                       panic-indicator;
-                       default-state = "off";
-               };
-
-               led@5 {
-                       label = "apq8016-sbc:yellow:wlan";
-                       gpios = <&pm8916_mpps 2 GPIO_ACTIVE_HIGH>;
-                       linux,default-trigger = "phy0tx";
-                       default-state = "off";
-               };
-
-               led@6 {
-                       label = "apq8016-sbc:blue:bt";
-                       gpios = <&pm8916_mpps 3 GPIO_ACTIVE_HIGH>;
-                       linux,default-trigger = "bluetooth-power";
-                       default-state = "off";
-               };
-       };
-};
-
-&blsp_dma {
-       status = "okay";
-};
-
-&blsp_i2c2 {
-       /* On Low speed expansion */
-       status = "okay";
-       label = "LS-I2C0";
-};
-
-&blsp_i2c4 {
-       /* On High speed expansion */
-       status = "okay";
-       label = "HS-I2C2";
-
-       adv_bridge: bridge@39 {
-               status = "okay";
-
-               compatible = "adi,adv7533";
-               reg = <0x39>;
-
-               interrupt-parent = <&msmgpio>;
-               interrupts = <31 IRQ_TYPE_EDGE_FALLING>;
-
-               adi,dsi-lanes = <4>;
-               clocks = <&rpmcc RPM_SMD_BB_CLK2>;
-               clock-names = "cec";
-
-               pd-gpios = <&msmgpio 32 GPIO_ACTIVE_HIGH>;
-
-               avdd-supply = <&pm8916_l6>;
-               v1p2-supply = <&pm8916_l6>;
-               v3p3-supply = <&pm8916_l17>;
-
-               pinctrl-names = "default","sleep";
-               pinctrl-0 = <&adv7533_int_active &adv7533_switch_active>;
-               pinctrl-1 = <&adv7533_int_suspend &adv7533_switch_suspend>;
-               #sound-dai-cells = <1>;
-
-               ports {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       port@0 {
-                               reg = <0>;
-                               adv7533_in: endpoint {
-                                       remote-endpoint = <&dsi0_out>;
-                               };
-                       };
-
-                       port@1 {
-                               reg = <1>;
-                               adv7533_out: endpoint {
-                                       remote-endpoint = <&hdmi_con>;
-                               };
-                       };
-               };
-       };
-};
-
-&blsp_i2c6 {
-       /* On Low speed expansion */
-       status = "okay";
-       label = "LS-I2C1";
-};
-
-&blsp_spi3 {
-       /* On High speed expansion */
-       status = "okay";
-       label = "HS-SPI1";
-};
-
-&blsp_spi5 {
-       /* On Low speed expansion */
-       status = "okay";
-       label = "LS-SPI0";
-};
-
-&blsp1_uart1 {
-       status = "okay";
-       label = "LS-UART0";
-};
-
-&blsp1_uart2 {
-       status = "okay";
-       label = "LS-UART1";
-};
-
-&camss {
-       status = "okay";
-       ports {
-               port@0 {
-                       reg = <0>;
-                       csiphy0_ep: endpoint {
-                               clock-lanes = <1>;
-                               data-lanes = <0 2>;
-                               remote-endpoint = <&ov5640_ep>;
-                               status = "okay";
-                       };
-               };
-       };
-};
-
-&cci {
-       status = "okay";
-};
-
-&cci_i2c0 {
-       camera_rear@3b {
-               compatible = "ovti,ov5640";
-               reg = <0x3b>;
-
-               enable-gpios = <&msmgpio 34 GPIO_ACTIVE_HIGH>;
-               reset-gpios = <&msmgpio 35 GPIO_ACTIVE_LOW>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&camera_rear_default>;
-
-               clocks = <&gcc GCC_CAMSS_MCLK0_CLK>;
-               clock-names = "xclk";
-               clock-frequency = <23880000>;
-
-               vdddo-supply = <&camera_vdddo_1v8>;
-               vdda-supply = <&camera_vdda_2v8>;
-               vddd-supply = <&camera_vddd_1v5>;
-
-               /* No camera mezzanine by default */
-               status = "disabled";
-
-               port {
-                       ov5640_ep: endpoint {
-                               clock-lanes = <1>;
-                               data-lanes = <0 2>;
-                               remote-endpoint = <&csiphy0_ep>;
-                       };
-               };
-       };
-};
-
-&dsi0_out {
-       data-lanes = <0 1 2 3>;
-       remote-endpoint = <&adv7533_in>;
-};
-
-&lpass {
-       status = "okay";
-};
-
-&mdss {
-       status = "okay";
-};
-
-&mpss {
-       status = "okay";
-
-       firmware-name = "qcom/apq8016/mba.mbn", "qcom/apq8016/modem.mbn";
-};
-
-&pm8916_resin {
-       status = "okay";
-       linux,code = <KEY_VOLUMEDOWN>;
-};
-
-&pronto {
-       status = "okay";
-
-       firmware-name = "qcom/apq8016/wcnss.mbn";
-};
-
-&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";
-
-       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";
-
-       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";
-       qcom,model = "DB410c";
-       qcom,audio-routing =
-               "AMIC2", "MIC BIAS Internal2",
-               "AMIC3", "MIC BIAS External1";
-
-       external-dai-link@0 {
-               link-name = "ADV7533";
-               cpu {
-                       sound-dai = <&lpass MI2S_QUATERNARY>;
-               };
-               codec {
-                       sound-dai = <&adv_bridge 0>;
-               };
-       };
-
-       internal-codec-playback-dai-link@0 {
-               link-name = "WCD";
-               cpu {
-                       sound-dai = <&lpass MI2S_PRIMARY>;
-               };
-               codec {
-                       sound-dai = <&lpass_codec 0>, <&wcd_codec 0>;
-               };
-       };
-
-       internal-codec-capture-dai-link@0 {
-               link-name = "WCD-Capture";
-               cpu {
-                       sound-dai = <&lpass MI2S_TERTIARY>;
-               };
-               codec {
-                       sound-dai = <&lpass_codec 1>, <&wcd_codec 1>;
-               };
-       };
-};
-
-&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>;
-};
-
-&usb_hs_phy {
-       extcon = <&usb_id>;
-};
-
-&wcd_codec {
-       clocks = <&gcc GCC_CODEC_DIGCODEC_CLK>;
-       clock-names = "mclk";
-       qcom,mbhc-vthreshold-low = <75 150 237 450 500>;
-       qcom,mbhc-vthreshold-high = <75 150 237 450 500>;
-};
-
-&wcnss_ctrl {
-       firmware-name = "qcom/apq8016/WCNSS_qcom_wlan_nv_sbc.bin";
-};
-
-/* Enable CoreSight */
-&cti0 { status = "okay"; };
-&cti1 { status = "okay"; };
-&cti12 { status = "okay"; };
-&cti13 { status = "okay"; };
-&cti14 { status = "okay"; };
-&cti15 { status = "okay"; };
-&debug0 { status = "okay"; };
-&debug1 { status = "okay"; };
-&debug2 { status = "okay"; };
-&debug3 { status = "okay"; };
-&etf { status = "okay"; };
-&etm0 { status = "okay"; };
-&etm1 { status = "okay"; };
-&etm2 { status = "okay"; };
-&etm3 { status = "okay"; };
-&etr { status = "okay"; };
-&funnel0 { status = "okay"; };
-&funnel1 { status = "okay"; };
-&replicator { status = "okay"; };
-&stm { status = "okay"; };
-&tpiu { status = "okay"; };
-
-&smd_rpm_regulators {
-       vdd_l1_l2_l3-supply = <&pm8916_s3>;
-       vdd_l4_l5_l6-supply = <&pm8916_s4>;
-       vdd_l7-supply = <&pm8916_s4>;
-
-       s3 {
-               regulator-min-microvolt = <375000>;
-               regulator-max-microvolt = <1562000>;
-       };
-
-       s4 {
-               regulator-min-microvolt = <1800000>;
-               regulator-max-microvolt = <1800000>;
-
-               regulator-always-on;
-               regulator-boot-on;
-       };
-
-       l1 {
-               regulator-min-microvolt = <375000>;
-               regulator-max-microvolt = <1525000>;
-       };
-
-       l2 {
-               regulator-min-microvolt = <1200000>;
-               regulator-max-microvolt = <1200000>;
-       };
-
-       l4 {
-               regulator-min-microvolt = <1750000>;
-               regulator-max-microvolt = <3337000>;
-       };
-
-       l5 {
-               regulator-min-microvolt = <1750000>;
-               regulator-max-microvolt = <3337000>;
-       };
-
-       l6 {
-               regulator-min-microvolt = <1800000>;
-               regulator-max-microvolt = <1800000>;
-       };
-
-       l7 {
-               regulator-min-microvolt = <1750000>;
-               regulator-max-microvolt = <3337000>;
-       };
-
-       l8 {
-               regulator-min-microvolt = <1750000>;
-               regulator-max-microvolt = <3337000>;
-       };
-
-       l9 {
-               regulator-min-microvolt = <1750000>;
-               regulator-max-microvolt = <3337000>;
-       };
-
-       l10 {
-               regulator-min-microvolt = <1750000>;
-               regulator-max-microvolt = <3337000>;
-       };
-
-       l11 {
-               regulator-min-microvolt = <1750000>;
-               regulator-max-microvolt = <3337000>;
-               regulator-allow-set-load;
-               regulator-system-load = <200000>;
-       };
-
-       l12 {
-               regulator-min-microvolt = <1750000>;
-               regulator-max-microvolt = <3337000>;
-       };
-
-       l13 {
-               regulator-min-microvolt = <1750000>;
-               regulator-max-microvolt = <3337000>;
-       };
-
-       l14 {
-               regulator-min-microvolt = <1750000>;
-               regulator-max-microvolt = <3337000>;
-       };
-
-       /**
-        * 1.8v required on LS expansion
-        * for mezzanine boards
-        */
-       l15 {
-               regulator-min-microvolt = <1750000>;
-               regulator-max-microvolt = <3337000>;
-               regulator-always-on;
-       };
-
-       l16 {
-               regulator-min-microvolt = <1750000>;
-               regulator-max-microvolt = <3337000>;
-       };
-
-       l17 {
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-       };
-
-       l18 {
-               regulator-min-microvolt = <1750000>;
-               regulator-max-microvolt = <3337000>;
-       };
-};
-
-/*
- * 2mA drive strength is not enough when connecting multiple
- * I2C devices with different pull up resistors.
- */
-&i2c2_default {
-       drive-strength = <16>;
-};
-
-&i2c4_default {
-       drive-strength = <16>;
-};
-
-&i2c6_default {
-       drive-strength = <16>;
-};
-
-/*
- * GPIO name legend: proper name = the GPIO line is used as GPIO
- *         NC = not connected (pin out but not routed from the chip to
- *              anything the board)
- *         "[PER]" = pin is muxed for [peripheral] (not GPIO)
- *         LSEC = Low Speed External Connector
- *         HSEC = High Speed External Connector
- *
- * Line names are taken from the schematic "DragonBoard410c"
- * dated monday, august 31, 2015. Page 5 in particular.
- *
- * For the lines routed to the external connectors the
- * lines are named after the 96Boards CE Specification 1.0,
- * Appendix "Expansion Connector Signal Description".
- *
- * When the 96Board naming of a line and the schematic name of
- * the same line are in conflict, the 96Board specification
- * takes precedence, which means that the external UART on the
- * LSEC is named UART0 while the schematic and SoC names this
- * UART3. This is only for the informational lines i.e. "[FOO]",
- * the GPIO named lines "GPIO-A" thru "GPIO-L" are the only
- * ones actually used for GPIO.
- */
-
-&msmgpio {
-       gpio-line-names =
-               "[UART0_TX]", /* GPIO_0, LSEC pin 5 */
-               "[UART0_RX]", /* GPIO_1, LSEC pin 7 */
-               "[UART0_CTS_N]", /* GPIO_2, LSEC pin 3 */
-               "[UART0_RTS_N]", /* GPIO_3, LSEC pin 9 */
-               "[UART1_TX]", /* GPIO_4, LSEC pin 11 */
-               "[UART1_RX]", /* GPIO_5, LSEC pin 13 */
-               "[I2C0_SDA]", /* GPIO_8, LSEC pin 17 */
-               "[I2C0_SCL]", /* GPIO_7, LSEC pin 15 */
-               "[SPI1_DOUT]", /* SPI1_MOSI, HSEC pin 1 */
-               "[SPI1_DIN]", /* SPI1_MISO, HSEC pin 11 */
-               "[SPI1_CS]", /* SPI1_CS_N, HSEC pin 7 */
-               "[SPI1_SCLK]", /* SPI1_CLK, HSEC pin 9 */
-               "GPIO-B", /* LS_EXP_GPIO_B, LSEC pin 24 */
-               "GPIO-C", /* LS_EXP_GPIO_C, LSEC pin 25 */
-               "[I2C3_SDA]", /* HSEC pin 38 */
-               "[I2C3_SCL]", /* HSEC pin 36 */
-               "[SPI0_MOSI]", /* LSEC pin 14 */
-               "[SPI0_MISO]", /* LSEC pin 10 */
-               "[SPI0_CS_N]", /* LSEC pin 12 */
-               "[SPI0_CLK]", /* LSEC pin 8 */
-               "HDMI_HPD_N", /* GPIO 20 */
-               "USR_LED_1_CTRL",
-               "[I2C1_SDA]", /* GPIO_22, LSEC pin 21 */
-               "[I2C1_SCL]", /* GPIO_23, LSEC pin 19 */
-               "GPIO-G", /* LS_EXP_GPIO_G, LSEC pin 29 */
-               "GPIO-H", /* LS_EXP_GPIO_H, LSEC pin 30 */
-               "[CSI0_MCLK]", /* HSEC pin 15 */
-               "[CSI1_MCLK]", /* HSEC pin 17 */
-               "GPIO-K", /* LS_EXP_GPIO_K, LSEC pin 33 */
-               "[I2C2_SDA]", /* HSEC pin 34 */
-               "[I2C2_SCL]", /* HSEC pin 32 */
-               "DSI2HDMI_INT_N",
-               "DSI_SW_SEL_APQ",
-               "GPIO-L", /* LS_EXP_GPIO_L, LSEC pin 34 */
-               "GPIO-J", /* LS_EXP_GPIO_J, LSEC pin 32 */
-               "GPIO-I", /* LS_EXP_GPIO_I, LSEC pin 31 */
-               "GPIO-A", /* LS_EXP_GPIO_A, LSEC pin 23 */
-               "FORCED_USB_BOOT",
-               "SD_CARD_DET_N",
-               "[WCSS_BT_SSBI]",
-               "[WCSS_WLAN_DATA_2]", /* GPIO 40 */
-               "[WCSS_WLAN_DATA_1]",
-               "[WCSS_WLAN_DATA_0]",
-               "[WCSS_WLAN_SET]",
-               "[WCSS_WLAN_CLK]",
-               "[WCSS_FM_SSBI]",
-               "[WCSS_FM_SDI]",
-               "[WCSS_BT_DAT_CTL]",
-               "[WCSS_BT_DAT_STB]",
-               "NC",
-               "NC", /* GPIO 50 */
-               "NC",
-               "NC",
-               "NC",
-               "NC",
-               "NC",
-               "NC",
-               "NC",
-               "NC",
-               "NC",
-               "NC", /* GPIO 60 */
-               "NC",
-               "NC",
-               "[CDC_PDM0_CLK]",
-               "[CDC_PDM0_SYNC]",
-               "[CDC_PDM0_TX0]",
-               "[CDC_PDM0_RX0]",
-               "[CDC_PDM0_RX1]",
-               "[CDC_PDM0_RX2]",
-               "GPIO-D", /* LS_EXP_GPIO_D, LSEC pin 26 */
-               "NC", /* GPIO 70 */
-               "NC",
-               "NC",
-               "NC",
-               "NC", /* GPIO 74 */
-               "NC",
-               "NC",
-               "NC",
-               "NC",
-               "NC",
-               "BOOT_CONFIG_0", /* GPIO 80 */
-               "BOOT_CONFIG_1",
-               "BOOT_CONFIG_2",
-               "BOOT_CONFIG_3",
-               "NC",
-               "NC",
-               "BOOT_CONFIG_5",
-               "NC",
-               "NC",
-               "NC",
-               "NC", /* GPIO 90 */
-               "NC",
-               "NC",
-               "NC",
-               "NC",
-               "NC",
-               "NC",
-               "NC",
-               "NC",
-               "NC",
-               "NC", /* GPIO 100 */
-               "NC",
-               "NC",
-               "NC",
-               "SSBI_GPS",
-               "NC",
-               "NC",
-               "KEY_VOLP_N",
-               "NC",
-               "NC",
-               "[LS_EXP_MI2S_WS]", /* GPIO 110 */
-               "NC",
-               "NC",
-               "[LS_EXP_MI2S_SCK]",
-               "[LS_EXP_MI2S_DATA0]",
-               "GPIO-E", /* LS_EXP_GPIO_E, LSEC pin 27 */
-               "NC",
-               "[DSI2HDMI_MI2S_WS]",
-               "[DSI2HDMI_MI2S_SCK]",
-               "[DSI2HDMI_MI2S_DATA0]",
-               "USR_LED_2_CTRL", /* GPIO 120 */
-               "SB_HS_ID";
-
-       msmgpio_leds: msmgpio-leds {
-               pins = "gpio21", "gpio120";
-               function = "gpio";
-
-               output-low;
-       };
-
-       usb_id_default: usb-id-default {
-               pins = "gpio121";
-               function = "gpio";
-
-               drive-strength = <8>;
-               input-enable;
-               bias-pull-up;
-       };
-
-       adv7533_int_active: adv533-int-active {
-               pins = "gpio31";
-               function = "gpio";
-
-               drive-strength = <16>;
-               bias-disable;
-       };
-
-       adv7533_int_suspend: adv7533-int-suspend {
-               pins = "gpio31";
-               function = "gpio";
-
-               drive-strength = <2>;
-               bias-disable;
-       };
-
-       adv7533_switch_active: adv7533-switch-active {
-               pins = "gpio32";
-               function = "gpio";
-
-               drive-strength = <16>;
-               bias-disable;
-       };
-
-       adv7533_switch_suspend: adv7533-switch-suspend {
-               pins = "gpio32";
-               function = "gpio";
-
-               drive-strength = <2>;
-               bias-disable;
-       };
-
-       msm_key_volp_n_default: msm-key-volp-n-default {
-               pins = "gpio107";
-               function = "gpio";
-
-               drive-strength = <8>;
-               input-enable;
-               bias-pull-up;
-       };
-};
-
-&pm8916_gpios {
-       gpio-line-names =
-               "USR_LED_3_CTRL",
-               "USR_LED_4_CTRL",
-               "USB_HUB_RESET_N_PM",
-               "USB_SW_SEL_PM";
-
-       usb_hub_reset_pm: usb-hub-reset-pm {
-               pins = "gpio3";
-               function = PMIC_GPIO_FUNC_NORMAL;
-
-               input-disable;
-               output-high;
-       };
-
-       usb_hub_reset_pm_device: usb-hub-reset-pm-device {
-               pins = "gpio3";
-               function = PMIC_GPIO_FUNC_NORMAL;
-
-               output-low;
-       };
-
-       usb_sw_sel_pm: usb-sw-sel-pm {
-               pins = "gpio4";
-               function = PMIC_GPIO_FUNC_NORMAL;
-
-               power-source = <PM8916_GPIO_VPH>;
-               input-disable;
-               output-high;
-       };
-
-       usb_sw_sel_pm_device: usb-sw-sel-pm-device {
-               pins = "gpio4";
-               function = PMIC_GPIO_FUNC_NORMAL;
-
-               power-source = <PM8916_GPIO_VPH>;
-               input-disable;
-               output-low;
-       };
-
-       pm8916_gpios_leds: pm8916-gpios-leds {
-               pins = "gpio1", "gpio2";
-               function = PMIC_GPIO_FUNC_NORMAL;
-
-               output-low;
-       };
-};
-
-&pm8916_mpps {
-       gpio-line-names =
-               "VDD_PX_BIAS",
-               "WLAN_LED_CTRL",
-               "BT_LED_CTRL",
-               "GPIO-F"; /* LS_EXP_GPIO_F, LSEC pin 28 */
-
-       pinctrl-names = "default";
-       pinctrl-0 = <&ls_exp_gpio_f>;
-
-       ls_exp_gpio_f: pm8916-mpp4-state {
-               pins = "mpp4";
-               function = "digital";
-
-               output-low;
-               power-source = <PM8916_MPP_L5>; // 1.8V
-       };
-
-       pm8916_mpps_leds: pm8916-mpps-state {
-               pins = "mpp2", "mpp3";
-               function = "digital";
-
-               output-low;
-       };
-};
index 757afa2..d01a512 100644 (file)
 
 /dts-v1/;
 
-#include "apq8096-db820c.dtsi"
+#include "msm8996.dtsi"
+#include "pm8994.dtsi"
+#include "pmi8994.dtsi"
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
+#include <dt-bindings/sound/qcom,q6afe.h>
+#include <dt-bindings/sound/qcom,q6asm.h>
+
+/*
+ * GPIO name legend: proper name = the GPIO line is used as GPIO
+ *         NC      = not connected (pin out but not routed from the chip to
+ *                   anything the board)
+ *         "[PER]" = pin is muxed for [peripheral] (not GPIO)
+ *         LSEC    = Low Speed External Connector
+ *         P HSEC  = Primary High Speed External Connector
+ *         S HSEC  = Secondary High Speed External Connector
+ *         J14     = Camera Connector
+ *         TP      = Test Points
+ *
+ * Line names are taken from the schematic "DragonBoard 820c",
+ * drawing no: LM25-P2751-1
+ *
+ * For the lines routed to the external connectors the
+ * lines are named after the 96Boards CE Specification 1.0,
+ * Appendix "Expansion Connector Signal Description".
+ *
+ * When the 96Board naming of a line and the schematic name of
+ * the same line are in conflict, the 96Board specification
+ * takes precedence, which means that the external UART on the
+ * LSEC is named UART0 while the schematic and SoC names this
+ * UART3. This is only for the informational lines i.e. "[FOO]",
+ * the GPIO named lines "GPIO-A" thru "GPIO-L" are the only
+ * ones actually used for GPIO.
+ */
 
 / {
        model = "Qualcomm Technologies, Inc. DB820c";
        compatible = "arrow,apq8096-db820c", "qcom,apq8096-sbc", "qcom,apq8096";
+
+       aliases {
+               serial0 = &blsp2_uart2;
+               serial1 = &blsp2_uart3;
+               serial2 = &blsp1_uart2;
+               i2c0    = &blsp1_i2c3;
+               i2c1    = &blsp2_i2c1;
+               i2c2    = &blsp2_i2c1;
+               spi0    = &blsp1_spi1;
+               spi1    = &blsp2_spi6;
+       };
+
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
+       clocks {
+               compatible = "simple-bus";
+               divclk4: divclk4 {
+                       compatible = "fixed-clock";
+                       #clock-cells = <0>;
+                       clock-frequency = <32768>;
+                       clock-output-names = "divclk4";
+
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&divclk4_pin_a>;
+               };
+
+               div1_mclk: divclk1 {
+                       compatible = "gpio-gate-clock";
+                       pinctrl-0 = <&audio_mclk>;
+                       pinctrl-names = "default";
+                       clocks = <&rpmcc RPM_SMD_DIV_CLK1>;
+                       #clock-cells = <0>;
+                       enable-gpios = <&pm8994_gpios 15 0>;
+               };
+       };
+
+       gpio_keys {
+               compatible = "gpio-keys";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               autorepeat;
+
+               pinctrl-names = "default";
+               pinctrl-0 = <&volume_up_gpio>;
+
+               button@0 {
+                       label = "Volume Up";
+                       linux,code = <KEY_VOLUMEUP>;
+                       gpios = <&pm8994_gpios 2 GPIO_ACTIVE_LOW>;
+               };
+       };
+
+       usb2_id: usb2-id {
+               compatible = "linux,extcon-usb-gpio";
+               id-gpio = <&pmi8994_gpios 6 GPIO_ACTIVE_HIGH>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&usb2_vbus_det_gpio>;
+       };
+
+       usb3_id: usb3-id {
+               compatible = "linux,extcon-usb-gpio";
+               id-gpio = <&pm8994_gpios 22 GPIO_ACTIVE_HIGH>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&usb3_vbus_det_gpio>;
+       };
+
+       vph_pwr: vph-pwr-regulator {
+               compatible = "regulator-fixed";
+               regulator-name = "vph_pwr";
+               regulator-always-on;
+               regulator-boot-on;
+
+               regulator-min-microvolt = <3700000>;
+               regulator-max-microvolt = <3700000>;
+       };
+
+       wlan_en: wlan-en-1-8v {
+               pinctrl-names = "default";
+               pinctrl-0 = <&wlan_en_gpios>;
+               compatible = "regulator-fixed";
+               regulator-name = "wlan-en-regulator";
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+
+               gpio = <&pm8994_gpios 8 0>;
+
+               /* WLAN card specific delay */
+               startup-delay-us = <70000>;
+               enable-active-high;
+       };
+};
+
+&blsp1_i2c3 {
+       /* On Low speed expansion */
+       label = "LS-I2C0";
+       status = "okay";
+};
+
+&blsp1_spi1 {
+       /* On Low speed expansion */
+       label = "LS-SPI0";
+       status = "okay";
+};
+
+&blsp1_uart2 {
+       label = "BT-UART";
+       status = "okay";
+
+       bluetooth {
+               compatible = "qcom,qca6174-bt";
+
+               /* bt_disable_n gpio */
+               enable-gpios = <&pm8994_gpios 19 GPIO_ACTIVE_HIGH>;
+
+               clocks = <&divclk4>;
+       };
+};
+
+&adsp_pil {
+       status = "okay";
+};
+
+&blsp2_i2c1 {
+       /* On High speed expansion */
+       label = "HS-I2C2";
+       status = "okay";
+};
+
+&blsp2_i2c1 {
+       /* On Low speed expansion */
+       label = "LS-I2C1";
+       status = "okay";
+};
+
+&blsp2_spi6 {
+       /* On High speed expansion */
+       label = "HS-SPI1";
+       status = "okay";
+};
+
+&blsp2_uart2 {
+       label = "LS-UART1";
+       status = "okay";
+       pinctrl-names = "default", "sleep";
+       pinctrl-0 = <&blsp2_uart2_2pins_default>;
+       pinctrl-1 = <&blsp2_uart2_2pins_sleep>;
+};
+
+&blsp2_uart3 {
+       label = "LS-UART0";
+       status = "disabled";
+       pinctrl-names = "default", "sleep";
+       pinctrl-0 = <&blsp2_uart3_4pins_default>;
+       pinctrl-1 = <&blsp2_uart3_4pins_sleep>;
+};
+
+&camss {
+       vdda-supply = <&vreg_l2a_1p25>;
+};
+
+&gpu {
+       status = "okay";
+};
+
+&hdmi {
+       status = "okay";
+
+       pinctrl-names = "default", "sleep";
+       pinctrl-0 = <&hdmi_hpd_active &hdmi_ddc_active>;
+       pinctrl-1 = <&hdmi_hpd_suspend &hdmi_ddc_suspend>;
+
+       core-vdda-supply = <&vreg_l12a_1p8>;
+       core-vcc-supply = <&vreg_s4a_1p8>;
+};
+
+&hdmi_phy {
+       status = "okay";
+
+       vddio-supply = <&vreg_l12a_1p8>;
+       vcca-supply = <&vreg_l28a_0p925>;
+       #phy-cells = <0>;
+};
+
+&hsusb_phy1 {
+       status = "okay";
+
+       vdda-pll-supply = <&vreg_l12a_1p8>;
+       vdda-phy-dpdm-supply = <&vreg_l24a_3p075>;
+};
+
+&hsusb_phy2 {
+       status = "okay";
+
+       vdda-pll-supply = <&vreg_l12a_1p8>;
+       vdda-phy-dpdm-supply = <&vreg_l24a_3p075>;
+};
+
+&mdp {
+       status = "okay";
+};
+
+&mdss {
+       status = "okay";
+};
+
+&mmcc {
+       vdd-gfx-supply = <&vdd_gfx>;
+};
+
+&pm8994_resin {
+       status = "okay";
+       linux,code = <KEY_VOLUMEDOWN>;
+};
+
+&tlmm {
+       gpio-line-names =
+               "[SPI0_DOUT]", /* GPIO_0, BLSP1_SPI_MOSI, LSEC pin 14 */
+               "[SPI0_DIN]", /* GPIO_1, BLSP1_SPI_MISO, LSEC pin 10 */
+               "[SPI0_CS]", /* GPIO_2, BLSP1_SPI_CS_N, LSEC pin 12 */
+               "[SPI0_SCLK]", /* GPIO_3, BLSP1_SPI_CLK, LSEC pin 8 */
+               "[UART1_TxD]", /* GPIO_4, BLSP8_UART_TX, LSEC pin 11 */
+               "[UART1_RxD]", /* GPIO_5, BLSP8_UART_RX, LSEC pin 13 */
+               "[I2C1_SDA]", /* GPIO_6, BLSP8_I2C_SDA, LSEC pin 21 */
+               "[I2C1_SCL]", /* GPIO_7, BLSP8_I2C_SCL, LSEC pin 19 */
+               "GPIO-H", /* GPIO_8, LCD0_RESET_N, LSEC pin 30 */
+               "TP93", /* GPIO_9 */
+               "GPIO-G", /* GPIO_10, MDP_VSYNC_P, LSEC pin 29 */
+               "[MDP_VSYNC_S]", /* GPIO_11, S HSEC pin 55 */
+               "NC", /* GPIO_12 */
+               "[CSI0_MCLK]", /* GPIO_13, CAM_MCLK0, P HSEC pin 15 */
+               "[CAM_MCLK1]", /* GPIO_14, J14 pin 11 */
+               "[CSI1_MCLK]", /* GPIO_15, CAM_MCLK2, P HSEC pin 17 */
+               "TP99", /* GPIO_16 */
+               "[I2C2_SDA]", /* GPIO_17, CCI_I2C_SDA0, P HSEC pin 34 */
+               "[I2C2_SCL]", /* GPIO_18, CCI_I2C_SCL0, P HSEC pin 32 */
+               "[CCI_I2C_SDA1]", /* GPIO_19, S HSEC pin 38 */
+               "[CCI_I2C_SCL1]", /* GPIO_20, S HSEC pin 36 */
+               "FLASH_STROBE_EN", /* GPIO_21, S HSEC pin 5 */
+               "FLASH_STROBE_TRIG", /* GPIO_22, S HSEC pin 1 */
+               "GPIO-K", /* GPIO_23, CAM2_RST_N, LSEC pin 33 */
+               "GPIO-D", /* GPIO_24, LSEC pin 26 */
+               "GPIO-I", /* GPIO_25, CAM0_RST_N, LSEC pin 31 */
+               "GPIO-J", /* GPIO_26, CAM0_STANDBY_N, LSEC pin 32 */
+               "BLSP6_I2C_SDA", /* GPIO_27 */
+               "BLSP6_I2C_SCL", /* GPIO_28 */
+               "GPIO-B", /* GPIO_29, TS0_RESET_N, LSEC pin 24 */
+               "GPIO30", /* GPIO_30, S HSEC pin 4 */
+               "HDMI_CEC", /* GPIO_31 */
+               "HDMI_DDC_CLOCK", /* GPIO_32 */
+               "HDMI_DDC_DATA", /* GPIO_33 */
+               "HDMI_HOT_PLUG_DETECT", /* GPIO_34 */
+               "PCIE0_RST_N", /* GPIO_35 */
+               "PCIE0_CLKREQ_N", /* GPIO_36 */
+               "PCIE0_WAKE", /* GPIO_37 */
+               "SD_CARD_DET_N", /* GPIO_38 */
+               "TSIF1_SYNC", /* GPIO_39, S HSEC pin 48 */
+               "W_DISABLE_N", /* GPIO_40 */
+               "[BLSP9_UART_TX]", /* GPIO_41 */
+               "[BLSP9_UART_RX]", /* GPIO_42 */
+               "[BLSP2_UART_CTS_N]", /* GPIO_43 */
+               "[BLSP2_UART_RFR_N]", /* GPIO_44 */
+               "[BLSP3_UART_TX]", /* GPIO_45 */
+               "[BLSP3_UART_RX]", /* GPIO_46 */
+               "[I2C0_SDA]", /* GPIO_47, LS_I2C0_SDA, LSEC pin 17 */
+               "[I2C0_SCL]", /* GPIO_48, LS_I2C0_SCL, LSEC pin 15 */
+               "[UART0_TxD]", /* GPIO_49, BLSP9_UART_TX, LSEC pin 5 */
+               "[UART0_RxD]", /* GPIO_50, BLSP9_UART_RX, LSEC pin 7 */
+               "[UART0_CTS]", /* GPIO_51, BLSP9_UART_CTS_N, LSEC pin 3 */
+               "[UART0_RTS]", /* GPIO_52, BLSP9_UART_RFR_N, LSEC pin 9 */
+               "[CODEC_INT1_N]", /* GPIO_53 */
+               "[CODEC_INT2_N]", /* GPIO_54 */
+               "[BLSP7_I2C_SDA]", /* GPIO_55 */
+               "[BLSP7_I2C_SCL]", /* GPIO_56 */
+               "MI2S_MCLK", /* GPIO_57, S HSEC pin 3 */
+               "[PCM_CLK]", /* GPIO_58, QUA_MI2S_SCK, LSEC pin 18 */
+               "[PCM_FS]", /* GPIO_59, QUA_MI2S_WS, LSEC pin 16 */
+               "[PCM_DO]", /* GPIO_60, QUA_MI2S_DATA0, LSEC pin 20 */
+               "[PCM_DI]", /* GPIO_61, QUA_MI2S_DATA1, LSEC pin 22 */
+               "GPIO-E", /* GPIO_62, LSEC pin 27 */
+               "TP87", /* GPIO_63 */
+               "[CODEC_RST_N]", /* GPIO_64 */
+               "[PCM1_CLK]", /* GPIO_65 */
+               "[PCM1_SYNC]", /* GPIO_66 */
+               "[PCM1_DIN]", /* GPIO_67 */
+               "[PCM1_DOUT]", /* GPIO_68 */
+               "AUDIO_REF_CLK", /* GPIO_69 */
+               "SLIMBUS_CLK", /* GPIO_70 */
+               "SLIMBUS_DATA0", /* GPIO_71 */
+               "SLIMBUS_DATA1", /* GPIO_72 */
+               "NC", /* GPIO_73 */
+               "NC", /* GPIO_74 */
+               "NC", /* GPIO_75 */
+               "NC", /* GPIO_76 */
+               "TP94", /* GPIO_77 */
+               "NC", /* GPIO_78 */
+               "TP95", /* GPIO_79 */
+               "GPIO-A", /* GPIO_80, MEMS_RESET_N, LSEC pin 23 */
+               "TP88", /* GPIO_81 */
+               "TP89", /* GPIO_82 */
+               "TP90", /* GPIO_83 */
+               "TP91", /* GPIO_84 */
+               "[SD_DAT0]", /* GPIO_85, BLSP12_SPI_MOSI, P HSEC pin 1 */
+               "[SD_CMD]", /* GPIO_86, BLSP12_SPI_MISO, P HSEC pin 11 */
+               "[SD_DAT3]", /* GPIO_87, BLSP12_SPI_CS_N, P HSEC pin 7 */
+               "[SD_SCLK]", /* GPIO_88, BLSP12_SPI_CLK, P HSEC pin 9 */
+               "TSIF1_CLK", /* GPIO_89, S HSEC pin 42 */
+               "TSIF1_EN", /* GPIO_90, S HSEC pin 46 */
+               "TSIF1_DATA", /* GPIO_91, S HSEC pin 44 */
+               "NC", /* GPIO_92 */
+               "TSIF2_CLK", /* GPIO_93, S HSEC pin 52 */
+               "TSIF2_EN", /* GPIO_94, S HSEC pin 56 */
+               "TSIF2_DATA", /* GPIO_95, S HSEC pin 54 */
+               "TSIF2_SYNC", /* GPIO_96, S HSEC pin 58 */
+               "NC", /* GPIO_97 */
+               "CAM1_STANDBY_N", /* GPIO_98 */
+               "NC", /* GPIO_99 */
+               "NC", /* GPIO_100 */
+               "[LCD1_RESET_N]", /* GPIO_101, S HSEC pin 51 */
+               "BOOT_CONFIG1", /* GPIO_102 */
+               "USB_HUB_RESET", /* GPIO_103 */
+               "CAM1_RST_N", /* GPIO_104 */
+               "NC", /* GPIO_105 */
+               "NC", /* GPIO_106 */
+               "NC", /* GPIO_107 */
+               "NC", /* GPIO_108 */
+               "NC", /* GPIO_109 */
+               "NC", /* GPIO_110 */
+               "NC", /* GPIO_111 */
+               "NC", /* GPIO_112 */
+               "PMI8994_BUA", /* GPIO_113 */
+               "PCIE2_RST_N", /* GPIO_114 */
+               "PCIE2_CLKREQ_N", /* GPIO_115 */
+               "PCIE2_WAKE", /* GPIO_116 */
+               "SSC_IRQ_0", /* GPIO_117 */
+               "SSC_IRQ_1", /* GPIO_118 */
+               "SSC_IRQ_2", /* GPIO_119 */
+               "NC", /* GPIO_120 */
+               "GPIO121", /* GPIO_121, S HSEC pin 2 */
+               "NC", /* GPIO_122 */
+               "SSC_IRQ_6", /* GPIO_123 */
+               "SSC_IRQ_7", /* GPIO_124 */
+               "GPIO-C", /* GPIO_125, TS_INT0, LSEC pin 25 */
+               "BOOT_CONFIG5", /* GPIO_126 */
+               "NC", /* GPIO_127 */
+               "NC", /* GPIO_128 */
+               "BOOT_CONFIG7", /* GPIO_129 */
+               "PCIE1_RST_N", /* GPIO_130 */
+               "PCIE1_CLKREQ_N", /* GPIO_131 */
+               "PCIE1_WAKE", /* GPIO_132 */
+               "GPIO-L", /* GPIO_133, CAM2_STANDBY_N, LSEC pin 34 */
+               "NC", /* GPIO_134 */
+               "NC", /* GPIO_135 */
+               "BOOT_CONFIG8", /* GPIO_136 */
+               "NC", /* GPIO_137 */
+               "NC", /* GPIO_138 */
+               "GPS_SSBI2", /* GPIO_139 */
+               "GPS_SSBI1", /* GPIO_140 */
+               "NC", /* GPIO_141 */
+               "NC", /* GPIO_142 */
+               "NC", /* GPIO_143 */
+               "BOOT_CONFIG6", /* GPIO_144 */
+               "NC", /* GPIO_145 */
+               "NC", /* GPIO_146 */
+               "NC", /* GPIO_147 */
+               "NC", /* GPIO_148 */
+               "NC"; /* GPIO_149 */
+
+       sdc2_cd_on: sdc2_cd_on {
+               mux {
+                       pins = "gpio38";
+                       function = "gpio";
+               };
+
+               config {
+                       pins = "gpio38";
+                       bias-pull-up;           /* pull up */
+                       drive-strength = <16>;  /* 16 MA */
+               };
+       };
+
+       sdc2_cd_off: sdc2_cd_off {
+               mux {
+                       pins = "gpio38";
+                       function = "gpio";
+               };
+
+               config {
+                       pins = "gpio38";
+                       bias-pull-up;           /* pull up */
+                       drive-strength = <2>;   /* 2 MA */
+               };
+       };
+
+       hdmi_hpd_active: hdmi_hpd_active {
+               mux {
+                       pins = "gpio34";
+                       function = "hdmi_hot";
+               };
+
+               config {
+                       pins = "gpio34";
+                       bias-pull-down;
+                       drive-strength = <16>;
+               };
+       };
+
+       hdmi_hpd_suspend: hdmi_hpd_suspend {
+               mux {
+                       pins = "gpio34";
+                       function = "hdmi_hot";
+               };
+
+               config {
+                       pins = "gpio34";
+                       bias-pull-down;
+                       drive-strength = <2>;
+               };
+       };
+
+       hdmi_ddc_active: hdmi_ddc_active {
+               mux {
+                       pins = "gpio32", "gpio33";
+                       function = "hdmi_ddc";
+               };
+
+               config {
+                       pins = "gpio32", "gpio33";
+                       drive-strength = <2>;
+                       bias-pull-up;
+               };
+       };
+
+       hdmi_ddc_suspend: hdmi_ddc_suspend {
+               mux {
+                       pins = "gpio32", "gpio33";
+                       function = "hdmi_ddc";
+               };
+
+               config {
+                       pins = "gpio32", "gpio33";
+                       drive-strength = <2>;
+                       bias-pull-down;
+               };
+       };
+};
+
+&pcie0 {
+       status = "okay";
+       perst-gpio = <&tlmm 35 GPIO_ACTIVE_LOW>;
+       vddpe-3v3-supply = <&wlan_en>;
+       vdda-supply = <&vreg_l28a_0p925>;
+};
+
+&pcie1 {
+       status = "okay";
+       perst-gpio = <&tlmm 130 GPIO_ACTIVE_LOW>;
+       vdda-supply = <&vreg_l28a_0p925>;
+};
+
+&pcie2 {
+       status = "okay";
+       perst-gpio = <&tlmm 114 GPIO_ACTIVE_LOW>;
+       vdda-supply = <&vreg_l28a_0p925>;
+};
+
+&pcie_phy {
+       status = "okay";
+
+       vdda-phy-supply = <&vreg_l28a_0p925>;
+       vdda-pll-supply = <&vreg_l12a_1p8>;
+};
+
+&pm8994_gpios {
+       gpio-line-names =
+               "NC",
+               "KEY_VOLP_N",
+               "NC",
+               "BL1_PWM",
+               "GPIO-F", /* BL0_PWM, LSEC pin 28 */
+               "BL1_EN",
+               "NC",
+               "WLAN_EN",
+               "NC",
+               "NC",
+               "NC",
+               "NC",
+               "NC",
+               "NC",
+               "DIVCLK1",
+               "DIVCLK2",
+               "DIVCLK3",
+               "DIVCLK4",
+               "BT_EN",
+               "PMIC_SLB",
+               "PMIC_BUA",
+               "USB_VBUS_DET";
+
+       pinctrl-names = "default";
+       pinctrl-0 = <&ls_exp_gpio_f &bt_en_gpios>;
+
+       ls_exp_gpio_f: pm8994_gpio5 {
+               pinconf {
+                       pins = "gpio5";
+                       output-low;
+                       power-source = <2>; // PM8994_GPIO_S4, 1.8V
+               };
+       };
+
+       bt_en_gpios: bt_en_gpios {
+               pinconf {
+                       pins = "gpio19";
+                       function = PMIC_GPIO_FUNC_NORMAL;
+                       output-low;
+                       power-source = <PM8994_GPIO_S4>; // 1.8V
+                       qcom,drive-strength = <PMIC_GPIO_STRENGTH_LOW>;
+                       bias-pull-down;
+               };
+       };
+
+       wlan_en_gpios: wlan_en_gpios {
+               pinconf {
+                       pins = "gpio8";
+                       function = PMIC_GPIO_FUNC_NORMAL;
+                       output-low;
+                       power-source = <PM8994_GPIO_S4>; // 1.8V
+                       qcom,drive-strength = <PMIC_GPIO_STRENGTH_LOW>;
+                       bias-pull-down;
+               };
+       };
+
+       audio_mclk: clk_div1 {
+               pinconf {
+                       pins = "gpio15";
+                       function = "func1";
+                       power-source = <PM8994_GPIO_S4>; // 1.8V
+               };
+       };
+
+       volume_up_gpio: pm8996_gpio2 {
+               pinconf {
+                       pins = "gpio2";
+                       function = "normal";
+                       input-enable;
+                       drive-push-pull;
+                       bias-pull-up;
+                       qcom,drive-strength = <PMIC_GPIO_STRENGTH_NO>;
+                       power-source = <PM8994_GPIO_S4>; // 1.8V
+               };
+       };
+
+       divclk4_pin_a: divclk4 {
+               pinconf {
+                       pins = "gpio18";
+                       function = PMIC_GPIO_FUNC_FUNC2;
+
+                       bias-disable;
+                       power-source = <PM8994_GPIO_S4>;
+               };
+       };
+
+       usb3_vbus_det_gpio: pm8996_gpio22 {
+               pinconf {
+                       pins = "gpio22";
+                       function = PMIC_GPIO_FUNC_NORMAL;
+                       input-enable;
+                       bias-pull-down;
+                       qcom,drive-strength = <PMIC_GPIO_STRENGTH_NO>;
+                       power-source = <PM8994_GPIO_S4>; // 1.8V
+               };
+       };
+};
+
+&pm8994_mpps {
+       gpio-line-names =
+               "VDDPX_BIAS",
+               "WIFI_LED",
+               "NC",
+               "BT_LED",
+               "PM_MPP05",
+               "PM_MPP06",
+               "PM_MPP07",
+               "NC";
+};
+
+&pm8994_spmi_regulators {
+       qcom,saw-reg = <&saw3>;
+       s9 {
+               qcom,saw-slave;
+       };
+       s10 {
+               qcom,saw-slave;
+       };
+       s11 {
+               qcom,saw-leader;
+               regulator-always-on;
+               regulator-min-microvolt = <980000>;
+               regulator-max-microvolt = <980000>;
+       };
+};
+
+&pmi8994_gpios {
+       gpio-line-names =
+               "NC",
+               "SPKR_AMP_EN1",
+               "SPKR_AMP_EN2",
+               "TP61",
+               "NC",
+               "USB2_VBUS_DET",
+               "NC",
+               "NC",
+               "NC",
+               "NC";
+
+       usb2_vbus_det_gpio: pmi8996_gpio6 {
+               pinconf {
+                       pins = "gpio6";
+                       function = PMIC_GPIO_FUNC_NORMAL;
+                       input-enable;
+                       bias-pull-down;
+                       qcom,drive-strength = <PMIC_GPIO_STRENGTH_NO>;
+                       power-source = <PM8994_GPIO_S4>; // 1.8V
+               };
+       };
+};
+
+&pmi8994_spmi_regulators {
+       vdd_gfx: s2@1700 {
+               reg = <0x1700 0x100>;
+               regulator-name = "VDD_GFX";
+               regulator-min-microvolt = <980000>;
+               regulator-max-microvolt = <980000>;
+       };
+};
+
+&rpm_requests {
+       pm8994-regulators {
+               compatible = "qcom,rpm-pm8994-regulators";
+
+               vdd_s1-supply = <&vph_pwr>;
+               vdd_s2-supply = <&vph_pwr>;
+               vdd_s3-supply = <&vph_pwr>;
+               vdd_s4-supply = <&vph_pwr>;
+               vdd_s5-supply = <&vph_pwr>;
+               vdd_s6-supply = <&vph_pwr>;
+               vdd_s7-supply = <&vph_pwr>;
+               vdd_s8-supply = <&vph_pwr>;
+               vdd_s9-supply = <&vph_pwr>;
+               vdd_s10-supply = <&vph_pwr>;
+               vdd_s11-supply = <&vph_pwr>;
+               vdd_s12-supply = <&vph_pwr>;
+               vdd_l1-supply = <&vreg_s1b_1p025>;
+               vdd_l2_l26_l28-supply = <&vreg_s3a_1p3>;
+               vdd_l3_l11-supply = <&vreg_s3a_1p3>;
+               vdd_l4_l27_l31-supply = <&vreg_s3a_1p3>;
+               vdd_l5_l7-supply = <&vreg_s5a_2p15>;
+               vdd_l6_l12_l32-supply = <&vreg_s5a_2p15>;
+               vdd_l8_l16_l30-supply = <&vph_pwr>;
+               vdd_l9_l10_l18_l22-supply = <&vph_pwr_bbyp>;
+               vdd_l13_l19_l23_l24-supply = <&vph_pwr_bbyp>;
+               vdd_l14_l15-supply = <&vreg_s5a_2p15>;
+               vdd_l17_l29-supply = <&vph_pwr_bbyp>;
+               vdd_l20_l21-supply = <&vph_pwr_bbyp>;
+               vdd_l25-supply = <&vreg_s3a_1p3>;
+               vdd_lvs1_lvs2-supply = <&vreg_s4a_1p8>;
+
+               vreg_s3a_1p3: s3 {
+                       regulator-name = "vreg_s3a_1p3";
+                       regulator-min-microvolt = <1300000>;
+                       regulator-max-microvolt = <1300000>;
+               };
+
+               /**
+                * 1.8v required on LS expansion
+                * for mezzanine boards
+                */
+               vreg_s4a_1p8: s4 {
+                       regulator-name = "vreg_s4a_1p8";
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+                       regulator-always-on;
+               };
+               vreg_s5a_2p15: s5 {
+                       regulator-name = "vreg_s5a_2p15";
+                       regulator-min-microvolt = <2150000>;
+                       regulator-max-microvolt = <2150000>;
+               };
+               vreg_s7a_1p0: s7 {
+                       regulator-name = "vreg_s7a_1p0";
+                       regulator-min-microvolt = <800000>;
+                       regulator-max-microvolt = <800000>;
+               };
+
+               vreg_l1a_1p0: l1 {
+                       regulator-name = "vreg_l1a_1p0";
+                       regulator-min-microvolt = <1000000>;
+                       regulator-max-microvolt = <1000000>;
+               };
+               vreg_l2a_1p25: l2 {
+                       regulator-name = "vreg_l2a_1p25";
+                       regulator-min-microvolt = <1250000>;
+                       regulator-max-microvolt = <1250000>;
+               };
+               vreg_l3a_0p875: l3 {
+                       regulator-name = "vreg_l3a_0p875";
+                       regulator-min-microvolt = <850000>;
+                       regulator-max-microvolt = <850000>;
+               };
+               vreg_l4a_1p225: l4 {
+                       regulator-name = "vreg_l4a_1p225";
+                       regulator-min-microvolt = <1225000>;
+                       regulator-max-microvolt = <1225000>;
+               };
+               vreg_l6a_1p2: l6 {
+                       regulator-name = "vreg_l6a_1p2";
+                       regulator-min-microvolt = <1200000>;
+                       regulator-max-microvolt = <1200000>;
+               };
+               vreg_l8a_1p8: l8 {
+                       regulator-name = "vreg_l8a_1p8";
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+               };
+               vreg_l9a_1p8: l9 {
+                       regulator-name = "vreg_l9a_1p8";
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+               };
+               vreg_l10a_1p8: l10 {
+                       regulator-name = "vreg_l10a_1p8";
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+               };
+               vreg_l11a_1p15: l11 {
+                       regulator-name = "vreg_l11a_1p15";
+                       regulator-min-microvolt = <1150000>;
+                       regulator-max-microvolt = <1150000>;
+               };
+               vreg_l12a_1p8: l12 {
+                       regulator-name = "vreg_l12a_1p8";
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+               };
+               vreg_l13a_2p95: l13 {
+                       regulator-name = "vreg_l13a_2p95";
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <2950000>;
+               };
+               vreg_l14a_1p8: l14 {
+                       regulator-name = "vreg_l14a_1p8";
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+               };
+               vreg_l15a_1p8: l15 {
+                       regulator-name = "vreg_l15a_1p8";
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+               };
+               vreg_l16a_2p7: l16 {
+                       regulator-name = "vreg_l16a_2p7";
+                       regulator-min-microvolt = <2700000>;
+                       regulator-max-microvolt = <2700000>;
+               };
+               vreg_l17a_2p8: l17 {
+                       regulator-name = "vreg_l17a_2p8";
+                       regulator-min-microvolt = <2500000>;
+                       regulator-max-microvolt = <2500000>;
+               };
+               vreg_l18a_2p85: l18 {
+                       regulator-name = "vreg_l18a_2p85";
+                       regulator-min-microvolt = <2700000>;
+                       regulator-max-microvolt = <2900000>;
+               };
+               vreg_l19a_2p8: l19 {
+                       regulator-name = "vreg_l19a_2p8";
+                       regulator-min-microvolt = <3000000>;
+                       regulator-max-microvolt = <3000000>;
+               };
+               vreg_l20a_2p95: l20 {
+                       regulator-name = "vreg_l20a_2p95";
+                       regulator-min-microvolt = <2950000>;
+                       regulator-max-microvolt = <2950000>;
+                       regulator-allow-set-load;
+               };
+               vreg_l21a_2p95: l21 {
+                       regulator-name = "vreg_l21a_2p95";
+                       regulator-min-microvolt = <2950000>;
+                       regulator-max-microvolt = <2950000>;
+                       regulator-allow-set-load;
+                       regulator-system-load = <200000>;
+               };
+               vreg_l22a_3p0: l22 {
+                       regulator-name = "vreg_l22a_3p0";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+               };
+               vreg_l23a_2p8: l23 {
+                       regulator-name = "vreg_l23a_2p8";
+                       regulator-min-microvolt = <2800000>;
+                       regulator-max-microvolt = <2800000>;
+               };
+               vreg_l24a_3p075: l24 {
+                       regulator-name = "vreg_l24a_3p075";
+                       regulator-min-microvolt = <3075000>;
+                       regulator-max-microvolt = <3075000>;
+               };
+               vreg_l25a_1p2: l25 {
+                       regulator-name = "vreg_l25a_1p2";
+                       regulator-min-microvolt = <1200000>;
+                       regulator-max-microvolt = <1200000>;
+                       regulator-allow-set-load;
+               };
+               vreg_l26a_0p8: l27 {
+                       regulator-name = "vreg_l26a_0p8";
+                       regulator-min-microvolt = <1000000>;
+                       regulator-max-microvolt = <1000000>;
+               };
+               vreg_l28a_0p925: l28 {
+                       regulator-name = "vreg_l28a_0p925";
+                       regulator-min-microvolt = <925000>;
+                       regulator-max-microvolt = <925000>;
+                       regulator-allow-set-load;
+               };
+               vreg_l29a_2p8: l29 {
+                       regulator-name = "vreg_l29a_2p8";
+                       regulator-min-microvolt = <2800000>;
+                       regulator-max-microvolt = <2800000>;
+               };
+               vreg_l30a_1p8: l30 {
+                       regulator-name = "vreg_l30a_1p8";
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+               };
+               vreg_l32a_1p8: l32 {
+                       regulator-name = "vreg_l32a_1p8";
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+               };
+
+               vreg_lvs1a_1p8: lvs1 {
+                       regulator-name = "vreg_lvs1a_1p8";
+               };
+
+               vreg_lvs2a_1p8: lvs2 {
+                       regulator-name = "vreg_lvs2a_1p8";
+               };
+       };
+
+       pmi8994-regulators {
+               compatible = "qcom,rpm-pmi8994-regulators";
+
+               vdd_s1-supply = <&vph_pwr>;
+               vdd_s2-supply = <&vph_pwr>;
+               vdd_s3-supply = <&vph_pwr>;
+               vdd_bst_byp-supply = <&vph_pwr>;
+
+               vph_pwr_bbyp: boost-bypass {
+                       regulator-name = "vph_pwr_bbyp";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+               };
+
+               vreg_s1b_1p025: s1 {
+                       regulator-name = "vreg_s1b_1p025";
+                       regulator-min-microvolt = <1025000>;
+                       regulator-max-microvolt = <1025000>;
+               };
+       };
+};
+
+&sdhc2 {
+       /* External SD card */
+       pinctrl-names = "default", "sleep";
+       pinctrl-0 = <&sdc2_state_on &sdc2_cd_on>;
+       pinctrl-1 = <&sdc2_state_off &sdc2_cd_off>;
+       cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
+       vmmc-supply = <&vreg_l21a_2p95>;
+       vqmmc-supply = <&vreg_l13a_2p95>;
+       status = "okay";
+};
+
+&q6asmdai {
+       dai@0 {
+               reg = <0>;
+       };
+
+       dai@1 {
+               reg = <1>;
+       };
+
+       dai@2 {
+               reg = <2>;
+       };
+};
+
+&sound {
+       compatible = "qcom,apq8096-sndcard";
+       model = "DB820c";
+       audio-routing = "RX_BIAS", "MCLK",
+               "MM_DL1",  "MultiMedia1 Playback",
+               "MM_DL2",  "MultiMedia2 Playback",
+               "MultiMedia3 Capture", "MM_UL3";
+
+       mm1-dai-link {
+               link-name = "MultiMedia1";
+               cpu {
+                       sound-dai = <&q6asmdai  MSM_FRONTEND_DAI_MULTIMEDIA1>;
+               };
+       };
+
+       mm2-dai-link {
+               link-name = "MultiMedia2";
+               cpu {
+                       sound-dai = <&q6asmdai  MSM_FRONTEND_DAI_MULTIMEDIA2>;
+               };
+       };
+
+       mm3-dai-link {
+               link-name = "MultiMedia3";
+               cpu {
+                       sound-dai = <&q6asmdai  MSM_FRONTEND_DAI_MULTIMEDIA3>;
+               };
+       };
+
+       hdmi-dai-link {
+               link-name = "HDMI";
+               cpu {
+                       sound-dai = <&q6afedai HDMI_RX>;
+               };
+
+               platform {
+                       sound-dai = <&q6routing>;
+               };
+
+               codec {
+                       sound-dai = <&hdmi 0>;
+               };
+       };
+
+       slim-dai-link {
+               link-name = "SLIM Playback";
+               cpu {
+                       sound-dai = <&q6afedai SLIMBUS_6_RX>;
+               };
+
+               platform {
+                       sound-dai = <&q6routing>;
+       };
+
+               codec {
+                       sound-dai = <&wcd9335 6>;
+               };
+       };
+
+       slimcap-dai-link {
+               link-name = "SLIM Capture";
+               cpu {
+                       sound-dai = <&q6afedai SLIMBUS_0_TX>;
+               };
+
+               platform {
+                       sound-dai = <&q6routing>;
+               };
+
+               codec {
+                       sound-dai = <&wcd9335 1>;
+               };
+       };
+};
+
+&ufsphy {
+       status = "okay";
+
+       vdda-phy-supply = <&vreg_l28a_0p925>;
+       vdda-pll-supply = <&vreg_l12a_1p8>;
+       vddp-ref-clk-supply = <&vreg_l25a_1p2>;
+};
+
+&ufshc {
+       status = "okay";
+
+       vcc-supply = <&vreg_l20a_2p95>;
+       vccq-supply = <&vreg_l25a_1p2>;
+       vccq2-supply = <&vreg_s4a_1p8>;
+
+       vcc-max-microamp = <600000>;
+       vccq-max-microamp = <450000>;
+       vccq2-max-microamp = <450000>;
+};
+
+&usb2 {
+       status = "okay";
+       extcon = <&usb2_id>;
+
+       dwc3@7600000 {
+               extcon = <&usb2_id>;
+               dr_mode = "otg";
+               maximum-speed = "high-speed";
+       };
+};
+
+&usb3 {
+       status = "okay";
+       extcon = <&usb3_id>;
+
+       dwc3@6a00000 {
+               extcon = <&usb3_id>;
+               dr_mode = "otg";
+       };
+};
+
+&usb3phy {
+       status = "okay";
+
+       vdda-phy-supply = <&vreg_l28a_0p925>;
+       vdda-pll-supply = <&vreg_l12a_1p8>;
+
+};
+
+&venus {
+       status = "okay";
+};
+
+&wcd9335 {
+       clock-names = "mclk", "slimbus";
+       clocks = <&div1_mclk>,
+                <&rpmcc RPM_SMD_BB_CLK1>;
+
+       vdd-buck-supply = <&vreg_s4a_1p8>;
+       vdd-buck-sido-supply = <&vreg_s4a_1p8>;
+       vdd-tx-supply = <&vreg_s4a_1p8>;
+       vdd-rx-supply = <&vreg_s4a_1p8>;
+       vdd-io-supply = <&vreg_s4a_1p8>;
 };
diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi
deleted file mode 100644 (file)
index eca428a..0000000
+++ /dev/null
@@ -1,1076 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.
- */
-
-#include "msm8996.dtsi"
-#include "pm8994.dtsi"
-#include "pmi8994.dtsi"
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
-#include <dt-bindings/sound/qcom,q6afe.h>
-#include <dt-bindings/sound/qcom,q6asm.h>
-
-/*
- * GPIO name legend: proper name = the GPIO line is used as GPIO
- *         NC      = not connected (pin out but not routed from the chip to
- *                   anything the board)
- *         "[PER]" = pin is muxed for [peripheral] (not GPIO)
- *         LSEC    = Low Speed External Connector
- *         P HSEC  = Primary High Speed External Connector
- *         S HSEC  = Secondary High Speed External Connector
- *         J14     = Camera Connector
- *         TP      = Test Points
- *
- * Line names are taken from the schematic "DragonBoard 820c",
- * drawing no: LM25-P2751-1
- *
- * For the lines routed to the external connectors the
- * lines are named after the 96Boards CE Specification 1.0,
- * Appendix "Expansion Connector Signal Description".
- *
- * When the 96Board naming of a line and the schematic name of
- * the same line are in conflict, the 96Board specification
- * takes precedence, which means that the external UART on the
- * LSEC is named UART0 while the schematic and SoC names this
- * UART3. This is only for the informational lines i.e. "[FOO]",
- * the GPIO named lines "GPIO-A" thru "GPIO-L" are the only
- * ones actually used for GPIO.
- */
-
-/ {
-       aliases {
-               serial0 = &blsp2_uart2;
-               serial1 = &blsp2_uart3;
-               serial2 = &blsp1_uart2;
-               i2c0    = &blsp1_i2c3;
-               i2c1    = &blsp2_i2c1;
-               i2c2    = &blsp2_i2c1;
-               spi0    = &blsp1_spi1;
-               spi1    = &blsp2_spi6;
-       };
-
-       chosen {
-               stdout-path = "serial0:115200n8";
-       };
-
-       clocks {
-               compatible = "simple-bus";
-               divclk4: divclk4 {
-                       compatible = "fixed-clock";
-                       #clock-cells = <0>;
-                       clock-frequency = <32768>;
-                       clock-output-names = "divclk4";
-
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&divclk4_pin_a>;
-               };
-
-               div1_mclk: divclk1 {
-                       compatible = "gpio-gate-clock";
-                       pinctrl-0 = <&audio_mclk>;
-                       pinctrl-names = "default";
-                       clocks = <&rpmcc RPM_SMD_DIV_CLK1>;
-                       #clock-cells = <0>;
-                       enable-gpios = <&pm8994_gpios 15 0>;
-               };
-       };
-
-       gpio_keys {
-               compatible = "gpio-keys";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               autorepeat;
-
-               pinctrl-names = "default";
-               pinctrl-0 = <&volume_up_gpio>;
-
-               button@0 {
-                       label = "Volume Up";
-                       linux,code = <KEY_VOLUMEUP>;
-                       gpios = <&pm8994_gpios 2 GPIO_ACTIVE_LOW>;
-               };
-       };
-
-       usb2_id: usb2-id {
-               compatible = "linux,extcon-usb-gpio";
-               id-gpio = <&pmi8994_gpios 6 GPIO_ACTIVE_HIGH>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&usb2_vbus_det_gpio>;
-       };
-
-       usb3_id: usb3-id {
-               compatible = "linux,extcon-usb-gpio";
-               id-gpio = <&pm8994_gpios 22 GPIO_ACTIVE_HIGH>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&usb3_vbus_det_gpio>;
-       };
-
-       vph_pwr: vph-pwr-regulator {
-               compatible = "regulator-fixed";
-               regulator-name = "vph_pwr";
-               regulator-always-on;
-               regulator-boot-on;
-
-               regulator-min-microvolt = <3700000>;
-               regulator-max-microvolt = <3700000>;
-       };
-
-       wlan_en: wlan-en-1-8v {
-               pinctrl-names = "default";
-               pinctrl-0 = <&wlan_en_gpios>;
-               compatible = "regulator-fixed";
-               regulator-name = "wlan-en-regulator";
-               regulator-min-microvolt = <1800000>;
-               regulator-max-microvolt = <1800000>;
-
-               gpio = <&pm8994_gpios 8 0>;
-
-               /* WLAN card specific delay */
-               startup-delay-us = <70000>;
-               enable-active-high;
-       };
-};
-
-&blsp1_i2c3 {
-       /* On Low speed expansion */
-       label = "LS-I2C0";
-       status = "okay";
-};
-
-&blsp1_spi1 {
-       /* On Low speed expansion */
-       label = "LS-SPI0";
-       status = "okay";
-};
-
-&blsp1_uart2 {
-       label = "BT-UART";
-       status = "okay";
-
-       bluetooth {
-               compatible = "qcom,qca6174-bt";
-
-               /* bt_disable_n gpio */
-               enable-gpios = <&pm8994_gpios 19 GPIO_ACTIVE_HIGH>;
-
-               clocks = <&divclk4>;
-       };
-};
-
-&adsp_pil {
-       status = "okay";
-};
-
-&blsp2_i2c1 {
-       /* On High speed expansion */
-       label = "HS-I2C2";
-       status = "okay";
-};
-
-&blsp2_i2c1 {
-       /* On Low speed expansion */
-       label = "LS-I2C1";
-       status = "okay";
-};
-
-&blsp2_spi6 {
-       /* On High speed expansion */
-       label = "HS-SPI1";
-       status = "okay";
-};
-
-&blsp2_uart2 {
-       label = "LS-UART1";
-       status = "okay";
-       pinctrl-names = "default", "sleep";
-       pinctrl-0 = <&blsp2_uart2_2pins_default>;
-       pinctrl-1 = <&blsp2_uart2_2pins_sleep>;
-};
-
-&blsp2_uart3 {
-       label = "LS-UART0";
-       status = "disabled";
-       pinctrl-names = "default", "sleep";
-       pinctrl-0 = <&blsp2_uart3_4pins_default>;
-       pinctrl-1 = <&blsp2_uart3_4pins_sleep>;
-};
-
-&camss {
-       vdda-supply = <&vreg_l2a_1p25>;
-};
-
-&gpu {
-       status = "okay";
-};
-
-&hdmi {
-       status = "okay";
-
-       pinctrl-names = "default", "sleep";
-       pinctrl-0 = <&hdmi_hpd_active &hdmi_ddc_active>;
-       pinctrl-1 = <&hdmi_hpd_suspend &hdmi_ddc_suspend>;
-
-       core-vdda-supply = <&vreg_l12a_1p8>;
-       core-vcc-supply = <&vreg_s4a_1p8>;
-};
-
-&hdmi_phy {
-       status = "okay";
-
-       vddio-supply = <&vreg_l12a_1p8>;
-       vcca-supply = <&vreg_l28a_0p925>;
-       #phy-cells = <0>;
-};
-
-&hsusb_phy1 {
-       status = "okay";
-
-       vdda-pll-supply = <&vreg_l12a_1p8>;
-       vdda-phy-dpdm-supply = <&vreg_l24a_3p075>;
-};
-
-&hsusb_phy2 {
-       status = "okay";
-
-       vdda-pll-supply = <&vreg_l12a_1p8>;
-       vdda-phy-dpdm-supply = <&vreg_l24a_3p075>;
-};
-
-&mdp {
-       status = "okay";
-};
-
-&mdss {
-       status = "okay";
-};
-
-&mmcc {
-       vdd-gfx-supply = <&vdd_gfx>;
-};
-
-&pm8994_resin {
-       status = "okay";
-       linux,code = <KEY_VOLUMEDOWN>;
-};
-
-&tlmm {
-       gpio-line-names =
-               "[SPI0_DOUT]", /* GPIO_0, BLSP1_SPI_MOSI, LSEC pin 14 */
-               "[SPI0_DIN]", /* GPIO_1, BLSP1_SPI_MISO, LSEC pin 10 */
-               "[SPI0_CS]", /* GPIO_2, BLSP1_SPI_CS_N, LSEC pin 12 */
-               "[SPI0_SCLK]", /* GPIO_3, BLSP1_SPI_CLK, LSEC pin 8 */
-               "[UART1_TxD]", /* GPIO_4, BLSP8_UART_TX, LSEC pin 11 */
-               "[UART1_RxD]", /* GPIO_5, BLSP8_UART_RX, LSEC pin 13 */
-               "[I2C1_SDA]", /* GPIO_6, BLSP8_I2C_SDA, LSEC pin 21 */
-               "[I2C1_SCL]", /* GPIO_7, BLSP8_I2C_SCL, LSEC pin 19 */
-               "GPIO-H", /* GPIO_8, LCD0_RESET_N, LSEC pin 30 */
-               "TP93", /* GPIO_9 */
-               "GPIO-G", /* GPIO_10, MDP_VSYNC_P, LSEC pin 29 */
-               "[MDP_VSYNC_S]", /* GPIO_11, S HSEC pin 55 */
-               "NC", /* GPIO_12 */
-               "[CSI0_MCLK]", /* GPIO_13, CAM_MCLK0, P HSEC pin 15 */
-               "[CAM_MCLK1]", /* GPIO_14, J14 pin 11 */
-               "[CSI1_MCLK]", /* GPIO_15, CAM_MCLK2, P HSEC pin 17 */
-               "TP99", /* GPIO_16 */
-               "[I2C2_SDA]", /* GPIO_17, CCI_I2C_SDA0, P HSEC pin 34 */
-               "[I2C2_SCL]", /* GPIO_18, CCI_I2C_SCL0, P HSEC pin 32 */
-               "[CCI_I2C_SDA1]", /* GPIO_19, S HSEC pin 38 */
-               "[CCI_I2C_SCL1]", /* GPIO_20, S HSEC pin 36 */
-               "FLASH_STROBE_EN", /* GPIO_21, S HSEC pin 5 */
-               "FLASH_STROBE_TRIG", /* GPIO_22, S HSEC pin 1 */
-               "GPIO-K", /* GPIO_23, CAM2_RST_N, LSEC pin 33 */
-               "GPIO-D", /* GPIO_24, LSEC pin 26 */
-               "GPIO-I", /* GPIO_25, CAM0_RST_N, LSEC pin 31 */
-               "GPIO-J", /* GPIO_26, CAM0_STANDBY_N, LSEC pin 32 */
-               "BLSP6_I2C_SDA", /* GPIO_27 */
-               "BLSP6_I2C_SCL", /* GPIO_28 */
-               "GPIO-B", /* GPIO_29, TS0_RESET_N, LSEC pin 24 */
-               "GPIO30", /* GPIO_30, S HSEC pin 4 */
-               "HDMI_CEC", /* GPIO_31 */
-               "HDMI_DDC_CLOCK", /* GPIO_32 */
-               "HDMI_DDC_DATA", /* GPIO_33 */
-               "HDMI_HOT_PLUG_DETECT", /* GPIO_34 */
-               "PCIE0_RST_N", /* GPIO_35 */
-               "PCIE0_CLKREQ_N", /* GPIO_36 */
-               "PCIE0_WAKE", /* GPIO_37 */
-               "SD_CARD_DET_N", /* GPIO_38 */
-               "TSIF1_SYNC", /* GPIO_39, S HSEC pin 48 */
-               "W_DISABLE_N", /* GPIO_40 */
-               "[BLSP9_UART_TX]", /* GPIO_41 */
-               "[BLSP9_UART_RX]", /* GPIO_42 */
-               "[BLSP2_UART_CTS_N]", /* GPIO_43 */
-               "[BLSP2_UART_RFR_N]", /* GPIO_44 */
-               "[BLSP3_UART_TX]", /* GPIO_45 */
-               "[BLSP3_UART_RX]", /* GPIO_46 */
-               "[I2C0_SDA]", /* GPIO_47, LS_I2C0_SDA, LSEC pin 17 */
-               "[I2C0_SCL]", /* GPIO_48, LS_I2C0_SCL, LSEC pin 15 */
-               "[UART0_TxD]", /* GPIO_49, BLSP9_UART_TX, LSEC pin 5 */
-               "[UART0_RxD]", /* GPIO_50, BLSP9_UART_RX, LSEC pin 7 */
-               "[UART0_CTS]", /* GPIO_51, BLSP9_UART_CTS_N, LSEC pin 3 */
-               "[UART0_RTS]", /* GPIO_52, BLSP9_UART_RFR_N, LSEC pin 9 */
-               "[CODEC_INT1_N]", /* GPIO_53 */
-               "[CODEC_INT2_N]", /* GPIO_54 */
-               "[BLSP7_I2C_SDA]", /* GPIO_55 */
-               "[BLSP7_I2C_SCL]", /* GPIO_56 */
-               "MI2S_MCLK", /* GPIO_57, S HSEC pin 3 */
-               "[PCM_CLK]", /* GPIO_58, QUA_MI2S_SCK, LSEC pin 18 */
-               "[PCM_FS]", /* GPIO_59, QUA_MI2S_WS, LSEC pin 16 */
-               "[PCM_DO]", /* GPIO_60, QUA_MI2S_DATA0, LSEC pin 20 */
-               "[PCM_DI]", /* GPIO_61, QUA_MI2S_DATA1, LSEC pin 22 */
-               "GPIO-E", /* GPIO_62, LSEC pin 27 */
-               "TP87", /* GPIO_63 */
-               "[CODEC_RST_N]", /* GPIO_64 */
-               "[PCM1_CLK]", /* GPIO_65 */
-               "[PCM1_SYNC]", /* GPIO_66 */
-               "[PCM1_DIN]", /* GPIO_67 */
-               "[PCM1_DOUT]", /* GPIO_68 */
-               "AUDIO_REF_CLK", /* GPIO_69 */
-               "SLIMBUS_CLK", /* GPIO_70 */
-               "SLIMBUS_DATA0", /* GPIO_71 */
-               "SLIMBUS_DATA1", /* GPIO_72 */
-               "NC", /* GPIO_73 */
-               "NC", /* GPIO_74 */
-               "NC", /* GPIO_75 */
-               "NC", /* GPIO_76 */
-               "TP94", /* GPIO_77 */
-               "NC", /* GPIO_78 */
-               "TP95", /* GPIO_79 */
-               "GPIO-A", /* GPIO_80, MEMS_RESET_N, LSEC pin 23 */
-               "TP88", /* GPIO_81 */
-               "TP89", /* GPIO_82 */
-               "TP90", /* GPIO_83 */
-               "TP91", /* GPIO_84 */
-               "[SD_DAT0]", /* GPIO_85, BLSP12_SPI_MOSI, P HSEC pin 1 */
-               "[SD_CMD]", /* GPIO_86, BLSP12_SPI_MISO, P HSEC pin 11 */
-               "[SD_DAT3]", /* GPIO_87, BLSP12_SPI_CS_N, P HSEC pin 7 */
-               "[SD_SCLK]", /* GPIO_88, BLSP12_SPI_CLK, P HSEC pin 9 */
-               "TSIF1_CLK", /* GPIO_89, S HSEC pin 42 */
-               "TSIF1_EN", /* GPIO_90, S HSEC pin 46 */
-               "TSIF1_DATA", /* GPIO_91, S HSEC pin 44 */
-               "NC", /* GPIO_92 */
-               "TSIF2_CLK", /* GPIO_93, S HSEC pin 52 */
-               "TSIF2_EN", /* GPIO_94, S HSEC pin 56 */
-               "TSIF2_DATA", /* GPIO_95, S HSEC pin 54 */
-               "TSIF2_SYNC", /* GPIO_96, S HSEC pin 58 */
-               "NC", /* GPIO_97 */
-               "CAM1_STANDBY_N", /* GPIO_98 */
-               "NC", /* GPIO_99 */
-               "NC", /* GPIO_100 */
-               "[LCD1_RESET_N]", /* GPIO_101, S HSEC pin 51 */
-               "BOOT_CONFIG1", /* GPIO_102 */
-               "USB_HUB_RESET", /* GPIO_103 */
-               "CAM1_RST_N", /* GPIO_104 */
-               "NC", /* GPIO_105 */
-               "NC", /* GPIO_106 */
-               "NC", /* GPIO_107 */
-               "NC", /* GPIO_108 */
-               "NC", /* GPIO_109 */
-               "NC", /* GPIO_110 */
-               "NC", /* GPIO_111 */
-               "NC", /* GPIO_112 */
-               "PMI8994_BUA", /* GPIO_113 */
-               "PCIE2_RST_N", /* GPIO_114 */
-               "PCIE2_CLKREQ_N", /* GPIO_115 */
-               "PCIE2_WAKE", /* GPIO_116 */
-               "SSC_IRQ_0", /* GPIO_117 */
-               "SSC_IRQ_1", /* GPIO_118 */
-               "SSC_IRQ_2", /* GPIO_119 */
-               "NC", /* GPIO_120 */
-               "GPIO121", /* GPIO_121, S HSEC pin 2 */
-               "NC", /* GPIO_122 */
-               "SSC_IRQ_6", /* GPIO_123 */
-               "SSC_IRQ_7", /* GPIO_124 */
-               "GPIO-C", /* GPIO_125, TS_INT0, LSEC pin 25 */
-               "BOOT_CONFIG5", /* GPIO_126 */
-               "NC", /* GPIO_127 */
-               "NC", /* GPIO_128 */
-               "BOOT_CONFIG7", /* GPIO_129 */
-               "PCIE1_RST_N", /* GPIO_130 */
-               "PCIE1_CLKREQ_N", /* GPIO_131 */
-               "PCIE1_WAKE", /* GPIO_132 */
-               "GPIO-L", /* GPIO_133, CAM2_STANDBY_N, LSEC pin 34 */
-               "NC", /* GPIO_134 */
-               "NC", /* GPIO_135 */
-               "BOOT_CONFIG8", /* GPIO_136 */
-               "NC", /* GPIO_137 */
-               "NC", /* GPIO_138 */
-               "GPS_SSBI2", /* GPIO_139 */
-               "GPS_SSBI1", /* GPIO_140 */
-               "NC", /* GPIO_141 */
-               "NC", /* GPIO_142 */
-               "NC", /* GPIO_143 */
-               "BOOT_CONFIG6", /* GPIO_144 */
-               "NC", /* GPIO_145 */
-               "NC", /* GPIO_146 */
-               "NC", /* GPIO_147 */
-               "NC", /* GPIO_148 */
-               "NC"; /* GPIO_149 */
-
-       sdc2_cd_on: sdc2_cd_on {
-               mux {
-                       pins = "gpio38";
-                       function = "gpio";
-               };
-
-               config {
-                       pins = "gpio38";
-                       bias-pull-up;           /* pull up */
-                       drive-strength = <16>;  /* 16 MA */
-               };
-       };
-
-       sdc2_cd_off: sdc2_cd_off {
-               mux {
-                       pins = "gpio38";
-                       function = "gpio";
-               };
-
-               config {
-                       pins = "gpio38";
-                       bias-pull-up;           /* pull up */
-                       drive-strength = <2>;   /* 2 MA */
-               };
-       };
-
-       hdmi_hpd_active: hdmi_hpd_active {
-               mux {
-                       pins = "gpio34";
-                       function = "hdmi_hot";
-               };
-
-               config {
-                       pins = "gpio34";
-                       bias-pull-down;
-                       drive-strength = <16>;
-               };
-       };
-
-       hdmi_hpd_suspend: hdmi_hpd_suspend {
-               mux {
-                       pins = "gpio34";
-                       function = "hdmi_hot";
-               };
-
-               config {
-                       pins = "gpio34";
-                       bias-pull-down;
-                       drive-strength = <2>;
-               };
-       };
-
-       hdmi_ddc_active: hdmi_ddc_active {
-               mux {
-                       pins = "gpio32", "gpio33";
-                       function = "hdmi_ddc";
-               };
-
-               config {
-                       pins = "gpio32", "gpio33";
-                       drive-strength = <2>;
-                       bias-pull-up;
-               };
-       };
-
-       hdmi_ddc_suspend: hdmi_ddc_suspend {
-               mux {
-                       pins = "gpio32", "gpio33";
-                       function = "hdmi_ddc";
-               };
-
-               config {
-                       pins = "gpio32", "gpio33";
-                       drive-strength = <2>;
-                       bias-pull-down;
-               };
-       };
-};
-
-&pcie0 {
-       status = "okay";
-       perst-gpio = <&tlmm 35 GPIO_ACTIVE_LOW>;
-       vddpe-3v3-supply = <&wlan_en>;
-       vdda-supply = <&vreg_l28a_0p925>;
-};
-
-&pcie1 {
-       status = "okay";
-       perst-gpio = <&tlmm 130 GPIO_ACTIVE_LOW>;
-       vdda-supply = <&vreg_l28a_0p925>;
-};
-
-&pcie2 {
-       status = "okay";
-       perst-gpio = <&tlmm 114 GPIO_ACTIVE_LOW>;
-       vdda-supply = <&vreg_l28a_0p925>;
-};
-
-&pcie_phy {
-       status = "okay";
-
-       vdda-phy-supply = <&vreg_l28a_0p925>;
-       vdda-pll-supply = <&vreg_l12a_1p8>;
-};
-
-&pm8994_gpios {
-       gpio-line-names =
-               "NC",
-               "KEY_VOLP_N",
-               "NC",
-               "BL1_PWM",
-               "GPIO-F", /* BL0_PWM, LSEC pin 28 */
-               "BL1_EN",
-               "NC",
-               "WLAN_EN",
-               "NC",
-               "NC",
-               "NC",
-               "NC",
-               "NC",
-               "NC",
-               "DIVCLK1",
-               "DIVCLK2",
-               "DIVCLK3",
-               "DIVCLK4",
-               "BT_EN",
-               "PMIC_SLB",
-               "PMIC_BUA",
-               "USB_VBUS_DET";
-
-       pinctrl-names = "default";
-       pinctrl-0 = <&ls_exp_gpio_f &bt_en_gpios>;
-
-       ls_exp_gpio_f: pm8994_gpio5 {
-               pinconf {
-                       pins = "gpio5";
-                       output-low;
-                       power-source = <2>; // PM8994_GPIO_S4, 1.8V
-               };
-       };
-
-       bt_en_gpios: bt_en_gpios {
-               pinconf {
-                       pins = "gpio19";
-                       function = PMIC_GPIO_FUNC_NORMAL;
-                       output-low;
-                       power-source = <PM8994_GPIO_S4>; // 1.8V
-                       qcom,drive-strength = <PMIC_GPIO_STRENGTH_LOW>;
-                       bias-pull-down;
-               };
-       };
-
-       wlan_en_gpios: wlan_en_gpios {
-               pinconf {
-                       pins = "gpio8";
-                       function = PMIC_GPIO_FUNC_NORMAL;
-                       output-low;
-                       power-source = <PM8994_GPIO_S4>; // 1.8V
-                       qcom,drive-strength = <PMIC_GPIO_STRENGTH_LOW>;
-                       bias-pull-down;
-               };
-       };
-
-       audio_mclk: clk_div1 {
-               pinconf {
-                       pins = "gpio15";
-                       function = "func1";
-                       power-source = <PM8994_GPIO_S4>; // 1.8V
-               };
-       };
-
-       volume_up_gpio: pm8996_gpio2 {
-               pinconf {
-                       pins = "gpio2";
-                       function = "normal";
-                       input-enable;
-                       drive-push-pull;
-                       bias-pull-up;
-                       qcom,drive-strength = <PMIC_GPIO_STRENGTH_NO>;
-                       power-source = <PM8994_GPIO_S4>; // 1.8V
-               };
-       };
-
-       divclk4_pin_a: divclk4 {
-               pinconf {
-                       pins = "gpio18";
-                       function = PMIC_GPIO_FUNC_FUNC2;
-
-                       bias-disable;
-                       power-source = <PM8994_GPIO_S4>;
-               };
-       };
-
-       usb3_vbus_det_gpio: pm8996_gpio22 {
-               pinconf {
-                       pins = "gpio22";
-                       function = PMIC_GPIO_FUNC_NORMAL;
-                       input-enable;
-                       bias-pull-down;
-                       qcom,drive-strength = <PMIC_GPIO_STRENGTH_NO>;
-                       power-source = <PM8994_GPIO_S4>; // 1.8V
-               };
-       };
-};
-
-&pm8994_mpps {
-       gpio-line-names =
-               "VDDPX_BIAS",
-               "WIFI_LED",
-               "NC",
-               "BT_LED",
-               "PM_MPP05",
-               "PM_MPP06",
-               "PM_MPP07",
-               "NC";
-};
-
-&pm8994_spmi_regulators {
-       qcom,saw-reg = <&saw3>;
-       s9 {
-               qcom,saw-slave;
-       };
-       s10 {
-               qcom,saw-slave;
-       };
-       s11 {
-               qcom,saw-leader;
-               regulator-always-on;
-               regulator-min-microvolt = <980000>;
-               regulator-max-microvolt = <980000>;
-       };
-};
-
-&pmi8994_gpios {
-       gpio-line-names =
-               "NC",
-               "SPKR_AMP_EN1",
-               "SPKR_AMP_EN2",
-               "TP61",
-               "NC",
-               "USB2_VBUS_DET",
-               "NC",
-               "NC",
-               "NC",
-               "NC";
-
-       usb2_vbus_det_gpio: pmi8996_gpio6 {
-               pinconf {
-                       pins = "gpio6";
-                       function = PMIC_GPIO_FUNC_NORMAL;
-                       input-enable;
-                       bias-pull-down;
-                       qcom,drive-strength = <PMIC_GPIO_STRENGTH_NO>;
-                       power-source = <PM8994_GPIO_S4>; // 1.8V
-               };
-       };
-};
-
-&pmi8994_spmi_regulators {
-       vdd_gfx: s2@1700 {
-               reg = <0x1700 0x100>;
-               regulator-name = "VDD_GFX";
-               regulator-min-microvolt = <980000>;
-               regulator-max-microvolt = <980000>;
-       };
-};
-
-&rpm_requests {
-       pm8994-regulators {
-               compatible = "qcom,rpm-pm8994-regulators";
-
-               vdd_s1-supply = <&vph_pwr>;
-               vdd_s2-supply = <&vph_pwr>;
-               vdd_s3-supply = <&vph_pwr>;
-               vdd_s4-supply = <&vph_pwr>;
-               vdd_s5-supply = <&vph_pwr>;
-               vdd_s6-supply = <&vph_pwr>;
-               vdd_s7-supply = <&vph_pwr>;
-               vdd_s8-supply = <&vph_pwr>;
-               vdd_s9-supply = <&vph_pwr>;
-               vdd_s10-supply = <&vph_pwr>;
-               vdd_s11-supply = <&vph_pwr>;
-               vdd_s12-supply = <&vph_pwr>;
-               vdd_l1-supply = <&vreg_s1b_1p025>;
-               vdd_l2_l26_l28-supply = <&vreg_s3a_1p3>;
-               vdd_l3_l11-supply = <&vreg_s3a_1p3>;
-               vdd_l4_l27_l31-supply = <&vreg_s3a_1p3>;
-               vdd_l5_l7-supply = <&vreg_s5a_2p15>;
-               vdd_l6_l12_l32-supply = <&vreg_s5a_2p15>;
-               vdd_l8_l16_l30-supply = <&vph_pwr>;
-               vdd_l9_l10_l18_l22-supply = <&vph_pwr_bbyp>;
-               vdd_l13_l19_l23_l24-supply = <&vph_pwr_bbyp>;
-               vdd_l14_l15-supply = <&vreg_s5a_2p15>;
-               vdd_l17_l29-supply = <&vph_pwr_bbyp>;
-               vdd_l20_l21-supply = <&vph_pwr_bbyp>;
-               vdd_l25-supply = <&vreg_s3a_1p3>;
-               vdd_lvs1_lvs2-supply = <&vreg_s4a_1p8>;
-
-               vreg_s3a_1p3: s3 {
-                       regulator-name = "vreg_s3a_1p3";
-                       regulator-min-microvolt = <1300000>;
-                       regulator-max-microvolt = <1300000>;
-               };
-
-               /**
-                * 1.8v required on LS expansion
-                * for mezzanine boards
-                */
-               vreg_s4a_1p8: s4 {
-                       regulator-name = "vreg_s4a_1p8";
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-                       regulator-always-on;
-               };
-               vreg_s5a_2p15: s5 {
-                       regulator-name = "vreg_s5a_2p15";
-                       regulator-min-microvolt = <2150000>;
-                       regulator-max-microvolt = <2150000>;
-               };
-               vreg_s7a_1p0: s7 {
-                       regulator-name = "vreg_s7a_1p0";
-                       regulator-min-microvolt = <800000>;
-                       regulator-max-microvolt = <800000>;
-               };
-
-               vreg_l1a_1p0: l1 {
-                       regulator-name = "vreg_l1a_1p0";
-                       regulator-min-microvolt = <1000000>;
-                       regulator-max-microvolt = <1000000>;
-               };
-               vreg_l2a_1p25: l2 {
-                       regulator-name = "vreg_l2a_1p25";
-                       regulator-min-microvolt = <1250000>;
-                       regulator-max-microvolt = <1250000>;
-               };
-               vreg_l3a_0p875: l3 {
-                       regulator-name = "vreg_l3a_0p875";
-                       regulator-min-microvolt = <850000>;
-                       regulator-max-microvolt = <850000>;
-               };
-               vreg_l4a_1p225: l4 {
-                       regulator-name = "vreg_l4a_1p225";
-                       regulator-min-microvolt = <1225000>;
-                       regulator-max-microvolt = <1225000>;
-               };
-               vreg_l6a_1p2: l6 {
-                       regulator-name = "vreg_l6a_1p2";
-                       regulator-min-microvolt = <1200000>;
-                       regulator-max-microvolt = <1200000>;
-               };
-               vreg_l8a_1p8: l8 {
-                       regulator-name = "vreg_l8a_1p8";
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-               };
-               vreg_l9a_1p8: l9 {
-                       regulator-name = "vreg_l9a_1p8";
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-               };
-               vreg_l10a_1p8: l10 {
-                       regulator-name = "vreg_l10a_1p8";
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-               };
-               vreg_l11a_1p15: l11 {
-                       regulator-name = "vreg_l11a_1p15";
-                       regulator-min-microvolt = <1150000>;
-                       regulator-max-microvolt = <1150000>;
-               };
-               vreg_l12a_1p8: l12 {
-                       regulator-name = "vreg_l12a_1p8";
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-               };
-               vreg_l13a_2p95: l13 {
-                       regulator-name = "vreg_l13a_2p95";
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <2950000>;
-               };
-               vreg_l14a_1p8: l14 {
-                       regulator-name = "vreg_l14a_1p8";
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-               };
-               vreg_l15a_1p8: l15 {
-                       regulator-name = "vreg_l15a_1p8";
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-               };
-               vreg_l16a_2p7: l16 {
-                       regulator-name = "vreg_l16a_2p7";
-                       regulator-min-microvolt = <2700000>;
-                       regulator-max-microvolt = <2700000>;
-               };
-               vreg_l17a_2p8: l17 {
-                       regulator-name = "vreg_l17a_2p8";
-                       regulator-min-microvolt = <2500000>;
-                       regulator-max-microvolt = <2500000>;
-               };
-               vreg_l18a_2p85: l18 {
-                       regulator-name = "vreg_l18a_2p85";
-                       regulator-min-microvolt = <2700000>;
-                       regulator-max-microvolt = <2900000>;
-               };
-               vreg_l19a_2p8: l19 {
-                       regulator-name = "vreg_l19a_2p8";
-                       regulator-min-microvolt = <3000000>;
-                       regulator-max-microvolt = <3000000>;
-               };
-               vreg_l20a_2p95: l20 {
-                       regulator-name = "vreg_l20a_2p95";
-                       regulator-min-microvolt = <2950000>;
-                       regulator-max-microvolt = <2950000>;
-                       regulator-allow-set-load;
-               };
-               vreg_l21a_2p95: l21 {
-                       regulator-name = "vreg_l21a_2p95";
-                       regulator-min-microvolt = <2950000>;
-                       regulator-max-microvolt = <2950000>;
-                       regulator-allow-set-load;
-                       regulator-system-load = <200000>;
-               };
-               vreg_l22a_3p0: l22 {
-                       regulator-name = "vreg_l22a_3p0";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-               };
-               vreg_l23a_2p8: l23 {
-                       regulator-name = "vreg_l23a_2p8";
-                       regulator-min-microvolt = <2800000>;
-                       regulator-max-microvolt = <2800000>;
-               };
-               vreg_l24a_3p075: l24 {
-                       regulator-name = "vreg_l24a_3p075";
-                       regulator-min-microvolt = <3075000>;
-                       regulator-max-microvolt = <3075000>;
-               };
-               vreg_l25a_1p2: l25 {
-                       regulator-name = "vreg_l25a_1p2";
-                       regulator-min-microvolt = <1200000>;
-                       regulator-max-microvolt = <1200000>;
-                       regulator-allow-set-load;
-               };
-               vreg_l26a_0p8: l27 {
-                       regulator-name = "vreg_l26a_0p8";
-                       regulator-min-microvolt = <1000000>;
-                       regulator-max-microvolt = <1000000>;
-               };
-               vreg_l28a_0p925: l28 {
-                       regulator-name = "vreg_l28a_0p925";
-                       regulator-min-microvolt = <925000>;
-                       regulator-max-microvolt = <925000>;
-                       regulator-allow-set-load;
-               };
-               vreg_l29a_2p8: l29 {
-                       regulator-name = "vreg_l29a_2p8";
-                       regulator-min-microvolt = <2800000>;
-                       regulator-max-microvolt = <2800000>;
-               };
-               vreg_l30a_1p8: l30 {
-                       regulator-name = "vreg_l30a_1p8";
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-               };
-               vreg_l32a_1p8: l32 {
-                       regulator-name = "vreg_l32a_1p8";
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-               };
-
-               vreg_lvs1a_1p8: lvs1 {
-                       regulator-name = "vreg_lvs1a_1p8";
-               };
-
-               vreg_lvs2a_1p8: lvs2 {
-                       regulator-name = "vreg_lvs2a_1p8";
-               };
-       };
-
-       pmi8994-regulators {
-               compatible = "qcom,rpm-pmi8994-regulators";
-
-               vdd_s1-supply = <&vph_pwr>;
-               vdd_s2-supply = <&vph_pwr>;
-               vdd_s3-supply = <&vph_pwr>;
-               vdd_bst_byp-supply = <&vph_pwr>;
-
-               vph_pwr_bbyp: boost-bypass {
-                       regulator-name = "vph_pwr_bbyp";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-               };
-
-               vreg_s1b_1p025: s1 {
-                       regulator-name = "vreg_s1b_1p025";
-                       regulator-min-microvolt = <1025000>;
-                       regulator-max-microvolt = <1025000>;
-               };
-       };
-};
-
-&sdhc2 {
-       /* External SD card */
-       pinctrl-names = "default", "sleep";
-       pinctrl-0 = <&sdc2_state_on &sdc2_cd_on>;
-       pinctrl-1 = <&sdc2_state_off &sdc2_cd_off>;
-       cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
-       vmmc-supply = <&vreg_l21a_2p95>;
-       vqmmc-supply = <&vreg_l13a_2p95>;
-       status = "okay";
-};
-
-&q6asmdai {
-       dai@0 {
-               reg = <0>;
-       };
-
-       dai@1 {
-               reg = <1>;
-       };
-
-       dai@2 {
-               reg = <2>;
-       };
-};
-
-&sound {
-       compatible = "qcom,apq8096-sndcard";
-       model = "DB820c";
-       audio-routing = "RX_BIAS", "MCLK",
-               "MM_DL1",  "MultiMedia1 Playback",
-               "MM_DL2",  "MultiMedia2 Playback",
-               "MultiMedia3 Capture", "MM_UL3";
-
-       mm1-dai-link {
-               link-name = "MultiMedia1";
-               cpu {
-                       sound-dai = <&q6asmdai  MSM_FRONTEND_DAI_MULTIMEDIA1>;
-               };
-       };
-
-       mm2-dai-link {
-               link-name = "MultiMedia2";
-               cpu {
-                       sound-dai = <&q6asmdai  MSM_FRONTEND_DAI_MULTIMEDIA2>;
-               };
-       };
-
-       mm3-dai-link {
-               link-name = "MultiMedia3";
-               cpu {
-                       sound-dai = <&q6asmdai  MSM_FRONTEND_DAI_MULTIMEDIA3>;
-               };
-       };
-
-       hdmi-dai-link {
-               link-name = "HDMI";
-               cpu {
-                       sound-dai = <&q6afedai HDMI_RX>;
-               };
-
-               platform {
-                       sound-dai = <&q6routing>;
-               };
-
-               codec {
-                       sound-dai = <&hdmi 0>;
-               };
-       };
-
-       slim-dai-link {
-               link-name = "SLIM Playback";
-               cpu {
-                       sound-dai = <&q6afedai SLIMBUS_6_RX>;
-               };
-
-               platform {
-                       sound-dai = <&q6routing>;
-       };
-
-               codec {
-                       sound-dai = <&wcd9335 6>;
-               };
-       };
-
-       slimcap-dai-link {
-               link-name = "SLIM Capture";
-               cpu {
-                       sound-dai = <&q6afedai SLIMBUS_0_TX>;
-               };
-
-               platform {
-                       sound-dai = <&q6routing>;
-               };
-
-               codec {
-                       sound-dai = <&wcd9335 1>;
-               };
-       };
-};
-
-&ufsphy {
-       status = "okay";
-
-       vdda-phy-supply = <&vreg_l28a_0p925>;
-       vdda-pll-supply = <&vreg_l12a_1p8>;
-       vddp-ref-clk-supply = <&vreg_l25a_1p2>;
-};
-
-&ufshc {
-       status = "okay";
-
-       vcc-supply = <&vreg_l20a_2p95>;
-       vccq-supply = <&vreg_l25a_1p2>;
-       vccq2-supply = <&vreg_s4a_1p8>;
-
-       vcc-max-microamp = <600000>;
-       vccq-max-microamp = <450000>;
-       vccq2-max-microamp = <450000>;
-};
-
-&usb2 {
-       status = "okay";
-       extcon = <&usb2_id>;
-
-       dwc3@7600000 {
-               extcon = <&usb2_id>;
-               dr_mode = "otg";
-               maximum-speed = "high-speed";
-       };
-};
-
-&usb3 {
-       status = "okay";
-       extcon = <&usb3_id>;
-
-       dwc3@6a00000 {
-               extcon = <&usb3_id>;
-               dr_mode = "otg";
-       };
-};
-
-&usb3phy {
-       status = "okay";
-
-       vdda-phy-supply = <&vreg_l28a_0p925>;
-       vdda-pll-supply = <&vreg_l12a_1p8>;
-
-};
-
-&venus {
-       status = "okay";
-};
-
-&wcd9335 {
-       clock-names = "mclk", "slimbus";
-       clocks = <&div1_mclk>,
-                <&rpmcc RPM_SMD_BB_CLK1>;
-
-       vdd-buck-supply = <&vreg_s4a_1p8>;
-       vdd-buck-sido-supply = <&vreg_s4a_1p8>;
-       vdd-tx-supply = <&vreg_s4a_1p8>;
-       vdd-rx-supply = <&vreg_s4a_1p8>;
-       vdd-io-supply = <&vreg_s4a_1p8>;
-};
index d66c155..7c0ceb3 100644 (file)
@@ -5,9 +5,22 @@
 
 /dts-v1/;
 
-#include "msm8916-mtp.dtsi"
+#include "msm8916-pm8916.dtsi"
 
 / {
        model = "Qualcomm Technologies, Inc. MSM 8916 MTP";
        compatible = "qcom,msm8916-mtp", "qcom,msm8916-mtp/1", "qcom,msm8916";
+
+       aliases {
+               serial0 = &blsp1_uart2;
+               usid0 = &pm8916_0;
+       };
+
+       chosen {
+               stdout-path = "serial0";
+       };
+};
+
+&blsp1_uart2 {
+       status = "okay";
 };
diff --git a/arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi b/arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi
deleted file mode 100644 (file)
index 1bd0504..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.
- */
-
-#include "msm8916-pm8916.dtsi"
-
-/ {
-       aliases {
-               serial0 = &blsp1_uart2;
-               usid0 = &pm8916_0;
-       };
-
-       chosen {
-               stdout-path = "serial0";
-       };
-};
-
-&blsp1_uart2 {
-       status = "okay";
-};
index 45ed594..7d9fc35 100644 (file)
@@ -5,9 +5,31 @@
 
 /dts-v1/;
 
-#include "msm8996-mtp.dtsi"
+#include "msm8996.dtsi"
 
 / {
        model = "Qualcomm Technologies, Inc. MSM 8996 MTP";
        compatible = "qcom,msm8996-mtp";
+
+       aliases {
+               serial0 = &blsp2_uart2;
+       };
+
+       chosen {
+               stdout-path = "serial0";
+       };
+
+       soc {
+               serial@75b0000 {
+                       status = "okay";
+               };
+       };
+};
+
+&hdmi {
+       status = "okay";
+};
+
+&hdmi_phy {
+       status = "okay";
 };
diff --git a/arch/arm64/boot/dts/qcom/msm8996-mtp.dtsi b/arch/arm64/boot/dts/qcom/msm8996-mtp.dtsi
deleted file mode 100644 (file)
index ac43a91..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.
- */
-
-#include "msm8996.dtsi"
-
-/ {
-       aliases {
-               serial0 = &blsp2_uart2;
-       };
-
-       chosen {
-               stdout-path = "serial0";
-       };
-
-       soc {
-               serial@75b0000 {
-                       status = "okay";
-               };
-       };
-};
-
-&hdmi {
-       status = "okay";
-};
-
-&hdmi_phy {
-       status = "okay";
-};