spi: Move spi code from Documentation to tools

Jon Corbet requested this code moved with the last changeset,
https://lkml.org/lkml/2015/3/1/144,
but the patch was not applied because it missed the Makefile.
Moved spidev_test, spidev_fdx and their Makefile infrastructure.

Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/Documentation/Makefile b/Documentation/Makefile
index bc0548201755e1a8d29614bccbd78fcbbe5a34ae..1207d7907650028927809c57c274d3cb962337c4 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -1,4 +1,4 @@
 subdir-y := accounting auxdisplay blackfin connector \
        filesystems filesystems ia64 laptops mic misc-devices \
-       networking pcmcia prctl ptp spi timers vDSO video4linux \
+       networking pcmcia prctl ptp timers vDSO video4linux \
        watchdog

diff --git a/Documentation/spi/Makefile b/Documentation/spi/Makefile
deleted file mode 100644 (file)
index efa2558..0000000
--- a/Documentation/spi/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# List of programs to build
-hostprogs-y := spidev_test spidev_fdx
-
-# Tell kbuild to always build the programs
-always := $(hostprogs-y)
-
-HOSTCFLAGS_spidev_test.o += -I$(objtree)/usr/include
-HOSTCFLAGS_spidev_fdx.o += -I$(objtree)/usr/include

diff --git a/tools/Makefile b/tools/Makefile
index d6f307dfb1a3c090dc94472f9761c377616ebb92..0528aa13ccb426f83c04d7828482ee3730e7c804 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -17,6 +17,7 @@ help:
        @echo '  lguest     - a minimal 32-bit x86 hypervisor'
        @echo '  perf       - Linux performance measurement and analysis tool'
        @echo '  selftests  - various kernel selftests'
+       @echo '  spi        - spi tools'
        @echo '  turbostat  - Intel CPU idle stats and freq reporting tool'
        @echo '  usb        - USB testing tools'
        @echo '  virtio     - vhost test module'
@@ -48,7 +49,7 @@ acpi: FORCE
 cpupower: FORCE
        $(call descend,power/$@)
 
-cgroup firewire hv guest usb virtio vm net iio: FORCE
+cgroup firewire hv guest spi usb virtio vm net iio: FORCE
        $(call descend,$@)
 
 liblockdep: FORCE
@@ -109,7 +110,7 @@ acpi_clean:
 cpupower_clean:
        $(call descend,power/cpupower,clean)
 
-cgroup_clean hv_clean firewire_clean lguest_clean usb_clean virtio_clean vm_clean net_clean iio_clean:
+cgroup_clean hv_clean firewire_clean lguest_clean spi_clean usb_clean virtio_clean vm_clean net_clean iio_clean:
        $(call descend,$(@:_clean=),clean)
 
 liblockdep_clean:
@@ -134,7 +135,7 @@ freefall_clean:
        $(call descend,laptop/freefall,clean)
 
 clean: acpi_clean cgroup_clean cpupower_clean hv_clean firewire_clean lguest_clean \
-               perf_clean selftests_clean turbostat_clean usb_clean virtio_clean \
+               perf_clean selftests_clean turbostat_clean spi_clean usb_clean virtio_clean \
                vm_clean net_clean iio_clean x86_energy_perf_policy_clean tmon_clean \
                freefall_clean
 

diff --git a/tools/spi/Makefile b/tools/spi/Makefile
new file mode 100644 (file)
index 0000000..cd0db62
--- /dev/null
+++ b/tools/spi/Makefile
@@ -0,0 +1,4 @@
+all: spidev_test spidev_fdx
+
+clean:
+       $(RM) spidev_test spidev_fdx

diff --git a/Documentation/spi/spidev_fdx.c b/tools/spi/spidev_fdx.c
similarity index 100%
rename from Documentation/spi/spidev_fdx.c
rename to tools/spi/spidev_fdx.c

diff --git a/Documentation/spi/spidev_test.c b/tools/spi/spidev_test.c
similarity index 100%
rename from Documentation/spi/spidev_test.c
rename to tools/spi/spidev_test.c