From a1d4355c20550a87bd1b468d3b13c9b8c82cb442 Mon Sep 17 00:00:00 2001
From: Oron Peled <oron.peled@xorcom.com>
Date: Tue, 15 Oct 2013 20:56:31 +0300
Subject: [PATCH] pinned-spans: fix examples in configuration files

* Correctly use the new "location" attribute
* Document the possibility to match against sysfs devpath
  (used to be the "location")

Signed-off-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
Acked-by: Russ Meyerriecks <rmeyerriecks@digium.com>
---
 pinned-spans.conf.sample | 17 +++++++++--------
 span-types.conf.sample   |  3 ++-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/pinned-spans.conf.sample b/pinned-spans.conf.sample
index a9145bb..41306d0 100644
--- a/pinned-spans.conf.sample
+++ b/pinned-spans.conf.sample
@@ -10,6 +10,7 @@
 #  * The <id> field may be either:
 #         hardware_id
 #         @location
+#         devpath (in sysfs)
 #  * Shell-style globbing is allowed for the <id> field
 #  * There may one or more of <spanspec>
 #  * Each <spanspec> is composed as:
@@ -44,13 +45,13 @@
 # Astribank with 4*BRI without hardware_id :-(
 # We use the location on the bus (ie: where it is physically
 # located). Note the '@' prefix that indicate the location key.
-#@pci0000:00/0000:00:03.3/usb1/1-6/xbus-01/astribanks:xbus-01	1:1:50
-#@pci0000:00/0000:00:03.3/usb1/1-6/xbus-01/astribanks:xbus-01	2:2:100
-#@pci0000:00/0000:00:03.3/usb1/1-6/xbus-01/astribanks:xbus-01	3:3:150
-#@pci0000:00/0000:00:03.3/usb1/1-6/xbus-01/astribanks:xbus-01	4:4:200
+#@usb-0000:00:1d.7-3	1:1:50
+#@usb-0000:00:1d.7-3	2:2:100
+#@usb-0000:00:1d.7-3	3:3:150
+#@usb-0000:00:1d.7-3	4:4:200
 
 # Same configuration with globbing:
-#@*/usb1/1-6/*	1:1:50
-#@*/usb1/1-6/*	2:2:100
-#@*/usb1/1-6/*	3:3:150
-#@*/usb1/1-6/*	4:4:200
+#/sys/*/usb1/1-6/*	1:1:50
+#/sys/*/usb1/1-6/*	2:2:100
+#/sys/*/usb1/1-6/*	3:3:150
+#/sys/*/usb1/1-6/*	4:4:200
diff --git a/span-types.conf.sample b/span-types.conf.sample
index e639fe5..71c391e 100644
--- a/span-types.conf.sample
+++ b/span-types.conf.sample
@@ -8,6 +8,7 @@
 #  * The <id> field may be either:
 #         hardware_id
 #         @location
+#         devpath (in sysfs)
 #  * The <local_spanno> is the relative span number 
 #    in the device (starting from 1)
 #    In this filed globbing rules apply. E.g:
@@ -24,4 +25,4 @@
 
 #  Set the first two spans of an Astribank to T1. The
 #  Astribanks is specified by its location instead of hardware_id
-#@pci0000:00/0000:00:03.3/usb1/1-5/xbus-01/astribanks:xbus-01 [12]:T1
+#@usb-0000:00:1d.7-3 [12]:T1