From 18b5048dda7a2d2f45663ad4efe9e5014de82402 Mon Sep 17 00:00:00 2001
From: Eero Nurkkala <eero.nurkkala@offcode.fi>
Date: Mon, 7 Mar 2022 15:35:12 +0200
Subject: [PATCH] risc-v/mpfs: add USB IOMUX definitions

This adds the proper IOMUX definitions for the Icicle and
m100pfsevp boards.

Signed-off-by: Eero Nurkkala <eero.nurkkala@offcode.fi>
---
 .../mpfs/icicle/include/board_liberodefs.h    | 21 +++++++++++++++++++
 .../m100pfsevp/include/board_liberodefs.h     | 21 +++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/boards/risc-v/mpfs/icicle/include/board_liberodefs.h b/boards/risc-v/mpfs/icicle/include/board_liberodefs.h
index e579195677..d75d1cd9f6 100644
--- a/boards/risc-v/mpfs/icicle/include/board_liberodefs.h
+++ b/boards/risc-v/mpfs/icicle/include/board_liberodefs.h
@@ -614,4 +614,25 @@
 #define LIBERO_SETTING_L2_SHUTDOWN_CR        0x00000000
 #define LIBERO_SETTING_WAY_ENABLE            0x0000000b
 
+/* IOMUX3 and IOMUX4, 0x4 signifies USB */
+
+#define LIBERO_SETTING_IOMUX3_CR                    0x44444444
+#define LIBERO_SETTING_IOMUX4_CR                    0x88cc4444
+
+#define LIBERO_SETTING_MSSIO_BANK2_CFG_CR           0x00080907
+#define LIBERO_SETTING_MSSIO_BANK2_IO_CFG_0_1_CR    0x08290829
+#define LIBERO_SETTING_MSSIO_BANK2_IO_CFG_2_3_CR    0x08290829
+#define LIBERO_SETTING_MSSIO_BANK2_IO_CFG_4_5_CR    0x08290829
+#define LIBERO_SETTING_MSSIO_BANK2_IO_CFG_6_7_CR    0x08290829
+#define LIBERO_SETTING_MSSIO_BANK2_IO_CFG_8_9_CR    0x08290829
+#define LIBERO_SETTING_MSSIO_BANK2_IO_CFG_10_11_CR  0x08290829
+#define LIBERO_SETTING_MSSIO_BANK2_IO_CFG_12_13_CR  0x08290829
+#define LIBERO_SETTING_MSSIO_BANK2_IO_CFG_14_15_CR  0x08290829
+#define LIBERO_SETTING_MSSIO_BANK2_IO_CFG_16_17_CR  0x08290829
+#define LIBERO_SETTING_MSSIO_BANK2_IO_CFG_18_19_CR  0x08290829
+#define LIBERO_SETTING_MSSIO_BANK2_IO_CFG_20_21_CR  0x08290829
+#define LIBERO_SETTING_MSSIO_BANK2_IO_CFG_22_23_CR  0x08290829
+#define LIBERO_SETTING_MSSIO_VB2_CFG                0x00000828
+#define LIBERO_SETTING_MSSIO_VB4_CFG                0x00000828
+
 #endif /* __BOARDS_RISCV_MPFS_ICICLE_INCLUDE_BOARD_LIBERODEFS_H */
diff --git a/boards/risc-v/mpfs/m100pfsevp/include/board_liberodefs.h b/boards/risc-v/mpfs/m100pfsevp/include/board_liberodefs.h
index 0d776674bb..27eeb787fe 100644
--- a/boards/risc-v/mpfs/m100pfsevp/include/board_liberodefs.h
+++ b/boards/risc-v/mpfs/m100pfsevp/include/board_liberodefs.h
@@ -610,4 +610,25 @@
 #define LIBERO_SETTING_L2_SHUTDOWN_CR        0x00000000
 #define LIBERO_SETTING_WAY_ENABLE            0x0000000b
 
+/* IOMUX3 and IOMUX4, 0x4 signifies USB */
+
+#define LIBERO_SETTING_IOMUX3_CR                    0x44444444
+#define LIBERO_SETTING_IOMUX4_CR                    0x88cc4444
+
+#define LIBERO_SETTING_MSSIO_BANK2_CFG_CR           0x00080907
+#define LIBERO_SETTING_MSSIO_BANK2_IO_CFG_0_1_CR    0x08290829
+#define LIBERO_SETTING_MSSIO_BANK2_IO_CFG_2_3_CR    0x08290829
+#define LIBERO_SETTING_MSSIO_BANK2_IO_CFG_4_5_CR    0x08290829
+#define LIBERO_SETTING_MSSIO_BANK2_IO_CFG_6_7_CR    0x08290829
+#define LIBERO_SETTING_MSSIO_BANK2_IO_CFG_8_9_CR    0x08290829
+#define LIBERO_SETTING_MSSIO_BANK2_IO_CFG_10_11_CR  0x08290829
+#define LIBERO_SETTING_MSSIO_BANK2_IO_CFG_12_13_CR  0x08290829
+#define LIBERO_SETTING_MSSIO_BANK2_IO_CFG_14_15_CR  0x08290829
+#define LIBERO_SETTING_MSSIO_BANK2_IO_CFG_16_17_CR  0x08290829
+#define LIBERO_SETTING_MSSIO_BANK2_IO_CFG_18_19_CR  0x08290829
+#define LIBERO_SETTING_MSSIO_BANK2_IO_CFG_20_21_CR  0x08290829
+#define LIBERO_SETTING_MSSIO_BANK2_IO_CFG_22_23_CR  0x08290829
+#define LIBERO_SETTING_MSSIO_VB2_CFG                0x00000828
+#define LIBERO_SETTING_MSSIO_VB4_CFG                0x00000828
+
 #endif /* __BOARDS_RISCV_MPFS_M100PFSEVP_INCLUDE_BOARD_LIBERODEFS_H */