mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: Sascha Hauer <s.hauer@pengutronix.de>,
	Barebox List <barebox@lists.infradead.org>
Subject: Re: [PATCH v3] ARM: i.MX: sabresd: Add support for i.MX6QP board variant
Date: Wed, 26 May 2021 09:22:41 +0200	[thread overview]
Message-ID: <395d50ec-c2b6-94f8-ceff-bf76d3ec497b@pengutronix.de> (raw)
In-Reply-To: <20210526064249.25378-1-s.hauer@pengutronix.de>



On 26.05.21 08:42, Sascha Hauer wrote:
> The SabreSD comes with different SoC variants. This patch adds support
> for the i.MX6QP based board. the DCD data has been taken from U-Boot
> 2021.04
> 
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> Link: https://lore.barebox.org/20210415140313.29161-1-s.hauer@pengutronix.de
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
> 
> Changes since v2:
> - Fix board compatible checks to also match "fsl,imx6qp-sabresd"
> 
>  arch/arm/boards/freescale-mx6-sabresd/board.c |  6 +-
>  ...mxcfg => flash-header-mx6q-sabresd.imxcfg} |  0
>  .../flash-header-mx6qp-sabresd.imxcfg         | 96 +++++++++++++++++++
>  .../boards/freescale-mx6-sabresd/lowlevel.c   | 16 ++++
>  arch/arm/dts/Makefile                         |  2 +-
>  arch/arm/dts/imx6qp-sabresd.dts               | 42 ++++++++
>  images/Makefile.imx                           |  4 +-
>  7 files changed, 162 insertions(+), 4 deletions(-)
>  rename arch/arm/boards/freescale-mx6-sabresd/{flash-header-mx6-sabresd.imxcfg => flash-header-mx6q-sabresd.imxcfg} (100%)
>  create mode 100644 arch/arm/boards/freescale-mx6-sabresd/flash-header-mx6qp-sabresd.imxcfg
>  create mode 100644 arch/arm/dts/imx6qp-sabresd.dts
> 
> diff --git a/arch/arm/boards/freescale-mx6-sabresd/board.c b/arch/arm/boards/freescale-mx6-sabresd/board.c
> index b710c05a47..4df6663775 100644
> --- a/arch/arm/boards/freescale-mx6-sabresd/board.c
> +++ b/arch/arm/boards/freescale-mx6-sabresd/board.c
> @@ -55,7 +55,8 @@ static int ar8031_phy_fixup(struct phy_device *dev)
>  
>  static int sabresd_devices_init(void)
>  {
> -	if (!of_machine_is_compatible("fsl,imx6q-sabresd"))
> +	if (!of_machine_is_compatible("fsl,imx6q-sabresd") &&
> +	    !of_machine_is_compatible("fsl,imx6q-sabresd"))

That's the same compatible string twice.

>  		return 0;
>  
>  	armlinux_set_architecture(3980);
> @@ -67,7 +68,8 @@ device_initcall(sabresd_devices_init);
>  
>  static int sabresd_coredevices_init(void)
>  {
> -	if (!of_machine_is_compatible("fsl,imx6q-sabresd"))
> +	if (!of_machine_is_compatible("fsl,imx6q-sabresd") &&
> +	    !of_machine_is_compatible("fsl,imx6q-sabresd"))

Ditto.

>  		return 0;
>  
>  	phy_register_fixup_for_uid(PHY_ID_AR8031, AR_PHY_ID_MASK,
> diff --git a/arch/arm/boards/freescale-mx6-sabresd/flash-header-mx6-sabresd.imxcfg b/arch/arm/boards/freescale-mx6-sabresd/flash-header-mx6q-sabresd.imxcfg
> similarity index 100%
> rename from arch/arm/boards/freescale-mx6-sabresd/flash-header-mx6-sabresd.imxcfg
> rename to arch/arm/boards/freescale-mx6-sabresd/flash-header-mx6q-sabresd.imxcfg
> diff --git a/arch/arm/boards/freescale-mx6-sabresd/flash-header-mx6qp-sabresd.imxcfg b/arch/arm/boards/freescale-mx6-sabresd/flash-header-mx6qp-sabresd.imxcfg
> new file mode 100644
> index 0000000000..aa52776afb
> --- /dev/null
> +++ b/arch/arm/boards/freescale-mx6-sabresd/flash-header-mx6qp-sabresd.imxcfg
> @@ -0,0 +1,96 @@
> +loadaddr 0x10000000
> +soc imx6
> +ivtofs 0x400
> +wm 32 0x20e0798 0x000c0000
> +wm 32 0x20e0758 0x00000000
> +wm 32 0x20e0588 0x00000030
> +wm 32 0x20e0594 0x00000030
> +wm 32 0x20e056c 0x00000030
> +wm 32 0x20e0578 0x00000030
> +wm 32 0x20e074c 0x00000030
> +wm 32 0x20e057c 0x00000030
> +wm 32 0x20e058c 0x00000000
> +wm 32 0x20e059c 0x00000030
> +wm 32 0x20e05a0 0x00000030
> +wm 32 0x20e078c 0x00000030
> +wm 32 0x20e0750 0x00020000
> +wm 32 0x20e05a8 0x00000030
> +wm 32 0x20e05b0 0x00000030
> +wm 32 0x20e0524 0x00000030
> +wm 32 0x20e051c 0x00000030
> +wm 32 0x20e0518 0x00000030
> +wm 32 0x20e050c 0x00000030
> +wm 32 0x20e05b8 0x00000030
> +wm 32 0x20e05c0 0x00000030
> +wm 32 0x20e0774 0x00020000
> +wm 32 0x20e0784 0x00000030
> +wm 32 0x20e0788 0x00000030
> +wm 32 0x20e0794 0x00000030
> +wm 32 0x20e079c 0x00000030
> +wm 32 0x20e07a0 0x00000030
> +wm 32 0x20e07a4 0x00000030
> +wm 32 0x20e07a8 0x00000030
> +wm 32 0x20e0748 0x00000030
> +wm 32 0x20e05ac 0x00000030
> +wm 32 0x20e05b4 0x00000030
> +wm 32 0x20e0528 0x00000030
> +wm 32 0x20e0520 0x00000030
> +wm 32 0x20e0514 0x00000030
> +wm 32 0x20e0510 0x00000030
> +wm 32 0x20e05bc 0x00000030
> +wm 32 0x20e05c4 0x00000030
> +wm 32 0x21b0800 0xa1390003
> +wm 32 0x21b080c 0x001b001e
> +wm 32 0x21b0810 0x002e0029
> +wm 32 0x21b480c 0x001b002a
> +wm 32 0x21b4810 0x0019002c
> +wm 32 0x21b083c 0x43240334
> +wm 32 0x21b0840 0x0324031a
> +wm 32 0x21b483c 0x43340344
> +wm 32 0x21b4840 0x03280276
> +wm 32 0x21b0848 0x44383A3E
> +wm 32 0x21b4848 0x3C3C3846
> +wm 32 0x21b0850 0x2e303230
> +wm 32 0x21b4850 0x38283E34
> +wm 32 0x21b081c 0x33333333
> +wm 32 0x21b0820 0x33333333
> +wm 32 0x21b0824 0x33333333
> +wm 32 0x21b0828 0x33333333
> +wm 32 0x21b481c 0x33333333
> +wm 32 0x21b4820 0x33333333
> +wm 32 0x21b4824 0x33333333
> +wm 32 0x21b4828 0x33333333
> +wm 32 0x21b08c0 0x24912249
> +wm 32 0x21b48c0 0x24914289
> +wm 32 0x21b08b8 0x00000800
> +wm 32 0x21b48b8 0x00000800
> +wm 32 0x21b0004 0x00020036
> +wm 32 0x21b0008 0x24444040
> +wm 32 0x21b000c 0x555A7955
> +wm 32 0x21b0010 0xFF320F64
> +wm 32 0x21b0014 0x01ff00db
> +wm 32 0x21b0018 0x00001740
> +wm 32 0x21b001c 0x00008000
> +wm 32 0x21b002c 0x000026d2
> +wm 32 0x21b0030 0x005A1023
> +wm 32 0x21b0040 0x00000027
> +wm 32 0x21b0400 0x14420000
> +wm 32 0x21b0000 0x831A0000
> +wm 32 0x21b0890 0x00400C58
> +wm 32 0x0bb0008 0x00000000
> +wm 32 0x0bb000c 0x2891E41A
> +wm 32 0x0bb0038 0x00000564
> +wm 32 0x0bb0014 0x00000040
> +wm 32 0x0bb0028 0x00000020
> +wm 32 0x0bb002c 0x00000020
> +wm 32 0x21b001c 0x04088032
> +wm 32 0x21b001c 0x00008033
> +wm 32 0x21b001c 0x00048031
> +wm 32 0x21b001c 0x09408030
> +wm 32 0x21b001c 0x04008040
> +wm 32 0x21b0020 0x00005800
> +wm 32 0x21b0818 0x00011117
> +wm 32 0x21b4818 0x00011117
> +wm 32 0x21b0004 0x00025576
> +wm 32 0x21b0404 0x00011006
> +wm 32 0x21b001c 0x00000000
> diff --git a/arch/arm/boards/freescale-mx6-sabresd/lowlevel.c b/arch/arm/boards/freescale-mx6-sabresd/lowlevel.c
> index ae847feaa6..7f83366e7a 100644
> --- a/arch/arm/boards/freescale-mx6-sabresd/lowlevel.c
> +++ b/arch/arm/boards/freescale-mx6-sabresd/lowlevel.c
> @@ -35,3 +35,19 @@ ENTRY_FUNCTION(start_imx6q_sabresd, r0, r1, r2)
>  
>  	barebox_arm_entry(0x10000000, SZ_1G, fdt);
>  }
> +
> +extern char __dtb_imx6qp_sabresd_start[];
> +
> +ENTRY_FUNCTION(start_imx6qp_sabresd, r0, r1, r2)
> +{
> +	void *fdt;
> +
> +	imx6_cpu_lowlevel_init();
> +
> +	if (IS_ENABLED(CONFIG_DEBUG_LL))
> +		setup_uart();
> +
> +	fdt = __dtb_imx6qp_sabresd_start + get_runtime_offset();
> +
> +	barebox_arm_entry(0x10000000, SZ_1G, fdt);
> +}
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index a637869fb6..795087f41b 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -100,7 +100,7 @@ lwl-$(CONFIG_MACH_RPI2) += bcm2836-rpi-2.dtb.o
>  lwl-$(CONFIG_MACH_RPI3) += bcm2837-rpi-3.dtb.o
>  lwl-$(CONFIG_MACH_RPI_CM3) += bcm2837-rpi-cm3.dtb.o
>  lwl-$(CONFIG_MACH_SABRELITE) += imx6q-sabrelite.dtb.o imx6dl-sabrelite.dtb.o
> -lwl-$(CONFIG_MACH_SABRESD) += imx6q-sabresd.dtb.o
> +lwl-$(CONFIG_MACH_SABRESD) += imx6q-sabresd.dtb.o imx6qp-sabresd.dtb.o
>  lwl-$(CONFIG_MACH_FREESCALE_IMX6SX_SABRESDB) += imx6sx-sdb.dtb.o
>  lwl-$(CONFIG_MACH_SOCFPGA_ALTERA_SOCDK) += socfpga_cyclone5_socdk.dtb.o
>  lwl-$(CONFIG_MACH_SOCFPGA_EBV_SOCRATES) += socfpga_cyclone5_socrates.dtb.o
> diff --git a/arch/arm/dts/imx6qp-sabresd.dts b/arch/arm/dts/imx6qp-sabresd.dts
> new file mode 100644
> index 0000000000..1fb20cb0b4
> --- /dev/null
> +++ b/arch/arm/dts/imx6qp-sabresd.dts
> @@ -0,0 +1,42 @@
> +/*
> + * Copyright 2012 Freescale Semiconductor, Inc.
> + * Copyright 2011 Linaro Ltd.
> + *
> + * The code contained herein is licensed under the GNU General Public
> + * License. You may obtain a copy of the GNU General Public License
> + * Version 2 or later at the following locations:
> + *
> + * http://www.opensource.org/licenses/gpl-license.html
> + * http://www.gnu.org/copyleft/gpl.html
> + */
> +
> +#include <arm/imx6qp-sabresd.dts>
> +
> +/ {
> +	model = "Freescale i.MX6 Quad Plus SABRE Smart Device Board";
> +	compatible = "fsl,imx6qp-sabresd", "fsl,imx6qp";
> +
> +	chosen {
> +		stdout-path = &uart1;
> +
> +		environment {
> +			compatible = "barebox,environment";
> +			device-path = &environment_usdhc3;
> +		};
> +	};
> +};
> +
> +&usdhc3 {
> +	#address-cells = <1>;
> +	#size-cells = <1>;
> +
> +	partition@0 {
> +		label = "barebox";
> +		reg = <0x0 0xe0000>;
> +	};
> +
> +	environment_usdhc3: partition@e0000 {
> +		label = "barebox-environment";
> +		reg = <0xe0000 0x20000>;
> +	};
> +};
> diff --git a/images/Makefile.imx b/images/Makefile.imx
> index f312712840..0ee12786b5 100644
> --- a/images/Makefile.imx
> +++ b/images/Makefile.imx
> @@ -215,7 +215,9 @@ $(call build_imx_habv4img, CONFIG_MACH_SABRELITE, start_imx6q_sabrelite, freesca
>  
>  $(call build_imx_habv4img, CONFIG_MACH_SABRELITE, start_imx6dl_sabrelite, freescale-mx6-sabrelite/flash-header-mx6-sabrelite, freescale-imx6dl-sabrelite)
>  
> -$(call build_imx_habv4img, CONFIG_MACH_SABRESD, start_imx6q_sabresd, freescale-mx6-sabresd/flash-header-mx6-sabresd, freescale-imx6q-sabresd)
> +$(call build_imx_habv4img, CONFIG_MACH_SABRESD, start_imx6q_sabresd, freescale-mx6-sabresd/flash-header-mx6q-sabresd, freescale-imx6q-sabresd)
> +
> +$(call build_imx_habv4img, CONFIG_MACH_SABRESD, start_imx6qp_sabresd, freescale-mx6-sabresd/flash-header-mx6qp-sabresd, freescale-imx6qp-sabresd)
>  
>  $(call build_imx_habv4img, CONFIG_MACH_UDOO_NEO, start_imx6sx_udoo_neo, udoo-neo/flash-header-mx6sx-udoo-neo_full, udoo-neo)
>  
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox


  reply	other threads:[~2021-05-26  7:24 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-26  6:42 Sascha Hauer
2021-05-26  7:22 ` Ahmad Fatoum [this message]
2021-05-26  7:24   ` Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=395d50ec-c2b6-94f8-ceff-bf76d3ec497b@pengutronix.de \
    --to=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=s.hauer@pengutronix.de \
    --subject='Re: [PATCH v3] ARM: i.MX: sabresd: Add support for i.MX6QP board variant' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox