From patchwork Sun Feb 14 20:48:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 582592 X-Patchwork-Delegate: jagannadh.teki@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 9B7D7140321 for ; Mon, 15 Feb 2016 07:58:16 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6B7B6A7652; Sun, 14 Feb 2016 21:54:30 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id j4aQVhysVT7w; Sun, 14 Feb 2016 21:54:30 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 83992A765B; Sun, 14 Feb 2016 21:53:36 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E8227A7709 for ; Sun, 14 Feb 2016 21:53:33 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xDHLMs5bzxWM for ; Sun, 14 Feb 2016 21:53:33 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-pf0-f181.google.com (mail-pf0-f181.google.com [209.85.192.181]) by theia.denx.de (Postfix) with ESMTPS id 0F690A76CE for ; Sun, 14 Feb 2016 21:52:49 +0100 (CET) Received: by mail-pf0-f181.google.com with SMTP id c10so77191862pfc.2 for ; Sun, 14 Feb 2016 12:52:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=t9pW3Kjp+vcTFy8gbJaXZQKMxAKEU8qsQ14VDra1r7Q=; b=kPUPSZdtxD1zzz2OqcISIUknxlgWVRwVkEc7pv6+AGIAxc12fSAWFzw5rnkUiC+mL9 UC4qPELn05JIJZ+bRwnco0P5g83okLLKsLaVRaCotHx4sft6V7DJ9jSym3kmRQQL5LGE gG4QsmLXSs9SCC1UhRn7OC8zbg+FVN0vvLQkwQiHhlcNO1ymI1xUHVqMC/2olukSbf82 mzb7MmQqzLDCYuGZCBgl79nPkIaUZHj7VJ8xerXOzHXzm2g2RhNVp0hjJXKSH2zfmygk fJlOPTcBPERSOCmi6T3AGa3AAbxNe8Hi1SuPc1YAedPaZfjUWUIkRIvQJNwUhWC4G+JU 5npQ== X-Gm-Message-State: AG10YOT1GfyLIdWXUCWG0S9glVy2auY+oAKJvGt9a64KTAiB9mhvFEEkgcNgPjwRRMv6NQ== X-Received: by 10.98.68.212 with SMTP id m81mr18683056pfi.135.1455483168209; Sun, 14 Feb 2016 12:52:48 -0800 (PST) Received: from localhost.localdomain ([123.236.183.254]) by smtp.gmail.com with ESMTPSA id cq9sm11423890pac.26.2016.02.14.12.52.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 14 Feb 2016 12:52:47 -0800 (PST) From: Jagan Teki To: u-boot@lists.denx.de Date: Mon, 15 Feb 2016 02:18:40 +0530 Message-Id: <1455482955-19053-41-git-send-email-jteki@openedev.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1455482955-19053-1-git-send-email-jteki@openedev.com> References: <1455482955-19053-1-git-send-email-jteki@openedev.com> Cc: Jagan Teki , Haikun Wang Subject: [U-Boot] [PATCH v6 41/76] mtd: dataflash: Drop sf_internal.h X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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" Drop using sf_internal.h and get the RDID from spi-nor.h Cc: Bin Meng Cc: Simon Glass Cc: York Sun Cc: Haikun Wang Signed-off-by: Jagan Teki --- drivers/mtd/spi-nor/sf_dataflash.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/spi-nor/sf_dataflash.c b/drivers/mtd/spi-nor/sf_dataflash.c index 525af0a..9943560 100644 --- a/drivers/mtd/spi-nor/sf_dataflash.c +++ b/drivers/mtd/spi-nor/sf_dataflash.c @@ -17,8 +17,7 @@ #include #include #include - -#include "sf_internal.h" +#include /* reads can bypass the buffers */ #define OP_READ_CONTINUOUS 0xE8 @@ -519,7 +518,7 @@ static struct flash_info *jedec_probe(struct spi_slave *spi) uint8_t id[5]; uint32_t jedec; struct flash_info *info; - u8 cmd = CMD_READ_ID; + u8 cmd = SNOR_OP_RDID; int status; /*