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

Commit e3bb1fd4 authored Jan 25, 2016 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Jan 25, 2016

Merge "ARM: dts: msm: enable audio nodes for msmgold"

parents 05b60990 f917f67b

arch/arm/boot/dts/qcom/msmgold-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 "msmgold.dtsi"
		#include "msmgold-pmi8937-cdp.dtsi"
		#include "msmgold-audio-cdp.dtsi"

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

arch/arm/boot/dts/qcom/msmgold-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 "msmgold-cdp.dtsi"
		#include "msmgold-audio-cdp.dtsi"

		&soc {
		led_flash0: qcom,camera-flash {

arch/arm/boot/dts/qcom/msmgold-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 "msmgold.dtsi"
		#include "msmgold-pmi8937-mtp.dtsi"
		#include "msmgold-audio-mtp.dtsi"

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

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@

		#include "msm-pmi8937.dtsi"
		#include "msmgold-mtp.dtsi"
		#include "msmgold-audio-mtp.dtsi"

		&soc {
		led_flash0: qcom,camera-flash {

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,6 @@

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

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