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

Commit 340d2121 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 support for MSM8940"

parents 08f8d92b d0eb392e
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -68,6 +68,9 @@ SoCs:
- MSM8917
  compatible = "qcom,msm8917"

- MSM8940
  compatible = "qcom,msm8940"

- MSM8936
  compatible = "qcom,msm8936"

@@ -213,6 +216,9 @@ compatible = "qcom,msm8917-mtp"
compatible = "qcom,msm8917-rumi"
compatible = "qcom,msm8917-qrd"
compatible = "qcom,msm8917-qrd-sku5"
compatible = "qcom,msm8940-cdp"
compatible = "qcom,msm8940-mtp"
compatible = "qcom,msm8940-rumi"
compatible = "qcom,msm8926-cdp"
compatible = "qcom,msm8926-mtp"
compatible = "qcom,msm8926-qrd"
+7 −0
Original line number Diff line number Diff line
@@ -143,6 +143,13 @@ dtb-$(CONFIG_ARCH_MSM8917) += msm8917-rumi.dtb \
	msm8917-pmi8950-rcm.dtb \
	msm8917-pmi8937-qrd-sku5.dtb

dtb-$(CONFIG_ARCH_MSM8940) += msm8940-pmi8937-cdp.dtb \
	msm8940-pmi8937-mtp.dtb \
	msm8940-pmi8950-cdp.dtb \
	msm8940-pmi8950-mtp.dtb \
	msm8940-pmi8937-rcm.dtb \
	msm8940-pmi8950-rcm.dtb

dtb-$(CONFIG_ARCH_MSM8953) += msm8953-sim.dtb \
	msm8953-rumi.dtb \
	msm8953-cdp.dtb \
+18 −0
Original line number Diff line number Diff line
/*
 * Copyright (c) 2016, 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 "msm8937-cdp.dtsi"
#include "msm8940-pinctrl.dtsi"

&soc {
};
+18 −0
Original line number Diff line number Diff line
/*
 * Copyright (c) 2016, 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 "msm8937-mtp.dtsi"
#include "msm8940-pinctrl.dtsi"

&soc {
};
+17 −0
Original line number Diff line number Diff line
/*
 * Copyright (c) 2016, 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 "msm8937-pinctrl.dtsi"

&soc {
};
Loading