From patchwork Mon Mar 15 17:32:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1690 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id E82F73F137 for ; Mon, 15 Mar 2021 18:33:45 +0100 (CET) Received: by mail-pj1-f72.google.com with SMTP id h17sf7204137pjz.3 for ; Mon, 15 Mar 2021 10:33:45 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1615829624; cv=pass; d=google.com; s=arc-20160816; b=OGXy6RxcfNE0Bn44ekKvMrMRxZBIboX6L3M3P0JbjRNBpZskj3yBnngFM80chrAuCr TJ9Nxj+j0HUzrwyGZp4CiJqZ/vyvi6VaSj8VnTqJYjYRAXjfayXhH4KXwwrcY6yxDbz5 f3K940KB8JEzlcWeZENx8wpEo7sj/aIUOxLttgJYD1TUtHAUDrtQb9oTtzpnby6kWDPW gvxQB7MJo2Giesne2AeOlkTQ6nsqDPAiJn/3n8wTFcVuQ3SJnijWdgsA04gTJG4Oae2/ GOX4FoDQ0JLtYAOsCCmxb9FjxDm5AOwYc+BOLmY+GoflB8eQ74YUDRpZr3sip7xxT8H/ yOfQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=9Wzjkve4CPnZ8Kc3f/ai9+yVHJdB4Uaz4uyLzG/YnYQ=; b=Jw0ZC5OnoMOqwMkUgBYi3/4xOnucQHWQTrYWvrdg7OHEllxm0lb2BebyLLuaDTJ6BP 1Y5ZSBooQ65bageO37ujsNsXI9sDZqblejLgOslkZxr5bdsQvOb0cbGsSRSt/Z+GEX+x mGjMfwU6lZW2d2XA0e6A3qaIRBVp/Nin2dNnP0qMtY/2B5jNO33aL9wwztT3UO6vdJtW O3gMf1GGFLM4h/zCRGQ0VlHpEAXhFGTHgtcRloVqEhgNaSmHSOP8lVqEStfjhs0aZ0HP 6sBu4bfuHIKHa1ZFoF1pZ3mGvqCgkabtCdKyeiz9LfB63yx/zfP1kfHjmAd11JmurG1E 5UVA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=pwDDwepg; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=9Wzjkve4CPnZ8Kc3f/ai9+yVHJdB4Uaz4uyLzG/YnYQ=; b=nZ2vy+OzEBaq9kVNCGw3L7oGQGT9qRtptkvpGlW/tKISQennZqZ/0ul1p7oH8KAw1f Djd3W4KfAuyK9aKXx2g94VLteYtHOtTgwye49+i5BFfutP+cKM05XroUv7hrQf9hBsJc FwQR8BAkr+TUHQ7RiFk16JILSIRRPzPtoBIwg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=9Wzjkve4CPnZ8Kc3f/ai9+yVHJdB4Uaz4uyLzG/YnYQ=; b=Pqwq4VY/bfV1AQYnuScNDkxLoUxj53b6s84L+f/CHW/nGubcsZq8xXFVbLbEHrEUvt F2s9LGwSxFFzZQ350y+wk5uWadzVN04ucwl11ECx973VON8WP/dzD5iMel8Z2DR/K6aL 9pdnHbZKwEBTC1Pz1WW0vabjs57o+Baz2XWT7tfg1BD3lMnpSKmv4ODNeTRGvFY7U7mN 5CHI1YWn3gWQ8jbR4C0Rxg64lKpnbMvbCtSxUJll5EY1bu3kZ5GqPvHdVhs1bEsXrGes 54VQr5aVLNhfrjt/WWTF6CzGpUjqOcV5DR7y+wd3qIhjDNRc8Zr4aMuW3qbu7xwdkYOB dNZg== X-Gm-Message-State: AOAM533+U67orgWDtFyKgz9H0RFAjhShJHV10y/vhc/c/6rRC47VtAb9 GPS1Na+gZDU6BHwszlg+4SfBymJG X-Google-Smtp-Source: ABdhPJwwAMiJlA18ysHWeG3nvkGFJBra4vhK3HD7qGZdwec41QNQ1ibRGnGxzkyNdHkk+YA1MvO74A== X-Received: by 2002:a17:90a:7103:: with SMTP id h3mr199307pjk.82.1615829624624; Mon, 15 Mar 2021 10:33:44 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a63:1b43:: with SMTP id b3ls6465250pgm.11.gmail; Mon, 15 Mar 2021 10:33:44 -0700 (PDT) X-Received: by 2002:a63:1e47:: with SMTP id p7mr199523pgm.133.1615829623959; Mon, 15 Mar 2021 10:33:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615829623; cv=none; d=google.com; s=arc-20160816; b=C7FHaOBDmykj0WlMu/5PUo+sOwJ3Ku53rXV+M63vhberls5KVbG2he6nLYcW0ChjhG LxCDpticdYqdLAPhZPaEeimrVJiC1Kwh05iHFjQtTpOSWs7WXGjZpX/PvOYMU1XVnciF 27WyVeMmgrdqMjkkm+rAmm2q+fr+KRMBLvBphL/S2EuJFQqr9NXzsQQYblzRecNXajt5 iYEpo2wzzGcNSemUhGAFR7ZEDJWeqfeNUBIINOXKi6yYnuLAWGXRMe5vKdhctxoqeDIH vN5mLHjSqeiccFR0wdViKAs5uCQXfrWtFhHVRU1I/TEWI5XBot9iOFxk3vVJPTcJZ+eF b5Wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=rfgLajO8EZBmhhXrc+dTaz4Ihr7Kvmgvs9Hf25134Ss=; b=SwXMoUDwwVdKGf92Q2wvVmbXfmbJhRbENC+Wa0swyMenuasBoFnIcggsiFpXHWutSH mHhijPLJmZxeoPVcqSJ9GqCzNz3NNksZVART3OJvB9nPDkpBMEF+VIAu3RuQQq3R+E0N ZpTLOeHe8WFhhmUGXvRHAQK3YJRaPEhgxn26xCI+vpW/DEvjy1YDwpWEjRXGn0Rv+vvA AFHCLSPZDNf4CbYWKBZ6GefEtK/Kd3TfCN4OBX+p3QDW2P1/lUCZmOMSmolyo1ZCDGt1 M/6GB1Azf/iU/WfKzlT3MJutOL6zNK4PrQaeZL906xgHuaHNgv8pXY8tEjMyZPC86NhB 6inQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=pwDDwepg; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id w126sor6574082pfw.75.2021.03.15.10.33.43 for (Google Transport Security); Mon, 15 Mar 2021 10:33:43 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Received: by 2002:a65:57cf:: with SMTP id q15mr212017pgr.380.1615829623639; Mon, 15 Mar 2021 10:33:43 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c00a:a884:6f76:4267:118b:2085]) by smtp.gmail.com with ESMTPSA id y17sm227500pju.50.2021.03.15.10.33.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 10:33:43 -0700 (PDT) From: Jagan Teki To: Patrick Delaunay , Patrice Chotard , Matteo Lisi Cc: uboot-stm32@st-md-mailman.stormreply.com, u-boot@lists.denx.de, linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH v2 5/9] board: stm32: Add Engicam i.Core STM32MP1 C.TOUCH 2.0 Date: Mon, 15 Mar 2021 23:02:52 +0530 Message-Id: <20210315173256.103731-6-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210315173256.103731-1-jagan@amarulasolutions.com> References: <20210315173256.103731-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=pwDDwepg; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Engicam C.TOUCH 2.0 is an EDIMM compliant general purpose Carrier board. Genaral features: - Ethernet 10/100 - Wifi/BT - USB Type A/OTG - Audio Out - CAN - LVDS panel connector i.Core STM32MP1 is an EDIMM SoM based on STM32MP157A from Engicam. i.Core STM32MP1 needs to mount on top of this Carrier board for creating complete i.Core STM32MP1 C.TOUCH 2.0 board. Linux dts commit details: commit <6ca2898df59f> ("ARM: dts: stm32: Add Engicam i.Core STM32MP1 C.TOUCH 2.0") Add support for it. Reviewed-by: Patrice Chotard Signed-off-by: Jagan Teki Reviewed-by: Patrick Delaunay --- Changes for v2: - collect Patrice r-b - add linux dts commit - drop CONFIG_BOARD_EARLY_INIT_F arch/arm/dts/Makefile | 1 + ...2mp157a-icore-stm32mp1-ctouch2-u-boot.dtsi | 51 ++++++++++++ .../stm32mp157a-icore-stm32mp1-ctouch2.dts | 47 +++++++++++ arch/arm/mach-stm32mp/Kconfig | 5 ++ board/engicam/stm32mp1/MAINTAINERS | 6 ++ ...stm32mp15-icore-stm32mp1-ctouch2_defconfig | 79 +++++++++++++++++++ 6 files changed, 189 insertions(+) create mode 100644 arch/arm/dts/stm32mp157a-icore-stm32mp1-ctouch2-u-boot.dtsi create mode 100644 arch/arm/dts/stm32mp157a-icore-stm32mp1-ctouch2.dts create mode 100644 configs/stm32mp15-icore-stm32mp1-ctouch2_defconfig diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 9d13045f21..ce4521b891 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -990,6 +990,7 @@ dtb-$(CONFIG_ARCH_STI) += stih410-b2260.dtb dtb-$(CONFIG_STM32MP15x) += \ stm32mp157a-dk1.dtb \ stm32mp157a-avenger96.dtb \ + stm32mp157a-icore-stm32mp1-ctouch2.dtb \ stm32mp157a-icore-stm32mp1-edimm2.2.dtb \ stm32mp157c-dk2.dtb \ stm32mp157c-ed1.dtb \ diff --git a/arch/arm/dts/stm32mp157a-icore-stm32mp1-ctouch2-u-boot.dtsi b/arch/arm/dts/stm32mp157a-icore-stm32mp1-ctouch2-u-boot.dtsi new file mode 100644 index 0000000000..96fe461235 --- /dev/null +++ b/arch/arm/dts/stm32mp157a-icore-stm32mp1-ctouch2-u-boot.dtsi @@ -0,0 +1,51 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +/* + * Copyright (C) STMicroelectronics 2019 - All Rights Reserved + * Copyright (c) 2020 Amarula Solutions(India) + * Author: Jagan Teki + */ + +#include "stm32mp157a-icore-stm32mp1-u-boot.dtsi" + +/{ + aliases { + mmc0 = &sdmmc1; + }; + + chosen { + stdout-path = &uart4; + }; +}; + +&sdmmc1 { + u-boot,dm-pre-reloc; +}; + +&sdmmc1_b4_pins_a { + u-boot,dm-pre-reloc; + + pins1 { + u-boot,dm-pre-reloc; + }; + + pins2 { + u-boot,dm-pre-reloc; + }; +}; + +&uart4 { + u-boot,dm-pre-reloc; +}; + +&uart4_pins_a { + u-boot,dm-pre-reloc; + + pins1 { + u-boot,dm-pre-reloc; + }; + + pins2 { + u-boot,dm-pre-reloc; + bias-pull-up; + }; +}; diff --git a/arch/arm/dts/stm32mp157a-icore-stm32mp1-ctouch2.dts b/arch/arm/dts/stm32mp157a-icore-stm32mp1-ctouch2.dts new file mode 100644 index 0000000000..d3058a036c --- /dev/null +++ b/arch/arm/dts/stm32mp157a-icore-stm32mp1-ctouch2.dts @@ -0,0 +1,47 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +/* + * Copyright (c) STMicroelectronics 2019 - All Rights Reserved + * Copyright (c) 2020 Engicam srl + * Copyright (c) 2020 Amarula Solutons(India) + */ + +/dts-v1/; +#include "stm32mp157.dtsi" +#include "stm32mp157a-icore-stm32mp1.dtsi" +#include "stm32mp15-pinctrl.dtsi" +#include "stm32mp15xxaa-pinctrl.dtsi" +#include + +/ { + model = "Engicam i.Core STM32MP1 C.TOUCH 2.0"; + compatible = "engicam,icore-stm32mp1-ctouch2", + "engicam,icore-stm32mp1", "st,stm32mp157"; + + aliases { + serial0 = &uart4; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&sdmmc1 { + bus-width = <4>; + disable-wp; + pinctrl-names = "default", "opendrain", "sleep"; + pinctrl-0 = <&sdmmc1_b4_pins_a>; + pinctrl-1 = <&sdmmc1_b4_od_pins_a>; + pinctrl-2 = <&sdmmc1_b4_sleep_pins_a>; + st,neg-edge; + vmmc-supply = <&v3v3>; + status = "okay"; +}; + +&uart4 { + pinctrl-names = "default", "sleep", "idle"; + pinctrl-0 = <&uart4_pins_a>; + pinctrl-1 = <&uart4_sleep_pins_a>; + pinctrl-2 = <&uart4_idle_pins_a>; + status = "okay"; +}; diff --git a/arch/arm/mach-stm32mp/Kconfig b/arch/arm/mach-stm32mp/Kconfig index 5a2123063a..15c832b16b 100644 --- a/arch/arm/mach-stm32mp/Kconfig +++ b/arch/arm/mach-stm32mp/Kconfig @@ -96,6 +96,11 @@ config TARGET_ICORE_STM32MP1 * i.Core STM32MP1 needs to mount on top of EDIMM2.2 for creating complete i.Core STM32MP1 EDIMM2.2 Starter Kit. + i.Core STM32MP1 C.TOUCH 2.0 + * C.TOUCH 2.0 is a general purpose Carrier board. + * i.Core STM32MP1 needs to mount on top of this Carrier board + for creating complete i.Core STM32MP1 C.TOUCH 2.0 board. + config TARGET_DH_STM32MP1_PDK2 bool "DH STM32MP1 PDK2" select STM32MP15x diff --git a/board/engicam/stm32mp1/MAINTAINERS b/board/engicam/stm32mp1/MAINTAINERS index 3230a7a6e8..62c6925c8d 100644 --- a/board/engicam/stm32mp1/MAINTAINERS +++ b/board/engicam/stm32mp1/MAINTAINERS @@ -1,3 +1,9 @@ +i.Core-STM32MP1-CTOUCH2.0 +M: Jagan Teki +M: Matteo Lisi +S: Maintained +F: configs/stm32mp15-icore-stm32mp1-ctouch2_defconfig + i.Core-STM32MP1-EDIMM2.2 M: Jagan Teki M: Matteo Lisi diff --git a/configs/stm32mp15-icore-stm32mp1-ctouch2_defconfig b/configs/stm32mp15-icore-stm32mp1-ctouch2_defconfig new file mode 100644 index 0000000000..55f9fb9427 --- /dev/null +++ b/configs/stm32mp15-icore-stm32mp1-ctouch2_defconfig @@ -0,0 +1,79 @@ +CONFIG_ARM=y +CONFIG_ARCH_STM32MP=y +CONFIG_SYS_MALLOC_F_LEN=0x3000 +CONFIG_SYS_MEMTEST_START=0xc0000000 +CONFIG_SYS_MEMTEST_END=0xc4000000 +CONFIG_ENV_OFFSET=0x280000 +CONFIG_SPL_TEXT_BASE=0x2FFC2500 +CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL=y +CONFIG_TARGET_ICORE_STM32MP1=y +CONFIG_ENV_OFFSET_REDUND=0x2C0000 +# CONFIG_ARMV7_VIRT is not set +CONFIG_DEFAULT_DEVICE_TREE="stm32mp157a-icore-stm32mp1-ctouch2" +CONFIG_DISTRO_DEFAULTS=y +CONFIG_FIT=y +CONFIG_BOOTCOMMAND="run bootcmd_stm32mp" +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=3 +CONFIG_SPL_ENV_SUPPORT=y +CONFIG_SPL_I2C_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y +CONFIG_SYS_PROMPT="STM32MP> " +CONFIG_CMD_ADTIMG=y +CONFIG_CMD_ERASEENV=y +CONFIG_CMD_MEMINFO=y +CONFIG_CMD_MEMTEST=y +CONFIG_CMD_ADC=y +CONFIG_CMD_CLK=y +CONFIG_CMD_FUSE=y +CONFIG_CMD_GPIO=y +CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y +CONFIG_CMD_REMOTEPROC=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_TIME=y +CONFIG_CMD_TIMER=y +CONFIG_CMD_PMIC=y +CONFIG_CMD_REGULATOR=y +CONFIG_CMD_EXT4_WRITE=y +# CONFIG_SPL_DOS_PARTITION is not set +CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-names interrupts-extended interrupt-controller \\\#interrupt-cells interrupt-parent dmas dma-names assigned-clocks assigned-clock-rates assigned-clock-parents hwlocks" +CONFIG_ENV_IS_NOWHERE=y +CONFIG_ENV_IS_IN_MMC=y +CONFIG_SYS_REDUNDAND_ENVIRONMENT=y +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +# CONFIG_SPL_ENV_IS_NOWHERE is not set +CONFIG_DM_HWSPINLOCK=y +CONFIG_HWSPINLOCK_STM32=y +CONFIG_DM_I2C=y +CONFIG_SYS_I2C_STM32F7=y +CONFIG_LED=y +CONFIG_LED_GPIO=y +CONFIG_DM_MAILBOX=y +CONFIG_STM32_IPCC=y +CONFIG_STM32_FMC2_EBI=y +CONFIG_DM_MMC=y +CONFIG_SUPPORT_EMMC_BOOT=y +CONFIG_STM32_SDMMC2=y +CONFIG_PHY_REALTEK=y +CONFIG_DM_ETH=y +CONFIG_DWC_ETH_QOS=y +CONFIG_PHY=y +CONFIG_PINCONF=y +# CONFIG_SPL_PINCTRL_FULL is not set +CONFIG_PINCTRL_STMFX=y +CONFIG_DM_PMIC=y +# CONFIG_SPL_PMIC_CHILDREN is not set +CONFIG_PMIC_STPMIC1=y +CONFIG_DM_REGULATOR=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_DM_REGULATOR_GPIO=y +CONFIG_REMOTEPROC_STM32_COPRO=y +CONFIG_DM_RTC=y +CONFIG_RTC_STM32=y +CONFIG_SERIAL_RX_BUFFER=y +CONFIG_WDT=y +CONFIG_WDT_STM32MP=y +CONFIG_LZO=y +CONFIG_ERRNO_STR=y