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

Commit 5810ea43 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: Add device tree changes for MSM8909 with PMIC8916 support"

parents fbcdf7a5 360e0e8e
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -549,7 +549,8 @@ dtb-$(CONFIG_ARCH_MSM8917) += msm8917-pmi8950-mtp.dtb \
	msm8917-pmi8940-rcm.dtb \
	qm215-qrd.dtb

dtb-$(CONFIG_ARCH_MSM8909) += sdw3100-msm8909w-wtp.dtb \
dtb-$(CONFIG_ARCH_MSM8909) += msm8909-pm8916-mtp.dtb \
	sdw3100-msm8909w-wtp.dtb \
	sdw3100-apq8009w-wtp.dtb \
	sdw3100-apq8009w-alpha.dtb \
	apq8009-mtp-wcd9326-refboard.dtb \
+21 −0
Original line number Diff line number Diff line
/*
 * Copyright (c) 2018, The Linux Foundation. All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 and
 * only version 2 as published by the Free Software Foundation.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 */

&reserved_mem {
	secure_display_memory: secure_region {
		compatible = "shared-dma-pool";
		label = "secure_display_mem";
		size = <0 0x1400000>;
		reusable;
	};
};
+35 −0
Original line number Diff line number Diff line
/*
 * Copyright (c) 2016,2018, The Linux Foundation. All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 and
 * only version 2 as published by the Free Software Foundation.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 */

/dts-v1/;

#include "msm8909-mtp.dtsi"
#include "8909-pm8916.dtsi"
#include "msm8909-pm8916-mtp.dtsi"
#include "msm8909-mtp_qseev4.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. MSM8909-PM8916 1GB MTP";
	compatible = "qcom,msm8909-mtp", "qcom,msm8909", "qcom,mtp";
	qcom,msm-id = <245 0x20000>, <245 0x0>;
	qcom,board-id= <0x02010008 0x102>;
	qcom,pmic-id = <0x1000B 0x0 0x0 0x0>;
};

&pm8916_chg {
	status = "ok";
};

&usb_otg {
	extcon = <&pm8916_chg>;
};