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

greybus: interface: Rename *_NO_PM as *_NO_BUNDLE_ACTIVATE 



Its a special quirk just for the bootrom as it doesn't have any PM
operations implemented. As the greybus bootrom bundle driver doesn't try
to do any PM stuff, this quirk is used only to skip bundle activate
operation currently.

Rename the GB_INTERFACE_QUIRK_NO_PM quirk to
GB_INTERFACE_QUIRK_NO_BUNDLE_ACTIVATE to suit its purpose better as the
GB_INTERFACE_QUIRK_NO_PM will be used for other quirk now.

Reviewed-by: default avatarJohan Hovold <johan@hovoldconsulting.com>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent c57fbb40

drivers/staging/greybus/control.c

+1 −1
Original line number Diff line number Diff line
@@ -534,7 +534,7 @@ int gb_control_enable(struct gb_control *control) 
		control->has_bundle_version = true;



	/* FIXME: use protocol version instead */

	if (!(control->intf->quirks & GB_INTERFACE_QUIRK_NO_PM))

	if (!(control->intf->quirks & GB_INTERFACE_QUIRK_NO_BUNDLE_ACTIVATE))

		control->has_bundle_activate = true;



	return 0;

drivers/staging/greybus/interface.c

+1 −1
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ static int gb_interface_read_and_clear_init_status(struct gb_interface *intf) 
	bootrom_quirks = GB_INTERFACE_QUIRK_NO_CPORT_FEATURES |

				GB_INTERFACE_QUIRK_FORCED_DISABLE |

				GB_INTERFACE_QUIRK_LEGACY_MODE_SWITCH |

				GB_INTERFACE_QUIRK_NO_PM;

				GB_INTERFACE_QUIRK_NO_BUNDLE_ACTIVATE;

	switch (init_status) {

	case GB_INIT_BOOTROM_UNIPRO_BOOT_STARTED:

	case GB_INIT_BOOTROM_FALLBACK_UNIPRO_BOOT_STARTED:

drivers/staging/greybus/interface.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ enum gb_interface_type { 
#define GB_INTERFACE_QUIRK_NO_ARA_IDS			BIT(2)

#define GB_INTERFACE_QUIRK_FORCED_DISABLE		BIT(3)

#define GB_INTERFACE_QUIRK_LEGACY_MODE_SWITCH		BIT(4)

#define GB_INTERFACE_QUIRK_NO_PM			BIT(5)

#define GB_INTERFACE_QUIRK_NO_BUNDLE_ACTIVATE		BIT(5)



struct gb_interface {

	struct device dev;