Merge "ARM: dts: msm: Add dedicated DT for 8916 QRD SKUH platform" (2840d981) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/boot/dts/qcom/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ dtb-$(CONFIG_ARCH_MSM8916) += msm8916-sim.dtb \
		msm8916-cdp-smb1360.dtb \
		msm8916-mtp.dtb \
		msm8916-mtp-smb1360.dtb \
		msm8916-qrd.dtb \
		msm8916-qrd-skuh.dtb \
		msm8936-sim.dtb \
		msm8936-rumi.dtb
		dtb-$(CONFIG_ARCH_MSM8226) += msm8226-sim.dtb \

0 → 100644

+21 −0

Original line number	Diff line number	Diff line
		/* Copyright (c) 2014, 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 "msm8916-qrd-skuh.dtsi"

		/ {
		model = "Qualcomm MSM 8916 QRD SKUH";
		compatible = "qcom,msm8916-qrd-skuh", "qcom,msm8916-qrd", "qcom,msm8916", "qcom,qrd";
		qcom,board-id = <11 0> , <11 4>;
		};

+0 −8

Original line number	Diff line number	Diff line
		@@ -10,17 +10,9 @@
		* GNU General Public License for more details.
		*/

		/dts-v1/;

		#include "msm8916-qrd.dtsi"
		#include "dsi-panel-innolux-720p-video.dtsi"

		/ {
		model = "Qualcomm MSM 8916 QRD";
		compatible = "qcom,msm8916-qrd", "qcom,msm8916", "qcom,qrd";
		qcom,board-id = <11 0> , <11 4>;
		};

		&tlmm_pinmux {
		akm_reset_pin {
		qcom,pins = <&gp 36>;