From: Sascha Hauer <s.hauer@pengutronix.de> To: Barebox List <barebox@lists.infradead.org> Cc: Marco Felsch <m.felsch@pengutronix.de> Subject: [PATCH 16/19] ARM: boards: mx6-sabrelite: add deep-probe support Date: Fri, 25 Jun 2021 09:25:37 +0200 [thread overview] Message-ID: <20210625072540.32717-17-s.hauer@pengutronix.de> (raw) In-Reply-To: <20210625072540.32717-1-s.hauer@pengutronix.de> From: Marco Felsch <m.felsch@pengutronix.de> Convert to board driver and explicitly request the required gpio resources instead of relying on their existence based on the initcall level. Signed-off-by: Marco Felsch <m.felsch@pengutronix.de> Link: https://lore.pengutronix.de/20201021115813.31645-11-m.felsch@pengutronix.de Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- .../boards/freescale-mx6-sabrelite/board.c | 58 ++++++++++--------- 1 file changed, 32 insertions(+), 26 deletions(-) diff --git a/arch/arm/boards/freescale-mx6-sabrelite/board.c b/arch/arm/boards/freescale-mx6-sabrelite/board.c index 1b39ef82c6..f6eac4c0f3 100644 --- a/arch/arm/boards/freescale-mx6-sabrelite/board.c +++ b/arch/arm/boards/freescale-mx6-sabrelite/board.c @@ -13,7 +13,9 @@ #include <mach/bbu.h> #include <asm/armlinux.h> #include <generated/mach-types.h> +#include <of.h> #include <partition.h> +#include <deep-probe.h> #include <linux/phy.h> #include <asm/io.h> #include <asm/mmu.h> @@ -98,10 +100,6 @@ static int sabrelite_ksz9021rn_setup(void) { int ret; - if (!of_machine_is_compatible("fsl,imx6q-sabrelite") && - !of_machine_is_compatible("fsl,imx6dl-sabrelite")) - return 0; - mxc_iomux_v3_setup_multiple_pads(sabrelite_enet_gpio_pads, ARRAY_SIZE(sabrelite_enet_gpio_pads)); @@ -118,11 +116,6 @@ static int sabrelite_ksz9021rn_setup(void) return 0; } -/* - * Do this before the fec initializes but after our - * gpios are available. - */ -fs_initcall(sabrelite_ksz9021rn_setup); static void sabrelite_ehci_init(void) { @@ -132,11 +125,22 @@ static void sabrelite_ehci_init(void) gpio_set_value(IMX_GPIO_NR(7, 12), 1); } -static int sabrelite_devices_init(void) +static int sabrelite_probe(struct device_d *dev) { - if (!of_machine_is_compatible("fsl,imx6q-sabrelite") && - !of_machine_is_compatible("fsl,imx6dl-sabrelite")) - return 0; + int ret; + + phy_register_fixup_for_uid(PHY_ID_KSZ9021, MICREL_PHY_ID_MASK, + ksz9021rn_phy_fixup); + + barebox_set_hostname("sabrelite"); + + ret = of_devices_ensure_probed_by_property("gpio-controller"); + if (ret) + return ret; + + ret = sabrelite_ksz9021rn_setup(); + if (ret) + return ret; sabrelite_ehci_init(); @@ -147,19 +151,21 @@ static int sabrelite_devices_init(void) return 0; } -device_initcall(sabrelite_devices_init); - -static int sabrelite_coredevices_init(void) -{ - if (!of_machine_is_compatible("fsl,imx6q-sabrelite") && - !of_machine_is_compatible("fsl,imx6dl-sabrelite")) - return 0; +static const struct of_device_id sabrelite_match[] = { + { + .compatible = "fsl,imx6q-sabrelite", + }, { + .compatible = "fsl,imx6dl-sabrelite", + }, + { /* Sentinel */ }, +}; - phy_register_fixup_for_uid(PHY_ID_KSZ9021, MICREL_PHY_ID_MASK, - ksz9021rn_phy_fixup); +static struct driver_d sabrelite_driver = { + .name = "physom-imx6", + .probe = sabrelite_probe, + .of_compatible = sabrelite_match, +}; - barebox_set_hostname("sabrelite"); +postcore_platform_driver(sabrelite_driver); - return 0; -} -coredevice_initcall(sabrelite_coredevices_init); +BAREBOX_DEEP_PROBE_ENABLE(sabrelite_match); -- 2.29.2 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2021-06-25 7:50 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-06-25 7:25 [PATCH v6 00/19] barebox deep probe support Sascha Hauer 2021-06-25 7:25 ` [PATCH 01/19] imx53: remove unused imx53_add_nand Sascha Hauer 2021-06-25 7:25 ` [PATCH 02/19] of: platform: remove check of already added devices Sascha Hauer 2021-06-25 7:25 ` [PATCH 03/19] of: platform: Keep track of populated platform devices Sascha Hauer 2021-06-25 7:25 ` [PATCH 04/19] of: base: move memory init from DT to initcall Sascha Hauer 2021-06-25 7:25 ` [PATCH 05/19] of: base: move clock init from of_probe() to barebox_register_of() Sascha Hauer 2021-06-25 7:25 ` [PATCH 06/19] of: Set of_chosen and of_model earlier Sascha Hauer 2021-06-25 7:25 ` [PATCH 07/19] of: implement of_get_stdoutpath() Sascha Hauer 2021-06-25 7:25 ` [PATCH 08/19] initcall: add of_populate_initcall Sascha Hauer 2021-06-25 7:25 ` [PATCH 09/19] common: add initial barebox deep-probe support Sascha Hauer 2021-06-25 7:25 ` [PATCH 10/19] pinctrl: Find controller node first Sascha Hauer 2021-06-25 7:25 ` [PATCH 11/19] common: Explicitly probe consoles earlier with deep probe Sascha Hauer 2021-06-25 7:25 ` [PATCH 12/19] pinctrl: Add deep probe support Sascha Hauer 2021-06-25 7:25 ` [PATCH 13/19] phy: " Sascha Hauer 2021-06-25 7:25 ` [PATCH 14/19] ARM: i.MX: esdctl: add deep-probe support Sascha Hauer 2021-06-25 7:25 ` [PATCH 15/19] ARM: stm32mp: ddrctrl: " Sascha Hauer 2021-06-25 7:25 ` Sascha Hauer [this message] 2021-06-25 7:25 ` [PATCH 17/19] ARM: i.MX Phytec physom: convert to board driver Sascha Hauer 2021-06-25 7:25 ` [PATCH 18/19] ARM: i.MX Phytec physom: Add deep-probe support Sascha Hauer 2021-06-25 7:25 ` [PATCH 19/19] of: Add dummy driver Sascha Hauer
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210625072540.32717-17-s.hauer@pengutronix.de \ --to=s.hauer@pengutronix.de \ --cc=barebox@lists.infradead.org \ --cc=m.felsch@pengutronix.de \ --subject='Re: [PATCH 16/19] ARM: boards: mx6-sabrelite: add deep-probe support' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox