From patchwork Wed Feb 17 10:06:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 583985 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 D17E11402A1 for ; Wed, 17 Feb 2016 21:06:46 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2BA81A753A; Wed, 17 Feb 2016 11:06:41 +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 XXIldIwYZxvk; Wed, 17 Feb 2016 11:06:41 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D1841A7524; Wed, 17 Feb 2016 11:06:40 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8ACFFA7516 for ; Wed, 17 Feb 2016 11:06:36 +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 mvbeUM-nNPbs for ; Wed, 17 Feb 2016 11:06:36 +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-f180.google.com (mail-pf0-f180.google.com [209.85.192.180]) by theia.denx.de (Postfix) with ESMTPS id 0D8A9A745C for ; Wed, 17 Feb 2016 11:06:31 +0100 (CET) Received: by mail-pf0-f180.google.com with SMTP id q63so9029058pfb.0 for ; Wed, 17 Feb 2016 02:06:31 -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; bh=wZZZkPyDmuA1TgNQs4a2nNadxsH0xaorSGdg1l/xGe0=; b=HRIbEPRDQVypKuGyygYBxArECmUgxuzT53B/sl8FYck1z7uF3lo4nEkEyOuWU1VQzD eTR/ADV1LAPOXgHYdpbt8gH3RisMYVwES9SzS6ztVfzcJsB/im1VMoaayxkMxw3/Cu/k h92NgvEJE70AJnVb7ZxGK4DXgydhYuS5tcrvBVyOW0vFtlhrCuNBN98g+x/WFDx3m1W5 qXEJhjKelDGr+pMLNQfvoa1h7e/SKpvRf7/eg11lJtM4OLkjkCbnVPB/w0rTsPT3bwGu 0MtAjQW70+EGBIjj1uCIvKTkTeb+zMpMbDeLyixJIDorIz60Dha0LFd0GtzcWDIT8NdD xzrw== X-Gm-Message-State: AG10YOSelXvfViThsPFxG86pVL4FZDumxyCOxR0cIc+uiuisfLm4pnblWKIZN4Y0wzkEfQ== X-Received: by 10.98.75.200 with SMTP id d69mr894261pfj.108.1455703590107; Wed, 17 Feb 2016 02:06:30 -0800 (PST) Received: from Jubuntu.amcc.com ([182.73.239.130]) by smtp.gmail.com with ESMTPSA id 82sm1347761pfn.89.2016.02.17.02.06.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 17 Feb 2016 02:06:28 -0800 (PST) From: Jagan Teki To: u-boot@lists.denx.de Date: Wed, 17 Feb 2016 15:36:16 +0530 Message-Id: <1455703576-9835-1-git-send-email-jteki@openedev.com> X-Mailer: git-send-email 1.9.1 Cc: Michal Simek , Siva Durga Prasad Paladugu , Jagan Teki Subject: [U-Boot] [PATCH v7 70/76] x86: Drop using spi_flash_dm_ops 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" Since spi-nor flash is part of MTD uclass, so replaced UCLASS_SPI_FLASH with UCLASS_MTD and use respective spi_flash operations as well. Cc: Simon Glass Cc: Bin Meng Cc: Mugunthan V N Cc: Michal Simek Cc: Siva Durga Prasad Paladugu Signed-off-by: Jagan Teki --- Changes for v7: - fix to use dm_spi_flash_ops. arch/arm/mach-rockchip/rk3288-board-spl.c | 2 +- arch/x86/lib/mrccache.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-rockchip/rk3288-board-spl.c b/arch/arm/mach-rockchip/rk3288-board-spl.c index 6a54368..3ba2382 100644 --- a/arch/arm/mach-rockchip/rk3288-board-spl.c +++ b/arch/arm/mach-rockchip/rk3288-board-spl.c @@ -53,7 +53,7 @@ u32 spl_boot_device(void) } debug("Found device %s\n", dev->name); switch (device_get_uclass_id(dev)) { - case UCLASS_SPI_FLASH: + case UCLASS_MTD: return BOOT_DEVICE_SPI; case UCLASS_MMC: return BOOT_DEVICE_MMC1; diff --git a/arch/x86/lib/mrccache.c b/arch/x86/lib/mrccache.c index 67bace4..dca3d84 100644 --- a/arch/x86/lib/mrccache.c +++ b/arch/x86/lib/mrccache.c @@ -109,6 +109,7 @@ static struct mrc_data_container *find_next_mrc_cache(struct mrc_region *entry, int mrccache_update(struct udevice *sf, struct mrc_region *entry, struct mrc_data_container *cur) { + struct mtd_info *mtd = dev_get_uclass_priv(sf); struct mrc_data_container *cache; ulong offset; ulong base_addr; @@ -139,7 +140,7 @@ int mrccache_update(struct udevice *sf, struct mrc_region *entry, debug("Erasing the MRC cache region of %x bytes at %x\n", entry->length, entry->offset); - ret = spi_flash_erase_dm(sf, entry->offset, entry->length); + ret = spi_flash_erase(mtd, entry->offset, entry->length); if (ret) { debug("Failed to erase flash region\n"); return ret; @@ -150,8 +151,7 @@ int mrccache_update(struct udevice *sf, struct mrc_region *entry, /* Write the data out */ offset = (ulong)cache - base_addr + entry->offset; debug("Write MRC cache update to flash at %lx\n", offset); - ret = spi_flash_write_dm(sf, offset, cur->data_size + sizeof(*cur), - cur); + ret = spi_flash_write(mtd, offset, cur->data_size + sizeof(*cur), cur); if (ret) { debug("Failed to write to SPI flash\n"); return ret; @@ -216,8 +216,7 @@ int mrccache_get_region(struct udevice **devp, struct mrc_region *entry) entry->length = reg[1]; if (devp) { - ret = uclass_get_device_by_of_offset(UCLASS_SPI_FLASH, node, - devp); + ret = uclass_get_device_by_of_offset(UCLASS_MTD, node, devp); debug("ret = %d\n", ret); if (ret) return ret;