# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1697150961 -7200
# Node ID 2dd556a42ffc29ea9ff2d333ed58bef57c90bf90
# Parent  d457dba9cc2ad348c6d3349802fc14fd9a3310ea# Parent  436ae1f720177fde8fb1343504a6f40add656a74
Merged CPM fixes.

diff -r d457dba9cc2a -r 2dd556a42ffc pkg/devices/lib/cpm/src/x1600.cc
--- a/pkg/devices/lib/cpm/src/x1600.cc	Thu Oct 12 18:52:11 2023 +0200
+++ b/pkg/devices/lib/cpm/src/x1600.cc	Fri Oct 13 00:49:21 2023 +0200
@@ -245,6 +245,7 @@
            mux_hclock0  (Clock_hclock0),
            mux_hclock2  (Clock_hclock2),
            mux_pclock   (Clock_pclock),
+           mux_main     (3, Clocks(Clock_none, Clock_external, Clock_pll_A)),
            mux_core     (3, Clocks(Clock_none, Clock_main, Clock_pll_M)),
            mux_bus      (4, Clocks(Clock_main, Clock_pll_M, Clock_pll_E, Clock_external)),
            mux_dev      (3, Clocks(Clock_main, Clock_pll_M, Clock_pll_E)),
@@ -269,7 +270,7 @@
 
              clock_i2c1((Source(mux_pclock)), (Control(Clock_gate_i2c1))),
 
-             clock_main(Source(mux_core, Clock_source_main), Control(Clock_gate_main)),
+             clock_main(Source(mux_main, Clock_source_main), Control(Clock_gate_main)),
 
              clock_mipi_csi((Source(mux_hclock0)), Control(Clock_gate_mipi_csi)),