On Mon, Jul 03, 2023 at 11:36:55AM +0200, Ahmad Fatoum wrote:
> The stickypage hostfile won't probe if the file is missing, yet because
> it's compatible to simple-mfd, its child nodes will be probed and fail
> their probe, because the hostfile itself was missing.
>
> Fix this by only probing hostfile children if the parent probe concludes
> successfully.
>
> Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx>
> ---
> arch/sandbox/board/hostfile.c | 2 +-
> arch/sandbox/dts/sandbox.dts | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
Applied, thanks
Sascha
>
> diff --git a/arch/sandbox/board/hostfile.c b/arch/sandbox/board/hostfile.c
> index d3fe8bcb9036..ca21703544af 100644
> --- a/arch/sandbox/board/hostfile.c
> +++ b/arch/sandbox/board/hostfile.c
> @@ -184,7 +184,7 @@ static int hf_probe(struct device *dev)
> of_parse_partitions(cdev, np);
> of_partitions_register_fixup(cdev);
>
> - return 0;
> + return of_platform_populate(np, NULL, dev);
> }
>
> static __maybe_unused struct of_device_id hostfile_dt_ids[] = {
> diff --git a/arch/sandbox/dts/sandbox.dts b/arch/sandbox/dts/sandbox.dts
> index 75c633c5909f..6a0ae77d65bd 100644
> --- a/arch/sandbox/dts/sandbox.dts
> +++ b/arch/sandbox/dts/sandbox.dts
> @@ -56,7 +56,7 @@ y {
> };
>
> stickypage: stickypage {
> - compatible = "barebox,hostfile", "syscon", "simple-mfd";
> + compatible = "barebox,hostfile", "syscon";
> barebox,filename = "$build/stickypage.bin";
> reg = <0 0 0 4096>;
> barebox,cdev; /* no caching allowed */
> --
> 2.39.2
>
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
