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

Commit c47cd747 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'lpc32xx-soc-for-5.1' of https://github.com/vzapolskiy/linux-lpc32xx into arm/fixes 

ARM: lpc32xx: platform updates for v5.1

Here are the changes for ARM NXP LPC32xx platform files:

* removed a superfluous record to kernel log buffer under OOM condition,
* use kmemdup() helper instead of kmalloc()/memcpy() pair,
* removed platform data of ARM PL180 SD/MMC and ARM PL111 LCD controllers,
  since now both are handled in devicetree files.

* tag 'lpc32xx-soc-for-5.1' of https://github.com/vzapolskiy/linux-lpc32xx

:
  ARM: lpc32xx: remove platform data of ARM PL111 LCD controller
  ARM: lpc32xx: remove platform data of ARM PL180 SD/MMC controller
  ARM: lpc32xx: Use kmemdup to replace duplicating its implementation
  ARM: lpc32xx: Delete an error message for a failed memory allocation in lpc32xx_pm_enter()

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 919c1d49 49bb0b96

arch/arm/mach-lpc32xx/phy3250.c

+0 −84
Original line number Diff line number Diff line
@@ -45,73 +45,6 @@ 
#include <mach/board.h>

#include "common.h"



/*

 * AMBA LCD controller

 */

static struct clcd_panel conn_lcd_panel = {

	.mode		= {

		.name		= "QVGA portrait",

		.refresh	= 60,

		.xres		= 240,

		.yres		= 320,

		.pixclock	= 191828,

		.left_margin	= 22,

		.right_margin	= 11,

		.upper_margin	= 2,

		.lower_margin	= 1,

		.hsync_len	= 5,

		.vsync_len	= 2,

		.sync		= 0,

		.vmode		= FB_VMODE_NONINTERLACED,

	},

	.width		= -1,

	.height		= -1,

	.tim2		= (TIM2_IVS | TIM2_IHS),

	.cntl		= (CNTL_BGR | CNTL_LCDTFT | CNTL_LCDVCOMP(1) |

				CNTL_LCDBPP16_565),

	.bpp		= 16,

};

#define PANEL_SIZE (3 * SZ_64K)



static int lpc32xx_clcd_setup(struct clcd_fb *fb)

{

	dma_addr_t dma;



	fb->fb.screen_base = dma_alloc_wc(&fb->dev->dev, PANEL_SIZE, &dma,

					  GFP_KERNEL);

	if (!fb->fb.screen_base) {

		printk(KERN_ERR "CLCD: unable to map framebuffer\n");

		return -ENOMEM;

	}



	fb->fb.fix.smem_start = dma;

	fb->fb.fix.smem_len = PANEL_SIZE;

	fb->panel = &conn_lcd_panel;



	return 0;

}



static int lpc32xx_clcd_mmap(struct clcd_fb *fb, struct vm_area_struct *vma)

{

	return dma_mmap_wc(&fb->dev->dev, vma, fb->fb.screen_base,

			   fb->fb.fix.smem_start, fb->fb.fix.smem_len);

}



static void lpc32xx_clcd_remove(struct clcd_fb *fb)

{

	dma_free_wc(&fb->dev->dev, fb->fb.fix.smem_len, fb->fb.screen_base,

		    fb->fb.fix.smem_start);

}



static struct clcd_board lpc32xx_clcd_data = {

	.name		= "Phytec LCD",

	.check		= clcdfb_check,

	.decode		= clcdfb_decode,

	.setup		= lpc32xx_clcd_setup,

	.mmap		= lpc32xx_clcd_mmap,

	.remove		= lpc32xx_clcd_remove,

};



static struct pl08x_channel_data pl08x_slave_channels[] = {

	{

		.bus_id = "nand-slc",
@@ -148,11 +81,6 @@ static struct pl08x_platform_data pl08x_pd = { 
	.mem_buses = PL08X_AHB1,

};



static struct mmci_platform_data lpc32xx_mmci_data = {

	.ocr_mask	= MMC_VDD_30_31 | MMC_VDD_31_32 |

			  MMC_VDD_32_33 | MMC_VDD_33_34,

};



static struct lpc32xx_slc_platform_data lpc32xx_slc_data = {

	.dma_filter = pl08x_filter_id,

};
@@ -164,10 +92,7 @@ static struct lpc32xx_mlc_platform_data lpc32xx_mlc_data = { 
static const struct of_dev_auxdata lpc32xx_auxdata_lookup[] __initconst = {

	OF_DEV_AUXDATA("arm,pl022", 0x20084000, "dev:ssp0", NULL),

	OF_DEV_AUXDATA("arm,pl022", 0x2008C000, "dev:ssp1", NULL),

	OF_DEV_AUXDATA("arm,pl110", 0x31040000, "dev:clcd", &lpc32xx_clcd_data),

	OF_DEV_AUXDATA("arm,pl080", 0x31000000, "pl08xdmac", &pl08x_pd),

	OF_DEV_AUXDATA("arm,pl18x", 0x20098000, "20098000.sd",

		       &lpc32xx_mmci_data),

	OF_DEV_AUXDATA("nxp,lpc3220-slc", 0x20020000, "20020000.flash",

		       &lpc32xx_slc_data),

	OF_DEV_AUXDATA("nxp,lpc3220-mlc", 0x200a8000, "200a8000.flash",
@@ -177,15 +102,6 @@ static const struct of_dev_auxdata lpc32xx_auxdata_lookup[] __initconst = { 


static void __init lpc3250_machine_init(void)

{

	u32 tmp;



	/* Setup LCD muxing to RGB565 */

	tmp = __raw_readl(LPC32XX_CLKPWR_LCDCLK_CTRL) &

		~(LPC32XX_CLKPWR_LCDCTRL_LCDTYPE_MSK |

		LPC32XX_CLKPWR_LCDCTRL_PSCALE_MSK);

	tmp |= LPC32XX_CLKPWR_LCDCTRL_LCDTYPE_TFT16;

	__raw_writel(tmp, LPC32XX_CLKPWR_LCDCLK_CTRL);



	lpc32xx_serial_init();



	/* Test clock needed for UDA1380 initial init */

arch/arm/mach-lpc32xx/pm.c

+3 −10
Original line number Diff line number Diff line
@@ -86,17 +86,10 @@ static int lpc32xx_pm_enter(suspend_state_t state) 
	void *iram_swap_area;



	/* Allocate some space for temporary IRAM storage */

	iram_swap_area = kmalloc(lpc32xx_sys_suspend_sz, GFP_KERNEL);

	if (!iram_swap_area) {

		printk(KERN_ERR

		       "PM Suspend: cannot allocate memory to save portion "

			"of SRAM\n");

	iram_swap_area = kmemdup((void *)TEMP_IRAM_AREA,

				 lpc32xx_sys_suspend_sz, GFP_KERNEL);

	if (!iram_swap_area)

		return -ENOMEM;

	}



	/* Backup a small area of IRAM used for the suspend code */

	memcpy(iram_swap_area, (void *) TEMP_IRAM_AREA,

		lpc32xx_sys_suspend_sz);



	/*

	 * Copy code to suspend system into IRAM. The suspend code