Merge tag 'ti-v2020.07-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti

[oweals/u-boot.git] / arch / arm / mach-k3 / include / mach / j721e_hardware.h

diff --git a/arch/arm/mach-k3/include/mach/j721e_hardware.h b/arch/arm/mach-k3/include/mach/j721e_hardware.h
index ead136ed6381955ef6d9b76e77d409bb850c9f60..19873d6e28c496b4839076f1fb4bda6ed79b1016 100644 (file)
--- a/arch/arm/mach-k3/include/mach/j721e_hardware.h
+++ b/arch/arm/mach-k3/include/mach/j721e_hardware.h
@@ -8,6 +8,9 @@
 #define __ASM_ARCH_J721E_HARDWARE_H
 
 #include <config.h>
+#ifndef __ASSEMBLY__
+#include <linux/bitops.h>
+#endif
 
 #define CTRL_MMR0_BASE                                 0x00100000
 #define CTRLMMR_MAIN_DEVSTAT                           (CTRL_MMR0_BASE + 0x30)
@@ -18,6 +21,8 @@
 #define MAIN_DEVSTAT_BKUP_BOOTMODE_SHIFT       1
 #define MAIN_DEVSTAT_PRIM_BOOTMODE_MMC_PORT_MASK       BIT(6)
 #define MAIN_DEVSTAT_PRIM_BOOTMODE_PORT_SHIFT          6
+#define MAIN_DEVSTAT_BKUP_MMC_PORT_MASK                        BIT(7)
+#define MAIN_DEVSTAT_BKUP_MMC_PORT_SHIFT               7
 
 #define WKUP_CTRL_MMR0_BASE                            0x43000000
 #define MCU_CTRL_MMR0_BASE                             0x40f00000