There was a conflict with these updates and the merge of 5.10.61
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: drivers/clk/imx/clk-imx6q.c
I've kept the clock registration from this branch, but looking at:
drivers/clk/imx/clk.h, there will be build issues depending on the
value of MODULE.
There's some other inconsistencies in the kernel with respect to the
function in question:
build [/home/bruc...-yocto.git]> git grep imx_register_uart_clocks
drivers/clk/imx/clk-imx25.c: imx_register_uart_clocks();
drivers/clk/imx/clk-imx27.c: imx_register_uart_clocks();
drivers/clk/imx/clk-imx35.c: imx_register_uart_clocks();
drivers/clk/imx/clk-imx5.c: imx_register_uart_clocks();
drivers/clk/imx/clk-imx5.c: imx_register_uart_clocks();
drivers/clk/imx/clk-imx5.c: imx_register_uart_clocks();
drivers/clk/imx/clk-imx6q.c: imx_register_uart_clocks();
drivers/clk/imx/clk-imx6sl.c: imx_register_uart_clocks();
drivers/clk/imx/clk-imx6sll.c: imx_register_uart_clocks();
drivers/clk/imx/clk-imx6sx.c: imx_register_uart_clocks();
drivers/clk/imx/clk-imx7d.c: imx_register_uart_clocks();
drivers/clk/imx/clk-imx7ulp.c: imx_register_uart_clocks();
drivers/clk/imx/clk-imx8mm.c: imx_register_uart_clocks();
drivers/clk/imx/clk-imx8mn.c: imx_register_uart_clocks();
drivers/clk/imx/clk-imx8mp.c: imx_register_uart_clocks(uart_clks);
drivers/clk/imx/clk-imx8mq.c: imx_register_uart_clocks();
drivers/clk/imx/clk.c:void imx_register_uart_clocks(void)
drivers/clk/imx/clk.c:EXPORT_SYMBOL_GPL(imx_register_uart_clocks);
drivers/clk/imx/clk.h:void imx_register_uart_clocks(void);
drivers/clk/imx/clk.h:static inline void
imx_register_uart_clocks(unsigned int clk_count)
There's a fair bit of bouncing around in those headers and calls, but
I'm assuming the BSP branch call without a clock count is correct.
Send fixups, if I've made the wrong choice.
Bruce
On Tue, Aug 10, 2021 at 11:08 PM Bruce Ashfield via
lists.yoctoproject.org
<bruce.ashfield=gmail....@lists.yoctoproject.org> wrote:
>
>
> merged.
>
> Bruce
>
> In message: [linux-yocto][kernel v5.10/standard/nxp-sdk-5.4/nxp-imx8][PATCH]
> mmc: core: Fix the 'err' undeclared compile failure in mmc_alloc_host()
> on 09/08/2021 Jun Miao wrote:
>
> > There is a compile failture caused by commit
> > 3b4009b49634 ("mmc: core: Don't allocate IDA for OF aliases").
> > When merging code, it conflicts with sdk kernel patch, "err" is not
> > replaced by
> > "index", and some indents and "}" are lost.
> >
> > build error:
> >
> > drivers/mmc/core/host.c:449:3: error: 'err' undeclared (first use in this
> > function)
> > | 449 | err = ida_simple_get(&mmc_host_ida, alias_id,
> > | | ^~~
> > drivers/mmc/core/host.c:568:15: error: non-static declaration of
> > 'mmc_free_host' follows static declaration
> > | 568 | EXPORT_SYMBOL(mmc_free_host);
> > | | ^~~~~~~~~~~~~
> > drivers/mmc/core/host.c:554:15: error: non-static declaration of
> > 'mmc_remove_host' follows static declaration
> > | 554 | EXPORT_SYMBOL(mmc_remove_host);
> > | | ^~~~~~~~~~~~~~~
> >
> > Signed-off-by: Jun Miao <jun.m...@windriver.com>
> > ---
> > drivers/mmc/core/host.c | 23 ++++++++++++-----------
> > 1 file changed, 12 insertions(+), 11 deletions(-)
> >
> > diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
> > index a71b9b7d85ea..29a936d0ac4b 100644
> > --- a/drivers/mmc/core/host.c
> > +++ b/drivers/mmc/core/host.c
> > @@ -444,17 +444,18 @@ struct mmc_host *mmc_alloc_host(int extra, struct
> > device *dev)
> > min_idx = mmc_first_nonreserved_index();
> > max_idx = 0;
> >
> > - alias_id = mmc_get_reserved_index(host);
> > - if (alias_id >= 0)
> > - err = ida_simple_get(&mmc_host_ida, alias_id,
> > - alias_id + 1, GFP_KERNEL);
> > - else
> > - err = ida_simple_get(&mmc_host_ida,
> > - mmc_first_nonreserved_index(),
> > - 0, GFP_KERNEL);
> > - if (err < 0) {
> > - kfree(host);
> > - return NULL;
> > + alias_id = mmc_get_reserved_index(host);
> > + if (alias_id >= 0)
> > + index = ida_simple_get(&mmc_host_ida, alias_id,
> > + alias_id + 1, GFP_KERNEL);
> > + else
> > + index = ida_simple_get(&mmc_host_ida,
> > + mmc_first_nonreserved_index(),
> > + 0, GFP_KERNEL);
> > + if (index < 0) {
> > + kfree(host);
> > + return NULL;
> > + }
> > }
> >
> > host->index = index;
> > --
> > 2.25.1
> >
>
>
>
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#10350):
https://lists.yoctoproject.org/g/linux-yocto/message/10350
Mute This Topic: https://lists.yoctoproject.org/mt/84766605/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
