mbox series

[v2,00/11] Add support for more Kontron i.MX6UL/ULL SoMs and boards

Message ID 20191029112655.15058-1-frieder.schrempf@kontron.de
Headers show
Series Add support for more Kontron i.MX6UL/ULL SoMs and boards | expand

Message

Frieder Schrempf Oct. 29, 2019, 11:27 a.m. UTC 
From: Frieder Schrempf <frieder.schrempf@kontron.de>

In order to support more of the i.MX6UL/ULL-based SoMs and boards by
Kontron Electronics GmbH, we restructure the devicetrees to share common
parts and add new devicetrees for the missing boards.

Currently there are the following SoM flavors:
  * N6310: SoM with i.MX6UL-2, 256MB RAM, 256MB SPI NAND
  * N6311: SoM with i.MX6UL-2, 512MB RAM, 512MB SPI NAND (new)
  * N6411: SoM with i.MX6ULL, 512MB RAM, 512MB SPI NAND (new)

Each of the SoMs also features 1MB SPI NOR and an Ethernet PHY. The carrier
board for the evalkit is the same for all SoMs.
---
Changes for v2:
===============
* Patch 1: Move the spi-flash node instead of duplicating it
* Patch 3: Add a missing include for dt-bindings/gpio/gpio.h
* Patch 11: Add patch to add missing includes for gpio.h and irq.h
* Add Reviewed-by tags from Krzysztof and Rob

Frieder Schrempf (11):
  ARM: dts: imx6ul-kontron-n6310: Move common SoM nodes to a separate
    file
  ARM: dts: Add support for two more Kontron SoMs N6311 and N6411
  ARM: dts: imx6ul-kontron-n6310-s: Move common nodes to a separate file
  ARM: dts: Add support for two more Kontron evalkit boards 'N6311 S'
    and 'N6411 S'
  ARM: dts: imx6ul-kontron-n6x1x: Add 'chosen' node with 'stdout-path'
  ARM: dts: imx6ul-kontron-n6x1x-s: Specify bus-width for SD card and
    eMMC
  ARM: dts: imx6ul-kontron-n6x1x-s: Add vbus-supply and overcurrent
    polarity to usb nodes
  ARM: dts: imx6ul-kontron-n6x1x-s: Remove an obsolete comment and fix
    indentation
  dt-bindings: arm: fsl: Add more Kontron i.MX6UL/ULL compatibles
  MAINTAINERS: Add an entry for Kontron Electronics ARM board support
  ARM: dts: imx6ul-kontron-n6310-s-43: Add missing includes for GPIOs
    and IRQs

 .../devicetree/bindings/arm/fsl.yaml          |  14 +
 MAINTAINERS                                   |   6 +
 .../boot/dts/imx6ul-kontron-n6310-s-43.dts    |   3 +
 arch/arm/boot/dts/imx6ul-kontron-n6310-s.dts  | 405 +----------------
 .../boot/dts/imx6ul-kontron-n6310-som.dtsi    |  95 +---
 arch/arm/boot/dts/imx6ul-kontron-n6311-s.dts  |  16 +
 .../boot/dts/imx6ul-kontron-n6311-som.dtsi    |  40 ++
 arch/arm/boot/dts/imx6ul-kontron-n6x1x-s.dtsi | 424 ++++++++++++++++++
 .../dts/imx6ul-kontron-n6x1x-som-common.dtsi  | 109 +++++
 arch/arm/boot/dts/imx6ull-kontron-n6411-s.dts |  16 +
 .../boot/dts/imx6ull-kontron-n6411-som.dtsi   |  40 ++
 11 files changed, 670 insertions(+), 498 deletions(-)
 create mode 100644 arch/arm/boot/dts/imx6ul-kontron-n6311-s.dts
 create mode 100644 arch/arm/boot/dts/imx6ul-kontron-n6311-som.dtsi
 create mode 100644 arch/arm/boot/dts/imx6ul-kontron-n6x1x-s.dtsi
 create mode 100644 arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi
 create mode 100644 arch/arm/boot/dts/imx6ull-kontron-n6411-s.dts
 create mode 100644 arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi

Comments

Frieder Schrempf Oct. 29, 2019, 11:32 a.m. UTC | #1 
On 29.10.19 12:28, Schrempf Frieder wrote:
> From: Frieder Schrempf <frieder.schrempf@kontron.de>

Sorry, the commit message here got lost:

The IRQ and GPIO macros are used in this file. Therefore we add the 
missing header includes.

> 
> Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de>
> Fixes: 1ea4b76cdfde ("ARM: dts: imx6ul-kontron-n6310: Add Kontron i.MX6UL N6310 SoM and boards")
> ---
>   arch/arm/boot/dts/imx6ul-kontron-n6310-s-43.dts | 3 +++
>   1 file changed, 3 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/imx6ul-kontron-n6310-s-43.dts b/arch/arm/boot/dts/imx6ul-kontron-n6310-s-43.dts
> index 5bad29683cc3..295bc3138fea 100644
> --- a/arch/arm/boot/dts/imx6ul-kontron-n6310-s-43.dts
> +++ b/arch/arm/boot/dts/imx6ul-kontron-n6310-s-43.dts
> @@ -7,6 +7,9 @@
>   
>   #include "imx6ul-kontron-n6310-s.dts"
>   
> +#include <dt-bindings/interrupt-controller/irq.h>
> +#include <dt-bindings/gpio/gpio.h>
> +
>   / {
>   	model = "Kontron N6310 S 43";
>   	compatible = "kontron,imx6ul-n6310-s-43", "kontron,imx6ul-n6310-s",
>
Krzysztof Kozlowski Oct. 31, 2019, 12:31 p.m. UTC | #2 
On Tue, Oct 29, 2019 at 11:27:44AM +0000, Schrempf Frieder wrote:
> From: Frieder Schrempf <frieder.schrempf@kontron.de>
> 
> The Kontron N6311 and N6411 SoMs are very similar to N6310. In
> preparation to add support for them, we move the common nodes to a
> separate file imx6ul-kontron-n6x1x-som-common.dtsi.
> 
> Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de>
> ---
>  .../boot/dts/imx6ul-kontron-n6310-som.dtsi    |  95 +---------------
>  .../dts/imx6ul-kontron-n6x1x-som-common.dtsi  | 103 ++++++++++++++++++
>  2 files changed, 104 insertions(+), 94 deletions(-)
>  create mode 100644 arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi

Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>

Best regards,
Krzysztof
Krzysztof Kozlowski Oct. 31, 2019, 1:03 p.m. UTC | #3 
On Tue, Oct 29, 2019 at 11:27:51AM +0000, Schrempf Frieder wrote:
> From: Frieder Schrempf <frieder.schrempf@kontron.de>
> 
> The baseboard for the Kontron N6310 SoM is also used for other SoMs
> such as N6311 and N6411. In order to share the code, we move the
> definitions of the baseboard to a separate dtsi file.
> 
> Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de>
> ---
>  arch/arm/boot/dts/imx6ul-kontron-n6310-s.dts  | 405 +----------------
>  arch/arm/boot/dts/imx6ul-kontron-n6x1x-s.dtsi | 414 ++++++++++++++++++
>  2 files changed, 415 insertions(+), 404 deletions(-)
>  create mode 100644 arch/arm/boot/dts/imx6ul-kontron-n6x1x-s.dtsi
> 

Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>

Best regards,
Krzysztof
Krzysztof Kozlowski Oct. 31, 2019, 1:07 p.m. UTC | #4 
On Tue, Oct 29, 2019 at 11:28:16AM +0000, Schrempf Frieder wrote:
> From: Frieder Schrempf <frieder.schrempf@kontron.de>
> 
> Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de>
> Fixes: 1ea4b76cdfde ("ARM: dts: imx6ul-kontron-n6310: Add Kontron i.MX6UL N6310 SoM and boards")
> ---
>  arch/arm/boot/dts/imx6ul-kontron-n6310-s-43.dts | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/imx6ul-kontron-n6310-s-43.dts b/arch/arm/boot/dts/imx6ul-kontron-n6310-s-43.dts
> index 5bad29683cc3..295bc3138fea 100644
> --- a/arch/arm/boot/dts/imx6ul-kontron-n6310-s-43.dts
> +++ b/arch/arm/boot/dts/imx6ul-kontron-n6310-s-43.dts
> @@ -7,6 +7,9 @@
>  
>  #include "imx6ul-kontron-n6310-s.dts"
>  
> +#include <dt-bindings/interrupt-controller/irq.h>
> +#include <dt-bindings/gpio/gpio.h>

This is not needed. This includes imx6ul-kontron-n6310-s.dts, which
includes imx6ul-kontron-n6310-som.dtsi which has proper GPIO include. It
also polls imx6ul.dtsi which has the IRQ defines.

My comment from v1 was for a case where you have a DTSI standing on its
own. If it does not include anything else, then it should have all
necessary inclusions (not only GPIO but also iMX-specific pinctrl and clock).

Best regards,
Krzysztof


> +
>  / {
>  	model = "Kontron N6310 S 43";
>  	compatible = "kontron,imx6ul-n6310-s-43", "kontron,imx6ul-n6310-s",
> -- 
> 2.17.1
Frieder Schrempf Oct. 31, 2019, 1:11 p.m. UTC | #5 
On 31.10.19 14:07, Krzysztof Kozlowski wrote:
> On Tue, Oct 29, 2019 at 11:28:16AM +0000, Schrempf Frieder wrote:
>> From: Frieder Schrempf <frieder.schrempf@kontron.de>
>>
>> Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de>
>> Fixes: 1ea4b76cdfde ("ARM: dts: imx6ul-kontron-n6310: Add Kontron i.MX6UL N6310 SoM and boards")
>> ---
>>   arch/arm/boot/dts/imx6ul-kontron-n6310-s-43.dts | 3 +++
>>   1 file changed, 3 insertions(+)
>>
>> diff --git a/arch/arm/boot/dts/imx6ul-kontron-n6310-s-43.dts b/arch/arm/boot/dts/imx6ul-kontron-n6310-s-43.dts
>> index 5bad29683cc3..295bc3138fea 100644
>> --- a/arch/arm/boot/dts/imx6ul-kontron-n6310-s-43.dts
>> +++ b/arch/arm/boot/dts/imx6ul-kontron-n6310-s-43.dts
>> @@ -7,6 +7,9 @@
>>   
>>   #include "imx6ul-kontron-n6310-s.dts"
>>   
>> +#include <dt-bindings/interrupt-controller/irq.h>
>> +#include <dt-bindings/gpio/gpio.h>
> 
> This is not needed. This includes imx6ul-kontron-n6310-s.dts, which
> includes imx6ul-kontron-n6310-som.dtsi which has proper GPIO include. It
> also polls imx6ul.dtsi which has the IRQ defines.
> 
> My comment from v1 was for a case where you have a DTSI standing on its
> own. If it does not include anything else, then it should have all
> necessary inclusions (not only GPIO but also iMX-specific pinctrl and clock).

Ok, got it. Thanks for clarifying.
This patch can be dropped then.

> 
> Best regards,
> Krzysztof
> 
> 
>> +
>>   / {
>>   	model = "Kontron N6310 S 43";
>>   	compatible = "kontron,imx6ul-n6310-s-43", "kontron,imx6ul-n6310-s",
>> -- 
>> 2.17.1