diff options
| -rw-r--r-- | arch/arm/boot/dts/vf610-colibri.dtsi | 60 |
1 files changed, 43 insertions, 17 deletions
diff --git a/arch/arm/boot/dts/vf610-colibri.dtsi b/arch/arm/boot/dts/vf610-colibri.dtsi index 09d46c34fc23..0bd1f7ceb53d 100644 --- a/arch/arm/boot/dts/vf610-colibri.dtsi +++ b/arch/arm/boot/dts/vf610-colibri.dtsi @@ -43,13 +43,13 @@ &sai2 { compatible = "fsl,vf610-sai-ac97"; #sound-dai-cells = <0>; - - pinctrl-names = "default", "ac97-running", "ac97-reset", + pinctrl-names = "default", "sleep", "ac97-running", "ac97-reset", "ac97-warm-reset"; - pinctrl-0 = <&pinctrl_sai2_ac97_running>; - pinctrl-1 = <&pinctrl_sai2_ac97_running>; - pinctrl-2 = <&pinctrl_sai2_ac97_reset>; + pinctrl-0 = <&pinctrl_sai2_ac97_default>; + pinctrl-1 = <&pinctrl_sai2_ac97_sleep>; + pinctrl-2 = <&pinctrl_sai2_ac97_running>; pinctrl-3 = <&pinctrl_sai2_ac97_reset>; + pinctrl-4 = <&pinctrl_sai2_ac97_warm_reset>; ac97-gpios = <&gpio0 9 GPIO_ACTIVE_HIGH &gpio0 8 GPIO_ACTIVE_HIGH &gpio0 13 GPIO_ACTIVE_HIGH>; status = "okay"; @@ -62,20 +62,25 @@ VF610_PAD_PTB23__SAI0_TX_BCLK 0x31C3 >; }; - pinctrl_sai2_ac97_reset: sai2grp_1 { + + pinctrl_sai2_ac97_default: sai2grp_1 { fsl,pins = < /* Pen-down */ VF610_PAD_PTA11__GPIO_4 0x22ed - /* AC97 SData Out (test mode selection) */ - VF610_PAD_PTA18__GPIO_8 0x22ed - /* AC97 Sync (warm reset) */ - VF610_PAD_PTA19__GPIO_9 0x22ed - /* AC97 Reset (cold reset) */ - VF610_PAD_PTA23__GPIO_13 0x22eb + + /* GenIRQ */ + VF610_PAD_PTB2__GPIO_24 0x22e1 >; }; - pinctrl_sai2_ac97_running: sai2grp_2 { + pinctrl_sai2_ac97_sleep: sai2grp_2 { + fsl,pins = < + /* AC97 Reset (cold reset) floating */ + VF610_PAD_PTA23__GPIO_13 0x22c1 + >; + }; + + pinctrl_sai2_ac97_running: sai2grp_3 { fsl,pins = < /* AC97 Bit clock */ VF610_PAD_PTA16__SAI2_TX_BCLK 0x31C3 @@ -88,13 +93,34 @@ /* AC97 SData In */ VF610_PAD_PTA22__SAI2_RX_DATA 0x0041 + >; + }; - /* AC97 Reset (cold reset, keep output buffer on) */ - VF610_PAD_PTA23__GPIO_13 0x22eb + pinctrl_sai2_ac97_reset: sai2grp_4 { + fsl,pins = < + VF610_PAD_PTA16__SAI2_TX_BCLK 0x31C1 - /* GenIRQ */ - VF610_PAD_PTB2__GPIO_24 0x22ed + /* AC97 SData Out (test mode selection) */ + VF610_PAD_PTA18__GPIO_8 0x22c1 + + /* AC97 Sync (warm reset) */ + VF610_PAD_PTA19__GPIO_9 0x22c1 + + /* AC97 Reset (cold reset) */ + VF610_PAD_PTA23__GPIO_13 0x22c1 + >; + }; + + pinctrl_sai2_ac97_warm_reset: sai2grp_5 { + fsl,pins = < + /* AC97 SData Out (test mode selection) */ + VF610_PAD_PTA18__GPIO_8 0x22c1 + + /* AC97 Sync (warm reset) */ + VF610_PAD_PTA19__GPIO_9 0x22c1 >; }; + + }; }; |