redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

AT91 fixes for 5.12: 

- only DT changes
 -- wrong phy address that blocks Ethernet use on boards with sama5d27 SoM1
 -- restrictive PIN possibilities for sam9x60
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEEAbEK3+sX+gUxe5RcpMrf1MU8doFAmBI6vYACgkQcpMrf1MU
 8drqxhAAwLln7DDVQaV358gRvG002lUd+REQSqJbApurXrNGrhskCtW5tzBq6tBb
 HRfLJP+ejq8vS8NZt/izwxFZgze9xJomv92a8saMQmeNtjWwzexY2EHXb7D0dwsE
 UnTl0TzLQu+fNdnj4uryUNDPUXKry7CK5/U9sUm/uYYsoX/qECzEFwgXZkRCtCFM
 cN0vgK0IFKHhg5v8ypCTUqViq9GeAoC/yQ9HqAV3N5I6+1uvgxQL8JUoWSQT0Ety
 WcguDVcEPETRpUMNLAGgQq/6MLNJxLOL42F5c5gzJEK3QMn1UiIO4lRbBAA8aRZ1
 UXkbhQz8SzAMl5N+nqEWMoeYplrjEuvTQUYu+SKZKTA9uTklzr3BYsxFTUusEIby
 6lHFHW8xigP0RpGY50CxeJdlwJ52R+ba2BpZRSb3l7HIxWrA2ebCn8e3YzChBehg
 0Xqio+bt111zIQgdttdTo7LSHFYag1s8zVKaKXH3SSUIQmMUnUkdXc0/qvUI7DbA
 oJYFeF09v4ThVDxcpNIx+N+xt6C/eQAUuoC7pHLVDYwo++szqsBX8tCSdXSH/tJt
 StSdSvrlxhueIA6xFtjt+6DuKutwaGBWdg+rRoTLYSifmTpXx9KPfN/nzjh5jq6K
 BmBV8jvpWRzEJHfnjenrGrAxwCUlJz/hrryvn2GY1bnLyPxOzXU=
 =NBzg
 -----END PGP SIGNATURE-----

Merge tag 'at91-fixes-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/fixes

AT91 fixes for 5.12:

- only DT changes
-- wrong phy address that blocks Ethernet use on boards with sama5d27 SoM1
-- restrictive PIN possibilities for sam9x60

* tag 'at91-fixes-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: dts: at91: sam9x60: fix mux-mask to match product's datasheet
  ARM: dts: at91: sam9x60: fix mux-mask for PA7 so it can be set to A, B and C
  ARM: dts: at91-sama5d27_som1: fix phy address to 7

Link: https://lore.kernel.org/r/20210310160547.55382-1-nicolas.ferre@microchip.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
rM2-mainline
Arnd Bergmann 2021-03-18 23:53:25 +01:00
parent ebccfa8a74 2c69c8a173
commit 3848421f9d
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/boot/dts/at91-sam9x60ek.dts
View File

@ -334,14 +334,6 @@
};
&pinctrl {
atmel,mux-mask = <
/* A B C */
0xFFFFFE7F 0xC0E0397F 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>;

4
arch/arm/boot/dts/at91-sama5d27_som1.dtsi
View File

@ -84,8 +84,8 @@
pinctrl-0 = <&pinctrl_macb0_default>;
phy-mode = "rmii";
ethernet-phy@0 {
reg = <0x0>;
ethernet-phy@7 {
reg = <0x7>;
interrupt-parent = <&pioA>;
interrupts = <PIN_PD31 IRQ_TYPE_LEVEL_LOW>;
pinctrl-names = "default";

9
arch/arm/boot/dts/sam9x60.dtsi
View File

@ -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>;