Skip to content

Commit

Permalink
ARM: dts: at91: sam9x60: fix mux-mask to match product's datasheet
Browse files Browse the repository at this point in the history
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 <[email protected]>
Fixes: 1e5f532 ("ARM: dts: at91: sam9x60: add device tree for soc and board")
Cc: <[email protected]> # 5.6+
Cc: Sandeep Sheriker Mallikarjun <[email protected]>
Reviewed-by: Tudor Ambarus <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
  • Loading branch information
noglitch committed Mar 10, 2021
1 parent 664979b commit 2c69c8a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
8 changes: 0 additions & 8 deletions arch/arm/boot/dts/at91-sam9x60ek.dts
Original file line number Diff line number Diff line change
Expand Up @@ -334,14 +334,6 @@
};

&pinctrl {
atmel,mux-mask = <
/* A B C */
0xFFFFFEFF 0xC0E039FF 0xEF00019D /* pioA */
0x03FFFFFF 0x02FC7E68 0x00780000 /* pioB */
0xffffffff 0xF83FFFFF 0xB800F3FC /* pioC */
0x003FFFFF 0x003F8000 0x00000000 /* pioD */
>;

adc {
pinctrl_adc_default: adc_default {
atmel,pins = <AT91_PIOB 15 AT91_PERIPH_A AT91_PINCTRL_NONE>;
Expand Down
9 changes: 9 additions & 0 deletions arch/arm/boot/dts/sam9x60.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -606,6 +606,15 @@
compatible = "microchip,sam9x60-pinctrl", "atmel,at91sam9x5-pinctrl", "atmel,at91rm9200-pinctrl", "simple-bus";
ranges = <0xfffff400 0xfffff400 0x800>;

/* mux-mask corresponding to sam9x60 SoC in TFBGA228L package */
atmel,mux-mask = <
/* A B C */
0xffffffff 0xffe03fff 0xef00019d /* pioA */
0x03ffffff 0x02fc7e7f 0x00780000 /* pioB */
0xffffffff 0xffffffff 0xf83fffff /* pioC */
0x003fffff 0x003f8000 0x00000000 /* pioD */
>;

pioA: gpio@fffff400 {
compatible = "microchip,sam9x60-gpio", "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
reg = <0xfffff400 0x200>;
Expand Down

0 comments on commit 2c69c8a

Please sign in to comment.