diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2012-11-03 16:11:05 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-19 11:36:33 +0100 |
| commit | c2e568d19c5c34a05a1002d25280bf113b72b752 (patch) | |
| tree | 82c01d2de3a76354d059e58efc2adb0ad9ae4a91 /drivers/base | |
| parent | 543cf11ad41a11ab36984e5ea35761c02a66a0db (diff) | |
| download | barebox-c2e568d19c5c34a05a1002d25280bf113b72b752.tar.gz barebox-c2e568d19c5c34a05a1002d25280bf113b72b752.tar.xz | |
bus: add bus device
automatically add it as parent of any bus device if none already specified
we have now a nice output per bus
barebox@Atmel at91sam9x5-ek:/
devices:
`---- platform
`---- atmel_usart0
`---- cs0
`---- atmel_usart1
`---- cs1
`---- mem0
`---- 0x00000000-0x07ffffff: /dev/ram0
`---- mem1
`---- 0x00000000-0x00007fff: /dev/sram0
`---- mem2
`---- 0x00000000-0x000037bf: /dev/defaultenv
`---- mem3
`---- 0x00000000-0xfffffffe: /dev/mem
`---- cs2
`---- w1-gpio
`---- w1_bus0
`---- w1-2d-0
`---- 0x00000000-0x0000007f: /dev/ds24310
`---- w1-2d-1
`---- 0x00000000-0x0000007f: /dev/ds24311
`---- w1-23-0
`---- 0x00000000-0x000001ff: /dev/ds24330
`---- at91sam9x5cm
`---- at91sam9x5ek
`---- at91sam9x5dm
`---- atmel_nand0
`---- nand0
`---- 0x00000000-0x1fffffff: /dev/nand0
`---- 0x00000000-0x0003ffff: /dev/at91bootstrap_raw
`---- 0x00040000-0x0009ffff: /dev/self_raw
`---- 0x000a0000-0x000bffff: /dev/env_raw
`---- 0x000c0000-0x000dffff: /dev/env_raw1
`---- 0x00000000-0x0003ffff: /dev/nand0.at91bootstrap
`---- 0x00040000-0x0009ffff: /dev/nand0.barebox
`---- 0x000a0000-0x000bffff: /dev/nand0.bareboxenv
`---- 0x000c0000-0x000dffff: /dev/nand0.bareboxenv2
`---- 0x000e0000-0x000fffff: /dev/nand0.oftree
`---- 0x00100000-0x001fffff: /dev/nand0.free
`---- 0x00200000-0x007fffff: /dev/nand0.kernel
`---- 0x00800000-0x07ffffff: /dev/nand0.rootfs
`---- 0x08000000-0x1fffffff: /dev/nand0.data
`---- macb0
`---- miibus0
`---- eth0
`---- atmel_spi0
`---- mtd_dataflash0
`---- dataflash0
`---- 0x00000000-0x0041ffff: /dev/dataflash0
`---- atmel_mci0
`---- mci0
`---- 0x00000000-0x1d9bfffff: /dev/disk0
`---- 0x00100000-0x064fffff: /dev/disk0.0
`---- 0x06500000-0x1d9bfffff: /dev/disk0.1
`---- i2c-gpio0
`---- i2c0
`---- qt10700
`---- cs3
`---- mdio_bus
`---- spi
`---- i2c
`---- w1_bus
`---- fs
`---- ramfs0
`---- devfs0
`---- net
`---- global
drivers:
atmel_usart
ramfs
devfs
fat
macb
Generic PHY
atmel_nand
mtd_dataflash
m25p80
atmel_spi
i2c-gpio
mci
atmel_mci
qt1070
w1-gpio
ds2431
ds2433
mem
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/bus.c | 10 | ||||
| -rw-r--r-- | drivers/base/driver.c | 5 |
2 files changed, 15 insertions, 0 deletions
diff --git a/drivers/base/bus.c b/drivers/base/bus.c index 69782d2e7b..e2204da4a4 100644 --- a/drivers/base/bus.c +++ b/drivers/base/bus.c @@ -25,9 +25,19 @@ static struct bus_type *get_bus_by_name(const char *name) int bus_register(struct bus_type *bus) { + int ret; + if (get_bus_by_name(bus->name)) return -EEXIST; + strcpy(bus->dev.name, bus->name); + bus->dev.id = DEVICE_ID_SINGLE; + + ret = register_device(&bus->dev); + if (ret) + return ret; + + INIT_LIST_HEAD(&bus->device_list); INIT_LIST_HEAD(&bus->driver_list); diff --git a/drivers/base/driver.c b/drivers/base/driver.c index dc2df91522..c2e681934f 100644 --- a/drivers/base/driver.c +++ b/drivers/base/driver.c @@ -125,6 +125,11 @@ int register_device(struct device_d *new_device) if (!new_device->bus) return 0; + if (!new_device->parent) { + new_device->parent = &new_device->bus->dev; + dev_add_child(new_device->parent, new_device); + } + list_add_tail(&new_device->bus_list, &new_device->bus->device_list); bus_for_each_driver(new_device->bus, drv) { |