Commit 3848421f authored Mar 18, 2021 by Arnd Bergmann

Merge tag 'at91-fixes-5.12' of...

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>

parents ebccfa8a 2c69c8a1

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

+0 −8

Original line number	Diff line number	Diff line
		@@ -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>;

arch/arm/boot/dts/at91-sama5d27_som1.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -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";

arch/arm/boot/dts/sam9x60.dtsi

+9 −0

Original line number	Diff line number	Diff line
		@@ -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>;