To prepare for adding ACPI support to the tegra-apbmisc driver,
relocate the code responsible for mapping memory resources from
the function ‘tegra_init_apbmisc’ to the function
‘tegra_init_apbmisc_resources.’ This adjustment will allow the
code to be shared between ‘tegra_init_apbmisc’ and the upcoming
‘tegra_acpi_init_apbmisc’ function.

Signed-off-by: Kartik <kkar...@nvidia.com>
---
 drivers/soc/tegra/fuse/tegra-apbmisc.c | 37 +++++++++++++++-----------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/drivers/soc/tegra/fuse/tegra-apbmisc.c 
b/drivers/soc/tegra/fuse/tegra-apbmisc.c
index da970f3dbf35..06c1b3a2c7ec 100644
--- a/drivers/soc/tegra/fuse/tegra-apbmisc.c
+++ b/drivers/soc/tegra/fuse/tegra-apbmisc.c
@@ -160,9 +160,28 @@ void __init tegra_init_revision(void)
        tegra_sku_info.platform = tegra_get_platform();
 }
 
-void __init tegra_init_apbmisc(void)
+static void tegra_init_apbmisc_resources(struct resource *apbmisc,
+                                        struct resource *straps)
 {
        void __iomem *strapping_base;
+
+       apbmisc_base = ioremap(apbmisc->start, resource_size(apbmisc));
+       if (apbmisc_base)
+               chipid = readl_relaxed(apbmisc_base + 4);
+       else
+               pr_err("failed to map APBMISC registers\n");
+
+       strapping_base = ioremap(straps->start, resource_size(straps));
+       if (strapping_base) {
+               strapping = readl_relaxed(strapping_base);
+               iounmap(strapping_base);
+       } else {
+               pr_err("failed to map strapping options registers\n");
+       }
+}
+
+void __init tegra_init_apbmisc(void)
+{
        struct resource apbmisc, straps;
        struct device_node *np;
 
@@ -219,21 +238,7 @@ void __init tegra_init_apbmisc(void)
                }
        }
 
-       apbmisc_base = ioremap(apbmisc.start, resource_size(&apbmisc));
-       if (!apbmisc_base) {
-               pr_err("failed to map APBMISC registers\n");
-       } else {
-               chipid = readl_relaxed(apbmisc_base + 4);
-       }
-
-       strapping_base = ioremap(straps.start, resource_size(&straps));
-       if (!strapping_base) {
-               pr_err("failed to map strapping options registers\n");
-       } else {
-               strapping = readl_relaxed(strapping_base);
-               iounmap(strapping_base);
-       }
-
+       tegra_init_apbmisc_resources(&apbmisc, &straps);
        long_ram_code = of_property_read_bool(np, "nvidia,long-ram-code");
 
 put:
-- 
2.34.1


Reply via email to