Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b69fc2ef authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://codeaurora.org/quic/kernel/davidb/linux-msm 

* 'for-linus' of git://codeaurora.org/quic/kernel/davidb/linux-msm: (35 commits)
  mmc: msm_sdcc: Check for only DATA_END interrupt to end a request
  mmc: msm_sdcc: Fix bug in PIO mode when data size is not word aligned
  mmc: msm_sdcc: Reset SDCC in case of data transfer errors
  mmc: msm_sdcc: Add prog done interrupt support
  mmc: msm_sdcc: Fix possible circular locking dependency warning
  MSM: Add USB support for MSM7x30
  MSM: Add USB suport for QSD8x50
  msm: initial framebuffer support
  msm: add handling for clocks tagged as CLK_MINMAX
  msm: trout: change name of pmdh_clk to mddi_clk
  msm: add CLK_MINMAX to pmdh_clk
  msm: trout: add gpio_to_irq
  msm: iommu: Use the correct memory allocation flag
  msm_serial: Remove redundant unlikely()
  msm: iommu: Miscellaneous code cleanup
  msm: iommu: Support cache-coherent memory access
  msm: iommu: Definitions for extended memory attributes
  msm: iommu: Kconfig dependency for the IOMMU API
  msm: iommu: Check if device is already attached
  msm: iommu: Kconfig item for cacheable page tables
  ...
parents 84b7290c c6d92e9b

arch/arm/mach-msm/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ config ARCH_MSM8X60 
	select CPU_V7

	select MSM_V2_TLMM

	select MSM_GPIOMUX

	select IOMMU_API



endchoice
@@ -122,6 +123,10 @@ config MACH_MSM8X60_FFA 


endmenu



config IOMMU_PGTABLES_L2

	def_bool y

	depends on ARCH_MSM8X60 && MMU && SMP && CPU_DCACHE_DISABLE=n



config MSM_DEBUG_UART

	int

	default 1 if MSM_DEBUG_UART1
@@ -162,4 +167,7 @@ config MSM_GPIOMUX 


config MSM_V2_TLMM

	bool



config IOMMU_API

	bool

endif

arch/arm/mach-msm/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ obj-$(CONFIG_MSM_SMD) += smd.o smd_debug.o 
obj-$(CONFIG_MSM_SMD) += last_radio_log.o



obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o devices-msm7x00.o

obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o board-trout-panel.o devices-msm7x00.o

obj-$(CONFIG_MACH_HALIBUT) += board-halibut.o devices-msm7x00.o

obj-$(CONFIG_ARCH_MSM7X30) += board-msm7x30.o devices-msm7x30.o

obj-$(CONFIG_ARCH_QSD8X50) += board-qsd8x50.o devices-qsd8x50.o
@@ -28,6 +29,8 @@ obj-$(CONFIG_ARCH_MSM8X60) += board-msm8x60.o 
obj-$(CONFIG_ARCH_MSM7X30) += gpiomux-7x30.o gpiomux-v1.o gpiomux.o

obj-$(CONFIG_ARCH_QSD8X50) += gpiomux-8x50.o gpiomux-v1.o gpiomux.o

obj-$(CONFIG_ARCH_MSM8X60) += gpiomux-8x60.o gpiomux-v2.o gpiomux.o

ifndef CONFIG_MSM_V2_TLMM

ifdef CONFIG_MSM_V2_TLMM

obj-y	+= gpio-v2.o

else

obj-y	+= gpio.o

endif

arch/arm/mach-msm/board-msm7x30.c

+20 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/delay.h>

#include <linux/io.h>

#include <linux/smsc911x.h>

#include <linux/usb/msm_hsusb.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>
@@ -39,11 +40,26 @@ 


extern struct sys_timer msm_timer;



static int hsusb_phy_init_seq[] = {

	0x30, 0x32,	/* Enable and set Pre-Emphasis Depth to 20% */

	0x02, 0x36,	/* Disable CDR Auto Reset feature */

	-1

};



static struct msm_otg_platform_data msm_otg_pdata = {

	.phy_init_seq		= hsusb_phy_init_seq,

	.mode                   = USB_PERIPHERAL,

	.otg_control		= OTG_PHY_CONTROL,

};



static struct platform_device *devices[] __initdata = {

#if defined(CONFIG_SERIAL_MSM) || defined(CONFIG_MSM_SERIAL_DEBUGGER)

        &msm_device_uart2,

#endif

	&msm_device_smd,

	&msm_device_otg,

	&msm_device_hsusb,

	&msm_device_hsusb_host,

};



static void __init msm7x30_init_irq(void)
@@ -53,6 +69,10 @@ static void __init msm7x30_init_irq(void) 


static void __init msm7x30_init(void)

{

	msm_device_otg.dev.platform_data = &msm_otg_pdata;

	msm_device_hsusb.dev.parent = &msm_device_otg.dev;

	msm_device_hsusb_host.dev.parent = &msm_device_otg.dev;



	platform_add_devices(devices, ARRAY_SIZE(devices));

}

arch/arm/mach-msm/board-qsd8x50.c

+19 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/gpio.h>

#include <linux/platform_device.h>

#include <linux/delay.h>

#include <linux/usb/msm_hsusb.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>
@@ -74,9 +75,24 @@ static int __init msm_init_smc91x(void) 
}

module_init(msm_init_smc91x);



static int hsusb_phy_init_seq[] = {

	0x08, 0x31,	/* Increase HS Driver Amplitude */

	0x20, 0x32,	/* Enable and set Pre-Emphasis Depth to 10% */

	-1

};



static struct msm_otg_platform_data msm_otg_pdata = {

	.phy_init_seq		= hsusb_phy_init_seq,

	.mode                   = USB_PERIPHERAL,

	.otg_control		= OTG_PHY_CONTROL,

};



static struct platform_device *devices[] __initdata = {

	&msm_device_uart3,

	&msm_device_smd,

	&msm_device_otg,

	&msm_device_hsusb,

	&msm_device_hsusb_host,

};



static void __init qsd8x50_map_io(void)
@@ -93,6 +109,9 @@ static void __init qsd8x50_init_irq(void) 


static void __init qsd8x50_init(void)

{

	msm_device_otg.dev.platform_data = &msm_otg_pdata;

	msm_device_hsusb.dev.parent = &msm_device_otg.dev;

	msm_device_hsusb_host.dev.parent = &msm_device_otg.dev;

	platform_add_devices(devices, ARRAY_SIZE(devices));

}

arch/arm/mach-msm/board-trout-gpio.c

+8 −0
Original line number Diff line number Diff line
@@ -72,6 +72,13 @@ static int msm_gpiolib_direction_output(struct gpio_chip *chip, 
	return 0;

}



static int trout_gpio_to_irq(struct gpio_chip *chip, unsigned offset)

{

	struct msm_gpio_chip *msm_gpio = to_msm_gpio_chip(chip);



	return TROUT_GPIO_TO_INT(offset + chip->base);

}



#define TROUT_GPIO_BANK(name, reg_num, base_gpio, shadow_val)		\

	{								\

		.chip = {						\
@@ -80,6 +87,7 @@ static int msm_gpiolib_direction_output(struct gpio_chip *chip, 
			.direction_output = msm_gpiolib_direction_output, \

			.get		  = msm_gpiolib_get,		\

			.set		  = msm_gpiolib_set,		\

			.to_irq		  = trout_gpio_to_irq,		\

			.base		  = base_gpio,			\

			.ngpio		  = 8,				\

		},							\