diff options
author | Gary Bisson <gary.bisson@boundarydevices.com> | 2017-01-03 06:22:47 -0500 |
---|---|---|
committer | Shawn Guo <shawnguo@kernel.org> | 2017-01-09 21:51:14 -0500 |
commit | 37530e74609a28ae3a3b51e7685fe54a00b1e2f2 (patch) | |
tree | 7688aa718ff143b89b7cedfd8103ace78da4d2b5 | |
parent | 6ab5c2b662e2dcbb964099bf7f19e9dbc9ae5a41 (diff) |
ARM: dts: imx6qdl-nitrogen6_som2: fix sgtl5000 pinctrl init
Since the codec is probed first, the pinctrl node should be
under the codec node.
The codec init was working for this board since U-Boot was
already setting GPIO_0 as CLKO1 but better fix it anyway.
Fixes: 3faa1bb2e89c ("ARM: dts: imx: add Boundary Devices Nitrogen6_SOM2 support")
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
-rw-r--r-- | arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi index d80f21abea62..31d4cc62dbc7 100644 --- a/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi +++ b/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | |||
@@ -250,8 +250,6 @@ | |||
250 | compatible = "fsl,imx6q-nitrogen6_som2-sgtl5000", | 250 | compatible = "fsl,imx6q-nitrogen6_som2-sgtl5000", |
251 | "fsl,imx-audio-sgtl5000"; | 251 | "fsl,imx-audio-sgtl5000"; |
252 | model = "imx6q-nitrogen6_som2-sgtl5000"; | 252 | model = "imx6q-nitrogen6_som2-sgtl5000"; |
253 | pinctrl-names = "default"; | ||
254 | pinctrl-0 = <&pinctrl_sgtl5000>; | ||
255 | ssi-controller = <&ssi1>; | 253 | ssi-controller = <&ssi1>; |
256 | audio-codec = <&codec>; | 254 | audio-codec = <&codec>; |
257 | audio-routing = | 255 | audio-routing = |
@@ -320,6 +318,8 @@ | |||
320 | 318 | ||
321 | codec: sgtl5000@0a { | 319 | codec: sgtl5000@0a { |
322 | compatible = "fsl,sgtl5000"; | 320 | compatible = "fsl,sgtl5000"; |
321 | pinctrl-names = "default"; | ||
322 | pinctrl-0 = <&pinctrl_sgtl5000>; | ||
323 | reg = <0x0a>; | 323 | reg = <0x0a>; |
324 | clocks = <&clks IMX6QDL_CLK_CKO>; | 324 | clocks = <&clks IMX6QDL_CLK_CKO>; |
325 | VDDA-supply = <®_2p5v>; | 325 | VDDA-supply = <®_2p5v>; |