From patchwork Fri Mar 1 12:10:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?S=C3=B6ren_Moch?= X-Patchwork-Id: 1050134 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=web.de Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=web.de header.i=@web.de header.b="q8KwUNZO"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 449pGg0bKTz9s3q for ; Fri, 1 Mar 2019 23:13:14 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id BEFFBC21C3F; Fri, 1 Mar 2019 12:11:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 00784C21DA6; Fri, 1 Mar 2019 12:11:16 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E511CC21C27; Fri, 1 Mar 2019 12:11:13 +0000 (UTC) Received: from mout.web.de (mout.web.de [212.227.15.4]) by lists.denx.de (Postfix) with ESMTPS id 79F04C21C27 for ; Fri, 1 Mar 2019 12:11:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1551442272; bh=XpYPXeUH7ljvKLFNN+anfDzLQHne+7Fsp+80ZF80hhc=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=q8KwUNZOa6W9lhuNXoetsWvFkBjn99zdDg5L81W+HlHjoqeUevclv4hgYcM3nDVxl FZtD7ZxtafgjlnoTrAb6/UvaCApBBNfFDv6uhKgam9lQq5KOcFf0cFLKEU9UL87EEd 1ZTckCvNxi1IsvnYphXvrA3MUSANA7bZS8/025FY= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from localhost.localdomain ([89.15.236.239]) by smtp.web.de (mrweb002 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MIvFp-1gxE2D2Wlt-002YNY; Fri, 01 Mar 2019 13:11:12 +0100 From: Soeren Moch To: Stefano Babic Date: Fri, 1 Mar 2019 13:10:52 +0100 Message-Id: <20190301121101.14163-2-smoch@web.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190301121101.14163-1-smoch@web.de> References: <20190301121101.14163-1-smoch@web.de> X-Provags-ID: V03:K1:6E2NGhDatSUlmXWpvBfE5twt+vOwXyZl0s2DufWksf0/E36+U31 wEyCiwMEIJ2ycNPwUjeGk0yLiPc+24pl3V+xZaT4thQl2sqn8e1J3ZMU1lDesPe7Whu/yIv DqJgW8L4pPtZ319yYOkpsSYvIjInqnX+rs0xeOl76+OiaOrQi0CSB/e1OmGZiE/ETtCoxmH YksSnCZ+3uMlJANmF6lRQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:qaUnOLu9oog=:cRhh7lgVAX33yKj1LhI8tv 2FLe/iz9QUEtdyYR3RMFeUPKSCk+c1y2Hbek4Ls6kAgP31YxkXO7m2pobQSSAy80WqViAYUkx GOxoietWDEIeqj+9cSFa3pxyid6TGyyC+EBX7khleiuKtppp5v54vUgU0Eh/p+iYJy1/0PSD3 eLVEQNj4k1FTAVQxPggD7gqhEyEdYfyDBuIosHNHB1MU+2aeuEEHYRAhRVoFJjfw+SaPDex0c n2lyCjL2B8SN2I7VLRifkBso3lznG1jGVJ3RgZLwx/o3+VLwhZYJIcpD2A1MtXXzaNffShsPe XVZ/uhfi/iSBlPehrXd4CKO5qZfLS8KSd4wc0jGJRmMwKgA+/Mkz9S9RMoaWkhUd8YvQrOUaK oeBOJ5hlP6fX+pH13UWdhhDP4yqV/+pPqA+W01OP/SczUbKAFcZ7C8kJTaMFhe5/NCkFglYLt JL9XrGCygr4Xx8xlH0VO8MmyIaJ8B6DJ5nTq1QGQrebI5tdytpitcMHa3Xwwt9Tt7k+W269kU GIb6B0VtfiDQ8MO0bjyfpZ3HDs9VNfkfa+EYsG7kajbJ6KpX1ZVBlEJV51bREM1vrg6IPLa3S JdWY0ISg7hNDUfeS7EV0ZTtKDJQcSOJehNk2DuxO1aGCq9GTajkSOi8Wlin1kex/KmhVYoqqR UukbfUL8yrYqzjlh9PjEJrUAUvZul8wcPaii1Es/IvxBrEwnfsc7L3eT70cO4R0GlO/AX7vmz RO6aU+dIwmT87DsUqXSmqv6hh7tW60PUJyqJK7ZxdXhUwmTMDhDu4h86H+C5yvvHmm0OKGLLN yTW7RgR4/joBGSTypL6OcsWynY6UctjxfhyHf+mx7r/EzvDkFpO5WB197rPebVRr5LYngVHzG PE85MMUdg9D0cfae/0GVvaO+e0yVjV/trKNv4ztfXIfN7GC2haTdzeSNsDPG9/ Cc: u-boot@lists.denx.de, Soeren Moch Subject: [U-Boot] [PATCH 01/10] board: tbs2910: Fix default environment X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Especially fix usb keyboard support. Other changes are only for beautification. Signed-off-by: Soeren Moch --- Cc: Stefano Babic Cc: u-boot@lists.denx.de --- include/configs/tbs2910.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 2.17.1 diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 2d4b9c9bfe..b06c90939c 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -94,7 +94,7 @@ "run set_con_hdmi; " \ "else " \ "run set_con_serial; " \ - "fi;" + "fi" #endif /* CONFIG_USB_KEYBOARD */ #endif /* CONFIG_CMD_USB */ @@ -142,12 +142,12 @@ "console=ttymxc0\0" \ "fan=gpio set 92\0" \ "set_con_serial=setenv stdout serial; " \ - "setenv stderr serial;\0" \ + "setenv stderr serial\0" \ "set_con_hdmi=setenv stdout serial,vga; " \ - "setenv stderr serial,vga;\0" \ - "stderr=serial,vga;\0" \ - "stdin=serial,usbkbd;\0" \ - "stdout=serial,vga;\0" + "setenv stderr serial,vga\0" \ + "stderr=serial,vga\0" \ + "stdin=serial,usbkbd\0" \ + "stdout=serial,vga\0" #define CONFIG_BOOTCOMMAND \ "mmc rescan; " \ From patchwork Fri Mar 1 12:10:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?S=C3=B6ren_Moch?= X-Patchwork-Id: 1050128 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=web.de Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=web.de header.i=@web.de header.b="Dhb7wm1u"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 449pFG0vPzz9s3q for ; Fri, 1 Mar 2019 23:12:01 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 2E03BC21C27; Fri, 1 Mar 2019 12:11:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 81833C21C38; Fri, 1 Mar 2019 12:11:15 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id CDF58C21C3F; Fri, 1 Mar 2019 12:11:13 +0000 (UTC) Received: from mout.web.de (mout.web.de [212.227.15.4]) by lists.denx.de (Postfix) with ESMTPS id 89C5BC21C38 for ; Fri, 1 Mar 2019 12:11:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1551442273; bh=/VViuEf4cOG4bLHYtA9DXKrlTHO0Yv8IRkb+zZPhob0=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=Dhb7wm1u0MqKIf97PdWznqQRhUH4+ZYdVsFHZCEtYNpGQxNsKGTkDHmd5BHYQaR0U AHZHTXmYT9qqtcAdysYb9uCSxhvaVs24gUGPZIeaepND5efkqxqrs1fVAKn71yRYDV KPMXQjDKyKeYgSIQMCZJyj4ElR2GBS0a1iU2uigY= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from localhost.localdomain ([89.15.236.239]) by smtp.web.de (mrweb002 [213.165.67.108]) with ESMTPSA (Nemesis) id 0LtXDY-1h9lhM46zc-010sK1; Fri, 01 Mar 2019 13:11:13 +0100 From: Soeren Moch To: Stefano Babic Date: Fri, 1 Mar 2019 13:10:53 +0100 Message-Id: <20190301121101.14163-3-smoch@web.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190301121101.14163-1-smoch@web.de> References: <20190301121101.14163-1-smoch@web.de> X-Provags-ID: V03:K1:XCIVfqAzI0qqO4ziNjfgEOlpcZjLUbWL5OMhLgXoJy/czPIpHvw PYKEp+JMyaDnjxNTNg2LMpZRj202iC8PAnWsEjyUl/Hd6ze8SsVzYBUQCTX5IiCha5D0Cjn 3GvDJZqs1TsSGY1Ncp+SNJS2uPxmyC1OD4TnqiNkZMpC3YeXXkhAmAqvYtsl0FTQA/ctqcS OkS+cISxnHM++mMppV2Lg== X-UI-Out-Filterresults: notjunk:1; V03:K0:rD7ZpK227II=:6YwxBdl74VfKpn5Z8zAjLJ THIaMOUe1gKbrtg4lWFky/jM1N7ocsbobfYQGa/aGy6TFQLOrHqqp57Iq2zXHbanGdxWhHUzz 9aLCJEt0QMLJ8+dUO1E6d5b1CXWsWm2uqTt2HIDI5DIn6D/sW4JEgZXHiRSI1G3p76mU9iDZD djB0cTxMKqMtnkz8yT6xlekUpACbRm/NLw6q8zdHyPMCEbhW3u/IFobPmj2DnRwtmMYWPWRK3 6JvPS/bPM/nC5gKfO1tuJ0H6gedSb3Xt9yuuoAXCV/mLSiRnzsJWxlg7Xq99ZxHpkeZXBYu1C VSa1dTGvVkEIbd4epEeV8Z3aqbQzOHaEE6/n2/iVXjeNsvEyV46ssxU+1984Hjftki8Gp8Eso DjHuBMXdD+Y2snnsbh/q50YH0gAf3yvTO8pDoKcrMTAbfOnTl8qnhrbS5CxtBRpL0DnXcHmu7 zN3o/DxaToJSuqJFHz4OYkLeR57dQwXWG6eTNTQpN8qwGfS9ngBdQ7fU5SRCExF5QcteIUbFS QdObAJNVUjTDaL/Qib1lF5pITtDFYF6rCuDQSmuJOJPX3RrCr74nSCm5WbsTxTC882LBNHt4e KBQ6TQ2eAM3pcjL3MM4IA24Ge6bVZP/GCsxqKcyCvrblNlCr5YFrXdyVDUH6Lop8R7FJM/rpp zpMAfYUx8nXQFHO/ySg+moK9Oy0xIo8WXlJBV4mKJ1U15sTTwS6k0VWoZsqNJ25VoL9tR1RXP gTc9DsoGYNeJiB2nIWMs8bzDfweTftrMKwU+TjplmDY3iRBuHHMJu4MeTWR1O5W+U5ZAvuCbj Rt71I6i2yctxUvdKIrEsSI5DF65mquKmNvHMrLkQutXxMeDe35uH+5yDIuhrjlezYH6Je3KLk eNby0SpeWZhrEuyQBR5clJ/kiPLNRVFipTxEoZhSyxMeBgOJCPhy1bCvUg2fxS Cc: u-boot@lists.denx.de, Soeren Moch Subject: [U-Boot] [PATCH 02/10] board: tbs2910: Remove efi loader support in defconfig to reduce u-boot size X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Signed-off-by: Soeren Moch --- Cc: Stefano Babic Cc: u-boot@lists.denx.de --- configs/tbs2910_defconfig | 1 + 1 file changed, 1 insertion(+) -- 2.17.1 diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig index 78beb9a522..70a3e18e23 100644 --- a/configs/tbs2910_defconfig +++ b/configs/tbs2910_defconfig @@ -56,3 +56,4 @@ CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_VIDEO=y CONFIG_OF_LIBFDT=y +# CONFIG_EFI_LOADER is not set From patchwork Fri Mar 1 12:10:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?S=C3=B6ren_Moch?= X-Patchwork-Id: 1050130 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=web.de Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=web.de header.i=@web.de header.b="MUWgNBUW"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 449pFf2fJbz9s3q for ; Fri, 1 Mar 2019 23:12:22 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id CDE2FC21C4A; Fri, 1 Mar 2019 12:11:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 73E0EC21D8A; Fri, 1 Mar 2019 12:11:16 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E6AE7C21C4A; Fri, 1 Mar 2019 12:11:14 +0000 (UTC) Received: from mout.web.de (mout.web.de [212.227.15.14]) by lists.denx.de (Postfix) with ESMTPS id 8D579C21C27 for ; Fri, 1 Mar 2019 12:11:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1551442273; bh=+753VVNWuYoNuf9UXGT64Jbfp8EgOW1KJ0lVcyoCaAA=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=MUWgNBUWaWO42y8wbhEsvzi6KG5BPDVZ8Ax1T419JzXR2h5QP6zhVGBN+CUd6MaQs g5EH5ZjjkQZeHqPGmkGSq/n94g0SJ0LaqH+hv8laOavZs9DGqt6HHUeND0fXCLPxdz vnnPQ73sHm9bPLxeeJkr/z9Z2uEQDomc7jVHL158= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from localhost.localdomain ([89.15.236.239]) by smtp.web.de (mrweb002 [213.165.67.108]) with ESMTPSA (Nemesis) id 0LbZlL-1hOHNa21e7-00lGqk; Fri, 01 Mar 2019 13:11:13 +0100 From: Soeren Moch To: Stefano Babic Date: Fri, 1 Mar 2019 13:10:54 +0100 Message-Id: <20190301121101.14163-4-smoch@web.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190301121101.14163-1-smoch@web.de> References: <20190301121101.14163-1-smoch@web.de> X-Provags-ID: V03:K1:h+OxplprOxaB3MGCEUOse8uJKLkbv8yb1c6AHeGeGkbM3A4E1YD mdRqSwu5kV/rM24iNCAq2PJ1gcpD12q73UoxWQwy22I/mO0XlGwxhGbzR4CWAmUd9PWcYcv reEJ1F3qIhKkfw7fpNM7AMtEOtrNmL88VMHztVCo7jxJ1+rXSwRKC/QP54kMlBIQYU8oVSD oswjZorqzbFiP/kfxtntg== X-UI-Out-Filterresults: notjunk:1; V03:K0:Zn7AHS7YNKI=:oDXLwg1dd3WCwyuyicqFdx tIJG8C7yeVp82BQsFRPefMxEuphvIajxLrWOcEQHHKCS6bfrnBxnQGgfI9cWhSZv7EBDojaNi +ykS2kP4kFmrzMMchrqZSMxGyF1MSmrl+jKmZzZRI7bNPV62c/3fk1rQlHhADSEHKWcdYqGQI A+Hii667fpxwipllJZ/DUysMjyuZ5rqNWYk4HWMIDWmhpOE00j1QqPnMLWTI36wiJ0DJQPnrl mKzCW80Pz0AA8qc4ZhX39uRW/42z4mR0W293D2Q5l9bCQ6V4g5EsHKdeGMYcBHFKtGtsq3W/6 8/n/OxDj1nEeN3XKfzakB1rwe3cFFIwdwm4mSj8J33ux7JGN20mw9b4CGPPFTgaSOiV5iPX2b eqncmNMXy/7F2m+mJFJ3Xi586PM2apQetIEjscITaW9TSyGuCz0Q4ZKG/DzXmX/FloXDbGk9J oG0eZ+wt2umb4rm2PKUusMeizadbknrhZH8XsX7acEFE5Ohdt7JeIDqsfPE7LL2OPsgpABFiM mqthonS0cWFqYTuWr11gVuLi+7nLneTj40Lqfti01SDi+72hAwvDL6/+cwnsoBwCNzpMeBnPy MBJYJ0OMHHQHlDiGriyn+Wg5ZQw/YEtRw82kYbnouWQxnivAy5hs1BMcReWDl0Y+YE20Crkjh lXcNYt+YdLRYFQfWOuSjXQT2nkMAXY9Bs+ReGt9yzFOANILi2RK6CIUAGow4zGW5HbLJto3Tt dtjULirU4VckcnymhCD2V64C2rg3HX9q+U4gdQgvmx3TaVi3pfIBYURvM5Rj50ryEN7CSkYg3 g+WjU2G/xBfDRrFARLKepEsPG+dDMeFvH6HqX26qicPGlDyW4n6UZi62fl47u5bAVu1scw+k2 Z97DTqNWVyllGr72NaurwtUsotReL97y2I8ZF5zCRtMNq9+X/x35MaGmQ/P6R9 Cc: u-boot@lists.denx.de, Soeren Moch Subject: [U-Boot] [PATCH 03/10] board: tbs2910: Add device tree X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" ... as preparation for additional driver model coonversions. We use CONFIG_OF_EMBED here to keep u-boot.imx as final binary name. So we maintain compatibility with the original TBS u-boot and available HOWTOs for u-boot updates. Signed-off-by: Soeren Moch --- Cc: Stefano Babic Cc: u-boot@lists.denx.de --- arch/arm/dts/imx6q-tbs2910.dts | 394 +++++++++++++++++++++++++++++++++ board/tbs/tbs2910/MAINTAINERS | 1 + board/tbs/tbs2910/tbs2910.c | 6 - configs/tbs2910_defconfig | 4 +- 4 files changed, 398 insertions(+), 7 deletions(-) create mode 100644 arch/arm/dts/imx6q-tbs2910.dts -- 2.17.1 diff --git a/arch/arm/dts/imx6q-tbs2910.dts b/arch/arm/dts/imx6q-tbs2910.dts new file mode 100644 index 0000000000..21e62c0cab --- /dev/null +++ b/arch/arm/dts/imx6q-tbs2910.dts @@ -0,0 +1,394 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +// +// Copyright 2014-2019 Soeren Moch + +/dts-v1/; + +#include "imx6q.dtsi" +#include +#include + +/ { + model = "TBS2910 Matrix ARM mini PC"; + compatible = "tbs,imx6q-tbs2910", "fsl,imx6q"; + + chosen { + stdout-path = &uart1; + }; + + aliases { + mmc0 = &usdhc2; + mmc1 = &usdhc3; + mmc2 = &usdhc4; + usb0 = &usbotg; + }; + + memory@10000000 { + reg = <0x10000000 0x80000000>; + }; + + fan { + compatible = "gpio-fan"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpio_fan>; + gpios = <&gpio3 28 GPIO_ACTIVE_HIGH>; + gpio-fan,speed-map = <0 0 + 3000 1>; + }; + + ir_recv { + compatible = "gpio-ir-receiver"; + gpios = <&gpio3 18 GPIO_ACTIVE_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ir>; + }; + + leds { + compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpio_leds>; + + blue { + label = "blue_status_led"; + gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; + default-state = "keep"; + }; + }; + + reg_2p5v: regulator-2p5v { + compatible = "regulator-fixed"; + regulator-name = "2P5V"; + regulator-min-microvolt = <2500000>; + regulator-max-microvolt = <2500000>; + }; + + reg_3p3v: regulator-3p3v { + compatible = "regulator-fixed"; + regulator-name = "3P3V"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; + + reg_5p0v: regulator-5p0v { + compatible = "regulator-fixed"; + regulator-name = "5P0V"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + }; + + sound-sgtl5000 { + audio-codec = <&sgtl5000>; + audio-routing = + "MIC_IN", "Mic Jack", + "Mic Jack", "Mic Bias", + "Headphone Jack", "HP_OUT"; + compatible = "fsl,imx-audio-sgtl5000"; + model = "On-board Codec"; + mux-ext-port = <3>; + mux-int-port = <1>; + ssi-controller = <&ssi1>; + }; + + sound-spdif { + compatible = "fsl,imx-audio-spdif"; + model = "On-board SPDIF"; + spdif-controller = <&spdif>; + spdif-out; + }; +}; + +&audmux { + status = "okay"; +}; + +&fec { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_enet>; + phy-mode = "rgmii"; + phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>; + status = "okay"; +}; + +&hdmi { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hdmi>; + ddc-i2c-bus = <&i2c2>; + status = "okay"; +}; + +&i2c1 { + clock-frequency = <100000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c1>; + status = "okay"; + + sgtl5000: sgtl5000@a { + clocks = <&clks IMX6QDL_CLK_CKO>; + compatible = "fsl,sgtl5000"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sgtl5000>; + reg = <0x0a>; + VDDA-supply = <®_2p5v>; + VDDIO-supply = <®_3p3v>; + }; +}; + +&i2c2 { + clock-frequency = <100000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c2>; + status = "okay"; +}; + +&i2c3 { + clock-frequency = <100000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c3>; + status = "okay"; + + rtc: ds1307@68 { + compatible = "dallas,ds1307"; + reg = <0x68>; + }; +}; + +&pcie { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pcie>; + reset-gpio = <&gpio7 12 GPIO_ACTIVE_LOW>; + status = "okay"; +}; + +&sata { + fsl,transmit-level-mV = <1104>; + fsl,transmit-boost-mdB = <3330>; + fsl,transmit-atten-16ths = <16>; + fsl,receive-eq-mdB = <3000>; + status = "okay"; +}; + +&snvs_poweroff { + status = "okay"; +}; + +&spdif { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spdif>; + status = "okay"; +}; + +&ssi1 { + status = "okay"; +}; + +&uart1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart1>; + status = "okay"; +}; + +&uart2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart2>; + status = "okay"; +}; + +&usbh1 { + vbus-supply = <®_5p0v>; + status = "okay"; +}; + +&usbotg { + vbus-supply = <®_5p0v>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usbotg>; + disable-over-current; + status = "okay"; +}; + +&usdhc2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc2>; + bus-width = <4>; + cd-gpios = <&gpio2 2 GPIO_ACTIVE_LOW>; + vmmc-supply = <®_3p3v>; + vqmmc-supply = <®_3p3v>; + voltage-ranges = <3300 3300>; + no-1-8-v; + status = "okay"; +}; + +&usdhc3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc3>; + bus-width = <4>; + cd-gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; + wp-gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>; + vmmc-supply = <®_3p3v>; + vqmmc-supply = <®_3p3v>; + voltage-ranges = <3300 3300>; + no-1-8-v; + status = "okay"; +}; + +&usdhc4 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc4>; + bus-width = <8>; + vmmc-supply = <®_3p3v>; + vqmmc-supply = <®_3p3v>; + voltage-ranges = <3300 3300>; + non-removable; + no-1-8-v; + status = "okay"; +}; + +&iomuxc { + pinctrl_enet: enetgrp { + fsl,pins = < + MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0 + MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0 + MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b030 + MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b030 + MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b030 + MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b030 + MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b030 + MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b030 + MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0 + MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b030 + MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b030 + MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b030 + MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b030 + MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b030 + MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b030 + MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8 + MX6QDL_PAD_ENET_CRS_DV__GPIO1_IO25 0x1b059 + >; + }; + + pinctrl_gpio_fan: gpiofangrp { + fsl,pins = < + MX6QDL_PAD_EIM_D28__GPIO3_IO28 0x130b1 + >; + }; + + pinctrl_gpio_leds: gpioledsgrp { + fsl,pins = < + MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x130b1 + >; + }; + + pinctrl_hdmi: hdmigrp { + fsl,pins = < + MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE 0x1f8b0 + >; + }; + + pinctrl_i2c1: i2c1grp { + fsl,pins = < + MX6QDL_PAD_CSI0_DAT9__I2C1_SCL 0x4001b8b1 + MX6QDL_PAD_CSI0_DAT8__I2C1_SDA 0x4001b8b1 + >; + }; + + pinctrl_i2c2: i2c2grp { + fsl,pins = < + MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1 + MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1 + >; + }; + + pinctrl_i2c3: i2c3grp { + fsl,pins = < + MX6QDL_PAD_GPIO_3__I2C3_SCL 0x4001b8b1 + MX6QDL_PAD_GPIO_6__I2C3_SDA 0x4001b8b1 + >; + }; + + pinctrl_ir: irgrp { + fsl,pins = < + MX6QDL_PAD_EIM_D18__GPIO3_IO18 0x17059 + >; + }; + + pinctrl_pcie: pciegrp { + fsl,pins = < + MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x17059 + >; + }; + + pinctrl_sgtl5000: sgtl5000grp { + fsl,pins = < + MX6QDL_PAD_CSI0_DAT7__AUD3_RXD 0x130b0 + MX6QDL_PAD_CSI0_DAT4__AUD3_TXC 0x130b0 + MX6QDL_PAD_CSI0_DAT5__AUD3_TXD 0x110b0 + MX6QDL_PAD_CSI0_DAT6__AUD3_TXFS 0x130b0 + MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x130b0 + >; + }; + + pinctrl_spdif: spdifgrp { + fsl,pins = ; + }; + + pinctrl_uart1: uart1grp { + fsl,pins = < + MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA 0x1b0b1 + MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1 + >; + }; + + pinctrl_uart2: uart2grp { + fsl,pins = < + MX6QDL_PAD_EIM_D26__UART2_TX_DATA 0x1b0b1 + MX6QDL_PAD_EIM_D27__UART2_RX_DATA 0x1b0b1 + >; + }; + + pinctrl_usbotg: usbotggrp { + fsl,pins = < + MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059 + >; + }; + + pinctrl_usdhc2: usdhc2grp { + fsl,pins = < + MX6QDL_PAD_SD2_CMD__SD2_CMD 0x17059 + MX6QDL_PAD_SD2_CLK__SD2_CLK 0x10059 + MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x17059 + MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x17059 + MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x17059 + MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x17059 + MX6QDL_PAD_NANDF_D2__GPIO2_IO02 0x17059 + >; + }; + + pinctrl_usdhc3: usdhc3grp { + fsl,pins = < + MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059 + MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059 + MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059 + MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059 + MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059 + MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059 + MX6QDL_PAD_NANDF_D0__GPIO2_IO00 0x17059 + MX6QDL_PAD_NANDF_D1__GPIO2_IO01 0x17059 + >; + }; + + pinctrl_usdhc4: usdhc4grp { + fsl,pins = < + MX6QDL_PAD_SD4_CMD__SD4_CMD 0x17059 + MX6QDL_PAD_SD4_CLK__SD4_CLK 0x10059 + MX6QDL_PAD_SD4_DAT0__SD4_DATA0 0x17059 + MX6QDL_PAD_SD4_DAT1__SD4_DATA1 0x17059 + MX6QDL_PAD_SD4_DAT2__SD4_DATA2 0x17059 + MX6QDL_PAD_SD4_DAT3__SD4_DATA3 0x17059 + MX6QDL_PAD_SD4_DAT4__SD4_DATA4 0x17059 + MX6QDL_PAD_SD4_DAT5__SD4_DATA5 0x17059 + MX6QDL_PAD_SD4_DAT6__SD4_DATA6 0x17059 + MX6QDL_PAD_SD4_DAT7__SD4_DATA7 0x17059 + >; + }; +}; diff --git a/board/tbs/tbs2910/MAINTAINERS b/board/tbs/tbs2910/MAINTAINERS index bf176553d2..a3ad2f712a 100644 --- a/board/tbs/tbs2910/MAINTAINERS +++ b/board/tbs/tbs2910/MAINTAINERS @@ -1,6 +1,7 @@ TBS2910 BOARD M: Soeren Moch S: Maintained +F: arch/arm/dts/imx6q-tbs2910.dts F: board/tbs/tbs2910/ F: configs/tbs2910_defconfig F: include/configs/tbs2910.h diff --git a/board/tbs/tbs2910/tbs2910.c b/board/tbs/tbs2910/tbs2910.c index ecb45f208d..99b282ca6b 100644 --- a/board/tbs/tbs2910/tbs2910.c +++ b/board/tbs/tbs2910/tbs2910.c @@ -446,9 +446,3 @@ int board_init(void) #endif return 0; } - -int checkboard(void) -{ - puts("Board: TBS2910 Matrix ARM mini PC\n"); - return 0; -} diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig index 70a3e18e23..3cc68eb922 100644 --- a/configs/tbs2910_defconfig +++ b/configs/tbs2910_defconfig @@ -36,6 +36,9 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_EFI_PARTITION=y +CONFIG_OF_CONTROL=y +CONFIG_OF_EMBED=y +CONFIG_DEFAULT_DEVICE_TREE="imx6q-tbs2910" CONFIG_ENV_IS_IN_MMC=y CONFIG_DM=y CONFIG_DWC_AHSATA=y @@ -55,5 +58,4 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_VIDEO=y -CONFIG_OF_LIBFDT=y # CONFIG_EFI_LOADER is not set From patchwork Fri Mar 1 12:10:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?S=C3=B6ren_Moch?= X-Patchwork-Id: 1050140 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=web.de Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=web.de header.i=@web.de header.b="cqsygnUq"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 449pKJ4QZkz9s3q for ; Fri, 1 Mar 2019 23:15:32 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 57197C21DDC; Fri, 1 Mar 2019 12:12:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id E5D11C21DF9; Fri, 1 Mar 2019 12:11:16 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 07C1AC21C27; Fri, 1 Mar 2019 12:11:14 +0000 (UTC) Received: from mout.web.de (mout.web.de [212.227.15.14]) by lists.denx.de (Postfix) with ESMTPS id 8F4E3C21C38 for ; Fri, 1 Mar 2019 12:11:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1551442274; bh=zqth2iBa4E92CfqPEJ5OAr+E04FWqW+mqcad2OQmklc=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=cqsygnUqagP996QB3gENsbKBkzOa0WX/3sbDghgB3MB3j6CbEwczLRhkePZ+XZY+7 bk9ZXbY4Fd42ExXQ6CsGJsht733izW/QT/5th4eg2aNVAIs3H/FcDy3PeUKS/U5u7M FkVouB9XzntgyKanAFQdmlgDmN9yU5TRyuSSx704= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from localhost.localdomain ([89.15.236.239]) by smtp.web.de (mrweb002 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MGiLB-1gmCTQ4Afx-00Dazc; Fri, 01 Mar 2019 13:11:14 +0100 From: Soeren Moch To: Stefano Babic Date: Fri, 1 Mar 2019 13:10:55 +0100 Message-Id: <20190301121101.14163-5-smoch@web.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190301121101.14163-1-smoch@web.de> References: <20190301121101.14163-1-smoch@web.de> X-Provags-ID: V03:K1:gmPPksecc77bjIqvZQLx/IKrf51xDxhprTZxwkgrCnATkYwt0aZ Y9UG4Np7GtHuRMZkHzf/4/+CybRhogbGFoIrS8xtjUM2vSrhTbTdIAlGWQihlicP9oJWSek PRy7bYqsW0gFPUizp4gJPwCXd1+wM/0Qrn2rdzWESZYlSgJ1ZW1Uou01miI9QBiOlDsTXxY L0ET/DDZcjV6XIP4ndSiA== X-UI-Out-Filterresults: notjunk:1; V03:K0:nfojfyQ9n1s=:a5gumI3XoPawbtis6Rmnox 1hbnWqf8hHrHi+tvyQ4/wHh+frB4PU6hu9IWi/6xKemaTKsDn149TAS9KyHA7MG4Gp4OWmDhx 6Sh/VYdfxzvW5UtUBCUfZkdy+9YOlE0qQoIvHWXjhLgHwf8rviYIgyXUM/C5Nd/7XQ/DWfZEO Etwab3P0L1/aZ7Q+6141a5XLZ1bhkMyTHL/DSPsLX+7Uuh9BdQczfq9rrhhbGY1wg5xRm8qrF UPTMauWazUIuLpj1+n4/OT0+IEeh1eGCEOVYiPx4YKvGLe8UweAK5gsiSXM19oMscI7QB6wPh aFwhfSeWxf054yTRlWP/3E0FNR2uzAgCVHAJyp6IxJJrFuRz7cpEEdID88FV8f3RVhzL5iZBA tHEl+BtP1+qGuLMJrevZvLoc6l8VC+62H4UQD0mn+/jTl1kPhu05hospxZMUH4k0IRBNp4eu6 CHuDi8CiBIx18b8RQNBL+nP4rjkfZvKMEXuCOvRPK0rJvilKChbKk79EVrYIM1pEqaqLyKnWA JVfvrDJ5q8UvEO7Sr17x+xEYSpFU8DrUfOcqCS1EjFOz1TuN/pZjGZTSspI2l69XI7cOuWt1M Qz/qDH5ULpWT3Yl/c1wOxW3F2HMp9J/a7Q0yDS81uL/vwSl07GngtBK/Lwv4JYaB2K9SDQOrT hkCLnqBbTYQCy9w1Dhky/HNRftqVHMCoB2bSe33o1kxRMS/YPzhmL2XDJfGxh0ZsyqZKGp/Pi sP2UKA3r6VSXQ4hZVnGUpWz4yYXf92XaBiqJJ11pN8g0WvqNsBPZdAb47qoVKDZQk+MT8j2oZ LlSVedPSTVGupM4DytnzAXTGA0LKwb3eKBm+xUcyy3BeT1HlROJwzAxpFbegJ7KX/5j5gZ7YU y9cPaV83KoyDLSXiytubLiPYRGs0ipiBpyLWoCNbkiklmbHO9LJlWasQ+hw2kJ Cc: u-boot@lists.denx.de, Soeren Moch Subject: [U-Boot] [PATCH 04/10] board: tbs2910: Add pinctrl driver and convert gpio to driver model X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" We need this for additional driver model conversions. Signed-off-by: Soeren Moch --- Cc: Stefano Babic Cc: u-boot@lists.denx.de --- board/tbs/tbs2910/tbs2910.c | 3 +++ configs/tbs2910_defconfig | 3 +++ 2 files changed, 6 insertions(+) -- 2.17.1 diff --git a/board/tbs/tbs2910/tbs2910.c b/board/tbs/tbs2910/tbs2910.c index 99b282ca6b..175dd88a69 100644 --- a/board/tbs/tbs2910/tbs2910.c +++ b/board/tbs/tbs2910/tbs2910.c @@ -138,6 +138,7 @@ static void setup_iomux_enet(void) imx_iomux_v3_setup_multiple_pads(enet_pads, ARRAY_SIZE(enet_pads)); /* Reset AR8035 PHY */ + gpio_request(IMX_GPIO_NR(1, 25), "ETH_PHY_RESET"); gpio_direction_output(IMX_GPIO_NR(1, 25) , 0); udelay(500); gpio_set_value(IMX_GPIO_NR(1, 25), 1); @@ -230,12 +231,14 @@ int board_mmc_init(bd_t *bis) case 0: imx_iomux_v3_setup_multiple_pads( usdhc2_pads, ARRAY_SIZE(usdhc2_pads)); + gpio_request(USDHC2_CD_GPIO, "MMC0_CD"); gpio_direction_input(USDHC2_CD_GPIO); usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK); break; case 1: imx_iomux_v3_setup_multiple_pads( usdhc3_pads, ARRAY_SIZE(usdhc3_pads)); + gpio_request(USDHC3_CD_GPIO, "MMC1_CD"); gpio_direction_input(USDHC3_CD_GPIO); usdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK); break; diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig index 3cc68eb922..717cabfa3b 100644 --- a/configs/tbs2910_defconfig +++ b/configs/tbs2910_defconfig @@ -42,10 +42,13 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6q-tbs2910" CONFIG_ENV_IS_IN_MMC=y CONFIG_DM=y CONFIG_DWC_AHSATA=y +CONFIG_DM_GPIO=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y CONFIG_MII=y CONFIG_PCI=y +CONFIG_PINCTRL=y +CONFIG_PINCTRL_IMX6=y CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_USB_STORAGE=y From patchwork Fri Mar 1 12:10:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?S=C3=B6ren_Moch?= X-Patchwork-Id: 1050142 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=web.de Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=web.de header.i=@web.de header.b="fKkahiTH"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 449pL66TyHz9s3q for ; Fri, 1 Mar 2019 23:16:14 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 83FD4C21DFF; Fri, 1 Mar 2019 12:12:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 6C2F9C21C3F; Fri, 1 Mar 2019 12:11:17 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C42D3C21D8A; Fri, 1 Mar 2019 12:11:15 +0000 (UTC) Received: from mout.web.de (mout.web.de [212.227.15.14]) by lists.denx.de (Postfix) with ESMTPS id DA3E7C21C3F for ; Fri, 1 Mar 2019 12:11:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1551442274; bh=+pLKwtyKB5ZfO1xThvqLnNr1zUfKDpAA4jNEPyW36eg=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=fKkahiTHyexoq7tAJMxjD74k5GdCJqF7TG/lprQ/RTckx4b3pw2kyDgnX5lcGrZ4R cNinVz9rnWO6P2Y3MgIA2hRW3HUWiWvRKYWuSO46CwTGhzHj/mQtpSoW6xdd1E7Bkh fonVA6KR4ctijHlHukE4FSZS9NSOraQnbMTiUSCY= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from localhost.localdomain ([89.15.236.239]) by smtp.web.de (mrweb002 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MWApN-1gSTjX1fK5-00XKns; Fri, 01 Mar 2019 13:11:14 +0100 From: Soeren Moch To: Stefano Babic Date: Fri, 1 Mar 2019 13:10:56 +0100 Message-Id: <20190301121101.14163-6-smoch@web.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190301121101.14163-1-smoch@web.de> References: <20190301121101.14163-1-smoch@web.de> X-Provags-ID: V03:K1:Eod2qjzFGGMNI2w4SnDLrVbqLlHKhgdRwxO8V7f1UMFYbV+80iJ Fn0ySdUcJqdbu389VM96DcrJOaDe3utdedpRZYkk+lx0W5pT+B0/PQh6EDzBIl6IZHEfRBC RsJhx0sFS5srkFpKIcnwxYMWM2hUlY1PsUYIXdeNviAkvISEYV0rpTfyty+tkJUSncO37Gw 8+MaMhWqJ7Y8UI1VlXMHg== X-UI-Out-Filterresults: notjunk:1; V03:K0:L+kXkca6Vm0=:nEmqh4IR8DV/lxwpf9YWuW 1gVVFPB79WJQdZ3AVWnFgvy2rzfz0ManipOOzBaVoNpbofqRaTe0KTekG9wdeIIFrLjnA0ocQ Z961cgMBhvDy5ci3n3f1BL/R3I0ox2qIn7lFiIoKy5ZbstdKdEu0Ju3j3YIOB4IgFEDUqFzjd 8QimE86UF+TlKAUDGcejaFPlJmtFaM7iu9Eo89pw7OLjlO2bC5B8TetEW4/jrnUzrugn9lHmV QtC5ymV/8C2X99OOZczXaD/lhWmZ8nAZXyj5RqWH6Zc0qQVNhMHcCSuypOS8r5IueAasg3WQc cKZMZhvw2sJ9Zjb3ZsPRAsBHhnNjsNgRaJ9avPGXHeuYuui6UjLELvUgCEWIE71inJA1uqqG2 jrL4/iMGfVOapzklGmkHuVkvtG/FwNwdGQE9XP3ntA1S0pmVUCvrMfUv33UxohSAe91Y+WcOP uc0AmdEOvYmXHyDjBZbiSGpr//OMB82dE8mwMiGjmQe8I60XeddpzxUr6XNdB3Qc4ACqeMWXU KTEa0V2iKROL6Kxtwd9xbbBlNqCaq/Db1x/rly9TlCdjDbOTHWuUQu97M7RmEW0xzlb628Goj zGpM5sKzo9YrhGJuL5dWOPoZGrFh3IRQZKRdJeVQJUhBiWFnjLT03iSwyeYqdP7F0l07oTIkp Ndq88ar8ft4Ju6DZUVbPleDXHLvjduX0MJpOsoEBXmgHregXloknbVfzAnioOhbbssCUliCtj T+m7Y21OzvXXhBppeujMyzAtyF3glcmoqlOli1axD6XQFzCT4gYFFbWznT//mPpzmMXm9F5m0 WgIXdpqY/qH1UU6slKinbArv+mqCSUe6nt+MHRHkLBtH+BltKHHAASRE9Q/RsxK+d+JD7hkJM 7oSO5ojdszj4ZKNtexCdM2qS969Kjbf+ib6aLd0t/KAOHYpL/UrrBuqkFEyQgH Cc: u-boot@lists.denx.de, Soeren Moch Subject: [U-Boot] [PATCH 05/10] board: tbs2910: Convert usb to driver model X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" So we don't need to duplicate settings from the device tree in the board file. Signed-off-by: Soeren Moch --- Cc: Stefano Babic Cc: u-boot@lists.denx.de --- board/tbs/tbs2910/tbs2910.c | 10 ---------- configs/tbs2910_defconfig | 2 ++ include/configs/tbs2910.h | 1 - 3 files changed, 2 insertions(+), 11 deletions(-) -- 2.17.1 diff --git a/board/tbs/tbs2910/tbs2910.c b/board/tbs/tbs2910/tbs2910.c index 175dd88a69..20c93778e1 100644 --- a/board/tbs/tbs2910/tbs2910.c +++ b/board/tbs/tbs2910/tbs2910.c @@ -418,12 +418,6 @@ static const struct boot_mode board_boot_modes[] = { }; #endif -#ifdef CONFIG_USB_EHCI_MX6 -static iomux_v3_cfg_t const usb_otg_pads[] = { - MX6_PAD_ENET_RX_ER__USB_OTG_ID | MUX_PAD_CTRL(NO_PAD_CTRL), -}; -#endif - int board_init(void) { /* address of boot parameters */ @@ -442,10 +436,6 @@ int board_init(void) #endif #ifdef CONFIG_CMD_BMODE add_board_boot_modes(board_boot_modes); -#endif -#ifdef CONFIG_USB_EHCI_MX6 - imx_iomux_v3_setup_multiple_pads( - usb_otg_pads, ARRAY_SIZE(usb_otg_pads)); #endif return 0; } diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig index 717cabfa3b..395275c6dd 100644 --- a/configs/tbs2910_defconfig +++ b/configs/tbs2910_defconfig @@ -43,6 +43,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_DM=y CONFIG_DWC_AHSATA=y CONFIG_DM_GPIO=y +CONFIG_DM_KEYBOARD=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y CONFIG_MII=y @@ -51,6 +52,7 @@ CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y CONFIG_DM_THERMAL=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index b06c90939c..93f75d72f3 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -81,7 +81,6 @@ /* USB */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #ifdef CONFIG_CMD_USB_MASS_STORAGE From patchwork Fri Mar 1 12:10:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?S=C3=B6ren_Moch?= X-Patchwork-Id: 1050139 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=web.de Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=web.de header.i=@web.de header.b="KW7qQzsv"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 449pKG6v5Vz9s3q for ; Fri, 1 Mar 2019 23:15:30 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id AF233C21C38; Fri, 1 Mar 2019 12:12:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 9C63AC21E29; Fri, 1 Mar 2019 12:11:25 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4FB6EC21C93; Fri, 1 Mar 2019 12:11:18 +0000 (UTC) Received: from mout.web.de (mout.web.de [212.227.15.4]) by lists.denx.de (Postfix) with ESMTPS id 5D0F9C21C93 for ; Fri, 1 Mar 2019 12:11:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1551442275; bh=9NqP7QiN1Xcmr2F/1QfUy97rS3IqEhh9IzOVu6TIo9E=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=KW7qQzsvGYdYCKQzQPNjaJgeLNlZm/iS9e2nhDIpggHdgIsarCA2mYx/xIulCMA4s /8Z+tW41YUgQA4hIphxcMumMgfqVZSgEbCvPsj88wPkjWDDm4BLTsxcfls6G07Yng/ cReQX0pSZvtOQlABYQ7GdHwMVoKLZyr0YAtjYUUc= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from localhost.localdomain ([89.15.236.239]) by smtp.web.de (mrweb002 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MXYnu-1gWbOm3O4s-00WVJz; Fri, 01 Mar 2019 13:11:14 +0100 From: Soeren Moch To: Stefano Babic Date: Fri, 1 Mar 2019 13:10:57 +0100 Message-Id: <20190301121101.14163-7-smoch@web.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190301121101.14163-1-smoch@web.de> References: <20190301121101.14163-1-smoch@web.de> X-Provags-ID: V03:K1:QGvQy9avkXk1INU8gg8VauZ6UO01EUN2Q9tZWBP4hTIlOZmXtH3 RIrYO/6B8AOVoydJ7I9czkbmO3aG9VgbzJ4sHp7j8NXEYdUtEfacmwoTVqkllzdBB+aEsK1 8KOe6mFGimCn+qQhPWcX0jiSUWj/Qb2ZjZnT7OHT/D/yg1ig7dVf/nCK8CYTaO6NoYfvfPN t/LiGtAzH1Fnn5EZbYCmQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:66xEMxlzsBw=:1+x4sw3DFRZbEHwJg84fpy YmSuQf6Pbl5VF/VjnRc8CyS2fjpqOx5UYZK7PBmz46x7t0FBbwbU9wROiW5EDtJcd1yWRFPPO cEVc9rTJ/yyReaX7eRrncAyPiwJZnKl+iYDyyD2hivTg9gTjfqjzQsf8SP31lvjpqyPstlNFA H4WCTpCdE1WL+ooRI/3QZRyNB+ST8rIYlLOFywJd4kIgFbBNYRcdS2h5vZpuJ1KMeah0mHRrV 0URnutvOxM3wGDjQjyTwl8aVqNLk5V1rdcAoGD2dpUdZdn1mqm7ZHZYhRCu4dApTz5vh5OmeL GtYY0t3/VqbwrGN8D4b+CtUJJOkTtvTVVAT2bQfWI/b84YqLkeDOLihCUUfy1XwBDVJ/Y6zW5 ruGZAiJPrkHqdvw1aklj8U+hEiNSQA1TsjEM4zubZu/QFzWcyBBPpPJOd/UhnuMWUaYBbV4dP o6EDDdSCh3bSroyWuQtnxaZ+6Q/cuYGSnlum5vqaiGvsIvRxaqIlkcGAKKYlNWtq9Jsq+txFh f/TPArT6kC3T7wv8F1OXIAmNVeiNV+UK0ZQF3p5CpnMokDjAzBoQCm6e1/DO4xPU4W+NducCo 4uNI5qDWWJTyIGpBlbq31yuGJHrZxIDhLtvnzCbP3LWULs26Ty7bNdnO1Lr9DYnxCNGOlX4fP BH1nKWs23kivjzYYoEFRSBZ2ayrfeOfVNFr5jS3HlPdFbRiLKZDI+JO1viFua/yIEzJAndsbr kY2WH7WJd1V3j5pp+FPR5ywR/AZ0oR/fW4kzdOUvRuXD6dgNJhuWkR42+gQO/6Vx7KWS9grAj Z2XQ/DHWetOaN7/2gh//dK160SUg9Dsb9S/aaEh9AYrw500MUG/IRTWQnxxSP8b+BS9cZv4mc Q5LBdjzmgo77BIXByVtV9T0/2E031iLpkk0EPLbEV8BnDuXBByF6MHkHO4FD5t Cc: u-boot@lists.denx.de, Soeren Moch Subject: [U-Boot] [PATCH 06/10] board: tbs2910: Convert i2c and rtc to driver model X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" So we don't need to duplicate settings from the device tree in the board file. Signed-off-by: Soeren Moch --- Cc: Stefano Babic Cc: u-boot@lists.denx.de --- board/tbs/tbs2910/tbs2910.c | 57 ------------------------------------- configs/tbs2910_defconfig | 6 +++- include/configs/tbs2910.h | 17 ----------- 3 files changed, 5 insertions(+), 75 deletions(-) -- 2.17.1 diff --git a/board/tbs/tbs2910/tbs2910.c b/board/tbs/tbs2910/tbs2910.c index 20c93778e1..2445efbde2 100644 --- a/board/tbs/tbs2910/tbs2910.c +++ b/board/tbs/tbs2910/tbs2910.c @@ -9,7 +9,6 @@ #include #include #include -#include #include #include #include @@ -22,7 +21,6 @@ #include #include #include -#include DECLARE_GLOBAL_DATA_PTR; #define WEAK_PULLUP (PAD_CTL_PUS_47K_UP | \ @@ -40,56 +38,6 @@ DECLARE_GLOBAL_DATA_PTR; #define ENET_PAD_CTRL (PAD_CTL_PUS_100K_UP | \ PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS) -#define I2C_PAD_CTRL (PAD_CTL_PUS_100K_UP | \ - PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS | \ - PAD_CTL_ODE | PAD_CTL_SRE_FAST) - -#define I2C_PAD MUX_PAD_CTRL(I2C_PAD_CTRL) - -#ifdef CONFIG_SYS_I2C -/* I2C1, SGTL5000 */ -static struct i2c_pads_info i2c_pad_info0 = { - .scl = { - .i2c_mode = MX6_PAD_CSI0_DAT9__I2C1_SCL | I2C_PAD, - .gpio_mode = MX6_PAD_CSI0_DAT9__GPIO5_IO27 | I2C_PAD, - .gp = IMX_GPIO_NR(5, 27) - }, - .sda = { - .i2c_mode = MX6_PAD_CSI0_DAT8__I2C1_SDA | I2C_PAD, - .gpio_mode = MX6_PAD_CSI0_DAT8__GPIO5_IO26 | I2C_PAD, - .gp = IMX_GPIO_NR(5, 26) - } -}; - -/* I2C2 HDMI */ -static struct i2c_pads_info i2c_pad_info1 = { - .scl = { - .i2c_mode = MX6_PAD_KEY_COL3__I2C2_SCL | I2C_PAD, - .gpio_mode = MX6_PAD_KEY_COL3__GPIO4_IO12 | I2C_PAD, - .gp = IMX_GPIO_NR(4, 12) - }, - .sda = { - .i2c_mode = MX6_PAD_KEY_ROW3__I2C2_SDA | I2C_PAD, - .gpio_mode = MX6_PAD_KEY_ROW3__GPIO4_IO13 | I2C_PAD, - .gp = IMX_GPIO_NR(4, 13) - } -}; - -/* I2C3, CON11, DS1307, PCIe_SMB */ -static struct i2c_pads_info i2c_pad_info2 = { - .scl = { - .i2c_mode = MX6_PAD_GPIO_3__I2C3_SCL | I2C_PAD, - .gpio_mode = MX6_PAD_GPIO_3__GPIO1_IO03 | I2C_PAD, - .gp = IMX_GPIO_NR(1, 3) - }, - .sda = { - .i2c_mode = MX6_PAD_GPIO_6__I2C3_SDA | I2C_PAD, - .gpio_mode = MX6_PAD_GPIO_6__GPIO1_IO06 | I2C_PAD, - .gp = IMX_GPIO_NR(1, 6) - } -}; -#endif /* CONFIG_SYS_I2C */ - static iomux_v3_cfg_t const uart1_pads[] = { MX6_PAD_CSI0_DAT10__UART1_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL), MX6_PAD_CSI0_DAT11__UART1_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL), @@ -426,11 +374,6 @@ int board_init(void) #ifdef CONFIG_VIDEO_IPUV3 setup_display(); #endif -#ifdef CONFIG_SYS_I2C - setup_i2c(0, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info0); - setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1); - setup_i2c(2, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info2); -#endif #ifdef CONFIG_DWC_AHSATA setup_sata(); #endif diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig index 395275c6dd..153f61d09d 100644 --- a/configs/tbs2910_defconfig +++ b/configs/tbs2910_defconfig @@ -28,7 +28,6 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y -CONFIG_CMD_DATE=y CONFIG_CMD_TIME=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y @@ -43,6 +42,8 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_DM=y CONFIG_DWC_AHSATA=y CONFIG_DM_GPIO=y +CONFIG_DM_I2C=y +CONFIG_SYS_I2C_MXC=y CONFIG_DM_KEYBOARD=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y @@ -50,6 +51,8 @@ CONFIG_MII=y CONFIG_PCI=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y +CONFIG_DM_RTC=y +CONFIG_RTC_DS1307=y CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_DM_USB=y @@ -62,5 +65,6 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_I2C_EDID=y CONFIG_VIDEO=y # CONFIG_EFI_LOADER is not set diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 93f75d72f3..eff93eff4f 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -97,23 +97,6 @@ #endif /* CONFIG_USB_KEYBOARD */ #endif /* CONFIG_CMD_USB */ -/* RTC */ -#ifdef CONFIG_CMD_DATE -#define CONFIG_RTC_DS1307 -#define CONFIG_SYS_RTC_BUS_NUM 2 -#endif - -/* I2C */ -#ifdef CONFIG_CMD_I2C -#define CONFIG_SYS_I2C -#define CONFIG_SYS_I2C_MXC -#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */ -#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */ -#define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */ -#define CONFIG_SYS_I2C_SPEED 100000 -#define CONFIG_I2C_EDID -#endif - /* Environment organization */ #define CONFIG_SYS_MMC_ENV_DEV 2 /* overwritten on SD boot */ #define CONFIG_SYS_MMC_ENV_PART 1 /* overwritten on SD boot */ From patchwork Fri Mar 1 12:10:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?S=C3=B6ren_Moch?= X-Patchwork-Id: 1050141 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=web.de Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=web.de header.i=@web.de header.b="mJVDCJUh"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 449pKS0dNmz9s3q for ; Fri, 1 Mar 2019 23:15:39 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 9E965C21DA6; Fri, 1 Mar 2019 12:12:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 2734BC21E26; Fri, 1 Mar 2019 12:11:24 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E22C6C21E29; Fri, 1 Mar 2019 12:11:19 +0000 (UTC) Received: from mout.web.de (mout.web.de [212.227.15.3]) by lists.denx.de (Postfix) with ESMTPS id C3D02C21D83 for ; Fri, 1 Mar 2019 12:11:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1551442275; bh=Vw3TGsoktsvEZiNY0cb4hYPVPQUjwamhYsyj8k+ET1M=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=mJVDCJUheKMZrtWpG76BNXfzdZl0dkjdUSlLlTRWXtDIWJ3+vrTGU43jR6a6NnTLt A/ewPVliNhQ9zrBI1nwePFGz2nNVW6ReDEcwaMbPbXz9fQsap6XrAY0tGsYOTG4Ed5 4LNRref+aC9GYAxq75GpLYGWvaaRsoBYBzbSrp4o= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from localhost.localdomain ([89.15.236.239]) by smtp.web.de (mrweb002 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MAdX1-1gowYq0xDP-00Bw22; Fri, 01 Mar 2019 13:11:15 +0100 From: Soeren Moch To: Stefano Babic Date: Fri, 1 Mar 2019 13:10:58 +0100 Message-Id: <20190301121101.14163-8-smoch@web.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190301121101.14163-1-smoch@web.de> References: <20190301121101.14163-1-smoch@web.de> X-Provags-ID: V03:K1:ym/TjZNBgqOY2RjplsAk8xBGB/wbf1TPr6u88SCZie5BXNp3h0m 4cyTam1bGSakY8lSBJ+on6TZJFA6EdH5Xf24X9T674WM1obAS4ghmOPYlqrYm/ZN/ns1NA7 5nCEBNsxY45UJGYQ8FvmdxrnUNbpSyd8r1sLi7GOgA/j4o+bHtnfQhw0FVQp/xNItZTMydf PxY9FAaBzepNy074YLwIg== X-UI-Out-Filterresults: notjunk:1; V03:K0:fxT4Ir8Gf5k=:80004AzET4niY4YUHkRuZT PHaajNkYTrqUestdUlg8KXoKXsosz2wmWRMME59/aRI+wcDDsMTFHibTj5Lj3869MSTdis1Eb MmsmdGep+zmynTDxK3czBNzxEoHIxobA9iCkDR2zSWuzlwn68DnW9XSWOqk5AjcFMKAmzWFli 8rMpXO6WkPa2gxMNtmuIFdHO9rt76Z2tjtCur3AsB6/rHWvMBre15WrzVOq3ilG+VmZnVWmvf 2Q5i4BhF4a6rSp6ntdAKv9qH/JBMDpnOR1Wd8wK2ygDJWBZF8Ku7Ia/pOiycv5VUk6DovKT7r 5U1jDMy5GvoZPP72TECj1+oOm1laJXmsP+OwcKoL2q5uazFe753fcVxTZJ+32swPPSOLfs9Ss cmdz0P6g/Rw3Cnu9WZut15mtzn/gammc7hDlqrz1/Rk5U57+82Ps2v2d63ntvAJ6/soQt3kk9 pW3Fgcun8dsrd7J0KXU6X10nCEmgzK051duvHKuQh5pqqComIm9cpIJ9gjMSmwpSe+YC4kboF z4viSFEIazrnjtkg1KBvyGWMCE7ODKwmOlzwl9eBqukylUti5VnAISiEUBj9gaWE+R4gzOw/9 JwsyyNG+8z3DT8HJtW4w6M/ym1Yzo5CRq7BaekvXqF8WcnorMOE4qL9UU6Jt3unxS3AfXamsM 8Pm+Ehf5F7lcGmAgH5AjfZQH2yLuAzj54ei/5K4rCjiJp+un90L2lazeLELKATkifQKKW6hvh g7wACjmvFQS/epGvdt5py6CfdC+rk8C6hvklzwG1ebF62E2mIhZaylrsP0DsP2U6DI48ix59H ro2CPx13gNn+qaiCY7R376A+H+ojWTlnjUJMBHBJ2FxrmtKtsYCBo9XcHni/0y+KEpQmmtJm+ aXNG1qxuDBoeyUEMGt5zy7Ht0dL6SEoA24f//sWnuurR8M0obj53xK5juuuGWo Cc: u-boot@lists.denx.de, Soeren Moch Subject: [U-Boot] [PATCH 07/10] ata: dwc_ahsata: Fix sector reports for large disks X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Do not report negative sector numbers for disks > 1TB, do not limit sector numbers to 32 bit if CONFIG_SYS_64BIT_LBA is enabled. Signed-off-by: Soeren Moch --- Cc: Stefano Babic Cc: u-boot@lists.denx.de --- drivers/ata/dwc_ahsata.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) -- 2.17.1 diff --git a/drivers/ata/dwc_ahsata.c b/drivers/ata/dwc_ahsata.c index 4c5b98482f..6fe5641dd9 100644 --- a/drivers/ata/dwc_ahsata.c +++ b/drivers/ata/dwc_ahsata.c @@ -511,15 +511,9 @@ static int ahci_port_start(struct ahci_uc_priv *uc_priv, u8 port) static void dwc_ahsata_print_info(struct blk_desc *pdev) { printf("SATA Device Info:\n\r"); -#ifdef CONFIG_SYS_64BIT_LBA printf("S/N: %s\n\rProduct model number: %s\n\r" - "Firmware version: %s\n\rCapacity: %lld sectors\n\r", + "Firmware version: %s\n\rCapacity: " LBAFU " sectors\n\r", pdev->product, pdev->vendor, pdev->revision, pdev->lba); -#else - printf("S/N: %s\n\rProduct model number: %s\n\r" - "Firmware version: %s\n\rCapacity: %ld sectors\n\r", - pdev->product, pdev->vendor, pdev->revision, pdev->lba); -#endif } static void dwc_ahsata_identify(struct ahci_uc_priv *uc_priv, u16 *id) @@ -754,7 +748,6 @@ static int dwc_ahsata_scan_common(struct ahci_uc_priv *uc_priv, u8 serial[ATA_ID_SERNO_LEN + 1] = { 0 }; u8 firmware[ATA_ID_FW_REV_LEN + 1] = { 0 }; u8 product[ATA_ID_PROD_LEN + 1] = { 0 }; - u64 n_sectors; u8 port = uc_priv->hard_port_no; ALLOC_CACHE_ALIGN_BUFFER(u16, id, ATA_ID_WORDS); @@ -773,9 +766,8 @@ static int dwc_ahsata_scan_common(struct ahci_uc_priv *uc_priv, ata_id_c_string(id, product, ATA_ID_PROD, sizeof(product)); memcpy(pdev->vendor, product, sizeof(product)); - /* Totoal sectors */ - n_sectors = ata_id_n_sectors(id); - pdev->lba = (u32)n_sectors; + /* Total sectors */ + pdev->lba = ata_id_n_sectors(id); pdev->type = DEV_TYPE_HARDDISK; pdev->blksz = ATA_SECT_SIZE; From patchwork Fri Mar 1 12:10:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?S=C3=B6ren_Moch?= X-Patchwork-Id: 1050143 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=web.de Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=web.de header.i=@web.de header.b="kLtaYjsa"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 449pLn3MXHz9s3q for ; Fri, 1 Mar 2019 23:16:49 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 35D6AC21DCA; Fri, 1 Mar 2019 12:13:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 6B2B1C21E1D; Fri, 1 Mar 2019 12:11:29 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id EFA20C21E30; Fri, 1 Mar 2019 12:11:23 +0000 (UTC) Received: from mout.web.de (mout.web.de [212.227.15.3]) by lists.denx.de (Postfix) with ESMTPS id D1FE4C21C27 for ; Fri, 1 Mar 2019 12:11:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1551442276; bh=DrbPsXsbqSSvw44wW9z2UbsI/PD7cBYcpT0+YRbdVps=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=kLtaYjsa1QF2OORa4VlzUQn55FH62FgvRznHgqu4WN1vjbhSb0BZ9VSk/AtwNCR42 k21PhI8uybtI3MIVPryIsnyJpXLstdhUa0WVWDfKFn+9O2GA+Oq4jEgDWCA5OSby9W FlP8s13Ddg6aHUSzXfeXERtxZ+w0LfLmaNTZ+5Lw= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from localhost.localdomain ([89.15.236.239]) by smtp.web.de (mrweb002 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MN47k-1gt7RE1HzM-006hFV; Fri, 01 Mar 2019 13:11:16 +0100 From: Soeren Moch To: Stefano Babic Date: Fri, 1 Mar 2019 13:10:59 +0100 Message-Id: <20190301121101.14163-9-smoch@web.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190301121101.14163-1-smoch@web.de> References: <20190301121101.14163-1-smoch@web.de> X-Provags-ID: V03:K1:9aYGENBSC2LtMWuufQ1t1edL5HHlzlCKtaAJgD/eIjfZ33mJYax HfTuADUGi/m2pbAWh0rn9zVaygXVvFSgltMHKV1zrGlVXB0Saa5ak6xd76UyBfgnVNnaxPb Eb+6j4JhD1JdjuNvtNtN4yceISGgLYKZ7nnM7IpMldrjwDe9Yf4zrmQlGl8GlVai2E9E/HU jhQFPdiRjrULWyM8nYDbA== X-UI-Out-Filterresults: notjunk:1; V03:K0:v0s/xwtSeso=:DdLw0DN3IZ0BJ/tSyF7eHH tyokFx22kTL7mr4iM27IJML4lIs/6ZE302yb8F1nLNN76MutLy0XEiT9yA20jAgkg17E2xa13 0Mex6KQQJCKncERA6RPzksbuVg8Rrs3kLhbCAYZhfOypRBakWocEUtlckYcSxF5Bd/2cbQU1m UxBx6Kxm0DanSYxh7hJe80jrZPQd1X3bkCyyuUgs1CDu8xI59mYTO65d5dOmSjBHEfm4Tc4sf iICV2nTWAqF8sWSyphZJp8BHAxCAKfXTKh+IOljIXP3v/vUljqT97tTgEE6/40nWSgHWDnJLV 6KzP54UD5OAmNKiZBt+7h1Cns3/CjKjxUL8Iv2xLjat74iq1JjCN8Ej6eLJdlOgFDhUoyPzVD FHxvKjw9aLunr6m/nE7CZ8KcpvNRCoFEKudLBX+F8vVxvjSGU4B3aMEeSJUr6SnnUcj6GSJYa VRM4TNlHjw1gt+3X2MsrhtwnqG6nAKbWCOS5e/daIZ+3A+Jirm4XQqm/QPiClwf9GrePB2ytM XRQWGeRXFeWrw1SzGvmd4x+bwkS77VjlE/KxCgjGCi6iLO6R3ieXwWdIkmVXxgm2tKllWpPJz 2bX8fluC8ZRrQHsq4dnxzvMrhwROvIPfga0MxMaODqt1VFNKdigSqM61oWoLXvJidEPcAepdg vvW/RLXG+eNe6+8FuI3tZfBIwe9R3V9WEK17qSFDwqXXzMUq/ZYamV9TuCAzV9Zk4NB/Jy9HV MFtWscor2n7Dzvglom9RJkA8Fr0NhDYGDDOUrxKGbrLJuuIxbjb6sr+jrSp0/CGJMb/hW20yy Y4xmh4D6sX7/jEu9ciqIq5CCUQgSA4AFk1EMyk+cjTkaAWPGNXpFkGndILit7PhK3NQghloUQ FHGprmgMghszmeqMGdsEH9tNJuUfKfp6g7wZqwaKpb/aTZV6F976w+NV/kt446 Cc: Nikita Kiryanov , u-boot@lists.denx.de, Soeren Moch , Marcel Ziswiler , Stefan Roese Subject: [U-Boot] [PATCH 08/10] ata: dwc_ahsata: Add ahci driver model support X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Disable this support for cm_fx6 to avoid breakage. Signed-off-by: Soeren Moch --- It would be easy to add weak board_ahci_enable/disable functions which can be overwritten (e.g. in the cm_fx6 board file) to handle power enable/ disable on driver probe/remove. But I have no idea why this board needs these repeated probe/remove calls for the same sata device. In my tests on a tbs2910 board a sata harddisk is always recognized by a 'sata init' command, also without this probe loop. If this can be ironed out, we can remove the DWC_AHSATA_AHCI config option. Cc: Nikita Kiryanov Cc: Stefano Babic Cc: Fabio Estevam Cc: Marcel Ziswiler Cc: Stefan Roese Cc: Simon Glass Cc: u-boot@lists.denx.de --- configs/cm_fx6_defconfig | 1 + drivers/ata/Kconfig | 8 ++++++++ drivers/ata/dwc_ahsata.c | 24 ++++++++++++++++++++++++ 3 files changed, 33 insertions(+) -- 2.17.1 diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig index c8d1e83111..1623357132 100644 --- a/configs/cm_fx6_defconfig +++ b/configs/cm_fx6_defconfig @@ -51,6 +51,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6q-cm-fx6" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DWC_AHSATA=y +# CONFIG_DWC_AHSATA_AHCI is not set CONFIG_DM_KEYBOARD=y CONFIG_DM_MMC=y CONFIG_FSL_ESDHC=y diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index 49a056e941..d7818c2d68 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig @@ -66,6 +66,14 @@ config DWC_AHSATA Enable this driver to support the DWC AHSATA SATA controller found in i.MX5 and i.MX6 SoCs. +config DWC_AHSATA_AHCI + bool "Enable DWC AHSATA AHCI driver support" + depends on DWC_AHSATA + depends on AHCI + default y + help + Enable this option unless you need your private ahci implementation + config FSL_SATA bool "Enable Freescale SATA controller driver support" select LIBATA diff --git a/drivers/ata/dwc_ahsata.c b/drivers/ata/dwc_ahsata.c index 6fe5641dd9..afced8e7e3 100644 --- a/drivers/ata/dwc_ahsata.c +++ b/drivers/ata/dwc_ahsata.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -1020,6 +1021,9 @@ int dwc_ahsata_probe(struct udevice *dev) struct ahci_uc_priv *uc_priv = dev_get_uclass_priv(dev); int ret; +#if defined(CONFIG_MX6) + setup_sata(); +#endif uc_priv->host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA | ATA_FLAG_NO_ATAPI; uc_priv->mmio_base = (void __iomem *)dev_read_addr(dev); @@ -1067,4 +1071,24 @@ U_BOOT_DRIVER(dwc_ahsata_blk) = { .ops = &dwc_ahsata_blk_ops, }; +#if CONFIG_IS_ENABLED(DWC_AHSATA_AHCI) +struct ahci_ops dwc_ahsata_ahci_ops = { + .port_status = dwc_ahsata_port_status, + .reset = dwc_ahsata_bus_reset, + .scan = dwc_ahsata_scan, +}; + +static const struct udevice_id dwc_ahsata_ahci_ids[] = { + { .compatible = "fsl,imx6q-ahci" }, + { } +}; + +U_BOOT_DRIVER(dwc_ahsata_ahci) = { + .name = "dwc_ahsata_ahci", + .id = UCLASS_AHCI, + .of_match = dwc_ahsata_ahci_ids, + .ops = &dwc_ahsata_ahci_ops, + .probe = dwc_ahsata_probe, +}; +#endif #endif From patchwork Fri Mar 1 12:11:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?S=C3=B6ren_Moch?= X-Patchwork-Id: 1050136 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=web.de Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=web.de header.i=@web.de header.b="guauYWRF"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 449pJH4tjvz9s47 for ; Fri, 1 Mar 2019 23:14:39 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 65FB3C21DFD; Fri, 1 Mar 2019 12:13:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id E78DEC21DFF; Fri, 1 Mar 2019 12:11:35 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2D904C21E36; Fri, 1 Mar 2019 12:11:23 +0000 (UTC) Received: from mout.web.de (mout.web.de [212.227.15.3]) by lists.denx.de (Postfix) with ESMTPS id F0EFCC21DB5 for ; Fri, 1 Mar 2019 12:11:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1551442277; bh=qd23JOgeG3k3WSHHP4Vx/ptucGeGHtdQVlWGys7m2gc=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=guauYWRFeygg9EjrOV9/JPSy+PrNBoFz4GbZHH2zD+cKfDx3FkUvqlG1hUSJbUabx mnQlWr9dzHz4h6Az8w6lE3DfgxdTZermVrhTZQXeR5DaC9focdA46YEwkL5dA/nn61 8iAa8kosSY49n0Br2EWmBGKPa4kxnfUwfHkOR8bw= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from localhost.localdomain ([89.15.236.239]) by smtp.web.de (mrweb002 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MX0q4-1gW3AO3TGu-00VxM9; Fri, 01 Mar 2019 13:11:17 +0100 From: Soeren Moch To: Stefano Babic Date: Fri, 1 Mar 2019 13:11:00 +0100 Message-Id: <20190301121101.14163-10-smoch@web.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190301121101.14163-1-smoch@web.de> References: <20190301121101.14163-1-smoch@web.de> X-Provags-ID: V03:K1:lHHS2drterfeUSVdzWNZURW9g/kWNOgyhU16dqaCSx2YVWlsaAw ImQdsv/CROVeFS/UL1yI3JwxwECxFSXZCGHuvJWfg7h/WgKSrU5QyJK1nWb21zQtgU9cygj AIiU1Ygslb64xcBI4haTTWFjf7ulkn4B9JYOv55/4Xl/z+ZWV/hor8uOOUce7RP2niy6XMT 3eiPIV/CTOYzRk3lM/7wA== X-UI-Out-Filterresults: notjunk:1; V03:K0:F7OcjpnUf8M=:AW7y//OFS0C/ut1VzBe2RP zffPB1HyUkiEdMCoV0iw4y5YFpdqDHXJnzxaHreBcrmR2SXSedzdjTPKDY4btDN3G5DemAxyw M1KKaPk/THVUFrkDR6Hd180SgsMNILAkc8MPf74K8lJeQfSNt0DGFpvPyhHy7aFmsjtR9kARc 7ko8Y9OB4sQHmlclIhwP7v8vn1eX8uA3I8WneVbgp0HqAL0C+58GqiVBolLIfGclp0EicnLxp N+JJfIBxl/96hW4pSwKHnzyCpH2z0hGXd31gcEnYmg5yBWzu3C8ibt514qlVOTlcef2hGIGk0 11G0p+PD9P9s6sshfgYIorxF+PQmU8PelhT8zE1XXughMK+D8q9pMTkAs9WNb+XaEkerK9E0Q BNGeMKREhZrgC5jS2L2yPy/QUiq+zBZy31sLJCzlcJkIsXAD0pj/CsnVj2AZVx9+F5+BHw7gG orCEXbdkTYE7QIJVZE4IYkhfHKfqtnd9Rkf8PF09xRSh5Htyg/FuOEd36Qd50xHjAShUmXNhC 1MnMAhwF+Jqjc+EQQkhLs4EjBZbY77cWwLpSrj0zOfwj61fGmsookcmRKkYwW1mCs8tVmTw/u J+sw7rmsHFqKn7n1hf23Qd11ByDhBvQNLy0C+oeSvMKJqjM+ee8wDVU+XlGLqmzDfXYnzGMFm AyrOsbkPAG1bj1BnBNeBUA8IjLY45+TDwqYk4pJqDjJ5uLuq9crlRaMQAoMJgzVPt4iGQopKc V17hgTBB5f1lysKWngiI+cOaowTMF82Y9JB8D7K4mcpw0/F4PT/CqiipJkNfJqfR9tYSDaixH iZq+s6SJ/R/TgPKxp0S4zrkLdIK9hKoh1AKgFHA6G7ioxIeAA0O8RV8RIS5+tkYhsWuIoY3eg 46QOXHPC/v7iMk7yiUBBUpuio+PIYoTLxhyhRlEEb8Dmp1zpw5EyrRmLYIuqO0 Cc: u-boot@lists.denx.de, Soeren Moch , Nikita Kiryanov , Marcel Ziswiler Subject: [U-Boot] [PATCH 09/10] board: tbs2910: Convert sata to ahci driver model X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" While at it, also configure 64-bit LBA support. Signed-off-by: Soeren Moch --- Cc: Stefano Babic Cc: Nikita Kiryanov Cc: Marcel Ziswiler Cc: u-boot@lists.denx.de --- board/tbs/tbs2910/tbs2910.c | 4 ---- configs/tbs2910_defconfig | 1 + include/configs/tbs2910.h | 1 + 3 files changed, 2 insertions(+), 4 deletions(-) -- 2.17.1 diff --git a/board/tbs/tbs2910/tbs2910.c b/board/tbs/tbs2910/tbs2910.c index 2445efbde2..84c813e29f 100644 --- a/board/tbs/tbs2910/tbs2910.c +++ b/board/tbs/tbs2910/tbs2910.c @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include @@ -374,9 +373,6 @@ int board_init(void) #ifdef CONFIG_VIDEO_IPUV3 setup_display(); #endif -#ifdef CONFIG_DWC_AHSATA - setup_sata(); -#endif #ifdef CONFIG_CMD_BMODE add_board_boot_modes(board_boot_modes); #endif diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig index 153f61d09d..54e34df6aa 100644 --- a/configs/tbs2910_defconfig +++ b/configs/tbs2910_defconfig @@ -4,6 +4,7 @@ CONFIG_ARCH_MX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_TARGET_TBS2910=y CONFIG_CMD_HDMIDETECT=y +CONFIG_AHCI=y CONFIG_NR_DRAM_BANKS=1 CONFIG_BOOTDELAY=3 CONFIG_PRE_CONSOLE_BUFFER=y diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index eff93eff4f..a211b9d611 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -77,6 +77,7 @@ #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR #define CONFIG_LBA48 +#define CONFIG_SYS_64BIT_LBA #endif /* USB */ From patchwork Fri Mar 1 12:11:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?S=C3=B6ren_Moch?= X-Patchwork-Id: 1050135 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=web.de Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=web.de header.i=@web.de header.b="JeQJvbTT"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 449pJG4Cswz9s3q for ; Fri, 1 Mar 2019 23:14:38 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 2E941C21DB5; Fri, 1 Mar 2019 12:13:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 06ADAC21DA2; Fri, 1 Mar 2019 12:11:27 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 929F9C21E1B; Fri, 1 Mar 2019 12:11:21 +0000 (UTC) Received: from mout.web.de (mout.web.de [212.227.15.3]) by lists.denx.de (Postfix) with ESMTPS id BA077C21E08 for ; Fri, 1 Mar 2019 12:11:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1551442277; bh=FpgaeWPOIm+go6hp2e0aA61rg3TLczzV4v3qD5AA+Xo=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=JeQJvbTTEpw4VEHHUqsyWs6P9INgplulv6B9JzjMIOho5vlEeKQY/UAt8IOyUCfjB dnrtyZ2I7Co1mKBqfuZu0VVtE8e5bjmKNEFNFavUuwKJeCPWmNeu+q4LHTEFuOmlLL pBO1RIY33Zk9yLD16FwTc3PeYIDEMRPl2WvHMa3s= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from localhost.localdomain ([89.15.236.239]) by smtp.web.de (mrweb002 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MLP9u-1h0FEt0wny-000cR5; Fri, 01 Mar 2019 13:11:17 +0100 From: Soeren Moch To: Stefano Babic Date: Fri, 1 Mar 2019 13:11:01 +0100 Message-Id: <20190301121101.14163-11-smoch@web.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190301121101.14163-1-smoch@web.de> References: <20190301121101.14163-1-smoch@web.de> X-Provags-ID: V03:K1:2UBClkm5CNt6QdytdvmpZbsjas4EPXMEr/LBQosT7hz6ngcjH54 kWtDQejlZ/DeUV52NzuM+vunWrKnYidMdy24Y2LTSZF5sOY5KpAatLo8LbjoA/FCJbtVyCE rnHgw9WjSZ+oV5HUdNWT7EifetBUkXqzEGUkz4rRmQmdTC/+fjvsNM8ZBuyeHleBgBxNsQa PzySd/IRAoSzHvXRIqIAA== X-UI-Out-Filterresults: notjunk:1; V03:K0:mAWtRuxk6A4=:KQIEddneh+mHUet6ppu4Ii T0cmgu3QIXNzV701WvDoOis1vM50jKvs8ipaKpwMZSX/WcZnrwjNQ6WWFH5Zjktboh7CjlFPH i3Rxx/79sk7UwLxhMQKz7L7Alz0VoyoKuj8l2TACr+98HCDFJBaKdNay788SB656uO6ETfLk5 pGOpCpqmFimgIG5BY8kVJFbdrmiZJKf8YeC2xdHPKMiYWn0pngjwlFLEaetwCZkgyI8ohK9iw Y7qjtMv7ruBlcto51nTG9Scr+P0X8cd3sldmR2lpIKZAHNXbF1kkuUQW5Ruz+0HolH39vOOzx FI90V9NKpM+TjIto/306fC9ysztuNZao7e+RUCf6etFWZTkzoIoloTTdYvIrdgRnWpEJE8H8s FCKuhDw7HHTjJyYS2QrHg1TCO8cLAaYSam1sSQW+VFRJJcQYkpXbAdvW4YK96DCEAZMWq1OVR ABeYQl5lFyrL25uc8EIcsFrwKMkQ9NunOrQFOK7LS2eZ9WlXzsICCO88FmKc9Cmo0bjz3hx50 L7cZN29/yt/jX7bkVoK0xrV+mtq0hNyfz887EE3uMRohoPY3C/hVAJgsM+CBDzSMs4181QI/e iBRAwD2C6DfDBBwbuqn1H0QodqYWol5ujG79srIBO3UNMaUQ8Qz5ndmriF9jHOG5RF9rqPx+n 1Alf3D3BtHGBe4dr8pm/t1YyNNpHw5wLyGkcad59OX2QHAriQLyDKyDP6yNf5shkuMGOVXYMJ mMYISNi2EZzX9n7xq5thFd6c1GHbOpCVOMfZqDFcDsEcXsLDSJ41QQNqFHu+3BBgc/2k6JyhD dbdTiyNYBTnLDhJ+KqyfOmdw7ZFA9tkXQ0ZDJFAmYKcoQe0zOCR5PibkJbtqy0dAo7PwHuyZ5 f8fovbTwL7/WRKwBWMB0lBW9gMJXno4lNxvXvns7ISCUefnyjJqnTOgOTTGpd3 Cc: u-boot@lists.denx.de, Soeren Moch Subject: [U-Boot] [PATCH 10/10] board: tbs2910: Convert mmc to driver model X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" So we don't need to duplicate settings from the device tree in the board file. Signed-off-by: Soeren Moch --- Cc: Stefano Babic Cc: u-boot@lists.denx.de --- board/tbs/tbs2910/tbs2910.c | 108 ------------------------------------ configs/tbs2910_defconfig | 1 + include/configs/tbs2910.h | 7 --- 3 files changed, 1 insertion(+), 115 deletions(-) -- 2.17.1 diff --git a/board/tbs/tbs2910/tbs2910.c b/board/tbs/tbs2910/tbs2910.c index 84c813e29f..fb0e773afc 100644 --- a/board/tbs/tbs2910/tbs2910.c +++ b/board/tbs/tbs2910/tbs2910.c @@ -30,10 +30,6 @@ DECLARE_GLOBAL_DATA_PTR; PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | \ PAD_CTL_SRE_FAST | PAD_CTL_HYS) -#define USDHC_PAD_CTRL (PAD_CTL_PUS_47K_UP | \ - PAD_CTL_SPEED_LOW | PAD_CTL_DSE_80ohm | \ - PAD_CTL_SRE_FAST | PAD_CTL_HYS) - #define ENET_PAD_CTRL (PAD_CTL_PUS_100K_UP | \ PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS) @@ -103,110 +99,6 @@ static void setup_iomux_uart(void) } #ifdef CONFIG_FSL_ESDHC -static iomux_v3_cfg_t const usdhc2_pads[] = { - MX6_PAD_SD2_CLK__SD2_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD2_CMD__SD2_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD2_DAT0__SD2_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD2_DAT1__SD2_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD2_DAT2__SD2_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD2_DAT3__SD2_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_NANDF_D2__GPIO2_IO02 | MUX_PAD_CTRL(NO_PAD_CTRL), /* CD */ -}; - -static iomux_v3_cfg_t const usdhc3_pads[] = { - MX6_PAD_SD3_CLK__SD3_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD3_CMD__SD3_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD3_DAT0__SD3_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD3_DAT1__SD3_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD3_DAT2__SD3_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD3_DAT3__SD3_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_NANDF_D0__GPIO2_IO00 | MUX_PAD_CTRL(NO_PAD_CTRL), /* CD */ -}; - -static iomux_v3_cfg_t const usdhc4_pads[] = { - MX6_PAD_SD4_CLK__SD4_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD4_CMD__SD4_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD4_DAT0__SD4_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD4_DAT1__SD4_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD4_DAT2__SD4_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD4_DAT3__SD4_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD4_DAT4__SD4_DATA4 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD4_DAT5__SD4_DATA5 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD4_DAT6__SD4_DATA6 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD4_DAT7__SD4_DATA7 | MUX_PAD_CTRL(USDHC_PAD_CTRL), -}; - -static struct fsl_esdhc_cfg usdhc_cfg[3] = { - {USDHC2_BASE_ADDR}, - {USDHC3_BASE_ADDR}, - {USDHC4_BASE_ADDR}, -}; - -#define USDHC2_CD_GPIO IMX_GPIO_NR(2, 2) -#define USDHC3_CD_GPIO IMX_GPIO_NR(2, 0) - -int board_mmc_getcd(struct mmc *mmc) -{ - struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv; - int ret = 0; - - switch (cfg->esdhc_base) { - case USDHC2_BASE_ADDR: - ret = !gpio_get_value(USDHC2_CD_GPIO); - break; - case USDHC3_BASE_ADDR: - ret = !gpio_get_value(USDHC3_CD_GPIO); - break; - case USDHC4_BASE_ADDR: - ret = 1; /* eMMC/uSDHC4 is always present */ - break; - } - return ret; -} - -int board_mmc_init(bd_t *bis) -{ - /* - * (U-Boot device node) (Physical Port) - * mmc0 SD2 - * mmc1 SD3 - * mmc2 eMMC - */ - int i, ret; - for (i = 0; i < CONFIG_SYS_FSL_USDHC_NUM; i++) { - switch (i) { - case 0: - imx_iomux_v3_setup_multiple_pads( - usdhc2_pads, ARRAY_SIZE(usdhc2_pads)); - gpio_request(USDHC2_CD_GPIO, "MMC0_CD"); - gpio_direction_input(USDHC2_CD_GPIO); - usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK); - break; - case 1: - imx_iomux_v3_setup_multiple_pads( - usdhc3_pads, ARRAY_SIZE(usdhc3_pads)); - gpio_request(USDHC3_CD_GPIO, "MMC1_CD"); - gpio_direction_input(USDHC3_CD_GPIO); - usdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK); - break; - case 2: - imx_iomux_v3_setup_multiple_pads( - usdhc4_pads, ARRAY_SIZE(usdhc4_pads)); - usdhc_cfg[2].sdhc_clk = mxc_get_clock(MXC_ESDHC4_CLK); - break; - default: - printf("Warning: you configured more USDHC controllers" - "(%d) then supported by the board (%d)\n", - i + 1, CONFIG_SYS_FSL_USDHC_NUM); - return -EINVAL; - } - ret = fsl_esdhc_initialize(bis, &usdhc_cfg[i]); - if (ret) - return ret; - } - return 0; -} - /* set environment device to boot device when booting from SD */ int board_mmc_get_env_dev(int devno) { diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig index 54e34df6aa..4d755c88c3 100644 --- a/configs/tbs2910_defconfig +++ b/configs/tbs2910_defconfig @@ -46,6 +46,7 @@ CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_MXC=y CONFIG_DM_KEYBOARD=y +CONFIG_DM_MMC=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y CONFIG_MII=y diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index a211b9d611..f31cadd951 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -40,13 +40,6 @@ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE /* select UART1/UART2 */ -/* Filesystems / image support */ - -/* MMC */ -#define CONFIG_SYS_FSL_USDHC_NUM 3 -#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC4_BASE_ADDR -#define CONFIG_SUPPORT_EMMC_BOOT - /* Ethernet */ #define CONFIG_FEC_MXC #define CONFIG_FEC_MXC