From: Romain Perier <romain.perier-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org> To: Liam Girdwood <lgirdwood-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, Jaroslav Kysela <perex-/Fr2/VpizcU@public.gmane.org>, Takashi Iwai <tiwai-IBi9RG/b67k@public.gmane.org>, alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org, Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org> Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, Ian Campbell <ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org>, Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org>, Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>, Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>, linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, Romain Perier <romain.perier-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org> Subject: [PATCH v3 3/3] arm: dts: Add support for ES8323 to the Firefly-RK3288 Date: Fri, 12 May 2017 15:22:23 +0200 [thread overview] Message-ID: <20170512132227.24916-8-romain.perier@collabora.com> (raw) In-Reply-To: <20170512132227.24916-1-romain.perier-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org> 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 es8323 analog output. Signed-off-by: Romain Perier <romain.perier-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org> --- Changes in v3: - Renamed sound_i2s to sound-i2s - Re-ordered properties in the right order - Splitted headphone into phone_ctl and hp_det Changes in v2: - Add the pinctrl headphone, that was previously in conflict with otp pins - Renamed sound_es8323 to sound_i2s - Added the property rockchip,routing arch/arm/boot/dts/rk3288-firefly.dtsi | 38 +++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi b/arch/arm/boot/dts/rk3288-firefly.dtsi index 10793ac18599..f80b17f0d1bf 100644 --- a/arch/arm/boot/dts/rk3288-firefly.dtsi +++ b/arch/arm/boot/dts/rk3288-firefly.dtsi @@ -103,6 +103,19 @@ }; }; + sound-i2s { + compatible = "rockchip,rk3288-hdmi-analog"; + pinctrl-names = "default"; + pinctrl-0 = <&phone_ctl>, <&hp_det>; + rockchip,audio-codec = <&es8323>; + rockchip,hp-det-gpios = <&gpio7 15 GPIO_ACTIVE_HIGH>; + rockchip,hp-en-gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>; + rockchip,i2s-controller = <&i2s>; + rockchip,model = "I2S"; + rockchip,routing = "Analog", "LOUT2", + "Analog", "ROUT2"; + }; + vbat_wl: vcc_sys: vsys-regulator { compatible = "regulator-fixed"; regulator-name = "vcc_sys"; @@ -371,6 +384,17 @@ &i2c2 { status = "okay"; + + es8323: es8323@10 { + compatible = "everest,es8323", "everest,es8328"; + reg = <0x10>; + AVDD-supply = <&vcca_33>; + DVDD-supply = <&vcca_33>; + HPVDD-supply = <&vcca_33>; + PVDD-supply = <&vcca_33>; + clocks = <&cru SCLK_I2S0_OUT>; + clock-names = "i2s_clk_out"; + }; }; &i2c4 { @@ -381,6 +405,10 @@ status = "okay"; }; +&i2s { + status = "okay"; +}; + &io_domains { status = "okay"; @@ -483,6 +511,16 @@ }; }; + headphone { + hp_det: hp-det { + rockchip,pins = <7 15 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + phone_ctl: phone-ctl { + rockchip,pins = <0 10 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; + usb_host { host_vbus_drv: host-vbus-drv { rockchip,pins = <0 14 RK_FUNC_GPIO &pcfg_pull_none>; -- 2.11.0 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
From: romain.perier@collabora.com (Romain Perier) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 3/3] arm: dts: Add support for ES8323 to the Firefly-RK3288 Date: Fri, 12 May 2017 15:22:23 +0200 [thread overview] Message-ID: <20170512132227.24916-8-romain.perier@collabora.com> (raw) In-Reply-To: <20170512132227.24916-1-romain.perier@collabora.com> 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 es8323 analog output. Signed-off-by: Romain Perier <romain.perier@collabora.com> --- Changes in v3: - Renamed sound_i2s to sound-i2s - Re-ordered properties in the right order - Splitted headphone into phone_ctl and hp_det Changes in v2: - Add the pinctrl headphone, that was previously in conflict with otp pins - Renamed sound_es8323 to sound_i2s - Added the property rockchip,routing arch/arm/boot/dts/rk3288-firefly.dtsi | 38 +++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi b/arch/arm/boot/dts/rk3288-firefly.dtsi index 10793ac18599..f80b17f0d1bf 100644 --- a/arch/arm/boot/dts/rk3288-firefly.dtsi +++ b/arch/arm/boot/dts/rk3288-firefly.dtsi @@ -103,6 +103,19 @@ }; }; + sound-i2s { + compatible = "rockchip,rk3288-hdmi-analog"; + pinctrl-names = "default"; + pinctrl-0 = <&phone_ctl>, <&hp_det>; + rockchip,audio-codec = <&es8323>; + rockchip,hp-det-gpios = <&gpio7 15 GPIO_ACTIVE_HIGH>; + rockchip,hp-en-gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>; + rockchip,i2s-controller = <&i2s>; + rockchip,model = "I2S"; + rockchip,routing = "Analog", "LOUT2", + "Analog", "ROUT2"; + }; + vbat_wl: vcc_sys: vsys-regulator { compatible = "regulator-fixed"; regulator-name = "vcc_sys"; @@ -371,6 +384,17 @@ &i2c2 { status = "okay"; + + es8323: es8323 at 10 { + compatible = "everest,es8323", "everest,es8328"; + reg = <0x10>; + AVDD-supply = <&vcca_33>; + DVDD-supply = <&vcca_33>; + HPVDD-supply = <&vcca_33>; + PVDD-supply = <&vcca_33>; + clocks = <&cru SCLK_I2S0_OUT>; + clock-names = "i2s_clk_out"; + }; }; &i2c4 { @@ -381,6 +405,10 @@ status = "okay"; }; +&i2s { + status = "okay"; +}; + &io_domains { status = "okay"; @@ -483,6 +511,16 @@ }; }; + headphone { + hp_det: hp-det { + rockchip,pins = <7 15 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + phone_ctl: phone-ctl { + rockchip,pins = <0 10 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; + usb_host { host_vbus_drv: host-vbus-drv { rockchip,pins = <0 14 RK_FUNC_GPIO &pcfg_pull_none>; -- 2.11.0
next prev parent reply other threads:[~2017-05-12 13:22 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-05-12 13:22 [PATCH v3 0/3] Add support for es8323 and hdmi audio to the firefly-rk3288 Romain Perier 2017-05-12 13:22 ` Romain Perier [not found] ` <20170512132227.24916-1-romain.perier-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org> 2017-05-12 13:22 ` [PATCH v3 1/3] SoC: es8328-i2c: Add compatible for ES8323 Romain Perier 2017-05-12 13:22 ` Romain Perier 2017-05-12 13:22 ` [PATCH v3 2/3] arm: dts: rockchip: Don't set otp-gpio pinctrl by default in rk3288.dtsi Romain Perier 2017-05-12 13:22 ` Romain Perier 2017-05-12 13:22 ` [PATCH v3 3/3] arm: dts: Add support for ES8323 to the Firefly-RK3288 Romain Perier 2017-05-12 13:22 ` Romain Perier 2017-05-12 13:22 ` [PATCH v3 0/3] Add support for es8323 and hdmi audio to the firefly-rk3288 Romain Perier 2017-05-12 13:22 ` Romain Perier 2017-05-12 13:22 ` [PATCH v3 1/3] SoC: es8328-i2c: Add compatible for ES8323 Romain Perier 2017-05-12 13:22 ` Romain Perier 2017-05-12 13:22 ` [PATCH v3 2/3] arm: dts: rockchip: Don't set otp-gpio pinctrl by default in rk3288.dtsi Romain Perier 2017-05-12 13:22 ` Romain Perier 2017-05-12 13:22 ` Romain Perier [this message] 2017-05-12 13:22 ` [PATCH v3 3/3] arm: dts: Add support for ES8323 to the Firefly-RK3288 Romain Perier 2017-05-12 13:22 ` [PATCH v3 0/3] Add support for es8323 and hdmi audio to the firefly-rk3288 Romain Perier 2017-05-12 13:22 ` Romain Perier 2017-06-26 14:00 ` Romain Perier 2017-06-26 14:00 ` Romain Perier 2017-06-26 14:07 ` Mark Brown 2017-06-26 14:07 ` Mark Brown [not found] ` <20170626140740.jlgtwaaivn3bvg2g-GFdadSzt00ze9xe1eoZjHA@public.gmane.org> 2017-06-26 14:19 ` Romain Perier 2017-06-26 14:19 ` Romain Perier 2017-06-27 16:07 ` Mark Brown 2017-06-27 16:07 ` Mark Brown 2017-05-12 13:22 ` [PATCH v3 1/3] SoC: es8328-i2c: Add compatible for ES8323 Romain Perier 2017-05-12 13:22 ` Romain Perier [not found] ` <20170512132227.24916-10-romain.perier-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org> 2017-05-15 21:41 ` Rob Herring 2017-05-15 21:41 ` Rob Herring 2017-05-16 11:18 ` Mark Brown 2017-05-16 11:18 ` Mark Brown 2017-05-19 6:56 ` Romain Perier 2017-05-19 6:56 ` Romain Perier 2017-05-19 7:00 ` Romain Perier 2017-05-19 7:00 ` Romain Perier [not found] ` <a052da20-d9c7-69f5-21d9-9111d45702e6-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org> 2017-05-19 12:35 ` Rob Herring 2017-05-19 12:35 ` Rob Herring 2017-05-12 13:22 ` [PATCH v3 2/3] arm: dts: rockchip: Don't set otp-gpio pinctrl by default in rk3288.dtsi Romain Perier 2017-05-12 13:22 ` Romain Perier 2017-05-12 13:22 ` [PATCH v3 3/3] arm: dts: Add support for ES8323 to the Firefly-RK3288 Romain Perier 2017-05-12 13:22 ` Romain Perier
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170512132227.24916-8-romain.perier@collabora.com \ --to=romain.perier-zgy8ohtn/8qb+jhodadfcq@public.gmane.org \ --cc=alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org \ --cc=broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \ --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org \ --cc=heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org \ --cc=ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org \ --cc=lgirdwood-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \ --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=mark.rutland-5wv7dgnIgG8@public.gmane.org \ --cc=pawel.moll-5wv7dgnIgG8@public.gmane.org \ --cc=perex-/Fr2/VpizcU@public.gmane.org \ --cc=robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \ --cc=tiwai-IBi9RG/b67k@public.gmane.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.