Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[firefly-linux-kernel-4.4.55.git] / include / linux / firewire.h

diff --git a/include/linux/firewire.h b/include/linux/firewire.h
index b6d21d5a11a2543564d4b0db1d2adbfc938c3687..c64f3680d4f154b2bc2959380e0b04ecd5477d52 100644 (file)
--- a/include/linux/firewire.h
+++ b/include/linux/firewire.h
@@ -42,6 +42,10 @@
 #define CSR_BROADCAST_CHANNEL          0x234
 #define CSR_CONFIG_ROM                 0x400
 #define CSR_CONFIG_ROM_END             0x800
+#define CSR_OMPR                       0x900
+#define CSR_OPCR(i)                    (0x904 + (i) * 4)
+#define CSR_IMPR                       0x980
+#define CSR_IPCR(i)                    (0x984 + (i) * 4)
 #define CSR_FCP_COMMAND                        0xB00
 #define CSR_FCP_RESPONSE               0xD00
 #define CSR_FCP_END                    0xF00
@@ -441,5 +445,8 @@ int fw_iso_context_start(struct fw_iso_context *ctx,
                         int cycle, int sync, int tags);
 int fw_iso_context_stop(struct fw_iso_context *ctx);
 void fw_iso_context_destroy(struct fw_iso_context *ctx);
+void fw_iso_resource_manage(struct fw_card *card, int generation,
+                           u64 channels_mask, int *channel, int *bandwidth,
+                           bool allocate, __be32 buffer[2]);
 
 #endif /* _LINUX_FIREWIRE_H */