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

Commit f568594a 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 support for sdm439 rcm" into msm-4.9

parents 137d2032 8386daaf
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -327,7 +327,8 @@ dtbo-$(CONFIG_ARCH_SDM632) += sdm632-rumi-overlay.dtbo \
dtbo-$(CONFIG_ARCH_SDM439) += sdm439-mtp-overlay.dtbo \
	sdm439-cdp-overlay.dtbo \
	sdm439-qrd-overlay.dtbo \
	sdm439-external-codec-mtp-overlay.dtbo
	sdm439-external-codec-mtp-overlay.dtbo \
	sdm439-rcm-overlay.dtbo

dtbo-$(CONFIG_ARCH_SDM429) += sdm429-mtp-overlay.dtbo \
	sdm429-cdp-overlay.dtbo \
@@ -395,6 +396,7 @@ sdm439-cdp-overlay.dtbo-base := sdm439.dtb \
sdm439-qrd-overlay.dtbo-base := sdm439.dtb \
	msm8937-interposer-sdm439.dtb
sdm439-external-codec-mtp-overlay.dtbo-base := sdm439.dtb
sdm439-rcm-overlay.dtbo-base := sdm439.dtb
sdm429-mtp-overlay.dtbo-base := sdm429.dtb \
	sda429.dtb \
	msm8937-interposer-sdm429.dtb
@@ -504,7 +506,8 @@ dtb-$(CONFIG_ARCH_SDM439) += sdm439-mtp.dtb \
	sdm439-qrd.dtb \
	sda439-mtp.dtb \
	sda439-cdp.dtb \
	sdm439-external-codec-mtp.dtb
	sdm439-external-codec-mtp.dtb \
	sdm439-rcm.dtb

dtb-$(CONFIG_ARCH_SDM429) += sdm429-mtp.dtb \
	sdm429-cdp.dtb \
+22 −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.
 */

/dts-v1/;
/plugin/;

#include "sdm439-rcm.dtsi"

/ {
	model = "RCM";
	qcom,board-id = <21 1>;
};
+24 −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.
 */

/dts-v1/;

#include "sdm439.dtsi"
#include "sdm439-rcm.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. SDM439 RCM";
	compatible = "qcom,sdm439-cdp", "qcom,sdm439", "qcom,cdp";
	qcom,board-id = <21 1>;
	qcom,pmic-id = <0x010016 0x25 0x0 0x0>;
};
+14 −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.
 */

#include "sdm439-cdp.dtsi"