From patchwork Fri Feb 16 16:47:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10225091 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 630A5602CB for ; Fri, 16 Feb 2018 16:51:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 507BA29605 for ; Fri, 16 Feb 2018 16:51:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4E33229629; Fri, 16 Feb 2018 16:51:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9008529615 for ; Fri, 16 Feb 2018 16:51:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=C3sYvSnnzq+6kwm0r2r8FksuOx4m52qXZb8JjWkB/VQ=; b=Er1DscwzuHwjhnxEUFTm8Ou9iR hDI2TO8kqeCOa12i1AJjgyIaFpPQ/GCuqPjgsDe/Bm9OVLtiU6XPb0puXilzSChyaumfqDP+ufP+P qxQHjw4QSOza+3XkPeIawf1jV/Dr3KX5NrAKjSMO7r3X/rpnow4Sdnh2ALdOOcP3pzCNWb0zgz7S9 yEfifMxzQsz6hYnyD9W3CmilJLxIIeMchHzJ1EVl4+mGkYA5/jKQ+HmdL7+iPHj2sqcrx9+qF5vxe mRHb8Lsrzj3UZ4nbeG3s0dkv71MSvhK4f1tBihtjJQh6IXyrUCj4Z0GpyRDjlUpT5Bqc9KggadS4p El+LymYw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1emjE8-0002SK-6Y; Fri, 16 Feb 2018 16:51:12 +0000 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1emjAZ-0007N4-Um for linux-arm-kernel@lists.infradead.org; Fri, 16 Feb 2018 16:47:37 +0000 Received: by mail-wm0-x241.google.com with SMTP id k87so4263344wmi.0 for ; Fri, 16 Feb 2018 08:47:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zVzsxksJMKkLiWWL0LnBnEt1UVda9iYvosNFKsvw7mU=; b=QFWVsXCHxwQAL6ARYYyoImHEEQ63mvXxzRvhpVBfrmLlTWuiXkhe8Jev69xoEDXHkW 8nVbqK1Gc7sCT7wrA37k6sX2mlsxtifvAm7ziVRJU1y5YH6VOyrymd6YAZwpaSOYznhX 8CdvurTBlmaJ2YGGjeP0CMw9oayd1qs5hVMVzicCIxXRJc+3AoADQrBWPbJyx7YamChb krWiVln2d6k3WtEmlI1M645nG+9Rv+WapiJCRHP2sHwTaV4agLNkx+xc2p+lxNwGQzez sRH21ZSGLLVEUOXClzV1FRJe4QszohP5xXZog39FStlcLwszMt+krmRj06v+4yVwpTRq Oifw== 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=zVzsxksJMKkLiWWL0LnBnEt1UVda9iYvosNFKsvw7mU=; b=Qf0z9ijKARO649n2xuZKe3PIaUIs4EdsaqismRf8AIGyHHdb6r/00F726mTxNKth6v Vx7A0WTnVo1kBBZgkV+M4k/5LqqFOqHmKwGxnCu4RjqcYM+BTuY1RDKt8aReeuTj0HFi Shz3rj3KVLQUdkuJIMoGueD4T8qBe4Y9D3M0kR/VIVHbVSXbXk6TTs/YjshDUqQxU6iz 5FTh6YDRxfPO/CxMoLcfMqi/GMLOUBOpiDBecQNVFHEJDTsuZXtnuVWSYfZSkPheLzyg 9CWmc/BhNStn00+KMz8tayyJRtL5VbVNeB4C4Ft7xsvnoE2qh5K354rljCHez231w+G2 x8RA== X-Gm-Message-State: APf1xPCZOxae+vqESsUUA2quFCV2MfLgNjQy4Gdz01S/EAW7Dxtw3gqJ A4dyWoeJVRYs3Iortox1eFTyIw== X-Google-Smtp-Source: AH8x226buVv80phYd9vazO8xxMEQy/k+4DC0JTth3VMBK1T79nXutm4jynbwG9f/6sldkm0rmuLSKA== X-Received: by 10.28.135.142 with SMTP id j136mr5676601wmd.33.1518799641013; Fri, 16 Feb 2018 08:47:21 -0800 (PST) Received: from brgl-bgdev.baylibre.local ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id 90sm7832826wrp.2.2018.02.16.08.47.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Feb 2018 08:47:20 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Russell King , Santosh Shilimkar , Boris Brezillon , Richard Weinberger , David Woodhouse , Brian Norris , Marek Vasut , Cyrille Pitchen Subject: [PATCH 2/6] ARM: davinci: update the nand driver names Date: Fri, 16 Feb 2018 17:47:08 +0100 Message-Id: <20180216164712.25898-3-brgl@bgdev.pl> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180216164712.25898-1-brgl@bgdev.pl> References: <20180216164712.25898-1-brgl@bgdev.pl> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180216_084732_075917_8F8AB970 X-CRM114-Status: GOOD ( 17.47 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, David Lechner MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski Since commit d8e22fb4ccac ("ARM: da850: add the nand dev_id to the clock lookup table") we can no longer correctly lookup the nand clock when booting in legacy mode. Said commit added a dev_id to the nand clock which must match and it doesn't correspond with the device name which is "davinci_nand" instead of "davinci-nand". The driver name has been changed. Update the board files. Fixes: d8e22fb4ccac ("ARM: da850: add the nand dev_id to the clock lookup table") Signed-off-by: Bartosz Golaszewski --- arch/arm/mach-davinci/board-da830-evm.c | 2 +- arch/arm/mach-davinci/board-da850-evm.c | 2 +- arch/arm/mach-davinci/board-dm355-evm.c | 2 +- arch/arm/mach-davinci/board-dm355-leopard.c | 2 +- arch/arm/mach-davinci/board-dm365-evm.c | 2 +- arch/arm/mach-davinci/board-dm644x-evm.c | 2 +- arch/arm/mach-davinci/board-dm646x-evm.c | 2 +- arch/arm/mach-davinci/board-mityomapl138.c | 2 +- arch/arm/mach-davinci/board-neuros-osd2.c | 2 +- arch/arm/mach-davinci/board-sffsdr.c | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c index f673cd7a6766..f8838c7b174b 100644 --- a/arch/arm/mach-davinci/board-da830-evm.c +++ b/arch/arm/mach-davinci/board-da830-evm.c @@ -348,7 +348,7 @@ static struct resource da830_evm_nand_resources[] = { }; static struct platform_device da830_evm_nand_device = { - .name = "davinci_nand", + .name = "davinci-nand", .id = 1, .dev = { .platform_data = &da830_evm_nand_pdata, diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c index d898a94f6eae..828194045a2b 100644 --- a/arch/arm/mach-davinci/board-da850-evm.c +++ b/arch/arm/mach-davinci/board-da850-evm.c @@ -266,7 +266,7 @@ static struct resource da850_evm_nandflash_resource[] = { }; static struct platform_device da850_evm_nandflash_device = { - .name = "davinci_nand", + .name = "davinci-nand", .id = 1, .dev = { .platform_data = &da850_evm_nandflash_data, diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c index e457f299cd44..58ca7f56e112 100644 --- a/arch/arm/mach-davinci/board-dm355-evm.c +++ b/arch/arm/mach-davinci/board-dm355-evm.c @@ -98,7 +98,7 @@ static struct resource davinci_nand_resources[] = { }; static struct platform_device davinci_nand_device = { - .name = "davinci_nand", + .name = "davinci-nand", .id = 0, .num_resources = ARRAY_SIZE(davinci_nand_resources), diff --git a/arch/arm/mach-davinci/board-dm355-leopard.c b/arch/arm/mach-davinci/board-dm355-leopard.c index be997243447b..196238117f9a 100644 --- a/arch/arm/mach-davinci/board-dm355-leopard.c +++ b/arch/arm/mach-davinci/board-dm355-leopard.c @@ -93,7 +93,7 @@ static struct resource davinci_nand_resources[] = { }; static struct platform_device davinci_nand_device = { - .name = "davinci_nand", + .name = "davinci-nand", .id = 0, .num_resources = ARRAY_SIZE(davinci_nand_resources), diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c index e75741fb2c1d..563d66df480b 100644 --- a/arch/arm/mach-davinci/board-dm365-evm.c +++ b/arch/arm/mach-davinci/board-dm365-evm.c @@ -159,7 +159,7 @@ static struct resource davinci_nand_resources[] = { }; static struct platform_device davinci_nand_device = { - .name = "davinci_nand", + .name = "davinci-nand", .id = 0, .num_resources = ARRAY_SIZE(davinci_nand_resources), .resource = davinci_nand_resources, diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c index 85e6fb33b1ee..e42ae2163c75 100644 --- a/arch/arm/mach-davinci/board-dm644x-evm.c +++ b/arch/arm/mach-davinci/board-dm644x-evm.c @@ -173,7 +173,7 @@ static struct resource davinci_evm_nandflash_resource[] = { }; static struct platform_device davinci_evm_nandflash_device = { - .name = "davinci_nand", + .name = "davinci-nand", .id = 0, .dev = { .platform_data = &davinci_evm_nandflash_data, diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c index cb0a41e83582..614dd211e6fc 100644 --- a/arch/arm/mach-davinci/board-dm646x-evm.c +++ b/arch/arm/mach-davinci/board-dm646x-evm.c @@ -108,7 +108,7 @@ static struct resource davinci_nand_resources[] = { }; static struct platform_device davinci_nand_device = { - .name = "davinci_nand", + .name = "davinci-nand", .id = 0, .num_resources = ARRAY_SIZE(davinci_nand_resources), diff --git a/arch/arm/mach-davinci/board-mityomapl138.c b/arch/arm/mach-davinci/board-mityomapl138.c index b73ce7bae81f..bf3659a21897 100644 --- a/arch/arm/mach-davinci/board-mityomapl138.c +++ b/arch/arm/mach-davinci/board-mityomapl138.c @@ -422,7 +422,7 @@ static struct resource mityomapl138_nandflash_resource[] = { }; static struct platform_device mityomapl138_nandflash_device = { - .name = "davinci_nand", + .name = "davinci-nand", .id = 1, .dev = { .platform_data = &mityomapl138_nandflash_data, diff --git a/arch/arm/mach-davinci/board-neuros-osd2.c b/arch/arm/mach-davinci/board-neuros-osd2.c index 4da210a1a110..04132494a7c9 100644 --- a/arch/arm/mach-davinci/board-neuros-osd2.c +++ b/arch/arm/mach-davinci/board-neuros-osd2.c @@ -107,7 +107,7 @@ static struct resource davinci_ntosd2_nandflash_resource[] = { }; static struct platform_device davinci_ntosd2_nandflash_device = { - .name = "davinci_nand", + .name = "davinci-nand", .id = 0, .dev = { .platform_data = &davinci_ntosd2_nandflash_data, diff --git a/arch/arm/mach-davinci/board-sffsdr.c b/arch/arm/mach-davinci/board-sffsdr.c index d85accf7f760..c8569c8aa6e3 100644 --- a/arch/arm/mach-davinci/board-sffsdr.c +++ b/arch/arm/mach-davinci/board-sffsdr.c @@ -83,7 +83,7 @@ static struct resource davinci_sffsdr_nandflash_resource[] = { }; static struct platform_device davinci_sffsdr_nandflash_device = { - .name = "davinci_nand", /* Name of driver */ + .name = "davinci-nand", /* Name of driver */ .id = 0, .dev = { .platform_data = &davinci_sffsdr_nandflash_data,