diff options
| author | Simon Shields <simon@lineageos.org> | 2018-03-20 00:00:23 +1100 |
|---|---|---|
| committer | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2020-11-04 19:45:14 +0100 |
| commit | b23511419f01d49aae76ef02b1ab4b831d3502e7 (patch) | |
| tree | bd8a408c944dbc54c49cc80ddc57510f6d524a3a | |
| parent | b6ff0009a97f220b1720f7f067488d90e2393c94 (diff) | |
| download | kernel_replicant_linux-b23511419f01d49aae76ef02b1ab4b831d3502e7.tar.gz kernel_replicant_linux-b23511419f01d49aae76ef02b1ab4b831d3502e7.tar.bz2 kernel_replicant_linux-b23511419f01d49aae76ef02b1ab4b831d3502e7.zip | |
ARM: dts: exynos: add sound support to midas
Update the never-mainlined "trats2-audio" binding and instead
use the new "midas-audio" binding.
Signed-off-by: Simon Shields <simon@lineageos.org>
GNUtoo: rebased using the dts documentation
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
| -rw-r--r-- | arch/arm/boot/dts/exynos4412-midas.dtsi | 79 |
1 files changed, 71 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/exynos4412-midas.dtsi b/arch/arm/boot/dts/exynos4412-midas.dtsi index 2c8111c6b065..9be98a3d9cf4 100644 --- a/arch/arm/boot/dts/exynos4412-midas.dtsi +++ b/arch/arm/boot/dts/exynos4412-midas.dtsi @@ -102,6 +102,22 @@ status = "disabled"; }; + vbatt_reg: voltage-regulator-9 { + compatible = "regulator-fixed"; + regulator-name = "VBATT"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + }; + + mic_bias_reg: voltage-regulator-10 { + compatible = "regulator-fixed"; + regulator-name = "MIC_BIAS"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + gpio = <&gpf1 7 GPIO_ACTIVE_HIGH>; + }; + gpio-keys { compatible = "gpio-keys"; pinctrl-names = "default"; @@ -267,15 +283,38 @@ }; sound { - compatible = "samsung,trats2-audio"; - samsung,i2s-controller = <&i2s0>; - samsung,model = "Trats2"; - samsung,audio-codec = <&wm1811>; + compatible = "samsung,midas-audio"; + model = "Midas"; + + fm-sel-gpios = <&gpa0 3 GPIO_ACTIVE_HIGH>; + + mic-bias-supply = <&mic_bias_reg>; + // submic-bias-supply = <&submic_bias_reg>; + samsung,audio-routing = + "HP", "HPOUT1L", + "HP", "HPOUT1R", + "SPK", "SPKOUTLN", "SPK", "SPKOUTLP", "SPK", "SPKOUTRN", - "SPK", "SPKOUTRP"; + "SPK", "SPKOUTRP", + + "RCV", "HPOUT2N", + "RCV", "HPOUT2P", + + "IN1LP", "Main Mic", + "IN1LN", "Main Mic", + "IN1RP", "Sub Mic", + "IN1LP", "Sub Mic"; + + cpu { + sound-dai = <&i2s0 0>; + }; + + codec { + sound-dai = <&wm1811>; + }; }; thermistor-ap { @@ -597,11 +636,35 @@ wm1811: wm1811@1a { compatible = "wlf,wm1811"; reg = <0x1a>; - clocks = <&pmu_system_controller 0>; - clock-names = "MCLK1"; - DCVDD-supply = <&ldo3_reg>; + clocks = <&pmu_system_controller 0>, + <&max77686 MAX77686_CLK_PMIC>; + clock-names = "MCLK1", "MCLK2"; + interrupt-controller; + #interrupt-cells = <2>; + interrupt-parent = <&gpx3>; + interrupts = <6 IRQ_TYPE_LEVEL_HIGH>; + + gpio-controller; + #gpio-cells = <2>; + + wlf,gpio-cfg = <0x3 0x0 0x0 0x0 0x0 0x0 + 0x0 0x8000 0x0 0x0 0x0>; + wlf,micbias-cfg = <0x2f 0x2b>; + + wlf,lineout2-feedback; + wlf,lineout1-se; + wlf,lineout2-se; + + AVDD2-supply = <&vbatt_reg>; DBVDD1-supply = <&ldo3_reg>; + DBVDD2-supply = <&vbatt_reg>; + DBVDD3-supply = <&vbatt_reg>; + DCVDD-supply = <&ldo3_reg>; + CPVDD-supply = <&vbatt_reg>; + SPKVDD1-supply = <&vbatt_reg>; + SPKVDD2-supply = <&vbatt_reg>; wlf,ldo1ena = <&gpj0 4 0>; + wlf,ldo2ena = <&gpj0 4 0>; }; }; |