Skip to content

Commit a8450b7

Browse files
committed
ARM: dts: at91: sam9x60: fix mux-mask to match product's datasheet
Fix the whole mux-mask table according to datasheet for the sam9x60 product. Too much functions for pins were disabled leading to misunderstandings when enabling more peripherals or taking this table as an example for another board. Take advantage of this fix to move the mux-mask in the SoC file where it belongs and use lower case letters for hex numbers like everywhere in the file. Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com> Fixes: 1e5f532 ("ARM: dts: at91: sam9x60: add device tree for soc and board") Cc: <stable@vger.kernel.org> # 5.6+ Cc: Sandeep Sheriker Mallikarjun <sandeepsheriker.mallikarjun@microchip.com> Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com> Link: https://lore.kernel.org/r/20210310152006.15018-1-nicolas.ferre@microchip.com
1 parent 06bbfee commit a8450b7

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

arch/arm/boot/dts/at91-sam9x60ek.dts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -335,14 +335,6 @@
335335
};
336336

337337
&pinctrl {
338-
atmel,mux-mask = <
339-
/* A B C */
340-
0xFFFFFEFF 0xC0E039FF 0xEF00019D /* pioA */
341-
0x03FFFFFF 0x02FC7E68 0x00780000 /* pioB */
342-
0xffffffff 0xF83FFFFF 0xB800F3FC /* pioC */
343-
0x003FFFFF 0x003F8000 0x00000000 /* pioD */
344-
>;
345-
346338
adc {
347339
pinctrl_adc_default: adc_default {
348340
atmel,pins = <AT91_PIOB 15 AT91_PERIPH_A AT91_PINCTRL_NONE>;

arch/arm/boot/dts/sam9x60.dtsi

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -673,6 +673,15 @@
673673
compatible = "microchip,sam9x60-pinctrl", "atmel,at91sam9x5-pinctrl", "atmel,at91rm9200-pinctrl", "simple-bus";
674674
ranges = <0xfffff400 0xfffff400 0x800>;
675675

676+
/* mux-mask corresponding to sam9x60 SoC in TFBGA228L package */
677+
atmel,mux-mask = <
678+
/* A B C */
679+
0xffffffff 0xffe03fff 0xef00019d /* pioA */
680+
0x03ffffff 0x02fc7e7f 0x00780000 /* pioB */
681+
0xffffffff 0xffffffff 0xf83fffff /* pioC */
682+
0x003fffff 0x003f8000 0x00000000 /* pioD */
683+
>;
684+
676685
pioA: gpio@fffff400 {
677686
compatible = "microchip,sam9x60-gpio", "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
678687
reg = <0xfffff400 0x200>;

0 commit comments

Comments
 (0)