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

Commit 6e9a9075 authored Jan 27, 2016 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Jan 27, 2016

Merge "ARM: dts: msm: enable audio nodes for 8937 target"

parents cc6d8e51 759e8735

arch/arm/boot/dts/qcom/msm8937-pmi8937-cdp.dts

+1 −2

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2015, The Linux Foundation. All rights reserved.
		* Copyright (c) 2015-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
		@@ -15,7 +15,6 @@

		#include "msm8937.dtsi"
		#include "msm8937-pmi8937-cdp.dtsi"
		#include "msm8937-audio-cdp.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. MSM8937-PMI8937 CDP";

arch/arm/boot/dts/qcom/msm8937-pmi8937-cdp.dtsi

+2 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2015, The Linux Foundation. All rights reserved.
		* Copyright (c) 2015-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
		@@ -13,6 +13,7 @@

		#include "msm-pmi8937.dtsi"
		#include "msm8937-cdp.dtsi"
		#include "msm8937-audio-cdp.dtsi"

		&soc {
		led_flash0: qcom,camera-flash {

arch/arm/boot/dts/qcom/msm8937-pmi8937-mtp.dts

+1 −2

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2015, The Linux Foundation. All rights reserved.
		* Copyright (c) 2015-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
		@@ -15,7 +15,6 @@

		#include "msm8937.dtsi"
		#include "msm8937-pmi8937-mtp.dtsi"
		#include "msm8937-audio-mtp.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. MSM8937-PMI8937 MTP";

arch/arm/boot/dts/qcom/msm8937-pmi8937-mtp.dtsi

+2 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2015, The Linux Foundation. All rights reserved.
		* Copyright (c) 2015-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
		@@ -13,6 +13,7 @@

		#include "msm-pmi8937.dtsi"
		#include "msm8937-mtp.dtsi"
		#include "msm8937-audio-cdp.dtsi"

		&soc {
		led_flash0: qcom,camera-flash {

arch/arm/boot/dts/qcom/msm8937-pmi8950-cdp.dts

+1 −2

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2015, The Linux Foundation. All rights reserved.
		* Copyright (c) 2015-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
		@@ -15,7 +15,6 @@

		#include "msm8937.dtsi"
		#include "msm8937-pmi8950-cdp.dtsi"
		#include "msm8937-audio-cdp.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. MSM8937-PMI8950 CDP";