Merge tag 'staging-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull staging/IIO updates from Greg KH:
 "Here is the big staging and IIO driver update for 4.18-rc1.

  It was delayed as I wanted to make sure the final driver deletions did
  not cause any major merge issues, and all now looks good.

  There are a lot of patches here, just over 1000. The diffstat summary
  shows the major changes here:

	1007 files changed, 16828 insertions(+), 227770 deletions(-)

  Because of this, we might be close to shrinking the overall kernel
  source code size for two releases in a row.

  There was loads of work in this release cycle, primarily:

   - tons of ks7010 driver cleanups

   - lots of mt7621 driver fixes and cleanups

   - most driver cleanups

   - wilc1000 fixes and cleanups

   - lots and lots of IIO driver cleanups and new additions

   - debugfs cleanups for all staging drivers

   - lots of other staging driver cleanups and fixes, the shortlog has
     the full details.

  but the big user-visable things here are the removal of 3 chunks of
  code:

   - ncpfs and ipx were removed on schedule, no one has cared about this
     code since it moved to staging last year, and if it needs to come
     back, it can be reverted.

   - lustre file system is removed.

     I've ranted at the lustre developers about once a year for the past
     5 years, with no real forward progress at all to clean things up
     and get the code into the "real" part of the kernel.

     Given that the lustre developers continue to work on an external
     tree and try to port those changes to the in-kernel tree every once
     in a while, this whole thing really really is not working out at
     all. So I'm deleting it so that the developers can spend the time
     working in their out-of-tree location and get things cleaned up
     properly to get merged into the tree correctly at a later date.

  Because of these file removals, you will have merge issues on some of
  these files (2 in the ipx code, 1 in the ncpfs code, and 1 in the
  atomisp driver). Just delete those files, it's a simple merge :)

  All of this has been in linux-next for a while with no reported
  problems"

* tag 'staging-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1011 commits)
  staging: ipx: delete it from the tree
  ncpfs: remove uapi .h files
  ncpfs: remove Documentation
  ncpfs: remove compat functionality
  staging: ncpfs: delete it
  staging: lustre: delete the filesystem from the tree.
  staging: vc04_services: no need to save the log debufs dentries
  staging: vc04_services: vchiq_debugfs_log_entry can be a void *
  staging: vc04_services: remove struct vchiq_debugfs_info
  staging: vc04_services: move client dbg directory into static variable
  staging: vc04_services: remove odd vchiq_debugfs_top() wrapper
  staging: vc04_services: no need to check debugfs return values
  staging: mt7621-gpio: reorder includes alphabetically
  staging: mt7621-gpio: change gc_map to don't use pointers
  staging: mt7621-gpio: use GPIOF_DIR_OUT and GPIOF_DIR_IN macros instead of custom values
  staging: mt7621-gpio: change 'to_mediatek_gpio' to make just a one line return
  staging: mt7621-gpio: dt-bindings: update documentation for #interrupt-cells property
  staging: mt7621-gpio: update #interrupt-cells for the gpio node
  staging: mt7621-gpio: dt-bindings: complete documentation for the gpio
  staging: mt7621-dts: add missing properties to gpio node
  ...

10 files changed, 328 insertions, 460 deletions

diff --git a/include/linux/iio/adc/ad_sigma_delta.h b/include/linux/iio/adc/ad_sigma_delta.h
index 1fc7abd28b0b..730ead1a46df 100644
--- a/include/linux/iio/adc/ad_sigma_delta.h
+++ b/include/linux/iio/adc/ad_sigma_delta.h
@@ -127,7 +127,7 @@ void ad_sd_cleanup_buffer_and_trigger(struct iio_dev *indio_dev);
 int ad_sd_validate_trigger(struct iio_dev *indio_dev, struct iio_trigger *trig);
 
 #define __AD_SD_CHANNEL(_si, _channel1, _channel2, _address, _bits, \
-        _storagebits, _shift, _extend_name, _type) \
+        _storagebits, _shift, _extend_name, _type, _mask_all) \
         { \
                 .type = (_type), \
                 .differential = (_channel2 == -1 ? 0 : 1), \
@@ -139,7 +139,7 @@ int ad_sd_validate_trigger(struct iio_dev *indio_dev, struct iio_trigger *trig);
                 .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
                         BIT(IIO_CHAN_INFO_OFFSET), \
                 .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \
-                .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ), \
+                .info_mask_shared_by_all = _mask_all, \
                 .scan_index = (_si), \
                 .scan_type = { \
                         .sign = 'u', \
@@ -153,25 +153,35 @@ int ad_sd_validate_trigger(struct iio_dev *indio_dev, struct iio_trigger *trig);
 #define AD_SD_DIFF_CHANNEL(_si, _channel1, _channel2, _address, _bits, \
         _storagebits, _shift) \
         __AD_SD_CHANNEL(_si, _channel1, _channel2, _address, _bits, \
-                _storagebits, _shift, NULL, IIO_VOLTAGE)
+                _storagebits, _shift, NULL, IIO_VOLTAGE, \
+                BIT(IIO_CHAN_INFO_SAMP_FREQ))
 
 #define AD_SD_SHORTED_CHANNEL(_si, _channel, _address, _bits, \
         _storagebits, _shift) \
         __AD_SD_CHANNEL(_si, _channel, _channel, _address, _bits, \
-                _storagebits, _shift, "shorted", IIO_VOLTAGE)
+                _storagebits, _shift, "shorted", IIO_VOLTAGE, \
+                BIT(IIO_CHAN_INFO_SAMP_FREQ))
 
 #define AD_SD_CHANNEL(_si, _channel, _address, _bits, \
         _storagebits, _shift) \
         __AD_SD_CHANNEL(_si, _channel, -1, _address, _bits, \
-                _storagebits, _shift, NULL, IIO_VOLTAGE)
+                _storagebits, _shift, NULL, IIO_VOLTAGE, \
+                 BIT(IIO_CHAN_INFO_SAMP_FREQ))
+
+#define AD_SD_CHANNEL_NO_SAMP_FREQ(_si, _channel, _address, _bits, \
+        _storagebits, _shift) \
+        __AD_SD_CHANNEL(_si, _channel, -1, _address, _bits, \
+                _storagebits, _shift, NULL, IIO_VOLTAGE, 0)
 
 #define AD_SD_TEMP_CHANNEL(_si, _address, _bits, _storagebits, _shift) \
         __AD_SD_CHANNEL(_si, 0, -1, _address, _bits, \
-                _storagebits, _shift, NULL, IIO_TEMP)
+                _storagebits, _shift, NULL, IIO_TEMP, \
+                BIT(IIO_CHAN_INFO_SAMP_FREQ))
 
 #define AD_SD_SUPPLY_CHANNEL(_si, _channel, _address, _bits, _storagebits, \
         _shift) \
         __AD_SD_CHANNEL(_si, _channel, -1, _address, _bits, \
-                _storagebits, _shift, "supply", IIO_VOLTAGE)
+                _storagebits, _shift, "supply", IIO_VOLTAGE, \
+                BIT(IIO_CHAN_INFO_SAMP_FREQ))
 
 #endif
diff --git a/include/linux/iio/adc/stm32-dfsdm-adc.h b/include/linux/iio/adc/stm32-dfsdm-adc.h
index e7dc7a542a4e..0da298b41737 100644
--- a/include/linux/iio/adc/stm32-dfsdm-adc.h
+++ b/include/linux/iio/adc/stm32-dfsdm-adc.h
@@ -9,6 +9,8 @@
 #ifndef STM32_DFSDM_ADC_H
 #define STM32_DFSDM_ADC_H
 
+#include <linux/iio/iio.h>
+
 int stm32_dfsdm_get_buff_cb(struct iio_dev *iio_dev,
                             int (*cb)(const void *data, size_t size,
                                       void *private),
diff --git a/include/linux/iio/common/cros_ec_sensors_core.h b/include/linux/iio/common/cros_ec_sensors_core.h
new file mode 100644
index 000000000000..ce16445411ac
--- /dev/null
+++ b/include/linux/iio/common/cros_ec_sensors_core.h
@@ -0,0 +1,180 @@
+/*
+ * ChromeOS EC sensor hub
+ *
+ * Copyright (C) 2016 Google, Inc
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __CROS_EC_SENSORS_CORE_H
+#define __CROS_EC_SENSORS_CORE_H
+
+#include <linux/iio/iio.h>
+#include <linux/irqreturn.h>
+#include <linux/mfd/cros_ec.h>
+
+enum {
+        CROS_EC_SENSOR_X,
+        CROS_EC_SENSOR_Y,
+        CROS_EC_SENSOR_Z,
+        CROS_EC_SENSOR_MAX_AXIS,
+};
+
+/* EC returns sensor values using signed 16 bit registers */
+#define CROS_EC_SENSOR_BITS 16
+
+/*
+ * 4 16 bit channels are allowed.
+ * Good enough for current sensors, they use up to 3 16 bit vectors.
+ */
+#define CROS_EC_SAMPLE_SIZE  (sizeof(s64) * 2)
+
+/* Minimum sampling period to use when device is suspending */
+#define CROS_EC_MIN_SUSPEND_SAMPLING_FREQUENCY 1000  /* 1 second */
+
+/**
+ * struct cros_ec_sensors_core_state - state data for EC sensors IIO driver
+ * @ec:                         cros EC device structure
+ * @cmd_lock:                   lock used to prevent simultaneous access to the
+ *                              commands.
+ * @msg:                        cros EC command structure
+ * @param:                      motion sensor parameters structure
+ * @resp:                       motion sensor response structure
+ * @type:                       type of motion sensor
+ * @loc:                        location where the motion sensor is placed
+ * @calib:                      calibration parameters. Note that trigger
+ *                              captured data will always provide the calibrated
+ *                              data
+ * @samples:                    static array to hold data from a single capture.
+ *                              For each channel we need 2 bytes, except for
+ *                              the timestamp. The timestamp is always last and
+ *                              is always 8-byte aligned.
+ * @read_ec_sensors_data:       function used for accessing sensors values
+ * @cuur_sampl_freq:            current sampling period
+ */
+struct cros_ec_sensors_core_state {
+        struct cros_ec_device *ec;
+        struct mutex cmd_lock;
+
+        struct cros_ec_command *msg;
+        struct ec_params_motion_sense param;
+        struct ec_response_motion_sense *resp;
+
+        enum motionsensor_type type;
+        enum motionsensor_location loc;
+
+        s16 calib[CROS_EC_SENSOR_MAX_AXIS];
+
+        u8 samples[CROS_EC_SAMPLE_SIZE];
+
+        int (*read_ec_sensors_data)(struct iio_dev *indio_dev,
+                                    unsigned long scan_mask, s16 *data);
+
+        int curr_sampl_freq;
+};
+
+/**
+ * cros_ec_sensors_read_lpc() - retrieve data from EC shared memory
+ * @indio_dev:  pointer to IIO device
+ * @scan_mask:  bitmap of the sensor indices to scan
+ * @data:       location to store data
+ *
+ * This is the safe function for reading the EC data. It guarantees that the
+ * data sampled was not modified by the EC while being read.
+ *
+ * Return: 0 on success, -errno on failure.
+ */
+int cros_ec_sensors_read_lpc(struct iio_dev *indio_dev, unsigned long scan_mask,
+                             s16 *data);
+
+/**
+ * cros_ec_sensors_read_cmd() - retrieve data using the EC command protocol
+ * @indio_dev:  pointer to IIO device
+ * @scan_mask:  bitmap of the sensor indices to scan
+ * @data:       location to store data
+ *
+ * Return: 0 on success, -errno on failure.
+ */
+int cros_ec_sensors_read_cmd(struct iio_dev *indio_dev, unsigned long scan_mask,
+                             s16 *data);
+
+struct platform_device;
+/**
+ * cros_ec_sensors_core_init() - basic initialization of the core structure
+ * @pdev:               platform device created for the sensors
+ * @indio_dev:          iio device structure of the device
+ * @physical_device:    true if the device refers to a physical device
+ *
+ * Return: 0 on success, -errno on failure.
+ */
+int cros_ec_sensors_core_init(struct platform_device *pdev,
+                              struct iio_dev *indio_dev, bool physical_device);
+
+/**
+ * cros_ec_sensors_capture() - the trigger handler function
+ * @irq:        the interrupt number.
+ * @p:          a pointer to the poll function.
+ *
+ * On a trigger event occurring, if the pollfunc is attached then this
+ * handler is called as a threaded interrupt (and hence may sleep). It
+ * is responsible for grabbing data from the device and pushing it into
+ * the associated buffer.
+ *
+ * Return: IRQ_HANDLED
+ */
+irqreturn_t cros_ec_sensors_capture(int irq, void *p);
+
+/**
+ * cros_ec_motion_send_host_cmd() - send motion sense host command
+ * @st:         pointer to state information for device
+ * @opt_length: optional length to reduce the response size, useful on the data
+ *              path. Otherwise, the maximal allowed response size is used
+ *
+ * When called, the sub-command is assumed to be set in param->cmd.
+ *
+ * Return: 0 on success, -errno on failure.
+ */
+int cros_ec_motion_send_host_cmd(struct cros_ec_sensors_core_state *st,
+                                 u16 opt_length);
+
+/**
+ * cros_ec_sensors_core_read() - function to request a value from the sensor
+ * @st:         pointer to state information for device
+ * @chan:       channel specification structure table
+ * @val:        will contain one element making up the returned value
+ * @val2:       will contain another element making up the returned value
+ * @mask:       specifies which values to be requested
+ *
+ * Return:      the type of value returned by the device
+ */
+int cros_ec_sensors_core_read(struct cros_ec_sensors_core_state *st,
+                              struct iio_chan_spec const *chan,
+                              int *val, int *val2, long mask);
+
+/**
+ * cros_ec_sensors_core_write() - function to write a value to the sensor
+ * @st:         pointer to state information for device
+ * @chan:       channel specification structure table
+ * @val:        first part of value to write
+ * @val2:       second part of value to write
+ * @mask:       specifies which values to write
+ *
+ * Return:      the type of value returned by the device
+ */
+int cros_ec_sensors_core_write(struct cros_ec_sensors_core_state *st,
+                               struct iio_chan_spec const *chan,
+                               int val, int val2, long mask);
+
+extern const struct dev_pm_ops cros_ec_sensors_pm_ops;
+
+/* List of extended channel specification for all sensors */
+extern const struct iio_chan_spec_ext_info cros_ec_sensors_ext_info[];
+
+#endif  /* __CROS_EC_SENSORS_CORE_H */
diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h
index 11579fd4126e..a74cb177dc6f 100644
--- a/include/linux/iio/iio.h
+++ b/include/linux/iio/iio.h
@@ -183,18 +183,18 @@ struct iio_event_spec {
  * @address:            Driver specific identifier.
  * @scan_index:         Monotonic index to give ordering in scans when read
  *                      from a buffer.
- * @scan_type:          sign:           's' or 'u' to specify signed or unsigned
- *                      realbits:       Number of valid bits of data
- *                      storagebits:    Realbits + padding
- *                      shift:          Shift right by this before masking out
- *                                      realbits.
- *                      repeat:         Number of times real/storage bits
- *                                      repeats. When the repeat element is
- *                                      more than 1, then the type element in
- *                                      sysfs will show a repeat value.
- *                                      Otherwise, the number of repetitions is
- *                                      omitted.
- *                      endianness:     little or big endian
+ * @scan_type:          struct describing the scan type
+ * @scan_type.sign:             's' or 'u' to specify signed or unsigned
+ * @scan_type.realbits:         Number of valid bits of data
+ * @scan_type.storagebits:      Realbits + padding
+ * @scan_type.shift:            Shift right by this before masking out
+ *                              realbits.
+ * @scan_type.repeat:           Number of times real/storage bits repeats.
+ *                              When the repeat element is more than 1, then
+ *                              the type element in sysfs will show a repeat
+ *                              value. Otherwise, the number of repetitions
+ *                              is omitted.
+ * @scan_type.endianness:       little or big endian
  * @info_mask_separate: What information is to be exported that is specific to
  *                      this channel.
  * @info_mask_separate_available: What availability information is to be
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 7c4e8f1f72d8..d23123238534 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -966,6 +966,22 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }
                          "pointer type mismatch in container_of()");    \
         ((type *)(__mptr - offsetof(type, member))); })
 
+/**
+ * container_of_safe - cast a member of a structure out to the containing structure
+ * @ptr:        the pointer to the member.
+ * @type:       the type of the container struct this is embedded in.
+ * @member:     the name of the member within the struct.
+ *
+ * If IS_ERR_OR_NULL(ptr), ptr is returned unchanged.
+ */
+#define container_of_safe(ptr, type, member) ({                         \
+        void *__mptr = (void *)(ptr);                                   \
+        BUILD_BUG_ON_MSG(!__same_type(*(ptr), ((type *)0)->member) &&   \
+                         !__same_type(*(ptr), void),                    \
+                         "pointer type mismatch in container_of()");    \
+        IS_ERR_OR_NULL(__mptr) ? ERR_CAST(__mptr) :                     \
+                ((type *)(__mptr - offsetof(type, member))); })
+
 /* Rebuild everything on CONFIG_FTRACE_MCOUNT_RECORD */
 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
 # define REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD
diff --git a/include/linux/platform_data/tsl2772.h b/include/linux/platform_data/tsl2772.h
new file mode 100644
index 000000000000..f8ade15a35e2
--- /dev/null
+++ b/include/linux/platform_data/tsl2772.h
@@ -0,0 +1,101 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Device driver for monitoring ambient light intensity (lux)
+ * and proximity (prox) within the TAOS TSL2772 family of devices.
+ *
+ * Copyright (c) 2012, TAOS Corporation.
+ * Copyright (c) 2017-2018 Brian Masney <masneyb@onstation.org>
+ */
+
+#ifndef __TSL2772_H
+#define __TSL2772_H
+
+struct tsl2772_lux {
+        unsigned int ch0;
+        unsigned int ch1;
+};
+
+/* Max number of segments allowable in LUX table */
+#define TSL2772_MAX_LUX_TABLE_SIZE              6
+/* The default LUX tables all have 3 elements.  */
+#define TSL2772_DEF_LUX_TABLE_SZ                3
+#define TSL2772_DEFAULT_TABLE_BYTES (sizeof(struct tsl2772_lux) * \
+                                     TSL2772_DEF_LUX_TABLE_SZ)
+
+/* Proximity diode to use */
+#define TSL2772_DIODE0                  0x01
+#define TSL2772_DIODE1                  0x02
+#define TSL2772_DIODE_BOTH              0x03
+
+/* LED Power */
+#define TSL2772_100_mA                  0x00
+#define TSL2772_50_mA                   0x01
+#define TSL2772_25_mA                   0x02
+#define TSL2772_13_mA                   0x03
+
+/**
+ * struct tsl2772_settings - Settings for the tsl2772 driver
+ *  @als_time:              Integration time of the ALS channel ADCs in 2.73 ms
+ *                          increments. Total integration time is
+ *                          (256 - als_time) * 2.73.
+ *  @als_gain:              Index into the tsl2772_als_gain array.
+ *  @als_gain_trim:         Default gain trim to account for aperture effects.
+ *  @wait_time:             Time between proximity and ALS cycles in 2.73
+ *                          periods.
+ *  @prox_time:             Integration time of the proximity ADC in 2.73 ms
+ *                          increments. Total integration time is
+ *                          (256 - prx_time) * 2.73.
+ *  @prox_gain:             Index into the tsl2772_prx_gain array.
+ *  @als_prox_config:       The value of the ALS / Proximity configuration
+ *                          register.
+ *  @als_cal_target:        Known external ALS reading for calibration.
+ *  @als_persistence:       H/W Filters, Number of 'out of limits' ALS readings.
+ *  @als_interrupt_en:      Enable/Disable ALS interrupts
+ *  @als_thresh_low:        CH0 'low' count to trigger interrupt.
+ *  @als_thresh_high:       CH0 'high' count to trigger interrupt.
+ *  @prox_persistence:      H/W Filters, Number of 'out of limits' proximity
+ *                          readings.
+ *  @prox_interrupt_en:     Enable/Disable proximity interrupts.
+ *  @prox_thres_low:        Low threshold proximity detection.
+ *  @prox_thres_high:       High threshold proximity detection.
+ *  @prox_pulse_count:      Number if proximity emitter pulses.
+ *  @prox_max_samples_cal:  The number of samples that are taken when performing
+ *                          a proximity calibration.
+ *  @prox_diode             Which diode(s) to use for driving the external
+ *                          LED(s) for proximity sensing.
+ *  @prox_power             The amount of power to use for the external LED(s).
+ */
+struct tsl2772_settings {
+        int als_time;
+        int als_gain;
+        int als_gain_trim;
+        int wait_time;
+        int prox_time;
+        int prox_gain;
+        int als_prox_config;
+        int als_cal_target;
+        u8 als_persistence;
+        bool als_interrupt_en;
+        int als_thresh_low;
+        int als_thresh_high;
+        u8 prox_persistence;
+        bool prox_interrupt_en;
+        int prox_thres_low;
+        int prox_thres_high;
+        int prox_pulse_count;
+        int prox_max_samples_cal;
+        int prox_diode;
+        int prox_power;
+};
+
+/**
+ * struct tsl2772_platform_data - Platform callback, glass and defaults
+ * @platform_lux_table:        Device specific glass coefficents
+ * @platform_default_settings: Device specific power on defaults
+ */
+struct tsl2772_platform_data {
+        struct tsl2772_lux platform_lux_table[TSL2772_MAX_LUX_TABLE_SIZE];
+        struct tsl2772_settings *platform_default_settings;
+};
+
+#endif /* __TSL2772_H */
diff --git a/include/uapi/linux/ncp.h b/include/uapi/linux/ncp.h
deleted file mode 100644
index ca6f3d42c88f..000000000000
--- a/include/uapi/linux/ncp.h
+++ /dev/null
@@ -1,202 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-/*
- *  ncp.h
- *
- *  Copyright (C) 1995 by Volker Lendecke
- *  Modified for sparc by J.F. Chadima
- *  Modified for __constant_ntoh by Frank A. Vorstenbosch
- *
- */
-
-#ifndef _LINUX_NCP_H
-#define _LINUX_NCP_H
-
-#include <linux/types.h>
-
-#define NCP_PTYPE                (0x11)
-#define NCP_PORT                 (0x0451)
-
-#define NCP_ALLOC_SLOT_REQUEST   (0x1111)
-#define NCP_REQUEST              (0x2222)
-#define NCP_DEALLOC_SLOT_REQUEST (0x5555)
-
-struct ncp_request_header {
-        __u16 type;
-        __u8 sequence;
-        __u8 conn_low;
-        __u8 task;
-        __u8 conn_high;
-        __u8 function;
-        __u8 data[0];
-} __attribute__((packed));
-
-#define NCP_REPLY                (0x3333)
-#define NCP_WATCHDOG             (0x3E3E)
-#define NCP_POSITIVE_ACK         (0x9999)
-
-struct ncp_reply_header {
-        __u16 type;
-        __u8 sequence;
-        __u8 conn_low;
-        __u8 task;
-        __u8 conn_high;
-        __u8 completion_code;
-        __u8 connection_state;
-        __u8 data[0];
-} __attribute__((packed));
-
-#define NCP_VOLNAME_LEN (16)
-#define NCP_NUMBER_OF_VOLUMES (256)
-struct ncp_volume_info {
-        __u32 total_blocks;
-        __u32 free_blocks;
-        __u32 purgeable_blocks;
-        __u32 not_yet_purgeable_blocks;
-        __u32 total_dir_entries;
-        __u32 available_dir_entries;
-        __u8 sectors_per_block;
-        char volume_name[NCP_VOLNAME_LEN + 1];
-};
-
-#define AR_READ      (cpu_to_le16(1))
-#define AR_WRITE     (cpu_to_le16(2))
-#define AR_EXCLUSIVE (cpu_to_le16(0x20))
-
-#define NCP_FILE_ID_LEN 6
-
-/* Defines for Name Spaces */
-#define NW_NS_DOS     0
-#define NW_NS_MAC     1
-#define NW_NS_NFS     2
-#define NW_NS_FTAM    3
-#define NW_NS_OS2     4
-
-/*  Defines for ReturnInformationMask */
-#define RIM_NAME              (cpu_to_le32(1))
-#define RIM_SPACE_ALLOCATED   (cpu_to_le32(2))
-#define RIM_ATTRIBUTES        (cpu_to_le32(4))
-#define RIM_DATA_SIZE         (cpu_to_le32(8))
-#define RIM_TOTAL_SIZE        (cpu_to_le32(0x10))
-#define RIM_EXT_ATTR_INFO     (cpu_to_le32(0x20))
-#define RIM_ARCHIVE           (cpu_to_le32(0x40))
-#define RIM_MODIFY            (cpu_to_le32(0x80))
-#define RIM_CREATION          (cpu_to_le32(0x100))
-#define RIM_OWNING_NAMESPACE  (cpu_to_le32(0x200))
-#define RIM_DIRECTORY         (cpu_to_le32(0x400))
-#define RIM_RIGHTS            (cpu_to_le32(0x800))
-#define RIM_ALL               (cpu_to_le32(0xFFF))
-#define RIM_COMPRESSED_INFO   (cpu_to_le32(0x80000000))
-
-/* Defines for NSInfoBitMask */
-#define NSIBM_NFS_NAME          0x0001
-#define NSIBM_NFS_MODE          0x0002
-#define NSIBM_NFS_GID           0x0004
-#define NSIBM_NFS_NLINKS        0x0008
-#define NSIBM_NFS_RDEV          0x0010
-#define NSIBM_NFS_LINK          0x0020
-#define NSIBM_NFS_CREATED       0x0040
-#define NSIBM_NFS_UID           0x0080
-#define NSIBM_NFS_ACSFLAG       0x0100
-#define NSIBM_NFS_MYFLAG        0x0200
-
-/* open/create modes */
-#define OC_MODE_OPEN      0x01
-#define OC_MODE_TRUNCATE  0x02
-#define OC_MODE_REPLACE   0x02
-#define OC_MODE_CREATE    0x08
-
-/* open/create results */
-#define OC_ACTION_NONE     0x00
-#define OC_ACTION_OPEN     0x01
-#define OC_ACTION_CREATE   0x02
-#define OC_ACTION_TRUNCATE 0x04
-#define OC_ACTION_REPLACE  0x04
-
-/* access rights attributes */
-#ifndef AR_READ_ONLY
-#define AR_READ_ONLY       0x0001
-#define AR_WRITE_ONLY      0x0002
-#define AR_DENY_READ       0x0004
-#define AR_DENY_WRITE      0x0008
-#define AR_COMPATIBILITY   0x0010
-#define AR_WRITE_THROUGH   0x0040
-#define AR_OPEN_COMPRESSED 0x0100
-#endif
-
-struct nw_nfs_info {
-        __u32 mode;
-        __u32 rdev;
-};
-
-struct nw_info_struct {
-        __u32 spaceAlloc;
-        __le32 attributes;
-        __u16 flags;
-        __le32 dataStreamSize;
-        __le32 totalStreamSize;
-        __u16 numberOfStreams;
-        __le16 creationTime;
-        __le16 creationDate;
-        __u32 creatorID;
-        __le16 modifyTime;
-        __le16 modifyDate;
-        __u32 modifierID;
-        __le16 lastAccessDate;
-        __u16 archiveTime;
-        __u16 archiveDate;
-        __u32 archiverID;
-        __u16 inheritedRightsMask;
-        __le32 dirEntNum;
-        __le32 DosDirNum;
-        __u32 volNumber;
-        __u32 EADataSize;
-        __u32 EAKeyCount;
-        __u32 EAKeySize;
-        __u32 NSCreator;
-        __u8 nameLen;
-        __u8 entryName[256];
-        /* libncp may depend on there being nothing after entryName */
-#ifdef __KERNEL__
-        struct nw_nfs_info nfs;
-#endif
-} __attribute__((packed));
-
-/* modify mask - use with MODIFY_DOS_INFO structure */
-#define DM_ATTRIBUTES             (cpu_to_le32(0x02))
-#define DM_CREATE_DATE            (cpu_to_le32(0x04))
-#define DM_CREATE_TIME            (cpu_to_le32(0x08))
-#define DM_CREATOR_ID             (cpu_to_le32(0x10))
-#define DM_ARCHIVE_DATE           (cpu_to_le32(0x20))
-#define DM_ARCHIVE_TIME           (cpu_to_le32(0x40))
-#define DM_ARCHIVER_ID            (cpu_to_le32(0x80))
-#define DM_MODIFY_DATE            (cpu_to_le32(0x0100))
-#define DM_MODIFY_TIME            (cpu_to_le32(0x0200))
-#define DM_MODIFIER_ID            (cpu_to_le32(0x0400))
-#define DM_LAST_ACCESS_DATE       (cpu_to_le32(0x0800))
-#define DM_INHERITED_RIGHTS_MASK  (cpu_to_le32(0x1000))
-#define DM_MAXIMUM_SPACE          (cpu_to_le32(0x2000))
-
-struct nw_modify_dos_info {
-        __le32 attributes;
-        __le16 creationDate;
-        __le16 creationTime;
-        __u32 creatorID;
-        __le16 modifyDate;
-        __le16 modifyTime;
-        __u32 modifierID;
-        __u16 archiveDate;
-        __u16 archiveTime;
-        __u32 archiverID;
-        __le16 lastAccessDate;
-        __u16 inheritanceGrantMask;
-        __u16 inheritanceRevokeMask;
-        __u32 maximumSpace;
-} __attribute__((packed));
-
-struct nw_search_sequence {
-        __u8 volNumber;
-        __u32 dirBase;
-        __u32 sequence;
-} __attribute__((packed));
-
-#endif                          /* _LINUX_NCP_H */
diff --git a/include/uapi/linux/ncp_fs.h b/include/uapi/linux/ncp_fs.h
deleted file mode 100644
index e76a44229d2f..000000000000
--- a/include/uapi/linux/ncp_fs.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-/*
- *  ncp_fs.h
- *
- *  Copyright (C) 1995, 1996 by Volker Lendecke
- *
- */
-
-#ifndef _LINUX_NCP_FS_H
-#define _LINUX_NCP_FS_H
-
-#include <linux/fs.h>
-#include <linux/in.h>
-#include <linux/types.h>
-#include <linux/magic.h>
-
-#include <linux/ipx.h>
-#include <linux/ncp_no.h>
-
-/*
- * ioctl commands
- */
-
-struct ncp_ioctl_request {
-        unsigned int function;
-        unsigned int size;
-        char __user *data;
-};
-
-struct ncp_fs_info {
-        int version;
-        struct sockaddr_ipx addr;
-        __kernel_uid_t mounted_uid;
-        int connection;         /* Connection number the server assigned us */
-        int buffer_size;        /* The negotiated buffer size, to be
-                                   used for read/write requests! */
-
-        int volume_number;
-        __le32 directory_id;
-};
-
-struct ncp_fs_info_v2 {
-        int version;
-        unsigned long mounted_uid;
-        unsigned int connection;
-        unsigned int buffer_size;
-
-        unsigned int volume_number;
-        __le32 directory_id;
-
-        __u32 dummy1;
-        __u32 dummy2;
-        __u32 dummy3;
-};
-
-struct ncp_sign_init
-{
-        char sign_root[8];
-        char sign_last[16];
-};
-
-struct ncp_lock_ioctl
-{
-#define NCP_LOCK_LOG    0
-#define NCP_LOCK_SH     1
-#define NCP_LOCK_EX     2
-#define NCP_LOCK_CLEAR  256
-        int             cmd;
-        int             origin;
-        unsigned int    offset;
-        unsigned int    length;
-#define NCP_LOCK_DEFAULT_TIMEOUT        18
-#define NCP_LOCK_MAX_TIMEOUT            180
-        int             timeout;
-};
-
-struct ncp_setroot_ioctl
-{
-        int             volNumber;
-        int             namespace;
-        __le32          dirEntNum;
-};
-
-struct ncp_objectname_ioctl
-{
-#define NCP_AUTH_NONE   0x00
-#define NCP_AUTH_BIND   0x31
-#define NCP_AUTH_NDS    0x32
-        int             auth_type;
-        size_t          object_name_len;
-        void __user *   object_name;    /* a userspace data, in most cases user name */
-};
-
-struct ncp_privatedata_ioctl
-{
-        size_t          len;
-        void __user *   data;           /* ~1000 for NDS */
-};
-
-/* NLS charsets by ioctl */
-#define NCP_IOCSNAME_LEN 20
-struct ncp_nls_ioctl
-{
-        unsigned char codepage[NCP_IOCSNAME_LEN+1];
-        unsigned char iocharset[NCP_IOCSNAME_LEN+1];
-};
-
-#define NCP_IOC_NCPREQUEST              _IOR('n', 1, struct ncp_ioctl_request)
-#define NCP_IOC_GETMOUNTUID             _IOW('n', 2, __kernel_old_uid_t)
-#define NCP_IOC_GETMOUNTUID2            _IOW('n', 2, unsigned long)
-
-#define NCP_IOC_CONN_LOGGED_IN          _IO('n', 3)
-
-#define NCP_GET_FS_INFO_VERSION    (1)
-#define NCP_IOC_GET_FS_INFO             _IOWR('n', 4, struct ncp_fs_info)
-#define NCP_GET_FS_INFO_VERSION_V2 (2)
-#define NCP_IOC_GET_FS_INFO_V2          _IOWR('n', 4, struct ncp_fs_info_v2)
-
-#define NCP_IOC_SIGN_INIT               _IOR('n', 5, struct ncp_sign_init)
-#define NCP_IOC_SIGN_WANTED             _IOR('n', 6, int)
-#define NCP_IOC_SET_SIGN_WANTED         _IOW('n', 6, int)
-
-#define NCP_IOC_LOCKUNLOCK              _IOR('n', 7, struct ncp_lock_ioctl)
-
-#define NCP_IOC_GETROOT                 _IOW('n', 8, struct ncp_setroot_ioctl)
-#define NCP_IOC_SETROOT                 _IOR('n', 8, struct ncp_setroot_ioctl)
-
-#define NCP_IOC_GETOBJECTNAME           _IOWR('n', 9, struct ncp_objectname_ioctl)
-#define NCP_IOC_SETOBJECTNAME           _IOR('n', 9, struct ncp_objectname_ioctl)
-#define NCP_IOC_GETPRIVATEDATA          _IOWR('n', 10, struct ncp_privatedata_ioctl)
-#define NCP_IOC_SETPRIVATEDATA          _IOR('n', 10, struct ncp_privatedata_ioctl)
-
-#define NCP_IOC_GETCHARSETS             _IOWR('n', 11, struct ncp_nls_ioctl)
-#define NCP_IOC_SETCHARSETS             _IOR('n', 11, struct ncp_nls_ioctl)
-
-#define NCP_IOC_GETDENTRYTTL            _IOW('n', 12, __u32)
-#define NCP_IOC_SETDENTRYTTL            _IOR('n', 12, __u32)
-
-/*
- * The packet size to allocate. One page should be enough.
- */
-#define NCP_PACKET_SIZE 4070
-
-#define NCP_MAXPATHLEN 255
-#define NCP_MAXNAMELEN 14
-
-#endif                          /* _LINUX_NCP_FS_H */
diff --git a/include/uapi/linux/ncp_mount.h b/include/uapi/linux/ncp_mount.h
deleted file mode 100644
index 9bdbcd68c329..000000000000
--- a/include/uapi/linux/ncp_mount.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-/*
- *  ncp_mount.h
- *
- *  Copyright (C) 1995, 1996 by Volker Lendecke
- *
- */
-
-#ifndef _LINUX_NCP_MOUNT_H
-#define _LINUX_NCP_MOUNT_H
-
-#include <linux/types.h>
-#include <linux/ncp.h>
-
-#define NCP_MOUNT_VERSION 3     /* Binary */
-
-/* Values for flags */
-#define NCP_MOUNT_SOFT          0x0001
-#define NCP_MOUNT_INTR          0x0002
-#define NCP_MOUNT_STRONG        0x0004  /* enable delete/rename of r/o files */
-#define NCP_MOUNT_NO_OS2        0x0008  /* do not use OS/2 (LONG) namespace */
-#define NCP_MOUNT_NO_NFS        0x0010  /* do not use NFS namespace */
-#define NCP_MOUNT_EXTRAS        0x0020
-#define NCP_MOUNT_SYMLINKS      0x0040  /* enable symlinks */
-#define NCP_MOUNT_NFS_EXTRAS    0x0080  /* Enable use of NFS NS meta-info */
-
-struct ncp_mount_data {
-        int version;
-        unsigned int ncp_fd;    /* The socket to the ncp port */
-        __kernel_uid_t mounted_uid;     /* Who may umount() this filesystem? */
-        __kernel_pid_t wdog_pid;                /* Who cares for our watchdog packets? */
-
-        unsigned char mounted_vol[NCP_VOLNAME_LEN + 1];
-        unsigned int time_out;  /* How long should I wait after
-                                   sending a NCP request? */
-        unsigned int retry_count;       /* And how often should I retry? */
-        unsigned int flags;
-
-        __kernel_uid_t uid;
-        __kernel_gid_t gid;
-        __kernel_mode_t file_mode;
-        __kernel_mode_t dir_mode;
-};
-
-#define NCP_MOUNT_VERSION_V4    (4)     /* Binary or text */
-
-struct ncp_mount_data_v4 {
-        int version;
-        unsigned long flags;    /* NCP_MOUNT_* flags */
-        /* MIPS uses long __kernel_uid_t, but... */
-        /* we neever pass -1, so it is safe */
-        unsigned long mounted_uid;      /* Who may umount() this filesystem? */
-        /* MIPS uses long __kernel_pid_t */
-        long wdog_pid;          /* Who cares for our watchdog packets? */
-
-        unsigned int ncp_fd;    /* The socket to the ncp port */
-        unsigned int time_out;  /* How long should I wait after
-                                   sending a NCP request? */
-        unsigned int retry_count;       /* And how often should I retry? */
-
-        /* MIPS uses long __kernel_uid_t... */
-        /* we never pass -1, so it is safe */
-        unsigned long uid;
-        unsigned long gid;
-        /* MIPS uses unsigned long __kernel_mode_t */
-        unsigned long file_mode;
-        unsigned long dir_mode;
-};
-
-#define NCP_MOUNT_VERSION_V5    (5)     /* Text only */
-
-#endif
diff --git a/include/uapi/linux/ncp_no.h b/include/uapi/linux/ncp_no.h
deleted file mode 100644
index 654d7c7f5d92..000000000000
--- a/include/uapi/linux/ncp_no.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-#ifndef _NCP_NO
-#define _NCP_NO
-
-/* these define the attribute byte as seen by NCP */
-#define aRONLY                  (__cpu_to_le32(1))
-#define aHIDDEN                 (__cpu_to_le32(2))
-#define aSYSTEM                 (__cpu_to_le32(4))
-#define aEXECUTE                (__cpu_to_le32(8))
-#define aDIR                    (__cpu_to_le32(0x10))
-#define aARCH                   (__cpu_to_le32(0x20))
-#define aSHARED                 (__cpu_to_le32(0x80))
-#define aDONTSUBALLOCATE        (__cpu_to_le32(1L<<11))
-#define aTRANSACTIONAL          (__cpu_to_le32(1L<<12))
-#define aPURGE                  (__cpu_to_le32(1L<<16))
-#define aRENAMEINHIBIT          (__cpu_to_le32(1L<<17))
-#define aDELETEINHIBIT          (__cpu_to_le32(1L<<18))
-#define aDONTCOMPRESS           (__cpu_to_le32(1L<<27))
-
-#endif /* _NCP_NO */