Skip to content

Commit 4754c5e

Browse files
nascstingleby
authored andcommitted
radxa cm5 io: remove useless pwm pins
Signed-off-by: Nascs <[email protected]>
1 parent 9374cc4 commit 4754c5e

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

include/arm/radxa_cm5_io.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ extern "C" {
1717
#define MRAA_RADXA_CM5_IO_I2C_COUNT 4
1818
#define MRAA_RADXA_CM5_IO_SPI_COUNT 1
1919
#define MRAA_RADXA_CM5_IO_UART_COUNT 2
20-
#define MRAA_RADXA_CM5_IO_PWM_COUNT 9
20+
#define MRAA_RADXA_CM5_IO_PWM_COUNT 7
2121
#define MRAA_RADXA_CM5_IO_AIO_COUNT 1
2222
#define MRAA_RADXA_CM5_IO_PIN_COUNT 40
2323
#define PLATFORM_NAME_RADXA_CM5_IO "Radxa CM5 IO"

src/arm/radxa_cm5_io.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,9 @@ mraa_radxa_cm5_io()
9393
b->pins[3].pwm.parent_id = 10; // PWM10-M2
9494
b->pins[3].pwm.mux_total = 0;
9595
b->pins[3].pwm.pinmap = 0;
96-
b->pins[16].pwm.parent_id = 11; // PWM11-M0
97-
b->pins[16].pwm.mux_total = 0;
98-
b->pins[16].pwm.pinmap = 0;
9996
b->pins[24].pwm.parent_id = 14; // PWM14-M1
10097
b->pins[24].pwm.mux_total = 0;
10198
b->pins[24].pwm.pinmap = 0;
102-
b->pins[28].pwm.parent_id = 14; // PWM14-M2
103-
b->pins[28].pwm.mux_total = 0;
104-
b->pins[28].pwm.pinmap = 0;
10599
b->pins[29].pwm.parent_id = 7; // PWM7-M0
106100
b->pins[29].pwm.mux_total = 0;
107101
b->pins[29].pwm.pinmap = 0;
@@ -142,7 +136,7 @@ mraa_radxa_cm5_io()
142136
mraa_radxa_cm5_io_pininfo(b, 13, 4, 5, (mraa_pincapabilities_t){1,1,0,0,0,1,0,1}, "GPIO4_A5");
143137
mraa_radxa_cm5_io_pininfo(b, 14, -1, -1, (mraa_pincapabilities_t){1,0,0,0, 0,0,0,0}, "GND");
144138
mraa_radxa_cm5_io_pininfo(b, 15, 4, 4, (mraa_pincapabilities_t){1,1,0,0,0,1,0,0}, "GPIO4_A4");
145-
mraa_radxa_cm5_io_pininfo(b, 16, 1, 20, (mraa_pincapabilities_t){1,1,1,0,1,1,0,0}, "GPIO1_C4");
139+
mraa_radxa_cm5_io_pininfo(b, 16, 1, 20, (mraa_pincapabilities_t){1,1,0,0,1,1,0,0}, "GPIO1_C4"); // Conflict with the fan's pwm11-m3
146140
mraa_radxa_cm5_io_pininfo(b, 17, -1, -1, (mraa_pincapabilities_t){1,0,0,0, 0,0,0,0}, "3V3");
147141
mraa_radxa_cm5_io_pininfo(b, 18, 1, 29, (mraa_pincapabilities_t){1,1,0,0,1,0,0,0}, "GPIO1_D5");
148142
mraa_radxa_cm5_io_pininfo(b, 19, 4, 1, (mraa_pincapabilities_t){1,1,0,0,1,0,0,0}, "GPIO4_A1");

0 commit comments

Comments
 (0)