USB: Merge 2.6.37-rc5 into usb-next (2af10844) · Commits · e / devices / android_kernel_fairphone_FP5

Documentation/kernel-parameters.txt

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -2175,11 +2175,6 @@ and is between 256 and 4096 characters. It is defined in the file
	reset_devices [KNL] Force drivers to reset the underlying device		reset_devices [KNL] Force drivers to reset the underlying device
	during initialization.		during initialization.

	resource_alloc_from_bottom
	Allocate new resources from the beginning of available
	space, not the end. If you need to use this, please
	report a bug.

	resume= [SWSUSP]		resume= [SWSUSP]
	Specify the partition device for software suspend		Specify the partition device for software suspend

Documentation/power/runtime_pm.txt

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -379,8 +379,8 @@ drivers/base/power/runtime.c and include/linux/pm_runtime.h:
	zero)		zero)

	bool pm_runtime_suspended(struct device *dev);		bool pm_runtime_suspended(struct device *dev);
	- return true if the device's runtime PM status is 'suspended', or false		- return true if the device's runtime PM status is 'suspended' and its
	otherwise		'power.disable_depth' field is equal to zero, or false otherwise

	void pm_runtime_allow(struct device *dev);		void pm_runtime_allow(struct device *dev);
	- set the power.runtime_auto flag for the device and decrease its usage		- set the power.runtime_auto flag for the device and decrease its usage

Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	VERSION = 2		VERSION = 2
	PATCHLEVEL = 6		PATCHLEVEL = 6
	SUBLEVEL = 37		SUBLEVEL = 37
	EXTRAVERSION = -rc6		EXTRAVERSION = -rc7
	NAME = Flesh-Eating Bats with Fangs		NAME = Flesh-Eating Bats with Fangs

	# DOCUMENTATION		# DOCUMENTATION

arch/arm/mach-at91/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -65,7 +65,7 @@ obj-$(CONFIG_MACH_AT91SAM9G20EK) += board-sam9g20ek.o
	obj-$(CONFIG_MACH_CPU9G20) += board-cpu9krea.o		obj-$(CONFIG_MACH_CPU9G20) += board-cpu9krea.o
	obj-$(CONFIG_MACH_STAMP9G20) += board-stamp9g20.o		obj-$(CONFIG_MACH_STAMP9G20) += board-stamp9g20.o
	obj-$(CONFIG_MACH_PORTUXG20) += board-stamp9g20.o		obj-$(CONFIG_MACH_PORTUXG20) += board-stamp9g20.o
	obj-$(CONFIG_MACH_PCONTROL_G20) += board-pcontrol-g20.o		obj-$(CONFIG_MACH_PCONTROL_G20) += board-pcontrol-g20.o board-stamp9g20.o

	# AT91SAM9260/AT91SAM9G20 board-specific support		# AT91SAM9260/AT91SAM9G20 board-specific support
	obj-$(CONFIG_MACH_SNAPPER_9260) += board-snapper9260.o		obj-$(CONFIG_MACH_SNAPPER_9260) += board-snapper9260.o

arch/arm/mach-at91/board-pcontrol-g20.c

+3 −95

Original line number	Original line	Diff line number	Diff line
	@@ -31,6 +31,7 @@

	#include <mach/board.h>		#include <mach/board.h>
	#include <mach/at91sam9_smc.h>		#include <mach/at91sam9_smc.h>
			#include <mach/stamp9g20.h>

	#include "sam9_smc.h"		#include "sam9_smc.h"
	#include "generic.h"		#include "generic.h"
	@@ -38,11 +39,7 @@

	static void __init pcontrol_g20_map_io(void)		static void __init pcontrol_g20_map_io(void)
	{		{
	/* Initialize processor: 18.432 MHz crystal */		stamp9g20_map_io();
	at91sam9260_initialize(18432000);

	/* DGBU on ttyS0. (Rx, Tx) only TTL -> JTAG connector X7 17,19 ) */
	at91_register_uart(0, 0, 0);

	/* USART0 on ttyS1. (Rx, Tx, CTS, RTS) piggyback A2 */		/* USART0 on ttyS1. (Rx, Tx, CTS, RTS) piggyback A2 */
	at91_register_uart(AT91SAM9260_ID_US0, 1, ATMEL_UART_CTS		at91_register_uart(AT91SAM9260_ID_US0, 1, ATMEL_UART_CTS
	@@ -54,9 +51,6 @@ static void __init pcontrol_g20_map_io(void)

	/* USART2 on ttyS3. (Rx, Tx) 9bit-Bus Multidrop-mode X4 */		/* USART2 on ttyS3. (Rx, Tx) 9bit-Bus Multidrop-mode X4 */
	at91_register_uart(AT91SAM9260_ID_US4, 3, 0);		at91_register_uart(AT91SAM9260_ID_US4, 3, 0);

	/* set serial console to ttyS0 (ie, DBGU) */
	at91_set_serial_console(0);
	}		}


	@@ -66,38 +60,6 @@ static void __init init_irq(void)
	}		}


	/*
	* NAND flash 512MiB 1,8V 8-bit, sector size 128 KiB
	*/
	static struct atmel_nand_data __initdata nand_data = {
	.ale = 21,
	.cle = 22,
	.rdy_pin = AT91_PIN_PC13,
	.enable_pin = AT91_PIN_PC14,
	};

	/*
	* Bus timings; unit = 7.57ns
	*/
	static struct sam9_smc_config __initdata nand_smc_config = {
	.ncs_read_setup = 0,
	.nrd_setup = 2,
	.ncs_write_setup = 0,
	.nwe_setup = 2,

	.ncs_read_pulse = 4,
	.nrd_pulse = 4,
	.ncs_write_pulse = 4,
	.nwe_pulse = 4,

	.read_cycle = 7,
	.write_cycle = 7,

	.mode = AT91_SMC_READMODE \| AT91_SMC_WRITEMODE
	\| AT91_SMC_EXNWMODE_DISABLE \| AT91_SMC_DBW_8,
	.tdf_cycles = 3,
	};

	static struct sam9_smc_config __initdata pcontrol_smc_config[2] = { {		static struct sam9_smc_config __initdata pcontrol_smc_config[2] = { {
	.ncs_read_setup = 16,		.ncs_read_setup = 16,
	.nrd_setup = 18,		.nrd_setup = 18,
	@@ -138,14 +100,6 @@ static struct sam9_smc_config __initdata pcontrol_smc_config[2] = { {
	.tdf_cycles = 1,		.tdf_cycles = 1,
	} };		} };

	static void __init add_device_nand(void)
	{
	/* configure chip-select 3 (NAND) */
	sam9_smc_configure(3, &nand_smc_config);
	at91_add_device_nand(&nand_data);
	}


	static void __init add_device_pcontrol(void)		static void __init add_device_pcontrol(void)
	{		{
	/* configure chip-select 4 (IO compatible to 8051 X4 ) */		/* configure chip-select 4 (IO compatible to 8051 X4 ) */
	@@ -155,23 +109,6 @@ static void __init add_device_pcontrol(void)
	}		}


	/*
	* MCI (SD/MMC)
	* det_pin, wp_pin and vcc_pin are not connected
	*/
	#if defined(CONFIG_MMC_ATMELMCI) \|\| defined(CONFIG_MMC_ATMELMCI_MODULE)
	static struct mci_platform_data __initdata mmc_data = {
	.slot[0] = {
	.bus_width = 4,
	},
	};
	#else
	static struct at91_mmc_data __initdata mmc_data = {
	.wire4 = 1,
	};
	#endif


	/*		/*
	* USB Host port		* USB Host port
	*/		*/
	@@ -265,42 +202,13 @@ static struct spi_board_info pcontrol_g20_spi_devices[] = {
	};		};


	/*
	* Dallas 1-Wire DS2431
	*/
	static struct w1_gpio_platform_data w1_gpio_pdata = {
	.pin = AT91_PIN_PA29,
	.is_open_drain = 1,
	};

	static struct platform_device w1_device = {
	.name = "w1-gpio",
	.id = -1,
	.dev.platform_data = &w1_gpio_pdata,
	};

	static void add_wire1(void)
	{
	at91_set_GPIO_periph(w1_gpio_pdata.pin, 1);
	at91_set_multi_drive(w1_gpio_pdata.pin, 1);
	platform_device_register(&w1_device);
	}


	static void __init pcontrol_g20_board_init(void)		static void __init pcontrol_g20_board_init(void)
	{		{
	at91_add_device_serial();		stamp9g20_board_init();
	add_device_nand();
	#if defined(CONFIG_MMC_ATMELMCI) \|\| defined(CONFIG_MMC_ATMELMCI_MODULE)
	at91_add_device_mci(0, &mmc_data);
	#else
	at91_add_device_mmc(0, &mmc_data);
	#endif
	at91_add_device_usbh(&usbh_data);		at91_add_device_usbh(&usbh_data);
	at91_add_device_eth(&macb_data);		at91_add_device_eth(&macb_data);
	at91_add_device_i2c(pcontrol_g20_i2c_devices,		at91_add_device_i2c(pcontrol_g20_i2c_devices,
	ARRAY_SIZE(pcontrol_g20_i2c_devices));		ARRAY_SIZE(pcontrol_g20_i2c_devices));
	add_wire1();
	add_device_pcontrol();		add_device_pcontrol();
	at91_add_device_spi(pcontrol_g20_spi_devices,		at91_add_device_spi(pcontrol_g20_spi_devices,
	ARRAY_SIZE(pcontrol_g20_spi_devices));		ARRAY_SIZE(pcontrol_g20_spi_devices));