diff --git a/data/chips/HPM6850.yaml b/data/chips/HPM6850.yaml
index 9573af9..b19db35 100644
--- a/data/chips/HPM6850.yaml
+++ b/data/chips/HPM6850.yaml
@@ -40,6 +40,7 @@ cores:
     include_peripherals:
       - "../family/COMMON.yaml"
       - "../family/HPM6800.yaml"
+      - "../family/HPM6800_NonBasic.yaml"
     include_interrupts: "../interrupts/HPM6850.yaml"
     include_dmamux: "../dmamux/HPM6880.yaml"
     gen_dma_channels:
diff --git a/data/chips/HPM6880.yaml b/data/chips/HPM6880.yaml
index daa913b..66aaa57 100644
--- a/data/chips/HPM6880.yaml
+++ b/data/chips/HPM6880.yaml
@@ -40,6 +40,8 @@ cores:
     include_peripherals:
       - "../family/COMMON.yaml"
       - "../family/HPM6800.yaml"
+      - "../family/HPM6800_NonBasic.yaml"
+      - "../family/HPM6800_Adv.yaml"
     include_interrupts: "../interrupts/HPM6880.yaml"
     include_dmamux: "../dmamux/HPM6880.yaml"
     gen_dma_channels:
diff --git a/data/family/HPM6800.yaml b/data/family/HPM6800.yaml
index b3702ce..62a437e 100644
--- a/data/family/HPM6800.yaml
+++ b/data/family/HPM6800.yaml
@@ -196,138 +196,7 @@
 
 # visual processing
 
-- name: GPU
-  address: 0xF1080000
-  registers:
-    kind: gpu
-    version: v68
-    block: GPU
-
-- name: MIPI_DSI0
-  address: 0xF1020000
-  registers:
-    kind: mipidsi
-    version: v68
-    block: MIPI_DSI
-- name: MIPI_DSI1
-  address: 0xF1024000
-  registers:
-    kind: mipidsi
-    version: v68
-    block: MIPI_DSI
-
-- name: MIPI_DSI_PHY0
-  address: 0xF4140000
-  registers:
-    kind: mipidsiphy
-    version: v68
-    block: MIPI_DSI_PHY
-- name: MIPI_DSI_PHY1
-  address: 0xF4144000
-  registers:
-    kind: mipidsiphy
-    version: v68
-    block: MIPI_DSI_PHY
-
-- name: MIPI_CSI0
-  address: 0xF1028000
-  registers:
-    kind: mipicsi
-    version: v68
-    block: MIPI_CSI
-- name: MIPI_CSI1
-  address: 0xF102C000
-  registers:
-    kind: mipicsi
-    version: v68
-    block: MIPI_CSI
-
-- name: MIPI_CSI_PHY0
-  address: 0xF4148000
-  registers:
-    kind: mipicsiphy
-    version: v68
-    block: MIPI_CSI_PHY
-- name: MIPI_CSI_PHY1
-  address: 0xF414C000
-  registers:
-    kind: mipicsiphy
-    version: v68
-    block: MIPI_CSI_PHY
-
-- name: LCDC0
-  address: 0xF1000000
-  registers:
-    kind: lcdc
-    version: v68
-    block: LCDC
-- name: LCDC1
-  address: 0xF1004000
-  registers:
-    kind: lcdc
-    version: v68
-    block: LCDC
-
-- name: CAM0
-  address: 0xF1008000
-  registers:
-    kind: cam
-    version: v68
-    block: CAM
-- name: CAM1
-  address: 0xF100C000
-  registers:
-    kind: cam
-    version: v68
-    block: CAM
-
-- name: PDMA
-  address: 0xF1010000
-  registers:
-    kind: pdma
-    version: v68
-    block: PDMA
-
-- name: JPEG
-  address: 0xF1014000
-  registers:
-    kind: jpeg
-    version: common
-    block: JPEG
-
-- name: GWC0
-  address: 0xF1018000
-  registers:
-    kind: gwc
-    version: v68
-    block: GWC
-- name: GWC1
-  address: 0xF101C000
-  registers:
-    kind: gwc
-    version: v68
-    block: GWC
-
-- name: LVB
-  address: 0xF1030000
-  registers:
-    kind: lvb
-    version: v68
-    block: LVB
-
-- name: LCB
-  address: 0xF1038000
-  registers:
-    kind: lcb
-    version: v68
-    block: LCB
-
-- name: PIXELMUX
-  address: 0xF1034000
-  registers:
-    kind: pixelmux
-    version: v68
-    block: PIXEL_MUX
+# in NonBasic
 
 # audio peripherals
 
diff --git a/data/family/HPM6800_Adv.yaml b/data/family/HPM6800_Adv.yaml
new file mode 100644
index 0000000..08b19b0
--- /dev/null
+++ b/data/family/HPM6800_Adv.yaml
@@ -0,0 +1,13 @@
+- name: GPU
+  address: 0xF1080000
+  registers:
+    kind: gpu
+    version: v68
+    block: GPU
+
+- name: JPEG
+  address: 0xF1014000
+  registers:
+    kind: jpeg
+    version: common
+    block: JPEG
diff --git a/data/family/HPM6800_NonBasic.yaml b/data/family/HPM6800_NonBasic.yaml
new file mode 100644
index 0000000..2c62257
--- /dev/null
+++ b/data/family/HPM6800_NonBasic.yaml
@@ -0,0 +1,118 @@
+- name: LCDC0
+  address: 0xF1000000
+  registers:
+    kind: lcdc
+    version: v68
+    block: LCDC
+- name: LCDC1
+  address: 0xF1004000
+  registers:
+    kind: lcdc
+    version: v68
+    block: LCDC
+
+- name: MIPI_DSI0
+  address: 0xF1020000
+  registers:
+    kind: mipidsi
+    version: v68
+    block: MIPI_DSI
+- name: MIPI_DSI1
+  address: 0xF1024000
+  registers:
+    kind: mipidsi
+    version: v68
+    block: MIPI_DSI
+
+- name: MIPI_DSI_PHY0
+  address: 0xF4140000
+  registers:
+    kind: mipidsiphy
+    version: v68
+    block: MIPI_DSI_PHY
+- name: MIPI_DSI_PHY1
+  address: 0xF4144000
+  registers:
+    kind: mipidsiphy
+    version: v68
+    block: MIPI_DSI_PHY
+
+- name: MIPI_CSI0
+  address: 0xF1028000
+  registers:
+    kind: mipicsi
+    version: v68
+    block: MIPI_CSI
+- name: MIPI_CSI1
+  address: 0xF102C000
+  registers:
+    kind: mipicsi
+    version: v68
+    block: MIPI_CSI
+
+- name: MIPI_CSI_PHY0
+  address: 0xF4148000
+  registers:
+    kind: mipicsiphy
+    version: v68
+    block: MIPI_CSI_PHY
+- name: MIPI_CSI_PHY1
+  address: 0xF414C000
+  registers:
+    kind: mipicsiphy
+    version: v68
+    block: MIPI_CSI_PHY
+
+- name: CAM0
+  address: 0xF1008000
+  registers:
+    kind: cam
+    version: v68
+    block: CAM
+- name: CAM1
+  address: 0xF100C000
+  registers:
+    kind: cam
+    version: v68
+    block: CAM
+
+- name: PDMA
+  address: 0xF1010000
+  registers:
+    kind: pdma
+    version: v68
+    block: PDMA
+
+- name: LVB
+  address: 0xF1030000
+  registers:
+    kind: lvb
+    version: v68
+    block: LVB
+
+- name: LCB
+  address: 0xF1038000
+  registers:
+    kind: lcb
+    version: v68
+    block: LCB
+
+- name: GWC0
+  address: 0xF1018000
+  registers:
+    kind: gwc
+    version: v68
+    block: GWC
+- name: GWC1
+  address: 0xF101C000
+  registers:
+    kind: gwc
+    version: v68
+    block: GWC
+
+- name: PIXELMUX
+  address: 0xF1034000
+  registers:
+    kind: pixelmux
+    version: v68
+    block: PIXEL_MUX