Commit 449c1cd2 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'versatile-v5.3-armsoc' of... 

Merge tag 'versatile-v5.3-armsoc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into arm/soc

Versatile platform updates for the v5.3 kernel cycle:
- Drop a slew of unused CLCD platform data
- Fix OF reference counts

* tag 'versatile-v5.3-armsoc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator

:
  ARM: versatile: Drop CLCD platform data
  ARM: versatile: fix a leaked reference by addingmissing of_node_put

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 6ad13599 153969fd

arch/arm/mach-versatile/versatile_dt.c

+5 −159
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 
#include <linux/of_platform.h>

#include <linux/slab.h>

#include <linux/amba/bus.h>

#include <linux/amba/clcd.h>

#include <linux/platform_data/video-clcd-versatile.h>

#include <linux/amba/mmci.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>
@@ -34,14 +32,12 @@ 
 */

#define VERSATILE_SYS_PCICTL_OFFSET           0x44

#define VERSATILE_SYS_MCI_OFFSET              0x48

#define VERSATILE_SYS_CLCD_OFFSET             0x50



/*

 * VERSATILE peripheral addresses

 */

#define VERSATILE_MMCI0_BASE           0x10005000	/* MMC interface */

#define VERSATILE_MMCI1_BASE           0x1000B000	/* MMC Interface */

#define VERSATILE_CLCD_BASE            0x10120000	/* CLCD */

#define VERSATILE_SCTL_BASE            0x101E0000	/* System controller */

#define VERSATILE_IB2_BASE             0x24000000	/* IB2 module */

#define VERSATILE_IB2_CTL_BASE		(VERSATILE_IB2_BASE + 0x03000000)
@@ -83,158 +79,6 @@ static struct mmci_platform_data mmc1_plat_data = { 
	.status		= mmc_status,

};



/*

 * CLCD support.

 */

#define SYS_CLCD_MODE_MASK	(3 << 0)

#define SYS_CLCD_MODE_888	(0 << 0)

#define SYS_CLCD_MODE_5551	(1 << 0)

#define SYS_CLCD_MODE_565_RLSB	(2 << 0)

#define SYS_CLCD_MODE_565_BLSB	(3 << 0)

#define SYS_CLCD_NLCDIOON	(1 << 2)

#define SYS_CLCD_VDDPOSSWITCH	(1 << 3)

#define SYS_CLCD_PWR3V5SWITCH	(1 << 4)

#define SYS_CLCD_ID_MASK	(0x1f << 8)

#define SYS_CLCD_ID_SANYO_3_8	(0x00 << 8)

#define SYS_CLCD_ID_UNKNOWN_8_4	(0x01 << 8)

#define SYS_CLCD_ID_EPSON_2_2	(0x02 << 8)

#define SYS_CLCD_ID_SANYO_2_5	(0x07 << 8)

#define SYS_CLCD_ID_VGA		(0x1f << 8)



static bool is_sanyo_2_5_lcd;



/*

 * Disable all display connectors on the interface module.

 */

static void versatile_clcd_disable(struct clcd_fb *fb)

{

	void __iomem *sys_clcd = versatile_sys_base + VERSATILE_SYS_CLCD_OFFSET;

	u32 val;



	val = readl(sys_clcd);

	val &= ~SYS_CLCD_NLCDIOON | SYS_CLCD_PWR3V5SWITCH;

	writel(val, sys_clcd);



	/*

	 * If the LCD is Sanyo 2x5 in on the IB2 board, turn the back-light off

	 */

	if (of_machine_is_compatible("arm,versatile-ab") && is_sanyo_2_5_lcd) {

		unsigned long ctrl;



		ctrl = readl(versatile_ib2_ctrl);

		ctrl &= ~0x01;

		writel(ctrl, versatile_ib2_ctrl);

	}

}



/*

 * Enable the relevant connector on the interface module.

 */

static void versatile_clcd_enable(struct clcd_fb *fb)

{

	struct fb_var_screeninfo *var = &fb->fb.var;

	void __iomem *sys_clcd = versatile_sys_base + VERSATILE_SYS_CLCD_OFFSET;

	u32 val;



	val = readl(sys_clcd);

	val &= ~SYS_CLCD_MODE_MASK;



	switch (var->green.length) {

	case 5:

		val |= SYS_CLCD_MODE_5551;

		break;

	case 6:

		if (var->red.offset == 0)

			val |= SYS_CLCD_MODE_565_RLSB;

		else

			val |= SYS_CLCD_MODE_565_BLSB;

		break;

	case 8:

		val |= SYS_CLCD_MODE_888;

		break;

	}



	/*

	 * Set the MUX

	 */

	writel(val, sys_clcd);



	/*

	 * And now enable the PSUs

	 */

	val |= SYS_CLCD_NLCDIOON | SYS_CLCD_PWR3V5SWITCH;

	writel(val, sys_clcd);



	/*

	 * If the LCD is Sanyo 2x5 in on the IB2 board, turn the back-light on

	 */

	if (of_machine_is_compatible("arm,versatile-ab") && is_sanyo_2_5_lcd) {

		unsigned long ctrl;



		ctrl = readl(versatile_ib2_ctrl);

		ctrl |= 0x01;

		writel(ctrl, versatile_ib2_ctrl);

	}

}



/*

 * Detect which LCD panel is connected, and return the appropriate

 * clcd_panel structure.  Note: we do not have any information on

 * the required timings for the 8.4in panel, so we presently assume

 * VGA timings.

 */

static int versatile_clcd_setup(struct clcd_fb *fb)

{

	void __iomem *sys_clcd = versatile_sys_base + VERSATILE_SYS_CLCD_OFFSET;

	const char *panel_name;

	u32 val;



	is_sanyo_2_5_lcd = false;



	val = readl(sys_clcd) & SYS_CLCD_ID_MASK;

	if (val == SYS_CLCD_ID_SANYO_3_8)

		panel_name = "Sanyo TM38QV67A02A";

	else if (val == SYS_CLCD_ID_SANYO_2_5) {

		panel_name = "Sanyo QVGA Portrait";

		is_sanyo_2_5_lcd = true;

	} else if (val == SYS_CLCD_ID_EPSON_2_2)

		panel_name = "Epson L2F50113T00";

	else if (val == SYS_CLCD_ID_VGA)

		panel_name = "VGA";

	else {

		printk(KERN_ERR "CLCD: unknown LCD panel ID 0x%08x, using VGA\n",

			val);

		panel_name = "VGA";

	}



	fb->panel = versatile_clcd_get_panel(panel_name);

	if (!fb->panel)

		return -EINVAL;



	return versatile_clcd_setup_dma(fb, SZ_1M);

}



static void versatile_clcd_decode(struct clcd_fb *fb, struct clcd_regs *regs)

{

	clcdfb_decode(fb, regs);



	/* Always clear BGR for RGB565: we do the routing externally */

	if (fb->fb.var.green.length == 6)

		regs->cntl &= ~CNTL_BGR;

}



static struct clcd_board clcd_plat_data = {

	.name		= "Versatile",

	.caps		= CLCD_CAP_5551 | CLCD_CAP_565 | CLCD_CAP_888,

	.check		= clcdfb_check,

	.decode		= versatile_clcd_decode,

	.disable	= versatile_clcd_disable,

	.enable		= versatile_clcd_enable,

	.setup		= versatile_clcd_setup,

	.mmap		= versatile_clcd_mmap_dma,

	.remove		= versatile_clcd_remove_dma,

};



/*

 * Lookup table for attaching a specific name and platform_data pointer to

 * devices as they get created by of_platform_populate().  Ideally this table
@@ -244,7 +88,6 @@ static struct clcd_board clcd_plat_data = { 
struct of_dev_auxdata versatile_auxdata_lookup[] __initdata = {

	OF_DEV_AUXDATA("arm,primecell", VERSATILE_MMCI0_BASE, "fpga:05", &mmc0_plat_data),

	OF_DEV_AUXDATA("arm,primecell", VERSATILE_MMCI1_BASE, "fpga:0b", &mmc1_plat_data),

	OF_DEV_AUXDATA("arm,primecell", VERSATILE_CLCD_BASE, "dev:20", &clcd_plat_data),

	{}

};
@@ -299,12 +142,12 @@ static void __init versatile_dt_pci_init(void) 
		 * driver had it so we will keep it.

		 */

		writel(1, versatile_sys_base + VERSATILE_SYS_PCICTL_OFFSET);

		return;

		goto out_put_node;

	}



	newprop = kzalloc(sizeof(*newprop), GFP_KERNEL);

	if (!newprop)

		return;

		goto out_put_node;



	newprop->name = kstrdup("status", GFP_KERNEL);

	newprop->value = kstrdup("disabled", GFP_KERNEL);
@@ -312,6 +155,9 @@ static void __init versatile_dt_pci_init(void) 
	of_update_property(np, newprop);



	pr_info("Not plugged into PCI backplane!\n");



out_put_node:

	of_node_put(np);

}



static void __init versatile_dt_init(void)

include/linux/platform_data/video-clcd-versatile.h

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef PLAT_CLCD_H

#define PLAT_CLCD_H



#ifdef CONFIG_PLAT_VERSATILE_CLCD

struct clcd_panel *versatile_clcd_get_panel(const char *);

int versatile_clcd_setup_dma(struct clcd_fb *, unsigned long);

int versatile_clcd_mmap_dma(struct clcd_fb *, struct vm_area_struct *);

void versatile_clcd_remove_dma(struct clcd_fb *);

#else

static inline struct clcd_panel *versatile_clcd_get_panel(const char *s)

{

	return NULL;

}

static inline int versatile_clcd_setup_dma(struct clcd_fb *fb, unsigned long framesize)

{

	return -ENODEV;

}

static inline int versatile_clcd_mmap_dma(struct clcd_fb *fb, struct vm_area_struct *vm)

{

	return -ENODEV;

}

static inline void versatile_clcd_remove_dma(struct clcd_fb *fb)

{

}

#endif



#endif