Skip to content

Commit 587b322

Browse files
authored
Merge pull request arduino#65 from KurtE/GIGA_M7_fix_spi5
GIGA: Remove Arduino pins 11-13 from PWM list to fix SPI1
2 parents e0eb2aa + 8428b9a commit 587b322

File tree

1 file changed

+22
-16
lines changed

1 file changed

+22
-16
lines changed

Diff for: loader/boards/arduino_giga_r1_m7.overlay

+22-16
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,9 @@
6363

6464
pwm1: pwm {
6565
status = "okay";
66-
pinctrl-0 = <&tim1_ch3_pj9 &tim1_ch1_pk1 &tim1_ch2_pj11>;
66+
/* Temporarily removed SPI1 pins */
67+
/* pinctrl-0 = <&tim1_ch3_pj9 &tim1_ch1_pk1 &tim1_ch2_pj11>; */
68+
pinctrl-0 = <&tim1_ch3_pj9 &tim1_ch1_pk1>;
6769
pinctrl-names = "default";
6870
};
6971
};
@@ -107,21 +109,23 @@
107109

108110
pwm8: pwm {
109111
status = "okay";
110-
pinctrl-0 = <&tim8_ch1_pj8 &tim8_ch2_pj10>;
112+
/* Temporarily removed SPI1 pins */
113+
/* pinctrl-0 = <&tim8_ch1_pj8 &tim8_ch2_pj10>; */
114+
pinctrl-0 = <&tim8_ch1_pj8>;
111115
pinctrl-names = "default";
112116
};
113117
};
114118

115-
&timers12 {
116-
status = "okay";
117-
st,prescaler = <100>;
118-
119-
pwm12: pwm {
120-
status = "okay";
121-
pinctrl-0 = <&tim12_ch1_ph6>;
122-
pinctrl-names = "default";
123-
};
124-
};
119+
/* Temporarily removed SPI1 pins */
120+
/* &timers12 { */
121+
/* status = "okay"; */
122+
/* st,prescaler = <100>; */
123+
/* pwm12: pwm { */
124+
/* status = "okay"; */
125+
/* pinctrl-0 = <&tim12_ch1_ph6>; */
126+
/* pinctrl-names = "default"; */
127+
/* }; */
128+
/*}; */
125129

126130
&pwm1 {
127131
/* Use the pwmclock node to start the clock generation */
@@ -518,10 +522,12 @@
518522
<&pwm3 1 PWM_HZ(500) PWM_POLARITY_NORMAL>,
519523
<&pwm4 3 PWM_HZ(500) PWM_POLARITY_NORMAL>,
520524
<&pwm4 4 PWM_HZ(500) PWM_POLARITY_NORMAL>,
521-
<&pwm1 1 PWM_HZ(5000) PWM_POLARITY_NORMAL>,
522-
<&pwm8 2 PWM_HZ(500) PWM_POLARITY_NORMAL>,
523-
<&pwm1 2 PWM_HZ(5000) PWM_POLARITY_NORMAL>,
524-
<&pwm12 1 PWM_HZ(500) PWM_POLARITY_NORMAL>;
525+
/* Temporarily removed SPI1 pins */
526+
/* <&pwm1 1 PWM_HZ(5000) PWM_POLARITY_NORMAL>, */
527+
/* <&pwm8 2 PWM_HZ(500) PWM_POLARITY_NORMAL>, */
528+
/* <&pwm1 2 PWM_HZ(5000) PWM_POLARITY_NORMAL>, */
529+
/* <&pwm12 1 PWM_HZ(500) PWM_POLARITY_NORMAL>; */
530+
<&pwm1 1 PWM_HZ(5000) PWM_POLARITY_NORMAL>;
525531

526532
io-channels = <&adc1 4>,
527533
<&adc1 8>,

0 commit comments

Comments
 (0)