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

Commit 61d6cc54 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 5091/1: Add missing bitfield include to regs-lcd.h
  [ARM] 5090/1: Correct pxafb palette typo error
  [ARM] 5077/1: spi: fix list scan success verification in PXA ssp driver
parents c6d8f400 3692fd0a

arch/arm/mach-pxa/ssp.c

+1 −1
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ struct ssp_device *ssp_request(int port, const char *label) 


	mutex_unlock(&ssp_lock);



	if (ssp->port_id != port)

	if (&ssp->node == &ssp_list)

		return NULL;



	return ssp;

drivers/video/pxafb.c

+4 −2
Original line number Diff line number Diff line
@@ -573,8 +573,8 @@ static int setup_frame_dma(struct pxafb_info *fbi, int dma, int pal, 
		dma_desc->fdadr = fbi->dma_buff_phys + dma_desc_off;

		fbi->fdadr[dma] = fbi->dma_buff_phys + dma_desc_off;

	} else {

		pal_desc = &fbi->dma_buff->pal_desc[dma];

		pal_desc_off = offsetof(struct pxafb_dma_buff, dma_desc[pal]);

		pal_desc = &fbi->dma_buff->pal_desc[pal];

		pal_desc_off = offsetof(struct pxafb_dma_buff, pal_desc[pal]);



		pal_desc->fsadr = fbi->dma_buff_phys + pal * PALETTE_SIZE;

		pal_desc->fidr  = 0;
@@ -1276,6 +1276,8 @@ static int __init pxafb_map_video_memory(struct pxafb_info *fbi) 
		fbi->dma_buff_phys = fbi->map_dma;

		fbi->palette_cpu = (u16 *) fbi->dma_buff->palette;



	        pr_debug("pxafb: palette_mem_size = 0x%08lx\n", fbi->palette_size*sizeof(u16));



#ifdef CONFIG_FB_PXA_SMARTPANEL

		fbi->smart_cmds = (uint16_t *) fbi->dma_buff->cmd_buff;

		fbi->n_smart_cmds = 0;

include/asm-arm/arch-pxa/regs-lcd.h

+4 −1
Original line number Diff line number Diff line 
#ifndef __ASM_ARCH_REGS_LCD_H

#define __ASM_ARCH_REGS_LCD_H



#include <asm/arch/bitfield.h>



/*

 * LCD Controller Registers and Bits Definitions

 */