diff --git a/hw/arm/apple-silicon/s8000-config.c.inc b/hw/arm/apple-silicon/s8000-config.c.inc
index 4f64af20690..f76ca55f5aa 100644
--- a/hw/arm/apple-silicon/s8000-config.c.inc
+++ b/hw/arm/apple-silicon/s8000-config.c.inc
@@ -1,4 +1,4 @@
-static uint8_t voltage_states1[] = {
+static uint8_t s8000_voltage_states1[] = {
     0x76, 0x86, 0x02, 0x00, 0x35, 0x02, 0x00, 0x00, 0xAA, 0xAA, 0x01,
     0x00, 0x6D, 0x02, 0x00, 0x00, 0xB3, 0x18, 0x01, 0x00, 0xC8, 0x02,
     0x00, 0x00, 0x55, 0xD5, 0x00, 0x00, 0xFD, 0x02, 0x00, 0x00, 0x4F,
@@ -7,7 +7,7 @@ static uint8_t voltage_states1[] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-static uint8_t clock_frequencies[] = {
+static uint8_t s8000_clock_frequencies[] = {
     0x00, 0x36, 0x6E, 0x01, 0x00, 0x10, 0x5E, 0x5F, 0x00, 0xA8, 0xD4, 0x55,
     0x00, 0x8C, 0x86, 0x47, 0x00, 0x36, 0x6E, 0x01, 0x00, 0x36, 0x6E, 0x01,
     0x00, 0x36, 0x6E, 0x01, 0x00, 0xE1, 0xF5, 0x05, 0x00, 0x7B, 0x9A, 0x17,
diff --git a/hw/arm/apple-silicon/s8000.c b/hw/arm/apple-silicon/s8000.c
index 4a9706ed464..0170b82a5b8 100644
--- a/hw/arm/apple-silicon/s8000.c
+++ b/hw/arm/apple-silicon/s8000.c
@@ -665,8 +665,8 @@ static void s8000_pmgr_setup(MachineState *machine)
             mem, -1);
     }
 
-    set_dtb_prop(child, "voltage-states1", sizeof(voltage_states1),
-                 voltage_states1);
+    set_dtb_prop(child, "voltage-states1", sizeof(s8000_voltage_states1),
+                 s8000_voltage_states1);
 }
 
 static void s8000_create_nvme(MachineState *machine)
@@ -1233,8 +1233,8 @@ static void s8000_machine_init(MachineState *machine)
     data = 0x0;
     set_dtb_prop(child, "chip-revision", sizeof(data), &data);
 
-    set_dtb_prop(child, "clock-frequencies", sizeof(clock_frequencies),
-                 clock_frequencies);
+    set_dtb_prop(child, "clock-frequencies", sizeof(s8000_clock_frequencies),
+                 s8000_clock_frequencies);
 
     prop = find_dtb_prop(child, "ranges");
     g_assert_nonnull(prop);
diff --git a/hw/arm/apple-silicon/t8030-config.c.inc b/hw/arm/apple-silicon/t8030-config.c.inc
index 2bd94cb9cbd..a1cb3bc2de3 100644
--- a/hw/arm/apple-silicon/t8030-config.c.inc
+++ b/hw/arm/apple-silicon/t8030-config.c.inc
@@ -1,4 +1,4 @@
-static uint8_t voltage_states5[] = {
+static uint8_t t8030_voltage_states5[] = {
     0x12, 0xDA, 0x01, 0x00, 0x45, 0x02, 0x00, 0x00, 0xB3, 0x18, 0x01,
     0x00, 0x7A, 0x02, 0x00, 0x00, 0x87, 0xC5, 0x00, 0x00, 0xB2, 0x02,
     0x00, 0x00, 0xA2, 0x89, 0x00, 0x00, 0x19, 0x03, 0x00, 0x00, 0x37,
@@ -7,7 +7,7 @@ static uint8_t voltage_states5[] = {
     0x00, 0x18, 0x60, 0x00, 0x00, 0x3F, 0x04, 0x00, 0x00,
 };
 
-static uint8_t voltage_states9_sram[] = {
+static uint8_t t8030_voltage_states9_sram[] = {
     0x00, 0x00, 0x00, 0x00, 0xF1, 0x02, 0x00, 0x00, 0x00, 0x2A, 0x75, 0x15,
     0xF1, 0x02, 0x00, 0x00, 0xC0, 0x4F, 0xEF, 0x1E, 0xF1, 0x02, 0x00, 0x00,
     0x00, 0xCD, 0x56, 0x27, 0xF1, 0x02, 0x00, 0x00, 0x00, 0x11, 0xEC, 0x2F,
@@ -15,12 +15,12 @@ static uint8_t voltage_states9_sram[] = {
     0x80, 0xFE, 0x2A, 0x47, 0x84, 0x03, 0x00, 0x00
 };
 
-static uint8_t voltage_states0[] = {
+static uint8_t t8030_voltage_states0[] = {
     0x01, 0x00, 0x00, 0x00, 0x77, 0x02, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
     0xB8, 0x02, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xEE, 0x02, 0x00, 0x00,
 };
 
-static uint8_t voltage_states9[] = {
+static uint8_t t8030_voltage_states9[] = {
     0x00, 0x00, 0x00, 0x00, 0x90, 0x01, 0x00, 0x00, 0x00, 0x2A, 0x75, 0x15,
     0x48, 0x02, 0x00, 0x00, 0xC0, 0x4F, 0xEF, 0x1E, 0x77, 0x02, 0x00, 0x00,
     0x00, 0xCD, 0x56, 0x27, 0x99, 0x02, 0x00, 0x00, 0x00, 0x11, 0xEC, 0x2F,
@@ -28,29 +28,29 @@ static uint8_t voltage_states9[] = {
     0x80, 0xFE, 0x2A, 0x47, 0x84, 0x03, 0x00, 0x00,
 };
 
-static uint8_t voltage_states2[] = {
+static uint8_t t8030_voltage_states2[] = {
     0x01, 0x00, 0x00, 0x00, 0x74, 0x02, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
     0xB5, 0x02, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x2C, 0x03, 0x00, 0x00,
 };
 
-static uint8_t voltage_states1_sram[] = {
+static uint8_t t8030_voltage_states1_sram[] = {
     0x00, 0x10, 0x55, 0x22, 0xF1, 0x02, 0x00, 0x00, 0x00, 0x98,
     0x7F, 0x33, 0xF1, 0x02, 0x00, 0x00, 0x00, 0x20, 0xAA, 0x44,
     0xF1, 0x02, 0x00, 0x00, 0x00, 0xA8, 0xD4, 0x55, 0x32, 0x03,
     0x00, 0x00, 0x00, 0x30, 0xFF, 0x66, 0x99, 0x03, 0x00, 0x00,
 };
 
-static uint8_t voltage_states10[] = {
+static uint8_t t8030_voltage_states10[] = {
     0x01, 0x00, 0x00, 0x00, 0x7A, 0x02, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
     0xA3, 0x02, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xBF, 0x02, 0x00, 0x00,
 };
 
-static uint8_t voltage_states11[] = {
+static uint8_t t8030_voltage_states11[] = {
     0x01, 0x00, 0x00, 0x00, 0x45, 0x02, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
     0x7D, 0x02, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xF4, 0x02, 0x00, 0x00,
 };
 
-static uint8_t voltage_states8[] = {
+static uint8_t t8030_voltage_states8[] = {
     0x00, 0xF4, 0x06, 0x14, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x2A, 0x75, 0x15,
     0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x6E, 0x0A, 0x1E, 0xFF, 0xFF, 0xFF, 0xFF,
     0x00, 0xBF, 0x2F, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x1E, 0x7C, 0x29,
@@ -61,7 +61,7 @@ static uint8_t voltage_states8[] = {
     0xFF, 0xFF, 0xFF, 0xFF, 0x80, 0xC9, 0x53, 0x53, 0xFF, 0xFF, 0xFF, 0xFF,
 };
 
-static uint8_t voltage_states5_sram[] = {
+static uint8_t t8030_voltage_states5_sram[] = {
     0x00, 0xBF, 0x2F, 0x20, 0xF1, 0x02, 0x00, 0x00, 0x00, 0x04, 0x5C,
     0x36, 0xF1, 0x02, 0x00, 0x00, 0x00, 0x64, 0x3F, 0x4D, 0xF1, 0x02,
     0x00, 0x00, 0x00, 0x59, 0xDD, 0x6E, 0x19, 0x03, 0x00, 0x00, 0x00,
@@ -70,19 +70,19 @@ static uint8_t voltage_states5_sram[] = {
     0x00, 0x00, 0x6A, 0xC9, 0x9E, 0x3F, 0x04, 0x00, 0x00,
 };
 
-static uint8_t voltage_states1[] = {
+static uint8_t t8030_voltage_states1[] = {
     0x71, 0xBC, 0x01, 0x00, 0x61, 0x02, 0x00, 0x00, 0x4B, 0x28,
     0x01, 0x00, 0x99, 0x02, 0x00, 0x00, 0x38, 0xDE, 0x00, 0x00,
     0xDE, 0x02, 0x00, 0x00, 0xC7, 0xB1, 0x00, 0x00, 0x32, 0x03,
     0x00, 0x00, 0x25, 0x94, 0x00, 0x00, 0x99, 0x03, 0x00, 0x00,
 };
 
-static uint8_t bridge_settings17[] = {
+static uint8_t t8030_bridge_settings17[] = {
     0x00, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00,
     0x00, 0x02, 0x00, 0x00, 0x01, 0x00, 0x01, 0xC0,
 };
 
-static uint8_t bridge_settings15[] = {
+static uint8_t t8030_bridge_settings15[] = {
     0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00,
     0x98, 0x7E, 0x68, 0x01, 0x00, 0x0A, 0x00, 0x00, 0x01, 0x00, 0x01, 0x40,
     0x24, 0x0A, 0x00, 0x00, 0x18, 0x08, 0x08, 0x00, 0x44, 0x0A, 0x00, 0x00,
@@ -97,7 +97,7 @@ static uint8_t bridge_settings15[] = {
     0x0F, 0x00, 0x00, 0x00, 0x00, 0x82, 0x00, 0x00, 0x01, 0x00, 0x01, 0xC0,
 };
 
-static uint8_t bridge_settings13[] = {
+static uint8_t t8030_bridge_settings13[] = {
     0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00,
     0x00, 0x03, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x03, 0x00,
     0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04,
@@ -106,7 +106,7 @@ static uint8_t bridge_settings13[] = {
     0x00, 0x48, 0x03, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
 };
 
-static uint8_t bridge_settings1[] = {
+static uint8_t t8030_bridge_settings1[] = {
     0x00, 0x00, 0x00, 0x00, 0x10, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00,
     0x01, 0x00, 0x01, 0x40, 0x00, 0x06, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x01,
     0x08, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0C, 0x07, 0x00, 0x00,
@@ -120,7 +120,7 @@ static uint8_t bridge_settings1[] = {
     0x00, 0x08, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00,
 };
 
-static uint8_t bridge_settings5[] = {
+static uint8_t t8030_bridge_settings5[] = {
     0x00, 0x00, 0x00, 0x00, 0x10, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00,
     0x01, 0x00, 0x00, 0x40, 0x00, 0x06, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x01,
     0x08, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0C, 0x07, 0x00, 0x00,
@@ -138,7 +138,7 @@ static uint8_t bridge_settings5[] = {
     0x00, 0x08, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00,
 };
 
-static uint8_t bridge_settings6[] = {
+static uint8_t t8030_bridge_settings6[] = {
     0x00, 0x00, 0x00, 0x00, 0x10, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00,
     0x01, 0x00, 0x01, 0x40, 0x00, 0x06, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x01,
     0x08, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0C, 0x07, 0x00, 0x00,
@@ -152,7 +152,7 @@ static uint8_t bridge_settings6[] = {
     0x00, 0x08, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00,
 };
 
-static uint8_t bridge_settings2[] = {
+static uint8_t t8030_bridge_settings2[] = {
     0x00, 0x00, 0x00, 0x00, 0x10, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00,
     0x01, 0x00, 0x01, 0x40, 0x00, 0x06, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x01,
     0x08, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0C, 0x07, 0x00, 0x00,
@@ -166,7 +166,7 @@ static uint8_t bridge_settings2[] = {
     0x00, 0x08, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00,
 };
 
-static uint8_t bridge_settings16[] = {
+static uint8_t t8030_bridge_settings16[] = {
     0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
     0x03, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
     0x0C, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
@@ -174,14 +174,14 @@ static uint8_t bridge_settings16[] = {
     0x00, 0x03, 0x00, 0x00, 0x01, 0x00, 0x01, 0xC0,
 };
 
-static uint8_t bridge_settings14[] = {
+static uint8_t t8030_bridge_settings14[] = {
     0x00, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x02,
     0x00, 0x00, 0x01, 0x00, 0x01, 0xC0, 0x28, 0x02, 0x00, 0x00,
     0x01, 0x00, 0x00, 0x00, 0x38, 0x02, 0x00, 0x00, 0x01, 0x00,
     0x00, 0x00, 0x48, 0x02, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
 };
 
-static uint8_t bridge_settings7[] = {
+static uint8_t t8030_bridge_settings7[] = {
     0x00, 0x00, 0x00, 0x00, 0x10, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00,
     0x01, 0x00, 0x01, 0x40, 0x00, 0x06, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x01,
     0x08, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0C, 0x07, 0x00, 0x00,
@@ -191,7 +191,7 @@ static uint8_t bridge_settings7[] = {
     0x00, 0x08, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00,
 };
 
-static uint8_t bridge_settings12[] = {
+static uint8_t t8030_bridge_settings12[] = {
     0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00,
     0xE8, 0x7C, 0x18, 0x03, 0x54, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00,
     0x00, 0x09, 0x00, 0x00, 0x01, 0x00, 0x01, 0x40, 0x24, 0x09, 0x00, 0x00,
@@ -210,7 +210,7 @@ static uint8_t bridge_settings12[] = {
     0x01, 0x00, 0x00, 0x00, 0x48, 0x82, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
 };
 
-static uint8_t bridge_settings3[] = {
+static uint8_t t8030_bridge_settings3[] = {
     0x00, 0x00, 0x00, 0x00, 0x10, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00,
     0x01, 0x00, 0x01, 0x40, 0x00, 0x06, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x01,
     0x08, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0C, 0x07, 0x00, 0x00,
@@ -224,7 +224,7 @@ static uint8_t bridge_settings3[] = {
     0x00, 0x08, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00,
 };
 
-static uint8_t bridge_settings8[] = {
+static uint8_t t8030_bridge_settings8[] = {
     0x00, 0x00, 0x00, 0x00, 0x10, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00,
     0x01, 0x00, 0x01, 0x40, 0x00, 0x06, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x01,
     0x08, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0C, 0x07, 0x00, 0x00,
@@ -238,7 +238,7 @@ static uint8_t bridge_settings8[] = {
     0x00, 0x08, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00,
 };
 
-static uint8_t bridge_settings4[] = {
+static uint8_t t8030_bridge_settings4[] = {
     0x00, 0x00, 0x00, 0x00, 0x10, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00,
     0x01, 0x00, 0x00, 0x40, 0x00, 0x06, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x01,
     0x08, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0C, 0x07, 0x00, 0x00,
@@ -252,7 +252,7 @@ static uint8_t bridge_settings4[] = {
     0x00, 0x08, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00,
 };
 
-static uint8_t bridge_settings0[] = {
+static uint8_t t8030_bridge_settings0[] = {
     0x00, 0x00, 0x00, 0x00, 0x10, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00,
     0x01, 0x00, 0x01, 0x40, 0x00, 0x06, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x01,
     0x08, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0C, 0x07, 0x00, 0x00,
@@ -266,7 +266,7 @@ static uint8_t bridge_settings0[] = {
     0x00, 0x08, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00,
 };
 
-static uint8_t clock_freq[] = {
+static uint8_t t8030_clock_freq[] = {
     0x00, 0x36, 0x6E, 0x01, 0x00, 0x80, 0x00, 0x00, 0x00, 0x40, 0x6E, 0x01,
     0x00, 0x00, 0x2A, 0x11, 0x00, 0x10, 0x5E, 0x5F, 0x00, 0xA8, 0xD4, 0x55,
     0x00, 0x00, 0x00, 0x00, 0x00, 0xDE, 0x42, 0x57, 0x00, 0xD2, 0x49, 0x6B,
@@ -302,14 +302,14 @@ static uint8_t clock_freq[] = {
     0x00, 0xE9, 0xA4, 0x35, 0x00, 0xE9, 0xA4, 0x35, 0x00, 0xE9, 0xA4, 0x35,
 };
 
-static uint32_t spi_cs_pins[] = {
+static uint32_t t8030_spi_cs_pins[] = {
     204,
     95,
     -1,
     66,
 };
 
-static uint32_t spi_irqs[] = {
+static uint32_t t8030_spi_irqs[] = {
     444,
     445,
     446,
diff --git a/hw/arm/apple-silicon/t8030.c b/hw/arm/apple-silicon/t8030.c
index 4c4c8d371d9..84ebfabcbb9 100644
--- a/hw/arm/apple-silicon/t8030.c
+++ b/hw/arm/apple-silicon/t8030.c
@@ -964,58 +964,61 @@ static void t8030_pmgr_setup(MachineState *machine)
                                     t8030_machine->soc_base_pa + 0x3BC00000,
                                     mem);
     }
-    set_dtb_prop(child, "voltage-states5", sizeof(voltage_states5),
-                 voltage_states5);
-    set_dtb_prop(child, "voltage-states9-sram", sizeof(voltage_states9_sram),
-                 voltage_states9_sram);
-    set_dtb_prop(child, "voltage-states0", sizeof(voltage_states0),
-                 voltage_states0);
-    set_dtb_prop(child, "voltage-states9", sizeof(voltage_states9),
-                 voltage_states9);
-    set_dtb_prop(child, "voltage-states2", sizeof(voltage_states2),
-                 voltage_states2);
-    set_dtb_prop(child, "voltage-states1-sram", sizeof(voltage_states1_sram),
-                 voltage_states1_sram);
-    set_dtb_prop(child, "voltage-states10", sizeof(voltage_states10),
-                 voltage_states10);
-    set_dtb_prop(child, "voltage-states11", sizeof(voltage_states11),
-                 voltage_states11);
-    set_dtb_prop(child, "voltage-states8", sizeof(voltage_states8),
-                 voltage_states8);
-    set_dtb_prop(child, "voltage-states5-sram", sizeof(voltage_states5_sram),
-                 voltage_states5_sram);
-    set_dtb_prop(child, "voltage-states1", sizeof(voltage_states1),
-                 voltage_states1);
-    set_dtb_prop(child, "bridge-settings-17", sizeof(bridge_settings17),
-                 bridge_settings17);
-    set_dtb_prop(child, "bridge-settings-15", sizeof(bridge_settings15),
-                 bridge_settings15);
-    set_dtb_prop(child, "bridge-settings-13", sizeof(bridge_settings13),
-                 bridge_settings13);
-    set_dtb_prop(child, "bridge-settings-1", sizeof(bridge_settings1),
-                 bridge_settings1);
-    set_dtb_prop(child, "bridge-settings-5", sizeof(bridge_settings5),
-                 bridge_settings5);
-    set_dtb_prop(child, "bridge-settings-6", sizeof(bridge_settings6),
-                 bridge_settings6);
-    set_dtb_prop(child, "bridge-settings-2", sizeof(bridge_settings2),
-                 bridge_settings2);
-    set_dtb_prop(child, "bridge-settings-16", sizeof(bridge_settings16),
-                 bridge_settings16);
-    set_dtb_prop(child, "bridge-settings-14", sizeof(bridge_settings14),
-                 bridge_settings14);
-    set_dtb_prop(child, "bridge-settings-7", sizeof(bridge_settings7),
-                 bridge_settings7);
-    set_dtb_prop(child, "bridge-settings-12", sizeof(bridge_settings12),
-                 bridge_settings12);
-    set_dtb_prop(child, "bridge-settings-3", sizeof(bridge_settings3),
-                 bridge_settings3);
-    set_dtb_prop(child, "bridge-settings-8", sizeof(bridge_settings8),
-                 bridge_settings8);
-    set_dtb_prop(child, "bridge-settings-4", sizeof(bridge_settings4),
-                 bridge_settings4);
-    set_dtb_prop(child, "bridge-settings-0", sizeof(bridge_settings0),
-                 bridge_settings0);
+    set_dtb_prop(child, "voltage-states5", sizeof(t8030_voltage_states5),
+                 t8030_voltage_states5);
+    set_dtb_prop(child, "voltage-states9-sram",
+                 sizeof(t8030_voltage_states9_sram),
+                 t8030_voltage_states9_sram);
+    set_dtb_prop(child, "voltage-states0", sizeof(t8030_voltage_states0),
+                 t8030_voltage_states0);
+    set_dtb_prop(child, "voltage-states9", sizeof(t8030_voltage_states9),
+                 t8030_voltage_states9);
+    set_dtb_prop(child, "voltage-states2", sizeof(t8030_voltage_states2),
+                 t8030_voltage_states2);
+    set_dtb_prop(child, "voltage-states1-sram",
+                 sizeof(t8030_voltage_states1_sram),
+                 t8030_voltage_states1_sram);
+    set_dtb_prop(child, "voltage-states10", sizeof(t8030_voltage_states10),
+                 t8030_voltage_states10);
+    set_dtb_prop(child, "voltage-states11", sizeof(t8030_voltage_states11),
+                 t8030_voltage_states11);
+    set_dtb_prop(child, "voltage-states8", sizeof(t8030_voltage_states8),
+                 t8030_voltage_states8);
+    set_dtb_prop(child, "voltage-states5-sram",
+                 sizeof(t8030_voltage_states5_sram),
+                 t8030_voltage_states5_sram);
+    set_dtb_prop(child, "voltage-states1", sizeof(t8030_voltage_states1),
+                 t8030_voltage_states1);
+    set_dtb_prop(child, "bridge-settings-17", sizeof(t8030_bridge_settings17),
+                 t8030_bridge_settings17);
+    set_dtb_prop(child, "bridge-settings-15", sizeof(t8030_bridge_settings15),
+                 t8030_bridge_settings15);
+    set_dtb_prop(child, "bridge-settings-13", sizeof(t8030_bridge_settings13),
+                 t8030_bridge_settings13);
+    set_dtb_prop(child, "bridge-settings-1", sizeof(t8030_bridge_settings1),
+                 t8030_bridge_settings1);
+    set_dtb_prop(child, "bridge-settings-5", sizeof(t8030_bridge_settings5),
+                 t8030_bridge_settings5);
+    set_dtb_prop(child, "bridge-settings-6", sizeof(t8030_bridge_settings6),
+                 t8030_bridge_settings6);
+    set_dtb_prop(child, "bridge-settings-2", sizeof(t8030_bridge_settings2),
+                 t8030_bridge_settings2);
+    set_dtb_prop(child, "bridge-settings-16", sizeof(t8030_bridge_settings16),
+                 t8030_bridge_settings16);
+    set_dtb_prop(child, "bridge-settings-14", sizeof(t8030_bridge_settings14),
+                 t8030_bridge_settings14);
+    set_dtb_prop(child, "bridge-settings-7", sizeof(t8030_bridge_settings7),
+                 t8030_bridge_settings7);
+    set_dtb_prop(child, "bridge-settings-12", sizeof(t8030_bridge_settings12),
+                 t8030_bridge_settings12);
+    set_dtb_prop(child, "bridge-settings-3", sizeof(t8030_bridge_settings3),
+                 t8030_bridge_settings3);
+    set_dtb_prop(child, "bridge-settings-8", sizeof(t8030_bridge_settings8),
+                 t8030_bridge_settings8);
+    set_dtb_prop(child, "bridge-settings-4", sizeof(t8030_bridge_settings4),
+                 t8030_bridge_settings4);
+    set_dtb_prop(child, "bridge-settings-0", sizeof(t8030_bridge_settings0),
+                 t8030_bridge_settings0);
 }
 
 static void t8030_amcc_setup(MachineState *machine)
@@ -1304,8 +1307,8 @@ static void t8030_create_spi(MachineState *machine, uint32_t port)
     Object *sio;
     char name[32] = { 0 };
     hwaddr base = t8030_machine->soc_base_pa + T8030_SPI_BASE(port);
-    uint32_t irq = spi_irqs[port];
-    uint32_t cs_pin = spi_cs_pins[port];
+    uint32_t irq = t8030_spi_irqs[port];
+    uint32_t cs_pin = t8030_spi_cs_pins[port];
 
     g_assert_cmpuint(port, <, T8030_NUM_SPIS);
     snprintf(name, sizeof(name), "spi%d", port);
@@ -2100,7 +2103,8 @@ static void t8030_machine_init(MachineState *machine)
     data = 0x20;
     set_dtb_prop(child, "chip-revision", sizeof(data), &data);
 
-    set_dtb_prop(child, "clock-frequencies", sizeof(clock_freq), clock_freq);
+    set_dtb_prop(child, "clock-frequencies", sizeof(t8030_clock_freq),
+                 t8030_clock_freq);
 
     prop = find_dtb_prop(child, "ranges");
     g_assert_nonnull(prop);