From patchwork Fri Sep 1 16:11:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 808791 X-Patchwork-Delegate: trini@ti.com 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="RM7yqMu0"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xkPTD0jmTz9t3P for ; Sat, 2 Sep 2017 02:14:40 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id D2DA4C21F6F; Fri, 1 Sep 2017 16:12:57 +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, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, 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 0F110C21F5B; Fri, 1 Sep 2017 16:12:26 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 77EE7C21EE5; Fri, 1 Sep 2017 16:12:13 +0000 (UTC) Received: from mail-io0-f196.google.com (mail-io0-f196.google.com [209.85.223.196]) by lists.denx.de (Postfix) with ESMTPS id 0F579C21F03 for ; Fri, 1 Sep 2017 16:12:10 +0000 (UTC) Received: by mail-io0-f196.google.com with SMTP id f99so713187ioi.0 for ; Fri, 01 Sep 2017 09:12:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+Npc0uKahneiET7qRoLkrIbFpFvLcKs/Iv7TEiY2m1g=; b=RM7yqMu0HVwASeN8Ycnhbpi61hK/sFZFwjmyt1ienFOqsQbMJK40ZU5M+Eq06CuKLJ dRQz9/gSQzFkVXM95O1ZefTaq2dM3PglR0No3SCMi0WntWLCe3e01tuoiGjvbB5Xs6v9 jeCvZLe5AVRGQto+5XokLYGc6cFFKWXpXoc4juTbT6mNT7sOE/O+KCxsxVzGZYPt0oTq t7PxMF3khUdOwJogVNBOtW/+rcppAUb9YFIGD1aNXAjHCra8bklSl4VIpdcRvmpMyVsC yhGqaOdo+t3p2xJAxq/bFlw++o2NpI9/lhx4gLb9CGHCe7++UdBl5DYQIfCBzZpUrgX0 xRDQ== 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; bh=+Npc0uKahneiET7qRoLkrIbFpFvLcKs/Iv7TEiY2m1g=; b=ke828r6w01Zlp964Pe9gop1AEbi0yvj+dsFcUKbZIjW2ajIRqXadvGB8ym+bmKwAmx fY8vMFQxwEa0ueX4EmcOj3kuWgE4ceVcskA4iXzytO9GEUkcoyZYdlZWh+AzOMLUU6C6 3bz7p3Js9VLJ+89VynMJ1ufyAoinrci1wAGmUrDJS/4BspN8vWqroTwNuCle4tHlYWf1 tNZYhf0JPtsf1bX1hk3Rdpzsv9Ek90rWkLBvKFFi6kwJXBEpxaOSDnCjgwDwae0MXzuu zaoW9zSHF/hcSo6cYlfiocCoKpqsLi9KLsamx37+mbijRbZjND1STMxacIk10SDXUSMs 7QWQ== X-Gm-Message-State: AHPjjUjPPlWa2NJ/9pMScQo9noWFg5sckk4jxPhW0eGDOpKUY/0QGGRP hnvbdGE1b00N3IIqbNM= X-Google-Smtp-Source: ADKCNb7LcRIS2A6oCbdYLZKaju3qzGz1+cVhTxK8LOGBYXcmZMIw2wKZ9sebEzXFOHKtpNNSmCP1xQ== X-Received: by 10.36.172.106 with SMTP id m42mr205484iti.3.1504282328696; Fri, 01 Sep 2017 09:12:08 -0700 (PDT) Received: from ubuntu16.lan (c-73-65-120-235.hsd1.mn.comcast.net. [73.65.120.235]) by smtp.gmail.com with ESMTPSA id p128sm246362iod.11.2017.09.01.09.12.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Sep 2017 09:12:05 -0700 (PDT) From: Adam Ford To: u-boot@lists.denx.de Date: Fri, 1 Sep 2017 11:11:56 -0500 Message-Id: <1504282319-21309-2-git-send-email-aford173@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1504282319-21309-1-git-send-email-aford173@gmail.com> References: <1504282319-21309-1-git-send-email-aford173@gmail.com> Cc: jagan@openedev.com, trini@konsulko.com Subject: [U-Boot] [Patch V2 1/4] spi: davinci_spi: Add da830-spi support for DM 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" The DM support is already in the driver, so add da830-spi to the compatible list. Signed-off-by: Adam Ford --- drivers/spi/davinci_spi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c index 291ef95..eda252d 100644 --- a/drivers/spi/davinci_spi.c +++ b/drivers/spi/davinci_spi.c @@ -563,6 +563,7 @@ static const struct dm_spi_ops davinci_spi_ops = { static const struct udevice_id davinci_spi_ids[] = { { .compatible = "ti,keystone-spi" }, { .compatible = "ti,dm6441-spi" }, + { .compatible = "ti,da830-spi" }, { } }; From patchwork Fri Sep 1 16:11:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 808788 X-Patchwork-Delegate: trini@ti.com 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bkelfwiI"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xkPRG10h4z9sRV for ; Sat, 2 Sep 2017 02:12:58 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id D0656C21EDF; Fri, 1 Sep 2017 16:12:26 +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, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, 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 44DDFC21EDC; Fri, 1 Sep 2017 16:12:20 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B1FB5C21F05; Fri, 1 Sep 2017 16:12:14 +0000 (UTC) Received: from mail-io0-f194.google.com (mail-io0-f194.google.com [209.85.223.194]) by lists.denx.de (Postfix) with ESMTPS id 0CFBBC21F25 for ; Fri, 1 Sep 2017 16:12:11 +0000 (UTC) Received: by mail-io0-f194.google.com with SMTP id f99so713225ioi.0 for ; Fri, 01 Sep 2017 09:12:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qJP8WOH1wlODrUnn4PBNe5EDzukDDamrorRzRq+coWw=; b=bkelfwiIKrm+QlSP10g4Fozgbiu6SSV/2nFSuJnLNX+Em7BnsK65X85nP+bZpE5Ade wBtKvK6z+AoM6qTKHuHS3jMDGKOyY7t/UFXsl3f7fxa48m02unFaykLFVgK2Nzpwi0ST 6AX0Hw6VVmDsVa0EHY8r9sCemFhlFVaYWpbRleH0wAHNkuO15Kg1wp3QlgWRN/USDno8 sHVFc7EahaTsOrhwsTwQfRtN1sRGsrpSi/HqKclLqLyH2MIth8+7+GdmDPj735zJUPpw +V55GCzf/p79iYXMhbud3bwLOMB3Z/raM9MG5Td7W2QG3KsGvswdtNk/QAD02/Cz7ahd OtQQ== 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; bh=qJP8WOH1wlODrUnn4PBNe5EDzukDDamrorRzRq+coWw=; b=ZRDezMPi45Zz5TxfyR3zlEAp/AJUPOP4haGKo4QUBjU+VPI2QX/7iYNkO6AEmL14Qf Me+TUQtDBgyaRzmuhVno1QqhBhaYg6exwNrEZkL0fw75/Dko888wpy0CC1hBdGAcZkiV 9aVcXmbQBKHBNKPlLyy65S8HQS2giS9QASB4W6gMJ8BoS32L6Yy27JINezJ7R1F102pz jZbBGBHOfAC0PUI2FzFy4cCGOr06zHt2RyflDs+ZB+RxJpxhq73A8vF6/I2IHBrxwFxJ RcWCTZyk4MMMYodrJOnZXC0lEvHLx7sYNqNk/4UAtUZTKGFmORg2VVm7XxtTHAUP0KZj E0hA== X-Gm-Message-State: AHPjjUgcwFYve9DOiPvxeERU5l4V1+nC1d2YGx9/PUTzk2lbWkFsxuhh hNCyTNR41FfWl5YlVLQ= X-Google-Smtp-Source: ADKCNb5BA4utc0LT8bgTIQcxyx2vacwlqbkyVRJqzEn8stMgPxuCI5FRaGPVzR7rjCjCPQF3+J6MCA== X-Received: by 10.36.204.138 with SMTP id x132mr244723itf.100.1504282329683; Fri, 01 Sep 2017 09:12:09 -0700 (PDT) Received: from ubuntu16.lan (c-73-65-120-235.hsd1.mn.comcast.net. [73.65.120.235]) by smtp.gmail.com with ESMTPSA id p128sm246362iod.11.2017.09.01.09.12.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Sep 2017 09:12:09 -0700 (PDT) From: Adam Ford To: u-boot@lists.denx.de Date: Fri, 1 Sep 2017 11:11:57 -0500 Message-Id: <1504282319-21309-3-git-send-email-aford173@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1504282319-21309-1-git-send-email-aford173@gmail.com> References: <1504282319-21309-1-git-send-email-aford173@gmail.com> Cc: jagan@openedev.com, trini@konsulko.com Subject: [U-Boot] [Patch V2 2/4] arm: da850-evm: Enable DM and device tree support for da850-evm 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" With the device tree ported and DM compatible drivers, enable: OF_CONTROL, DM_SPI, DM_SPI_FLASH and DM_SERIAL Signed-off-by: Adam Ford Reviewed-by: Jagan Teki --- configs/da850evm_defconfig | 9 +++++++-- include/configs/da850evm.h | 17 +++++++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig index 0135e7d..652da01 100644 --- a/configs/da850evm_defconfig +++ b/configs/da850evm_defconfig @@ -6,8 +6,8 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y +CONFIG_DEFAULT_DEVICE_TREE="da850-evm" CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH" -CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="mem=32M console=ttyS2,115200n8 root=/dev/mtdblock2 rw noinitrd ip=dhcp" @@ -34,8 +34,13 @@ CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_CMD_DIAG=y +CONFIG_OF_CONTROL=y +CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_DM=y +CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y +CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y -CONFIG_OF_LIBFDT=y +CONFIG_DM_SPI=y diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 0736b39..b147bc5 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -21,6 +21,15 @@ #endif /* +* Disable DM_* for SPL build and can be re-enabled after adding +* DM support in SPL +*/ +#ifdef CONFIG_SPL_BUILD +#undef CONFIG_DM_SPI +#undef CONFIG_DM_SPI_FLASH +#undef CONFIG_DM_I2C +#endif +/* * SoC Configuration */ #define CONFIG_MACH_DAVINCI_DA850_EVM @@ -130,18 +139,23 @@ /* * Serial Driver info */ + +#ifdef CONFIG_SPL_BUILD #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE -4 /* NS16550 register size */ #define CONFIG_SYS_NS16550_COM1 DAVINCI_UART2_BASE /* Base address of UART2 */ +#endif #define CONFIG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID) #define CONFIG_CONS_INDEX 1 /* use UART0 for console */ #define CONFIG_SPI #define CONFIG_DAVINCI_SPI -#define CONFIG_SYS_SPI_BASE DAVINCI_SPI1_BASE #define CONFIG_SYS_SPI_CLK clk_get(DAVINCI_SPI1_CLKID) +#ifdef CONFIG_SPL_BUILD +#define CONFIG_SYS_SPI_BASE DAVINCI_SPI1_BASE #define CONFIG_SF_DEFAULT_SPEED 30000000 #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED +#endif #ifdef CONFIG_USE_SPIFLASH #define CONFIG_SPL_SPI_LOAD @@ -152,7 +166,6 @@ /* * I2C Configuration */ -#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_DAVINCI #define CONFIG_SYS_DAVINCI_I2C_SPEED 25000 #define CONFIG_SYS_DAVINCI_I2C_SLAVE 10 /* Bogus, master-only in U-Boot */ From patchwork Fri Sep 1 16:11:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 808790 X-Patchwork-Delegate: trini@ti.com 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="pw7HUVIH"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xkPSQ5dlVz9sRV for ; Sat, 2 Sep 2017 02:13:58 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 7011DC21F00; Fri, 1 Sep 2017 16:12:41 +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, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, 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 1707EC21EEE; Fri, 1 Sep 2017 16:12:25 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E2305C21EE5; Fri, 1 Sep 2017 16:12:15 +0000 (UTC) Received: from mail-io0-f194.google.com (mail-io0-f194.google.com [209.85.223.194]) by lists.denx.de (Postfix) with ESMTPS id 48538C21F30 for ; Fri, 1 Sep 2017 16:12:12 +0000 (UTC) Received: by mail-io0-f194.google.com with SMTP id z67so711883iof.1 for ; Fri, 01 Sep 2017 09:12:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7KS8O9fUitZ/hd/da+VrYy3+oyxThpOPXMtABfHesSw=; b=pw7HUVIHC1isyv9GkTGsTyUOaCfT4l3UEorJDS2kQYFUYIZYKLHCuz15E5NiGW9gyY L6XgTLdUXbLlUM2QXu+7aNhSdQxOV5kW1IN3wVhJJHkpmuz+tf1gHGYYNtCJdn/yvduJ lAMj4tS5V43MPCJW3VrYfMdLqSt1TFf2t4/7dDIR4D1CIEe6n3QEfFjOpYhIzvlyCvyr 3OTOtoWqUpKXyxqDUbLVrx5jzLHIDG6Wpm4wb16T4OKrxPMOgk1vRVEX/Eo0Dc2HLRT1 6i3zp43pY2/K/dZ5av22SLnLE5uJfCCwQjievKlMhWJttV4X4PHfHxewRx/RxLMovII9 K0Gw== 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; bh=7KS8O9fUitZ/hd/da+VrYy3+oyxThpOPXMtABfHesSw=; b=VR0uYCu9zLNiQ8hFgVcQAIA7Y/4hxwXVBt3dtSB6lqectfrlFwduq+PnE73d1MlI5K xM5FyAptFSiwdPQmDUlqEqkn9POt8+e2Uju/NxJqlV0X2yHGTRdn0yS1wPq5xVRiZdar GU9hOwCpPzWMNZhFMtq1RgK0ZPjPR8sYMcP5dJK6SjPBzW64yeCclGZaGlgsuhbNC4Pf 24DZ35XOaphTfOyeU+KORNGPCJEV893TPvezq9wNwXcxeAmzCM0infoVA04FJlxXrXKp zsWmSTAj//rPex5jER4ANdlkkUF3lZfqltmZsnxP1CYubqouU5HL+gfj/aX1Vlo/EhI6 lYSg== X-Gm-Message-State: AHPjjUj/qqWjy6jrofprSpX+w6iOLtcfiVLkzGTrdXdnQd9dRvhSsf+P fDVzhimyZpHsTmRpgsg= X-Google-Smtp-Source: ADKCNb7uEJ/m563Tp89/0mQDQOET8bcaCPp0pDDBdI8BbI845nwsXHN8P8Gr0jY+KDMdvme/6o/P6A== X-Received: by 10.36.8.138 with SMTP id 132mr228619itc.162.1504282330870; Fri, 01 Sep 2017 09:12:10 -0700 (PDT) Received: from ubuntu16.lan (c-73-65-120-235.hsd1.mn.comcast.net. [73.65.120.235]) by smtp.gmail.com with ESMTPSA id p128sm246362iod.11.2017.09.01.09.12.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Sep 2017 09:12:10 -0700 (PDT) From: Adam Ford To: u-boot@lists.denx.de Date: Fri, 1 Sep 2017 11:11:58 -0500 Message-Id: <1504282319-21309-4-git-send-email-aford173@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1504282319-21309-1-git-send-email-aford173@gmail.com> References: <1504282319-21309-1-git-send-email-aford173@gmail.com> Cc: jagan@openedev.com, trini@konsulko.com Subject: [U-Boot] [Patch V2 3/4] arm: da850-evm: Enable MTD Parts 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" There is a discrepency between U-Boot and Linux on the partition map. This enabes the MTD parts to pass MTD partition information from U-Boot to Linux. Linux already has a pending patch to enable MTD PARTS in davinci_all_defconfig Signed-off-by: Adam Ford V2: This patch is new to the series Reviewed-by: Jagan Teki --- configs/da850evm_defconfig | 2 ++ include/configs/da850evm.h | 16 ++++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig index 652da01..08cc2e8 100644 --- a/configs/da850evm_defconfig +++ b/configs/da850evm_defconfig @@ -33,6 +33,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_MTDPARTS=y CONFIG_CMD_DIAG=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_SPI_FLASH=y @@ -41,6 +42,7 @@ CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y +CONFIG_SPI_FLASH_MTD=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index b147bc5..a47ba96 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -139,7 +139,6 @@ /* * Serial Driver info */ - #ifdef CONFIG_SPL_BUILD #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE -4 /* NS16550 register size */ @@ -148,6 +147,9 @@ #define CONFIG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID) #define CONFIG_CONS_INDEX 1 /* use UART0 for console */ +/* + * SPI Driver Info + */ #define CONFIG_SPI #define CONFIG_DAVINCI_SPI #define CONFIG_SYS_SPI_CLK clk_get(DAVINCI_SPI1_CLKID) @@ -156,11 +158,21 @@ #define CONFIG_SF_DEFAULT_SPEED 30000000 #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #endif - #ifdef CONFIG_USE_SPIFLASH #define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8000 #define CONFIG_SYS_SPI_U_BOOT_SIZE 0x40000 +#ifdef CONFIG_SPL_BUILD +#undef CONFIG_SPI_FLASH_MTD +#endif +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ +#define CONFIG_MTD_PARTITIONS /* required for UBI partition support */ +#define MTDIDS_DEFAULT "nor0=spi0.0" +#define MTDPARTS_DEFAULT "mtdparts=spi0.0:"\ + "512k(u-boot.ais),"\ + "64k(u-boot-env),"\ + "7552k(kernel-spare),"\ + "64k(MAC-Address)" #endif /* From patchwork Fri Sep 1 16:11:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 808792 X-Patchwork-Delegate: trini@ti.com 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="b/54Oc8p"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xkPTT0hB0z9t1t for ; Sat, 2 Sep 2017 02:14:52 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id ACC7DC21F62; Fri, 1 Sep 2017 16:13:11 +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, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, 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 D8510C21F61; Fri, 1 Sep 2017 16:12:31 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 0B315C21F25; Fri, 1 Sep 2017 16:12:16 +0000 (UTC) Received: from mail-io0-f195.google.com (mail-io0-f195.google.com [209.85.223.195]) by lists.denx.de (Postfix) with ESMTPS id 58150C21F05 for ; Fri, 1 Sep 2017 16:12:13 +0000 (UTC) Received: by mail-io0-f195.google.com with SMTP id 2so697362ion.3 for ; Fri, 01 Sep 2017 09:12:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2GIlHEwsuwqq4WbLdZx32DwkFj2HhyxdosXMxopplUk=; b=b/54Oc8ptioACfG+Ps06C9I4G59Qf4TynMBQ/QqMzH7Rqe73UQNvvIM8G21olz2FnI LogVkuUTVBa7ufysdIK86dMB8mk+jJcQ2YN5vtj3nRrVqvK8sNMl+mtbXhnnbr6Vg5kw sdCUMwv2iAtDWUBrdYu5WhAWpMJtHLGCl5a8NvPREXK6X4DA4U/R1py8Nzz6WVZPxNwC mFNQzFe/oC8T0MIyheddZ+Tl9OU581X8JXw+gqTtiidXUHj5nH7liyfyqnryu6YAvSEd YpQtJzrzOMK/tHg9QFU2VPs8eEtIF2owjPsJx1I6WZqPCvg1YHN2mcSaoJ1c5im5Hq5s kHMw== 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; bh=2GIlHEwsuwqq4WbLdZx32DwkFj2HhyxdosXMxopplUk=; b=OW4gzG01bBkLhWDUsTed/BIT/G/tFTp6HjR8yPu9ELbGMoDmbQ+w0Ng7XuQAR366FE 4TMpufWAceApXzsYi9GUZJZOTh+kNCvBz9EpEL3U2hAy7LvvhCNTZlt3KvtB+SvJ+xao gcV73A17H9tCeRVWjzUV1jMkYGx+k4imr3QQU2qlqFqso8odoCBbpsRVMCeHmDFon6uV /Tilxe8qsj1dRf41K0eOxsm/3W1+0kZ2OfWgIn7HRWUnhB7yB0LYmf68I7U19qFE3qLm 1YcsHNimG1ICXZiBH0WGID6CLyk7ZtXpGm/eIioqFz8jXXndlsCfI7TAFryGeHB5exsC nwpQ== X-Gm-Message-State: AHPjjUjMa46pmBbr0VNlU2upSqkQaztOWakLEpeEtpZjJWSXn12HeU8b 5VPufitwpFMuRlloZKw= X-Google-Smtp-Source: ADKCNb7Eu1ukhFMQgSk/T7Hd8MRHP7t/Acbxq4PBLt8zdWA3lGPDmj1zgbx6Poj5WFCB1g6sWT37Tg== X-Received: by 10.36.189.193 with SMTP id x184mr1152234ite.30.1504282331939; Fri, 01 Sep 2017 09:12:11 -0700 (PDT) Received: from ubuntu16.lan (c-73-65-120-235.hsd1.mn.comcast.net. [73.65.120.235]) by smtp.gmail.com with ESMTPSA id p128sm246362iod.11.2017.09.01.09.12.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Sep 2017 09:12:11 -0700 (PDT) From: Adam Ford To: u-boot@lists.denx.de Date: Fri, 1 Sep 2017 11:11:59 -0500 Message-Id: <1504282319-21309-5-git-send-email-aford173@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1504282319-21309-1-git-send-email-aford173@gmail.com> References: <1504282319-21309-1-git-send-email-aford173@gmail.com> Cc: jagan@openedev.com, trini@konsulko.com Subject: [U-Boot] [Patch V2 4/4] ARM: da850-evm: Enable DM_I2C 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" With DM now enabled with the device tree pulled from Linux, we can enable DM_I2C in U-Boot. Signed-off-by: Adam Ford V2: New to series Reviewed-by: Jagan Teki --- arch/arm/dts/da850-evm-u-boot.dtsi | 1 + configs/da850evm_defconfig | 3 +++ include/configs/da850evm.h | 5 +++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/arm/dts/da850-evm-u-boot.dtsi b/arch/arm/dts/da850-evm-u-boot.dtsi index 516bc1d..2041cde 100644 --- a/arch/arm/dts/da850-evm-u-boot.dtsi +++ b/arch/arm/dts/da850-evm-u-boot.dtsi @@ -13,6 +13,7 @@ }; aliases { + i2c0 = &i2c0; spi0 = &spi1; }; }; diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig index 08cc2e8..d6cd1fa 100644 --- a/configs/da850evm_defconfig +++ b/configs/da850evm_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_ASKENV=y CONFIG_CRC32_VERIFY=y # CONFIG_CMD_FLASH is not set +CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y @@ -38,6 +39,8 @@ CONFIG_CMD_DIAG=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DM=y +CONFIG_DM_I2C=y +CONFIG_I2C_SET_DEFAULT_BUS_NUM=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index a47ba96..38798b0 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -28,6 +28,7 @@ #undef CONFIG_DM_SPI #undef CONFIG_DM_SPI_FLASH #undef CONFIG_DM_I2C +#undef CONFIG_DM_I2C_COMPAT #endif /* * SoC Configuration @@ -178,10 +179,10 @@ /* * I2C Configuration */ +#ifndef CONFIG_SPL_BUILD #define CONFIG_SYS_I2C_DAVINCI -#define CONFIG_SYS_DAVINCI_I2C_SPEED 25000 -#define CONFIG_SYS_DAVINCI_I2C_SLAVE 10 /* Bogus, master-only in U-Boot */ #define CONFIG_SYS_I2C_EXPANDER_ADDR 0x20 +#endif /* * Flash & Environment