diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/01/01/01/01/gpbridge00/usb/.gitignore b/drivers/staging/greybus/Documentation/sysfs/endo/01/01/01/01/gpbridge00/usb/.gitignore
deleted file mode 100644
index f935021a8f8a..000000000000
--- a/drivers/staging/greybus/Documentation/sysfs/endo/01/01/01/01/gpbridge00/usb/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-!.gitignore
diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/02/02/.gitignore b/drivers/staging/greybus/Documentation/sysfs/endo/02/02/.gitignore
deleted file mode 100644
index f935021a8f8a..000000000000
--- a/drivers/staging/greybus/Documentation/sysfs/endo/02/02/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-!.gitignore
diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/vendor_id b/drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/1-2.1/class
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/vendor_id
rename to drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/1-2.1/class
diff --git a/drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/1-2.1/id b/drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/1-2.1/id
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/1-2.1/id
@@ -0,0 +1 @@
+1
diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/01/01/state b/drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/1-2.1/state
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo/01/01/state
rename to drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/1-2.1/state
diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/vendor_name b/drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/1-2.2/class
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/vendor_name
rename to drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/1-2.2/class
diff --git a/drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/1-2.2/id b/drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/1-2.2/id
new file mode 100644
index 000000000000..0cfbf08886fc
--- /dev/null
+++ b/drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/1-2.2/id
@@ -0,0 +1 @@
+2
diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/01/01/firmware b/drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/1-2.2/state
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo/01/01/firmware
rename to drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/1-2.2/state
diff --git a/drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/id b/drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/id
new file mode 100644
index 000000000000..0cfbf08886fc
--- /dev/null
+++ b/drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/id
@@ -0,0 +1 @@
+2
diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/01/01/product_id b/drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/product_id
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo/01/01/product_id
rename to drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/product_id
diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/01/01/manifest b/drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/unique_id
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo/01/01/manifest
rename to drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/unique_id
diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/01/01/product_name b/drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/vendor_id
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo/01/01/product_name
rename to drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/vendor_id
diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/01/01/uid b/drivers/staging/greybus/Documentation/sysfs/greybus1/1-4/1-4.2/class
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo/01/01/uid
rename to drivers/staging/greybus/Documentation/sysfs/greybus1/1-4/1-4.2/class
diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/01/01/01/01/gpbridge00/gpio/.gitignore b/drivers/staging/greybus/Documentation/sysfs/greybus1/1-4/1-4.2/gpbridge0/gpio/gpiochip490/.gitignore
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo/01/01/01/01/gpbridge00/gpio/.gitignore
rename to drivers/staging/greybus/Documentation/sysfs/greybus1/1-4/1-4.2/gpbridge0/gpio/gpiochip490/.gitignore
diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/01/01/01/01/gpbridge00/i2c/.gitignore b/drivers/staging/greybus/Documentation/sysfs/greybus1/1-4/1-4.2/gpbridge0/i2c-4/.gitignore
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo/01/01/01/01/gpbridge00/i2c/.gitignore
rename to drivers/staging/greybus/Documentation/sysfs/greybus1/1-4/1-4.2/gpbridge0/i2c-4/.gitignore
diff --git a/drivers/staging/greybus/Documentation/sysfs/greybus1/1-4/1-4.2/id b/drivers/staging/greybus/Documentation/sysfs/greybus1/1-4/1-4.2/id
new file mode 100644
index 000000000000..0cfbf08886fc
--- /dev/null
+++ b/drivers/staging/greybus/Documentation/sysfs/greybus1/1-4/1-4.2/id
@@ -0,0 +1 @@
+2
diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/01/01/version_major b/drivers/staging/greybus/Documentation/sysfs/greybus1/1-4/1-4.2/state
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo/01/01/version_major
rename to drivers/staging/greybus/Documentation/sysfs/greybus1/1-4/1-4.2/state
diff --git a/drivers/staging/greybus/Documentation/sysfs/greybus1/1-4/id b/drivers/staging/greybus/Documentation/sysfs/greybus1/1-4/id
new file mode 100644
index 000000000000..b8626c4cff28
--- /dev/null
+++ b/drivers/staging/greybus/Documentation/sysfs/greybus1/1-4/id
@@ -0,0 +1 @@
+4
diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/01/01/version_minor b/drivers/staging/greybus/Documentation/sysfs/greybus1/1-4/product_id
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo/01/01/version_minor
rename to drivers/staging/greybus/Documentation/sysfs/greybus1/1-4/product_id
diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/01/epm b/drivers/staging/greybus/Documentation/sysfs/greybus1/1-4/unique_id
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo/01/epm
rename to drivers/staging/greybus/Documentation/sysfs/greybus1/1-4/unique_id
diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/01/power b/drivers/staging/greybus/Documentation/sysfs/greybus1/1-4/vendor_id
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo/01/power
rename to drivers/staging/greybus/Documentation/sysfs/greybus1/1-4/vendor_id
diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/ap_intf_id b/drivers/staging/greybus/Documentation/sysfs/greybus1/1-svc/ap_intf_id
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo/ap_intf_id
rename to drivers/staging/greybus/Documentation/sysfs/greybus1/1-svc/ap_intf_id
diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/01/present b/drivers/staging/greybus/Documentation/sysfs/greybus1/1-svc/eject
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo/01/present
rename to drivers/staging/greybus/Documentation/sysfs/greybus1/1-svc/eject
diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/id b/drivers/staging/greybus/Documentation/sysfs/greybus1/1-svc/endo_id
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo/id
rename to drivers/staging/greybus/Documentation/sysfs/greybus1/1-svc/endo_id
diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/svc/svc/firmware b/drivers/staging/greybus/Documentation/sysfs/greybus1/1-svc/unique_id
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo/svc/svc/firmware
rename to drivers/staging/greybus/Documentation/sysfs/greybus1/1-svc/unique_id
diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/svc/svc/serial_number b/drivers/staging/greybus/Documentation/sysfs/greybus2/2-3/2-3.1/class
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo/svc/svc/serial_number
rename to drivers/staging/greybus/Documentation/sysfs/greybus2/2-3/2-3.1/class
diff --git a/drivers/staging/greybus/Documentation/sysfs/greybus2/2-3/2-3.1/id b/drivers/staging/greybus/Documentation/sysfs/greybus2/2-3/2-3.1/id
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/drivers/staging/greybus/Documentation/sysfs/greybus2/2-3/2-3.1/id
@@ -0,0 +1 @@
+1
diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/svc/svc/version b/drivers/staging/greybus/Documentation/sysfs/greybus2/2-3/2-3.1/state
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo/svc/svc/version
rename to drivers/staging/greybus/Documentation/sysfs/greybus2/2-3/2-3.1/state
diff --git a/drivers/staging/greybus/Documentation/sysfs/greybus2/2-3/id b/drivers/staging/greybus/Documentation/sysfs/greybus2/2-3/id
new file mode 100644
index 000000000000..00750edc07d6
--- /dev/null
+++ b/drivers/staging/greybus/Documentation/sysfs/greybus2/2-3/id
@@ -0,0 +1 @@
+3
diff --git a/drivers/staging/greybus/Documentation/sysfs/greybus2/2-3/product_id b/drivers/staging/greybus/Documentation/sysfs/greybus2/2-3/product_id
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/drivers/staging/greybus/Documentation/sysfs/greybus2/2-3/unique_id b/drivers/staging/greybus/Documentation/sysfs/greybus2/2-3/unique_id
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/drivers/staging/greybus/Documentation/sysfs/greybus2/2-3/vendor_id b/drivers/staging/greybus/Documentation/sysfs/greybus2/2-3/vendor_id
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/drivers/staging/greybus/Documentation/sysfs/greybus2/2-svc/ap_intf_id b/drivers/staging/greybus/Documentation/sysfs/greybus2/2-svc/ap_intf_id
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/drivers/staging/greybus/Documentation/sysfs/greybus2/2-svc/eject b/drivers/staging/greybus/Documentation/sysfs/greybus2/2-svc/eject
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/drivers/staging/greybus/Documentation/sysfs/greybus2/2-svc/endo_id b/drivers/staging/greybus/Documentation/sysfs/greybus2/2-svc/endo_id
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/drivers/staging/greybus/Documentation/sysfs/greybus2/2-svc/unique_id b/drivers/staging/greybus/Documentation/sysfs/greybus2/2-svc/unique_id
new file mode 100644
index 000000000000..e69de29bb2d1