ARM: msm: remove support for MSMSAMARIUM and MPQ8092 (fb18cc9c) · Commits · e / devices / android_kernel_sony_msm8994

Documentation/devicetree/bindings/sound/qcom-audio-dev.txt

+0 −87

Original line number	Diff line number	Diff line
		@@ -866,93 +866,6 @@ sound {
		qcom,cdc-vdd-spkr-gpios = <&pm8226_gpios 3 0>;
		};

		* MSMSAMARIUM ASoC Machine driver

		Required properties:
		- compatible : "qcom,msmsamarium-audio-tapan"

		Required properties:
		- compatible : "qcom,msmsamarium-audio-tapan"
		- qcom,model : The user-visible name of this sound card.
		- qcom,tapan-mclk-clk-freq : Tapan mclk Freq in Hz. currently only 9600000Hz
		is supported.
		- qcom,audio-routing : A list of the connections between audio components.
		Each entry is a pair of strings, the first being the connection's sink,
		the second being the connection's source.
		- qcom,cdc-mclk-gpios : GPIO on which mclk signal is comming.

		Example:

		sound {
		compatible = "qcom,msmsamarium-audio-tapan";
		qcom,model = "msmsamarium-tapan-snd-card";
		qcom,tapan-mclk-clk-freq = <9600000>;
		audio-routing =
		"RX_BIAS", "MCLK",
		"LDO_H", "MCLK",
		"SPK_OUT", "MCLK",
		"AMIC1", "MIC BIAS1 Internal1",
		"MIC BIAS1 Internal1", "Handset Mic",
		"AMIC2", "MIC BIAS2 External",
		"MIC BIAS2 External", "Headset Mic",
		"AMIC3", "MIC BIAS2 External",
		"MIC BIAS2 External", "ANCRight Headset Mic",
		"AMIC4", "MIC BIAS2 External",
		"MIC BIAS2 External", "ANCLeft Headset Mic",
		"DMIC1", "MIC BIAS1 External",
		"MIC BIAS1 External", "Digital Mic1",
		"DMIC2", "MIC BIAS1 External",
		"MIC BIAS1 External", "Digital Mic2",
		"DMIC3", "MIC BIAS3 External",
		"MIC BIAS3 External", "Digital Mic3",
		"DMIC4", "MIC BIAS3 External",
		"MIC BIAS3 External", "Digital Mic4",
		};

		* MPQ8092 ASoC Machine driver

		Required properties:
		- compatible : "qcom,mpq8092-audio-tabla"
		- qcom,model : The user-visible name of this sound card.
		- qcom,audio-routing : A list of the connections between audio components.
		Each entry is a pair of strings, the first being the connection's sink,
		the second being the connection's source.
		- qcom,cdc-mclk-gpios : GPIO on which mclk signal is comming.
		- qcom,tabla-mclk-clk-freq : Tabla mclk Freq in Hz.
		Optional properties:
		- qcom,hdmi-audio-rx: specifies if HDMI audio support is enabled or not.
		- qcom,spdif-audio-rx: specifies if SPDIF audio support is enabled or not.
		- qcom,spdif-opt-gpio: GPIO on which SPDIF optical output signal is coming.
		If qcom,spdif-audio-rx property is present then this property must be present.
		- qcom,spdif-elec-gpio: GPIO on which SPDIF electrical output signal is coming.
		If qcom,spdif-audio-rx property is present then this property must be present.

		Example:

		sound {
		compatible = "qcom,mpq8092-audio-tabla";
		qcom,model = "mpq8092-tabla-snd-card";

		qcom,audio-routing =
		"RX_BIAS", "MCLK",
		"LDO_H", "MCLK",
		"AMIC1", "MIC BIAS1 External",
		"MIC BIAS1 External", "Handset Mic",
		"AMIC2", "MIC BIAS2 External",
		"MIC BIAS2 External", "Headset Mic",
		"AMIC3", "MIC BIAS3 External",
		"MIC BIAS3 Eternal", "ANCRight Headset Mic",
		"AMIC4", "MIC BIAS1 External",
		"MIC BIAS1 External", "ANCLeft Headset Mic",
		"HEADPHONE", "LDO_H";

		qcom,cdc-mclk-gpios = <&msmgpio 42 0>;
		qcom,tabla-mclk-clk-freq = <12288000>;
		qcom,spdif-opt-gpio = <&msmgpio 46 0>;
		qcom,spdif-elec-gpio = <&msmgpio 41 0>;
		qcom,hdmi-audio-rx;
		qcom,spdif-audio-rx;
		};

		* MDM9630 ASoC Machine driver

arch/arm/boot/dts/qcom/Makefile

+0 −11

Original line number	Diff line number	Diff line
		@@ -102,17 +102,6 @@ dtb-$(CONFIG_ARCH_MDM9630) += mdm9630-sim.dtb \
		mdm9630-cdp.dtb \
		mdm9630-mtp.dtb
		dtb-$(CONFIG_ARCH_MSMZIRC) += msmzirc-sim.dtb
		dtb-$(CONFIG_ARCH_MSMSAMARIUM) += msmsamarium-sim.dtb \
		msmsamarium-rumi.dtb \
		msmsamarium-cdp-interposer.dtb \
		msmsamarium-cdp.dtb \
		msmsamarium-mtp.dtb \
		apqsamarium-mtp.dtb
		dtb-$(CONFIG_ARCH_MPQ8092) += mpq8092-sim.dtb \
		mpq8092-rumi.dtb \
		mpq8092-cdp.dtb \
		mpq8092-dtv.dtb \
		mpq8092-dma.dtb
		dtb-$(CONFIG_ARCH_APQ8084) += apq8084-v1.0-old-pwr-grid-liquid.dtb \
		apq8084-v1.1-old-pwr-grid-liquid.dtb \
		apq8084-v1.1-liquid.dtb \

arch/arm/boot/dts/qcom/apqsamarium-mtp.dts

deleted100644 → 0

+0 −22

Original line number	Diff line number	Diff line
		/* Copyright (c) 2013-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 "apqsamarium.dtsi"
		#include "msmsamarium-mtp.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. APQ SAMARIUM MTP";
		compatible = "qcom,apqsamarium-mtp", "qcom,apqsamarium", "qcom,mtp";
		qcom,board-id = <8 0>;
		};

arch/arm/boot/dts/qcom/apqsamarium.dtsi

deleted100644 → 0

+0 −24

Original line number	Diff line number	Diff line
		/* Copyright (c) 2013-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.
		*/

		/*
		* Only samarium APQ-specific property overrides should be placed inside this
		* file. Device definitions should be placed inside the msmsamarium.dtsi file.
		*/

		#include "msmsamarium.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. APQ SAMARIUM";
		compatible = "qcom,apqsamarium";
		qcom,msm-id = <197 0>;
		};