From 11ae60b6d30e7ebb023fdcf1ef9a27c6086ae146 Mon Sep 17 00:00:00 2001 From: Claudiu Beznea Date: Fri, 10 Jan 2020 18:17:53 +0200 Subject: dt-bindings: at_xdmac: remove wildcard Remove wildcard and use the available compatible. Signed-off-by: Claudiu Beznea Acked-by: Rob Herring Link: https://lore.kernel.org/r/1578673089-3484-2-git-send-email-claudiu.beznea@microchip.com Signed-off-by: Alexandre Belloni --- Documentation/devicetree/bindings/dma/atmel-xdma.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'Documentation') diff --git a/Documentation/devicetree/bindings/dma/atmel-xdma.txt b/Documentation/devicetree/bindings/dma/atmel-xdma.txt index 0eb2b3207e08..ad03920b7a28 100644 --- a/Documentation/devicetree/bindings/dma/atmel-xdma.txt +++ b/Documentation/devicetree/bindings/dma/atmel-xdma.txt @@ -2,9 +2,7 @@ * XDMA Controller Required properties: -- compatible: Should be "atmel,-dma". - compatible description: - - sama5d4: first SoC adding the XDMAC +- compatible: Should be "atmel,sama5d4-dma". - reg: Should contain DMA registers location and length. - interrupts: Should contain DMA interrupt. - #dma-cells: Must be <1>, used to represent the number of integer cells in -- cgit v1.2.3 From 97f807f36af0c6316a0f44e2558b083a7d1ae72d Mon Sep 17 00:00:00 2001 From: Claudiu Beznea Date: Fri, 10 Jan 2020 18:17:54 +0200 Subject: dt-bindings: at_xdmac: add microchip,sam9x60-dma Add microchip,sam9x60-dma to DT bindings documentation. Signed-off-by: Claudiu Beznea Acked-by: Rob Herring Link: https://lore.kernel.org/r/1578673089-3484-3-git-send-email-claudiu.beznea@microchip.com Signed-off-by: Alexandre Belloni --- Documentation/devicetree/bindings/dma/atmel-xdma.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation') diff --git a/Documentation/devicetree/bindings/dma/atmel-xdma.txt b/Documentation/devicetree/bindings/dma/atmel-xdma.txt index ad03920b7a28..4dc398e1a371 100644 --- a/Documentation/devicetree/bindings/dma/atmel-xdma.txt +++ b/Documentation/devicetree/bindings/dma/atmel-xdma.txt @@ -2,7 +2,7 @@ * XDMA Controller Required properties: -- compatible: Should be "atmel,sama5d4-dma". +- compatible: Should be "atmel,sama5d4-dma" or "microchip,sam9x60-dma". - reg: Should contain DMA registers location and length. - interrupts: Should contain DMA interrupt. - #dma-cells: Must be <1>, used to represent the number of integer cells in -- cgit v1.2.3 From 75f453f28ca8a3aa492b8f361ac498842a2f43ae Mon Sep 17 00:00:00 2001 From: Claudiu Beznea Date: Fri, 10 Jan 2020 18:17:55 +0200 Subject: dt-bindings: atmel-can: add microchip,sam9x60-can Add microchip,sam9x60-can to DT bindings documentation. Signed-off-by: Claudiu Beznea Acked-by: Rob Herring Link: https://lore.kernel.org/r/1578673089-3484-4-git-send-email-claudiu.beznea@microchip.com Signed-off-by: Alexandre Belloni --- Documentation/devicetree/bindings/net/can/atmel-can.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Documentation') diff --git a/Documentation/devicetree/bindings/net/can/atmel-can.txt b/Documentation/devicetree/bindings/net/can/atmel-can.txt index 14e52a0d86ec..218a3b3eb27e 100644 --- a/Documentation/devicetree/bindings/net/can/atmel-can.txt +++ b/Documentation/devicetree/bindings/net/can/atmel-can.txt @@ -1,7 +1,8 @@ * AT91 CAN * Required properties: - - compatible: Should be "atmel,at91sam9263-can" or "atmel,at91sam9x5-can" + - compatible: Should be "atmel,at91sam9263-can", "atmel,at91sam9x5-can" or + "microchip,sam9x60-can" - reg: Should contain CAN controller registers location and length - interrupts: Should contain IRQ line for the CAN controller -- cgit v1.2.3 From 08c2da3da2b01b35438994310371dbfff6a4d008 Mon Sep 17 00:00:00 2001 From: Claudiu Beznea Date: Fri, 10 Jan 2020 18:17:57 +0200 Subject: dt-bindings: atmel-isi: add microchip,sam9x60-isi Add microchip,sam9x60-isi to DT bindings documentation. Signed-off-by: Claudiu Beznea Acked-by: Rob Herring Acked-by: Hans Verkuil Link: https://lore.kernel.org/r/1578673089-3484-6-git-send-email-claudiu.beznea@microchip.com Signed-off-by: Alexandre Belloni --- Documentation/devicetree/bindings/media/atmel-isi.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation') diff --git a/Documentation/devicetree/bindings/media/atmel-isi.txt b/Documentation/devicetree/bindings/media/atmel-isi.txt index 332513a151cc..8924c7545b63 100644 --- a/Documentation/devicetree/bindings/media/atmel-isi.txt +++ b/Documentation/devicetree/bindings/media/atmel-isi.txt @@ -2,7 +2,7 @@ Atmel Image Sensor Interface (ISI) ---------------------------------- Required properties for ISI: -- compatible: must be "atmel,at91sam9g45-isi". +- compatible: must be "atmel,at91sam9g45-isi" or "microchip,sam9x60-isi". - reg: physical base address and length of the registers set for the device. - interrupts: should contain IRQ line for the ISI. - clocks: list of clock specifiers, corresponding to entries in the clock-names -- cgit v1.2.3 From 7c7acbc34d64969b950fb721edc792913ed556bc Mon Sep 17 00:00:00 2001 From: Claudiu Beznea Date: Fri, 10 Jan 2020 18:17:58 +0200 Subject: dt-bindings: at91-sama5d2_adc: add microchip,sam9x60-adc Add microchip,sam9x60-adc to DT bindings documentation. Signed-off-by: Claudiu Beznea Acked-by: Jonathan Cameron Acked-by: Rob Herring Link: https://lore.kernel.org/r/1578673089-3484-7-git-send-email-claudiu.beznea@microchip.com Signed-off-by: Alexandre Belloni --- Documentation/devicetree/bindings/iio/adc/at91-sama5d2_adc.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation') diff --git a/Documentation/devicetree/bindings/iio/adc/at91-sama5d2_adc.txt b/Documentation/devicetree/bindings/iio/adc/at91-sama5d2_adc.txt index 4a3c1d496e1a..07c59f301b31 100644 --- a/Documentation/devicetree/bindings/iio/adc/at91-sama5d2_adc.txt +++ b/Documentation/devicetree/bindings/iio/adc/at91-sama5d2_adc.txt @@ -1,7 +1,7 @@ * AT91 SAMA5D2 Analog to Digital Converter (ADC) Required properties: - - compatible: Should be "atmel,sama5d2-adc". + - compatible: Should be "atmel,sama5d2-adc" or "microchip,sam9x60-adc". - reg: Should contain ADC registers location and length. - interrupts: Should contain the IRQ line for the ADC. - clocks: phandle to device clock. -- cgit v1.2.3 From 00b9a43be06696292bc3806445ef693e0ce8dad7 Mon Sep 17 00:00:00 2001 From: Claudiu Beznea Date: Fri, 10 Jan 2020 18:17:59 +0200 Subject: dt-bindings: atmel-matrix: add microchip,sam9x60-matrix Add microchip,sam9x60-matrix to DT bindings documentation. Signed-off-by: Claudiu Beznea Acked-by: Rob Herring Link: https://lore.kernel.org/r/1578673089-3484-8-git-send-email-claudiu.beznea@microchip.com Signed-off-by: Alexandre Belloni --- Documentation/devicetree/bindings/mfd/atmel-matrix.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'Documentation') diff --git a/Documentation/devicetree/bindings/mfd/atmel-matrix.txt b/Documentation/devicetree/bindings/mfd/atmel-matrix.txt index e3ef50ca02a5..89d05c64fb01 100644 --- a/Documentation/devicetree/bindings/mfd/atmel-matrix.txt +++ b/Documentation/devicetree/bindings/mfd/atmel-matrix.txt @@ -13,6 +13,7 @@ Required properties: "atmel,at91sam9n12-matrix", "syscon" "atmel,at91sam9x5-matrix", "syscon" "atmel,sama5d3-matrix", "syscon" + "microchip,sam9x60-matrix", "syscon" - reg: Contains offset/length value of the Bus Matrix memory region. -- cgit v1.2.3 From 7402b7fa4860b1a65394be4c9c5d119884215484 Mon Sep 17 00:00:00 2001 From: Claudiu Beznea Date: Fri, 10 Jan 2020 18:18:00 +0200 Subject: dt-bindings: atmel-nand: add microchip,sam9x60-pmecc Add microchip,sam9x60-pmecc to DT bindings documentation. Signed-off-by: Claudiu Beznea Reviewed-by: Miquel Raynal Acked-by: Rob Herring Link: https://lore.kernel.org/r/1578673089-3484-9-git-send-email-claudiu.beznea@microchip.com Signed-off-by: Alexandre Belloni --- Documentation/devicetree/bindings/mtd/atmel-nand.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'Documentation') diff --git a/Documentation/devicetree/bindings/mtd/atmel-nand.txt b/Documentation/devicetree/bindings/mtd/atmel-nand.txt index 68b51dc58816..3aa297c97ab6 100644 --- a/Documentation/devicetree/bindings/mtd/atmel-nand.txt +++ b/Documentation/devicetree/bindings/mtd/atmel-nand.txt @@ -57,6 +57,7 @@ Required properties: "atmel,at91sam9g45-pmecc" "atmel,sama5d4-pmecc" "atmel,sama5d2-pmecc" + "microchip,sam9x60-pmecc" - reg: should contain 2 register ranges. The first one is pointing to the PMECC block, and the second one to the PMECC_ERRLOC block. -- cgit v1.2.3 From ac9168dfbafd930cdc1a3496b2808843a3f5fcd7 Mon Sep 17 00:00:00 2001 From: Claudiu Beznea Date: Fri, 10 Jan 2020 18:18:01 +0200 Subject: dt-bindings: atmel-sysreg: add microchip,sam9x60-ddramc Add microchip,sam9x60-ddramc to DT bindings documentation. Signed-off-by: Claudiu Beznea Acked-by: Rob Herring Link: https://lore.kernel.org/r/1578673089-3484-10-git-send-email-claudiu.beznea@microchip.com Signed-off-by: Alexandre Belloni --- Documentation/devicetree/bindings/arm/atmel-sysregs.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'Documentation') diff --git a/Documentation/devicetree/bindings/arm/atmel-sysregs.txt b/Documentation/devicetree/bindings/arm/atmel-sysregs.txt index 9fbde401a090..b4900d3b4a7c 100644 --- a/Documentation/devicetree/bindings/arm/atmel-sysregs.txt +++ b/Documentation/devicetree/bindings/arm/atmel-sysregs.txt @@ -39,6 +39,7 @@ RAMC SDRAM/DDR Controller required properties: "atmel,at91sam9260-sdramc", "atmel,at91sam9g45-ddramc", "atmel,sama5d3-ddramc", + "microchip,sam9x60-ddramc" - reg: Should contain registers location and length Examples: -- cgit v1.2.3 From e517d6d949a23a8738bcf4a62c81d7c0b44c5a4a Mon Sep 17 00:00:00 2001 From: Claudiu Beznea Date: Fri, 10 Jan 2020 18:18:02 +0200 Subject: dt-bindings: atmel-smc: add microchip,sam9x60-smc Add microchip,sam9x60-smc to DT bindings documentation. Signed-off-by: Claudiu Beznea Acked-by: Rob Herring Link: https://lore.kernel.org/r/1578673089-3484-11-git-send-email-claudiu.beznea@microchip.com Signed-off-by: Alexandre Belloni --- Documentation/devicetree/bindings/mfd/atmel-smc.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'Documentation') diff --git a/Documentation/devicetree/bindings/mfd/atmel-smc.txt b/Documentation/devicetree/bindings/mfd/atmel-smc.txt index 1103ce2030fb..5696d9fcb5dc 100644 --- a/Documentation/devicetree/bindings/mfd/atmel-smc.txt +++ b/Documentation/devicetree/bindings/mfd/atmel-smc.txt @@ -9,6 +9,7 @@ Required properties: "atmel,at91sam9260-smc", "syscon" "atmel,sama5d3-smc", "syscon" "atmel,sama5d2-smc", "syscon" + "microchip,sam9x60-smc", "syscon" - reg: Contains offset/length value of the SMC memory region. -- cgit v1.2.3 From 523752d8da38bed6ac8ecf674c96ebcbe7536122 Mon Sep 17 00:00:00 2001 From: Claudiu Beznea Date: Fri, 10 Jan 2020 18:18:03 +0200 Subject: dt-bindings: atmel-gpbr: add microchip,sam9x60-gpbr Add microchip,sam9x60-gpbr to DT bindings documentation. Signed-off-by: Claudiu Beznea Acked-by: Rob Herring Link: https://lore.kernel.org/r/1578673089-3484-12-git-send-email-claudiu.beznea@microchip.com Signed-off-by: Alexandre Belloni --- Documentation/devicetree/bindings/mfd/atmel-gpbr.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Documentation') diff --git a/Documentation/devicetree/bindings/mfd/atmel-gpbr.txt b/Documentation/devicetree/bindings/mfd/atmel-gpbr.txt index a28569540683..e8c525569f10 100644 --- a/Documentation/devicetree/bindings/mfd/atmel-gpbr.txt +++ b/Documentation/devicetree/bindings/mfd/atmel-gpbr.txt @@ -3,7 +3,9 @@ The GPBR are a set of battery-backed registers. Required properties: -- compatible: "atmel,at91sam9260-gpbr", "syscon" +- compatible: Should be one of the following: + "atmel,at91sam9260-gpbr", "syscon" + "microchip,sam9x60-gpbr", "syscon" - reg: contains offset/length value of the GPBR memory region. -- cgit v1.2.3 From be0b9aa757c74a2b10c555bd02ace71f929ab741 Mon Sep 17 00:00:00 2001 From: Claudiu Beznea Date: Fri, 10 Jan 2020 18:18:07 +0200 Subject: dt-bindings: arm: add sam9x60-ek board Add documentation for SAM9X60-EK board. Signed-off-by: Claudiu Beznea Acked-by: Rob Herring Link: https://lore.kernel.org/r/1578673089-3484-16-git-send-email-claudiu.beznea@microchip.com Signed-off-by: Alexandre Belloni --- Documentation/devicetree/bindings/arm/atmel-at91.yaml | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Documentation') diff --git a/Documentation/devicetree/bindings/arm/atmel-at91.yaml b/Documentation/devicetree/bindings/arm/atmel-at91.yaml index 3584f0ec263f..0357314076bc 100644 --- a/Documentation/devicetree/bindings/arm/atmel-at91.yaml +++ b/Documentation/devicetree/bindings/arm/atmel-at91.yaml @@ -82,6 +82,12 @@ properties: - const: atmel,sama5d2 - const: atmel,sama5 + - description: SAM9X60-EK board + items: + - const: microchip,sam9x60ek + - const: microchip,sam9x60 + - const: atmel,at91sam9 + - description: Nattis v2 board with Natte v2 power board items: - const: axentia,nattis-2 -- cgit v1.2.3