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

Commit d6ada860 authored by Linus Walleij's avatar Linus Walleij Committed by Russell King
Browse files

ARM: 6227/1: PL022 SSP platform data for the RealViews 



This adds platform data for the PL022 to the ARM RealView reference
designs, adds the necessary clock definition and fixes a badly
defined IRQ line on the PB1176.

Signed-off-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 48f1d5a3

arch/arm/mach-realview/core.c

+3 −0
Original line number Diff line number Diff line
@@ -349,6 +349,9 @@ static struct clk_lookup lookups[] = { 
	}, {	/* PB:CLCD */

		.dev_id		= "issp:clcd",

		.clk		= &oscvco_clk,

	}, {	/* SSP */

		.dev_id		= "dev:ssp0",

		.clk		= &ref24_clk,

	}

};

arch/arm/mach-realview/include/mach/irqs-pb1176.h

+1 −1
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#define IRQ_DC1176_L2CC		(IRQ_DC1176_GIC_START + 13)

#define IRQ_DC1176_RTC		(IRQ_DC1176_GIC_START + 14)

#define IRQ_DC1176_CLCD		(IRQ_DC1176_GIC_START + 15)	/* CLCD controller */

#define IRQ_DC1176_SSP		(IRQ_DC1176_GIC_START + 17)	/* SSP port */

#define IRQ_DC1176_UART0	(IRQ_DC1176_GIC_START + 18)	/* UART 0 on development chip */

#define IRQ_DC1176_UART1	(IRQ_DC1176_GIC_START + 19)	/* UART 1 on development chip */

#define IRQ_DC1176_UART2	(IRQ_DC1176_GIC_START + 20)	/* UART 2 on development chip */
@@ -73,7 +74,6 @@ 
#define IRQ_PB1176_RTC		(IRQ_PB1176_GIC_START + 25)	/* Real Time Clock */



#define IRQ_PB1176_GPIO0	-1

#define IRQ_PB1176_SSP		-1

#define IRQ_PB1176_SCTL		-1



#define NR_GIC_PB1176		2

arch/arm/mach-realview/realview_eb.c

+8 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/amba/bus.h>

#include <linux/amba/pl061.h>

#include <linux/amba/mmci.h>

#include <linux/amba/pl022.h>

#include <linux/io.h>



#include <mach/hardware.h>
@@ -129,6 +130,12 @@ static struct pl061_platform_data gpio2_plat_data = { 
	.irq_base	= -1,

};



static struct pl022_ssp_controller ssp0_plat_data = {

	.bus_id = 0,

	.enable_dma = 0,

	.num_chipselect = 1,

};



/*

 * RealView EB AMBA devices

 */
@@ -213,7 +220,7 @@ AMBA_DEVICE(sci0, "dev:sci0", SCI, NULL); 
AMBA_DEVICE(uart0, "dev:uart0", EB_UART0, NULL);

AMBA_DEVICE(uart1, "dev:uart1", EB_UART1, NULL);

AMBA_DEVICE(uart2, "dev:uart2", EB_UART2, NULL);

AMBA_DEVICE(ssp0,  "dev:ssp0",  EB_SSP,   NULL);

AMBA_DEVICE(ssp0,  "dev:ssp0",  EB_SSP,   &ssp0_plat_data);



static struct amba_device *amba_devs[] __initdata = {

	&dmac_device,

arch/arm/mach-realview/realview_pb1176.c

+9 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/amba/bus.h>

#include <linux/amba/pl061.h>

#include <linux/amba/mmci.h>

#include <linux/amba/pl022.h>

#include <linux/io.h>



#include <mach/hardware.h>
@@ -123,6 +124,12 @@ static struct pl061_platform_data gpio2_plat_data = { 
	.irq_base	= -1,

};



static struct pl022_ssp_controller ssp0_plat_data = {

	.bus_id = 0,

	.enable_dma = 0,

	.num_chipselect = 1,

};



/*

 * RealView PB1176 AMBA devices

 */
@@ -166,7 +173,7 @@ static struct pl061_platform_data gpio2_plat_data = { 
#define PB1176_UART3_DMA	{ 0x86, 0x87 }

#define PB1176_UART4_IRQ	{ IRQ_PB1176_UART4, NO_IRQ }

#define PB1176_UART4_DMA	{ 0, 0 }

#define PB1176_SSP_IRQ		{ IRQ_PB1176_SSP, NO_IRQ }

#define PB1176_SSP_IRQ		{ IRQ_DC1176_SSP, NO_IRQ }

#define PB1176_SSP_DMA		{ 9, 8 }



/* FPGA Primecells */
@@ -189,7 +196,7 @@ AMBA_DEVICE(uart0, "dev:uart0", PB1176_UART0, NULL); 
AMBA_DEVICE(uart1,	"dev:uart1",	PB1176_UART1,	NULL);

AMBA_DEVICE(uart2,	"dev:uart2",	PB1176_UART2,	NULL);

AMBA_DEVICE(uart3,	"dev:uart3",	PB1176_UART3,	NULL);

AMBA_DEVICE(ssp0,	"dev:ssp0",	PB1176_SSP,	NULL);

AMBA_DEVICE(ssp0,	"dev:ssp0",	PB1176_SSP,	&ssp0_plat_data);

AMBA_DEVICE(clcd,	"dev:clcd",	PB1176_CLCD,	&clcd_plat_data);



static struct amba_device *amba_devs[] __initdata = {

arch/arm/mach-realview/realview_pb11mp.c

+8 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/amba/bus.h>

#include <linux/amba/pl061.h>

#include <linux/amba/mmci.h>

#include <linux/amba/pl022.h>

#include <linux/io.h>



#include <mach/hardware.h>
@@ -124,6 +125,12 @@ static struct pl061_platform_data gpio2_plat_data = { 
	.irq_base	= -1,

};



static struct pl022_ssp_controller ssp0_plat_data = {

	.bus_id = 0,

	.enable_dma = 0,

	.num_chipselect = 1,

};



/*

 * RealView PB11MPCore AMBA devices

 */
@@ -190,7 +197,7 @@ AMBA_DEVICE(sci0, "dev:sci0", SCI, NULL); 
AMBA_DEVICE(uart0,	"dev:uart0",	PB11MP_UART0,	NULL);

AMBA_DEVICE(uart1,	"dev:uart1",	PB11MP_UART1,	NULL);

AMBA_DEVICE(uart2,	"dev:uart2",	PB11MP_UART2,	NULL);

AMBA_DEVICE(ssp0,	"dev:ssp0",	PB11MP_SSP,	NULL);

AMBA_DEVICE(ssp0,	"dev:ssp0",	PB11MP_SSP,	&ssp0_plat_data);



/* Primecells on the NEC ISSP chip */

AMBA_DEVICE(clcd,	"issp:clcd",	PB11MP_CLCD,	&clcd_plat_data);