mbox series

[0/3] ARM: dts: imx6ull: fix some incompatibilities between i.MX6UL and i.MX6ULL

Message ID 1516955032-21167-1-git-send-email-LW@KARO-electronics.de
Headers show
Series ARM: dts: imx6ull: fix some incompatibilities between i.MX6UL and i.MX6ULL | expand

Message

Lothar Waßmann Jan. 26, 2018, 8:23 a.m. UTC 
This patchset addresses some differences between i.MX6UL and i.MX6ULL
which have slipped through the cracks so far.

- UART8 is not on SPBA but on AIPS-3
- i.MX6ULL has an ESAI interface in the address range of the UART8 on i.MX6UL
- i.MX6ULL does not have a CAAM unit nor SIM interfaces

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Dong Aisheng Jan. 26, 2018, 8:57 a.m. UTC | #1 
On Fri, Jan 26, 2018 at 09:23:50AM +0100, Lothar Waßmann wrote:
> UART8 on i.MX6ULL is not located on the SPBA bus like on i.MX6UL but
> on the (otherwise unused) AIPS-3 bus.
> Create the appropriate AIPS-3 bus configuration and move the uart8
> definition where it belongs.
> 
> Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>

Stefan seemed already fixed this.

See:
https://patchwork.kernel.org/patch/10156125/

Regards
Dong Aisheng

> ---
>  arch/arm/boot/dts/imx6ull.dtsi | 29 +++++++++++++++++++++++++++++
>  1 file changed, 29 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/imx6ull.dtsi b/arch/arm/boot/dts/imx6ull.dtsi
> index 0c18291..abc815f 100644
> --- a/arch/arm/boot/dts/imx6ull.dtsi
> +++ b/arch/arm/boot/dts/imx6ull.dtsi
> @@ -41,3 +41,32 @@
>  
>  #include "imx6ul.dtsi"
>  #include "imx6ull-pinfunc.h"
> +
> +/ {
> +	soc {
> +		aips-bus@2000000 {
> +			spba-bus@2000000 {
> +				/delete-node/ serial@2024000;
> +			};
> +		};
> +
> +		aips3: aips-bus@2200000 {
> +			compatible = "fsl,aips-bus", "simple-bus";
> +			#address-cells = <1>;
> +			#size-cells = <1>;
> +			reg = <0x02200000 0x100000>;
> +			ranges;
> +
> +			uart8: serial@2288000 {
> +				compatible = "fsl,imx6ul-uart",
> +					     "fsl,imx6q-uart";
> +				reg = <0x02288000 0x4000>;
> +				interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
> +				clocks = <&clks IMX6UL_CLK_IPG>,
> +					 <&clks IMX6UL_CLK_UART8_SERIAL>;
> +				clock-names = "ipg", "per";
> +				status = "disabled";
> +			};
> +		};
> +	};
> +};
> -- 
> 2.1.4
> 
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Dong Aisheng Jan. 26, 2018, 9:05 a.m. UTC | #2 
On Fri, Jan 26, 2018 at 09:23:52AM +0100, Lothar Waßmann wrote:
> The i.MX6ULL doesn't have the CAAM engine nor any SIM interface.
> These are currently not implemented for i.MX6UL but it cannot hurt to
> delete the corresponding nodes from the i.MX6ULL DTB anyway.
> 
> Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>

Acked-by: Dong Aisheng <aisheng.dong@nxp.com>

Regards
Dong Aisheng

> ---
>  arch/arm/boot/dts/imx6ull.dtsi | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/imx6ull.dtsi b/arch/arm/boot/dts/imx6ull.dtsi
> index 8724fdb2..da325cd 100644
> --- a/arch/arm/boot/dts/imx6ull.dtsi
> +++ b/arch/arm/boot/dts/imx6ull.dtsi
> @@ -67,6 +67,12 @@
>  			};
>  		};
>  
> +		aips-bus@2100000 {
> +			/delete-node/ caam@21400000;
> +			/delete-node/ sim@218c0000;
> +			/delete-node/ sim@21b40000;
> +		};
> +
>  		aips3: aips-bus@2200000 {
>  			compatible = "fsl,aips-bus", "simple-bus";
>  			#address-cells = <1>;
> -- 
> 2.1.4
> 
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html