remove id fields from struct device_d

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

22 files changed, 3 insertions, 72 deletions

diff --git a/board/at91sam9260ek/init.c b/board/at91sam9260ek/init.c
index 75149222d5..63c9deafe7 100644
--- a/board/at91sam9260ek/init.c
+++ b/board/at91sam9260ek/init.c
@@ -81,7 +81,6 @@ static struct at91sam_ether_platform_data macb_pdata = {
 
 static struct device_d macb_dev = {
 	.name     = "macb",
-	.id       = "eth0",
 	.map_base = AT91C_BASE_EMACB,
 	.size     = 0x1000,
 	.platform_data = &macb_pdata,
@@ -115,7 +114,6 @@ device_initcall(at91sam9260ek_devices_init);
 
 static struct device_d at91sam9260ek_serial_device = {
 	.name     = "atmel_serial",
-	.id       = "cs0",
 	.map_base = AT91C_BASE_DBGU,
 	.size     = 4096,
 };
diff --git a/board/eco920/eco920.c b/board/eco920/eco920.c
index 103622e5a8..30d5ac02af 100644
--- a/board/eco920/eco920.c
+++ b/board/eco920/eco920.c
@@ -42,8 +42,6 @@ static struct cfi_platform_data cfi_info = {
 
 struct device_d cfi_dev = {
 	.name     = "cfi_flash",
-	.id       = "nor0",
-
 	.map_base = 0x11000000,
 	.size     = 16 * 1024 * 1024,
 
@@ -64,7 +62,6 @@ struct device_d sdram_dev = {
 
 static struct device_d at91_ath_dev = {
 	.name     = "at91_eth",
-	.id       = "eth0",
 };
 
 static int devices_init (void)
diff --git a/board/freescale-mx35-3-stack/3stack.c b/board/freescale-mx35-3-stack/3stack.c
index 94cb9bb019..8801c01e67 100644
--- a/board/freescale-mx35-3-stack/3stack.c
+++ b/board/freescale-mx35-3-stack/3stack.c
@@ -40,8 +40,6 @@
 
 static struct device_d cfi_dev = {
 	.name     = "cfi_flash",
-	.id       = "nor0",
-
 	.map_base = 0xa0000000,
 	.size     = 64 * 1024 * 1024,
 };
@@ -64,7 +62,6 @@ static struct fec_platform_data fec_info = {
 
 static struct device_d fec_dev = {
 	.name     = "fec_imx",
-	.id       = "eth0",
 	.map_base = 0x50038000,
 	.platform_data	= &fec_info,
 };
@@ -74,7 +71,6 @@ static struct device_d fec_dev = {
  */
 static struct device_d smc911x_dev = {
 	.name     = "smc911x",
-	.id       = "eth0",
 	.map_base = IMX_CS5_BASE,
 	.size     = IMX_CS5_RANGE,	/* area size */
 };
@@ -108,7 +104,6 @@ device_initcall(f3s_devices_init);
 
 static struct device_d f3s_serial_device = {
 	.name     = "imx_serial",
-	.id       = "cs0",
 	.map_base = IMX_UART1_BASE,
 	.size     = 4096,
 };
diff --git a/board/imx21ads/imx21ads.c b/board/imx21ads/imx21ads.c
index 20dd9676f1..3e1f47ff3c 100644
--- a/board/imx21ads/imx21ads.c
+++ b/board/imx21ads/imx21ads.c
@@ -38,8 +38,6 @@
 
 static struct device_d cfi_dev = {
 	.name     = "cfi_flash",
-	.id       = "nor0",
-
 	.map_base = 0xC8000000,
 	.size     = 32 * 1024 * 1024,
 };
@@ -69,7 +67,6 @@ static struct device_d nand_dev = {
 
 static struct device_d cs8900_dev = {
 	.name     = "cs8900",
-	.id       = "eth0",
 	.map_base = IMX_CS1_BASE,
 	// IRQ is connected to UART3_RTS
 };
@@ -141,7 +138,6 @@ device_initcall(mx21ads_devices_init);
 
 static struct device_d mx21ads_serial_device = {
 	.name     = "imx_serial",
-	.id       = "cs0",
 	.map_base = IMX_UART1_BASE,
 	.size     = 4096,
 };
diff --git a/board/imx27ads/imx27ads.c b/board/imx27ads/imx27ads.c
index 2163fa1ba0..ef92d52b6f 100644
--- a/board/imx27ads/imx27ads.c
+++ b/board/imx27ads/imx27ads.c
@@ -35,8 +35,6 @@
 
 static struct device_d cfi_dev = {
 	.name     = "cfi_flash",
-	.id       = "nor0",
-
 	.map_base = 0xC0000000,
 	.size     = 32 * 1024 * 1024,
 };
@@ -60,7 +58,6 @@ static struct fec_platform_data fec_info = {
 
 static struct device_d fec_dev = {
 	.name     = "fec_imx",
-	.id       = "eth0",
 	.map_base = 0x1002b000,
 	.platform_data	= &fec_info,
 };
@@ -151,7 +148,6 @@ device_initcall(mx27ads_devices_init);
 
 static struct device_d mx27ads_serial_device = {
 	.name     = "imx_serial",
-	.id       = "cs0",
 	.map_base = IMX_UART1_BASE,
 	.size     = 4096,
 };
diff --git a/board/ipe337/ipe337.c b/board/ipe337/ipe337.c
index 3aa1be8924..b4dab3b45a 100644
--- a/board/ipe337/ipe337.c
+++ b/board/ipe337/ipe337.c
@@ -6,8 +6,6 @@
 
 static struct device_d cfi_dev = {
 	.name     = "cfi_flash",
-	.id       = "nor0",
-
 	.map_base = 0x20000000,
 	.size     = 32 * 1024 * 1024,
 };
@@ -26,7 +24,6 @@ static struct device_d sdram_dev = {
 
 static struct device_d smc911x_dev = {
 	.name     = "smc911x",
-	.id       = "eth0",
 	.map_base = 0x24000000,
 	.size     = 4096,
 };
@@ -55,7 +52,6 @@ device_initcall(ipe337_devices_init);
 
 static struct device_d blackfin_serial_device = {
 	.name     = "blackfin_serial",
-	.id       = "cs0",
 	.map_base = 0,
 	.size     = 4096,
 };
diff --git a/board/kp_ukd_r1_num/kp_ukd_r1_num.c b/board/kp_ukd_r1_num/kp_ukd_r1_num.c
index dcfee2c1c2..06b3c0bf48 100644
--- a/board/kp_ukd_r1_num/kp_ukd_r1_num.c
+++ b/board/kp_ukd_r1_num/kp_ukd_r1_num.c
@@ -43,7 +43,6 @@ ulong mcfv4e_get_bus_clk(void)
  */
 static struct device_d cfi_dev = {
 	.name     = "cfi_flash",
-	.id       = "nor0",
 	.map_base = CFG_FLASH_ADDRESS,
 	.size     = CFG_FLASH_SIZE,
 };
@@ -54,7 +53,6 @@ static struct device_d cfi_dev = {
  */
 //static struct device_d sram_dev = {
 //	.name     = "sram",
-//	.id       = "sram0",
 //FIXME	.map_base = IMX_CS4_BASE,
 //FIXME	.size     = IMX_CS4_RANGE,	/* area size */
 //};
@@ -64,7 +62,6 @@ static struct device_d cfi_dev = {
  */
 //static struct device_d nand_dev = {
 //	.name     = "cfi_flash_nand",
-//	.id       = "nand0",
 //	.map_base = 0xfc000000,	/* FIXME */
 //	.size     = 32 * 1024 * 1024,	/* FIXME */
 //};
@@ -79,14 +76,12 @@ static struct fec_platform_data fec_info = {
 
 static struct device_d network_dev0 = {
 	.name     = "fec_mcf54xx",
-	.id       = "eth0",
 	.map_base = MCF_FEC_ADDR(0),
 	.size     = MCF_FEC_SIZE(0),	   /* area size */
 	.platform_data	= &fec_info,
 };
 static struct device_d network_dev1 = {
 	.name     = "fec_mcf54xx",
-	.id       = "eth1",
 	.map_base = MCF_FEC_ADDR(1),
 	.size     = MCF_FEC_SIZE(1),	   /* area size */
 	.platform_data	= &fec_info,
@@ -140,7 +135,6 @@ device_initcall(mcfv4e_devices_init);
 
 static struct device_d mcfv4e_serial_device = {
 	.name     = "mcfv4e_serial",
-	.id       = "cs0",
 	.map_base = 1+CFG_EARLY_UART_PORT,
 	.size     = 16 * 1024,
 };
diff --git a/board/mmccpu/init.c b/board/mmccpu/init.c
index 9f4a9900c6..58edd73c43 100644
--- a/board/mmccpu/init.c
+++ b/board/mmccpu/init.c
@@ -49,8 +49,6 @@ static struct device_d sdram_dev = {
 
 static struct device_d cfi_dev = {
 	.name		= "cfi_flash",
-	.id		= "nor0",
-
 	.map_base	= 0x10000000,
 	.size		= 0,	/* zero means autodetect size */
 };
@@ -62,7 +60,6 @@ static struct at91sam_ether_platform_data macb_pdata = {
 
 static struct device_d macb_dev = {
 	.name		= "macb",
-	.id		= "eth0",
 	.map_base	= AT91C_BASE_MACB,
 	.size		= 0x1000,
 	.platform_data	= &macb_pdata,
@@ -122,7 +119,6 @@ device_initcall(mmccpu_devices_init);
 
 static struct device_d mmccpu_serial_device = {
 	.name		= "atmel_serial",
-	.id		= "cs0",
 	.map_base	= AT91C_BASE_DBGU,
 	.size		= 4096,
 };
diff --git a/board/netx/netx.c b/board/netx/netx.c
index d3fc6dc099..8af5dee749 100644
--- a/board/netx/netx.c
+++ b/board/netx/netx.c
@@ -33,8 +33,6 @@
 
 static struct device_d cfi_dev = {
 	.name     = "cfi_flash",
-	.id       = "nor0",
-
 	.map_base = 0xC0000000,
 	.size     = 32 * 1024 * 1024,
 };
@@ -57,7 +55,6 @@ struct netx_eth_platform_data eth0_data = {
 
 static struct device_d netx_eth_dev0 = {
 	.name		= "netx-eth",
-	.id		= "eth0",
 	.platform_data	= &eth0_data,
 };
 
@@ -67,7 +64,6 @@ struct netx_eth_platform_data eth1_data = {
 
 static struct device_d netx_eth_dev1 = {
 	.name		= "netx-eth",
-	.id		= "eth1",
 	.platform_data	= &eth1_data,
 };
 
@@ -95,7 +91,6 @@ device_initcall(netx_devices_init);
 
 static struct device_d netx_serial_device = {
 	.name     = "netx_serial",
-	.id       = "cs0",
 	.map_base = NETX_PA_UART0,
 	.size     = 0x40,
 };
diff --git a/board/omap/board-beagle.c b/board/omap/board-beagle.c
index b7b89f9e26..5da64d4997 100644
--- a/board/omap/board-beagle.c
+++ b/board/omap/board-beagle.c
@@ -216,7 +216,6 @@ static struct NS16550_plat serial_plat = {
 
 static struct device_d beagle_serial_device = {
        .name = "serial_ns16550",
-       .id = "uart3",
        .map_base = OMAP_UART3_BASE,
        .size = 1024,
        .platform_data = (void *)&serial_plat,
diff --git a/board/omap/board-sdp343x.c b/board/omap/board-sdp343x.c
index f6f389e3f2..2ddc5c2718 100644
--- a/board/omap/board-sdp343x.c
+++ b/board/omap/board-sdp343x.c
@@ -605,7 +605,6 @@ static struct NS16550_plat serial_plat = {
 
 static struct device_d sdp3430_serial_device = {
 	.name = "serial_ns16550",
-	.id = "uart3",
 	.map_base = OMAP_UART3_BASE,
 	.size = 1024,
 	.platform_data = (void *)&serial_plat,
diff --git a/board/omap/devices-gpmc-nand.c b/board/omap/devices-gpmc-nand.c
index d3d3ec91e3..d6db8a36de 100644
--- a/board/omap/devices-gpmc-nand.c
+++ b/board/omap/devices-gpmc-nand.c
@@ -113,7 +113,6 @@ static struct gpmc_nand_platform_data nand_plat = {
 /** NAND device definition */
 static struct device_d gpmc_generic_nand_nand_device = {
 	.name = "gpmc_nand",
-	.id = "gpmc_nand0",
 	.map_base = OMAP_GPMC_BASE,
 	.size = 1024 * 4,	/* GPMC size */
 	.platform_data = (void *)&nand_plat,
diff --git a/board/pcm030/pcm030.c b/board/pcm030/pcm030.c
index e26af00da9..aa41e61a33 100644
--- a/board/pcm030/pcm030.c
+++ b/board/pcm030/pcm030.c
@@ -44,8 +44,6 @@
 
 struct device_d cfi_dev = {
 	.name     = "cfi_flash",
-	.id       = "nor0",
-
 	.map_base = 0xff000000,
 	.size     = 16 * 1024 * 1024,
 };
@@ -68,7 +66,6 @@ static struct mpc5xxx_fec_platform_data fec_info = {
 
 struct device_d eth_dev = {
 	.name		= "fec_mpc5xxx",
-	.id		= "eth0",
 	.map_base	= MPC5XXX_FEC,
 	.platform_data	= &fec_info,
 };
@@ -89,14 +86,12 @@ device_initcall(devices_init);
 
 static struct device_d psc3 = {
 	.name     = "mpc5xxx_serial",
-	.id       = "psc3",
 	.map_base = MPC5XXX_PSC3,
 	.size     = 4096,
 };
 
 static struct device_d psc6 = {
 	.name     = "mpc5xxx_serial",
-	.id       = "psc6",
 	.map_base = MPC5XXX_PSC6,
 	.size     = 4096,
 };
diff --git a/board/pcm037/pcm037.c b/board/pcm037/pcm037.c
index e2ac8b1bbd..eec41cae1f 100644
--- a/board/pcm037/pcm037.c
+++ b/board/pcm037/pcm037.c
@@ -70,7 +70,6 @@ static struct device_d sram_dev = {
  */
 static struct device_d network_dev = {
 	.name     = "smc911x",
-	.id       = "eth0",
 	.map_base = IMX_CS1_BASE,
 	.size     = IMX_CS1_RANGE,	/* area size */
 };
@@ -128,14 +127,12 @@ static struct device_d nand_dev = {
 #ifdef CONFIG_USB
 static struct device_d usbotg_dev = {
 	.name     = "ehci",
-	.id       = "ehci0",
 	.map_base = IMX_OTG_BASE,
 	.size     = 0x200,
 };
 
 static struct device_d usbh2_dev = {
 	.name     = "ehci",
-	.id       = "ehci1",
 	.map_base = IMX_OTG_BASE + 0x400,
 	.size     = 0x200,
 };
@@ -285,7 +282,6 @@ device_initcall(imx31_devices_init);
 
 static struct device_d imx31_serial_device = {
 	.name     = "imx_serial",
-	.id       = "cs0",
 	.map_base = IMX_UART1_BASE,
 	.size     = 16 * 1024,
 };
diff --git a/board/pcm038/pcm038.c b/board/pcm038/pcm038.c
index 7866499686..4bf193c538 100644
--- a/board/pcm038/pcm038.c
+++ b/board/pcm038/pcm038.c
@@ -77,7 +77,6 @@ static struct fec_platform_data fec_info = {
 
 static struct device_d fec_dev = {
 	.name     = "fec_imx",
-	.id       = "eth0",
 	.map_base = 0x1002b000,
 	.platform_data	= &fec_info,
 };
@@ -211,7 +210,6 @@ device_initcall(pcm038_devices_init);
 
 static struct device_d pcm038_serial_device = {
 	.name     = "imx_serial",
-	.id       = "cs0",
 	.map_base = IMX_UART1_BASE,
 	.size     = 4096,
 };
diff --git a/board/pcm043/pcm043.c b/board/pcm043/pcm043.c
index a01e94482c..55c6ba31d1 100644
--- a/board/pcm043/pcm043.c
+++ b/board/pcm043/pcm043.c
@@ -50,7 +50,6 @@
  */
 static struct device_d cfi_dev = {
 	.name     = "cfi_flash",
-	.id       = "nor0",
 	.map_base = IMX_CS0_BASE,
 	.size     = 32 * 1024 * 1024,	/* area size */
 };
@@ -61,7 +60,6 @@ static struct fec_platform_data fec_info = {
 
 static struct device_d fec_dev = {
 	.name     = "fec_imx",
-	.id       = "eth0",
 	.map_base = 0x50038000,
 	.platform_data	= &fec_info,
 };
@@ -124,7 +122,6 @@ device_initcall(imx35_devices_init);
 
 static struct device_d imx35_serial_device = {
 	.name     = "imx_serial",
-	.id       = "cs0",
 	.map_base = IMX_UART1_BASE,
 	.size     = 16 * 1024,
 };
diff --git a/board/phycard-i.MX27/pca100.c b/board/phycard-i.MX27/pca100.c
index 160b8cea99..dfc9761222 100644
--- a/board/phycard-i.MX27/pca100.c
+++ b/board/phycard-i.MX27/pca100.c
@@ -57,7 +57,6 @@ static struct fec_platform_data fec_info = {
 
 static struct device_d fec_dev = {
 	.name     = "fec_imx",
-	.id       = "eth0",
 	.map_base = 0x1002b000,
 	.platform_data	= &fec_info,
 };
@@ -126,7 +125,7 @@ static int pca100_devices_init(void)
 
 	PCCR1 |= PCCR1_PERCLK2_EN;
 
-	nand = get_device_by_path("/dev/nand0");
+	nand = get_device_by_name("nand0");
 	devfs_add_partition("nand0", 0x00000, 0x40000, PARTITION_FIXED, "self_raw");
 	dev_add_bb_dev("self_raw", "self0");
 
@@ -144,7 +143,6 @@ device_initcall(pca100_devices_init);
 
 static struct device_d pca100_serial_device = {
 	.name     = "imx_serial",
-	.id       = "cs0",
 	.map_base = IMX_UART1_BASE,
 	.size     = 4096,
 };
diff --git a/board/phycore_mcf54xx/phyCore_MCF54xx.c b/board/phycore_mcf54xx/phyCore_MCF54xx.c
index 279307788c..128515a510 100644
--- a/board/phycore_mcf54xx/phyCore_MCF54xx.c
+++ b/board/phycore_mcf54xx/phyCore_MCF54xx.c
@@ -46,7 +46,6 @@ ulong mcfv4e_get_bus_clk(void)
 static struct device_d cfi_dev =
 {
 	.name     = "cfi_flash",
-	.id       = "nor0",
 	.map_base = CFG_FLASH_ADDRESS,
 	.size     = CFG_FLASH_SIZE,
 };
@@ -62,7 +61,6 @@ static struct fec_platform_data fec_info =
 static struct device_d network_dev0 =
 {
 	.name     = "fec_mcf54xx",
-	.id       = "eth0",
 	.map_base = MCF_FEC_ADDR(0),
 	.size     = MCF_FEC_SIZE(0),	   /* area size */
 	.platform_data	= &fec_info,
@@ -70,7 +68,6 @@ static struct device_d network_dev0 =
 static struct device_d network_dev1 =
 {
 	.name     = "fec_mcf54xx",
-	.id       = "eth1",
 	.map_base = MCF_FEC_ADDR(1),
 	.size     = MCF_FEC_SIZE(1),	   /* area size */
 	.platform_data	= &fec_info,
@@ -119,7 +116,6 @@ device_initcall(mcfv4e_devices_init);
 static struct device_d mcfv4e_serial_device =
 {
 	.name     = "mcfv4e_serial",
-	.id       = "cs0",
 	.map_base = 1 + CFG_EARLY_UART_PORT,
 	.size     = 16 * 1024,
 };
diff --git a/board/pm9263/init.c b/board/pm9263/init.c
index fd0102edc7..3cdfe7fe38 100644
--- a/board/pm9263/init.c
+++ b/board/pm9263/init.c
@@ -49,8 +49,6 @@ static struct device_d sdram_dev = {
 
 static struct device_d cfi_dev = {
 	.name     = "cfi_flash",
-	.id       = "nor0",
-
 	.map_base = 0x10000000,
 	.size     = 4 * 1024 * 1024,
 };
@@ -62,7 +60,6 @@ static struct at91sam_ether_platform_data macb_pdata = {
 
 static struct device_d macb_dev = {
 	.name     = "macb",
-	.id       = "eth0",
 	.map_base = AT91C_BASE_MACB,
 	.size     = 0x1000,
 	.platform_data = &macb_pdata,
@@ -113,7 +110,6 @@ device_initcall(pm9263_devices_init);
 
 static struct device_d pm9263_serial_device = {
 	.name     = "atmel_serial",
-	.id       = "cs0",
 	.map_base = AT91C_BASE_DBGU,
 	.size     = 4096,
 };
diff --git a/board/sandbox/board.c b/board/sandbox/board.c
index c0397ab0ab..a3f64983c4 100644
--- a/board/sandbox/board.c
+++ b/board/sandbox/board.c
@@ -29,7 +29,6 @@
 
 static struct device_d tap_device = {
         .name     = "tap",
-        .id       = "eth0",
 };
 
 static int devices_init(void)
diff --git a/board/sandbox/console.c b/board/sandbox/console.c
index a3d2ce93c6..7b429df8b3 100644
--- a/board/sandbox/console.c
+++ b/board/sandbox/console.c
@@ -25,7 +25,7 @@
 #include <asm/arch/linux.h>
 #include <xfuncs.h>
 
-int u_boot_register_console(char *name_template, int stdinfd, int stdoutfd)
+int u_boot_register_console(char *name, int stdinfd, int stdoutfd)
 {
 	struct device_d *dev;
 	struct linux_console_data *data;
@@ -35,10 +35,10 @@ int u_boot_register_console(char *name_template, int stdinfd, int stdoutfd)
 	data = (struct linux_console_data *)(dev + 1);
 
 	dev->platform_data = data;
+	strcpy(dev->name, name);
 
 	strcpy(dev->name, "console");
 
-
 	if (stdinfd >= 0)
 		data->flags = CONSOLE_STDIN;
 	if (stdoutfd >= 0)
@@ -47,8 +47,6 @@ int u_boot_register_console(char *name_template, int stdinfd, int stdoutfd)
 	data->stdoutfd = stdoutfd;
 	data->stdinfd  = stdinfd;
 
-	get_free_deviceid(dev->id, name_template);
-
 	return register_device(dev);
 }
 
diff --git a/board/scb9328/scb9328.c b/board/scb9328/scb9328.c
index 80d60378d0..c7e53dfb9d 100644
--- a/board/scb9328/scb9328.c
+++ b/board/scb9328/scb9328.c
@@ -60,7 +60,6 @@ static struct dm9000_platform_data dm9000_data = {
 
 static struct device_d dm9000_dev = {
 	.name     = "dm9000",
-	.id       = "eth0",
 	.map_base = 0x16000000,
 	.size     = 8,
 	.platform_data = &dm9000_data,
@@ -108,7 +107,6 @@ device_initcall(scb9328_devices_init);
 
 static struct device_d scb9328_serial_device = {
 	.name     = "imx_serial",
-	.id       = "cs0",
 	.map_base = IMX_UART1_BASE,
 	.size     = 4096,
 };