Commit ba119204 authored by David Brown's avatar David Brown
Browse files

Merge branches 'msm-core' and 'msm-mmc' into for-next 

* msm-core: (28 commits)
  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
  msm: iommu: Don't flush page tables if no devices attached
  msm: iommu: Mark functions with the right section names
  msm: iommu: Support for the 2nd GFX core's IOMMU
  msm: iommu: Revise GFX2D0 IOMMU contexts and M2V mappings
  msm: iommu: Revise GFX3D IOMMU contexts and M2V mappings
  msm: iommu: Use more consistent naming in platform data
  msm: iomap: Addresses and IRQs for 2nd GFX core IOMMU
  ...

* msm-mmc: (33 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: 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
  msm: iommu: Don't flush page tables if no devices attached
  msm: iommu: Mark functions with the right section names
  ...
parents cf7d7e5a 0c521ccb

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-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,				\

		},							\

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

0 → 100644
+297 −0
Original line number Diff line number Diff line 
/* linux/arch/arm/mach-msm/board-trout-mddi.c

** Author: Brian Swetland <swetland@google.com>

*/



#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/delay.h>

#include <linux/leds.h>

#include <linux/clk.h>

#include <linux/err.h>



#include <asm/io.h>

#include <asm/gpio.h>

#include <asm/mach-types.h>



#include <mach/msm_fb.h>

#include <mach/vreg.h>



#include "board-trout.h"

#include "proc_comm.h"

#include "devices.h"



#define TROUT_DEFAULT_BACKLIGHT_BRIGHTNESS 255



#define MDDI_CLIENT_CORE_BASE  0x108000

#define LCD_CONTROL_BLOCK_BASE 0x110000

#define SPI_BLOCK_BASE         0x120000

#define I2C_BLOCK_BASE         0x130000

#define PWM_BLOCK_BASE         0x140000

#define GPIO_BLOCK_BASE        0x150000

#define SYSTEM_BLOCK1_BASE     0x160000

#define SYSTEM_BLOCK2_BASE     0x170000





#define	DPSUS       (MDDI_CLIENT_CORE_BASE|0x24)

#define	SYSCLKENA   (MDDI_CLIENT_CORE_BASE|0x2C)

#define	PWM0OFF	      (PWM_BLOCK_BASE|0x1C)



#define V_VDDE2E_VDD2_GPIO 0

#define MDDI_RST_N 82



#define	MDDICAP0    (MDDI_CLIENT_CORE_BASE|0x00)

#define	MDDICAP1    (MDDI_CLIENT_CORE_BASE|0x04)

#define	MDDICAP2    (MDDI_CLIENT_CORE_BASE|0x08)

#define	MDDICAP3    (MDDI_CLIENT_CORE_BASE|0x0C)

#define	MDCAPCHG    (MDDI_CLIENT_CORE_BASE|0x10)

#define	MDCRCERC    (MDDI_CLIENT_CORE_BASE|0x14)

#define	TTBUSSEL    (MDDI_CLIENT_CORE_BASE|0x18)

#define	DPSET0      (MDDI_CLIENT_CORE_BASE|0x1C)

#define	DPSET1      (MDDI_CLIENT_CORE_BASE|0x20)

#define	DPSUS       (MDDI_CLIENT_CORE_BASE|0x24)

#define	DPRUN       (MDDI_CLIENT_CORE_BASE|0x28)

#define	SYSCKENA    (MDDI_CLIENT_CORE_BASE|0x2C)

#define	TESTMODE    (MDDI_CLIENT_CORE_BASE|0x30)

#define	FIFOMONI    (MDDI_CLIENT_CORE_BASE|0x34)

#define	INTMONI     (MDDI_CLIENT_CORE_BASE|0x38)

#define	MDIOBIST    (MDDI_CLIENT_CORE_BASE|0x3C)

#define	MDIOPSET    (MDDI_CLIENT_CORE_BASE|0x40)

#define	BITMAP0     (MDDI_CLIENT_CORE_BASE|0x44)

#define	BITMAP1     (MDDI_CLIENT_CORE_BASE|0x48)

#define	BITMAP2     (MDDI_CLIENT_CORE_BASE|0x4C)

#define	BITMAP3     (MDDI_CLIENT_CORE_BASE|0x50)

#define	BITMAP4     (MDDI_CLIENT_CORE_BASE|0x54)



#define	SRST        (LCD_CONTROL_BLOCK_BASE|0x00)

#define	PORT_ENB    (LCD_CONTROL_BLOCK_BASE|0x04)

#define	START       (LCD_CONTROL_BLOCK_BASE|0x08)

#define	PORT        (LCD_CONTROL_BLOCK_BASE|0x0C)

#define	CMN         (LCD_CONTROL_BLOCK_BASE|0x10)

#define	GAMMA       (LCD_CONTROL_BLOCK_BASE|0x14)

#define	INTFLG      (LCD_CONTROL_BLOCK_BASE|0x18)

#define	INTMSK      (LCD_CONTROL_BLOCK_BASE|0x1C)

#define	MPLFBUF     (LCD_CONTROL_BLOCK_BASE|0x20)

#define	HDE_LEFT    (LCD_CONTROL_BLOCK_BASE|0x24)

#define	VDE_TOP     (LCD_CONTROL_BLOCK_BASE|0x28)

#define	PXL         (LCD_CONTROL_BLOCK_BASE|0x30)

#define	HCYCLE      (LCD_CONTROL_BLOCK_BASE|0x34)

#define	HSW         (LCD_CONTROL_BLOCK_BASE|0x38)

#define	HDE_START   (LCD_CONTROL_BLOCK_BASE|0x3C)

#define	HDE_SIZE    (LCD_CONTROL_BLOCK_BASE|0x40)

#define	VCYCLE      (LCD_CONTROL_BLOCK_BASE|0x44)

#define	VSW         (LCD_CONTROL_BLOCK_BASE|0x48)

#define	VDE_START   (LCD_CONTROL_BLOCK_BASE|0x4C)

#define	VDE_SIZE    (LCD_CONTROL_BLOCK_BASE|0x50)

#define	WAKEUP      (LCD_CONTROL_BLOCK_BASE|0x54)

#define	WSYN_DLY    (LCD_CONTROL_BLOCK_BASE|0x58)

#define	REGENB      (LCD_CONTROL_BLOCK_BASE|0x5C)

#define	VSYNIF      (LCD_CONTROL_BLOCK_BASE|0x60)

#define	WRSTB       (LCD_CONTROL_BLOCK_BASE|0x64)

#define	RDSTB       (LCD_CONTROL_BLOCK_BASE|0x68)

#define	ASY_DATA    (LCD_CONTROL_BLOCK_BASE|0x6C)

#define	ASY_DATB    (LCD_CONTROL_BLOCK_BASE|0x70)

#define	ASY_DATC    (LCD_CONTROL_BLOCK_BASE|0x74)

#define	ASY_DATD    (LCD_CONTROL_BLOCK_BASE|0x78)

#define	ASY_DATE    (LCD_CONTROL_BLOCK_BASE|0x7C)

#define	ASY_DATF    (LCD_CONTROL_BLOCK_BASE|0x80)

#define	ASY_DATG    (LCD_CONTROL_BLOCK_BASE|0x84)

#define	ASY_DATH    (LCD_CONTROL_BLOCK_BASE|0x88)

#define	ASY_CMDSET  (LCD_CONTROL_BLOCK_BASE|0x8C)



#define	SSICTL      (SPI_BLOCK_BASE|0x00)

#define	SSITIME     (SPI_BLOCK_BASE|0x04)

#define	SSITX       (SPI_BLOCK_BASE|0x08)

#define	SSIRX       (SPI_BLOCK_BASE|0x0C)

#define	SSIINTC     (SPI_BLOCK_BASE|0x10)

#define	SSIINTS     (SPI_BLOCK_BASE|0x14)

#define	SSIDBG1     (SPI_BLOCK_BASE|0x18)

#define	SSIDBG2     (SPI_BLOCK_BASE|0x1C)

#define	SSIID       (SPI_BLOCK_BASE|0x20)



#define	WKREQ       (SYSTEM_BLOCK1_BASE|0x00)

#define	CLKENB      (SYSTEM_BLOCK1_BASE|0x04)

#define	DRAMPWR     (SYSTEM_BLOCK1_BASE|0x08)

#define	INTMASK     (SYSTEM_BLOCK1_BASE|0x0C)

#define	GPIOSEL     (SYSTEM_BLOCK2_BASE|0x00)



#define	GPIODATA    (GPIO_BLOCK_BASE|0x00)

#define	GPIODIR     (GPIO_BLOCK_BASE|0x04)

#define	GPIOIS      (GPIO_BLOCK_BASE|0x08)

#define	GPIOIBE     (GPIO_BLOCK_BASE|0x0C)

#define	GPIOIEV     (GPIO_BLOCK_BASE|0x10)

#define	GPIOIE      (GPIO_BLOCK_BASE|0x14)

#define	GPIORIS     (GPIO_BLOCK_BASE|0x18)

#define	GPIOMIS     (GPIO_BLOCK_BASE|0x1C)

#define	GPIOIC      (GPIO_BLOCK_BASE|0x20)

#define	GPIOOMS     (GPIO_BLOCK_BASE|0x24)

#define	GPIOPC      (GPIO_BLOCK_BASE|0x28)

#define	GPIOID      (GPIO_BLOCK_BASE|0x30)



#define SPI_WRITE(reg, val) \

	{ SSITX,        0x00010000 | (((reg) & 0xff) << 8) | ((val) & 0xff) }, \

	{ 0, 5 },



#define SPI_WRITE1(reg) \

	{ SSITX,        (reg) & 0xff }, \

	{ 0, 5 },



struct mddi_table {

	uint32_t reg;

	uint32_t value;

};

static struct mddi_table mddi_toshiba_init_table[] = {

	{ DPSET0,       0x09e90046 },

	{ DPSET1,       0x00000118 },

	{ DPSUS,        0x00000000 },

	{ DPRUN,        0x00000001 },

	{ 1,            14         }, /* msleep 14 */

	{ SYSCKENA,     0x00000001 },

	{ CLKENB,       0x0000A1EF },  /*    # SYS.CLKENB  # Enable clocks for each module (without DCLK , i2cCLK) */



	{ GPIODATA,     0x02000200 },  /*   # GPI .GPIODATA  # GPIO2(RESET_LCD_N) set to 0 , GPIO3(eDRAM_Power) set to 0 */

	{ GPIODIR,      0x000030D  },  /* 24D   # GPI .GPIODIR  # Select direction of GPIO port (0,2,3,6,9 output) */

	{ GPIOSEL,      0/*0x00000173*/},  /*   # SYS.GPIOSEL  # GPIO port multiplexing control */

	{ GPIOPC,       0x03C300C0 },  /*   # GPI .GPIOPC  # GPIO2,3 PD cut */

	{ WKREQ,        0x00000000 },  /*   # SYS.WKREQ  # Wake-up request event is VSYNC alignment */



	{ GPIOIBE,      0x000003FF },

	{ GPIOIS,       0x00000000 },

	{ GPIOIC,       0x000003FF },

	{ GPIOIE,       0x00000000 },



	{ GPIODATA,     0x00040004 },  /*   # GPI .GPIODATA  # eDRAM VD supply */

	{ 1,            1          }, /* msleep 1 */

	{ GPIODATA,     0x02040004 },  /*   # GPI .GPIODATA  # eDRAM VD supply */

	{ DRAMPWR,      0x00000001 }, /* eDRAM power */

};



#define GPIOSEL_VWAKEINT (1U << 0)

#define INTMASK_VWAKEOUT (1U << 0)





static struct clk *gp_clk;

static int trout_new_backlight = 1;

static struct vreg *vreg_mddi_1v5;

static struct vreg *vreg_lcm_2v85;



static void trout_process_mddi_table(struct msm_mddi_client_data *client_data,

				     struct mddi_table *table, size_t count)

{

	int i;

	for (i = 0; i < count; i++) {

		uint32_t reg = table[i].reg;

		uint32_t value = table[i].value;



		if (reg == 0)

			udelay(value);

		else if (reg == 1)

			msleep(value);

		else

			client_data->remote_write(client_data, value, reg);

	}

}



static int trout_mddi_toshiba_client_init(

	struct msm_mddi_bridge_platform_data *bridge_data,

	struct msm_mddi_client_data *client_data)

{

	int panel_id;



	client_data->auto_hibernate(client_data, 0);

	trout_process_mddi_table(client_data, mddi_toshiba_init_table,

				 ARRAY_SIZE(mddi_toshiba_init_table));

	client_data->auto_hibernate(client_data, 1);

	panel_id = (client_data->remote_read(client_data, GPIODATA) >> 4) & 3;

	if (panel_id > 1) {

		printk(KERN_WARNING "unknown panel id at mddi_enable\n");

		return -1;

	}

	return 0;

}



static int trout_mddi_toshiba_client_uninit(

	struct msm_mddi_bridge_platform_data *bridge_data,

	struct msm_mddi_client_data *client_data)

{

	return 0;

}



static struct resource resources_msm_fb[] = {

	{

		.start = MSM_FB_BASE,

		.end = MSM_FB_BASE + MSM_FB_SIZE,

		.flags = IORESOURCE_MEM,

	},

};



struct msm_mddi_bridge_platform_data toshiba_client_data = {

	.init = trout_mddi_toshiba_client_init,

	.uninit = trout_mddi_toshiba_client_uninit,

	.fb_data = {

		.xres = 320,

		.yres = 480,

		.width = 45,

		.height = 67,

		.output_format = 0,

	},

};



static struct msm_mddi_platform_data mddi_pdata = {

	.clk_rate = 122880000,

	.fb_resource = resources_msm_fb,

	.num_clients = 1,

	.client_platform_data = {

		{

			.product_id = (0xd263 << 16 | 0),

			.name = "mddi_c_d263_0000",

			.id = 0,

			.client_data = &toshiba_client_data,

			.clk_rate = 0,

		},

	},

};



int __init trout_init_panel(void)

{

	int rc;



	if (!machine_is_trout())

		return 0;

	vreg_mddi_1v5 = vreg_get(0, "gp2");

	if (IS_ERR(vreg_mddi_1v5))

		return PTR_ERR(vreg_mddi_1v5);

	vreg_lcm_2v85 = vreg_get(0, "gp4");

	if (IS_ERR(vreg_lcm_2v85))

		return PTR_ERR(vreg_lcm_2v85);



	trout_new_backlight = system_rev >= 5;

	if (trout_new_backlight) {

		uint32_t config = PCOM_GPIO_CFG(27, 0, GPIO_OUTPUT,

						GPIO_NO_PULL, GPIO_8MA);

		msm_proc_comm(PCOM_RPC_GPIO_TLMM_CONFIG_EX, &config, 0);

	} else {

		uint32_t config = PCOM_GPIO_CFG(27, 1, GPIO_OUTPUT,

						GPIO_NO_PULL, GPIO_8MA);

		msm_proc_comm(PCOM_RPC_GPIO_TLMM_CONFIG_EX, &config, 0);



		gp_clk = clk_get(NULL, "gp_clk");

		if (IS_ERR(gp_clk)) {

			printk(KERN_ERR "trout_init_panel: could not get gp"

			       "clock\n");

			gp_clk = NULL;

		}

		rc = clk_set_rate(gp_clk, 19200000);

		if (rc)

			printk(KERN_ERR "trout_init_panel: set clock rate "

			       "failed\n");

	}



	rc = platform_device_register(&msm_device_mdp);

	if (rc)

		return rc;

	msm_device_mddi0.dev.platform_data = &mddi_pdata;

	return platform_device_register(&msm_device_mddi0);

}



device_initcall(trout_init_panel);

arch/arm/mach-msm/clock.c

+15 −0
Original line number Diff line number Diff line
@@ -120,6 +120,21 @@ EXPORT_SYMBOL(clk_get_rate); 


int clk_set_rate(struct clk *clk, unsigned long rate)

{

	int ret;

	if (clk->flags & CLKFLAG_MAX) {

		ret = clk->ops->set_max_rate(clk->id, rate);

		if (ret)

			return ret;

	}

	if (clk->flags & CLKFLAG_MIN) {

		ret = clk->ops->set_min_rate(clk->id, rate);

		if (ret)

			return ret;

	}



	if (clk->flags & CLKFLAG_MAX || clk->flags & CLKFLAG_MIN)

		return ret;



	return clk->ops->set_rate(clk->id, rate);

}

EXPORT_SYMBOL(clk_set_rate);

CRA Git | Maintained and supported by SUSTech CRA and CCSE