Merge branch 'master' (79bfb0a9) · Commits · e / devices / android_kernel_oneplus_sm7250

Documentation/devices.txt

+6 −6

Original line number	Diff line number	Diff line
		@@ -2903,14 +2903,14 @@ Your cooperation is appreciated.
		196 = /dev/dvb/adapter3/video0 first video decoder of fourth card


		216 char USB BlueTooth devices
		0 = /dev/ttyUB0 First USB BlueTooth device
		1 = /dev/ttyUB1 Second USB BlueTooth device
		216 char Bluetooth RFCOMM TTY devices
		0 = /dev/rfcomm0 First Bluetooth RFCOMM TTY device
		1 = /dev/rfcomm1 Second Bluetooth RFCOMM TTY device
		...

		217 char USB BlueTooth devices (alternate devices)
		0 = /dev/cuub0 Callout device for ttyUB0
		1 = /dev/cuub1 Callout device for ttyUB1
		217 char Bluetooth RFCOMM TTY devices (alternate devices)
		0 = /dev/curf0 Callout device for rfcomm0
		1 = /dev/curf1 Callout device for rfcomm1
		...

		218 char The Logical Company bus Unibus/Qbus adapters

+10 −0

Original line number	Diff line number	Diff line
		@@ -149,3 +149,13 @@ Files: drivers/md/md.c
		Why: Not reliable by design - can fail when most needed.
		Alternatives exist
		Who: NeilBrown <neilb@suse.de>

		---------------------------

		What: au1x00_uart driver
		When: January 2006
		Why: The 8250 serial driver now has the ability to deal with the differences
		between the standard 8250 family of UARTs and their slightly strange
		brother on Alchemy SOCs. The loss of features is not considered an
		issue.
		Who: Ralf Baechle <ralf@linux-mips.org>

deleted100644 → 0

+0 −44

Original line number	Diff line number	Diff line
		INTRODUCTION

		The USB Bluetooth driver supports any USB Bluetooth device.
		It currently works well with the Linux USB Bluetooth stack from Axis
		(available at http://developer.axis.com/software/bluetooth/ ) and
		has been rumored to work with other Linux USB Bluetooth stacks.


		CONFIGURATION

		Currently the driver can handle up to 256 different USB Bluetooth
		devices at once.

		If you are not using devfs:
		The major number that the driver uses is 216 so to use the driver,
		create the following nodes:
		mknod /dev/ttyUB0 c 216 0
		mknod /dev/ttyUB1 c 216 1
		mknod /dev/ttyUB2 c 216 2
		mknod /dev/ttyUB3 c 216 3
		.
		.
		.
		mknod /dev/ttyUB254 c 216 254
		mknod /dev/ttyUB255 c 216 255

		If you are using devfs:
		The devices supported by this driver will show up as
		/dev/usb/ttub/{0,1,...}

		When the device is connected and recognized by the driver, the driver
		will print to the system log, which node the device has been bound to.


		CONTACT:

		If anyone has any problems using this driver, please contact me, or
		join the Linux-USB mailing list (information on joining the mailing
		list, as well as a link to its searchable archive is at
		http://www.linux-usb.org/ )


		Greg Kroah-Hartman
		greg@kroah.com

+11 −19

Original line number	Diff line number	Diff line
		@@ -19,8 +19,6 @@
		*/
		#ifdef DEBUG

		#include <asm/arch/debug-macro.S>

		#if defined(CONFIG_DEBUG_ICEDCC)
		.macro loadsp, rb
		.endm
		@@ -28,25 +26,17 @@
		mcr p14, 0, \ch, c0, c1, 0
		.endm
		#else

		#include <asm/arch/debug-macro.S>

		.macro writeb, ch, rb
		senduart \ch, \rb
		.endm

		#if defined(CONFIG_FOOTBRIDGE) \|\| \
		defined(CONFIG_ARCH_RPC) \|\| \
		defined(CONFIG_ARCH_INTEGRATOR) \|\| \
		defined(CONFIG_ARCH_PXA) \|\| \
		defined(CONFIG_ARCH_IXP4XX) \|\| \
		defined(CONFIG_ARCH_IXP2000) \|\| \
		defined(CONFIG_ARCH_LH7A40X) \|\| \
		defined(CONFIG_ARCH_OMAP)
		.macro loadsp, rb
		addruart \rb
		.endm
		#elif defined(CONFIG_ARCH_SA1100)
		#if defined(CONFIG_ARCH_SA1100)
		.macro loadsp, rb
		mov \rb, #0x80000000 @ physical base address
		# if defined(CONFIG_DEBUG_LL_SER3)
		#ifdef CONFIG_DEBUG_LL_SER3
		add \rb, \rb, #0x00050000 @ Ser3
		#else
		add \rb, \rb, #0x00010000 @ Ser1
		@@ -64,7 +54,9 @@
		add \rb, \rb, #0x4000 * CONFIG_S3C2410_LOWLEVEL_UART_PORT
		.endm
		#else
		#error no serial architecture defined
		.macro loadsp, rb
		addruart \rb
		.endm
		#endif
		#endif
		#endif

+12 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@
		#include <asm/io.h>
		#include <asm/irq.h>
		#include <asm/mach/irq.h>
		#include <asm/sizes.h>

		#include <asm/hardware/sa1111.h>

		@@ -132,6 +133,17 @@ static struct sa1111_dev_info sa1111_devices[] = {
		},
		};

		void __init sa1111_adjust_zones(int node, unsigned long size, unsigned long holes)
		{
		unsigned int sz = SZ_1M >> PAGE_SHIFT;

		if (node != 0)
		sz = 0;

		size[1] = size[0] - sz;
		size[0] = sz;
		}

		/*
		* SA1111 interrupt support. Since clearing an IRQ while there are
		* active IRQs causes the interrupt output to pulse, the upper levels