summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorDan Murphy <DMurphy@ti.com>2014-09-17 13:16:55 -0500
committerDan Murphy <DMurphy@ti.com>2014-09-17 13:16:55 -0500
commit6abf0c736e3c44c4a06eb32c4e27edafa1c571f5 (patch)
tree096f9bd4afcfd5db2690c560d5c7a007d54a36e5 /Documentation
parentf8035738c59f841504717d677a9af6a65251c82a (diff)
parentaf92ba8fd23cb5811d96b833bbb7133efefeb5b9 (diff)
Merge tag 'v3.14.19' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into ti-linux-3.14.y
This is the 3.14.19 stable release * tag 'v3.14.19' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable: (114 commits) Linux 3.14.19 KEYS: Fix termination condition in assoc array garbage collection KEYS: Fix use-after-free in assoc_array_gc() libceph: gracefully handle large reply messages from the mon vfs: fix bad hashing of dentries drm/nouveau: Bump version from 1.1.1 to 1.1.2 IB/srp: Fix deadlock between host removal and multipathd mtd: nand: omap: Fix 1-bit Hamming code scheme, omap_calculate_ecc() mtd/ftl: fix the double free of the buffers allocated in build_maps() CIFS: Fix wrong restart readdir for SMB1 CIFS: Fix wrong filename length for SMB2 CIFS: Fix directory rename error vfs: add d_is_dir() CIFS: Fix wrong directory attributes after rename CIFS: Possible null ptr deref in SMB2_tcon CIFS: Fix async reading on reconnects CIFS: Fix STATUS_CANNOT_DELETE error mapping for SMB2 libceph: do not hard code max auth ticket len libceph: add process_one_ticket() helper libceph: set last_piece in ceph_msg_data_pages_cursor_init() correctly ... Signed-off-by: Dan Murphy <DMurphy@ti.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/sound/adi,axi-spdif-tx.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/sound/adi,axi-spdif-tx.txt b/Documentation/devicetree/bindings/sound/adi,axi-spdif-tx.txt
index 46f34496531..4eb7997674a 100644
--- a/Documentation/devicetree/bindings/sound/adi,axi-spdif-tx.txt
+++ b/Documentation/devicetree/bindings/sound/adi,axi-spdif-tx.txt
@@ -1,7 +1,7 @@
ADI AXI-SPDIF controller
Required properties:
- - compatible : Must be "adi,axi-spdif-1.00.a"
+ - compatible : Must be "adi,axi-spdif-tx-1.00.a"
- reg : Must contain SPDIF core's registers location and length
- clocks : Pairs of phandle and specifier referencing the controller's clocks.
The controller expects two clocks, the clock used for the AXI interface and