V4L/DVB: V4L: v4l2-subdev driver for AK8813 and AK8814 TV-encoders from AKM

[safe/jmp/linux-2.6] / include / scsi / sas.h

diff --git a/include/scsi/sas.h b/include/scsi/sas.h
index 752853a..e9fd022 100644 (file)
--- a/include/scsi/sas.h
+++ b/include/scsi/sas.h
@@ -102,27 +102,12 @@ enum sas_dev_type {
        SATA_PM_PORT= 8,
 };
 
-enum sas_phy_linkrate {
-       PHY_LINKRATE_NONE = 0,
-       PHY_LINKRATE_UNKNOWN = 0,
-       PHY_DISABLED,
-       PHY_RESET_PROBLEM,
-       PHY_SPINUP_HOLD,
-       PHY_PORT_SELECTOR,
-       PHY_LINKRATE_1_5 = 0x08,
-       PHY_LINKRATE_G1  = PHY_LINKRATE_1_5,
-       PHY_LINKRATE_3   = 0x09,
-       PHY_LINKRATE_G2  = PHY_LINKRATE_3,
-       PHY_LINKRATE_6   = 0x0A,
-};
-
-/* Partly from IDENTIFY address frame. */
-enum sas_proto {
-       SATA_PROTO    = 1,
-       SAS_PROTO_SMP = 2,        /* protocol */
-       SAS_PROTO_STP = 4,        /* protocol */
-       SAS_PROTO_SSP = 8,        /* protocol */
-       SAS_PROTO_ALL = 0xE,
+enum sas_protocol {
+       SAS_PROTOCOL_SATA               = 0x01,
+       SAS_PROTOCOL_SMP                = 0x02,
+       SAS_PROTOCOL_STP                = 0x04,
+       SAS_PROTOCOL_SSP                = 0x08,
+       SAS_PROTOCOL_ALL                = 0x0E,
 };
 
 /* From the spec; local phys only */
@@ -135,6 +120,7 @@ enum phy_func {
        PHY_FUNC_CLEAR_AFFIL,
        PHY_FUNC_TX_SATA_PS_SIGNAL,
        PHY_FUNC_RELEASE_SPINUP_HOLD = 0x10, /* LOCAL PORT ONLY! */
+       PHY_FUNC_SET_LINK_RATE,
 };
 
 /* SAS LLDD would need to report only _very_few_ of those, like BROADCAST.