Commit 7f011845 authored by Nícolas F. R. A. Prado's avatar Nícolas F. R. A. Prado Committed by Matthias Brugger
Browse files

arm64: dts: mediatek: Remove asurada-audio dtsi files 



There aren't enough users of the common asurada-audio dtsi files to
justify having them. It is simpler to just have the audio nodes directly
on the board files.

Signed-off-by: default avatarNícolas F. R. A. Prado <nfraprado@collabora.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20230721201705.387426-4-nfraprado@collabora.com


Signed-off-by: default avatarMatthias Brugger <matthias.bgg@gmail.com>
parent 3993c86f

arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt1015p-rt5682.dtsi

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0 OR MIT)

/*

 * Copyright 2020 Google LLC

 */



#include "mt8192-asurada-audio-rt5682.dtsi"

#include "mt8192-asurada-audio-rt1015p.dtsi"



&sound {

	compatible = "mediatek,mt8192_mt6359_rt1015p_rt5682";



	speaker-codecs {

		sound-dai = <&rt1015p>;

	};



	headset-codec {

		sound-dai = <&rt5682 0>;

	};

};

arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt1015p.dtsi

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0 OR MIT)

/*

 * Copyright (C) 2022 MediaTek Inc.

 */



#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/pinctrl/mt8192-pinfunc.h>



/ {

	rt1015p: audio-codec {

		compatible = "realtek,rt1015p";

		pinctrl-names = "default";

		pinctrl-0 = <&rt1015p_pins>;

		sdb-gpios = <&pio 147 GPIO_ACTIVE_HIGH>;

		#sound-dai-cells = <0>;

	};

};



&pio {

	rt1015p_pins: rt1015p-default-pins {

		pins {

			pinmux = <PINMUX_GPIO147__FUNC_GPIO147>;

			output-low;

		};

	};

};

arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt5682.dtsi

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0 OR MIT)

/*

 * Copyright (C) 2022 MediaTek Inc.

 */



&i2c1 {

	rt5682: audio-codec@1a {

		compatible = "realtek,rt5682i";

		reg = <0x1a>;

		interrupts-extended = <&pio 18 IRQ_TYPE_LEVEL_LOW>;

		realtek,jd-src = <1>;

		realtek,btndet-delay = <16>;

		#sound-dai-cells = <1>;



		AVDD-supply = <&mt6359_vio18_ldo_reg>;

		DBVDD-supply = <&mt6359_vio18_ldo_reg>;

		LDO1-IN-supply = <&mt6359_vio18_ldo_reg>;

		MICVDD-supply = <&pp3300_g>;

		VBAT-supply = <&pp3300_ldo_z>;

	};

};

arch/arm64/boot/dts/mediatek/mt8192-asurada-hayato-r1.dts

+18 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
 */

/dts-v1/;

#include "mt8192-asurada.dtsi"

#include "mt8192-asurada-audio-rt1015p-rt5682.dtsi"



/ {

	model = "Google Hayato rev1";
@@ -101,6 +100,24 @@ pins-rts { 
	};

};



&rt5682 {

	compatible = "realtek,rt5682i";

	realtek,btndet-delay = <16>;

	VBAT-supply = <&pp3300_ldo_z>;

};



&sound {

	compatible = "mediatek,mt8192_mt6359_rt1015p_rt5682";



	speaker-codecs {

		sound-dai = <&rt1015p>;

	};



	headset-codec {

		sound-dai = <&rt5682 0>;

	};

};



&touchscreen {

	compatible = "hid-over-i2c";

	post-power-on-delay-ms = <10>;

arch/arm64/boot/dts/mediatek/mt8192-asurada-spherion-r0.dts

+18 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
 */

/dts-v1/;

#include "mt8192-asurada.dtsi"

#include "mt8192-asurada-audio-rt1015p-rt5682.dtsi"

#include <dt-bindings/leds/common.h>



/ {
@@ -58,6 +57,24 @@ CROS_STD_MAIN_KEYMAP 
	>;

};



&rt5682 {

	compatible = "realtek,rt5682i";

	realtek,btndet-delay = <16>;

	VBAT-supply = <&pp3300_ldo_z>;

};



&sound {

	compatible = "mediatek,mt8192_mt6359_rt1015p_rt5682";



	speaker-codecs {

		sound-dai = <&rt1015p>;

	};



	headset-codec {

		sound-dai = <&rt5682 0>;

	};

};



&touchscreen {

	compatible = "elan,ekth3500";

};