Commit dc075408 authored by Viresh Kumar's avatar Viresh Kumar Committed by Greg Kroah-Hartman
Browse files

greybus: Remove bridge PHY protocol specific classes 



These protocols are managed under the bridged PHY class and doesn't need
protocol specific classes anymore.

Remove their entries from gb_gpbridge_id_table array and remove the now
unused macro's and mark their values as unused.

Tested on EVT 1.5 with generic-test module.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Acked-by: default avatarSandeep Patil <sspatil@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent b9662266

drivers/staging/greybus/gpbridge.c

+0 −7
Original line number Diff line number Diff line
@@ -283,13 +283,6 @@ static int gb_gpbridge_probe(struct gb_bundle *bundle, 


static const struct greybus_bundle_id gb_gpbridge_id_table[] = {

	{ GREYBUS_DEVICE_CLASS(GREYBUS_CLASS_BRIDGED_PHY) },

	{ GREYBUS_DEVICE_CLASS(GREYBUS_CLASS_GPIO) },

	{ GREYBUS_DEVICE_CLASS(GREYBUS_CLASS_I2C) },

	{ GREYBUS_DEVICE_CLASS(GREYBUS_CLASS_PWM) },

	{ GREYBUS_DEVICE_CLASS(GREYBUS_CLASS_SDIO) },

	{ GREYBUS_DEVICE_CLASS(GREYBUS_CLASS_SPI) },

	{ GREYBUS_DEVICE_CLASS(GREYBUS_CLASS_UART) },

	{ GREYBUS_DEVICE_CLASS(GREYBUS_CLASS_USB) },

	{ },

};

MODULE_DEVICE_TABLE(greybus, gb_gpbridge_id_table);

drivers/staging/greybus/greybus_manifest.h

+7 −7
Original line number Diff line number Diff line
@@ -55,16 +55,16 @@ enum greybus_protocol { 
enum greybus_class_type {

	GREYBUS_CLASS_CONTROL		= 0x00,

	/* 0x01 is unused */

	GREYBUS_CLASS_GPIO		= 0x02,

	GREYBUS_CLASS_I2C		= 0x03,

	GREYBUS_CLASS_UART		= 0x04,

	/* 0x02 is unused */

	/* 0x03 is unused */

	/* 0x04 is unused */

	GREYBUS_CLASS_HID		= 0x05,

	GREYBUS_CLASS_USB		= 0x06,

	GREYBUS_CLASS_SDIO		= 0x07,

	/* 0x06 is unused */

	/* 0x07 is unused */

	GREYBUS_CLASS_POWER_SUPPLY	= 0x08,

	GREYBUS_CLASS_PWM		= 0x09,

	/* 0x09 is unused */

	GREYBUS_CLASS_BRIDGED_PHY	= 0x0a,

	GREYBUS_CLASS_SPI		= 0x0b,

	/* 0x0b is unused */

	GREYBUS_CLASS_DISPLAY		= 0x0c,

	GREYBUS_CLASS_CAMERA		= 0x0d,

	GREYBUS_CLASS_SENSOR		= 0x0e,