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

Commit 379df279 authored by Linus Walleij's avatar Linus Walleij
Browse files

ARM: integrator: push down SC dependencies 



This pushes the dependencies on the Integrator/AP system
controller (SC) down into the PCI V3 driver and the
AP-specific board file.

First, the platform data for the PL010 UART is moved into
the integrator_ap.c board file, and the Integrator/CP is
assigned with NULL pdata. This way the callback functions
can reference the dynamically remapped AP syscon address
in both the ATAG and DT boot path, and this remapping
is localized to the board file.

Second the PCIv3 driver is making its own dynamic remapping
of the SC for the few registers it is using. When we
convert the PCIv3 driver over to using device tree having a
dynamically assigned base address will be useful, but we
will have to use the definition from <mach/platform.h> for
now, the only improvement is that it's done dynamically.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 328ba305

arch/arm/mach-integrator/common.h

+6 −1
Original line number Diff line number Diff line 
#include <linux/amba/serial.h>

extern struct amba_pl010_data integrator_uart_data;

#ifdef CONFIG_ARCH_INTEGRATOR_AP

extern struct amba_pl010_data ap_uart_data;

#else

/* Not used without Integrator/AP support anyway */

struct amba_pl010_data ap_uart_data {};

#endif

void integrator_init_early(void);

int integrator_init(bool is_cp);

void integrator_reserve(void);

arch/arm/mach-integrator/core.c

+4 −46
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include <linux/memblock.h>

#include <linux/sched.h>

#include <linux/smp.h>

#include <linux/termios.h>

#include <linux/amba/bus.h>

#include <linux/amba/serial.h>

#include <linux/io.h>
@@ -47,10 +46,10 @@ static AMBA_APB_DEVICE(rtc, "rtc", 0, 
	INTEGRATOR_RTC_BASE, INTEGRATOR_RTC_IRQ, NULL);



static AMBA_APB_DEVICE(uart0, "uart0", 0,

	INTEGRATOR_UART0_BASE, INTEGRATOR_UART0_IRQ, &integrator_uart_data);

	INTEGRATOR_UART0_BASE, INTEGRATOR_UART0_IRQ, NULL);



static AMBA_APB_DEVICE(uart1, "uart1", 0,

	INTEGRATOR_UART1_BASE, INTEGRATOR_UART1_IRQ, &integrator_uart_data);

	INTEGRATOR_UART1_BASE, INTEGRATOR_UART1_IRQ, NULL);



static AMBA_APB_DEVICE(kmi0, "kmi0", 0, KMI0_BASE, KMI0_IRQ, NULL);

static AMBA_APB_DEVICE(kmi1, "kmi1", 0, KMI1_BASE, KMI1_IRQ, NULL);
@@ -78,6 +77,8 @@ int __init integrator_init(bool is_cp) 
		uart1_device.periphid	= 0x00041010;

		kmi0_device.periphid	= 0x00041050;

		kmi1_device.periphid	= 0x00041050;

		uart0_device.dev.platform_data = &ap_uart_data;

		uart1_device.dev.platform_data = &ap_uart_data;

	}



	for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {
@@ -90,49 +91,6 @@ int __init integrator_init(bool is_cp) 


#endif



/*

 * On the Integrator platform, the port RTS and DTR are provided by

 * bits in the following SC_CTRLS register bits:

 *        RTS  DTR

 *  UART0  7    6

 *  UART1  5    4

 */

#define SC_CTRLC	__io_address(INTEGRATOR_SC_CTRLC)

#define SC_CTRLS	__io_address(INTEGRATOR_SC_CTRLS)



static void integrator_uart_set_mctrl(struct amba_device *dev, void __iomem *base, unsigned int mctrl)

{

	unsigned int ctrls = 0, ctrlc = 0, rts_mask, dtr_mask;

	u32 phybase = dev->res.start;



	if (phybase == INTEGRATOR_UART0_BASE) {

		/* UART0 */

		rts_mask = 1 << 4;

		dtr_mask = 1 << 5;

	} else {

		/* UART1 */

		rts_mask = 1 << 6;

		dtr_mask = 1 << 7;

	}



	if (mctrl & TIOCM_RTS)

		ctrlc |= rts_mask;

	else

		ctrls |= rts_mask;



	if (mctrl & TIOCM_DTR)

		ctrlc |= dtr_mask;

	else

		ctrls |= dtr_mask;



	__raw_writel(ctrls, SC_CTRLS);

	__raw_writel(ctrlc, SC_CTRLC);

}



struct amba_pl010_data integrator_uart_data = {

	.set_mctrl = integrator_uart_set_mctrl,

};



static DEFINE_RAW_SPINLOCK(cm_lock);



/**

arch/arm/mach-integrator/include/mach/platform.h

+0 −1
Original line number Diff line number Diff line
@@ -190,7 +190,6 @@ 
#define INTEGRATOR_SC_CTRLC_OFFSET      0x0C

#define INTEGRATOR_SC_DEC_OFFSET        0x10

#define INTEGRATOR_SC_ARB_OFFSET        0x14

#define INTEGRATOR_SC_PCIENABLE_OFFSET  0x18

#define INTEGRATOR_SC_LOCK_OFFSET       0x1C



#define INTEGRATOR_SC_BASE              0x11000000

arch/arm/mach-integrator/integrator_ap.c

+43 −3
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include <linux/of_platform.h>

#include <linux/stat.h>

#include <linux/sys_soc.h>

#include <linux/termios.h>

#include <video/vga.h>



#include <mach/hardware.h>
@@ -63,7 +64,7 @@ 
#include "common.h"



/* Base address to the AP system controller */

static void __iomem *ap_syscon_base;

void __iomem *ap_syscon_base;



/*

 * All IO addresses are mapped onto VA 0xFFFx.xxxx, where x.xxxx
@@ -250,6 +251,45 @@ static struct physmap_flash_data ap_flash_data = { 
	.set_vpp	= ap_flash_set_vpp,

};



/*

 * For the PL010 found in the Integrator/AP some of the UART control is

 * implemented in the system controller and accessed using a callback

 * from the driver.

 */

static void integrator_uart_set_mctrl(struct amba_device *dev,

				void __iomem *base, unsigned int mctrl)

{

	unsigned int ctrls = 0, ctrlc = 0, rts_mask, dtr_mask;

	u32 phybase = dev->res.start;



	if (phybase == INTEGRATOR_UART0_BASE) {

		/* UART0 */

		rts_mask = 1 << 4;

		dtr_mask = 1 << 5;

	} else {

		/* UART1 */

		rts_mask = 1 << 6;

		dtr_mask = 1 << 7;

	}



	if (mctrl & TIOCM_RTS)

		ctrlc |= rts_mask;

	else

		ctrls |= rts_mask;



	if (mctrl & TIOCM_DTR)

		ctrlc |= dtr_mask;

	else

		ctrls |= dtr_mask;



	__raw_writel(ctrls, ap_syscon_base + INTEGRATOR_SC_CTRLS_OFFSET);

	__raw_writel(ctrlc, ap_syscon_base + INTEGRATOR_SC_CTRLC_OFFSET);

}



struct amba_pl010_data ap_uart_data = {

	.set_mctrl = integrator_uart_set_mctrl,

};



/*

 * Where is the timer (VA)?

 */
@@ -447,9 +487,9 @@ static struct of_dev_auxdata ap_auxdata_lookup[] __initdata = { 
	OF_DEV_AUXDATA("arm,primecell", INTEGRATOR_RTC_BASE,

		"rtc", NULL),

	OF_DEV_AUXDATA("arm,primecell", INTEGRATOR_UART0_BASE,

		"uart0", &integrator_uart_data),

		"uart0", &ap_uart_data),

	OF_DEV_AUXDATA("arm,primecell", INTEGRATOR_UART1_BASE,

		"uart1", &integrator_uart_data),

		"uart1", &ap_uart_data),

	OF_DEV_AUXDATA("arm,primecell", KMI0_BASE,

		"kmi0", NULL),

	OF_DEV_AUXDATA("arm,primecell", KMI1_BASE,

arch/arm/mach-integrator/integrator_cp.c

+2 −2
Original line number Diff line number Diff line
@@ -306,9 +306,9 @@ static struct of_dev_auxdata intcp_auxdata_lookup[] __initdata = { 
	OF_DEV_AUXDATA("arm,primecell", INTEGRATOR_RTC_BASE,

		"rtc", NULL),

	OF_DEV_AUXDATA("arm,primecell", INTEGRATOR_UART0_BASE,

		"uart0", &integrator_uart_data),

		"uart0", NULL),

	OF_DEV_AUXDATA("arm,primecell", INTEGRATOR_UART1_BASE,

		"uart1", &integrator_uart_data),

		"uart1", NULL),

	OF_DEV_AUXDATA("arm,primecell", KMI0_BASE,

		"kmi0", NULL),

	OF_DEV_AUXDATA("arm,primecell", KMI1_BASE,