1.1 --- a/pkg/landfall-examples/ci20_hdmi_i2c/ci20_hdmi_i2c.c Sat Jan 30 23:39:17 2021 +0100
1.2 +++ b/pkg/landfall-examples/ci20_hdmi_i2c/ci20_hdmi_i2c.c Sun Jan 31 00:49:22 2021 +0100
1.3 @@ -1,7 +1,7 @@
1.4 /*
1.5 * Access the HDMI I2C peripheral on the MIPS Creator CI20 board.
1.6 *
1.7 - * Copyright (C) 2020 Paul Boddie <paul@boddie.org.uk>
1.8 + * Copyright (C) 2020, 2021 Paul Boddie <paul@boddie.org.uk>
1.9 *
1.10 * This program is free software; you can redistribute it and/or
1.11 * modify it under the terms of the GNU General Public License as
1.12 @@ -268,15 +268,15 @@
1.13
1.14 printf("VPLL frequency: %d\n", jz4780_cpm_get_vpll_frequency(cpm));
1.15 printf("HDMI divider: %d\n", jz4780_cpm_get_hdmi_divider(cpm));
1.16 - printf("HDMI frequency: %d\n", jz4780_cpm_get_hdmi_frequency(cpm));
1.17 + printf("HDMI frequency: %d\n", jz4780_cpm_get_frequency(cpm, Clock_frequency_hdmi));
1.18
1.19 - jz4780_cpm_stop_hdmi(cpm);
1.20 - jz4780_cpm_set_hdmi_frequency(cpm, 27000000);
1.21 + jz4780_cpm_stop_clock(cpm, Clock_hdmi);
1.22 + jz4780_cpm_set_frequency(cpm, Clock_frequency_hdmi, 27000000);
1.23
1.24 printf("HDMI divider: %d\n", jz4780_cpm_get_hdmi_divider(cpm));
1.25 - printf("HDMI frequency: %d\n", jz4780_cpm_get_hdmi_frequency(cpm));
1.26 + printf("HDMI frequency: %d\n", jz4780_cpm_get_frequency(cpm, Clock_frequency_hdmi));
1.27
1.28 - jz4780_cpm_start_hdmi(cpm);
1.29 + jz4780_cpm_start_clock(cpm, Clock_hdmi);
1.30
1.31 /* Configure pins. */
1.32
1.33 @@ -336,22 +336,22 @@
1.34
1.35 printf("LCD source: %d\n", jz4780_cpm_get_lcd_source(cpm));
1.36 printf("LCD divider: %d\n", jz4780_cpm_get_lcd_pixel_divider(cpm));
1.37 - printf("LCD frequency: %d\n", jz4780_cpm_get_lcd_pixel_frequency(cpm));
1.38 + printf("LCD frequency: %d\n", jz4780_cpm_get_frequency(cpm, Clock_frequency_lcd_pixel));
1.39 printf("Desired frequency: %d\n", jz4740_lcd_get_pixel_clock(lcd));
1.40
1.41 - jz4780_cpm_stop_lcd(cpm);
1.42 - jz4780_cpm_set_lcd_frequencies(cpm, jz4740_lcd_get_pixel_clock(lcd), 3);
1.43 + jz4780_cpm_stop_clock(cpm, Clock_lcd);
1.44 + jz4780_cpm_set_frequency(cpm, Clock_frequency_lcd_pixel, jz4740_lcd_get_pixel_clock(lcd));
1.45
1.46 printf("LCD source: %d\n", jz4780_cpm_get_lcd_source(cpm));
1.47 printf("LCD divider: %d\n", jz4780_cpm_get_lcd_pixel_divider(cpm));
1.48 - printf("LCD frequency: %d\n", jz4780_cpm_get_lcd_pixel_frequency(cpm));
1.49 + printf("LCD frequency: %d\n", jz4780_cpm_get_frequency(cpm, Clock_frequency_lcd_pixel));
1.50 printf("AHB0 frequency: %d\n", jz4780_cpm_get_hclock0_frequency(cpm));
1.51
1.52 /* With the LCD pixel clock set up, bring up the HDMI. */
1.53
1.54 printf("Enable HDMI output...\n");
1.55
1.56 - jz4780_hdmi_enable(hdmi, jz4780_cpm_get_lcd_pixel_frequency(cpm));
1.57 + jz4780_hdmi_enable(hdmi, jz4780_cpm_get_frequency(cpm, Clock_frequency_lcd_pixel));
1.58
1.59 /* Allocate descriptors and framebuffer at 2**8 == 256 byte == 64 word alignment. */
1.60
1.61 @@ -417,7 +417,7 @@
1.62
1.63 printf("Start LCD clock and initialise LCD...\n");
1.64
1.65 - jz4780_cpm_start_lcd(cpm);
1.66 + jz4780_cpm_start_clock(cpm, Clock_lcd);
1.67 l4_sleep(1); // 1ms == 1000us
1.68
1.69 jz4740_lcd_disable(lcd);