From: Nikhil Devshatwar <nikhil...@ti.com>
Add regmaps to cover PADCONFIG registers in CTRL_MMR in J721e.
Describe the ownership for PAD registers in bitmap.
Enable serdes and UART control registers.
Signed-off-by: Nikhil Devshatwar <nikhil...@ti.com>
---
configs/arm64/k3-j721e-evm-linux-demo.c | 25 +++++++++++++++++++++++++
configs/arm64/k3-j721e-evm.c | 15 +++++++++++++++
2 files changed, 40 insertions(+)
diff --git a/configs/arm64/k3-j721e-evm-linux-demo.c
b/configs/arm64/k3-j721e-evm-linux-demo.c
index 47ad32ea..40b7aff8 100644
--- a/configs/arm64/k3-j721e-evm-linux-demo.c
+++ b/configs/arm64/k3-j721e-evm-linux-demo.c
@@ -28,6 +28,8 @@ struct {
struct jailhouse_irqchip irqchips[4];
struct jailhouse_pci_device pci_devices[1];
__u32 stream_ids[2];
+ struct jailhouse_regmap regmaps[1];
+
} __attribute__((packed)) config = {
.cell = {
.signature = JAILHOUSE_CELL_DESC_SIGNATURE,
@@ -40,6 +42,7 @@ struct {
.num_irqchips = ARRAY_SIZE(config.irqchips),
.num_pci_devices = ARRAY_SIZE(config.pci_devices),
.num_stream_ids = ARRAY_SIZE(config.stream_ids),
+ .num_regmaps = ARRAY_SIZE(config.regmaps),
.cpu_reset_address = 0x0,
.vpci_irq_base = 195 - 32,
.console = {
@@ -288,4 +291,26 @@ struct {
/* Non PCIe peripherals */
0x0003, 0xf003,
},
+
+ .regmaps = {
+ /*
+ * offset = (CTRL_MMR address - reg_base) / 4 / 32
+ * bit = (CTRL_MMR address - reg_base) / 4 % 32
+ */
+
+ /* Partition7 */ {
+ .reg_base = 0x11c000,
+ .reg_size = 4,
+ .reg_count = 256,
+ .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE,
+ /*
+ * sw10_button_pins_default => 0:[0]
+ * main_usbss1_pins_default => 4:[6]
+ */
+ .reg_bitmap = {
+ 0x00000001, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000020, 0x00000000, 0x00000000, 0x00000000,
+ },
+ },
+ },
};
diff --git a/configs/arm64/k3-j721e-evm.c b/configs/arm64/k3-j721e-evm.c
index 4f9755a8..ac422143 100644
--- a/configs/arm64/k3-j721e-evm.c
+++ b/configs/arm64/k3-j721e-evm.c
@@ -23,6 +23,7 @@ struct {
struct jailhouse_irqchip irqchips[6];
struct jailhouse_pci_device pci_devices[1];
__u32 stream_ids[30];
+ struct jailhouse_regmap regmaps[1];
} __attribute__((packed)) config = {
.header = {
.signature = JAILHOUSE_SYSTEM_SIGNATURE,
@@ -89,6 +90,7 @@ struct {
.num_irqchips = ARRAY_SIZE(config.irqchips),
.num_pci_devices = ARRAY_SIZE(config.pci_devices),
.num_stream_ids = ARRAY_SIZE(config.stream_ids),
+ .num_regmaps = ARRAY_SIZE(config.regmaps),
.vpci_irq_base = 191 - 32,
},
},
@@ -398,4 +400,17 @@ struct {
/* PCI3 */
0x8100, 0x8101, 0x8102, 0x8103, 0x8104, 0x8105,
},
+
+ .regmaps = {
+ /* Partition7 */ {
+ .reg_base = 0x11c000,
+ .reg_size = 4,
+ .reg_count = 256,
+ .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE,
+ .reg_bitmap = {
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ },
+ },
+ },
};
--
2.17.1
--
You received this message because you are subscribed to the Google Groups
"Jailhouse" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to jailhouse-dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/jailhouse-dev/20200127135611.21302-5-nikhil.nd%40ti.com.
