Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44b7c70c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Move various nodes under /vendor on SDM845"

parents a262fffa db9fe120

arch/arm64/boot/dts/qcom/Makefile

+11 −10
Original line number Diff line number Diff line
@@ -2,6 +2,17 @@ dtb-$(CONFIG_ARCH_QCOM) += apq8016-sbc.dtb msm8916-mtp.dtb 
dtb-$(CONFIG_ARCH_QCOM)	+= msm8996-mtp.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= apq8096-db820c.dtb





ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

	dtbo-$(CONFIG_ARCH_SDM845) += \

		sdm845-cdp-overlay.dtbo \

		sdm845-mtp-overlay.dtbo \

		sdm845-qrd-overlay.dtbo



sdm845-cdp-overlay.dtbo-base := sdm845.dtb

sdm845-mtp-overlay.dtbo-base := sdm845.dtb

sdm845-qrd-overlay.dtbo-base := sdm845.dtb

else

dtb-$(CONFIG_ARCH_SDM845) += sdm845-sim.dtb \

	sdm845-rumi.dtb \

	sdm845-mtp.dtb \
@@ -14,16 +25,6 @@ dtb-$(CONFIG_ARCH_SDM845) += sdm845-sim.dtb \ 
	sdm845-4k-panel-mtp.dtb \

	sdm845-4k-panel-cdp.dtb \

	sdm845-4k-panel-qrd.dtb



ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

	dtbo-$(CONFIG_ARCH_SDM845) += \

		sdm845-cdp-overlay.dtbo \

		sdm845-mtp-overlay.dtbo \

		sdm845-qrd-overlay.dtbo



sdm845-cdp-overlay.dtbo-base := sdm845.dtb

sdm845-mtp-overlay.dtbo-base := sdm845.dtb

sdm845-qrd-overlay.dtbo-base := sdm845.dtb

endif



dtb-$(CONFIG_ARCH_SDM670) += sdm670-rumi.dtb \

arch/arm64/boot/dts/qcom/sdm845-cdp.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include <dt-bindings/gpio/gpio.h>

#include "sdm845-camera-sensor-cdp.dtsi"



/ {

&vendor {

	bluetooth: bt_wcn3990 {

		compatible = "qca,wcn3990";

		qca,bt-vdd-io-supply = <&pm8998_s3>;
@@ -188,7 +188,7 @@ 
	qcom,batteryless-platform;

};



/ {

&vendor {

	extcon_usb1: extcon_usb1 {

		compatible = "linux,extcon-usb-gpio";

		id-gpio = <&pmi8998_gpios 9 GPIO_ACTIVE_HIGH>;

arch/arm64/boot/dts/qcom/sdm845-mtp.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include "sdm845-camera-sensor-mtp.dtsi"

#include "smb1355.dtsi"



/ {

&vendor {

	bluetooth: bt_wcn3990 {

		compatible = "qca,wcn3990";

		qca,bt-vdd-io-supply = <&pm8998_s3>;
@@ -260,7 +260,7 @@ 
	pinctrl-1 = <&flash_led3_front_dis>;

};



/{

&vendor {

	mtp_batterydata: qcom,battery-data {

		qcom,batt-id-range-pct = <15>;

		#include "fg-gen3-batterydata-itech-3000mah.dtsi"

arch/arm64/boot/dts/qcom/sdm845-qrd.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include "smb1355.dtsi"

#include <dt-bindings/gpio/gpio.h>



/{

&vendor {

	bluetooth: bt_wcn3990 {

		compatible = "qca,wcn3990";

		qca,bt-vdd-io-supply = <&pm8998_s3>;