Commit ec0ad868 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

staging: greybus: move core include files to include/linux/greybus/

With the goal of moving the core of the greybus code out of staging, the
include files need to be moved to include/linux/greybus.h and
include/linux/greybus/

Cc: Vaibhav Hiremath <hvaibhav.linux@gmail.com>
Cc: Johan Hovold <johan@kernel.org>
Cc: Vaibhav Agarwal <vaibhav.sr@gmail.com>
Cc: Rui Miguel Silva <rmfrfs@gmail.com>
Cc: David Lin <dtwlin@gmail.com>
Cc: "Bryan O'Donoghue" <pure.logic@nexus-software.ie>
Cc: greybus-dev@lists.linaro.org
Cc: devel@driverdev.osuosl.org
Acked-by: default avatarMark Greer <mgreer@animalcreek.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Acked-by: default avatarAlex Elder <elder@kernel.org>
Link: https://lore.kernel.org/r/20190825055429.18547-8-gregkh@linuxfoundation.orgSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9c319739
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/suspend.h> #include <linux/suspend.h>
#include <linux/time.h> #include <linux/time.h>
#include <linux/greybus.h>
#include "arche_platform.h" #include "arche_platform.h"
#include "greybus.h"
#if IS_ENABLED(CONFIG_USB_HSIC_USB3613) #if IS_ENABLED(CONFIG_USB_HSIC_USB3613)
#include <linux/usb/usb3613.h> #include <linux/usb/usb3613.h>
......
...@@ -5,8 +5,7 @@ ...@@ -5,8 +5,7 @@
* Copyright 2015-2016 Google Inc. * Copyright 2015-2016 Google Inc.
*/ */
#include "greybus.h" #include <linux/greybus.h>
#include "greybus_protocols.h"
#include "audio_apbridgea.h" #include "audio_apbridgea.h"
#include "audio_codec.h" #include "audio_codec.h"
......
...@@ -8,12 +8,10 @@ ...@@ -8,12 +8,10 @@
#ifndef __LINUX_GBAUDIO_CODEC_H #ifndef __LINUX_GBAUDIO_CODEC_H
#define __LINUX_GBAUDIO_CODEC_H #define __LINUX_GBAUDIO_CODEC_H
#include <linux/greybus.h>
#include <sound/soc.h> #include <sound/soc.h>
#include <sound/jack.h> #include <sound/jack.h>
#include "greybus.h"
#include "greybus_protocols.h"
#define NAME_SIZE 32 #define NAME_SIZE 32
#define MAX_DAIS 2 /* APB1, APB2 */ #define MAX_DAIS 2 /* APB1, APB2 */
......
...@@ -5,9 +5,7 @@ ...@@ -5,9 +5,7 @@
* Copyright 2015-2016 Google Inc. * Copyright 2015-2016 Google Inc.
*/ */
#include "greybus.h" #include <linux/greybus.h>
#include "greybus_protocols.h"
#include "operation.h"
#include "audio_codec.h" #include "audio_codec.h"
/* TODO: Split into separate calls */ /* TODO: Split into separate calls */
......
...@@ -6,8 +6,7 @@ ...@@ -6,8 +6,7 @@
* Copyright 2016 Linaro Ltd. * Copyright 2016 Linaro Ltd.
*/ */
#include "greybus.h" #include <linux/greybus.h>
#include <linux/cdev.h> #include <linux/cdev.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/ioctl.h> #include <linux/ioctl.h>
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/greybus.h>
#include "greybus.h"
#include "firmware.h" #include "firmware.h"
/* Timeout, in jiffies, within which the next request must be received */ /* Timeout, in jiffies, within which the next request must be received */
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* Copyright 2014-2015 Linaro Ltd. * Copyright 2014-2015 Linaro Ltd.
*/ */
#include "greybus.h" #include <linux/greybus.h>
#include "greybus_trace.h" #include "greybus_trace.h"
static ssize_t bundle_class_show(struct device *dev, static ssize_t bundle_class_show(struct device *dev,
......
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
#include <linux/string.h> #include <linux/string.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/greybus.h>
#include "gb-camera.h" #include "gb-camera.h"
#include "greybus.h"
#include "greybus_protocols.h" #include "greybus_protocols.h"
enum gb_camera_debugs_buffer_id { enum gb_camera_debugs_buffer_id {
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
*/ */
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/greybus.h>
#include "greybus.h"
#include "greybus_trace.h" #include "greybus_trace.h"
#define GB_CONNECTION_CPORT_QUIESCE_TIMEOUT 1000 #define GB_CONNECTION_CPORT_QUIESCE_TIMEOUT 1000
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include "greybus.h" #include <linux/greybus.h>
/* Highest control-protocol version supported */ /* Highest control-protocol version supported */
#define GB_CONTROL_VERSION_MAJOR 0 #define GB_CONTROL_VERSION_MAJOR 0
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#define CREATE_TRACE_POINTS #define CREATE_TRACE_POINTS
#include "greybus.h" #include <linux/greybus.h>
#include "greybus_trace.h" #include "greybus_trace.h"
#define GB_BUNDLE_AUTOSUSPEND_MS 3000 #define GB_BUNDLE_AUTOSUSPEND_MS 3000
......
...@@ -7,8 +7,7 @@ ...@@ -7,8 +7,7 @@
*/ */
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <linux/greybus.h>
#include "greybus.h"
static struct dentry *gb_debug_root; static struct dentry *gb_debug_root;
......
...@@ -11,12 +11,11 @@ ...@@ -11,12 +11,11 @@
#include <linux/kfifo.h> #include <linux/kfifo.h>
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/greybus.h>
#include <asm/unaligned.h> #include <asm/unaligned.h>
#include "arpc.h" #include "arpc.h"
#include "greybus.h"
#include "greybus_trace.h" #include "greybus_trace.h"
#include "connection.h"
/* Default timeout for USB vendor requests. */ /* Default timeout for USB vendor requests. */
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#ifndef __FIRMWARE_H #ifndef __FIRMWARE_H
#define __FIRMWARE_H #define __FIRMWARE_H
#include "greybus.h" #include <linux/greybus.h>
#define FW_NAME_PREFIX "gmp_" #define FW_NAME_PREFIX "gmp_"
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/firmware.h> #include <linux/firmware.h>
#include <linux/greybus.h>
#include "firmware.h" #include "firmware.h"
#include "greybus.h"
#include "spilib.h" #include "spilib.h"
struct gb_fw_core { struct gb_fw_core {
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/greybus.h>
#include "firmware.h" #include "firmware.h"
#include "greybus.h"
/* Estimated minimum buffer size, actual size can be smaller than this */ /* Estimated minimum buffer size, actual size can be smaller than this */
#define MIN_FETCH_SIZE 512 #define MIN_FETCH_SIZE 512
......
...@@ -13,10 +13,10 @@ ...@@ -13,10 +13,10 @@
#include <linux/idr.h> #include <linux/idr.h>
#include <linux/ioctl.h> #include <linux/ioctl.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/greybus.h>
#include "firmware.h" #include "firmware.h"
#include "greybus_firmware.h" #include "greybus_firmware.h"
#include "greybus.h"
#define FW_MGMT_TIMEOUT_MS 1000 #define FW_MGMT_TIMEOUT_MS 1000
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/greybus.h>
#include "greybus.h"
#include "gbphy.h" #include "gbphy.h"
#define GB_GBPHY_AUTOSUSPEND_MS 3000 #define GB_GBPHY_AUTOSUSPEND_MS 3000
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
#include <linux/irqdomain.h> #include <linux/irqdomain.h>
#include <linux/gpio/driver.h> #include <linux/gpio/driver.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/greybus.h>
#include "greybus.h"
#include "gbphy.h" #include "gbphy.h"
struct gb_gpio_line { struct gb_gpio_line {
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/greybus.h>
#include "greybus.h"
#include "greybus_trace.h" #include "greybus_trace.h"
EXPORT_TRACEPOINT_SYMBOL_GPL(gb_hd_create); EXPORT_TRACEPOINT_SYMBOL_GPL(gb_hd_create);
......
...@@ -12,8 +12,7 @@ ...@@ -12,8 +12,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/greybus.h>
#include "greybus.h"
/* Greybus HID device's structure */ /* Greybus HID device's structure */
struct gb_hid { struct gb_hid {
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/greybus.h>
#include "greybus.h"
#include "gbphy.h" #include "gbphy.h"
struct gb_i2c_device { struct gb_i2c_device {
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
*/ */
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/greybus.h>
#include "greybus.h"
#include "greybus_trace.h" #include "greybus_trace.h"
#define GB_INTERFACE_MODE_SWITCH_TIMEOUT 2000 #define GB_INTERFACE_MODE_SWITCH_TIMEOUT 2000
......
...@@ -11,11 +11,9 @@ ...@@ -11,11 +11,9 @@
#include <linux/led-class-flash.h> #include <linux/led-class-flash.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/greybus.h>
#include <media/v4l2-flash-led-class.h> #include <media/v4l2-flash-led-class.h>
#include "greybus.h"
#include "greybus_protocols.h"
#define NAMES_MAX 32 #define NAMES_MAX 32
struct gb_channel { struct gb_channel {
......
...@@ -9,8 +9,7 @@ ...@@ -9,8 +9,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/sizes.h> #include <linux/sizes.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/greybus.h>
#include "greybus.h"
struct gb_log { struct gb_log {
struct gb_connection *connection; struct gb_connection *connection;
......
...@@ -25,12 +25,9 @@ ...@@ -25,12 +25,9 @@
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/atomic.h> #include <linux/atomic.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/greybus.h>
#include <asm/div64.h> #include <asm/div64.h>
#include "greybus.h"
#include "connection.h"
#define NSEC_PER_DAY 86400000000000ULL #define NSEC_PER_DAY 86400000000000ULL
struct gb_loopback_stats { struct gb_loopback_stats {
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* Copyright 2014-2015 Linaro Ltd. * Copyright 2014-2015 Linaro Ltd.
*/ */
#include "greybus.h" #include <linux/greybus.h>
static const char *get_descriptor_type_string(u8 type) static const char *get_descriptor_type_string(u8 type)
{ {
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* Copyright 2016 Linaro Ltd. * Copyright 2016 Linaro Ltd.
*/ */
#include "greybus.h" #include <linux/greybus.h>
#include "greybus_trace.h" #include "greybus_trace.h"
static ssize_t eject_store(struct device *dev, static ssize_t eject_store(struct device *dev,
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/greybus.h>
#include "greybus.h"
#include "greybus_trace.h" #include "greybus_trace.h"
static struct kmem_cache *gb_operation_cache; static struct kmem_cache *gb_operation_cache;
......
...@@ -10,8 +10,7 @@ ...@@ -10,8 +10,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/power_supply.h> #include <linux/power_supply.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/greybus.h>
#include "greybus.h"
#define PROP_MAX 32 #define PROP_MAX 32
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/pwm.h> #include <linux/pwm.h>
#include <linux/greybus.h>
#include "greybus.h"
#include "gbphy.h" #include "gbphy.h"
struct gb_pwm_chip { struct gb_pwm_chip {
......
...@@ -13,8 +13,7 @@ ...@@ -13,8 +13,7 @@
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/idr.h> #include <linux/idr.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/greybus.h>
#include "greybus.h"
struct gb_raw { struct gb_raw {
struct gb_connection *connection; struct gb_connection *connection;
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
#include <linux/mmc/mmc.h> #include <linux/mmc/mmc.h>
#include <linux/scatterlist.h> #include <linux/scatterlist.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/greybus.h>
#include "greybus.h"
#include "gbphy.h" #include "gbphy.h"
struct gb_sdio_host { struct gb_sdio_host {
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/greybus.h>
#include "greybus.h"
#include "gbphy.h" #include "gbphy.h"
#include "spilib.h" #include "spilib.h"
......
...@@ -10,9 +10,9 @@ ...@@ -10,9 +10,9 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/greybus.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include "greybus.h"
#include "spilib.h" #include "spilib.h"
struct gb_spilib { struct gb_spilib {
......
...@@ -8,8 +8,7 @@ ...@@ -8,8 +8,7 @@
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/greybus.h>
#include "greybus.h"
#define SVC_INTF_EJECT_TIMEOUT 9000 #define SVC_INTF_EJECT_TIMEOUT 9000
#define SVC_INTF_ACTIVATE_TIMEOUT 6000 #define SVC_INTF_ACTIVATE_TIMEOUT 6000
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/suspend.h> #include <linux/suspend.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include "greybus.h" #include <linux/greybus.h>
#define SVC_WATCHDOG_PERIOD (2 * HZ) #define SVC_WATCHDOG_PERIOD (2 * HZ)
......
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
#include <linux/kfifo.h> #include <linux/kfifo.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/completion.h> #include <linux/completion.h>
#include <linux/greybus.h>
#include "greybus.h"
#include "gbphy.h" #include "gbphy.h"
#define GB_NUM_MINORS 16 /* 16 is more than enough */ #define GB_NUM_MINORS 16 /* 16 is more than enough */
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/usb/hcd.h> #include <linux/usb/hcd.h>
#include <linux/greybus.h>
#include "greybus.h"
#include "gbphy.h" #include "gbphy.h"
/* Greybus USB request types */ /* Greybus USB request types */
......
...@@ -13,8 +13,7 @@ ...@@ -13,8 +13,7 @@
#include <linux/kdev_t.h> #include <linux/kdev_t.h>
#include <linux/idr.h> #include <linux/idr.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/greybus.h>
#include "greybus.h"
struct gb_vibrator_device { struct gb_vibrator_device {
struct gb_connection *connection; struct gb_connection *connection;
......
...@@ -20,18 +20,18 @@ ...@@ -20,18 +20,18 @@
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/idr.h> #include <linux/idr.h>
#include "greybus_id.h" #include <linux/greybus/greybus_id.h>
#include "greybus_manifest.h" #include <linux/greybus/greybus_manifest.h>
#include "greybus_protocols.h" #include <linux/greybus/greybus_protocols.h>
#include "manifest.h" #include <linux/greybus/manifest.h>
#include "hd.h" #include <linux/greybus/hd.h>
#include "svc.h" #include <linux/greybus/svc.h>
#include "control.h" #include <linux/greybus/control.h>
#include "module.h" #include <linux/greybus/module.h>
#include "interface.h" #include <linux/greybus/interface.h>
#include "bundle.h" #include <linux/greybus/bundle.h>
#include "connection.h" #include <linux/greybus/connection.h>
#include "operation.h" #include <linux/greybus/operation.h>
/* Matches up with the Greybus Protocol specification document */ /* Matches up with the Greybus Protocol specification document */
#define GREYBUS_VERSION_MAJOR 0x00 #define GREYBUS_VERSION_MAJOR 0x00
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment