Merge branch 'master' of... (e7ab5f1c) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/bluetooth/Kconfig

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -188,7 +188,7 @@ config BT_MRVL
	The core driver to support Marvell Bluetooth devices.		The core driver to support Marvell Bluetooth devices.

	This driver is required if you want to support		This driver is required if you want to support
	Marvell Bluetooth devices, such as 8688/8787.		Marvell Bluetooth devices, such as 8688/8787/8797.

	Say Y here to compile Marvell Bluetooth driver		Say Y here to compile Marvell Bluetooth driver
	into the kernel or say M to compile it as module.		into the kernel or say M to compile it as module.
	@@ -201,8 +201,8 @@ config BT_MRVL_SDIO
	The driver for Marvell Bluetooth chipsets with SDIO interface.		The driver for Marvell Bluetooth chipsets with SDIO interface.

	This driver is required if you want to use Marvell Bluetooth		This driver is required if you want to use Marvell Bluetooth
	devices with SDIO interface. Currently SD8688/SD8787 chipsets are		devices with SDIO interface. Currently SD8688/SD8787/SD8797
	supported.		chipsets are supported.

	Say Y here to compile support for Marvell BT-over-SDIO driver		Say Y here to compile support for Marvell BT-over-SDIO driver
	into the kernel or say M to compile it as module.		into the kernel or say M to compile it as module.

drivers/bluetooth/btmrvl_sdio.c

+13 −2

Original line number	Original line	Diff line number	Diff line
	@@ -65,7 +65,7 @@ static const struct btmrvl_sdio_card_reg btmrvl_reg_8688 = {
	.io_port_1 = 0x01,		.io_port_1 = 0x01,
	.io_port_2 = 0x02,		.io_port_2 = 0x02,
	};		};
	static const struct btmrvl_sdio_card_reg btmrvl_reg_8787 = {		static const struct btmrvl_sdio_card_reg btmrvl_reg_87xx = {
	.cfg = 0x00,		.cfg = 0x00,
	.host_int_mask = 0x02,		.host_int_mask = 0x02,
	.host_intstatus = 0x03,		.host_intstatus = 0x03,
	@@ -92,7 +92,14 @@ static const struct btmrvl_sdio_device btmrvl_sdio_sd8688 = {
	static const struct btmrvl_sdio_device btmrvl_sdio_sd8787 = {		static const struct btmrvl_sdio_device btmrvl_sdio_sd8787 = {
	.helper = NULL,		.helper = NULL,
	.firmware = "mrvl/sd8787_uapsta.bin",		.firmware = "mrvl/sd8787_uapsta.bin",
	.reg = &btmrvl_reg_8787,		.reg = &btmrvl_reg_87xx,
			.sd_blksz_fw_dl = 256,
			};

			static const struct btmrvl_sdio_device btmrvl_sdio_sd8797 = {
			.helper = NULL,
			.firmware = "mrvl/sd8797_uapsta.bin",
			.reg = &btmrvl_reg_87xx,
	.sd_blksz_fw_dl = 256,		.sd_blksz_fw_dl = 256,
	};		};

	@@ -103,6 +110,9 @@ static const struct sdio_device_id btmrvl_sdio_ids[] = {
	/* Marvell SD8787 Bluetooth device */		/* Marvell SD8787 Bluetooth device */
	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x911A),		{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x911A),
	.driver_data = (unsigned long) &btmrvl_sdio_sd8787 },		.driver_data = (unsigned long) &btmrvl_sdio_sd8787 },
			/* Marvell SD8797 Bluetooth device */
			{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x912A),
			.driver_data = (unsigned long) &btmrvl_sdio_sd8797 },

	{ } /* Terminating entry */		{ } /* Terminating entry */
	};		};
	@@ -1076,3 +1086,4 @@ MODULE_LICENSE("GPL v2");
	MODULE_FIRMWARE("sd8688_helper.bin");		MODULE_FIRMWARE("sd8688_helper.bin");
	MODULE_FIRMWARE("sd8688.bin");		MODULE_FIRMWARE("sd8688.bin");
	MODULE_FIRMWARE("mrvl/sd8787_uapsta.bin");		MODULE_FIRMWARE("mrvl/sd8787_uapsta.bin");
			MODULE_FIRMWARE("mrvl/sd8797_uapsta.bin");

drivers/bluetooth/btusb.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -777,9 +777,8 @@ skip_waking:
	usb_mark_last_busy(data->udev);		usb_mark_last_busy(data->udev);
	}		}

	usb_free_urb(urb);

	done:		done:
			usb_free_urb(urb);
	return err;		return err;
	}		}

drivers/net/wireless/ath/ath9k/main.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -286,7 +286,7 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start)
	ath_start_ani(common);		ath_start_ani(common);
	}		}

	if (ath9k_hw_ops(ah)->antdiv_comb_conf_get && sc->ant_rx != 3) {		if ((ah->caps.hw_caps & ATH9K_HW_CAP_ANT_DIV_COMB) && sc->ant_rx != 3) {
	struct ath_hw_antcomb_conf div_ant_conf;		struct ath_hw_antcomb_conf div_ant_conf;
	u8 lna_conf;		u8 lna_conf;

drivers/net/wireless/rtlwifi/rtl8192ce/phy.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -569,7 +569,7 @@ static bool _rtl92ce_phy_set_rf_power_state(struct ieee80211_hw *hw,
	}		}
	case ERFSLEEP:{		case ERFSLEEP:{
	if (ppsc->rfpwr_state == ERFOFF)		if (ppsc->rfpwr_state == ERFOFF)
	break;		return false;
	for (queue_id = 0, i = 0;		for (queue_id = 0, i = 0;
	queue_id < RTL_PCI_MAX_TX_QUEUE_COUNT;) {		queue_id < RTL_PCI_MAX_TX_QUEUE_COUNT;) {
	ring = &pcipriv->dev.tx_ring[queue_id];		ring = &pcipriv->dev.tx_ring[queue_id];