[PATCH 4/7] arch: arm: dts: ls1046a: sync serial nodes with Linux

[Peng Fan]

On 6/15/2023 8:37 PM, Camelia Groza wrote:
> Pick up the serial node descriptions from Linux for the ls1046ardb and
> ls1046afrwy boards and their dependencies. Including the
> fsl,qoriq-clockgen.h and arm-gic.h headers forces us to change the include
> directives to explicitly go through the C preprocessor for all boards in
> the ls1046a SoC family.

Add the tag or commit of linux kernel.

Regards,
Peng.

> 
> Signed-off-by: Camelia Groza <camelia.groza at nxp.com>
> ---
>   arch/arm/dts/fsl-ls1046a-frwy.dts | 22 +++++++++++++++++++++-
>   arch/arm/dts/fsl-ls1046a-qds.dtsi |  2 +-
>   arch/arm/dts/fsl-ls1046a-rdb.dts  | 14 +++++++++++++-
>   arch/arm/dts/fsl-ls1046a.dtsi     | 24 +++++++++++++++---------
>   4 files changed, 50 insertions(+), 12 deletions(-)
> 
> diff --git a/arch/arm/dts/fsl-ls1046a-frwy.dts b/arch/arm/dts/fsl-ls1046a-frwy.dts
> index cda05411d881..f3ba2acd6d51 100644
> --- a/arch/arm/dts/fsl-ls1046a-frwy.dts
> +++ b/arch/arm/dts/fsl-ls1046a-frwy.dts
> @@ -7,17 +7,37 @@
>    */
>   
>   /dts-v1/;
> -/include/ "fsl-ls1046a.dtsi"
> +#include "fsl-ls1046a.dtsi"
>   
>   / {
>   	model = "LS1046A FRWY Board";
>   
>   	aliases {
>   		spi0 = &qspi;
> +		serial0 = &duart0;
> +		serial1 = &duart1;
> +		serial2 = &duart2;
> +		serial3 = &duart3;
>   	};
>   
>   };
>   
> +&duart0 {
> +	status = "okay";
> +};
> +
> +&duart1 {
> +	status = "okay";
> +};
> +
> +&duart2 {
> +	status = "okay";
> +};
> +
> +&duart3 {
> +	status = "okay";
> +};
> +
>   &qspi {
>   	status = "okay";
>   
> diff --git a/arch/arm/dts/fsl-ls1046a-qds.dtsi b/arch/arm/dts/fsl-ls1046a-qds.dtsi
> index fec5c8ddb23a..d66824975c5e 100644
> --- a/arch/arm/dts/fsl-ls1046a-qds.dtsi
> +++ b/arch/arm/dts/fsl-ls1046a-qds.dtsi
> @@ -7,7 +7,7 @@
>    * Mingkai Hu <Mingkai.hu at nxp.com>
>    */
>   
> -/include/ "fsl-ls1046a.dtsi"
> +#include "fsl-ls1046a.dtsi"
>   
>   / {
>   	model = "LS1046A QDS Board";
> diff --git a/arch/arm/dts/fsl-ls1046a-rdb.dts b/arch/arm/dts/fsl-ls1046a-rdb.dts
> index 464129291c91..66d718905c7d 100644
> --- a/arch/arm/dts/fsl-ls1046a-rdb.dts
> +++ b/arch/arm/dts/fsl-ls1046a-rdb.dts
> @@ -9,17 +9,29 @@
>    */
>   
>   /dts-v1/;
> -/include/ "fsl-ls1046a.dtsi"
> +#include "fsl-ls1046a.dtsi"
>   
>   / {
>   	model = "LS1046A RDB Board";
>   
>   	aliases {
>   		spi0 = &qspi;
> +		serial0 = &duart0;
> +		serial1 = &duart1;
> +		serial2 = &duart2;
> +		serial3 = &duart3;
>   	};
>   
>   };
>   
> +&duart0 {
> +	status = "okay";
> +};
> +
> +&duart1 {
> +	status = "okay";
> +};
> +
>   &qspi {
>   	status = "okay";
>   
> diff --git a/arch/arm/dts/fsl-ls1046a.dtsi b/arch/arm/dts/fsl-ls1046a.dtsi
> index 060dc399c2f6..9fdd398e2c4c 100644
> --- a/arch/arm/dts/fsl-ls1046a.dtsi
> +++ b/arch/arm/dts/fsl-ls1046a.dtsi
> @@ -8,7 +8,9 @@
>    * Mingkai Hu <mingkai.hu at nxp.com>
>    */
>   
> -/include/ "skeleton64.dtsi"
> +#include "skeleton64.dtsi"
> +#include <dt-bindings/clock/fsl,qoriq-clockgen.h>
> +#include <dt-bindings/interrupt-controller/arm-gic.h>
>   
>   / {
>   	compatible = "fsl,ls1046a";
> @@ -222,29 +224,33 @@
>   		duart0: serial at 21c0500 {
>   			compatible = "fsl,ns16550", "ns16550a";
>   			reg = <0x00 0x21c0500 0x0 0x100>;
> -			interrupts = <0 54 0x4>;
> -			clocks = <&clockgen 4 0>;
> +			interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
> +			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
> +					    QORIQ_CLK_PLL_DIV(2)>;
>   		};
>   
>   		duart1: serial at 21c0600 {
>   			compatible = "fsl,ns16550", "ns16550a";
>   			reg = <0x00 0x21c0600 0x0 0x100>;
> -			interrupts = <0 54 0x4>;
> -			clocks = <&clockgen 4 0>;
> +			interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
> +			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
> +					    QORIQ_CLK_PLL_DIV(2)>;
>   		};
>   
>   		duart2: serial at 21d0500 {
>   			compatible = "fsl,ns16550", "ns16550a";
>   			reg = <0x0 0x21d0500 0x0 0x100>;
> -			interrupts = <0 55 0x4>;
> -			clocks = <&clockgen 4 0>;
> +			interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
> +			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
> +					    QORIQ_CLK_PLL_DIV(2)>;
>   		};
>   
>   		duart3: serial at 21d0600 {
>   			compatible = "fsl,ns16550", "ns16550a";
>   			reg = <0x0 0x21d0600 0x0 0x100>;
> -			interrupts = <0 55 0x4>;
> -			clocks = <&clockgen 4 0>;
> +			interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
> +			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
> +					    QORIQ_CLK_PLL_DIV(2)>;
>   		};
>   
>   		lpuart0: serial at 2950000 {