litex_soc_ctrl: switch to exclusively 32-bit CSR alignment

Signed-off-by: Gabriel Somlo <gsomlo@gmail.com>
litex-hub · Jun 1, 2020 · 2a20a88 · 2a20a88
1 parent 584f7b3
commit 2a20a88
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 17 deletions.
diff --git a/drivers/soc/litex/litex_soc_ctrl.c b/drivers/soc/litex/litex_soc_ctrl.c
@@ -17,12 +17,8 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 
-/* scratch register located one CPU x-len past the base address */
-#ifdef CONFIG_64BIT
-#define SCRATCH_REG_OFF     8
-#else
+/* scratch register located one "simple CSR" past the base address */
 #define SCRATCH_REG_OFF     4
-#endif
 
 #define SCRATCH_REG_VALUE   0x12345678
 #define SCRATCH_TEST_VALUE  0xdeadbeef

diff --git a/include/linux/litex.h b/include/linux/litex.h
@@ -11,11 +11,7 @@
 #error LiteX subregister size (LITEX_SUBREG_SIZE) must be 4 or 1!
 #endif
 
-#ifdef CONFIG_64BIT
-#define LITEX_SUBREG_ALIGN     8
-#else
 #define LITEX_SUBREG_ALIGN     4
-#endif
 
 #define LITEX_SUBREG_SIZE_BIT  (LITEX_SUBREG_SIZE * 8)
 
@@ -36,20 +32,12 @@ int litex_check_accessors(void);
 
 static inline ulong _readu_cpu(const volatile void __iomem *addr)
 {
-#ifdef CONFIG_64BIT
-	return cpu_to_le64(readq(addr));
-#else
 	return cpu_to_le32(readl(addr));
-#endif
 }
 
 static inline void _writeu_cpu(volatile void __iomem *addr, ulong value)
 {
-#ifdef CONFIG_64BIT
-	writeq(le64_to_cpu(value), addr);
-#else
 	writel(le32_to_cpu(value), addr);
-#endif
 }
 
 /* number of LiteX subregisters needed to store a register of given reg_size */