From patchwork Mon Dec 30 12:04:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 976 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 18ED53F03F for ; Mon, 30 Dec 2019 13:04:26 +0100 (CET) Received: by mail-pj1-f69.google.com with SMTP id s19sf11835863pjp.9 for ; Mon, 30 Dec 2019 04:04:26 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1577707464; cv=pass; d=google.com; s=arc-20160816; b=NR3J4cecurU6ZT3IfhHABJhTdRF7E1CnGy7aHa6L8TOCzK/51ONQiI4hXbaGWQnJFP dkkjMTOkyoFNxhgpl7CjfR8QRPyAzR4XIVVfNxv6lHigsOQgFdxu9aAj4vuiW8ky+wGb m1NyEaEbN/2h7RoksGtmPz7MbQZY1aKkiukiZgZwdzuEoxxrW7Qj5/onKPmR3PAO5qTC cct7ivB2nV1+GANnhCdbJemfaC3mqUr2Rf5SzkkffAEcN2Ld/71s5vZnFp9LilA0/VO0 h/IWUlpkQQwCzoKKodagSo9asrjSuXw9OZFr4+rE2FOVDL06wm/Z4cR2fmuk7n4vCO06 RY7g== 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=GDTrMJr/4LKUMl1B5V9VIuNxrthgamfPHxNJqlswN+Y=; b=l+lA0Yr3lKdc3nohvXgUkncbhoZzve2MiTWOvDyaXQLsfISFugjQFwS0VKKKiPS3sl YGPbvwv1Xer+SPww0GWI8ksgfP8nZhIkFgIu8ls6ibNn+zPGS1LPGMkdg1yhLlruI6qh /hG8k9Hu6H1d3iqyQSnKHpdbUg7pM6ABLMRE2lUwj8iOLNuIsblC+3o+3mLEI1dii/66 BUDnx6PErgYvRkt4GiUqIqhJR0uHyW8H/em3/J7Iz8AMQFqyTZ4qAo2eI1htSZolrxET T0bLilCNbgPxzm+50a2fycPjCW5pQg6bZDcSw0H9oTiQm39PDUQjX4s0/zn1g9I5i99d mG6g== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=LiImp19K; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 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=GDTrMJr/4LKUMl1B5V9VIuNxrthgamfPHxNJqlswN+Y=; b=XqnEqGANNtJO8sS9GXZx3m6ENW0BRMJnlekQrGI9fmrvP3/kKH1Jm48aNRjW2/eLsV 6Mw1stIlBqo05WJXTBse5nDBaMJd5laxv14y35g67zDy0augbYjj1mF9bWAL9crAPPFd x9vbL0kAXJnoDhlhpw1XEEMge7OcpjtQeDzho= 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=GDTrMJr/4LKUMl1B5V9VIuNxrthgamfPHxNJqlswN+Y=; b=adinp8YSfQ3DqLUOZvaaktVNMZocvFpByObbA2LCPQqaYOrM49y2jlvui/5rPK8qu1 iaKfDwrCAssbD8M9daKR/sLWlvQWhbUbo8BidBdN1gWcs8EjX2MTxjstA8NoKZ9DGE38 1nX4NDRx6E/1FPwFzxye1FO5cwreLJfm9ualKzEOsaXGlTzqLIy5gnNghKTdggM3ldhJ tF0cqD4Bdr2h5ISgarrOKrMt6ZHAysXfM5LwMT677Hw60B4i4IE1FX0qvu0rbjZ+2lD8 75NmumfIlNHSi/HZARcNlQRYNcoVuSOEpL7TF/CnCxwij9T526o3Y0ugqll/N2/EHIpy cl/g== X-Gm-Message-State: APjAAAWMCGPl8SpkwASQX3RFfoTEd7aVPEMHGf3Jn93dTczdKAoxX0Hh JOi6za1bLi1IFHAjsUASQ0wJ6YEr X-Google-Smtp-Source: APXvYqynAB9we68kVmctTS3C1fmQy0y9HfBeGrzQ8wVeVnDnrYj2bDYRcSuL/ycjLi1MZHcqOsvagw== X-Received: by 2002:a17:902:ab84:: with SMTP id f4mr70204365plr.35.1577707464388; Mon, 30 Dec 2019 04:04:24 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a62:ab0b:: with SMTP id p11ls9877320pff.0.gmail; Mon, 30 Dec 2019 04:04:24 -0800 (PST) X-Received: by 2002:a63:303:: with SMTP id 3mr71264338pgd.372.1577707463886; Mon, 30 Dec 2019 04:04:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577707463; cv=none; d=google.com; s=arc-20160816; b=A/aukBiMaW7K+g2AFcRcebpXgSdXdTqfxSw0YvDODHr85hxXtFrkMiIPgOFk1QY+z0 DN3W3e9jOAtDQPq6/hw91ivP/d9XvgHUSBasId2zioXSzNgh6+8Ma3cJPAfyAjwcNhq/ lix3Phjr+R/wa+Ebzsx7YmQ+ehIoZVeFXUDqoiGPFIklSSLzCpXAKB4fDzpWx+NXTEdr VDMZwDnGUcMCC5eQKxMdHbmZTBOIjznqpIl47vFFnDBbI4ApRPXfB7RM3r+JzD08TwUI uIZWWsJ0OcytHGMIk4j7prpzBzNTgxcaBU7uwvvOQHDCN6dMoK+PkKrE8YMKH22pbs8h KJ/g== 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=N4AXbwqBTtwQ0ItnN+FKO5sVPh3Kkm//IWDuhuVsEvc=; b=CkdQMoKnxkdGvNkhI70mFClq+z1VYxpqnzAGgaBZaNLS0Uj77O/RkUwRkpYv24d0be BHdqmGuYwL6lonZdZg/TbOw19IXtyt56I/c7nXA4ca/ox0TCCg4iQRRK3eelVl9tzTPq yEWM9fI04+C6jt85vxxtuFvHQ1oJABRuIKIgTbEvlqo5X66i8Qvu/c/4xdsx7DNELxs5 DChFlpmFXRDkrCbAZWUUo0Iou9rElXUo8b0GmcNMR9yjNFIZzMQIJ+pcQjANvbHsHxjN kXX8NVZEu5mkRER0SwOLDBg/ADIsURjLpe6p7uEGK0Zp5Ig4PtirdwEutCNWXomyd2bS 8YdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=LiImp19K; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id d24sor21119923pls.45.2019.12.30.04.04.23 for (Google Transport Security); Mon, 30 Dec 2019 04:04:23 -0800 (PST) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a17:902:5ac9:: with SMTP id g9mr54014438plm.69.1577707463569; Mon, 30 Dec 2019 04:04:23 -0800 (PST) Received: from localhost.localdomain ([49.206.202.131]) by smtp.gmail.com with ESMTPSA id n7sm24552620pjq.8.2019.12.30.04.04.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2019 04:04:22 -0800 (PST) From: Jagan Teki To: Stefano Babic , Fabio Estevam , uboot-imx@nxp.com Cc: Michael Trimarchi , u-boot@lists.denx.de, linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH 1/8] board: engicam: Cleanup fdt file and board mapping Date: Mon, 30 Dec 2019 17:34:02 +0530 Message-Id: <20191230120409.884-2-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20191230120409.884-1-jagan@amarulasolutions.com> References: <20191230120409.884-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=LiImp19K; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 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: , From: Michael Trimarchi Make easy to map fdt file to board in order to use this information later to apply specific change to specific board combination. Signed-off-by: Michael Trimarchi Signed-off-by: Jagan Teki --- board/engicam/common/board.c | 67 ++++++++++++++++++++++++++++++------ 1 file changed, 56 insertions(+), 11 deletions(-) diff --git a/board/engicam/common/board.c b/board/engicam/common/board.c index e5358b47f3..992d209cbd 100644 --- a/board/engicam/common/board.c +++ b/board/engicam/common/board.c @@ -35,35 +35,76 @@ static void mmc_late_init(void) } #endif -static void setenv_fdt_file(void) +enum engicam_boards { + IMX6Q_ICORE, + IMX6DL_ICORE, + IMX6Q_ICORE_MIPI, + IMX6DL_ICORE_MIPI, + IMX6Q_ICORE_RQS, + IMX6DL_ICORE_RQS, + IMX6UL_GEAM, + IMX6UL_ISIOT_EMMC, + IMX6UL_ISIOT_NAND, + ENGICAM_BOARDS, +}; + +static const char * const board_fdt_file[ENGICAM_BOARDS] = { + [IMX6Q_ICORE] = "imx6q-icore.dtb", + [IMX6DL_ICORE] = "imx6dl-icore.dtb", + [IMX6Q_ICORE_MIPI] = "imx6q-icore-mipi.dtb", + [IMX6DL_ICORE_MIPI] = "imx6dl-icore-mipi.dtb", + [IMX6Q_ICORE_RQS] = "imx6q-icore-rqs.dtb", + [IMX6DL_ICORE_RQS] = "imx6dl-icore-rqs.dtb", + [IMX6UL_GEAM] = "imx6ul-geam.dtb", + [IMX6UL_ISIOT_EMMC] = "imx6ul-isiot-emmc.dtb", + [IMX6UL_ISIOT_NAND] = "imx6ul-isiot-nand.dtb", +}; + +static int setenv_fdt_file(int board_detected) +{ + if (board_detected < 0 || board_detected >= ENGICAM_BOARDS) + return -EINVAL; + + if (!board_fdt_file[board_detected]) + return -ENODEV; + + env_set("fdt_file", board_fdt_file[board_detected]); + return 0; +} + +static enum engicam_boards engicam_board_detect(void) { const char *cmp_dtb = CONFIG_DEFAULT_DEVICE_TREE; if (!strcmp(cmp_dtb, "imx6q-icore")) { if (is_mx6dq()) - env_set("fdt_file", "imx6q-icore.dtb"); + return IMX6Q_ICORE; else if (is_mx6dl() || is_mx6solo()) - env_set("fdt_file", "imx6dl-icore.dtb"); + return IMX6DL_ICORE; } else if (!strcmp(cmp_dtb, "imx6q-icore-mipi")) { if (is_mx6dq()) - env_set("fdt_file", "imx6q-icore-mipi.dtb"); + return IMX6Q_ICORE_MIPI; else if (is_mx6dl() || is_mx6solo()) - env_set("fdt_file", "imx6dl-icore-mipi.dtb"); + return IMX6DL_ICORE_MIPI; } else if (!strcmp(cmp_dtb, "imx6q-icore-rqs")) { if (is_mx6dq()) - env_set("fdt_file", "imx6q-icore-rqs.dtb"); + return IMX6Q_ICORE_RQS; else if (is_mx6dl() || is_mx6solo()) - env_set("fdt_file", "imx6dl-icore-rqs.dtb"); + return IMX6DL_ICORE_RQS; } else if (!strcmp(cmp_dtb, "imx6ul-geam")) - env_set("fdt_file", "imx6ul-geam.dtb"); + return IMX6UL_GEAM; else if (!strcmp(cmp_dtb, "imx6ul-isiot-emmc")) - env_set("fdt_file", "imx6ul-isiot-emmc.dtb"); + return IMX6UL_ISIOT_EMMC; else if (!strcmp(cmp_dtb, "imx6ul-isiot-nand")) - env_set("fdt_file", "imx6ul-isiot-nand.dtb"); + return IMX6UL_ISIOT_NAND; + + return -EINVAL; } int board_late_init(void) { + enum engicam_boards board_detected = IMX6Q_ICORE; + switch ((imx6_src_get_boot_mode() & IMX6_BMODE_MASK) >> IMX6_BMODE_SHIFT) { case IMX6_BMODE_SD: @@ -88,7 +129,11 @@ int board_late_init(void) else env_set("console", "ttymxc3"); - setenv_fdt_file(); + board_detected = engicam_board_detect(); + if (board_detected < 0) + hang(); + + setenv_fdt_file(board_detected); #ifdef CONFIG_HW_WATCHDOG hw_watchdog_init(); From patchwork Mon Dec 30 12:04:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 977 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 1E0E13F03F for ; Mon, 30 Dec 2019 13:04:29 +0100 (CET) Received: by mail-pf1-f197.google.com with SMTP id d127sf15882388pfa.7 for ; Mon, 30 Dec 2019 04:04:29 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1577707468; cv=pass; d=google.com; s=arc-20160816; b=IvWKgvjtd83IMqPpmGktPaJvG19TOp1E2oDN4vIWN56O5ZB3O6D+z/MtcJALTB4/Pc 2GqMAdc8CPeCsZ8ssxCPGa5IldxszPwT2PUnh/NTYebkD08V6AOCKDRuv+mC8CdoNWnx 9OWz90Pn3Sp1LqiATEzBmrdFG6HkYHEwAEp86W0+GWcmLc2s6A1EvWgUpkzr5C/Sts/A Mp8dM4S9+pKQZG4lDgT75IimjN5HVg9fJw333PUTERB7t9TzalkcrZ1hlogtOkBnIYE8 m2U5G/jQjGUJcfAZa8elA3Jo9UGQkfqUXD4i2Ekz8IJnrgGjNn5u+5P44xe9Qevj7fAc B2VQ== 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=atdqfH1z+jjy8btcUM2KLU3MbCxVSU0wEq3NMXh4cCQ=; b=XJkJMqgdd0nx9u0L9UeptgBymVxNyCX4gKrLpp7O6/UFD3rZ/3cmf9hCyPkHHOWwJY BFRgyYLYIvV1bLcvFTgH+OTjZdomonBHIDq7Eh5msvap9OtWE0cXi55cJhAiDWaJ8B5S clsJy4NhMCjx258+TIukit9svSrjSb4dD5ggEIWHucSgXL0gdDYUUYLLTstLZvgQu2+9 jdERlFLY2wDXmrJH1gvg6VFkAyqVdQK2DjOVzP9CqbRjdtGCvBUeojCjgVXTWLuUyR7Q 2ZbwVwobyju2ow51/MOFD7mBsq49fmHO/StNbaELT/DqgZ/ON8HtTbHk3vlXpL35p9J+ xkpg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=ApXvK8JL; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 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=atdqfH1z+jjy8btcUM2KLU3MbCxVSU0wEq3NMXh4cCQ=; b=f23FPB5w4XQ3FCa29+Ul8YMXCTr6Dxtci6ZL01vn+XuaYIbFeAoFvcsqKTDGa2DWzz RtGf0RHRwgsBy5sOJjAUjUsIOD4V+AVOJDQIG/Lb+nvPXMoi+gBNKcPs6ilzNo4dVbBC AJ18Wi+kQdg1mynleTKu8XwR7daSNafmNKFyY= 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=atdqfH1z+jjy8btcUM2KLU3MbCxVSU0wEq3NMXh4cCQ=; b=qisEAhFYccFbsfykPPifdcCScmM5Xh3K1NxHKmdbL5LQxg6S8BkiNQBWHA8TKXOFM9 mgBhpylZlI2jsh6TSwFAI8hZNVsEiFohA2AQ/6afVfJH8LW4sfHFt6XMi+Pz5gh431Da HitXetrUrYTtlz/9k5z3SCqkUW7bBkMsdD+XHmAMSIWCEARcUq+4cuHNevARNpkNOcwm RB+nWaCkyucMlk4zOPrlZZksK4YNiWEo/SVgSPjXU3VFbTkTMGxJ1USVyktf6td/1n4o YBrOIbyyDnMP5QwPCUdd9WcVw+jqfeDnwj1l4f9lVxdhUfjWz3bon2QCMioxpmCImVwh r/uA== X-Gm-Message-State: APjAAAUu6+kqQm/VBiHldQJPFgBGRCQ6QuEzB/nvgMJFWZ+eeBSNYiFw 6MUXg4tbifuoa/RYRhXMKn12dGso X-Google-Smtp-Source: APXvYqyEmixd3SdlUQX3j8hCwkE3VhHgh7xoXz4n4PJcJHIqG12QqyOouJn4oxO6eHfzRjpLHNF3fQ== X-Received: by 2002:a17:902:8e87:: with SMTP id bg7mr42026255plb.279.1577707467881; Mon, 30 Dec 2019 04:04:27 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:902:ba8b:: with SMTP id k11ls7180863pls.13.gmail; Mon, 30 Dec 2019 04:04:27 -0800 (PST) X-Received: by 2002:a17:902:8b89:: with SMTP id ay9mr57734147plb.309.1577707467329; Mon, 30 Dec 2019 04:04:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577707467; cv=none; d=google.com; s=arc-20160816; b=BHnlWUMDKx9t4ISzH4Yr6C7t20W/zVb3d4PGc1KfzizhTshyu/dCrL0lUwCSwTzhXg zZWCoeppp4wEtC2pG/6tYS4vHMbY8XB7S+Q77kYgjDfJ6flIpxPsHBSNh2JqMzj+vywU 1NgnqVWCmdG7VwltY+EfdcwaT0rKwBFQtXMH7oeBeBo50iGZwqG/LqjCJBKo/yf3j53M j7eqcYPVDzw6fkDCquRfGjGZSMQHgTHEvpxzVb/l1nEBcZ7aapNO1XGaYW2lIufPAPXq eJcxqRbdPf9Czrl3mHQTi4wCnLumKSYtAn+BcJ2azIqo8h+qE3lIeiJezm5pWdYwaNTv rrIA== 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=thqmmrBPT2ITS8/+D8jQ9w02jMZLrX9dio7x6TuRY20=; b=rGEZHtb2iu/jZU64p9pCFA01vuSia2U+WO6L2VxEuwvMKu8IosoxKQ3b4dASjNCaBR +0X28YweGquJ3ctQxRF6kSTd+VSk+ELR76XopX0Yw4eEO7apW3k/vIH5bh8JUiJUnyu/ U+qHxzUO51G0BwdTOJq0vCFT3VEoB+6ocyIYSiYpettqxyy5AXbOm0iqKSlk3A4sPQeF QvxEaw5vyByTkTnUb1ZPYYYVV1hO0hSo7HwN3/bAs/k+ZHT3D1P8A4btSYTLiBVYvCt1 ehvr8ivrl3UjKLZaegjEcOEoDUDx6LCxDQe+3Jh+e8g6DjJcp1Qt//YXexg2h9zk4JSb 7LFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=ApXvK8JL; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id d15sor37444731plr.44.2019.12.30.04.04.27 for (Google Transport Security); Mon, 30 Dec 2019 04:04:27 -0800 (PST) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a17:902:8d8c:: with SMTP id v12mr46257530plo.336.1577707467013; Mon, 30 Dec 2019 04:04:27 -0800 (PST) Received: from localhost.localdomain ([49.206.202.131]) by smtp.gmail.com with ESMTPSA id n7sm24552620pjq.8.2019.12.30.04.04.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2019 04:04:26 -0800 (PST) From: Jagan Teki To: Stefano Babic , Fabio Estevam , uboot-imx@nxp.com Cc: Michael Trimarchi , u-boot@lists.denx.de, linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH 2/8] board: engicam: Fix the ethernet clock initialization Date: Mon, 30 Dec 2019 17:34:03 +0530 Message-Id: <20191230120409.884-3-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20191230120409.884-1-jagan@amarulasolutions.com> References: <20191230120409.884-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=ApXvK8JL; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 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: , From: Michael Trimarchi According to the SOM and reference board the clock can be taken from the external pin or provided from ENET_REF_CLK. Add a new function that make the proper set according the board type. Signed-off-by: Michael Trimarchi Signed-off-by: Jagan Teki --- board/engicam/common/board.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/board/engicam/common/board.c b/board/engicam/common/board.c index 992d209cbd..6472d382c9 100644 --- a/board/engicam/common/board.c +++ b/board/engicam/common/board.c @@ -10,6 +10,8 @@ #include #include #include +#include +#include #include #include @@ -101,6 +103,32 @@ static enum engicam_boards engicam_board_detect(void) return -EINVAL; } +static int fixup_enet_clock(enum engicam_boards board_detected) +{ + struct iomuxc *iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR; + int clk_internal = 0; + + switch (board_detected) { + case IMX6Q_ICORE_MIPI: + case IMX6DL_ICORE_MIPI: + clk_internal = 1; + break; + default: + break; + } + + /* set gpr1[21] to select anatop clock */ + debug("fixup_enet_clock %d\n", clk_internal); + clrsetbits_le32(&iomuxc_regs->gpr[1], 0x1 << 21, clk_internal << 21); + + if (!clk_internal) { + /* clock is external */ + return 0; + } + + return enable_fec_anatop_clock(0, ENET_50MHZ); +} + int board_late_init(void) { enum engicam_boards board_detected = IMX6Q_ICORE; @@ -133,6 +161,7 @@ int board_late_init(void) if (board_detected < 0) hang(); + fixup_enet_clock(board_detected); setenv_fdt_file(board_detected); #ifdef CONFIG_HW_WATCHDOG From patchwork Mon Dec 30 12:04:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 978 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 598B13F03F for ; Mon, 30 Dec 2019 13:04:32 +0100 (CET) Received: by mail-pg1-f200.google.com with SMTP id x189sf10290198pgd.9 for ; Mon, 30 Dec 2019 04:04:32 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1577707471; cv=pass; d=google.com; s=arc-20160816; b=QOQb2r0KCqdEiYOUdd4gJ2UsPljK4HfFa+h/Dd5b4ZHMXQXNnwP0f+MAiVCJdPpgf/ 6DINSz1cj2M6+G0hz4z5oeW9k8CfxvRnTFkUP/sacQTIfYxeHQmbNXGl/G7f/rjqLP0u IVGgi/JeDMAxWoi7LfeOUbUXFuZ73PnVycKbZGbQlGM52csHbBSjhwC0UyhQx9tkQyo9 DppqOADUw192cS2azof9Hw2MpZLcmna6KU+jQn0i3IY3CY8Ybj/wSoJ/aGfaVSak//PT 7Y066YVzjNwnWIvjVBTfwV8g0GiZFWcnMc0k9lECSqPUgxVbu2rucCw0zOATLgM8QZDE X4cA== 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=pnZMeFrWxfnEm0IX/aiP5bJ104kYS3wLIRENjrBofMw=; b=drU84I42hWz9wd8rIx0hAvBDtEiAlCeHrQXuu6qTEPoD0AXeEdop/OvH4PWocL30KY N2OGHYVAbKHp5MumtWIn7r4caBBJcltbuPSh68UpN85HCYCapDB3cCs4Ads2hFa1X8Tb tsYi5RwrwC3V9zaJUNC56gzTpX5ScFXPw1Q+cFvK+LSADDhcRqee/7XyKj1IeeCdfPaw 1g9eFYR5u0u/DWZBY1Bk/J+UkMa7oQ8gEA4eDF6vMLz9Ox+ze+04ADeF6a2uZTsYNiBb sBpbx2EsO0X8dfRLckSWwohdrlAc2b+he0wQxdBbNf5QCpCZHEqJsscE6/LwwkAfGdEj d47A== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=W1izjI5Y; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 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=pnZMeFrWxfnEm0IX/aiP5bJ104kYS3wLIRENjrBofMw=; b=QrXf7AjQomTe0B0vV4ObL65OCXNBDgtdnCT2nyIQFzuBQ03QeSdd+OYQT8Ca8p0DsR WGImbPhrDNKXoK1Q0yjFVg4nBpoqYFMRA/a08SqGtjlJ5i639TAHEPiHkGEJ2S9Biqnc TF8E8zRtRhrOqfRfQ01IXYuQwvB/QkM0Tm3uo= 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=pnZMeFrWxfnEm0IX/aiP5bJ104kYS3wLIRENjrBofMw=; b=lTMPwlhpAN7NaVoF1jkm/0dLl99uyRJS81cqpWB7/LLBcvlzIeF3T2rcuK8gdaFEAM CW96Za4tx1YVZM45C6wz5yYsRBDmw1Xve3NrEMsHqzKRavOxrocqPj8XMO85Y3Dbh9G+ kW1pSi5cgx7vklZY1u4xSi2FSUNn7jD4FAH9UNg0jCJJeYD055q2F70hfCv7lmkcelVh hYnib6oBlXvJh871R8Bog9ZZLbCLxYw6sXpvbXYzDfaBCh4/VfEzOivQIHfHrmn+fBZc xghaQMGZ0Pp90M28nJL7QoTzhWqCs9ajKXjjUVkc+q8c4DYAernhiGN4GPYCC78dvxCA reqA== X-Gm-Message-State: APjAAAW4NL/f2SKjCuUMsKV7ULGZMVP2nlmtSilczMrnZuNSBUmdACbt m+9nN9U46O4d5lXe8RHHqmCQ1Pzn X-Google-Smtp-Source: APXvYqy9ByGALsTwZczXF9Y1wWSHgcoJCxZBIWyAkxY2dHIYb80LVYD2eQ3HQ3ulLCOSjbl8IeBlsA== X-Received: by 2002:a17:902:c509:: with SMTP id o9mr67481455plx.112.1577707471082; Mon, 30 Dec 2019 04:04:31 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:902:b491:: with SMTP id y17ls9225938plr.16.gmail; Mon, 30 Dec 2019 04:04:30 -0800 (PST) X-Received: by 2002:a17:90a:b102:: with SMTP id z2mr45693783pjq.120.1577707470669; Mon, 30 Dec 2019 04:04:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577707470; cv=none; d=google.com; s=arc-20160816; b=F69Ccu2a+k+Ss1rj2ou0T+dycvmSQ1cSruhTFNL4RtEe8cYUs0cJWH+AIiV5UcbZhI 5+gNR8+vKyQnoZlaEzYkgLgve57sA9eT7dsUsq0O1bWT4bDpku0YR3ZhDdvzfdjmxtnw FRYSuFAgiUj8wA1zmBaV5TrUMgTMZdxcvZotcfJ1HYbqKoS0U3oYMeaJUy7JCH1Fhzfw wVtGhZnl3eTdNISfgRGjQNz7OPutykXlhDc82xb943PStkwKzqy4rsHqWB5l/9haVvef wdXQinplsOH+g3ZaowFA0z0ggBdTgcUbhEj/cGINIw/cMvwgg9H4NLvLR77sFquqxkOF ezbw== 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=lv99QpkTY/0XzA6DtGl2IE0jYrn8/Nhqp70v2CECJyE=; b=f7mWxcLEj9gqJN31Hs9fCkW+S+0rxmPuyvtw/zJAenlz/RMoIZEYmMeOlglCczpojc pmiQtg6fLA9uAOJUXxXVjcSk9Ei0KqJ07oXIB3LjHG6Z5n4EvoJ2zJPMFTWPwFD6VejN FF0cjGW/is0le1B3JPnCeUwiEQfmQO8vC+kzbLlR7VofbfQla/ZgPbdWqVDtSrK4gagM W/iY4ICB7elt0fE1LIeXHr5CovUswDXF5YCp6unBO1pzypacxPjMlGnAI7vVhvw7Z5Jh EnX/xKeh/Agu7k/5P7M3qQrGNLqcscfRyV9mIf5K+kOYic6mEUowd+C9ZgVLJQgXJuz8 fyEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=W1izjI5Y; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id m125sor44632365pga.25.2019.12.30.04.04.30 for (Google Transport Security); Mon, 30 Dec 2019 04:04:30 -0800 (PST) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a63:4416:: with SMTP id r22mr70751556pga.254.1577707470342; Mon, 30 Dec 2019 04:04:30 -0800 (PST) Received: from localhost.localdomain ([49.206.202.131]) by smtp.gmail.com with ESMTPSA id n7sm24552620pjq.8.2019.12.30.04.04.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2019 04:04:29 -0800 (PST) From: Jagan Teki To: Stefano Babic , Fabio Estevam , uboot-imx@nxp.com Cc: Michael Trimarchi , u-boot@lists.denx.de, linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH 3/8] configs: imx6-engicam: Drop fec phy address and mode Date: Mon, 30 Dec 2019 17:34:04 +0530 Message-Id: <20191230120409.884-4-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20191230120409.884-1-jagan@amarulasolutions.com> References: <20191230120409.884-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=W1izjI5Y; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 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: , From: Michael Trimarchi Now all the fec related phy properties are now accessible via dts. So drop the explicit config items from common config file, imx6-engicam.h Signed-off-by: Michael Trimarchi Signed-off-by: Jagan Teki --- include/configs/imx6-engicam.h | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h index 46529a61da..18327fb4c3 100644 --- a/include/configs/imx6-engicam.h +++ b/include/configs/imx6-engicam.h @@ -156,17 +156,6 @@ /* MTD device */ #endif -/* Ethernet */ -#ifdef CONFIG_FEC_MXC -# ifdef CONFIG_TARGET_MX6Q_ICORE_RQS -# define CONFIG_FEC_MXC_PHYADDR 3 -# define CONFIG_FEC_XCV_TYPE RGMII -# else -# define CONFIG_FEC_MXC_PHYADDR 0 -# define CONFIG_FEC_XCV_TYPE RMII -# endif -#endif - /* Falcon Mode */ #ifdef CONFIG_SPL_OS_BOOT # define CONFIG_SPL_FS_LOAD_ARGS_NAME "args" From patchwork Mon Dec 30 12:04:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 979 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 8D8E93F03F for ; Mon, 30 Dec 2019 13:04:35 +0100 (CET) Received: by mail-pj1-f71.google.com with SMTP id h2sf7936803pji.1 for ; Mon, 30 Dec 2019 04:04:35 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1577707474; cv=pass; d=google.com; s=arc-20160816; b=svj/lMRdM0Ip7GUK4a0SpdGWCUT7dhm5xHNffevX92SIcUiEUwErNxIP7OBQn/lrYe QcVRshnE3fB/ZrsFCm1JrnRCfMFTWxZpIREHCR7Kk+lRP2qdibMuc3IjF86oscZlfIqW Foz4sjh6tuJwbPA6rm1Id9pdL4DOm5fNAfB5L13lZVGsR/oTR7mFiPLpiG/mjEKobD10 JuYtVyfgXM6Kp9nd7zqY0PNwbZ8BS9uCRaCARdI9iL94mD0rDaamvsbmTFatQOP1aeEC 0zirvTDosq3/5wtT91DjSl4hG2NQVtA65MXgNpLRp0HrTxHESqqt0PFQ4BP+geQiJrP6 bX+w== 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=sLhp+ASF7tS8a5Mvu4LcHKfYEDSEe7ppdDF8ZlJnYm4=; b=KQKYX9Qp09ViZ1At69qeq9d8ZY33AwsAO/zB9aZ1lee3ibioTVJejc2fLaPvjlyPXg Yr3TNMZbH7704Vq4k5ffbw9h7c7+uMbWk36aoHPzXwClGwGPm8T6j2nJ9AadYvtRFjLT 7zNm1OK4uqxT/LxHQYMaihTKvjJIqaqJ29XB0FWqkjsPEIUQm1OdPFeYbhvMVfkmsRPS h/FabSctS5BgYnOqb+cqS+3KmlyKhqgTphORS+CznxH1mT7KOUJiDHVtAxBVWKREs3d3 OE6CMuhs9wQYmZnlQhn6nuRv8IMwYkDuXJZdXohBVVguZOk++uyppXoYjSJMeASXhwIR oi5w== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=l8GXdVPX; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 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=sLhp+ASF7tS8a5Mvu4LcHKfYEDSEe7ppdDF8ZlJnYm4=; b=Zllrbvy61p0eXgJJni+t39cTnKyNeW9oCwIIfFnXQT4RCPK+UI2VtHRnwl18LaP99i 14ouqGq0qdvI4YfPHJDUnbITHr5agxo+sTMKOVwJmIUiq2lDu+8c71kMwE1opi6fQcLd l+W2roovfRibcjd5+y2b+Ciw5Zp18cskVxYwc= 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=sLhp+ASF7tS8a5Mvu4LcHKfYEDSEe7ppdDF8ZlJnYm4=; b=VXQMzyh7ar4PgA0idoq+mZyi++9FpMqpkbOU1P0PIvlrllsC4Eq4EKlSF/UE8D0ez5 aetdoH9XpWh1MEpBnPtuJTFGDsXgmBhYl2ymjjGwyR8RPxt8z8FlqefQhCgnXKKy3gPT V+QnwDEq3HGeCV2CmKBQybEDmtxVE8X797zzvLmRr5UR5boNIrXfZxU+lZnKGdUzcKtU zmK+FmwLMuJ7fVhCT/yw7J0dNBopxuCBv+n+72P14kc1WzZmdUS8VBPemEjgF0RoMdPY FziQZm9zd0ELWxlCkgSMZSQ5de+j4G4f4BgQCQiLLHHvEHu1Dr9zb4RCre1Bp4Rap8GS azxQ== X-Gm-Message-State: APjAAAVzgOhCGEkY3Q8PPQ/i6e3HKOV1OZdy6gWIqt4UxrJ7aUDXV7S0 IgZ46TOyncgDM4SxZS8+26iGzk+Y X-Google-Smtp-Source: APXvYqx3ulupBBu668g1u9CxijmaAYqXE4jOBc4hFLkO+qO1PVBDbIk6ZrWiW4VQX4n3trtW3tL5ag== X-Received: by 2002:a63:753:: with SMTP id 80mr65876841pgh.95.1577707474343; Mon, 30 Dec 2019 04:04:34 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:902:8214:: with SMTP id x20ls6766163pln.15.gmail; Mon, 30 Dec 2019 04:04:34 -0800 (PST) X-Received: by 2002:a17:90a:17e5:: with SMTP id q92mr46698839pja.28.1577707473948; Mon, 30 Dec 2019 04:04:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577707473; cv=none; d=google.com; s=arc-20160816; b=p//UYdkEJ2ACWL+WE+A6J78C9sfckDF9sSdhlfuLyHtQ71HE+THVOJmCu1ppFVmWb+ Rkx4MTpo9Y3cGi+hrToht+yMpGEfNrhCu+Dfoja7G1Z3Z4klyFKMRG5KUjLtAOT3Qal8 HfCyfoJ53mWeyywsUIEg5iq8RKPrNyuVnl9hReHN5EAWmnytt0I3hTe5kFvoaezQ84nK wEnhQ9PD6/VOibF5ysKb16ndI0WCRFHMg7sZ9lAx90XES08tjA4gvda+KNu/LVsjz24g aT8TGYg9dyKmfEEEgQGPm9CPGWJcq6Fy2YTieqR4zdSwyUvc17a2JdDQyW4eUhQc8tSo bfog== 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=z15TVhsC6aVgAoY/1ECtIR0dastBo/t1/yTBeBel+xw=; b=W4slXOGa7zss5sfHzTrq8P896M3X8M8s9D9Id/KLARvs++UUrp4aGppCNvU4x9Wv8T EGHwZyRE413IUOsGfCCe2DNyvdavNlziDgjcpHSssz/h4DLzMOgA6ojnkyV9d1JRGaLn YGcuMgo1FVKH4B29xlSZocN+K8udMBHH/rJJHkGVMNh0MfH5oUFjdmxYfP3jA5oysQ8R dZOBT8T6rM8JEWMX3qZyNmYuTCFpbPkmB9pphRky4U3xwEP4DhzHjxWKtH4VByuXJ1Bc dWmSMcY+nAonHg4hi3riahwhaJjVu1PQQRII0Y2+ZdyyAUvAKK1UGwJWVyyvmMbkqIPa oR6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=l8GXdVPX; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id q15sor45079548pgs.22.2019.12.30.04.04.33 for (Google Transport Security); Mon, 30 Dec 2019 04:04:33 -0800 (PST) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a65:5cc2:: with SMTP id b2mr71242533pgt.51.1577707473641; Mon, 30 Dec 2019 04:04:33 -0800 (PST) Received: from localhost.localdomain ([49.206.202.131]) by smtp.gmail.com with ESMTPSA id n7sm24552620pjq.8.2019.12.30.04.04.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2019 04:04:33 -0800 (PST) From: Jagan Teki To: Stefano Babic , Fabio Estevam , uboot-imx@nxp.com Cc: Michael Trimarchi , u-boot@lists.denx.de, linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH 4/8] dt-bindings: sound: Add fsl-imx-audmux.h from v5.4 Date: Mon, 30 Dec 2019 17:34:05 +0530 Message-Id: <20191230120409.884-5-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20191230120409.884-1-jagan@amarulasolutions.com> References: <20191230120409.884-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=l8GXdVPX; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 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: , Sync fsl-imx-audmux.h from v5.4 linux-next. Signed-off-by: Michael Trimarchi Signed-off-by: Jagan Teki --- include/dt-bindings/sound/fsl-imx-audmux.h | 64 ++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 include/dt-bindings/sound/fsl-imx-audmux.h diff --git a/include/dt-bindings/sound/fsl-imx-audmux.h b/include/dt-bindings/sound/fsl-imx-audmux.h new file mode 100644 index 0000000000..15f138bebe --- /dev/null +++ b/include/dt-bindings/sound/fsl-imx-audmux.h @@ -0,0 +1,64 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __DT_FSL_IMX_AUDMUX_H +#define __DT_FSL_IMX_AUDMUX_H + +#define MX27_AUDMUX_HPCR1_SSI0 0 +#define MX27_AUDMUX_HPCR2_SSI1 1 +#define MX27_AUDMUX_HPCR3_SSI_PINS_4 2 +#define MX27_AUDMUX_PPCR1_SSI_PINS_1 3 +#define MX27_AUDMUX_PPCR2_SSI_PINS_2 4 +#define MX27_AUDMUX_PPCR3_SSI_PINS_3 5 + +#define MX31_AUDMUX_PORT1_SSI0 0 +#define MX31_AUDMUX_PORT2_SSI1 1 +#define MX31_AUDMUX_PORT3_SSI_PINS_3 2 +#define MX31_AUDMUX_PORT4_SSI_PINS_4 3 +#define MX31_AUDMUX_PORT5_SSI_PINS_5 4 +#define MX31_AUDMUX_PORT6_SSI_PINS_6 5 +#define MX31_AUDMUX_PORT7_SSI_PINS_7 6 + +#define MX51_AUDMUX_PORT1_SSI0 0 +#define MX51_AUDMUX_PORT2_SSI1 1 +#define MX51_AUDMUX_PORT3 2 +#define MX51_AUDMUX_PORT4 3 +#define MX51_AUDMUX_PORT5 4 +#define MX51_AUDMUX_PORT6 5 +#define MX51_AUDMUX_PORT7 6 + +/* + * TFCSEL/RFCSEL (i.MX27) or TFSEL/TCSEL/RFSEL/RCSEL (i.MX31/51/53/6Q) + * can be sourced from Rx/Tx. + */ +#define IMX_AUDMUX_RXFS 0x8 +#define IMX_AUDMUX_RXCLK 0x8 + +/* Register definitions for the i.MX21/27 Digital Audio Multiplexer */ +#define IMX_AUDMUX_V1_PCR_INMMASK(x) ((x) & 0xff) +#define IMX_AUDMUX_V1_PCR_INMEN (1 << 8) +#define IMX_AUDMUX_V1_PCR_TXRXEN (1 << 10) +#define IMX_AUDMUX_V1_PCR_SYN (1 << 12) +#define IMX_AUDMUX_V1_PCR_RXDSEL(x) (((x) & 0x7) << 13) +#define IMX_AUDMUX_V1_PCR_RFCSEL(x) (((x) & 0xf) << 20) +#define IMX_AUDMUX_V1_PCR_RCLKDIR (1 << 24) +#define IMX_AUDMUX_V1_PCR_RFSDIR (1 << 25) +#define IMX_AUDMUX_V1_PCR_TFCSEL(x) (((x) & 0xf) << 26) +#define IMX_AUDMUX_V1_PCR_TCLKDIR (1 << 30) +#define IMX_AUDMUX_V1_PCR_TFSDIR (1 << 31) + +/* Register definitions for the i.MX25/31/35/51 Digital Audio Multiplexer */ +#define IMX_AUDMUX_V2_PTCR_TFSDIR (1 << 31) +#define IMX_AUDMUX_V2_PTCR_TFSEL(x) (((x) & 0xf) << 27) +#define IMX_AUDMUX_V2_PTCR_TCLKDIR (1 << 26) +#define IMX_AUDMUX_V2_PTCR_TCSEL(x) (((x) & 0xf) << 22) +#define IMX_AUDMUX_V2_PTCR_RFSDIR (1 << 21) +#define IMX_AUDMUX_V2_PTCR_RFSEL(x) (((x) & 0xf) << 17) +#define IMX_AUDMUX_V2_PTCR_RCLKDIR (1 << 16) +#define IMX_AUDMUX_V2_PTCR_RCSEL(x) (((x) & 0xf) << 12) +#define IMX_AUDMUX_V2_PTCR_SYN (1 << 11) + +#define IMX_AUDMUX_V2_PDCR_RXDSEL(x) (((x) & 0x7) << 13) +#define IMX_AUDMUX_V2_PDCR_TXRXEN (1 << 12) +#define IMX_AUDMUX_V2_PDCR_MODE(x) (((x) & 0x3) << 8) +#define IMX_AUDMUX_V2_PDCR_INMMASK(x) ((x) & 0xff) + +#endif /* __DT_FSL_IMX_AUDMUX_H */ From patchwork Mon Dec 30 12:04:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 980 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id B0CC93F03F for ; Mon, 30 Dec 2019 13:04:40 +0100 (CET) Received: by mail-pl1-f199.google.com with SMTP id o12sf14807645pll.7 for ; Mon, 30 Dec 2019 04:04:40 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1577707479; cv=pass; d=google.com; s=arc-20160816; b=IlnsKE3gzA8JS490wTBN9bdBCufeYOYI4/F0nb/QOMXcP0M3p2nA0GYAyXIT3z4IPi vxbrv2JaYjcdKycT5mSJ/0uFFGf8OkJ90wumtHxs9GG7D7kZ+uqLTuITXEorVl5FbGai bFuA1GOBF6FdoENuiY0PpaCUobWZYFGs1uwKLVWQlsr3mdKJ/vi82qw2gyCWvY6Rh124 RX2j1AqIdcMHrwvQnN2DZFx1ToVeMhJXd6EnLkqVkdRtc2SU3wWlwFZk5ZMHWnnaL2RZ akeE2p5G3racejjEzrjlIlNjklnif5wxLE3sOkoXO2ZoyoHa1Be/FF9hxmubUJbLv09y UuZQ== 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=N3hGBJcJgFFPcHdNwC8zPwA1dHQYGzr4Zc9dnPBNiO0=; b=XgKQiu05obK7eUHKBJNOuMlyGwSqn1SOLVAaoyTsP1WFbNFzh57K3aLsMiWep2JPow BVKjkEo5sqHz7aFzPnKZrt3tF7+QPxZPFcspvPRrllHDB6uiK2MTCpE3wGSyS/klSxEd +NqVAjKrFSVE4h3FuhBmLVcW+plDRAEpddObqLW9KVumolRA2atZJNwAevmUj4hYNkX3 N+OWAM+/q/4Did/t5xRfug1/I8KCXP9sCEWAffMrFTY/femrOIpmWw8pWUPIGUAIRMcM 932PPZ1bRUj9JNWYB/SHdPr/lPcZOAN6vC3r9wdjF4shHnEICHWUXijVwGXmoJmt0CcL S10Q== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=ENf7KWw+; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 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=N3hGBJcJgFFPcHdNwC8zPwA1dHQYGzr4Zc9dnPBNiO0=; b=C2Cav+SOWfR6OODeapk90Da5HppyOlakjgbK+OFX3QOAEFUcVaRVQRIEG5UWVrDaGE elYtxsTMqzSS6mlgHCtajbyIJNYPQQhhjunQ/O0wFAbfSiWjn9hzXH7O1qLG4bwIwOjZ 4zbe2Z8YJc0+VqdYnq4GEAISFTVFs+ByygojQ= 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=N3hGBJcJgFFPcHdNwC8zPwA1dHQYGzr4Zc9dnPBNiO0=; b=S6PIXLOW/NvsvfgIW+5ir86FygC0L2W3i64y/NzAeX72zl3iFR8GXuyGVgpPU1rqTm 8MIbs8eXyR+kpjyCxTsKPXhU99AXxr1UlzGieFrumgfqQviCn82q/QZ3HtkWAHn+GTT6 FxzJRjtMz23rUTjDfcRZuqzzKg4IEKZcfK+5deEl/4x+ZGsei8ReWU7Ob+AcXHitxSvk Esj1RubMzqzzhH77+Vr6EtKEdvTlQT10S6pZjSz/UbMu0jddPy2UOZyS/OlA8IqkQegc 9upqv3PeDeRw6ZkvvfOBGnt0+fYQWKxmpT40MCvsTCkL2fqO660pepjcOePB0hKA0KKP SgKA== X-Gm-Message-State: APjAAAXTqoSko70xV1lS+APA224Yez2Q/f5pjCBDAXLhe8kTqYQ+9S5G DsmUL6dtQOz5KWNcgAxWvwG7uLq9 X-Google-Smtp-Source: APXvYqz5kVLRlxniF0mszoElEMSZXo2ZMbpBesdEJh1LP8vMANgS7DVC22GhJLRO0CTz8OEUScCLxA== X-Received: by 2002:a17:90a:21d1:: with SMTP id q75mr47668154pjc.0.1577707479306; Mon, 30 Dec 2019 04:04:39 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:90b:28f:: with SMTP id az15ls6741590pjb.3.gmail; Mon, 30 Dec 2019 04:04:38 -0800 (PST) X-Received: by 2002:a17:90b:344f:: with SMTP id lj15mr47117637pjb.0.1577707478681; Mon, 30 Dec 2019 04:04:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577707478; cv=none; d=google.com; s=arc-20160816; b=MfW6tIaeVwVGGTa0kCqgMzVzm5MfBJUWxUt23Gvfk4lc3tK91ls/cdPimD61DGDKrr JH17/ql74Upq8S2fIRwMv7RlK+M3TXq2Fbpq6e58BuQg1gS3GQBrtAeo3R/qAvhqRjGo tUb97KyqeEHGSEPB5oxqOf6jsxvxQU6EbVd6qTNH36XH8ziAA+dxklj7he0668qPSBNB VVpXUTMTjC3ra4uO5hOJwFCc6pp3uTCV6W86zLFqiLHuFTjCJOc8+X8o5t6NaUq65M1h ysdZBLW+QEgruo74ryJNrCeAiHb2DUXxRJGZerjWJwWZhEASQDhIAQNPR0uzX5DHPZYt 3IWQ== 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=s1XwcOzqKWpIkIumqwmda/IpaxxLYeP1MROFO+L0ZI8=; b=yGedzRrvT9FUVGHa+0MHOtMr702R2sVhgIxys9Nj+lHfDpjvJu17y071v19J0KGa74 XSpllpT0qfewEIPDkSZJzeUatRDIByja2BDampXZQ1qGln5paCuDuMbxbRLqnsGOwpYc g8fyulyqRxb2Q/NpDBlvIWGWHZrw81Pftkt6vdteXbzWg2L+2KpXqvMNqfcFnYo/h6Z+ oDHkdPh0kebKyggjkVVBJOCSNZNUkSKO6U/ROorkW3aULbYY0SmyfENZgKjkGbEsrlwQ WdDIh/GaeruIahl2L+fTuq4cFinh+GInsKdC9SyUEbzSma86xP5Ju9LMtW9t+mqNPb5L rVsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=ENf7KWw+; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id j12sor45195492pls.0.2019.12.30.04.04.38 for (Google Transport Security); Mon, 30 Dec 2019 04:04:38 -0800 (PST) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a17:902:708c:: with SMTP id z12mr46101409plk.15.1577707477676; Mon, 30 Dec 2019 04:04:37 -0800 (PST) Received: from localhost.localdomain ([49.206.202.131]) by smtp.gmail.com with ESMTPSA id n7sm24552620pjq.8.2019.12.30.04.04.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2019 04:04:37 -0800 (PST) From: Jagan Teki To: Stefano Babic , Fabio Estevam , uboot-imx@nxp.com Cc: Michael Trimarchi , u-boot@lists.denx.de, linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH 5/8] ARM: dts: icorem6: Sync engicam device trees from v5.4 Date: Mon, 30 Dec 2019 17:34:06 +0530 Message-Id: <20191230120409.884-6-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20191230120409.884-1-jagan@amarulasolutions.com> References: <20191230120409.884-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=ENf7KWw+; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 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: , Sync Engicam device tree file from v5.4 linux-next. Signed-off-by: Michael Trimarchi Signed-off-by: Jagan Teki --- arch/arm/dts/imx6dl-icore-mipi.dts | 11 +- arch/arm/dts/imx6dl-icore-rqs.dts | 43 +--- arch/arm/dts/imx6dl-icore.dts | 47 +--- arch/arm/dts/imx6q-icore-mipi.dts | 19 +- arch/arm/dts/imx6q-icore-ofcap10.dts | 40 ++++ arch/arm/dts/imx6q-icore-ofcap12.dts | 43 ++++ arch/arm/dts/imx6q-icore-rqs.dts | 43 +--- arch/arm/dts/imx6q-icore.dts | 72 +++--- arch/arm/dts/imx6qdl-icore-1.5.dtsi | 34 +++ arch/arm/dts/imx6qdl-icore-rqs.dtsi | 326 +++++++++++++++++++++++---- arch/arm/dts/imx6qdl-icore.dtsi | 255 +++++++++++++++++---- 11 files changed, 688 insertions(+), 245 deletions(-) create mode 100644 arch/arm/dts/imx6q-icore-ofcap10.dts create mode 100644 arch/arm/dts/imx6q-icore-ofcap12.dts create mode 100644 arch/arm/dts/imx6qdl-icore-1.5.dtsi diff --git a/arch/arm/dts/imx6dl-icore-mipi.dts b/arch/arm/dts/imx6dl-icore-mipi.dts index 39bdf2d55b..e43bccb78a 100644 --- a/arch/arm/dts/imx6dl-icore-mipi.dts +++ b/arch/arm/dts/imx6dl-icore-mipi.dts @@ -1,7 +1,7 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: GPL-2.0 OR X11 /* - * Copyright (C) 2017 Engicam S.r.l. - * Copyright (C) 2017 Amarula Solutions B.V. + * Copyright (C) 2018 Engicam S.r.l. + * Copyright (C) 2018 Amarula Solutions B.V. * Author: Jagan Teki */ @@ -15,6 +15,11 @@ compatible = "engicam,imx6-icore", "fsl,imx6dl"; }; +&hdmi { + ddc-i2c-bus = <&i2c2>; + status = "okay"; +}; + &usdhc3 { status = "okay"; }; diff --git a/arch/arm/dts/imx6dl-icore-rqs.dts b/arch/arm/dts/imx6dl-icore-rqs.dts index 820e66c724..73d710d34b 100644 --- a/arch/arm/dts/imx6dl-icore-rqs.dts +++ b/arch/arm/dts/imx6dl-icore-rqs.dts @@ -1,42 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 OR X11 /* - * Copyright (C) 2015 Amarula Solutions B.V. - * - * This file is dual-licensed: you can use it either under the terms - * of the GPL or the X11 license, at your option. Note that this dual - * licensing only applies to this file, and not this project as a - * whole. - * - * a) This file is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - * This file is distributed in the hope that it will be useful - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * Or, alternatively - * - * b) Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. + * Copyright (C) 2016 Amarula Solutions B.V. + * Copyright (C) 2016 Engicam S.r.l. */ /dts-v1/; @@ -46,5 +11,5 @@ / { model = "Engicam i.CoreM6 DualLite/Solo RQS Starter Kit"; - compatible = "engicam,imx6-icore-rqs", "fsl,imx6q"; + compatible = "engicam,imx6-icore-rqs", "fsl,imx6dl"; }; diff --git a/arch/arm/dts/imx6dl-icore.dts b/arch/arm/dts/imx6dl-icore.dts index aec332c14a..80fa60607a 100644 --- a/arch/arm/dts/imx6dl-icore.dts +++ b/arch/arm/dts/imx6dl-icore.dts @@ -1,43 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 OR X11 /* * Copyright (C) 2016 Amarula Solutions B.V. * Copyright (C) 2016 Engicam S.r.l. - * - * This file is dual-licensed: you can use it either under the terms - * of the GPL or the X11 license, at your option. Note that this dual - * licensing only applies to this file, and not this project as a - * whole. - * - * a) This file is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - * This file is distributed in the hope that it will be useful - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * Or, alternatively - * - * b) Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ /dts-v1/; @@ -57,3 +21,12 @@ &can2 { status = "okay"; }; + +&i2c1 { + max11801: touchscreen@48 { + compatible = "maxim,max11801"; + reg = <0x48>; + interrupt-parent = <&gpio3>; + interrupts = <31 IRQ_TYPE_EDGE_FALLING>; + }; +}; diff --git a/arch/arm/dts/imx6q-icore-mipi.dts b/arch/arm/dts/imx6q-icore-mipi.dts index e7c5616a63..d51745268d 100644 --- a/arch/arm/dts/imx6q-icore-mipi.dts +++ b/arch/arm/dts/imx6q-icore-mipi.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: GPL-2.0 OR X11 /* * Copyright (C) 2017 Engicam S.r.l. * Copyright (C) 2017 Amarula Solutions B.V. @@ -8,13 +8,26 @@ /dts-v1/; #include "imx6q.dtsi" -#include "imx6qdl-icore.dtsi" +#include "imx6qdl-icore-1.5.dtsi" / { - model = "Engicam i.CoreM6 Quad/Dual MIPI Starter Kit"; + model = "Engicam i.CoreM6 1.5 Quad/Dual MIPI Starter Kit"; compatible = "engicam,imx6-icore", "fsl,imx6q"; }; +&hdmi { + ddc-i2c-bus = <&i2c2>; + status = "okay"; +}; + +&mipi_csi { + status = "okay"; +}; + +&ov5640 { + status = "okay"; +}; + &usdhc3 { status = "okay"; }; diff --git a/arch/arm/dts/imx6q-icore-ofcap10.dts b/arch/arm/dts/imx6q-icore-ofcap10.dts new file mode 100644 index 0000000000..81cc346dd1 --- /dev/null +++ b/arch/arm/dts/imx6q-icore-ofcap10.dts @@ -0,0 +1,40 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (C) 2016 Amarula Solutions B.V. + * Copyright (C) 2016 Engicam S.r.l. + */ + +/dts-v1/; + +#include "imx6q.dtsi" +#include "imx6qdl-icore.dtsi" + +/ { + model = "Engicam i.CoreM6 Quad/Dual OpenFrame Capacitive touch 10.1 Kit"; + compatible = "engicam,imx6-icore", "fsl,imx6q"; +}; + +&ldb { + status = "okay"; + + lvds-channel@0 { + fsl,data-mapping = "spwg"; + fsl,data-width = <24>; + status = "okay"; + + display-timings { + native-mode = <&timing0>; + timing0: timing0 { + clock-frequency = <60000000>; + hactive = <1280>; + vactive = <800>; + hback-porch = <40>; + hfront-porch = <40>; + vback-porch = <10>; + vfront-porch = <3>; + hsync-len = <80>; + vsync-len = <10>; + }; + }; + }; +}; diff --git a/arch/arm/dts/imx6q-icore-ofcap12.dts b/arch/arm/dts/imx6q-icore-ofcap12.dts new file mode 100644 index 0000000000..241811c52b --- /dev/null +++ b/arch/arm/dts/imx6q-icore-ofcap12.dts @@ -0,0 +1,43 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (C) 2016 Amarula Solutions B.V. + * Copyright (C) 2016 Engicam S.r.l. + */ + +/dts-v1/; + +#include "imx6q.dtsi" +#include "imx6qdl-icore.dtsi" + +/ { + model = "Engicam i.CoreM6 Quad/Dual OpenFrame Capacitive touch 12 Kit"; + compatible = "engicam,imx6-icore", "fsl,imx6q"; + + panel { + compatible = "koe,tx31d200vm0baa"; + backlight = <&backlight_lvds>; + + port { + panel_in: endpoint { + remote-endpoint = <&lvds0_out>; + }; + }; + }; +}; + +&ldb { + status = "okay"; + + lvds-channel@0 { + reg = <0>; + status = "okay"; + + port@4 { + reg = <4>; + + lvds0_out: endpoint { + remote-endpoint = <&panel_in>; + }; + }; + }; +}; diff --git a/arch/arm/dts/imx6q-icore-rqs.dts b/arch/arm/dts/imx6q-icore-rqs.dts index 9fa6ba097d..cf6ba724f4 100644 --- a/arch/arm/dts/imx6q-icore-rqs.dts +++ b/arch/arm/dts/imx6q-icore-rqs.dts @@ -1,42 +1,7 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Copyright (C) 2015 Amarula Solutions B.V. - * - * This file is dual-licensed: you can use it either under the terms - * of the GPL or the X11 license, at your option. Note that this dual - * licensing only applies to this file, and not this project as a - * whole. - * - * a) This file is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - * This file is distributed in the hope that it will be useful - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * Or, alternatively - * - * b) Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. + * Copyright (C) 2015 Engicam S.r.l. */ /dts-v1/; @@ -48,3 +13,7 @@ model = "Engicam i.CoreM6 Quad/Dual RQS Starter Kit"; compatible = "engicam,imx6-icore-rqs", "fsl,imx6q"; }; + +&sata { + status = "okay"; +}; diff --git a/arch/arm/dts/imx6q-icore.dts b/arch/arm/dts/imx6q-icore.dts index 025f54350c..fe28c3cf54 100644 --- a/arch/arm/dts/imx6q-icore.dts +++ b/arch/arm/dts/imx6q-icore.dts @@ -1,43 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 OR X11 /* * Copyright (C) 2016 Amarula Solutions B.V. * Copyright (C) 2016 Engicam S.r.l. - * - * This file is dual-licensed: you can use it either under the terms - * of the GPL or the X11 license, at your option. Note that this dual - * licensing only applies to this file, and not this project as a - * whole. - * - * a) This file is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - * This file is distributed in the hope that it will be useful - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * Or, alternatively - * - * b) Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ /dts-v1/; @@ -57,3 +21,37 @@ &can2 { status = "okay"; }; + +&i2c1 { + max11801: touchscreen@48 { + compatible = "maxim,max11801"; + reg = <0x48>; + interrupt-parent = <&gpio3>; + interrupts = <31 IRQ_TYPE_EDGE_FALLING>; + }; +}; + +&ldb { + status = "okay"; + + lvds-channel@0 { + fsl,data-mapping = "spwg"; + fsl,data-width = <18>; + status = "okay"; + + display-timings { + native-mode = <&timing0>; + timing0: timing0 { + clock-frequency = <60000000>; + hactive = <800>; + vactive = <480>; + hback-porch = <30>; + hfront-porch = <30>; + vback-porch = <5>; + vfront-porch = <5>; + hsync-len = <64>; + vsync-len = <20>; + }; + }; + }; +}; diff --git a/arch/arm/dts/imx6qdl-icore-1.5.dtsi b/arch/arm/dts/imx6qdl-icore-1.5.dtsi new file mode 100644 index 0000000000..d91d46b589 --- /dev/null +++ b/arch/arm/dts/imx6qdl-icore-1.5.dtsi @@ -0,0 +1,34 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Jacopo Mondi + */ + +#include "imx6qdl-icore.dtsi" + +&iomuxc { + pinctrl_enet: enetgrp { + fsl,pins = < + MX6QDL_PAD_ENET_CRS_DV__ENET_RX_EN 0x1b0b0 + MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0b0 + MX6QDL_PAD_ENET_TX_EN__ENET_TX_EN 0x1b0b0 + MX6QDL_PAD_ENET_RXD1__ENET_RX_DATA1 0x1b0b0 + MX6QDL_PAD_ENET_RXD0__ENET_RX_DATA0 0x1b0b0 + MX6QDL_PAD_ENET_TXD1__ENET_TX_DATA1 0x1b0b0 + MX6QDL_PAD_ENET_TXD0__ENET_TX_DATA0 0x1b0b0 + MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0 + MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0 + MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x1b0b0 + >; + }; +}; + +&fec { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_enet>; + phy-reset-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>; + clocks = <&clks IMX6QDL_CLK_ENET>, + <&clks IMX6QDL_CLK_ENET>, + <&clks IMX6QDL_CLK_ENET_REF>; + phy-mode = "rmii"; + status = "okay"; +}; diff --git a/arch/arm/dts/imx6qdl-icore-rqs.dtsi b/arch/arm/dts/imx6qdl-icore-rqs.dtsi index d797a034f7..a4217f564a 100644 --- a/arch/arm/dts/imx6qdl-icore-rqs.dtsi +++ b/arch/arm/dts/imx6qdl-icore-rqs.dtsi @@ -1,56 +1,161 @@ +// SPDX-License-Identifier: GPL-2.0 OR X11 /* * Copyright (C) 2015 Amarula Solutions B.V. - * - * This file is dual-licensed: you can use it either under the terms - * of the GPL or the X11 license, at your option. Note that this dual - * licensing only applies to this file, and not this project as a - * whole. - * - * a) This file is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - * This file is distributed in the hope that it will be useful - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * Or, alternatively - * - * b) Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. + * Copyright (C) 2015 Engicam S.r.l. */ #include #include +#include / { - aliases { - mmc1 = &usdhc3; - mmc2 = &usdhc4; + memory@10000000 { + device_type = "memory"; + reg = <0x10000000 0x80000000>; }; - memory { - reg = <0x10000000 0x80000000>; + reg_1p8v: regulator-1p8v { + compatible = "regulator-fixed"; + regulator-name = "1P8V"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-boot-on; + regulator-always-on; + }; + + reg_2p5v: regulator-2p5v { + compatible = "regulator-fixed"; + regulator-name = "2P5V"; + regulator-min-microvolt = <2500000>; + regulator-max-microvolt = <2500000>; + regulator-boot-on; + regulator-always-on; + }; + + reg_3p3v: regulator-3p3v { + compatible = "regulator-fixed"; + regulator-name = "3P3V"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + regulator-always-on; + }; + + reg_sd3_vmmc: regulator-sd3-vmmc { + compatible = "regulator-fixed"; + regulator-name = "P3V3_SD3_SWITCHED"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + gpio = <&gpio1 4 GPIO_ACTIVE_LOW>; + enable-active-high; + }; + + reg_sd4_vmmc: regulator-sd4-vmmc { + compatible = "regulator-fixed"; + regulator-name = "P3V3_SD4_SWITCHED"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + regulator-always-on; + }; + + reg_usb_h1_vbus: regulator-usb-h1-vbus { + compatible = "regulator-fixed"; + regulator-name = "usb_h1_vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-boot-on; + regulator-always-on; + }; + + reg_usb_otg_vbus: regulator-usb-otg-vbus { + compatible = "regulator-fixed"; + regulator-name = "usb_otg_vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-boot-on; + regulator-always-on; + }; + + usb_hub: usb-hub { + compatible = "smsc,usb3503a"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usbhub>; + reset-gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + clocks = <&clks IMX6QDL_CLK_LVDS2_GATE>; + clock-names = "refclk"; + }; + + sound { + compatible = "simple-audio-card"; + simple-audio-card,name = "imx6qdl-icore-rqs-sgtl5000"; + simple-audio-card,format = "i2s"; + simple-audio-card,bitclock-master = <&dailink_master>; + simple-audio-card,frame-master = <&dailink_master>; + simple-audio-card,widgets = + "Microphone", "Mic Jack", + "Headphone", "Headphone Jack", + "Line", "Line In Jack", + "Speaker", "Line Out Jack", + "Speaker", "Ext Spk"; + simple-audio-card,routing = + "MIC_IN", "Mic Jack", + "Mic Jack", "Mic Bias", + "Headphone Jack", "HP_OUT"; + + simple-audio-card,cpu { + sound-dai = <&ssi1>; + }; + + dailink_master: simple-audio-card,codec { + sound-dai = <&sgtl5000>; + }; + }; +}; + +&audmux { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_audmux>; + status = "okay"; + + audmux_ssi1 { + fsl,audmux-port = ; + fsl,port-config = < + (IMX_AUDMUX_V2_PTCR_TFSDIR | + IMX_AUDMUX_V2_PTCR_TFSEL(MX51_AUDMUX_PORT4) | + IMX_AUDMUX_V2_PTCR_TCLKDIR | + IMX_AUDMUX_V2_PTCR_TCSEL(MX51_AUDMUX_PORT4) | + IMX_AUDMUX_V2_PTCR_SYN) + IMX_AUDMUX_V2_PDCR_RXDSEL(MX51_AUDMUX_PORT4) + >; }; + + audmux_aud4 { + fsl,audmux-port = ; + fsl,port-config = < + IMX_AUDMUX_V2_PTCR_SYN + IMX_AUDMUX_V2_PDCR_RXDSEL(MX51_AUDMUX_PORT1_SSI0) + >; + }; +}; + +&can1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_can1>; + xceiver-supply = <®_3p3v>; + status = "okay"; +}; + +&can2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_can2>; + xceiver-supply = <®_3p3v>; + status = "okay"; +}; + +&clks { + assigned-clocks = <&clks IMX6QDL_CLK_LVDS2_SEL>; + assigned-clock-parents = <&clks IMX6QDL_CLK_OSC>; }; &fec { @@ -61,7 +166,11 @@ status = "okay"; mdio { - eth_phy: ethernet-phy { + #address-cells = <1>; + #size-cells = <0>; + + eth_phy: ethernet-phy@0 { + reg = <0x0>; rxc-skew-ps = <1140>; txc-skew-ps = <1140>; txen-skew-ps = <600>; @@ -96,6 +205,28 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c3>; status = "okay"; + + sgtl5000: codec@a { + #sound-dai-cells = <0>; + compatible = "fsl,sgtl5000"; + reg = <0x0a>; + clocks = <&clks IMX6QDL_CLK_CKO>; + VDDA-supply = <®_2p5v>; + VDDIO-supply = <®_3p3v>; + VDDD-supply = <®_1p8v>; + }; +}; + +&pcie { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pcie>; + reset-gpio = <&gpio3 29 GPIO_ACTIVE_LOW>; + status = "okay"; +}; + +&ssi1 { + fsl,mode = "i2s-slave"; + status = "okay"; }; &uart4 { @@ -104,10 +235,36 @@ status = "okay"; }; -&usdhc3 { +&usbh1 { + vbus-supply = <®_usb_h1_vbus>; + disable-over-current; + clocks = <&clks IMX6QDL_CLK_USBOH3>; + status = "okay"; +}; + +&usbotg { + vbus-supply = <®_usb_otg_vbus>; pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usbotg>; + disable-over-current; + status = "okay"; +}; + +&usdhc1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc1>; + no-1-8-v; + status = "okay"; +}; + +&usdhc3 { + pinctrl-names = "default", "state_100mhz", "state_200mhz"; pinctrl-0 = <&pinctrl_usdhc3>; + pinctrl-1 = <&pinctrl_usdhc3_100mhz>; + pinctrl-2 = <&pinctrl_usdhc3_200mhz>; + vmcc-supply = <®_sd3_vmmc>; cd-gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; + bus-width = <4>; no-1-8-v; status = "okay"; }; @@ -117,13 +274,23 @@ pinctrl-0 = <&pinctrl_usdhc4>; pinctrl-1 = <&pinctrl_usdhc4_100mhz>; pinctrl-2 = <&pinctrl_usdhc4_200mhz>; - bus-witdh = <8>; + vmcc-supply = <®_sd4_vmmc>; + bus-width = <8>; no-1-8-v; non-removable; status = "okay"; }; &iomuxc { + pinctrl_audmux: audmuxgrp { + fsl,pins = < + MX6QDL_PAD_DISP0_DAT20__AUD4_TXC 0x130b0 + MX6QDL_PAD_DISP0_DAT21__AUD4_TXD 0x110b0 + MX6QDL_PAD_DISP0_DAT22__AUD4_TXFS 0x130b0 + MX6QDL_PAD_DISP0_DAT23__AUD4_RXD 0x130b0 + >; + }; + pinctrl_enet: enetgrp { fsl,pins = < MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0 @@ -145,6 +312,20 @@ >; }; + pinctrl_can1: can1grp { + fsl,pins = < + MX6QDL_PAD_KEY_ROW2__FLEXCAN1_RX 0x1b020 + MX6QDL_PAD_KEY_COL2__FLEXCAN1_TX 0x1b020 + >; + }; + + pinctrl_can2: can2grp { + fsl,pins = < + MX6QDL_PAD_KEY_COL4__FLEXCAN2_TX 0x1b020 + MX6QDL_PAD_KEY_ROW4__FLEXCAN2_RX 0x1b020 + >; + }; + pinctrl_i2c1: i2c1grp { fsl,pins = < MX6QDL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1 @@ -163,6 +344,13 @@ fsl,pins = < MX6QDL_PAD_GPIO_5__I2C3_SCL 0x4001b8b1 MX6QDL_PAD_EIM_D18__I2C3_SDA 0x4001b8b1 + MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x130b0 + >; + }; + + pinctrl_pcie: pciegrp { + fsl,pins = < + MX6QDL_PAD_EIM_D29__GPIO3_IO29 0x1f059 /* PCIe Reset */ >; }; @@ -173,6 +361,29 @@ >; }; + pinctrl_usbhub: usbhubgrp { + fsl,pins = < + MX6QDL_PAD_GPIO_6__GPIO1_IO06 0x1f059 /* HUB USB Reset */ + >; + }; + + pinctrl_usbotg: usbotggrp { + fsl,pins = < + MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059 + >; + }; + + pinctrl_usdhc1: usdhc1grp { + fsl,pins = < + MX6QDL_PAD_SD1_CMD__SD1_CMD 0x17071 + MX6QDL_PAD_SD1_CLK__SD1_CLK 0x10071 + MX6QDL_PAD_SD1_DAT0__SD1_DATA0 0x17071 + MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x17071 + MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x17071 + MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x17071 + >; + }; + pinctrl_usdhc3: usdhc3grp { fsl,pins = < MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17070 @@ -181,6 +392,30 @@ MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17070 MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17070 MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17070 + MX6QDL_PAD_GPIO_1__GPIO1_IO01 0x1f059 /* CD */ + MX6QDL_PAD_GPIO_4__GPIO1_IO04 0x1f059 /* PWR */ + >; + }; + + pinctrl_usdhc3_100mhz: usdhc3grp_100mhz { + fsl,pins = < + MX6QDL_PAD_SD3_CMD__SD3_CMD 0x170B1 + MX6QDL_PAD_SD3_CLK__SD3_CLK 0x100B1 + MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x170B1 + MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x170B1 + MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x170B1 + MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x170B1 + >; + }; + + pinctrl_usdhc3_200mhz: usdhc3grp_200mhz { + fsl,pins = < + MX6QDL_PAD_SD3_CMD__SD3_CMD 0x170F9 + MX6QDL_PAD_SD3_CLK__SD3_CLK 0x100F9 + MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x170F9 + MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x170F9 + MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x170F9 + MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x170F9 >; }; @@ -228,5 +463,4 @@ MX6QDL_PAD_SD4_DAT7__SD4_DATA7 0x170F9 >; }; - }; diff --git a/arch/arm/dts/imx6qdl-icore.dtsi b/arch/arm/dts/imx6qdl-icore.dtsi index 5eccda800d..7814f1ef08 100644 --- a/arch/arm/dts/imx6qdl-icore.dtsi +++ b/arch/arm/dts/imx6qdl-icore.dtsi @@ -1,55 +1,46 @@ +// SPDX-License-Identifier: GPL-2.0 OR X11 /* * Copyright (C) 2016 Amarula Solutions B.V. * Copyright (C) 2016 Engicam S.r.l. - * - * This file is dual-licensed: you can use it either under the terms - * of the GPL or the X11 license, at your option. Note that this dual - * licensing only applies to this file, and not this project as a - * whole. - * - * a) This file is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - * This file is distributed in the hope that it will be useful - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * Or, alternatively - * - * b) Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ #include #include +#include / { - aliases { - mmc1 = &usdhc3; + memory@10000000 { + device_type = "memory"; + reg = <0x10000000 0x80000000>; }; - memory { - reg = <0x10000000 0x80000000>; + chosen { + stdout-path = &uart4; + }; + + backlight_lvds: backlight-lvds { + compatible = "pwm-backlight"; + pwms = <&pwm3 0 100000>; + brightness-levels = <0 4 8 16 32 64 128 255>; + default-brightness-level = <7>; + }; + + reg_1p8v: regulator-1p8v { + compatible = "regulator-fixed"; + regulator-name = "1P8V"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-boot-on; + regulator-always-on; + }; + + reg_2p5v: regulator-2p5v { + compatible = "regulator-fixed"; + regulator-name = "2P5V"; + regulator-min-microvolt = <2500000>; + regulator-max-microvolt = <2500000>; + regulator-boot-on; + regulator-always-on; }; reg_3p3v: regulator-3p3v { @@ -60,6 +51,83 @@ regulator-boot-on; regulator-always-on; }; + + reg_usb_h1_vbus: regulator-usb-h1-vbus { + compatible = "regulator-fixed"; + regulator-name = "usb_h1_vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-boot-on; + regulator-always-on; + }; + + reg_usb_otg_vbus: regulator-usb-otg-vbus { + compatible = "regulator-fixed"; + regulator-name = "usb_otg_vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-boot-on; + regulator-always-on; + }; + + rmii_clk: clock-rmii-clk { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <25000000>; /* 25MHz for example */ + }; + + sound { + compatible = "simple-audio-card"; + simple-audio-card,name = "imx6qdl-icore-sgtl5000"; + simple-audio-card,format = "i2s"; + simple-audio-card,bitclock-master = <&dailink_master>; + simple-audio-card,frame-master = <&dailink_master>; + simple-audio-card,widgets = + "Microphone", "Mic Jack", + "Headphone", "Headphone Jack", + "Line", "Line In Jack", + "Speaker", "Line Out Jack", + "Speaker", "Ext Spk"; + simple-audio-card,routing = + "MIC_IN", "Mic Jack", + "Mic Jack", "Mic Bias", + "Headphone Jack", "HP_OUT"; + + simple-audio-card,cpu { + sound-dai = <&ssi1>; + }; + + dailink_master: simple-audio-card,codec { + sound-dai = <&sgtl5000>; + }; + }; +}; + +&audmux { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_audmux>; + status = "okay"; + + + audmux_ssi1 { + fsl,audmux-port = ; + fsl,port-config = < + (IMX_AUDMUX_V2_PTCR_TFSDIR | + IMX_AUDMUX_V2_PTCR_TFSEL(MX51_AUDMUX_PORT4) | + IMX_AUDMUX_V2_PTCR_TCLKDIR | + IMX_AUDMUX_V2_PTCR_TCSEL(MX51_AUDMUX_PORT4) | + IMX_AUDMUX_V2_PTCR_SYN) + IMX_AUDMUX_V2_PDCR_RXDSEL(MX51_AUDMUX_PORT4) + >; + }; + + audmux_aud4 { + fsl,audmux-port = ; + fsl,port-config = < + IMX_AUDMUX_V2_PTCR_SYN + IMX_AUDMUX_V2_PDCR_RXDSEL(MX51_AUDMUX_PORT1_SSI0) + >; + }; }; &can1 { @@ -83,6 +151,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet>; phy-reset-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>; + clocks = <&clks IMX6QDL_CLK_ENET>, <&clks IMX6QDL_CLK_ENET>, <&rmii_clk>; phy-mode = "rmii"; status = "okay"; }; @@ -113,6 +182,64 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c3>; status = "okay"; + + ov5640: camera@3c { + compatible = "ovti,ov5640"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ov5640>; + reg = <0x3c>; + clocks = <&clks IMX6QDL_CLK_CKO>; + clock-names = "xclk"; + DOVDD-supply = <®_1p8v>; + AVDD-supply = <®_3p3v>; + DVDD-supply = <®_3p3v>; + powerdown-gpios = <&gpio5 30 GPIO_ACTIVE_HIGH>; + reset-gpios = <&gpio5 31 GPIO_ACTIVE_LOW>; + status = "disabled"; + + port { + ov5640_to_mipi_csi2: endpoint { + remote-endpoint = <&mipi_csi2_in>; + clock-lanes = <0>; + data-lanes = <1 2>; + }; + }; + }; + + sgtl5000: codec@a { + #sound-dai-cells = <0>; + compatible = "fsl,sgtl5000"; + reg = <0x0a>; + clocks = <&clks IMX6QDL_CLK_CKO>; + VDDA-supply = <®_2p5v>; + VDDIO-supply = <®_3p3v>; + VDDD-supply = <®_1p8v>; + }; +}; + +&mipi_csi { + status = "disabled"; + + port@0 { + reg = <0>; + + mipi_csi2_in: endpoint { + remote-endpoint = <&ov5640_to_mipi_csi2>; + clock-lanes = <0>; + data-lanes = <1 2>; + }; + }; +}; + +&pwm3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pwm3>; + status = "okay"; +}; + +&ssi1 { + fsl,mode = "i2s-slave"; + status = "okay"; }; &uart4 { @@ -121,6 +248,20 @@ status = "okay"; }; +&usbh1 { + vbus-supply = <®_usb_h1_vbus>; + disable-over-current; + status = "okay"; +}; + +&usbotg { + vbus-supply = <®_usb_otg_vbus>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usbotg>; + disable-over-current; + status = "okay"; +}; + &usdhc1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc1>; @@ -138,6 +279,15 @@ }; &iomuxc { + pinctrl_audmux: audmuxgrp { + fsl,pins = < + MX6QDL_PAD_DISP0_DAT20__AUD4_TXC 0x130b0 + MX6QDL_PAD_DISP0_DAT21__AUD4_TXD 0x110b0 + MX6QDL_PAD_DISP0_DAT22__AUD4_TXFS 0x130b0 + MX6QDL_PAD_DISP0_DAT23__AUD4_RXD 0x130b0 + >; + }; + pinctrl_enet: enetgrp { fsl,pins = < MX6QDL_PAD_ENET_CRS_DV__ENET_RX_EN 0x1b0b0 @@ -168,7 +318,7 @@ >; }; - pinctrl_gpmi_nand: gpmi-nand { + pinctrl_gpmi_nand: gpminandgrp { fsl,pins = < MX6QDL_PAD_NANDF_CLE__NAND_CLE 0xb0b1 MX6QDL_PAD_NANDF_ALE__NAND_ALE 0xb0b1 @@ -208,7 +358,14 @@ fsl,pins = < MX6QDL_PAD_GPIO_5__I2C3_SCL 0x4001b8b1 MX6QDL_PAD_EIM_D18__I2C3_SDA 0x4001b8b1 - MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x130b0 + >; + }; + + pinctrl_ov5640: ov5640grp { + fsl,pins = < + MX6QDL_PAD_CSI0_DAT12__GPIO5_IO30 0x1b0b0 + MX6QDL_PAD_CSI0_DAT13__GPIO5_IO31 0x1b0b0 + MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x130b0 >; }; @@ -219,6 +376,18 @@ >; }; + pinctrl_pwm3: pwm3grp { + fsl,pins = < + MX6QDL_PAD_SD4_DAT1__PWM3_OUT 0x1b0b1 + >; + }; + + pinctrl_usbotg: usbotggrp { + fsl,pins = < + MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059 + >; + }; + pinctrl_usdhc1: usdhc1grp { fsl,pins = < MX6QDL_PAD_SD1_CMD__SD1_CMD 0x17070 From patchwork Mon Dec 30 12:04:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 981 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-io1-f70.google.com (mail-io1-f70.google.com [209.85.166.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id E047C3F03F for ; Mon, 30 Dec 2019 13:04:43 +0100 (CET) Received: by mail-io1-f70.google.com with SMTP id 144sf21968800iou.3 for ; Mon, 30 Dec 2019 04:04:43 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1577707483; cv=pass; d=google.com; s=arc-20160816; b=JusYTLnPFQInW5/Aa0AMlUlDsJ21d1Amsr9MJ2FV4XD/iX1CLxgvYWkpbBjsdX5wN6 VRODtvrTVVULDT/2EunrXgvLFEtB9Uy1KL6sp/YzE4AMG5acJ0MbBtS1K6RBGkp32HQq 2QEbaYR2rBuMpW77g8NdWa7z4CevT0q2IwTRhXB0nYOqTURluvIeRcK65FgDI1SvSBhf 45P30cR6h9XGXQ/J2UBwq+bYc5LiZotSYDCkTecK1xCRUvlOxgGBj4R2ZFMGudzgvbGa iJSiTXIHPpjvIGOt/N8TeKSGBEYzD0UzXRORW/zpm0IHvYBYARe8IdKFrqgzYjFLKPUo Ti0w== 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=9yYpytbz4NsKFYWyBQFrBCPBycBOUxy8btSWt5zHlRM=; b=EZggcEpf20fW47OcLdDd7djRW4y1k4u5mXraPNJfGvYQ9ss4mRsw0SSdv7FQKVgHc+ CXXfiDzXM7msdLhvnHTY1qifBNXwhvSsQlg+aNsnRNj1nUNdVGu56T+gwX7jC9kZj3NT lHvprJxo++1o7TB0Xs6dXVU1ZqCMxKX979ZzkWLM6LuOmJ59F+WHqLx1iLzS+dr5fO8u FCiR8XMxV0XzdKxjcUN6EaMqZhtyazwywAX4AxdUeEhSpeZYoOdPokRSmfx0Q4qA5vsp XsQmTzQ0Zuv6LItFwLgJoFK65XEFECN1ft9SqLa/oRw8Ndph1+x0fo6TOJU6pJnkqG0T AdPA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=kGTg6hB7; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 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=9yYpytbz4NsKFYWyBQFrBCPBycBOUxy8btSWt5zHlRM=; b=EQqw4WSo0HuyhwP9QP1MJUyFOIrbuWib9KZ0/2PNiq5qkn4CQuvJIcldwwVuX7qrHr dLqyhkSdy36iB+PceDIV3XjIM2B5/1b43OOGTqDvegDaRev+sNa770B2YWsV4M72xRQE 13AH6sFXzWTKK4gNsShm1c78TuLf/xjRPRLzY= 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=9yYpytbz4NsKFYWyBQFrBCPBycBOUxy8btSWt5zHlRM=; b=FTGHUqmuo5j84wmnXoy10mskx0KxieO45HlPeLp3HbiKao/iXXlsqpmDbnDECQ+yN+ i0hWR4ZgxuoIJcoVB5cR4fxhxWbTD6d+N4LAJIUBidy4Tm865viN21wmCs9JJU78rE2P YQJJx/UWqCVQ2AMmrOahPR+xSGDIydb2D50A8rKYAvXcA77nM0u0L/kyFO7gmUlAWjRY iFsmdZifaipRBNL3fF+HGvDHYmDZzPHt9p6o/7b0zbwgQT5f8jMVh64ZJ8/ok72Q2KP6 kk8nXTHCQoOPluFUeqjEc/aAbPrayUgg7R5ia/+0OT5/NyOsWqTuIIRFHH+wQ5UGrmcJ giww== X-Gm-Message-State: APjAAAXVrOAuWwud75tKEFgVgGyIMgG7FFa+4+Anf64IY0hVuymFRxM+ //yJkRFZJZO3KVIZcWhEe4gOgfoS X-Google-Smtp-Source: APXvYqyOOowpCyGTg19MNtEGkuQgXdclGzLAEfMhyb5zwS78t0xrT5KUG/K0O4v9k3mi1m4bzJFQmA== X-Received: by 2002:a92:4514:: with SMTP id s20mr41168368ila.254.1577707482837; Mon, 30 Dec 2019 04:04:42 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a02:344a:: with SMTP id z10ls2243811jaz.7.gmail; Mon, 30 Dec 2019 04:04:42 -0800 (PST) X-Received: by 2002:a02:a60e:: with SMTP id c14mr53495804jam.80.1577707482294; Mon, 30 Dec 2019 04:04:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577707482; cv=none; d=google.com; s=arc-20160816; b=Kv/ZJCCrTvLqtkSc8i+0dSFnuqs14y/iYf6g4Yhq0JTyiw/8bg7+JH9/BbcvcOqEoe xv+KVNaWSETpj37N/Ed5VyuTecKxvqXdoo5uQxaZcwc92cALd9OCmxZN6zhaUlU4/1lU pNNa6GnDRVXACyQ3FtVOuBHF+QbYJkmhN13pGgbl68zPOJZSiO8VIVucfkHqkqn/0/0r D8sSiGyrzFHV2nndQZHHI/NByhV/cZKG8cdDo1h6HsFaPjEeOEEbpVFaN+f+LdiiL8Q+ rKIdqayZMYWek9KW4eFXvt4zTzevSuVTELsUer5HQCTaprTo9V0TwqNY/SLVYiayTHri FBAA== 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=X1ppixjyvr+Or53zVNzm0X/b1Y01pkzUVd8xzIs+Q5c=; b=yZZSHnPIQ7uBPN/AH2zCVc+ZaZgv/GlU/zYQDO5OizxsHpBGlWspZDaI1QRYF9cfvT zGfOasQll0Md5wTwNImpsDMkvUFjaIxgJS8XEHFUnpBJUcznxwfMqR4xUHpEy0tJogxK bnzYYhwm/k0PrM/laytAWk+AX1BeXX0g6lJGvX3qxRg2ciuPapYoNo4poTjLscvt4G0m 7WctVMVpi9u/LatEKPh43eZfd/0jufFUXy/2squYLK19cttPXDjoTcq3HFLyOVj6bEpK 2yqeCUkgH+LZkt69RzeSTfaZ6CRjQ+hOtbmTR/jE57QKfwUoM+oPNmjG3JABg9v1z+Ja bKJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=kGTg6hB7; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id p10sor27741985ioo.0.2019.12.30.04.04.42 for (Google Transport Security); Mon, 30 Dec 2019 04:04:42 -0800 (PST) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a17:90a:8a96:: with SMTP id x22mr44584251pjn.139.1577707481994; Mon, 30 Dec 2019 04:04:41 -0800 (PST) Received: from localhost.localdomain ([49.206.202.131]) by smtp.gmail.com with ESMTPSA id n7sm24552620pjq.8.2019.12.30.04.04.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2019 04:04:41 -0800 (PST) From: Jagan Teki To: Stefano Babic , Fabio Estevam , uboot-imx@nxp.com Cc: Michael Trimarchi , u-boot@lists.denx.de, linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH 6/8] ARM: dts: imx6q-icore-mipi: Use 1.5 version of i.Core MX6DL Date: Mon, 30 Dec 2019 17:34:07 +0530 Message-Id: <20191230120409.884-7-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20191230120409.884-1-jagan@amarulasolutions.com> References: <20191230120409.884-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=kGTg6hB7; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 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: , The EDIMM STARTER KIT i.Core 1.5 MIPI Evaluation is based on the 1.5 version of the i.Core MX6 cpu module. The 1.5 version differs from the original one for a few details, including the ethernet PHY interface clock provider. With this commit, the ethernet interface works properly: SMSC LAN8710/LAN8720 2188000.ethernet-1:00: attached PHY driver While before using the 1.5 version, ethernet failed to startup do to un-clocked PHY interface: fec 2188000.ethernet eth0: could not attach to PHY Similar fix has merged for i.Core MX6Q but missed to update for DL. Signed-off-by: Michael Trimarchi Signed-off-by: Jagan Teki --- arch/arm/dts/imx6dl-icore-mipi.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/dts/imx6dl-icore-mipi.dts b/arch/arm/dts/imx6dl-icore-mipi.dts index e43bccb78a..d8f3821a0f 100644 --- a/arch/arm/dts/imx6dl-icore-mipi.dts +++ b/arch/arm/dts/imx6dl-icore-mipi.dts @@ -8,7 +8,7 @@ /dts-v1/; #include "imx6dl.dtsi" -#include "imx6qdl-icore.dtsi" +#include "imx6qdl-icore-1.5.dtsi" / { model = "Engicam i.CoreM6 DualLite/Solo MIPI Starter Kit"; From patchwork Mon Dec 30 12:04:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 982 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id DA2743F03F for ; Mon, 30 Dec 2019 13:04:47 +0100 (CET) Received: by mail-pl1-f197.google.com with SMTP id p11sf9338230plo.6 for ; Mon, 30 Dec 2019 04:04:47 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1577707486; cv=pass; d=google.com; s=arc-20160816; b=u4vm4MfPLcBR/R5zDwzDxV7Kb/5mLSuTYgo1v4M1thsLa6TxhXxoYpStbLd4vBLstJ b4POKorNkTw5qvQvG97eeBroTY1/yJgPwFZYKGViSjWcjLsyPZqRMGLuAKkakZKFJW4y TXuz36HKvyev1eUE9y+uaynICplNAoHVYRMLtf2p3FDaCw92KZkef/u2VttN8Fm1J6L2 hawdlGYIcnQIdFr5VPXC+NDRSsfeN4IX+eAp9CHWyAh7qvglvA7Ay9pYYNKWj1Y+LEMc 29GaX24BE/AgBqXGEkKBMSmADghQRLUBLv1HJeDuPLHOG12y9mZR5vdm38ybccNmrT8j inWw== 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=7p0tlCkW8owN3n3qieYrUgF4S/LXsp3PoIgyqEXKThk=; b=iwiFBs9/ofRi0TeaQjjLohCQcdUyC+vUwouGCGzmTsN2c21rRfgo+VsG73DJrxG9C+ qLyBoGMdvt037Vd+4chd//RErezcl26yrlek51ftvpuKHgJC10hxyQfdLcp/Rr2BJ3lS RJ8HvFNB8gaLJQSA5jsqPMj3i0mNcTRr7VgVMaKSakRcazY3Ec7DLIlnNhXALD6WonMc Um64hJKXR6N/8t2u1JfYnPOvaFDxVPbCz84wgp7bVDp1VWRUHNYtVdZFT+NU8dLjuOOq N3WgZRuKmk2P3DBSL0WWoXveg1Nr9dEXbfqKBd8LHU7NmAMi1jAoffHsS2BNVIAXV/5y WdnQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=qQjfAcT0; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 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=7p0tlCkW8owN3n3qieYrUgF4S/LXsp3PoIgyqEXKThk=; b=KA6aT+JXaSWvsJTzwIapEUFCoDEtX1nURYEeqOzpwN4hQmuIwyPo5nqkDlct8seYd2 O5PlLVAAL9PH1at6jAvZfdDBla/OxE8zIn1cDsf3zrW8WxPWlaHHz1OzOmtorqDUI49V cUskLyX9ZMzCDTX4TFENFFM15hS4sjEwrOo44= 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=7p0tlCkW8owN3n3qieYrUgF4S/LXsp3PoIgyqEXKThk=; b=AlThh7UucY1UhHQGNetZnyJZ5VKyXZckgwZF4WQ45aaBZFTE/nkCwV9CV2p2ov0g9a Tb3sBmknp4+hclaOaliVner+/fO+l9RweXGbPnKZi3KWAEteZIpIiQbWKu1VHewvNaVw lR/jsHZRGDfnFYnW+k5tDA7oTL13dyrTD/SXkqN3zSFYG01RLX4MXCM3gkVKR2MDZSZ4 bzMvLOEtQvp3M8fAHxR2Be/2z3F6CVlXKyR9KGPK+5FPe5+4IjXBZz8yuOMoChGnBhDU vZKScakxLAsH/EhT/lES3BocfVu8rf/Dm29opMX0yibJktrvteuJSjzWzDO6BPyRo3++ Lg3Q== X-Gm-Message-State: APjAAAUk+SJZVbvri12N2o0n1OoZC4sAM+onEjmZZy1e6u7vXTKzTq3A J9Tl258NmGeWVhcRkJ7ikUMMHk/7 X-Google-Smtp-Source: APXvYqzvfOwpVnCxM0I+jnaSSjNeOGIrA3eO2tauH413zs7H0ExspD9ZrJv+8xXFnqwqKyX1sNksiA== X-Received: by 2002:a62:78c1:: with SMTP id t184mr69240033pfc.222.1577707486706; Mon, 30 Dec 2019 04:04:46 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a62:8744:: with SMTP id i65ls9870006pfe.11.gmail; Mon, 30 Dec 2019 04:04:46 -0800 (PST) X-Received: by 2002:aa7:8708:: with SMTP id b8mr56318869pfo.184.1577707486263; Mon, 30 Dec 2019 04:04:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577707486; cv=none; d=google.com; s=arc-20160816; b=QRu73RMy8rtXcTA1fpSk+8DW9VW7nh5XD6tzHcmUeKTrW1ZL9UOO5ZzRr19qF7NzB0 clDupVfcCXqPLlUEYZdLFtnLC9UCRWrWEDZKRv7BPvzLIZe8ICm4xvsiEqGan1f1174Y 2GiZ24T8wka3G5DzPfHYO8Z92g9fx55NpRhG4zydg6Gb8nAm7bXvX1Zb8RE1/nixsK5u 7q0xN+fG9NLB43lHCNWGQiHk6Zhybm/c7fQDV7xoWMYMBO98jyOLxdPLnjQvlWfEX259 vlVArFg1UL0KdRbgktLF7AU9T4cz3lYQ5DO8CdUhGoyQ2FNT+vqmz2aFc7DeWbXO567M jmoA== 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=qLsOALy0WQcZFYv/9TRB5WwjXRXOmzwURSbo8yK91so=; b=m30znXC8xdPwrUFyPE8CA08aA3fa+fRaHN2qnVTUTNNZ3vC2QolLi3XPqMqiuz/Z3h MieaPXv24SP+1fNfwJIIcBpnFPmJ9QFiz9UNs3r1xH87GHocoAcibMWGhq3wQEXDGs6Y eZohTwehXLTVapYkrw+tCk9G829CeXfqUwMBWSMtrkd8vWHlZAC2honK12qcgvRzfPhM IyGA8Oatt/WeqpIH5Ne5/XOab3cMfsRwcNF+QU22QpDjtb8YUBdw+tD5A6EBKqao65XK O12VYlgQHnz/6gky+mesifVXEQAH3W3oU5pDXIl/bnswgu1F6VaUA/WZyMQni7G5b3KS /N1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=qQjfAcT0; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id b21sor45218239pfb.38.2019.12.30.04.04.46 for (Google Transport Security); Mon, 30 Dec 2019 04:04:46 -0800 (PST) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:aa7:9218:: with SMTP id 24mr70140721pfo.145.1577707486043; Mon, 30 Dec 2019 04:04:46 -0800 (PST) Received: from localhost.localdomain ([49.206.202.131]) by smtp.gmail.com with ESMTPSA id n7sm24552620pjq.8.2019.12.30.04.04.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2019 04:04:45 -0800 (PST) From: Jagan Teki To: Stefano Babic , Fabio Estevam , uboot-imx@nxp.com Cc: Michael Trimarchi , u-boot@lists.denx.de, linux-amarula@amarulasolutions.com, Jacopo Mondi , Jagan Teki Subject: [PATCH 7/8] ARM: dts: imx6qdl-icore-1.5: Remove duplicate phy reset methods Date: Mon, 30 Dec 2019 17:34:08 +0530 Message-Id: <20191230120409.884-8-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20191230120409.884-1-jagan@amarulasolutions.com> References: <20191230120409.884-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=qQjfAcT0; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 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: , From: Michael Trimarchi Engicam i.CoreM6 1.5 Quad/Dual MIPI dtsi is reusing fec node from Engicam i.CoreM6 dtsi but have sampe copy of phy-reset-gpio and phy-mode properties. So, drop this phy reset methods from imx6qdl-icore-1.5 dsti file. Cc: Jacopo Mondi Signed-off-by: Michael Trimarchi Signed-off-by: Jagan Teki --- arch/arm/dts/imx6qdl-icore-1.5.dtsi | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm/dts/imx6qdl-icore-1.5.dtsi b/arch/arm/dts/imx6qdl-icore-1.5.dtsi index d91d46b589..0fd7f2e24d 100644 --- a/arch/arm/dts/imx6qdl-icore-1.5.dtsi +++ b/arch/arm/dts/imx6qdl-icore-1.5.dtsi @@ -25,10 +25,8 @@ &fec { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet>; - phy-reset-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>; clocks = <&clks IMX6QDL_CLK_ENET>, <&clks IMX6QDL_CLK_ENET>, <&clks IMX6QDL_CLK_ENET_REF>; - phy-mode = "rmii"; status = "okay"; }; From patchwork Mon Dec 30 12:04:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 983 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 4E0C23F03F for ; Mon, 30 Dec 2019 13:04:52 +0100 (CET) Received: by mail-pl1-f199.google.com with SMTP id g16sf3796939plo.14 for ; Mon, 30 Dec 2019 04:04:52 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1577707491; cv=pass; d=google.com; s=arc-20160816; b=Yf6mXKZmnaIRTp/sRn9LLWt6dWd8N/6/WxBYqZqfK/1oGNgWOqGGURfOx+T9duVxh0 0r026mSM6p9CcZbCCbWcSPz2PxkWcWSY8qqy59bQkPICrADFakWKDZk82PShw7LQhMkR pjRexY9wwYlCJGvQJ3zGgzdyczWF2Ut+QqAzRXa7EwQ5VW+LyNUXg9YtUXmLr23oqp3A ekDCiiQ8PJF/hUfThEp7CKLTKnDTUPjnCtYcPDmcHZjm2ZpLmoXhlgGBcwSBOqfIL9W5 ZccoU437i0EjsnaEhRtjsrW8NugIBTZL8ZIJLirJWSjVmdzJvTHbax6vrACXxiyrUMGa FTIQ== 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=a2FsIXZ7WafaukM0HfDLxAs1RVZrLYMwF8NYEN10Ah8=; b=EqUYZcRQ+iRot1HNmq/zsYotE8MTv/7qatOm2M6Dha4K1aUBbz5U/9825Kh04IGJNO VksMw9aNAKZlSbXxtjvIXUqvrsSI0JQSL/3e+wlXUu7J1h0bfJ6OMk4Ij84HKU+1MPs/ jxyxX0Jw6k4hhE7/0sYGAlrcTm4yvDVv2CnxR4KQk/u0Ss6yIlIQ0Z4HNLFatbj4kiy2 ngPa+XmNincQlYy+I7knyz202eXbvneWzxL77Z0nXVe51oWTqrZLXEIrO1ekfa1HnpTz NdPm+cbPjDEmPrDo4v1YJXZKYkAhtcMpstEn8WNUDq2MeZWDJdXCx7pQQ47xIOJS5/Dx 6txg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=VlYk2LYn; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 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=a2FsIXZ7WafaukM0HfDLxAs1RVZrLYMwF8NYEN10Ah8=; b=gH8NCcSfffj2GmsPdpuKWkqxggQWzKXwzFrkvBTsk4C6ltQcMb/7H5VuRcyFKvYjkj jMjc9jgH/fd10fWGRUSeWFJEg3oSJUi7Z6ravsw8o9VnWsttPRFTJPALxFSb4Vafg+xw lB1WGAosiXoHWLqk5BtA8rVAp/YdqqB7iFpQY= 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=a2FsIXZ7WafaukM0HfDLxAs1RVZrLYMwF8NYEN10Ah8=; b=nCldLcAXWSbkx06nxTAkcd+X4REtb0GVeaw6l181W5LwrqAKrhFcCGbIRUWGReLdS+ EjIlYE/2QlKo/ZeRSVIJY0dP45AxsbM3TpSxI1oVZUw7aOZAW+rlfFIgNp9FRr/ZE9gv FaAyQGgpqy7bGjwWHehQWVczRR2FtyfC3wr1rCbUkWtwwGIvffGMBDnBMxpN+oYzaR27 UxpI101z358A5fiddDd4euRvMTEr1LRtidJv6tw0wyYq4298Rrn7ZJl5Yw6KEgXPeUEN hHSrcUptNeohq1MfN+krTyC3IH5Vn2nx1dgqkjVPFf2RVWz5JTJKtBs0TTX7LnLablfE JNqg== X-Gm-Message-State: APjAAAUj1D8TP2NngqC/EFNeINhytEczwe8+GT8B+gFQw2btwfzd/8aN jNRVukvTkK0P3zfBPeCmqLwSHxhk X-Google-Smtp-Source: APXvYqy18rO9frY8ogpst6IcIQ80AdunPMfGKWrCK7Ig8RyydB30ZIKIjiJPembTArYWa3ZIhZ77PA== X-Received: by 2002:a17:90a:5d95:: with SMTP id t21mr46498402pji.31.1577707491111; Mon, 30 Dec 2019 04:04:51 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a63:d007:: with SMTP id z7ls9244596pgf.9.gmail; Mon, 30 Dec 2019 04:04:50 -0800 (PST) X-Received: by 2002:a63:6e04:: with SMTP id j4mr69866557pgc.175.1577707490508; Mon, 30 Dec 2019 04:04:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577707490; cv=none; d=google.com; s=arc-20160816; b=o866gfPox9fHiOneatiGb4zwzMe1UVt0rBow/lzR4v5LI+TIdGaBDQce+1ZcBT4sVG FaGes8YRDLO/bLZMWE+TdddapodX4vFh+2leol8hWY7Ai6Cf2ChyZLYaNevhlP02XcjF g32IbzV8h4qE6hM3xM20ZbExrZhEDTh+JVL4eJrs4wiFA4lCEg+k8MfcOkCqhWfKF1og eDjbFcpTTORFBk5T0/ElDj3tBVYwYxzyWVYaJZvqQbM6dVR+ufO6NAmz2CYlGJctkbPa BqX6/bGyHh8yfJ7U89jRxXnUACayMUS6vV29MeOiyYrcCUilV2gyrHo+GfJ143vD4aSS Odlg== 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=YUfJICrBNZgLeVUN6jNSDYezRpZ8tR5OwwUhJwvmxuE=; b=cmKNu64gSWqUphrDxfJCUt7fEFIPKYFRu7bQoS0StHKWhWiJTnMGaEz6Qg+bha4WUj LyFN+6k9cEUquYaFQQTDmnaTa6rInsSKvm2H67uxZup9eUi1dYppYTvTHNnxBFt4cVZE LDN2hp9Ygj+3ApvqGwmBa7ZTDDUuklcHz0pDO4h8sKcgS70+gHJzHv0OWZZuTdHgasHP tG2AqWcSOekUXYZRoZdgRp2VedgRX27GdScnjgFAkcBhvGRJEYeaFkdjGH0ddWRRivn+ vXKvnSspql7DuNJGkZqNpQ9uHHkqE/8K9ymnwVWNhSByQtrD1UuA5YUB2jrEwr5RShjI DApw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=VlYk2LYn; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id c16sor45376052pls.22.2019.12.30.04.04.50 for (Google Transport Security); Mon, 30 Dec 2019 04:04:50 -0800 (PST) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a17:902:b187:: with SMTP id s7mr68457865plr.104.1577707490190; Mon, 30 Dec 2019 04:04:50 -0800 (PST) Received: from localhost.localdomain ([49.206.202.131]) by smtp.gmail.com with ESMTPSA id n7sm24552620pjq.8.2019.12.30.04.04.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2019 04:04:49 -0800 (PST) From: Jagan Teki To: Stefano Babic , Fabio Estevam , uboot-imx@nxp.com Cc: Michael Trimarchi , u-boot@lists.denx.de, linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH 8/8] ARM: dts: imx6qdli-icore: Add fec phy-handle Date: Mon, 30 Dec 2019 17:34:09 +0530 Message-Id: <20191230120409.884-9-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20191230120409.884-1-jagan@amarulasolutions.com> References: <20191230120409.884-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=VlYk2LYn; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 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: , From: Michael Trimarchi LAN8720 needs a reset of every clock enable. The reset needs to be done at device level, due the flag PHY_RST_AFTER_CLK_EN. So, add phy-handle by creating mdio child node inside fec. This will eventually move the phy-reset-gpio which is defined in fec node. Signed-off-by: Michael Trimarchi Signed-off-by: Jagan Teki --- arch/arm/dts/imx6qdl-icore.dtsi | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/arch/arm/dts/imx6qdl-icore.dtsi b/arch/arm/dts/imx6qdl-icore.dtsi index 7814f1ef08..756f3a9f1b 100644 --- a/arch/arm/dts/imx6qdl-icore.dtsi +++ b/arch/arm/dts/imx6qdl-icore.dtsi @@ -150,10 +150,23 @@ &fec { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet>; - phy-reset-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>; clocks = <&clks IMX6QDL_CLK_ENET>, <&clks IMX6QDL_CLK_ENET>, <&rmii_clk>; phy-mode = "rmii"; + phy-handle = <ð_phy>; status = "okay"; + + mdio { + #address-cells = <1>; + #size-cells = <0>; + + eth_phy: ethernet-phy@0 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <0>; + reset-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>; + reset-assert-us = <4000>; + reset-deassert-us = <4000>; + }; + }; }; &gpmi {