1.1 --- a/pkg/devices/lib/cpm/include/cpm-jz4780.h Sat Jan 30 23:39:17 2021 +0100
1.2 +++ b/pkg/devices/lib/cpm/include/cpm-jz4780.h Sun Jan 31 00:49:22 2021 +0100
1.3 @@ -21,7 +21,7 @@
1.4
1.5 #pragma once
1.6
1.7 -#include "cpm.h"
1.8 +#include <l4/devices/cpm.h>
1.9
1.10 #include <l4/sys/types.h>
1.11 #include <stdint.h>
1.12 @@ -133,9 +133,6 @@
1.13 uint32_t get_cpu_frequency();
1.14 uint32_t get_hclock0_frequency();
1.15 uint32_t get_hclock2_frequency();
1.16 - uint32_t get_hdmi_frequency();
1.17 - uint32_t get_lcd_pixel_frequency(uint8_t controller);
1.18 - uint32_t get_lcd_pixel_frequency() { return get_lcd_pixel_frequency(0); }
1.19 uint32_t get_memory_frequency();
1.20 uint32_t get_pclock_frequency();
1.21
1.22 @@ -144,11 +141,11 @@
1.23 uint32_t get_mpll_frequency();
1.24 uint32_t get_vpll_frequency();
1.25
1.26 - void set_hdmi_frequency(uint32_t pclk);
1.27 - void set_lcd_pixel_frequency(uint32_t pclk);
1.28 - void set_lcd_frequencies(uint32_t pclk, uint8_t multiplier);
1.29 void set_pll_parameters(uint32_t pll_reg, uint16_t multiplier, uint8_t in_divider, uint8_t out_divider);
1.30
1.31 + uint32_t get_frequency(enum Clock_frequency_identifiers clock);
1.32 + void set_frequency(enum Clock_frequency_identifiers clock, uint32_t frequency);
1.33 +
1.34 void update_output_frequency();
1.35 };
1.36
1.37 @@ -196,8 +193,6 @@
1.38 uint32_t jz4780_cpm_get_cpu_frequency(void *cpm);
1.39 uint32_t jz4780_cpm_get_hclock0_frequency(void *cpm);
1.40 uint32_t jz4780_cpm_get_hclock2_frequency(void *cpm);
1.41 -uint32_t jz4780_cpm_get_hdmi_frequency(void *cpm);
1.42 -uint32_t jz4780_cpm_get_lcd_pixel_frequency(void *cpm);
1.43 uint32_t jz4780_cpm_get_memory_frequency(void *cpm);
1.44 uint32_t jz4780_cpm_get_pclock_frequency(void *cpm);
1.45
1.46 @@ -206,9 +201,9 @@
1.47 uint32_t jz4780_cpm_get_mpll_frequency(void *cpm);
1.48 uint32_t jz4780_cpm_get_vpll_frequency(void *cpm);
1.49
1.50 -void jz4780_cpm_set_hdmi_frequency(void *cpm, uint32_t pclk);
1.51 -void jz4780_cpm_set_lcd_pixel_frequency(void *cpm, uint32_t pclk);
1.52 -void jz4780_cpm_set_lcd_frequencies(void *cpm, uint32_t pclk, uint8_t ratio);
1.53 +uint32_t jz4780_cpm_get_frequency(void *cpm, enum Clock_frequency_identifiers clock);
1.54 +void jz4780_cpm_set_frequency(void *cpm, enum Clock_frequency_identifiers clock, uint32_t frequency);
1.55 +
1.56 void jz4780_cpm_set_mpll_parameters(void *cpm, uint16_t multiplier, uint8_t in_divider, uint8_t out_divider);
1.57
1.58 EXTERN_C_END