From patchwork Sat Jun 13 13:54:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1308674 X-Patchwork-Delegate: jagannadh.teki@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=ShCOeauG; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49kfJD47Zvz9sRK for ; Sat, 13 Jun 2020 23:55:56 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7D2F981D09; Sat, 13 Jun 2020 15:55:29 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="ShCOeauG"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A39DA81CCC; Sat, 13 Jun 2020 15:55:19 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pg1-x544.google.com (mail-pg1-x544.google.com [IPv6:2607:f8b0:4864:20::544]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6AA1B81C78 for ; Sat, 13 Jun 2020 15:55:14 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jagan@amarulasolutions.com Received: by mail-pg1-x544.google.com with SMTP id l63so3228947pge.12 for ; Sat, 13 Jun 2020 06:55:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XeeVhTGx62/IiBLDfBfmAw8aH0Sao6ReHCwATQLF7lI=; b=ShCOeauGzhiW1pMlIPupyRuN8FNtrUqiVMAEbxuMPdgA28LzXRZLlihCuJY+ayvO7l i/1qGpBPzuRqopE6BsK5xT1eIIfnp65qMUTXpKQD4tAW/ycresGrzQa0ztToHpVAkhBH 03S+V5Q5Tg7G+kPRpX3FnTFh/GBgKgbuNM5O4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XeeVhTGx62/IiBLDfBfmAw8aH0Sao6ReHCwATQLF7lI=; b=XZQ2yh2wM+PkAtxigFNTuiApdveR9GkUzK8+paQn5ItqDWpuVF3p8Ok1l3WsIejahI d5rUaTx77ibvd4bnnejPBodno9o8i1rQGXArrSUmYVYOGI5Xf06Xdrtek9rT6jVnt7L1 56+h6BYwulF7hi+U05uHPrfWVIasLyFYYjTcVawYlIlqpb/rDB9zmO355J0noAn4Tw/g AmkRPqRnF84jZHFWOgWDVEjtD1cjsDVpQHpS+KlGwgBSsXzUQG6SIE9Q7eIJWsjrfibr wzN442Me96acJZ2z86QxzmwyAIVE1taT5uKyMKDfJIELKbfYcMIf3puzwKQz+Q7RCCMm eOQw== X-Gm-Message-State: AOAM531IY8M68jJxVOahcuk1sf+2xTQ0DyQKvAxXVrnGB6ztbcjFFCIN NkuUmQnXJd+2Nvl1kbh8Ja1lDiRDucsylg== X-Google-Smtp-Source: ABdhPJwLktcFUZyWJ1EifYHW+QoYic8QgaC1lbs5OYJtbkvbElddIMy6d7IVvcFQQoOYtCM6O40CzA== X-Received: by 2002:a62:780c:: with SMTP id t12mr15225295pfc.317.1592056512694; Sat, 13 Jun 2020 06:55:12 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:5482:aff0:70c0:2108]) by smtp.gmail.com with ESMTPSA id m18sm9087017pfo.173.2020.06.13.06.55.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jun 2020 06:55:11 -0700 (PDT) From: Jagan Teki To: u-boot@lists.denx.de Cc: Simon Glass , Tom Rini , linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH 02/16] cm_fx6: Switch to full DM-aware Date: Sat, 13 Jun 2020 19:24:41 +0530 Message-Id: <20200613135455.181483-3-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200613135455.181483-1-jagan@amarulasolutions.com> References: <20200613135455.181483-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean Enable DM_SPI/DM_SPI_FLASH with a related config option. Build fine, but not tested. Patch-cc: Nikita Kiryanov Signed-off-by: Jagan Teki --- configs/cm_fx6_defconfig | 3 +++ include/configs/cm_fx6.h | 7 ------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig index edaa8e24a5..a55a021a75 100644 --- a/configs/cm_fx6_defconfig +++ b/configs/cm_fx6_defconfig @@ -53,10 +53,12 @@ CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nor0=spi0.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:768k(uboot),256k(uboot-environment),-(reserved)" CONFIG_OF_CONTROL=y +CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-cm-fx6" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_SPL_DM=y CONFIG_DWC_AHSATA=y # CONFIG_DWC_AHSATA_AHCI is not set CONFIG_DM_KEYBOARD=y @@ -83,6 +85,7 @@ CONFIG_DM_ETH=y CONFIG_MII=y CONFIG_DM_PMIC=y CONFIG_DM_REGULATOR=y +CONFIG_SPECIFY_CONSOLE_INDEX=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_MXC_SPI=y diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index 302907dcfb..55761450b1 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -151,13 +151,6 @@ /* APBH DMA is required for NAND support */ #endif -/* SPI Flash Configs */ -#if defined(CONFIG_SPL_BUILD) -#undef CONFIG_DM_SPI -#undef CONFIG_DM_SPI_FLASH -#undef CONFIG_SPI_FLASH_MTD -#endif - /* Ethernet */ #define CONFIG_FEC_MXC #define CONFIG_FEC_MXC_PHYADDR 0