aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Perier <romain.perier@collabora.com>2017-02-03 09:38:00 -0500
committerHeiko Stuebner <heiko@sntech.de>2017-03-05 22:45:23 -0500
commitdb3347846f7f20fe7e6d0da8e5d31f6c50313611 (patch)
tree4b0aaf7f5b1567dfc4c414871f0f899530978727
parentc1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201 (diff)
ARM: dts: rockchip: Add support for ES8388 to the Radxa Rock 2
This commit adds the DT definition of the es8388 i2c device found at address 0x10. It also adds the definition for connecting the Rockchip I2S to the es8388 analog output. This commit is based on the initial work that was done by Sjoerd Simons <sjoerd.simons@collabora.com> with some improvements. Signed-off-by: Romain Perier <romain.perier@collabora.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
-rw-r--r--arch/arm/boot/dts/rk3288-rock2-som.dtsi2
-rw-r--r--arch/arm/boot/dts/rk3288-rock2-square.dts41
2 files changed, 42 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/rk3288-rock2-som.dtsi b/arch/arm/boot/dts/rk3288-rock2-som.dtsi
index 1c0bbc9b928b..f0778a46bca9 100644
--- a/arch/arm/boot/dts/rk3288-rock2-som.dtsi
+++ b/arch/arm/boot/dts/rk3288-rock2-som.dtsi
@@ -136,7 +136,7 @@
136 regulator-always-on; 136 regulator-always-on;
137 }; 137 };
138 138
139 vcc_io: REG2 { 139 vcc_io: vccio_codec: REG2 {
140 regulator-name = "VCC_IO"; 140 regulator-name = "VCC_IO";
141 regulator-min-microvolt = <3300000>; 141 regulator-min-microvolt = <3300000>;
142 regulator-max-microvolt = <3300000>; 142 regulator-max-microvolt = <3300000>;
diff --git a/arch/arm/boot/dts/rk3288-rock2-square.dts b/arch/arm/boot/dts/rk3288-rock2-square.dts
index 96a2e745bb93..fbf11d410c42 100644
--- a/arch/arm/boot/dts/rk3288-rock2-square.dts
+++ b/arch/arm/boot/dts/rk3288-rock2-square.dts
@@ -86,6 +86,19 @@
86 #sound-dai-cells = <0>; 86 #sound-dai-cells = <0>;
87 }; 87 };
88 88
89 sound-i2s {
90 compatible = "rockchip,rk3288-hdmi-analog";
91 pinctrl-names = "default";
92 pinctrl-0 = <&phone_ctl>, <&hp_det>;
93 rockchip,audio-codec = <&es8388>;
94 rockchip,hp-det-gpios = <&gpio7 7 GPIO_ACTIVE_HIGH>;
95 rockchip,hp-en-gpios = <&gpio8 0 GPIO_ACTIVE_HIGH>;
96 rockchip,i2s-controller = <&i2s>;
97 rockchip,model = "I2S";
98 rockchip,routing = "Analog", "LOUT2",
99 "Analog", "ROUT2";
100 };
101
89 sdio_pwrseq: sdio-pwrseq { 102 sdio_pwrseq: sdio-pwrseq {
90 compatible = "mmc-pwrseq-simple"; 103 compatible = "mmc-pwrseq-simple";
91 clocks = <&hym8563>; 104 clocks = <&hym8563>;
@@ -173,10 +186,28 @@
173 }; 186 };
174}; 187};
175 188
189&i2c2 {
190 status = "okay";
191
192 es8388: es8388@10 {
193 compatible = "everest,es8388", "everest,es8328";
194 reg = <0x10>;
195 AVDD-supply = <&vccio_codec>;
196 DVDD-supply = <&vccio_codec>;
197 HPVDD-supply = <&vccio_codec>;
198 PVDD-supply = <&vccio_codec>;
199 clocks = <&cru SCLK_I2S0_OUT>;
200 };
201};
202
176&i2c5 { 203&i2c5 {
177 status = "okay"; 204 status = "okay";
178}; 205};
179 206
207&i2s {
208 status = "okay";
209};
210
180&pinctrl { 211&pinctrl {
181 ir { 212 ir {
182 ir_int: ir-int { 213 ir_int: ir-int {
@@ -190,6 +221,16 @@
190 }; 221 };
191 }; 222 };
192 223
224 headphone {
225 hp_det: hp-det {
226 rockchip,pins = <7 7 RK_FUNC_GPIO &pcfg_pull_none>;
227 };
228
229 phone_ctl: phone-ctl {
230 rockchip,pins = <8 0 RK_FUNC_GPIO &pcfg_pull_up>;
231 };
232 };
233
193 usb { 234 usb {
194 host_vbus_drv: host-vbus-drv { 235 host_vbus_drv: host-vbus-drv {
195 rockchip,pins = <0 14 RK_FUNC_GPIO &pcfg_pull_none>; 236 rockchip,pins = <0 14 RK_FUNC_GPIO &pcfg_pull_none>;