diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-19 12:16:02 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-19 12:16:34 -0700 |
| commit | 730346236af3fcd3324dbc26e4fa13955c59fa7e (patch) | |
| tree | 8bdc0ac70d36636a26e2284670aee5f15b930831 /arch/arm/boot/dts/am335x-evmsk.dts | |
| parent | 1409f3fd5bdb548b0e11a109baa1087680b60c5a (diff) | |
| parent | 8fe9346b945d76ddb3f08c00e34d701174c62fa0 (diff) | |
Merge tag 'zynq-dt-for-3.17' of git://git.xilinx.com/linux-xlnx into next/dt
Merge "Xilinx Zynq changes for v3.17" from Michal Simek:
arm: Xilinx Zynq dt patches for v3.17
- Document and use new cadence serial binding
* tag 'zynq-dt-for-3.17' of git://git.xilinx.com/linux-xlnx:
ARM: zynq: DT: Migrate UART to Cadence binding
tty: cadence: Document DT binding
+ Linux 3.16-rc5
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/am335x-evmsk.dts')
| -rw-r--r-- | arch/arm/boot/dts/am335x-evmsk.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts index 59766e2c2980..df5fee6b6b4b 100644 --- a/arch/arm/boot/dts/am335x-evmsk.dts +++ b/arch/arm/boot/dts/am335x-evmsk.dts @@ -661,8 +661,8 @@ serial-dir = < /* 0: INACTIVE, 1: TX, 2: RX */ 0 0 1 2 >; - tx-num-evt = <1>; - rx-num-evt = <1>; + tx-num-evt = <32>; + rx-num-evt = <32>; }; &tscadc { |