thunderbolt: Move enum tb_cfg_pkg_type to thunderbolt.h

These will be needed by Thunderbolt services when sending and receiving
XDomain control messages. While there change TB_CFG_PKG_PREPARE_TO_SLEEP
value to be decimal in order to be consistent with other members.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: Michael Jamet <michael.jamet@intel.com>
Reviewed-by: Yehezkel Bernat <yehezkel.bernat@intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/thunderbolt/ctl.h b/drivers/thunderbolt/ctl.h
index 36fd28b1c1c57b35e6566ab9fddc56ec9eb6c37b..d0f21e1e0b8b83e07004dab1462e5eb05b9de09b 100644 (file)
--- a/drivers/thunderbolt/ctl.h
+++ b/drivers/thunderbolt/ctl.h
@@ -8,6 +8,7 @@
 #define _TB_CFG
 
 #include <linux/kref.h>
+#include <linux/thunderbolt.h>
 
 #include "nhi.h"
 #include "tb_msgs.h"

diff --git a/drivers/thunderbolt/tb_msgs.h b/drivers/thunderbolt/tb_msgs.h
index f3adf58a40ce8c6c69e557eacdce4c306b031037..f2b2550cd97c5c84f66d11714bfdb811da52a867 100644 (file)
--- a/drivers/thunderbolt/tb_msgs.h
+++ b/drivers/thunderbolt/tb_msgs.h
@@ -15,23 +15,6 @@
 #include <linux/types.h>
 #include <linux/uuid.h>
 
-enum tb_cfg_pkg_type {
-       TB_CFG_PKG_READ = 1,
-       TB_CFG_PKG_WRITE = 2,
-       TB_CFG_PKG_ERROR = 3,
-       TB_CFG_PKG_NOTIFY_ACK = 4,
-       TB_CFG_PKG_EVENT = 5,
-       TB_CFG_PKG_XDOMAIN_REQ = 6,
-       TB_CFG_PKG_XDOMAIN_RESP = 7,
-       TB_CFG_PKG_OVERRIDE = 8,
-       TB_CFG_PKG_RESET = 9,
-       TB_CFG_PKG_ICM_EVENT = 10,
-       TB_CFG_PKG_ICM_CMD = 11,
-       TB_CFG_PKG_ICM_RESP = 12,
-       TB_CFG_PKG_PREPARE_TO_SLEEP = 0xd,
-
-};
-
 enum tb_cfg_space {
        TB_CFG_HOPS = 0,
        TB_CFG_PORT = 1,

diff --git a/include/linux/thunderbolt.h b/include/linux/thunderbolt.h
index 96561c1265ae81b9e2bdc195c54d74acdfb3be80..b512b1e2b4f290ef5e0d121d765fc6ca71899e4b 100644 (file)
--- a/include/linux/thunderbolt.h
+++ b/include/linux/thunderbolt.h
@@ -1,6 +1,7 @@
 /*
  * Thunderbolt service API
  *
+ * Copyright (C) 2014 Andreas Noever <andreas.noever@gmail.com>
  * Copyright (C) 2017, Intel Corporation
  * Authors: Michael Jamet <michael.jamet@intel.com>
  *          Mika Westerberg <mika.westerberg@linux.intel.com>
@@ -16,6 +17,22 @@
 #include <linux/list.h>
 #include <linux/uuid.h>
 
+enum tb_cfg_pkg_type {
+       TB_CFG_PKG_READ = 1,
+       TB_CFG_PKG_WRITE = 2,
+       TB_CFG_PKG_ERROR = 3,
+       TB_CFG_PKG_NOTIFY_ACK = 4,
+       TB_CFG_PKG_EVENT = 5,
+       TB_CFG_PKG_XDOMAIN_REQ = 6,
+       TB_CFG_PKG_XDOMAIN_RESP = 7,
+       TB_CFG_PKG_OVERRIDE = 8,
+       TB_CFG_PKG_RESET = 9,
+       TB_CFG_PKG_ICM_EVENT = 10,
+       TB_CFG_PKG_ICM_CMD = 11,
+       TB_CFG_PKG_ICM_RESP = 12,
+       TB_CFG_PKG_PREPARE_TO_SLEEP = 13,
+};
+
 /**
  * struct tb_property_dir - XDomain property directory
  * @uuid: Directory UUID or %NULL if root directory