diff options
author | Stefan Agner <stefan.agner@toradex.com> | 2015-08-05 17:30:20 +0200 |
---|---|---|
committer | Stefan Agner <stefan.agner@toradex.com> | 2015-08-05 17:30:20 +0200 |
commit | 756ad5099e37fe0c3782236a53c7da885460c810 (patch) | |
tree | 1fc3a2345bb666fb5c0afe4efe6ad65ec8966a4c /arch/arm/boot/dts/vfxxx.dtsi | |
parent | 39b99087823cff2acd91349c5c7739e55a85d979 (diff) | |
parent | 5bd7f39372a784a97a4226302e4067d0b1e65194 (diff) |
Merge branch 'vf610-ac97-sai-v4.1' into toradex_vf_4.1-next
Diffstat (limited to 'arch/arm/boot/dts/vfxxx.dtsi')
-rw-r--r-- | arch/arm/boot/dts/vfxxx.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/vfxxx.dtsi b/arch/arm/boot/dts/vfxxx.dtsi index ebffdc0df5e7..1a3d6485a687 100644 --- a/arch/arm/boot/dts/vfxxx.dtsi +++ b/arch/arm/boot/dts/vfxxx.dtsi @@ -218,7 +218,7 @@ reg = <0x4002f000 0x1000>; interrupts = <84 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks VF610_CLK_SAI0>, - <&clks VF610_CLK_SAI0>, + <&clks VF610_CLK_SAI0_DIV>, <&clks 0>, <&clks 0>; clock-names = "bus", "mclk1", "mclk2", "mclk3"; dma-names = "tx", "rx"; @@ -232,7 +232,7 @@ reg = <0x40031000 0x1000>; interrupts = <86 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks VF610_CLK_SAI2>, - <&clks VF610_CLK_SAI2>, + <&clks VF610_CLK_SAI2_DIV>, <&clks 0>, <&clks 0>; clock-names = "bus", "mclk1", "mclk2", "mclk3"; dma-names = "tx", "rx"; |