arm: mach-k3: am62: move device identification accessor functions to header

mach-k3/am625_fdt.c does fdt fixup depending on fields in the device
identification register. Move the accessors to the device identification
register as inline functions into the am62_hardware.h header, so that
they can be used for other functionality.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>

diff --git a/arch/arm/mach-k3/am625_fdt.c b/arch/arm/mach-k3/am625_fdt.c
index 37806907af1a597a834d53eac96a492bb79c1cc4..970dd3447dec4b2d2c6d33551ec99e9427d5c574 100644 (file)
--- a/arch/arm/mach-k3/am625_fdt.c
+++ b/arch/arm/mach-k3/am625_fdt.c
@@ -38,29 +38,6 @@ static void fdt_fixup_pru_node_am625(void *blob, int has_pru)
                fdt_del_node_path(blob, "/bus@f0000/pruss@30040000");
 }
 
-static int k3_get_core_nr(void)
-{
-       u32 full_devid = readl(CTRLMMR_WKUP_JTAG_DEVICE_ID);
-
-       return (full_devid & JTAG_DEV_CORE_NR_MASK) >> JTAG_DEV_CORE_NR_SHIFT;
-}
-
-static int k3_has_pru(void)
-{
-       u32 full_devid = readl(CTRLMMR_WKUP_JTAG_DEVICE_ID);
-       u32 feature_mask = (full_devid & JTAG_DEV_FEATURES_MASK) >>
-                          JTAG_DEV_FEATURES_SHIFT;
-
-       return !(feature_mask & JTAG_DEV_FEATURE_NO_PRU);
-}
-
-static int k3_has_gpu(void)
-{
-       u32 full_devid = readl(CTRLMMR_WKUP_JTAG_DEVICE_ID);
-
-       return (full_devid & JTAG_DEV_GPU_MASK) >> JTAG_DEV_GPU_SHIFT;
-}
-
 int ft_system_setup(void *blob, struct bd_info *bd)
 {
        fdt_fixup_cores_nodes_am625(blob, k3_get_core_nr());

diff --git a/arch/arm/mach-k3/include/mach/am62_hardware.h b/arch/arm/mach-k3/include/mach/am62_hardware.h
index acd2d109c2c53b5fe26726f54f75113b20643aac..ea5bcf5d3def4f7d5342fc4dfa7730a252efccd8 100644 (file)
--- a/arch/arm/mach-k3/include/mach/am62_hardware.h
+++ b/arch/arm/mach-k3/include/mach/am62_hardware.h
@@ -79,6 +79,29 @@
 
 #define TI_SRAM_SCRATCH_BOARD_EEPROM_START     0x43c30000
 
+static inline int k3_get_core_nr(void)
+{
+       u32 full_devid = readl(CTRLMMR_WKUP_JTAG_DEVICE_ID);
+
+       return (full_devid & JTAG_DEV_CORE_NR_MASK) >> JTAG_DEV_CORE_NR_SHIFT;
+}
+
+static inline int k3_has_pru(void)
+{
+       u32 full_devid = readl(CTRLMMR_WKUP_JTAG_DEVICE_ID);
+       u32 feature_mask = (full_devid & JTAG_DEV_FEATURES_MASK) >>
+                          JTAG_DEV_FEATURES_SHIFT;
+
+       return !(feature_mask & JTAG_DEV_FEATURE_NO_PRU);
+}
+
+static inline int k3_has_gpu(void)
+{
+       u32 full_devid = readl(CTRLMMR_WKUP_JTAG_DEVICE_ID);
+
+       return (full_devid & JTAG_DEV_GPU_MASK) >> JTAG_DEV_GPU_SHIFT;
+}
+
 #if defined(CONFIG_SYS_K3_SPL_ATF) && !defined(__ASSEMBLY__)
 
 static const u32 put_device_ids[] = {};