1.1 --- a/pkg/devices/lib/cpm/src/jz4780.cc Wed Apr 24 00:47:34 2024 +0200
1.2 +++ b/pkg/devices/lib/cpm/src/jz4780.cc Sat Apr 27 23:46:28 2024 +0200
1.3 @@ -451,7 +451,7 @@
1.4 Divider(Clock_divider_vpu));
1.5
1.6 static Clock_divided_fixed
1.7 - clock_external_div_512((Source(mux_external)), (Divider_fixed(512)));
1.8 + clock_external_div((Source(mux_external)), (Divider_fixed(512)));
1.9
1.10 const double jz4780_pll_intermediate_min = 300000000,
1.11 jz4780_pll_intermediate_max = 1500000000;
1.12 @@ -499,7 +499,7 @@
1.13 &clock_dma,
1.14 &clock_none, // Clock_emac
1.15 &clock_external,
1.16 - &clock_external_div_512,
1.17 + &clock_external_div,
1.18 &clock_hclock0,
1.19 &clock_hclock2,
1.20 &clock_hclock2_pclock,
1.21 @@ -522,6 +522,7 @@
1.22 &clock_lcd_pixel1,
1.23 &clock_mac,
1.24 &clock_main,
1.25 + &clock_none, // Clock_mclock
1.26 &clock_none, // Clock_mipi_csi
1.27 &clock_msc,
1.28 &clock_msc0,
1.29 @@ -532,13 +533,14 @@
1.30 &clock_otg1,
1.31 &clock_pclock,
1.32 &clock_pcm,
1.33 + &clock_none, // Clock_pll
1.34 &clock_pll_A,
1.35 &clock_pll_E,
1.36 &clock_pll_M,
1.37 &clock_pll_V,
1.38 &clock_none, // Clock_pwm0
1.39 &clock_none, // Clock_pwm1
1.40 - &clock_external_div_512,// Clock_rtc
1.41 + &clock_external_div, // Clock_rtc
1.42 &clock_rtc_external,
1.43 &clock_sadc,
1.44 &clock_scc,
1.45 @@ -576,90 +578,96 @@
1.46 {
1.47 }
1.48
1.49 +Cpm_chip *
1.50 +jz4780_cpm_chip(l4_addr_t cpm_base)
1.51 +{
1.52 + return new Cpm_jz4780_chip(cpm_base);
1.53 +}
1.54 +
1.55
1.56
1.57 // C language interface functions.
1.58
1.59 -void
1.60 -*jz4780_cpm_init(l4_addr_t cpm_base)
1.61 +void *
1.62 +jz4780_cpm_init(l4_addr_t cpm_base)
1.63 {
1.64 - return (void *) new Cpm_jz4780_chip(cpm_base);
1.65 + return (void *) jz4780_cpm_chip(cpm_base);
1.66 }
1.67
1.68 const char *
1.69 jz4780_cpm_clock_type(void *cpm, enum Clock_identifiers clock)
1.70 {
1.71 - return static_cast<Cpm_jz4780_chip *>(cpm)->clock_type(clock);
1.72 + return static_cast<Cpm_chip *>(cpm)->clock_type(clock);
1.73 }
1.74
1.75 int
1.76 jz4780_cpm_have_clock(void *cpm, enum Clock_identifiers clock)
1.77 {
1.78 - return static_cast<Cpm_jz4780_chip *>(cpm)->have_clock(clock);
1.79 + return static_cast<Cpm_chip *>(cpm)->have_clock(clock);
1.80 }
1.81
1.82 void
1.83 jz4780_cpm_start_clock(void *cpm, enum Clock_identifiers clock)
1.84 {
1.85 - static_cast<Cpm_jz4780_chip *>(cpm)->start_clock(clock);
1.86 + static_cast<Cpm_chip *>(cpm)->start_clock(clock);
1.87 }
1.88
1.89 void
1.90 jz4780_cpm_stop_clock(void *cpm, enum Clock_identifiers clock)
1.91 {
1.92 - static_cast<Cpm_jz4780_chip *>(cpm)->stop_clock(clock);
1.93 + static_cast<Cpm_chip *>(cpm)->stop_clock(clock);
1.94 }
1.95
1.96 int
1.97 jz4780_cpm_get_parameters(void *cpm, enum Clock_identifiers clock, uint32_t parameters[])
1.98 {
1.99 - return static_cast<Cpm_jz4780_chip *>(cpm)->get_parameters(clock, parameters);
1.100 + return static_cast<Cpm_chip *>(cpm)->get_parameters(clock, parameters);
1.101 }
1.102
1.103 int
1.104 jz4780_cpm_set_parameters(void *cpm, enum Clock_identifiers clock, int num_parameters, uint32_t parameters[])
1.105 {
1.106 - return static_cast<Cpm_jz4780_chip *>(cpm)->set_parameters(clock, num_parameters, parameters);
1.107 + return static_cast<Cpm_chip *>(cpm)->set_parameters(clock, num_parameters, parameters);
1.108 }
1.109
1.110 uint8_t
1.111 jz4780_cpm_get_source(void *cpm, enum Clock_identifiers clock)
1.112 {
1.113 - return static_cast<Cpm_jz4780_chip *>(cpm)->get_source(clock);
1.114 + return static_cast<Cpm_chip *>(cpm)->get_source(clock);
1.115 }
1.116
1.117 void
1.118 jz4780_cpm_set_source(void *cpm, enum Clock_identifiers clock, uint8_t source)
1.119 {
1.120 - static_cast<Cpm_jz4780_chip *>(cpm)->set_source(clock, source);
1.121 + static_cast<Cpm_chip *>(cpm)->set_source(clock, source);
1.122 }
1.123
1.124 enum Clock_identifiers
1.125 jz4780_cpm_get_source_clock(void *cpm, enum Clock_identifiers clock)
1.126 {
1.127 - return static_cast<Cpm_jz4780_chip *>(cpm)->get_source_clock(clock);
1.128 + return static_cast<Cpm_chip *>(cpm)->get_source_clock(clock);
1.129 }
1.130
1.131 void
1.132 jz4780_cpm_set_source_clock(void *cpm, enum Clock_identifiers clock, enum Clock_identifiers source)
1.133 {
1.134 - static_cast<Cpm_jz4780_chip *>(cpm)->set_source_clock(clock, source);
1.135 + static_cast<Cpm_chip *>(cpm)->set_source_clock(clock, source);
1.136 }
1.137
1.138 uint64_t
1.139 jz4780_cpm_get_source_frequency(void *cpm, enum Clock_identifiers clock)
1.140 {
1.141 - return static_cast<Cpm_jz4780_chip *>(cpm)->get_source_frequency(clock);
1.142 + return static_cast<Cpm_chip *>(cpm)->get_source_frequency(clock);
1.143 }
1.144
1.145 uint64_t
1.146 jz4780_cpm_get_frequency(void *cpm, enum Clock_identifiers clock)
1.147 {
1.148 - return static_cast<Cpm_jz4780_chip *>(cpm)->get_frequency(clock);
1.149 + return static_cast<Cpm_chip *>(cpm)->get_frequency(clock);
1.150 }
1.151
1.152 int
1.153 jz4780_cpm_set_frequency(void *cpm, enum Clock_identifiers clock, uint64_t frequency)
1.154 {
1.155 - return static_cast<Cpm_jz4780_chip *>(cpm)->set_frequency(clock, frequency);
1.156 + return static_cast<Cpm_chip *>(cpm)->set_frequency(clock, frequency);
1.157 }