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

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

ARM: 5718/1: Sane busids for RealView board components 



This removes the totally bogus bus ID:s with two-digit hex numerals
either referring to the base address of corresponding versatile
machine or just some arbitrarily chosen digit in favor of just using
the device identifier as a string. I kept the "dev:" prefix for
DevChips, "fpga:" prefix for FPGA:s and "issp:" prefix for the
other processor bus, just in case someone likes them.

Signed-off-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 59b69e27

arch/arm/mach-realview/core.c

+9 −9
Original line number Diff line number Diff line
@@ -296,31 +296,31 @@ static struct clk ref24_clk = { 


static struct clk_lookup lookups[] = {

	{	/* UART0 */

		.dev_id		= "dev:f1",

		.dev_id		= "dev:uart0",

		.clk		= &ref24_clk,

	}, {	/* UART1 */

		.dev_id		= "dev:f2",

		.dev_id		= "dev:uart1",

		.clk		= &ref24_clk,

	}, {	/* UART2 */

		.dev_id		= "dev:f3",

		.dev_id		= "dev:uart2",

		.clk		= &ref24_clk,

	}, {	/* UART3 */

		.dev_id		= "fpga:09",

		.dev_id		= "fpga:uart3",

		.clk		= &ref24_clk,

	}, {	/* KMI0 */

		.dev_id		= "fpga:06",

		.dev_id		= "fpga:kmi0",

		.clk		= &ref24_clk,

	}, {	/* KMI1 */

		.dev_id		= "fpga:07",

		.dev_id		= "fpga:kmi1",

		.clk		= &ref24_clk,

	}, {	/* MMC0 */

		.dev_id		= "fpga:05",

		.dev_id		= "fpga:mmc0",

		.clk		= &ref24_clk,

	}, {	/* EB:CLCD */

		.dev_id		= "dev:20",

		.dev_id		= "dev:clcd",

		.clk		= &oscvco_clk,

	}, {	/* PB:CLCD */

		.dev_id		= "issp:20",

		.dev_id		= "issp:clcd",

		.clk		= &oscvco_clk,

	}

};

arch/arm/mach-realview/realview_eb.c

+19 −19
Original line number Diff line number Diff line
@@ -193,27 +193,27 @@ static struct pl061_platform_data gpio2_plat_data = { 
#define EB_SSP_DMA	{ 9, 8 }



/* FPGA Primecells */

AMBA_DEVICE(aaci,  "fpga:04", AACI,     NULL);

AMBA_DEVICE(mmc0,  "fpga:05", MMCI0,    &realview_mmc0_plat_data);

AMBA_DEVICE(kmi0,  "fpga:06", KMI0,     NULL);

AMBA_DEVICE(kmi1,  "fpga:07", KMI1,     NULL);

AMBA_DEVICE(uart3, "fpga:09", EB_UART3, NULL);

AMBA_DEVICE(aaci,  "fpga:aaci",  AACI,     NULL);

AMBA_DEVICE(mmc0,  "fpga:mmc0",  MMCI0,    &realview_mmc0_plat_data);

AMBA_DEVICE(kmi0,  "fpga:kmi0",  KMI0,     NULL);

AMBA_DEVICE(kmi1,  "fpga:kmi1",  KMI1,     NULL);

AMBA_DEVICE(uart3, "fpga:uart3", EB_UART3, NULL);



/* DevChip Primecells */

AMBA_DEVICE(smc,   "dev:00",  EB_SMC,   NULL);

AMBA_DEVICE(clcd,  "dev:20",  EB_CLCD,  &clcd_plat_data);

AMBA_DEVICE(dmac,  "dev:30",  DMAC,     NULL);

AMBA_DEVICE(sctl,  "dev:e0",  SCTL,     NULL);

AMBA_DEVICE(wdog,  "dev:e1",  EB_WATCHDOG, NULL);

AMBA_DEVICE(gpio0, "dev:e4",  EB_GPIO0, &gpio0_plat_data);

AMBA_DEVICE(gpio1, "dev:e5",  GPIO1,    &gpio1_plat_data);

AMBA_DEVICE(gpio2, "dev:e6",  GPIO2,    &gpio2_plat_data);

AMBA_DEVICE(rtc,   "dev:e8",  EB_RTC,   NULL);

AMBA_DEVICE(sci0,  "dev:f0",  SCI,      NULL);

AMBA_DEVICE(uart0, "dev:f1",  EB_UART0, NULL);

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

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

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

AMBA_DEVICE(smc,   "dev:smc",   EB_SMC,   NULL);

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

AMBA_DEVICE(dmac,  "dev:dmac",  DMAC,     NULL);

AMBA_DEVICE(sctl,  "dev:sctl",  SCTL,     NULL);

AMBA_DEVICE(wdog,  "dev:wdog",  EB_WATCHDOG, NULL);

AMBA_DEVICE(gpio0, "dev:gpio0", EB_GPIO0, &gpio0_plat_data);

AMBA_DEVICE(gpio1, "dev:gpio1", GPIO1,    &gpio1_plat_data);

AMBA_DEVICE(gpio2, "dev:gpio2", GPIO2,    &gpio2_plat_data);

AMBA_DEVICE(rtc,   "dev:rtc",   EB_RTC,   NULL);

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);



static struct amba_device *amba_devs[] __initdata = {

	&dmac_device,

arch/arm/mach-realview/realview_pb1176.c

+19 −19
Original line number Diff line number Diff line
@@ -170,29 +170,29 @@ static struct pl061_platform_data gpio2_plat_data = { 
#define PB1176_SSP_DMA		{ 9, 8 }



/* FPGA Primecells */

AMBA_DEVICE(aaci,	"fpga:04",	AACI,		NULL);

AMBA_DEVICE(mmc0,	"fpga:05",	MMCI0,		&realview_mmc0_plat_data);

AMBA_DEVICE(kmi0,	"fpga:06",	KMI0,		NULL);

AMBA_DEVICE(kmi1,	"fpga:07",	KMI1,		NULL);

AMBA_DEVICE(uart3,	"fpga:09",	PB1176_UART3,	NULL);

AMBA_DEVICE(aaci,	"fpga:aaci",	AACI,		NULL);

AMBA_DEVICE(mmc0,	"fpga:mmc0",	MMCI0,		&realview_mmc0_plat_data);

AMBA_DEVICE(kmi0,	"fpga:kmi0",	KMI0,		NULL);

AMBA_DEVICE(kmi1,	"fpga:kmi1",	KMI1,		NULL);

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



/* DevChip Primecells */

AMBA_DEVICE(smc,	"dev:00",	PB1176_SMC,	NULL);

AMBA_DEVICE(sctl,	"dev:e0",	SCTL,		NULL);

AMBA_DEVICE(wdog,	"dev:e1",	PB1176_WATCHDOG,	NULL);

AMBA_DEVICE(gpio0,	"dev:e4",	PB1176_GPIO0,	&gpio0_plat_data);

AMBA_DEVICE(gpio1,	"dev:e5",	GPIO1,		&gpio1_plat_data);

AMBA_DEVICE(gpio2,	"dev:e6",	GPIO2,		&gpio2_plat_data);

AMBA_DEVICE(rtc,	"dev:e8",	PB1176_RTC,	NULL);

AMBA_DEVICE(sci0,	"dev:f0",	SCI,		NULL);

AMBA_DEVICE(uart0,	"dev:f1",	PB1176_UART0,	NULL);

AMBA_DEVICE(uart1,	"dev:f2",	PB1176_UART1,	NULL);

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

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

AMBA_DEVICE(smc,	"dev:smc",	PB1176_SMC,	NULL);

AMBA_DEVICE(sctl,	"dev:sctl",	SCTL,		NULL);

AMBA_DEVICE(wdog,	"dev:wdog",	PB1176_WATCHDOG,	NULL);

AMBA_DEVICE(gpio0,	"dev:gpio0",	PB1176_GPIO0,	&gpio0_plat_data);

AMBA_DEVICE(gpio1,	"dev:gpio1",	GPIO1,		&gpio1_plat_data);

AMBA_DEVICE(gpio2,	"dev:gpio2",	GPIO2,		&gpio2_plat_data);

AMBA_DEVICE(rtc,	"dev:rtc",	PB1176_RTC,	NULL);

AMBA_DEVICE(sci0,	"dev:sci0",	SCI,		NULL);

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(ssp0,	"dev:ssp0",	PB1176_SSP,	NULL);



/* Primecells on the NEC ISSP chip */

AMBA_DEVICE(clcd,	"issp:20",	PB1176_CLCD,	&clcd_plat_data);

//AMBA_DEVICE(dmac,	"issp:30",	PB1176_DMAC,	NULL);

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

//AMBA_DEVICE(dmac,	"issp:dmac",	PB1176_DMAC,	NULL);



static struct amba_device *amba_devs[] __initdata = {

//	&dmac_device,

arch/arm/mach-realview/realview_pb11mp.c

+19 −19
Original line number Diff line number Diff line
@@ -172,29 +172,29 @@ static struct pl061_platform_data gpio2_plat_data = { 
#define PB11MP_SSP_DMA		{ 9, 8 }



/* FPGA Primecells */

AMBA_DEVICE(aaci,	"fpga:04",	AACI,		NULL);

AMBA_DEVICE(mmc0,	"fpga:05",	MMCI0,		&realview_mmc0_plat_data);

AMBA_DEVICE(kmi0,	"fpga:06",	KMI0,		NULL);

AMBA_DEVICE(kmi1,	"fpga:07",	KMI1,		NULL);

AMBA_DEVICE(uart3,	"fpga:09",	PB11MP_UART3,	NULL);

AMBA_DEVICE(aaci,	"fpga:aaci",	AACI,		NULL);

AMBA_DEVICE(mmc0,	"fpga:mmc0",	MMCI0,		&realview_mmc0_plat_data);

AMBA_DEVICE(kmi0,	"fpga:kmi0",	KMI0,		NULL);

AMBA_DEVICE(kmi1,	"fpga:kmi1",	KMI1,		NULL);

AMBA_DEVICE(uart3,	"fpga:uart3",	PB11MP_UART3,	NULL);



/* DevChip Primecells */

AMBA_DEVICE(smc,	"dev:00",	PB11MP_SMC,	NULL);

AMBA_DEVICE(sctl,	"dev:e0",	SCTL,		NULL);

AMBA_DEVICE(wdog,	"dev:e1",	PB11MP_WATCHDOG, NULL);

AMBA_DEVICE(gpio0,	"dev:e4",	PB11MP_GPIO0,	&gpio0_plat_data);

AMBA_DEVICE(gpio1,	"dev:e5",	GPIO1,		&gpio1_plat_data);

AMBA_DEVICE(gpio2,	"dev:e6",	GPIO2,		&gpio2_plat_data);

AMBA_DEVICE(rtc,	"dev:e8",	PB11MP_RTC,	NULL);

AMBA_DEVICE(sci0,	"dev:f0",	SCI,		NULL);

AMBA_DEVICE(uart0,	"dev:f1",	PB11MP_UART0,	NULL);

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

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

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

AMBA_DEVICE(smc,	"dev:smc",	PB11MP_SMC,	NULL);

AMBA_DEVICE(sctl,	"dev:sctl",	SCTL,		NULL);

AMBA_DEVICE(wdog,	"dev:wdog",	PB11MP_WATCHDOG, NULL);

AMBA_DEVICE(gpio0,	"dev:gpio0",	PB11MP_GPIO0,	&gpio0_plat_data);

AMBA_DEVICE(gpio1,	"dev:gpio1",	GPIO1,		&gpio1_plat_data);

AMBA_DEVICE(gpio2,	"dev:gpio2",	GPIO2,		&gpio2_plat_data);

AMBA_DEVICE(rtc,	"dev:rtc",	PB11MP_RTC,	NULL);

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);



/* Primecells on the NEC ISSP chip */

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

AMBA_DEVICE(dmac,	"issp:30",	DMAC,		NULL);

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

AMBA_DEVICE(dmac,	"issp:dmac",	DMAC,		NULL);



static struct amba_device *amba_devs[] __initdata = {

	&dmac_device,

arch/arm/mach-realview/realview_pba8.c

+19 −19
Original line number Diff line number Diff line
@@ -162,29 +162,29 @@ static struct pl061_platform_data gpio2_plat_data = { 
#define PBA8_SSP_DMA		{ 9, 8 }



/* FPGA Primecells */

AMBA_DEVICE(aaci,	"fpga:04",	AACI,		NULL);

AMBA_DEVICE(mmc0,	"fpga:05",	MMCI0,		&realview_mmc0_plat_data);

AMBA_DEVICE(kmi0,	"fpga:06",	KMI0,		NULL);

AMBA_DEVICE(kmi1,	"fpga:07",	KMI1,		NULL);

AMBA_DEVICE(uart3,	"fpga:09",	PBA8_UART3,	NULL);

AMBA_DEVICE(aaci,	"fpga:aaci",	AACI,		NULL);

AMBA_DEVICE(mmc0,	"fpga:mmc0",	MMCI0,		&realview_mmc0_plat_data);

AMBA_DEVICE(kmi0,	"fpga:kmi0",	KMI0,		NULL);

AMBA_DEVICE(kmi1,	"fpga:kmi1",	KMI1,		NULL);

AMBA_DEVICE(uart3,	"fpga:uart3",	PBA8_UART3,	NULL);



/* DevChip Primecells */

AMBA_DEVICE(smc,	"dev:00",	PBA8_SMC,	NULL);

AMBA_DEVICE(sctl,	"dev:e0",	SCTL,		NULL);

AMBA_DEVICE(wdog,	"dev:e1",	PBA8_WATCHDOG, NULL);

AMBA_DEVICE(gpio0,	"dev:e4",	PBA8_GPIO0,	&gpio0_plat_data);

AMBA_DEVICE(gpio1,	"dev:e5",	GPIO1,		&gpio1_plat_data);

AMBA_DEVICE(gpio2,	"dev:e6",	GPIO2,		&gpio2_plat_data);

AMBA_DEVICE(rtc,	"dev:e8",	PBA8_RTC,	NULL);

AMBA_DEVICE(sci0,	"dev:f0",	SCI,		NULL);

AMBA_DEVICE(uart0,	"dev:f1",	PBA8_UART0,	NULL);

AMBA_DEVICE(uart1,	"dev:f2",	PBA8_UART1,	NULL);

AMBA_DEVICE(uart2,	"dev:f3",	PBA8_UART2,	NULL);

AMBA_DEVICE(ssp0,	"dev:f4",	PBA8_SSP,	NULL);

AMBA_DEVICE(smc,	"dev:smc",	PBA8_SMC,	NULL);

AMBA_DEVICE(sctl,	"dev:sctl",	SCTL,		NULL);

AMBA_DEVICE(wdog,	"dev:wdog",	PBA8_WATCHDOG, NULL);

AMBA_DEVICE(gpio0,	"dev:gpio0",	PBA8_GPIO0,	&gpio0_plat_data);

AMBA_DEVICE(gpio1,	"dev:gpio1",	GPIO1,		&gpio1_plat_data);

AMBA_DEVICE(gpio2,	"dev:gpio2",	GPIO2,		&gpio2_plat_data);

AMBA_DEVICE(rtc,	"dev:rtc",	PBA8_RTC,	NULL);

AMBA_DEVICE(sci0,	"dev:sci0",	SCI,		NULL);

AMBA_DEVICE(uart0,	"dev:uart0",	PBA8_UART0,	NULL);

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

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

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



/* Primecells on the NEC ISSP chip */

AMBA_DEVICE(clcd,	"issp:20",	PBA8_CLCD,	&clcd_plat_data);

AMBA_DEVICE(dmac,	"issp:30",	DMAC,		NULL);

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

AMBA_DEVICE(dmac,	"issp:dmac",	DMAC,		NULL);



static struct amba_device *amba_devs[] __initdata = {

	&dmac_device,