Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit efe4c108e687dbfa7cbf96cd962155203d7d1c0b

Authored by Dan Murphy
2 parents c559824b17 a3963411b0
Exists in ti-linux-3.12.y and in 3 other branches newt-ti-linux-3.12.y, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y

Merge branch 'audio-display-ti-linux-3.12.y' of git://git.ti.com/~darrene/ti-lin… 

…ux-kernel/audio-display-linux-feature-tree into ti-linux-3.12.y

TI-Feature: audio-display
TI-Tree: git://git.ti.com/~darrene/ti-linux-kernel/audio-display-linux-feature-tree.git
TI-Branch: audio-display-ti-linux-3.12.y

* 'audio-display-ti-linux-3.12.y' of git://git.ti.com/~darrene/ti-linux-kernel/audio-display-linux-feature-tree:
  ARM: dts: am43x-epos-evm: Enable McASP FIFO usage
  ARM: dts: am437x-gp-evm: Enable McASP FIFO usage
  ARM: dts: am335x-evmsk: Enable McASP FIFO usage
  ARM: dts: am335x-evm: Enable McASP FIFO usage

Signed-off-by: Dan Murphy <DMurphy@ti.com>

Showing 4 changed files Side-by-side Diff

arch/arm/boot/dts/am335x-evm.dts
Diff comments   View file @ efe4c10
... ... @@ -750,8 +750,8 @@
750 750 serial-dir = < /* 0: INACTIVE, 1: TX, 2: RX */
751 751 0 0 1 2
752 752 >;
753   - tx-num-evt = <1>;
754   - rx-num-evt = <1>;
  753 + tx-num-evt = <32>;
  754 + rx-num-evt = <32>;
755 755 };
756 756  
757 757 &tps {
arch/arm/boot/dts/am335x-evmsk.dts
Diff comments   View file @ efe4c10
... ... @@ -673,7 +673,7 @@
673 673 serial-dir = < /* 0: INACTIVE, 1: TX, 2: RX */
674 674 0 0 1 2
675 675 >;
676   - tx-num-evt = <1>;
677   - rx-num-evt = <1>;
  676 + tx-num-evt = <32>;
  677 + rx-num-evt = <32>;
678 678 };
arch/arm/boot/dts/am437x-gp-evm.dts
Diff comments   View file @ efe4c10
... ... @@ -711,8 +711,8 @@
711 711 serial-dir = < /* 0: INACTIVE, 1: TX, 2: RX */
712 712 0 0 1 2
713 713 >;
714   - tx-num-evt = <1>;
715   - rx-num-evt = <1>;
  714 + tx-num-evt = <32>;
  715 + rx-num-evt = <32>;
716 716 };
717 717  
718 718 &elm {
arch/arm/boot/dts/am43x-epos-evm.dts
Diff comments   View file @ efe4c10
... ... @@ -935,8 +935,8 @@
935 935 serial-dir = < /* 0: INACTIVE, 1: TX, 2: RX */
936 936 1 2 0 0
937 937 >;
938   - tx-num-evt = <1>;
939   - rx-num-evt = <1>;
  938 + tx-num-evt = <32>;
  939 + rx-num-evt = <32>;
940 940 };
941 941  
942 942 &vpfe1 {