Skip to content

Commit 4c989fe

Browse files
committed
Clean up dt_prop stuff
1 parent e42f631 commit 4c989fe

File tree

6 files changed

+22
-21
lines changed

6 files changed

+22
-21
lines changed

src/drivers/aes/aes_a9.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ static uint64_t gAESClockAddr;
6262

6363
void aes_a9_init(void)
6464
{
65-
gAESBase = gIOBase + dt_get_u64_prop("aes", "reg");
65+
gAESBase = gIOBase + dt_get_u64("/arm-io/aes", "reg", 0);
6666
gAESPipeBase = gAESBase + 0x200;
6767
switch(socnum)
6868
{

src/drivers/gpio/gpio.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ void gpio_main(void) {
3535
struct task gpio_task = {.name = "gpio"};
3636

3737
uint64_t gGpioBase;
38-
void gpio_early_init(void) {
39-
gGpioBase = dt_get_u32_prop("gpio", "reg");
40-
gGpioBase += gIOBase;
38+
void gpio_early_init(void)
39+
{
40+
gGpioBase = gIOBase + dt_get_u64("/arm-io/gpio", "reg", 0);
4141
}
4242

4343
void gpio_init(void) {

src/drivers/mipi/mipi.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,12 @@ void mipi_cmd(const char* cmd, char* args) {
9595
}
9696
}
9797

98-
void mipi_init(void) {
99-
if(dt_find(gDeviceTree, "mipi-dsim")) {
100-
uint64_t mipi_reg = dt_get_u32_prop("mipi-dsim", "reg");
101-
mipi_reg += gIOBase;
102-
gmipi_reg = mipi_reg;
98+
void mipi_init(void)
99+
{
100+
dt_node_t *mipi = dt_find(gDeviceTree, "/arm-io/mipi-dsim");
101+
if(mipi)
102+
{
103+
gmipi_reg = gIOBase + dt_node_u64(mipi, "reg", 0);
103104
command_register("mipi", "mipi tools", mipi_cmd);
104105
}
105106
}

src/drivers/uart/uart.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,7 @@ uint64_t gUartBase;
105105
extern uint32_t gLogoBitmap[32];
106106
void serial_early_init(void) {
107107
disable_interrupts();
108-
gUartBase = dt_node_u32(serial_dt_node(), "reg", 0);
109-
gUartBase += gIOBase;
108+
gUartBase = gIOBase + dt_node_u64(serial_dt_node(), "reg", 0);
110109
orig_rUCON0 = rUCON0;
111110
orig_rULCON0 = rULCON0;
112111
orig_rUFCON0 = rUFCON0;

src/kernel/entry.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,11 @@ __attribute__((noinline)) void pongo_entry_cached(void)
135135
// Literally everything depends on this
136136
dt_init((void*)((uint64_t)gBootArgs->deviceTreeP - gBootArgs->virtBase + gBootArgs->physBase - 0x800000000 + kCacheableView), gBootArgs->deviceTreeLength);
137137

138-
gIOBase = dt_get_u64_prop_i("arm-io", "ranges", 1);
138+
gIOBase = dt_get_u64("/arm-io", "ranges", 1);
139139

140140
map_full_ram(gBootArgs->physBase & 0x7ffffffff, gBootArgs->memSize);
141141

142-
gDevType = dt_get_prop("arm-io", "device_type", NULL);
142+
gDevType = dt_get_prop("/arm-io", "device_type", NULL);
143143
size_t len = strlen(gDevType) - 3;
144144
len = len < 8 ? len : 8;
145145
strncpy(soc_name, gDevType, len);
@@ -153,7 +153,7 @@ __attribute__((noinline)) void pongo_entry_cached(void)
153153
else if(strcmp(soc_name, "t8015") == 0) socnum = 0x8015;
154154
else if(strcmp(soc_name, "s8000") == 0)
155155
{
156-
const char *sgx = dt_get_prop("sgx", "compatible", NULL);
156+
const char *sgx = dt_get_prop("/arm-io/sgx", "compatible", NULL);
157157
if(strlen(sgx) > 4 && strcmp(sgx + 4, "s8003") == 0)
158158
{
159159
socnum = 0x8003;

src/kernel/lowlevel.c

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -618,20 +618,21 @@ void pmgr_init(void)
618618
gPMGRmaplen /= sizeof(*gPMGRmap);
619619
gPMGRdevlen /= sizeof(*gPMGRdev);
620620
gPMGRBase = gIOBase + gPMGRreg[0].addr;
621-
gWDTBase = gIOBase + dt_get_u64_prop("wdt", "reg");
621+
gWDTBase = gIOBase + dt_get_u64("/arm-io/wdt", "reg", 0);
622622
command_register("reset", "resets the device", (void*)wdt_reset);
623623
command_register("crash", "branches to an invalid address", (void*)0x41414141);
624624
}
625-
void interrupt_init(void) {
626-
gInterruptBase = dt_get_u32_prop("aic", "reg");
627-
gInterruptBase += gIOBase;
628-
629-
gAICVersion = dt_get_u32_prop("aic", "aic-version");
625+
void interrupt_init(void)
626+
{
627+
dt_node_t *aic = dt_get("/arm-io/aic");
628+
gInterruptBase = gIOBase + dt_node_u64(aic, "reg", 0);
629+
gAICVersion = dt_node_u32(aic, "aic-version", 0);
630630

631631
interrupt_or_config(0xE0000000);
632632
interrupt_or_config(1); // enable interrupt
633633
}
634-
void interrupt_teardown(void) {
634+
void interrupt_teardown(void)
635+
{
635636
wdt_disable();
636637
task_irq_teardown();
637638
}

0 commit comments

Comments
 (0)