Unverified Commit 2b7fda34 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'at91-dt-6.13' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into soc/dt 

Microchip AT91 device tree updates for v6.13

It contains:
- device tree support for the Microchip SAM9X7 SoC and the Microchip
  SAM9X75 Curiosity board
- enable power monitor support for SAM9X60-EK, SAMA5D2-ICP,
  SAMA7G45 Curiosity, SAMA7G5-EK boards
- updates the uart nodes with missing properties
- device tree cleanups

* tag 'at91-dt-6.13' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: dts: microchip: sam9x75_curiosity: add sam9x75 curiosity board
  dt-bindings: arm: add sam9x75 curiosity board
  ARM: dts: at91: sam9x7: add device tree for SoC
  ARM: dts: microchip: Rename LED sub nodes name
  ARM: dts: microchip: Rename the pmic node
  ARM: dts: microchip: Rename the eeprom nodename
  ARM: dts: microchip: sama7g5ek: Add power monitor support
  ARM: dts: microchip: sama7g54_curiosity: Add power monitor support
  ARM: dts: microchip: sama5d2_icp: Add power monitor support
  ARM: dts: microchip: sam9x60ek: Add power monitor support
  ARM: dts: microchip: Unify rng node names
  ARM: dts: microchip: Add trng labels for all at91 SoCs
  ARM: dts: microchip: sam9x60: Add missing property atmel,usart-mode

Link: https://lore.kernel.org/r/20241113182050.2176500-2-claudiu.beznea@tuxon.dev


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents bc329f39 371a47c9

Documentation/devicetree/bindings/arm/atmel-at91.yaml

+6 −0
Original line number Diff line number Diff line
@@ -106,6 +106,12 @@ properties: 
          - const: microchip,sam9x60

          - const: atmel,at91sam9



      - description: Microchip SAM9X7 Evaluation Boards

        items:

          - const: microchip,sam9x75-curiosity

          - const: microchip,sam9x7

          - const: atmel,at91sam9



      - description: Nattis v2 board with Natte v2 power board

        items:

          - const: axentia,nattis-2

arch/arm/boot/dts/microchip/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
# Enables support for device-tree overlays

DTC_FLAGS_at91-sam9x60_curiosity := -@

DTC_FLAGS_at91-sam9x60ek := -@

DTC_FLAGS_at91-sam9x75_curiosity := -@

DTC_FLAGS_at91-sama5d27_som1_ek := -@

DTC_FLAGS_at91-sama5d27_wlsom1_ek := -@

DTC_FLAGS_at91-sama5d29_curiosity := -@
@@ -60,6 +61,8 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \ 
dtb-$(CONFIG_SOC_SAM9X60) += \

	at91-sam9x60_curiosity.dtb \

	at91-sam9x60ek.dtb

dtb-$(CONFIG_SOC_SAM9X7) += \

	at91-sam9x75_curiosity.dtb

dtb-$(CONFIG_SOC_SAM_V7) += \

	at91-kizbox2-2.dtb \

	at91-kizbox3-hs.dtb \

arch/arm/boot/dts/microchip/aks-cdu.dts

+8 −4
Original line number Diff line number Diff line
@@ -98,23 +98,27 @@ rootfs@500000 { 
	leds {

		compatible = "gpio-leds";



		red {

		led-red {

			label = "red";

			gpios = <&pioC 10 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "none";

		};



		green {

		led-green {

			label = "green";

			gpios = <&pioA 5 GPIO_ACTIVE_LOW>;

			linux,default-trigger = "none";

			default-state = "on";

		};



		yellow {

		led-yellow {

			label = "yellow";

			gpios = <&pioB 20 GPIO_ACTIVE_LOW>;

			linux,default-trigger = "none";

		};



		blue {

		led-blue {

			label = "blue";

			gpios = <&pioB 21 GPIO_ACTIVE_LOW>;

			linux,default-trigger = "none";

		};

arch/arm/boot/dts/microchip/animeo_ip.dts

+4 −4
Original line number Diff line number Diff line
@@ -146,23 +146,23 @@ usb0: ohci@500000 { 
	leds {

		compatible = "gpio-leds";



		power_green {

		led-power-green {

			label = "power_green";

			gpios = <&pioC 17 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "heartbeat";

		};



		power_red {

		led-power-red {

			label = "power_red";

			gpios = <&pioA 2 GPIO_ACTIVE_HIGH>;

		};



		tx_green {

		led-tx-green {

			label = "tx_green";

			gpios = <&pioC 19 GPIO_ACTIVE_HIGH>;

		};



		tx_red {

		led-tx-red {

			label = "tx_red";

			gpios = <&pioC 18 GPIO_ACTIVE_HIGH>;

		};

arch/arm/boot/dts/microchip/at91-kizbox2-common.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ led-3 { 
&i2c1 {

	status = "okay";



	pmic: act8865@5b {

	act8865: pmic@5b {

		compatible = "active-semi,act8865";

		reg = <0x5b>;

		status = "okay";