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

Commit 4e66a0f5 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6

parents 34f25476 22fe8439

arch/arm/mach-pxa/include/mach/mfp-pxa300.h

+3 −3
Original line number Diff line number Diff line
@@ -567,9 +567,9 @@ 
#define GPIO37_ULPI_DATA_OUT_7	MFP_CFG(GPIO37, AF3)

#define GPIO33_ULPI_OTG_INTR	MFP_CFG(GPIO33, AF1)



#define ULPI_DIR	MFP_CFG_DRV(ULPI_DIR, MFP_AF0, MFP_DS01X)

#define ULPI_NXT	MFP_CFG_DRV(ULPI_NXT, MFP_AF0, MFP_DS01X)

#define ULPI_STP	MFP_CFG_DRV(ULPI_STP, MFP_AF0, MFP_DS01X)

#define ULPI_DIR	MFP_CFG_DRV(ULPI_DIR, AF0, DS01X)

#define ULPI_NXT	MFP_CFG_DRV(ULPI_NXT, AF0, DS01X)

#define ULPI_STP	MFP_CFG_DRV(ULPI_STP, AF0, DS01X)

#endif /* CONFIG_CPU_PXA310 */



#endif /* __ASM_ARCH_MFP_PXA300_H */

arch/arm/mach-pxa/pxa3xx.c

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ static DEFINE_PXA3_CKEN(pxa3xx_mmc2, MMC2, 19500000, 0); 
static struct clk_lookup pxa3xx_clkregs[] = {

	INIT_CLKREG(&clk_pxa3xx_pout, NULL, "CLK_POUT"),

	/* Power I2C clock is always on */

	INIT_CLKREG(&clk_dummy, "pxa2xx-i2c.1", NULL),

	INIT_CLKREG(&clk_dummy, "pxa3xx-pwri2c.1", NULL),

	INIT_CLKREG(&clk_pxa3xx_lcd, "pxa2xx-fb", NULL),

	INIT_CLKREG(&clk_pxa3xx_camera, NULL, "CAMCLK"),

	INIT_CLKREG(&clk_pxa3xx_ac97, NULL, "AC97CLK"),

arch/arm/plat-pxa/gpio.c

+2 −7
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <linux/irq.h>

#include <linux/io.h>

#include <linux/sysdev.h>

#include <linux/bootmem.h>

#include <linux/slab.h>



#include <mach/gpio.h>
@@ -112,17 +112,12 @@ static int __init pxa_init_gpio_chip(int gpio_end) 
	int i, gpio, nbanks = gpio_to_bank(gpio_end) + 1;

	struct pxa_gpio_chip *chips;



	/* this is early, we have to use bootmem allocator, and we really

	 * want this to be allocated dynamically for different 'gpio_end'

	 */

	chips = alloc_bootmem_low(nbanks * sizeof(struct pxa_gpio_chip));

	chips = kzalloc(nbanks * sizeof(struct pxa_gpio_chip), GFP_KERNEL);

	if (chips == NULL) {

		pr_err("%s: failed to allocate GPIO chips\n", __func__);

		return -ENOMEM;

	}



	memset(chips, 0, nbanks * sizeof(struct pxa_gpio_chip));



	for (i = 0, gpio = 0; i < nbanks; i++, gpio += 32) {

		struct gpio_chip *c = &chips[i].chip;

drivers/mmc/host/pxamci.c

+2 −2
Original line number Diff line number Diff line
@@ -168,12 +168,12 @@ static void pxamci_setup_data(struct pxamci_host *host, struct mmc_data *data) 


	if (data->flags & MMC_DATA_READ) {

		host->dma_dir = DMA_FROM_DEVICE;

		dcmd = DCMD_INCTRGADDR | DCMD_FLOWTRG;

		dcmd = DCMD_INCTRGADDR | DCMD_FLOWSRC;

		DRCMR(host->dma_drcmrtx) = 0;

		DRCMR(host->dma_drcmrrx) = host->dma | DRCMR_MAPVLD;

	} else {

		host->dma_dir = DMA_TO_DEVICE;

		dcmd = DCMD_INCSRCADDR | DCMD_FLOWSRC;

		dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG;

		DRCMR(host->dma_drcmrrx) = 0;

		DRCMR(host->dma_drcmrtx) = host->dma | DRCMR_MAPVLD;

	}

drivers/video/backlight/pwm_bl.c

+2 −0
Original line number Diff line number Diff line
@@ -145,6 +145,8 @@ static int pwm_backlight_suspend(struct platform_device *pdev, 
	struct backlight_device *bl = platform_get_drvdata(pdev);

	struct pwm_bl_data *pb = dev_get_drvdata(&bl->dev);



	if (pb->notify)

		pb->notify(0);

	pwm_config(pb->pwm, 0, pb->period);

	pwm_disable(pb->pwm);

	return 0;