* linux-next: manual merge of the generic-ioremap tree with the tegra tree
@ 2020-01-13 5:27 Stephen Rothwell
2020-01-27 23:01 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2020-01-13 5:27 UTC (permalink / raw)
To: Christoph Hellwig, Colin Cross, Olof Johansson, Thierry Reding
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Dmitry Osipenko
[-- Attachment #1: Type: text/plain, Size: 1835 bytes --]
Hi all,
Today's linux-next merge of the generic-ioremap tree got a conflict in:
drivers/soc/tegra/fuse/tegra-apbmisc.c
between commit:
02676345e9b3 ("soc/tegra: fuse: Unmap registers once they are not needed anymore")
from the tegra tree and commit:
4bdc0d676a64 ("remove ioremap_nocache and devm_ioremap_nocache")
from the generic-ioremap tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/soc/tegra/fuse/tegra-apbmisc.c
index 4a737f15e401,a2fd6ccd48f9..000000000000
--- a/drivers/soc/tegra/fuse/tegra-apbmisc.c
+++ b/drivers/soc/tegra/fuse/tegra-apbmisc.c
@@@ -157,21 -159,13 +157,21 @@@ void __init tegra_init_apbmisc(void
}
}
- apbmisc_base = ioremap_nocache(apbmisc.start, resource_size(&apbmisc));
+ apbmisc_base = ioremap(apbmisc.start, resource_size(&apbmisc));
- if (!apbmisc_base)
+ if (!apbmisc_base) {
pr_err("failed to map APBMISC registers\n");
+ } else {
+ chipid = readl_relaxed(apbmisc_base + 4);
+ iounmap(apbmisc_base);
+ }
- strapping_base = ioremap_nocache(straps.start, resource_size(&straps));
+ strapping_base = ioremap(straps.start, resource_size(&straps));
- if (!strapping_base)
+ if (!strapping_base) {
pr_err("failed to map strapping options registers\n");
+ } else {
+ strapping = readl_relaxed(strapping_base);
+ iounmap(strapping_base);
+ }
long_ram_code = of_property_read_bool(np, "nvidia,long-ram-code");
}
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: linux-next: manual merge of the generic-ioremap tree with the tegra tree
2020-01-13 5:27 linux-next: manual merge of the generic-ioremap tree with the tegra tree Stephen Rothwell
@ 2020-01-27 23:01 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2020-01-27 23:01 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann
Cc: Christoph Hellwig, Colin Cross, Thierry Reding,
Linux Next Mailing List, Linux Kernel Mailing List,
Dmitry Osipenko, ARM
[-- Attachment #1: Type: text/plain, Size: 2133 bytes --]
Hi all,
On Mon, 13 Jan 2020 16:27:48 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the generic-ioremap tree got a conflict in:
>
> drivers/soc/tegra/fuse/tegra-apbmisc.c
>
> between commit:
>
> 02676345e9b3 ("soc/tegra: fuse: Unmap registers once they are not needed anymore")
>
> from the tegra tree and commit:
>
> 4bdc0d676a64 ("remove ioremap_nocache and devm_ioremap_nocache")
>
> from the generic-ioremap tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/soc/tegra/fuse/tegra-apbmisc.c
> index 4a737f15e401,a2fd6ccd48f9..000000000000
> --- a/drivers/soc/tegra/fuse/tegra-apbmisc.c
> +++ b/drivers/soc/tegra/fuse/tegra-apbmisc.c
> @@@ -157,21 -159,13 +157,21 @@@ void __init tegra_init_apbmisc(void
> }
> }
>
> - apbmisc_base = ioremap_nocache(apbmisc.start, resource_size(&apbmisc));
> + apbmisc_base = ioremap(apbmisc.start, resource_size(&apbmisc));
> - if (!apbmisc_base)
> + if (!apbmisc_base) {
> pr_err("failed to map APBMISC registers\n");
> + } else {
> + chipid = readl_relaxed(apbmisc_base + 4);
> + iounmap(apbmisc_base);
> + }
>
> - strapping_base = ioremap_nocache(straps.start, resource_size(&straps));
> + strapping_base = ioremap(straps.start, resource_size(&straps));
> - if (!strapping_base)
> + if (!strapping_base) {
> pr_err("failed to map strapping options registers\n");
> + } else {
> + strapping = readl_relaxed(strapping_base);
> + iounmap(strapping_base);
> + }
>
> long_ram_code = of_property_read_bool(np, "nvidia,long-ram-code");
> }
This is now a conflict between the arm-soc tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-01-27 23:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-13 5:27 linux-next: manual merge of the generic-ioremap tree with the tegra tree Stephen Rothwell
2020-01-27 23:01 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox