From patchwork Fri Sep 20 13:25:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Pali_Roh=C3=A1r?= X-Patchwork-Id: 2918811 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9A8A19F1BF for ; Fri, 20 Sep 2013 13:27:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F2E0320320 for ; Fri, 20 Sep 2013 13:27:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B3E2520319 for ; Fri, 20 Sep 2013 13:27:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754745Ab3ITN07 (ORCPT ); Fri, 20 Sep 2013 09:26:59 -0400 Received: from mail-ea0-f173.google.com ([209.85.215.173]:52863 "EHLO mail-ea0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754629Ab3ITN0L (ORCPT ); Fri, 20 Sep 2013 09:26:11 -0400 Received: by mail-ea0-f173.google.com with SMTP id g10so264425eak.4 for ; Fri, 20 Sep 2013 06:26:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=OkvWbFlo/na1DEEcS9W5AoPv//+xS0t2H0I6jfkvR0g=; b=fIWFRBxjEygLlj0Obo74bWT29TynJJKgi7yuiqNvqzndCnZey/p7UV24KY9J7FWuIt 2c3P2mpiqXgHIizHtPNqFJGfCLPtz7wtGQVqb+UDDzLcjnDGQI8vmpxJy71JisDCwka7 Q6sBpbMSkv4gYTvM2H0mWCK31f8UrpP5hatPvJ4a6N6MxwECbcUmZAN/NX6YhYCmzQtZ EKPx2FntUfTiX328JOETuOzpDMVvDXiLi0yHnuQNkiTdc1HApNrstz3v1rIbnrRvRS7Y VRGWA/WY5oPcayllDqcCeqP/ahcOWEBkbcgXRIx3eJQ8+YW6X25WbGtc7HR5OA925r3L fkQg== X-Received: by 10.14.104.199 with SMTP id i47mr2472244eeg.85.1379683570478; Fri, 20 Sep 2013 06:26:10 -0700 (PDT) Received: from Pali-EliteBook.kolej.mff.cuni.cz (pali.kolej.mff.cuni.cz. [78.128.193.202]) by mx.google.com with ESMTPSA id a43sm19429342eep.9.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 20 Sep 2013 06:26:09 -0700 (PDT) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Matt Mackall , Herbert Xu , Tony Lindgren , Russell King , Joe Perches , Aaro Koskinen Cc: linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Pali=20Roh=C3=A1r?= Subject: [PATCH v2 1/3] omap2: Change clk dev id for rng to omap3-rom-rng Date: Fri, 20 Sep 2013 15:25:05 +0200 Message-Id: <1379683507-30793-2-git-send-email-pali.rohar@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1379683507-30793-1-git-send-email-pali.rohar@gmail.com> References: <1379534757-20870-1-git-send-email-pali.rohar@gmail.com> <1379683507-30793-1-git-send-email-pali.rohar@gmail.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Name omap_rng is already used by omap_rng driver which is for omap2 and omap4. For omap3 HS devices there is new driver omap3-rom-rng which needs that clk. And because there cannot be two drivers with same name, rename omap3 clk dev id. Signed-off-by: Pali Rohár --- arch/arm/mach-omap2/cclock3xxx_data.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/cclock3xxx_data.c b/arch/arm/mach-omap2/cclock3xxx_data.c index 334b767..5059338 100644 --- a/arch/arm/mach-omap2/cclock3xxx_data.c +++ b/arch/arm/mach-omap2/cclock3xxx_data.c @@ -3274,7 +3274,7 @@ static struct omap_clk omap36xx_clks[] = { */ static struct omap_clk omap34xx_omap36xx_clks[] = { CLK(NULL, "aes1_ick", &aes1_ick), - CLK("omap_rng", "ick", &rng_ick), + CLK("omap3-rom-rng", "ick", &rng_ick), CLK(NULL, "sha11_ick", &sha11_ick), CLK(NULL, "des1_ick", &des1_ick), CLK(NULL, "cam_mclk", &cam_mclk),