| Message ID | 20240716-midas-audio-tab3-v1-6-a53ea075af5a@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ASoC: samsung: midas_wm1811: Separate compatible for tab3 + fixes | expand |
On 16/07/2024 21:36, Artur Weber wrote: > Add the samsung,tab3-audio compatible that makes mic bias regulators > non-required, and drop the dummy main/sub mic bias regulators that > don't exist in hardware. > > Signed-off-by: Artur Weber <aweber.kernel@gmail.com> > --- > arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi | 20 ++------------------ > 1 file changed, 2 insertions(+), 18 deletions(-) > > diff --git a/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi b/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi > index 2f39f3c0661e..a140f86d399b 100644 > --- a/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi > +++ b/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi > @@ -286,20 +286,6 @@ display_3v3_supply: voltage-regulator-3 { > enable-active-high; > }; > > - mic_bias_reg: voltage-regulator-4 { > - compatible = "regulator-fixed"; > - regulator-name = "MICBIAS_LDO_2.8V"; > - regulator-min-microvolt = <2800000>; > - regulator-max-microvolt = <2800000>; > - }; > - > - submic_bias_reg: voltage-regulator-5 { > - compatible = "regulator-fixed"; > - regulator-name = "SUB_MICBIAS_LDO_2.8V"; > - regulator-min-microvolt = <2800000>; > - regulator-max-microvolt = <2800000>; > - }; > - > earmic_bias_reg: voltage-regulator-6 { This should be voltage-regulator-4. > compatible = "regulator-fixed"; > regulator-name = "EAR_MICBIAS_LDO_2.8V"; > @@ -310,14 +296,12 @@ earmic_bias_reg: voltage-regulator-6 { > }; > > sound: sound { > - compatible = "samsung,midas-audio"; > + compatible = "samsung,tab3-audio", "samsung,midas-audio"; > model = "TAB3"; > - mic-bias-supply = <&mic_bias_reg>; > - submic-bias-supply = <&submic_bias_reg>; > - headset-mic-bias-supply = <&earmic_bias_reg>; > You just added this line. Organize patches or code in a way that does not move it within one patchset. Best regards, Krzysztof
diff --git a/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi b/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi index 2f39f3c0661e..a140f86d399b 100644 --- a/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi +++ b/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi @@ -286,20 +286,6 @@ display_3v3_supply: voltage-regulator-3 { enable-active-high; }; - mic_bias_reg: voltage-regulator-4 { - compatible = "regulator-fixed"; - regulator-name = "MICBIAS_LDO_2.8V"; - regulator-min-microvolt = <2800000>; - regulator-max-microvolt = <2800000>; - }; - - submic_bias_reg: voltage-regulator-5 { - compatible = "regulator-fixed"; - regulator-name = "SUB_MICBIAS_LDO_2.8V"; - regulator-min-microvolt = <2800000>; - regulator-max-microvolt = <2800000>; - }; - earmic_bias_reg: voltage-regulator-6 { compatible = "regulator-fixed"; regulator-name = "EAR_MICBIAS_LDO_2.8V"; @@ -310,14 +296,12 @@ earmic_bias_reg: voltage-regulator-6 { }; sound: sound { - compatible = "samsung,midas-audio"; + compatible = "samsung,tab3-audio", "samsung,midas-audio"; model = "TAB3"; - mic-bias-supply = <&mic_bias_reg>; - submic-bias-supply = <&submic_bias_reg>; - headset-mic-bias-supply = <&earmic_bias_reg>; lineout-sel-gpios = <&gpj1 2 GPIO_ACTIVE_HIGH>; + headset-mic-bias-supply = <&earmic_bias_reg>; headset-detect-gpios = <&gpx0 4 GPIO_ACTIVE_LOW>; headset-key-gpios = <&gpx3 6 GPIO_ACTIVE_LOW>; samsung,headset-4pole-threshold-microvolt = <710 2000>;
Add the samsung,tab3-audio compatible that makes mic bias regulators non-required, and drop the dummy main/sub mic bias regulators that don't exist in hardware. Signed-off-by: Artur Weber <aweber.kernel@gmail.com> --- arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-)