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

Commit f825f6ed authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Kalle Valo
Browse files

bcma: fill core OF info independently of bus type 



PCI devices can be described in DT as well so we should always execute
relevant code. This will make bcma e.g. set of_node for cores described
in DT.

Signed-off-by: default avatarRafał Miłecki <rafal@milecki.pl>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 5e48a4cd

drivers/bcma/main.c

+2 −2
Original line number Diff line number Diff line
@@ -240,6 +240,8 @@ void bcma_prepare_core(struct bcma_bus *bus, struct bcma_device *core) 
	core->dev.bus = &bcma_bus_type;

	dev_set_name(&core->dev, "bcma%d:%d", bus->num, core->core_index);

	core->dev.parent = bcma_bus_get_host_dev(bus);

	if (core->dev.parent)

		bcma_of_fill_device(core->dev.parent, core);



	switch (bus->hosttype) {

	case BCMA_HOSTTYPE_PCI:
@@ -249,8 +251,6 @@ void bcma_prepare_core(struct bcma_bus *bus, struct bcma_device *core) 
	case BCMA_HOSTTYPE_SOC:

		if (IS_ENABLED(CONFIG_OF) && bus->host_pdev) {

			core->dma_dev = &bus->host_pdev->dev;

			if (core->dev.parent)

				bcma_of_fill_device(core->dev.parent, core);

		} else {

			core->dev.dma_mask = &core->dev.coherent_dma_mask;

			core->dma_dev = &core->dev;