Merge branch 'master' of... (42d887a6) · Commits · 戴 / test

drivers/bluetooth/Kconfig

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -201,7 +201,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/8797.		Marvell Bluetooth devices, such as 8688/8787/8797/8897.

	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.
	@@ -214,7 +214,7 @@ 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/SD8797		devices with SDIO interface. Currently SD8688/SD8787/SD8797/SD8897
	chipsets are 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

drivers/bluetooth/btmrvl_sdio.c

+28 −0

Original line number	Original line	Diff line number	Diff line
	@@ -82,6 +82,23 @@ static const struct btmrvl_sdio_card_reg btmrvl_reg_87xx = {
	.io_port_2 = 0x7a,		.io_port_2 = 0x7a,
	};		};

			static const struct btmrvl_sdio_card_reg btmrvl_reg_88xx = {
			.cfg = 0x00,
			.host_int_mask = 0x02,
			.host_intstatus = 0x03,
			.card_status = 0x50,
			.sq_read_base_addr_a0 = 0x60,
			.sq_read_base_addr_a1 = 0x61,
			.card_revision = 0xbc,
			.card_fw_status0 = 0xc0,
			.card_fw_status1 = 0xc1,
			.card_rx_len = 0xc2,
			.card_rx_unit = 0xc3,
			.io_port_0 = 0xd8,
			.io_port_1 = 0xd9,
			.io_port_2 = 0xda,
			};

	static const struct btmrvl_sdio_device btmrvl_sdio_sd8688 = {		static const struct btmrvl_sdio_device btmrvl_sdio_sd8688 = {
	.helper = "mrvl/sd8688_helper.bin",		.helper = "mrvl/sd8688_helper.bin",
	.firmware = "mrvl/sd8688.bin",		.firmware = "mrvl/sd8688.bin",
	@@ -103,6 +120,13 @@ static const struct btmrvl_sdio_device btmrvl_sdio_sd8797 = {
	.sd_blksz_fw_dl = 256,		.sd_blksz_fw_dl = 256,
	};		};

			static const struct btmrvl_sdio_device btmrvl_sdio_sd8897 = {
			.helper = NULL,
			.firmware = "mrvl/sd8897_uapsta.bin",
			.reg = &btmrvl_reg_88xx,
			.sd_blksz_fw_dl = 256,
			};

	static const struct sdio_device_id btmrvl_sdio_ids[] = {		static const struct sdio_device_id btmrvl_sdio_ids[] = {
	/* Marvell SD8688 Bluetooth device */		/* Marvell SD8688 Bluetooth device */
	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x9105),		{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x9105),
	@@ -116,6 +140,9 @@ static const struct sdio_device_id btmrvl_sdio_ids[] = {
	/* Marvell SD8797 Bluetooth device */		/* Marvell SD8797 Bluetooth device */
	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x912A),		{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x912A),
	.driver_data = (unsigned long) &btmrvl_sdio_sd8797 },		.driver_data = (unsigned long) &btmrvl_sdio_sd8797 },
			/* Marvell SD8897 Bluetooth device */
			{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x912E),
			.driver_data = (unsigned long) &btmrvl_sdio_sd8897 },

	{ } /* Terminating entry */		{ } /* Terminating entry */
	};		};
	@@ -1194,3 +1221,4 @@ MODULE_FIRMWARE("mrvl/sd8688_helper.bin");
	MODULE_FIRMWARE("mrvl/sd8688.bin");		MODULE_FIRMWARE("mrvl/sd8688.bin");
	MODULE_FIRMWARE("mrvl/sd8787_uapsta.bin");		MODULE_FIRMWARE("mrvl/sd8787_uapsta.bin");
	MODULE_FIRMWARE("mrvl/sd8797_uapsta.bin");		MODULE_FIRMWARE("mrvl/sd8797_uapsta.bin");
			MODULE_FIRMWARE("mrvl/sd8897_uapsta.bin");

drivers/net/wireless/ath/ath9k/Kconfig

+7 −3

Original line number	Original line	Diff line number	Diff line
	@@ -92,13 +92,17 @@ config ATH9K_MAC_DEBUG
	This option enables collection of statistics for Rx/Tx status		This option enables collection of statistics for Rx/Tx status
	data and some other MAC related statistics		data and some other MAC related statistics

	config ATH9K_RATE_CONTROL		config ATH9K_LEGACY_RATE_CONTROL
	bool "Atheros ath9k rate control"		bool "Atheros ath9k rate control"
	depends on ATH9K		depends on ATH9K
	default y		default n
	---help---		---help---
	Say Y, if you want to use the ath9k specific rate control		Say Y, if you want to use the ath9k specific rate control
	module instead of minstrel_ht.		module instead of minstrel_ht. Be warned that there are various
			issues with the ath9k RC and minstrel is a more robust algorithm.
			Note that even if this option is selected, "ath9k_rate_control"
			has to be passed to mac80211 using the module parameter,
			ieee80211_default_rc_algo.

	config ATH9K_HTC		config ATH9K_HTC
	tristate "Atheros HTC based wireless cards support"		tristate "Atheros HTC based wireless cards support"

drivers/net/wireless/ath/ath9k/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -8,7 +8,7 @@ ath9k-y += beacon.o \
	antenna.o		antenna.o

	ath9k-$(CONFIG_ATH9K_BTCOEX_SUPPORT) += mci.o		ath9k-$(CONFIG_ATH9K_BTCOEX_SUPPORT) += mci.o
	ath9k-$(CONFIG_ATH9K_RATE_CONTROL) += rc.o		ath9k-$(CONFIG_ATH9K_LEGACY_RATE_CONTROL) += rc.o
	ath9k-$(CONFIG_ATH9K_PCI) += pci.o		ath9k-$(CONFIG_ATH9K_PCI) += pci.o
	ath9k-$(CONFIG_ATH9K_AHB) += ahb.o		ath9k-$(CONFIG_ATH9K_AHB) += ahb.o
	ath9k-$(CONFIG_ATH9K_DEBUGFS) += debug.o		ath9k-$(CONFIG_ATH9K_DEBUGFS) += debug.o

drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -958,11 +958,11 @@ static const u32 ar9300Common_rx_gain_table_2p2[][2] = {
	{0x0000a074, 0x00000000},		{0x0000a074, 0x00000000},
	{0x0000a078, 0x00000000},		{0x0000a078, 0x00000000},
	{0x0000a07c, 0x00000000},		{0x0000a07c, 0x00000000},
	{0x0000a080, 0x1a1a1a1a},		{0x0000a080, 0x22222229},
	{0x0000a084, 0x1a1a1a1a},		{0x0000a084, 0x1d1d1d1d},
	{0x0000a088, 0x1a1a1a1a},		{0x0000a088, 0x1d1d1d1d},
	{0x0000a08c, 0x1a1a1a1a},		{0x0000a08c, 0x1d1d1d1d},
	{0x0000a090, 0x171a1a1a},		{0x0000a090, 0x171d1d1d},
	{0x0000a094, 0x11111717},		{0x0000a094, 0x11111717},
	{0x0000a098, 0x00030311},		{0x0000a098, 0x00030311},
	{0x0000a09c, 0x00000000},		{0x0000a09c, 0x00000000},

Admin message