Commit 3e0111ec authored by Olof Johansson's avatar Olof Johansson
Browse files

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

AT91 DT for 5.10

 - New board: GARDENA smart Gateway (Art. 19000)
 - dtbs_check warnings fixes

* tag 'at91-dt-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: dts: at91: sama5d2: add missing flexcom spi node properties
  ARM: dts: at91: add unit-address to memory node
  ARM: dts: at91: move mmc pinctrl-names property to board dts
  ARM: dts: at91: fix sram nodes
  ARM: dts: at91: fix cpu node
  ARM: at91: Add GARDENA smart Gateway (Art. 19000) support
  dt-bindings: arm: at91: Add GARDENA smart Gateway (Art. 19000) board

Link: https://lore.kernel.org/r/20200916211348.GA275895@piout.net


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents b042dc74 860b6d80
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ properties:
              - overkiz,kizboxmini-mb   # Overkiz kizbox Mini Mother Board
              - overkiz,kizboxmini-rd   # Overkiz kizbox Mini RailDIN
              - overkiz,smartkiz        # Overkiz SmartKiz Board
              - gardena,smart-gateway-at91sam # GARDENA smart Gateway (Article No. 19000)
          - const: atmel,at91sam9g25
          - const: atmel,at91sam9x5
          - const: atmel,at91sam9
+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \
	at91-smartkiz.dtb \
	at91-wb45n.dtb \
	at91sam9g15ek.dtb \
	at91sam9g25-gardena-smart-gateway.dtb \
	at91sam9g25ek.dtb \
	at91sam9g35ek.dtb \
	at91sam9x25ek.dtb \
+2 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ chosen {
		stdout-path = &usart2;
	};

	memory {
	memory@20000000 {
		reg = <0x20000000 0x4000000>;
	};

@@ -81,6 +81,7 @@ mmc0: mmc@fffa8000 {
				pinctrl-0 = <&pinctrl_mmc0_clk
					     &pinctrl_mmc0_slot1_cmd_dat0
					     &pinctrl_mmc0_slot1_dat1_3>;
				pinctrl-names = "default";
				status = "okay";

				slot@1 {
+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ chosen {
		bootargs = "console=ttyS0,115200 root=/dev/mmcblk0p2 rw rootwait";
	};

	memory {
	memory@20000000 {
		/* 128 MB, change this for 256 MB revision */
		reg = <0x20000000 0x8000000>;
	};
@@ -93,6 +93,7 @@ &mmc0 {
	pinctrl-0 = <
		&pinctrl_mmc0_slot0_clk_cmd_dat0
		&pinctrl_mmc0_slot0_dat1_3>;
	pinctrl-names = "default";
	status = "okay";

	slot@0 {
+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ chosen {
		stdout-path = "serial0:115200n8";
	};

	memory {
	memory@20000000 {
		reg = <0x20000000 0x8000000>;
	};

@@ -48,6 +48,7 @@ &mmc0 {
	pinctrl-0 = <
		&pinctrl_mmc0_slot0_clk_cmd_dat0
		&pinctrl_mmc0_slot0_dat1_3>;
	pinctrl-names = "default";
	status = "okay";

	slot@0 {
Loading