Merge branch 'master' of... (f2abba49) · Commits · e / devices / android_kernel_oneplus_sm8150

Documentation/feature-removal-schedule.txt

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -263,8 +263,7 @@ Who: Ravikiran Thirumalai <kiran@scalex86.org>

	What: Code that is now under CONFIG_WIRELESS_EXT_SYSFS		What: Code that is now under CONFIG_WIRELESS_EXT_SYSFS
	(in net/core/net-sysfs.c)		(in net/core/net-sysfs.c)
	When: After the only user (hal) has seen a release with the patches		When: 3.5
	for enough time, probably some time in 2010.
	Why: Over 1K .text/.data size reduction, data is available in other		Why: Over 1K .text/.data size reduction, data is available in other
	ways (ioctls)		ways (ioctls)
	Who: Johannes Berg <johannes@sipsolutions.net>		Who: Johannes Berg <johannes@sipsolutions.net>

drivers/bcma/host_pci.c

+21 −11

Original line number	Original line	Diff line number	Diff line
	@@ -21,48 +21,58 @@ static void bcma_host_pci_switch_core(struct bcma_device *core)
	pr_debug("Switched to core: 0x%X\n", core->id.id);		pr_debug("Switched to core: 0x%X\n", core->id.id);
	}		}

	static u8 bcma_host_pci_read8(struct bcma_device *core, u16 offset)		/* Provides access to the requested core. Returns base offset that has to be
			* used. It makes use of fixed windows when possible. */
			static u16 bcma_host_pci_provide_access_to_core(struct bcma_device *core)
	{		{
			switch (core->id.id) {
			case BCMA_CORE_CHIPCOMMON:
			return 3 * BCMA_CORE_SIZE;
			case BCMA_CORE_PCIE:
			return 2 * BCMA_CORE_SIZE;
			}

	if (core->bus->mapped_core != core)		if (core->bus->mapped_core != core)
	bcma_host_pci_switch_core(core);		bcma_host_pci_switch_core(core);
			return 0;
			}

			static u8 bcma_host_pci_read8(struct bcma_device *core, u16 offset)
			{
			offset += bcma_host_pci_provide_access_to_core(core);
	return ioread8(core->bus->mmio + offset);		return ioread8(core->bus->mmio + offset);
	}		}

	static u16 bcma_host_pci_read16(struct bcma_device *core, u16 offset)		static u16 bcma_host_pci_read16(struct bcma_device *core, u16 offset)
	{		{
	if (core->bus->mapped_core != core)		offset += bcma_host_pci_provide_access_to_core(core);
	bcma_host_pci_switch_core(core);
	return ioread16(core->bus->mmio + offset);		return ioread16(core->bus->mmio + offset);
	}		}

	static u32 bcma_host_pci_read32(struct bcma_device *core, u16 offset)		static u32 bcma_host_pci_read32(struct bcma_device *core, u16 offset)
	{		{
	if (core->bus->mapped_core != core)		offset += bcma_host_pci_provide_access_to_core(core);
	bcma_host_pci_switch_core(core);
	return ioread32(core->bus->mmio + offset);		return ioread32(core->bus->mmio + offset);
	}		}

	static void bcma_host_pci_write8(struct bcma_device *core, u16 offset,		static void bcma_host_pci_write8(struct bcma_device *core, u16 offset,
	u8 value)		u8 value)
	{		{
	if (core->bus->mapped_core != core)		offset += bcma_host_pci_provide_access_to_core(core);
	bcma_host_pci_switch_core(core);
	iowrite8(value, core->bus->mmio + offset);		iowrite8(value, core->bus->mmio + offset);
	}		}

	static void bcma_host_pci_write16(struct bcma_device *core, u16 offset,		static void bcma_host_pci_write16(struct bcma_device *core, u16 offset,
	u16 value)		u16 value)
	{		{
	if (core->bus->mapped_core != core)		offset += bcma_host_pci_provide_access_to_core(core);
	bcma_host_pci_switch_core(core);
	iowrite16(value, core->bus->mmio + offset);		iowrite16(value, core->bus->mmio + offset);
	}		}

	static void bcma_host_pci_write32(struct bcma_device *core, u16 offset,		static void bcma_host_pci_write32(struct bcma_device *core, u16 offset,
	u32 value)		u32 value)
	{		{
	if (core->bus->mapped_core != core)		offset += bcma_host_pci_provide_access_to_core(core);
	bcma_host_pci_switch_core(core);
	iowrite32(value, core->bus->mmio + offset);		iowrite32(value, core->bus->mmio + offset);
	}		}

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
	@@ -785,9 +785,8 @@ static int btusb_send_frame(struct sk_buff *skb)
	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;
	}		}