Skip to contentSkip to conversation

xillybus: Move out of staging

PATCH New Eli Billauer 1 participant 1 message Sep 9, 2014

Subsystems (5)
lore
Share & tools
lore

Eli Billauer

author maintainer
#0 lore raw

PATCH v2 1/1 xillybus: Move out of staging

This driver has been functional and stable throughout the year it has spent in the staging area. It has been patched for minor bugs, coding style issues and improvements during this period.

This is the second submission of this move-out, after making several style improvements, as suggested by Dan Carpenter.

---
 .../devicetree/bindings/staging/xillybus.txt       |   20 -
 .../devicetree/bindings/xillybus/xillybus.txt      |   20 +
 Documentation/xillybus.txt                         |  380 ++++
 drivers/char/Kconfig                               |    2 +
 drivers/char/Makefile                              |    1 +
 drivers/char/xillybus/Kconfig                      |   33 +
 drivers/char/xillybus/Makefile                     |    7 +
 drivers/char/xillybus/xillybus.h                   |  160 ++
 drivers/char/xillybus/xillybus_core.c              | 2103 ++++++++++++++++++++
 drivers/char/xillybus/xillybus_of.c                |  187 ++
 drivers/char/xillybus/xillybus_pcie.c              |  228 +++
 drivers/staging/Kconfig                            |    2 -
 drivers/staging/Makefile                           |    1 -
 drivers/staging/xillybus/Kconfig                   |   33 -
 drivers/staging/xillybus/Makefile                  |    7 -
 drivers/staging/xillybus/README                    |  380 ----
 drivers/staging/xillybus/TODO                      |    5 -
 drivers/staging/xillybus/xillybus.h                |  160 --
 drivers/staging/xillybus/xillybus_core.c           | 2103 --------------------
 drivers/staging/xillybus/xillybus_of.c             |  187 --
 drivers/staging/xillybus/xillybus_pcie.c           |  228 ---
 21 files changed, 3121 insertions(+), 3126 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/staging/xillybus.txt
 create mode 100644 Documentation/devicetree/bindings/xillybus/xillybus.txt
 create mode 100644 Documentation/xillybus.txt
 create mode 100644 drivers/char/xillybus/Kconfig
 create mode 100644 drivers/char/xillybus/Makefile
 create mode 100644 drivers/char/xillybus/xillybus.h
 create mode 100644 drivers/char/xillybus/xillybus_core.c
 create mode 100644 drivers/char/xillybus/xillybus_of.c
 create mode 100644 drivers/char/xillybus/xillybus_pcie.c
 delete mode 100644 drivers/staging/xillybus/Kconfig
 delete mode 100644 drivers/staging/xillybus/Makefile
 delete mode 100644 drivers/staging/xillybus/README
 delete mode 100644 drivers/staging/xillybus/TODO
 delete mode 100644 drivers/staging/xillybus/xillybus.h
 delete mode 100644 drivers/staging/xillybus/xillybus_core.c
 delete mode 100644 drivers/staging/xillybus/xillybus_of.c
 delete mode 100644 drivers/staging/xillybus/xillybus_pcie.c
Documentation/devicetree/bindings/staging/xillybus.txt deleted +0 -20
deleted file mode 100644
index 9e316dc..0000000
@@ -1,20 +0,0 @@
-* Xillybus driver for generic FPGA interface
-
-Required properties:
-- compatible: Should be "xillybus,xillybus-1.00.a"
-- reg: Address and length of the register set for the device
-- interrupts: Contains one interrupt node, typically consisting of three cells.
-- interrupt-parent: the phandle for the interrupt controller that
-                    services interrupts for this device.
-
-Optional properties:
-- dma-coherent: Present if DMA operations are coherent
-
-Example:
-
-	xillybus@ff200400 {
-		compatible = "xillybus,xillybus-1.00.a";
-		reg = < 0xff200400 0x00000080 >;
-		interrupts = < 0 40 1 >;
-		interrupt-parent = <&intc>;
-	} ;
Documentation/devicetree/bindings/xillybus/xillybus.txt new file +20 -0
new file mode 100644
index 0000000..9e316dc
@@ -0,0 +1,20 @@
+* Xillybus driver for generic FPGA interface
+
+Required properties:
+- compatible: Should be "xillybus,xillybus-1.00.a"
+- reg: Address and length of the register set for the device
+- interrupts: Contains one interrupt node, typically consisting of three cells.
+- interrupt-parent: the phandle for the interrupt controller that
+                    services interrupts for this device.
+
+Optional properties:
+- dma-coherent: Present if DMA operations are coherent
+
+Example:
+
+	xillybus@ff200400 {
+		compatible = "xillybus,xillybus-1.00.a";
+		reg = < 0xff200400 0x00000080 >;
+		interrupts = < 0 40 1 >;
+		interrupt-parent = <&intc>;
+	} ;
Documentation/xillybus.txt new file +380 -0

380 lines not on this page · raw message

drivers/char/Kconfig +2 -0
index 6e9f74a..efefd12 100644
@@ -600,5 +600,7 @@ config TILE_SROM
 	  device appear much like a simple EEPROM, and knows
 	  how to partition a single ROM for multiple purposes.
 
+source "drivers/char/xillybus/Kconfig"
+
 endmenu
 
drivers/char/Makefile +1 -0
index a324f93..d06cde26 100644
@@ -61,3 +61,4 @@ obj-$(CONFIG_JS_RTC)		+= js-rtc.o
 js-rtc-y = rtc.o
 
 obj-$(CONFIG_TILE_SROM)		+= tile-srom.o
+obj-$(CONFIG_XILLYBUS)		+= xillybus/
drivers/char/xillybus/Kconfig new file +33 -0
new file mode 100644
index 0000000..b53bdf1
@@ -0,0 +1,33 @@
+#
+# Xillybus devices
+#
+
+config XILLYBUS
+	tristate "Xillybus generic FPGA interface"
+	depends on PCI || (OF_ADDRESS && OF_IRQ)
+	select CRC32
+	help
+	  Xillybus is a generic interface for peripherals designed on
+	  programmable logic (FPGA). The driver probes the hardware for
+	  its capabilities, and creates device files accordingly.
+
+	  If unsure, say N.
+
+if XILLYBUS
+
+config XILLYBUS_PCIE
+	tristate "Xillybus over PCIe"
+	depends on PCI_MSI
+	help
+	  Set to M if you want Xillybus to use PCI Express for communicating
+	  with the FPGA.
+
+config XILLYBUS_OF
+	tristate "Xillybus over Device Tree"
+	depends on OF_ADDRESS && OF_IRQ
+	help
+	  Set to M if you want Xillybus to find its resources from the
+	  Open Firmware Flattened Device Tree. If the target is an embedded
+	  system, say M.
+
+endif # if XILLYBUS
drivers/char/xillybus/Makefile new file +7 -0
new file mode 100644
index 0000000..b68b7eb
@@ -0,0 +1,7 @@
+#
+# Makefile for Xillybus driver
+#
+
+obj-$(CONFIG_XILLYBUS)		+= xillybus_core.o
+obj-$(CONFIG_XILLYBUS_PCIE)	+= xillybus_pcie.o
+obj-$(CONFIG_XILLYBUS_OF)	+= xillybus_of.o
drivers/char/xillybus/xillybus.h new file +160 -0

160 lines not on this page · raw message

drivers/char/xillybus/xillybus_core.c new file +2103 -0

2,103 lines not on this page · raw message

drivers/char/xillybus/xillybus_of.c new file +187 -0

187 lines not on this page · raw message

drivers/char/xillybus/xillybus_pcie.c new file +228 -0

79 lines not on this page · raw message

drivers/staging/Kconfig +0 -2
index 6e2d6fd..e3c1a1f 100644

Lines of this file are not shown. View the raw message.

drivers/staging/Makefile +0 -1
index 74c679e..8e8333f 100644

Lines of this file are not shown. View the raw message.

drivers/staging/xillybus/Kconfig deleted +0 -33
deleted file mode 100644
index b53bdf1..0000000

Lines of this file are not shown. View the raw message.

drivers/staging/xillybus/Makefile deleted +0 -7
deleted file mode 100644
index b68b7eb..0000000

Lines of this file are not shown. View the raw message.

drivers/staging/xillybus/README deleted +0 -380

380 lines not on this page · raw message

drivers/staging/xillybus/TODO deleted +0 -5
deleted file mode 100644
index 95cfe2f..0000000

Lines of this file are not shown. View the raw message.

drivers/staging/xillybus/xillybus.h deleted +0 -160

160 lines not on this page · raw message

drivers/staging/xillybus/xillybus_core.c deleted +0 -2103

2,103 lines not on this page · raw message

drivers/staging/xillybus/xillybus_of.c deleted +0 -187

187 lines not on this page · raw message

drivers/staging/xillybus/xillybus_pcie.c deleted +0 -228

228 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.7.2.3

Part of the diff is not shown here. View the raw message.