From patchwork Thu Oct 16 23:00:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kim Kukjin X-Patchwork-Id: 5094701 Return-Path: X-Original-To: patchwork-linux-arm@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 137C29F38C for ; Thu, 16 Oct 2014 23:03:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2FE31201EC for ; Thu, 16 Oct 2014 23:03:37 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4A230201D3 for ; Thu, 16 Oct 2014 23:03:36 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xeu2t-0000To-0a; Thu, 16 Oct 2014 23:01:23 +0000 Received: from mail-pa0-x22e.google.com ([2607:f8b0:400e:c03::22e]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xeu2o-0000Sr-7P for linux-arm-kernel@lists.infradead.org; Thu, 16 Oct 2014 23:01:19 +0000 Received: by mail-pa0-f46.google.com with SMTP id fa1so4273646pad.5 for ; Thu, 16 Oct 2014 16:00:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=DlhlUwWSq+zItrIQ+66pWKM3W6aYYD6XUJqX/X0ILSk=; b=fFVK0dqUH32FuZKXEHc6qCBv2ulr7ECNh7ZFqtQNqIN19Nx/0PX4ci5FTvYsj6bFdA UJkFKE6xBq75s5DWiqKj+Kiqr1tFdcE79HPxGbu/UHzYuTNFqGFL2dDIky48+snKrvNu h5JrWtXTBJrIuo1P77Vnk1WlDYhvyz5iwYyJdMl5dwImLrpalo4EI1MXigNBcPMrJrYP NZ8gURhnFm4FJ5rxmaiejrQ7RnghbMed3A2IzWXGvmrJUHIZ9Tqr/8O1YVwItMwR+sQO E5KlNzhUy08p4Z8mEM27siIEnpXGuOUuW/ogqovn5W5Yq8ixoZvt1Ap1sFI+jEG0BTlh d2IA== X-Received: by 10.68.201.9 with SMTP id jw9mr4423576pbc.140.1413500454417; Thu, 16 Oct 2014 16:00:54 -0700 (PDT) Received: from [10.211.55.6] ([115.23.146.239]) by mx.google.com with ESMTPSA id xj9sm20859147pab.40.2014.10.16.16.00.51 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 16 Oct 2014 16:00:53 -0700 (PDT) Message-ID: <54404E1F.7040607@samsung.com> Date: Fri, 17 Oct 2014 08:00:47 +0900 From: Kukjin Kim User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.24) Gecko/20111108 Fedora/3.1.16-1.fc14 Lightning/1.0b3pre Thunderbird/3.1.16 MIME-Version: 1.0 To: Kukjin Kim Subject: Re: [GIT PULL 2/2] Samsung defconfig updates for v3.18 References: <543DB158.7030303@samsung.com> <1413380267.4565.1.camel@collabora.co.uk> <00e601cfe8dc$abf25bb0$03d71310$@kernel.org> <014e01cfe917$20adbb90$620932b0$@kernel.org> In-Reply-To: <014e01cfe917$20adbb90$620932b0$@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141016_160118_307277_CFDD3E9E X-CRM114-Status: GOOD ( 24.29 ) X-Spam-Score: -0.7 (/) Cc: linux-samsung-soc@vger.kernel.org, 'Arnd Bergmann' , 'Chanwoo Choi' , 'Olof Johansson' , 'Javier Martinez Canillas' , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=no 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 On 10/16/14 16:59, Kukjin Kim wrote: > Javier Martinez Canillas wrote: >> >> Hello Kukjin, >> > Hi, > >> On Thu, Oct 16, 2014 at 3:01 AM, Kukjin Kim wrote: >>> Sjoerd Simons wrote: >>>>> On Tue, 2014-10-14 at 23:32 -0700, Olof Johansson wrote: >>>>> On Tue, Oct 14, 2014 at 4:27 PM, Kukjin Kim wrote: >>>>>> git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git >>>>>> tags/samsung-defconfig >>>>>> >>>>>> for you to fetch changes up to 508423bebcda29eb0ba7c627f895387dad7cdcd6: >>>>>> >>>>>> ARM: exynos_defconfig: enable USB gadget support (2014-09-25 18:20:18 >>>>>> +0900) >>>>> >>>>> Merged, thanks. >>>> >>>> Hrm, enabling USB gadget support will actually regress USB on Exynos >>>> peach boards and Arndale Octa without some of the DT fixes that landed >>>> in armsoc next/late branch. Specifically: >>>> >>>> 5c42acdbffff9bab595482b966b22ab5e2f6f359 >>>> dbb62ef9ade6e92737d3fac199665b8b7c455959 >>>> >>> Yeah...I've missed it. Sorry. >>> >>>> Might be good to cherry-pick those into for-next at this point (they're >>>> rather trivial) >>>> >>> So...Olof, can you please cherry pick them into arm-soc/fixes? Or shall I send >>> pull-request for them again? >>> >> > + Arnd, Olof and regarding MLs > >> There are other bugfixes for 3.18 that ended in next/late so it would >> be good if you do a new pull request to include those as well. >> >> The commits (with hashes from linux-next) are: >> >> 3f3d046 ARM: dts: Remove display timings node from exynos5250-snow >> dd12ac7 ARM: dts: Fix chip select GPIO on exynos5250-smdk5250 > Above patches are not required because there is no my wrong merge ;) >> c04c92e ARM: dts: Add rtc_src clk for s3c-rtc on exynos5250-snow >> 8bd43b6 ARM: dts: Add rtc_src clk for s3c-rtc on exynos Peach boards >> > I checked its dependent clock patches have been merged into mainline just now. > As you know, the patches blocked dt patches in this time :( Anyway, I'll try > to send a pull-request with including above patches tonight. > Hmm... + Chanwoo I didn't look at the Chanwoo's patch closely at that time but I think we don't need to register rtc_src clock for all other Samsung stuff if we don't want to gate the clock for rtc driver. So the rtc driver would be fixed like below for all Samsung stuff... > Thanks for your gentle reminder. > > Olof, I think it makes sense because it is related fixes for 3.18 ;) > > Sorry for late noise... > > Thanks, > Kukjin diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c index a6b1252..84f3cbd 100644 --- a/drivers/rtc/rtc-s3c.c +++ b/drivers/rtc/rtc-s3c.c @@ -535,13 +535,14 @@ static int s3c_rtc_probe(struct platform_device *pdev) } clk_prepare_enable(info->rtc_clk); - info->rtc_src_clk = devm_clk_get(&pdev->dev, "rtc_src"); - if (IS_ERR(info->rtc_src_clk)) { - dev_err(&pdev->dev, "failed to find rtc source clock\n"); - return PTR_ERR(info->rtc_src_clk); + if (info->data->needs_src_clk) + info->rtc_src_clk = devm_clk_get(&pdev->dev, "rtc_src"); + if (IS_ERR(info->rtc_src_clk)) { + dev_err(&pdev->dev, "failed to find rtc source clock\n"); + return PTR_ERR(info->rtc_src_clk); + } + clk_prepare_enable(info->rtc_src_clk); } - clk_prepare_enable(info->rtc_src_clk); - /* check to see if everything is setup correctly */ if (info->data->enable)