Merge "ARM: dts: msm: Add device tree changes for sdm429-bg target"
diff --git a/arch/arm64/boot/dts/qcom/sda429-bg-wdp-overlay.dts b/arch/arm64/boot/dts/qcom/sda429-bg-wdp-overlay.dts
index f895f17..0ddd81d 100644
--- a/arch/arm64/boot/dts/qcom/sda429-bg-wdp-overlay.dts
+++ b/arch/arm64/boot/dts/qcom/sda429-bg-wdp-overlay.dts
@@ -24,6 +24,118 @@
qcom,pmic-id = <0x0002001b 0x0 0x0 0x0>;
};
+&soc {
+
+ qcom,blackghost {
+ compatible = "qcom,pil-blackghost";
+ qcom,pil-force-shutdown;
+ qcom,firmware-name = "bg-wear";
+ /* GPIO inputs from blackghost */
+ qcom,bg2ap-status-gpio = <&tlmm 44 0>;
+ qcom,bg2ap-errfatal-gpio = <&tlmm 72 0>;
+ /* GPIO output to blackghost */
+ qcom,ap2bg-status-gpio = <&tlmm 61 0>;
+ qcom,ap2bg-errfatal-gpio = <&tlmm 62 0>;
+ };
+
+ qcom,msm-ssc-sensors {
+ compatible = "qcom,msm-ssc-sensors";
+ };
+
+ qcom,glink-bgcom-xprt-bg {
+ compatible = "qcom,glink-bgcom-xprt";
+ label = "bg";
+ qcom,qos-config = <&glink_qos_bg>;
+ qcom,ramp-time = <0x10>,
+ <0x20>,
+ <0x30>,
+ <0x40>;
+ };
+
+ glink_qos_bg: qcom,glink-qos-config-bg {
+ compatible = "qcom,glink-qos-config";
+ qcom,flow-info = <0x80 0x0>,
+ <0x70 0x1>,
+ <0x60 0x2>,
+ <0x50 0x3>;
+ qcom,mtu-size = <0x800>;
+ qcom,tput-stats-cycle = <0xa>;
+ };
+
+ qcom,glink_pkt {
+ compatible = "qcom,glinkpkt";
+
+ qcom,glinkpkt-bg-daemon {
+ qcom,glinkpkt-transport = "bgcom";
+ qcom,glinkpkt-edge = "bg";
+ qcom,glinkpkt-ch-name = "bg-daemon";
+ qcom,glinkpkt-dev-name = "glink_pkt_bg_daemon";
+ };
+
+ qcom,glinkpkt-bg-display-ctrl {
+ qcom,glinkpkt-transport = "bgcom";
+ qcom,glinkpkt-edge = "bg";
+ qcom,glinkpkt-ch-name = "display-ctrl";
+ qcom,glinkpkt-dev-name = "glink_pkt_bg_display_ctrl";
+ };
+
+ qcom,glinkpkt-bg-display-data {
+ qcom,glinkpkt-transport = "bgcom";
+ qcom,glinkpkt-edge = "bg";
+ qcom,glinkpkt-ch-name = "display-data";
+ qcom,glinkpkt-dev-name = "glink_pkt_bg_display_data";
+ };
+
+ qcom,glinkpkt-bg-rsb-ctrl {
+ qcom,glinkpkt-transport = "bgcom";
+ qcom,glinkpkt-edge = "bg";
+ qcom,glinkpkt-ch-name = "RSB_CTRL";
+ qcom,glinkpkt-dev-name = "glink_pkt_bg_rsb_ctrl";
+ };
+
+ qcom,glinkpkt-bg-sso-ctrl {
+ qcom,glinkpkt-transport = "bgcom";
+ qcom,glinkpkt-edge = "bg";
+ qcom,glinkpkt-ch-name = "sso-ctrl";
+ qcom,glinkpkt-dev-name = "glink_pkt_bg_sso_ctrl";
+ };
+
+ qcom,glinkpkt-bg-buzzer-ctrl {
+ qcom,glinkpkt-transport = "bgcom";
+ qcom,glinkpkt-edge = "bg";
+ qcom,glinkpkt-ch-name = "buzzer-ctrl";
+ qcom,glinkpkt-dev-name = "glink_pkt_bg_buzzer_ctrl";
+ };
+ };
+
+ spi_3: spi@78b7000 { /* BLSP1 QUP3*/
+ status = "ok";
+ qcom,bg-spi {
+ compatible = "qcom,bg-spi";
+ reg = <0>;
+ spi-max-frequency = <16000000>;
+ interrupt-parent = <&tlmm>;
+ qcom,irq-gpio = <&tlmm 43 1>;
+ };
+ };
+
+ i2c_3: i2c@78b7000 { /* BLSP1 QUP3 */
+ status = "disabled";
+ };
+
+ qcom,bg-rsb {
+ compatible = "qcom,bg-rsb";
+ vdd-ldo1-supply = <&pm660_l11>;
+ };
+
+ qcom,bg-daemon {
+ compatible = "qcom,bg-daemon";
+ qcom,bg-reset-gpio = <&pm660_gpios 5 0>;
+ ssr-reg1-supply = <&pm660_l3>;
+ ssr-reg2-supply = <&pm660_l9>;
+ };
+};
+
&usb_otg {
HSUSB_3p3-supply = <&L16A>;
};
diff --git a/arch/arm64/boot/dts/qcom/sda429-bg-wtp-overlay.dts b/arch/arm64/boot/dts/qcom/sda429-bg-wtp-overlay.dts
index d12b346..8d2e157 100644
--- a/arch/arm64/boot/dts/qcom/sda429-bg-wtp-overlay.dts
+++ b/arch/arm64/boot/dts/qcom/sda429-bg-wtp-overlay.dts
@@ -31,11 +31,11 @@
qcom,pil-force-shutdown;
qcom,firmware-name = "bg-wear";
/* GPIO inputs from blackghost */
- qcom,bg2ap-status-gpio = <&msm_gpio 44 0>;
- qcom,bg2ap-errfatal-gpio = <&msm_gpio 72 0>;
+ qcom,bg2ap-status-gpio = <&tlmm 44 0>;
+ qcom,bg2ap-errfatal-gpio = <&tlmm 72 0>;
/* GPIO output to blackghost */
- qcom,ap2bg-status-gpio = <&msm_gpio 61 0>;
- qcom,ap2bg-errfatal-gpio = <&msm_gpio 62 0>;
+ qcom,ap2bg-status-gpio = <&tlmm 61 0>;
+ qcom,ap2bg-errfatal-gpio = <&tlmm 62 0>;
};
qcom,msm-ssc-sensors {
@@ -108,21 +108,24 @@
};
};
- spi@78B8000 { /* BLSP1 QUP4 */
+ spi_3: spi@78b7000 { /* BLSP1 QUP3*/
status = "ok";
qcom,bg-spi {
compatible = "qcom,bg-spi";
reg = <0>;
spi-max-frequency = <16000000>;
- interrupt-parent = <&msm_gpio>;
- qcom,irq-gpio = <&msm_gpio 43 1>;
+ interrupt-parent = <&tlmm>;
+ qcom,irq-gpio = <&tlmm 43 1>;
};
};
+ i2c_3: i2c@78b7000 { /* BLSP1 QUP3 */
+ status = "disabled";
+ };
+
qcom,bg-rsb {
compatible = "qcom,bg-rsb";
vdd-ldo1-supply = <&pm660_l11>;
- vdd-ldo2-supply = <&pm660_l15>;
};
qcom,bg-daemon {
diff --git a/arch/arm64/boot/dts/qcom/sdm429-bg-wdp-overlay.dts b/arch/arm64/boot/dts/qcom/sdm429-bg-wdp-overlay.dts
index 53229a0..d78655b 100644
--- a/arch/arm64/boot/dts/qcom/sdm429-bg-wdp-overlay.dts
+++ b/arch/arm64/boot/dts/qcom/sdm429-bg-wdp-overlay.dts
@@ -31,11 +31,11 @@
qcom,pil-force-shutdown;
qcom,firmware-name = "bg-wear";
/* GPIO inputs from blackghost */
- qcom,bg2ap-status-gpio = <&msm_gpio 44 0>;
- qcom,bg2ap-errfatal-gpio = <&msm_gpio 72 0>;
+ qcom,bg2ap-status-gpio = <&tlmm 44 0>;
+ qcom,bg2ap-errfatal-gpio = <&tlmm 72 0>;
/* GPIO output to blackghost */
- qcom,ap2bg-status-gpio = <&msm_gpio 61 0>;
- qcom,ap2bg-errfatal-gpio = <&msm_gpio 62 0>;
+ qcom,ap2bg-status-gpio = <&tlmm 61 0>;
+ qcom,ap2bg-errfatal-gpio = <&tlmm 62 0>;
};
qcom,msm-ssc-sensors {
@@ -108,21 +108,24 @@
};
};
- spi@78B8000 { /* BLSP1 QUP4 */
+ spi_3: spi@78b7000 { /*BLSP1 QUP3*/
status = "ok";
qcom,bg-spi {
compatible = "qcom,bg-spi";
reg = <0>;
spi-max-frequency = <16000000>;
- interrupt-parent = <&msm_gpio>;
- qcom,irq-gpio = <&msm_gpio 43 1>;
+ interrupt-parent = <&tlmm>;
+ qcom,irq-gpio = <&tlmm 43 1>;
};
};
+ i2c_3: i2c@78b8000 { /* BLSP1 QUP3 */
+ status = "disabled";
+ };
+
qcom,bg-rsb {
compatible = "qcom,bg-rsb";
vdd-ldo1-supply = <&pm660_l11>;
- vdd-ldo2-supply = <&pm660_l15>;
};
qcom,bg-daemon {
diff --git a/arch/arm64/boot/dts/qcom/sdm429-bg-wtp-overlay.dts b/arch/arm64/boot/dts/qcom/sdm429-bg-wtp-overlay.dts
index 96c2385..6502a3e 100644
--- a/arch/arm64/boot/dts/qcom/sdm429-bg-wtp-overlay.dts
+++ b/arch/arm64/boot/dts/qcom/sdm429-bg-wtp-overlay.dts
@@ -24,6 +24,118 @@
qcom,pmic-id = <0x0002001b 0x0 0x0 0x0>;
};
+&soc {
+
+ qcom,blackghost {
+ compatible = "qcom,pil-blackghost";
+ qcom,pil-force-shutdown;
+ qcom,firmware-name = "bg-wear";
+ /* GPIO inputs from blackghost */
+ qcom,bg2ap-status-gpio = <&tlmm 44 0>;
+ qcom,bg2ap-errfatal-gpio = <&tlmm 72 0>;
+ /* GPIO output to blackghost */
+ qcom,ap2bg-status-gpio = <&tlmm 61 0>;
+ qcom,ap2bg-errfatal-gpio = <&tlmm 62 0>;
+ };
+
+ qcom,msm-ssc-sensors {
+ compatible = "qcom,msm-ssc-sensors";
+ };
+
+ qcom,glink-bgcom-xprt-bg {
+ compatible = "qcom,glink-bgcom-xprt";
+ label = "bg";
+ qcom,qos-config = <&glink_qos_bg>;
+ qcom,ramp-time = <0x10>,
+ <0x20>,
+ <0x30>,
+ <0x40>;
+ };
+
+ glink_qos_bg: qcom,glink-qos-config-bg {
+ compatible = "qcom,glink-qos-config";
+ qcom,flow-info = <0x80 0x0>,
+ <0x70 0x1>,
+ <0x60 0x2>,
+ <0x50 0x3>;
+ qcom,mtu-size = <0x800>;
+ qcom,tput-stats-cycle = <0xa>;
+ };
+
+ qcom,glink_pkt {
+ compatible = "qcom,glinkpkt";
+
+ qcom,glinkpkt-bg-daemon {
+ qcom,glinkpkt-transport = "bgcom";
+ qcom,glinkpkt-edge = "bg";
+ qcom,glinkpkt-ch-name = "bg-daemon";
+ qcom,glinkpkt-dev-name = "glink_pkt_bg_daemon";
+ };
+
+ qcom,glinkpkt-bg-display-ctrl {
+ qcom,glinkpkt-transport = "bgcom";
+ qcom,glinkpkt-edge = "bg";
+ qcom,glinkpkt-ch-name = "display-ctrl";
+ qcom,glinkpkt-dev-name = "glink_pkt_bg_display_ctrl";
+ };
+
+ qcom,glinkpkt-bg-display-data {
+ qcom,glinkpkt-transport = "bgcom";
+ qcom,glinkpkt-edge = "bg";
+ qcom,glinkpkt-ch-name = "display-data";
+ qcom,glinkpkt-dev-name = "glink_pkt_bg_display_data";
+ };
+
+ qcom,glinkpkt-bg-rsb-ctrl {
+ qcom,glinkpkt-transport = "bgcom";
+ qcom,glinkpkt-edge = "bg";
+ qcom,glinkpkt-ch-name = "RSB_CTRL";
+ qcom,glinkpkt-dev-name = "glink_pkt_bg_rsb_ctrl";
+ };
+
+ qcom,glinkpkt-bg-sso-ctrl {
+ qcom,glinkpkt-transport = "bgcom";
+ qcom,glinkpkt-edge = "bg";
+ qcom,glinkpkt-ch-name = "sso-ctrl";
+ qcom,glinkpkt-dev-name = "glink_pkt_bg_sso_ctrl";
+ };
+
+ qcom,glinkpkt-bg-buzzer-ctrl {
+ qcom,glinkpkt-transport = "bgcom";
+ qcom,glinkpkt-edge = "bg";
+ qcom,glinkpkt-ch-name = "buzzer-ctrl";
+ qcom,glinkpkt-dev-name = "glink_pkt_bg_buzzer_ctrl";
+ };
+ };
+
+ spi_3: spi@78b7000 { /* BLSP1 QUP3*/
+ status = "ok";
+ qcom,bg-spi {
+ compatible = "qcom,bg-spi";
+ reg = <0>;
+ spi-max-frequency = <16000000>;
+ interrupt-parent = <&tlmm>;
+ qcom,irq-gpio = <&tlmm 43 1>;
+ };
+ };
+
+ i2c_3: i2c@78b7000 { /* BLSP1 QUP3 */
+ status = "disabled";
+ };
+
+ qcom,bg-rsb {
+ compatible = "qcom,bg-rsb";
+ vdd-ldo1-supply = <&pm660_l11>;
+ };
+
+ qcom,bg-daemon {
+ compatible = "qcom,bg-daemon";
+ qcom,bg-reset-gpio = <&pm660_gpios 5 0>;
+ ssr-reg1-supply = <&pm660_l3>;
+ ssr-reg2-supply = <&pm660_l9>;
+ };
+};
+
&usb_otg {
HSUSB_3p3-supply = <&L16A>;
};