Hi Herbert,
Today's linux-next merge of the crypto tree got a conflict in
arch/arm/mach-tegra/fuse.c between commit b2609c7c7237 ("ARM: tegra:
fuse: add functions to access chip revision") from the tegra tree and
commit e87e06cd8cc0 ("arm: tegra: export tegra_chip_uid") from the crypto
tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
By the way, adding the EXPORT_SYMBOL() really now only needs export.h not
module.h (assuming that the crypto tree has a recent enough base).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc arch/arm/mach-tegra/fuse.c
index 17fdd40,ea49bd9..0000000
--- a/arch/arm/mach-tegra/fuse.c
+++ b/arch/arm/mach-tegra/fuse.c
@@@ -119,7 -55,32 +120,8 @@@ unsigned long long tegra_chip_uid(void
{
unsigned long long lo, hi;
- lo = fuse_readl(FUSE_UID_LOW);
- hi = fuse_readl(FUSE_UID_HIGH);
+ lo = tegra_fuse_readl(FUSE_UID_LOW);
+ hi = tegra_fuse_readl(FUSE_UID_HIGH);
return (hi << 32ull) | lo;
}
+ EXPORT_SYMBOL(tegra_chip_uid);
-
-int tegra_sku_id(void)
-{
- int sku_id;
- u32 reg = fuse_readl(FUSE_SKU_INFO);
- sku_id = reg & 0xFF;
- return sku_id;
-}
-
-int tegra_cpu_process_id(void)
-{
- int cpu_process_id;
- u32 reg = fuse_readl(FUSE_SPARE_BIT);
- cpu_process_id = (reg >> 6) & 3;
- return cpu_process_id;
-}
-
-int tegra_core_process_id(void)
-{
- int core_process_id;
- u32 reg = fuse_readl(FUSE_SPARE_BIT);
- core_process_id = (reg >> 12) & 3;
- return core_process_id;
-}
Attachment:
pgpY6jZeN0Hqj.pgp
Description: PGP signature
