Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 357499df authored by Mark Greer's avatar Mark Greer Committed by Greg Kroah-Hartman
Browse files

greybus: i2s: Remove deprecated I2S Bridged-PHY Protocol 



The Greybus I2S Bridged-PHY Protocol is deprecated so remove
all support for it from the Greybus code.

CC: Vaibhav Agarwal <vaibhav.agarwal@linaro.org>
Signed-off-by: default avatarMark Greer <mgreer@animalcreek.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent ddc88eff

drivers/staging/greybus/greybus_manifest.h

+6 −6
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ enum greybus_protocol { 
	GREYBUS_PROTOCOL_SDIO		= 0x07,

	GREYBUS_PROTOCOL_BATTERY	= 0x08,

	GREYBUS_PROTOCOL_PWM		= 0x09,

	GREYBUS_PROTOCOL_I2S_MGMT	= 0x0a,

	/* 0x0a is unused */

	GREYBUS_PROTOCOL_SPI		= 0x0b,

	GREYBUS_PROTOCOL_DISPLAY	= 0x0c,

	GREYBUS_PROTOCOL_CAMERA		= 0x0d,
@@ -40,8 +40,8 @@ enum greybus_protocol { 
	GREYBUS_PROTOCOL_LIGHTS		= 0x0f,

	GREYBUS_PROTOCOL_VIBRATOR	= 0x10,

	GREYBUS_PROTOCOL_LOOPBACK	= 0x11,

	GREYBUS_PROTOCOL_I2S_RECEIVER	= 0x12,

	GREYBUS_PROTOCOL_I2S_TRANSMITTER = 0x13,

	/* 0x12 is unused */

	/* 0x13 is unused */

	GREYBUS_PROTOCOL_SVC            = 0x14,

	GREYBUS_PROTOCOL_FIRMWARE	= 0x15,

		/* ... */
@@ -60,7 +60,7 @@ enum greybus_class_type { 
	GREYBUS_CLASS_SDIO		= 0x07,

	GREYBUS_CLASS_BATTERY		= 0x08,

	GREYBUS_CLASS_PWM		= 0x09,

	GREYBUS_CLASS_I2S		= 0x0a,

	/* 0x0a is unused */

	GREYBUS_CLASS_SPI		= 0x0b,

	GREYBUS_CLASS_DISPLAY		= 0x0c,

	GREYBUS_CLASS_CAMERA		= 0x0d,
@@ -68,8 +68,8 @@ enum greybus_class_type { 
	GREYBUS_CLASS_LIGHTS		= 0x0f,

	GREYBUS_CLASS_VIBRATOR		= 0x10,

	GREYBUS_CLASS_LOOPBACK		= 0x11,

	GREYBUS_CLASS_I2S_RECEIVER	= 0x12,

	GREYBUS_CLASS_I2S_TRANSMITTER	= 0x13,

	/* 0x12 is unused */

	/* 0x13 is unused */

	GREYBUS_CLASS_SVC		= 0x14,

	GREYBUS_CLASS_FIRMWARE		= 0x15,

		/* ... */

drivers/staging/greybus/greybus_protocols.h

+0 −138
Original line number Diff line number Diff line
@@ -511,144 +511,6 @@ struct gb_pwm_disable_request { 
	__u8	which;

} __packed;



/* I2S */



#define GB_I2S_MGMT_TYPE_GET_SUPPORTED_CONFIGURATIONS	0x02

#define GB_I2S_MGMT_TYPE_SET_CONFIGURATION		0x03

#define GB_I2S_MGMT_TYPE_SET_SAMPLES_PER_MESSAGE	0x04

#define GB_I2S_MGMT_TYPE_GET_PROCESSING_DELAY		0x05

#define GB_I2S_MGMT_TYPE_SET_START_DELAY		0x06

#define GB_I2S_MGMT_TYPE_ACTIVATE_CPORT			0x07

#define GB_I2S_MGMT_TYPE_DEACTIVATE_CPORT		0x08

#define GB_I2S_MGMT_TYPE_REPORT_EVENT			0x09



#define GB_I2S_MGMT_BYTE_ORDER_NA			BIT(0)

#define GB_I2S_MGMT_BYTE_ORDER_BE			BIT(1)

#define GB_I2S_MGMT_BYTE_ORDER_LE			BIT(2)



#define GB_I2S_MGMT_SPATIAL_LOCATION_FL			BIT(0)

#define GB_I2S_MGMT_SPATIAL_LOCATION_FR			BIT(1)

#define GB_I2S_MGMT_SPATIAL_LOCATION_FC			BIT(2)

#define GB_I2S_MGMT_SPATIAL_LOCATION_LFE		BIT(3)

#define GB_I2S_MGMT_SPATIAL_LOCATION_BL			BIT(4)

#define GB_I2S_MGMT_SPATIAL_LOCATION_BR			BIT(5)

#define GB_I2S_MGMT_SPATIAL_LOCATION_FLC		BIT(6)

#define GB_I2S_MGMT_SPATIAL_LOCATION_FRC		BIT(7)

#define GB_I2S_MGMT_SPATIAL_LOCATION_C			BIT(8) /* BC in USB */

#define GB_I2S_MGMT_SPATIAL_LOCATION_SL			BIT(9)

#define GB_I2S_MGMT_SPATIAL_LOCATION_SR			BIT(10)

#define GB_I2S_MGMT_SPATIAL_LOCATION_TC			BIT(11)

#define GB_I2S_MGMT_SPATIAL_LOCATION_TFL		BIT(12)

#define GB_I2S_MGMT_SPATIAL_LOCATION_TFC		BIT(13)

#define GB_I2S_MGMT_SPATIAL_LOCATION_TFR		BIT(14)

#define GB_I2S_MGMT_SPATIAL_LOCATION_TBL		BIT(15)

#define GB_I2S_MGMT_SPATIAL_LOCATION_TBC		BIT(16)

#define GB_I2S_MGMT_SPATIAL_LOCATION_TBR		BIT(17)

#define GB_I2S_MGMT_SPATIAL_LOCATION_TFLC		BIT(18)

#define GB_I2S_MGMT_SPATIAL_LOCATION_TFRC		BIT(19)

#define GB_I2S_MGMT_SPATIAL_LOCATION_LLFE		BIT(20)

#define GB_I2S_MGMT_SPATIAL_LOCATION_RLFE		BIT(21)

#define GB_I2S_MGMT_SPATIAL_LOCATION_TSL		BIT(22)

#define GB_I2S_MGMT_SPATIAL_LOCATION_TSR		BIT(23)

#define GB_I2S_MGMT_SPATIAL_LOCATION_BC			BIT(24)

#define GB_I2S_MGMT_SPATIAL_LOCATION_BLC		BIT(25)

#define GB_I2S_MGMT_SPATIAL_LOCATION_BRC		BIT(26)

#define GB_I2S_MGMT_SPATIAL_LOCATION_RD			BIT(31)



#define GB_I2S_MGMT_PROTOCOL_PCM			BIT(0)

#define GB_I2S_MGMT_PROTOCOL_I2S			BIT(1)

#define GB_I2S_MGMT_PROTOCOL_LR_STEREO			BIT(2)



#define GB_I2S_MGMT_ROLE_MASTER				BIT(0)

#define GB_I2S_MGMT_ROLE_SLAVE				BIT(1)



#define GB_I2S_MGMT_POLARITY_NORMAL			BIT(0)

#define GB_I2S_MGMT_POLARITY_REVERSED			BIT(1)



#define GB_I2S_MGMT_EDGE_RISING				BIT(0)

#define GB_I2S_MGMT_EDGE_FALLING			BIT(1)



#define GB_I2S_MGMT_EVENT_UNSPECIFIED			0x1

#define GB_I2S_MGMT_EVENT_HALT				0x2

#define GB_I2S_MGMT_EVENT_INTERNAL_ERROR		0x3

#define GB_I2S_MGMT_EVENT_PROTOCOL_ERROR		0x4

#define GB_I2S_MGMT_EVENT_FAILURE			0x5

#define GB_I2S_MGMT_EVENT_OUT_OF_SEQUENCE		0x6

#define GB_I2S_MGMT_EVENT_UNDERRUN			0x7

#define GB_I2S_MGMT_EVENT_OVERRUN			0x8

#define GB_I2S_MGMT_EVENT_CLOCKING			0x9

#define GB_I2S_MGMT_EVENT_DATA_LEN			0xa



struct gb_i2s_mgmt_configuration {

	__le32	sample_frequency;

	__u8	num_channels;

	__u8	bytes_per_channel;

	__u8	byte_order;

	__u8	pad;

	__le32	spatial_locations;

	__le32	ll_protocol;

	__u8	ll_mclk_role;

	__u8	ll_bclk_role;

	__u8	ll_wclk_role;

	__u8	ll_wclk_polarity;

	__u8	ll_wclk_change_edge;

	__u8	ll_wclk_tx_edge;

	__u8	ll_wclk_rx_edge;

	__u8	ll_data_offset;

} __packed;



/* get supported configurations request has no payload */

struct gb_i2s_mgmt_get_supported_configurations_response {

	__u8					config_count;

	__u8					pad[3];

	struct gb_i2s_mgmt_configuration	config[0];

} __packed;



struct gb_i2s_mgmt_set_configuration_request {

	struct gb_i2s_mgmt_configuration	config;

} __packed;

/* set configuration response has no payload */



struct gb_i2s_mgmt_set_samples_per_message_request {

	__le16	samples_per_message;

} __packed;

/* set samples per message response has no payload */



/* get processing request delay has no payload */

struct gb_i2s_mgmt_get_processing_delay_response {

	__le32	microseconds;

} __packed;



struct gb_i2s_mgmt_set_start_delay_request {

	__le32	microseconds;

} __packed;

/* set start delay response has no payload */



struct gb_i2s_mgmt_activate_cport_request {

	__le16	cport;

} __packed;

/* activate cport response has no payload */



struct gb_i2s_mgmt_deactivate_cport_request {

	__le16	cport;

} __packed;

/* deactivate cport response has no payload */



struct gb_i2s_mgmt_report_event_request {

	__u8	event;

} __packed;

/* report event response has no payload */



#define GB_I2S_DATA_TYPE_SEND_DATA			0x02



struct gb_i2s_send_data_request {

	__le32	sample_number;

	__le32	size;

	__u8	data[0];

} __packed;

/* send data has no response at all */





/* SPI */



/* Version of the Greybus spi protocol we support */