From patchwork Fri Mar 21 16:01:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 3875161 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0D17ABF540 for ; Fri, 21 Mar 2014 16:01:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E733320212 for ; Fri, 21 Mar 2014 16:01:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8A5DC20203 for ; Fri, 21 Mar 2014 16:01:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753761AbaCUQBm (ORCPT ); Fri, 21 Mar 2014 12:01:42 -0400 Received: from moutng.kundenserver.de ([212.227.126.130]:60552 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751634AbaCUQBl convert rfc822-to-8bit (ORCPT ); Fri, 21 Mar 2014 12:01:41 -0400 Received: from klappe2.localnet (HSI-KBW-134-3-135-108.hsi14.kabel-badenwuerttemberg.de [134.3.135.108]) by mrelayeu.kundenserver.de (node=mreue007) with ESMTP (Nemesis) id 0MKPas-1WQTvJ04f8-001llo; Fri, 21 Mar 2014 17:01:39 +0100 From: Arnd Bergmann To: Tony Lindgren Subject: Re: [PATCH 23/62] ARM: omap1: fix building without 32K_TIMER Date: Fri, 21 Mar 2014 17:01:36 +0100 User-Agent: KMail/1.12.2 (Linux/3.8.0-22-generic; KDE/4.3.2; x86_64; ; ) Cc: Felipe Balbi , arm@kernel.org, linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org References: <1395257399-359545-1-git-send-email-arnd@arndb.de> <20140319200100.GB4271@saruman.home> <20140319203431.GA8333@atomide.com> In-Reply-To: <20140319203431.GA8333@atomide.com> MIME-Version: 1.0 Message-Id: <201403211701.36846.arnd@arndb.de> X-Provags-ID: V02:K0:nagmTTlnkrvSQzUoDVgTutfq2rH1T4QnvbYiBJuWUhV 880hIxAcelRtr/lkYP33SxP2atCYEyBBsOKsA9Qlt+9pkQOG4Z 7rjvW0eDtW31v+ELlZbA4KF5qhq0WczIDxVYC1jJ87VyTx2VO+ 0SYnDU+tLpD0AOxa74RLPuV7rDDtEqgET9mJ3gf3qfyRq8NtBe OyPYpe0UHUcvZ94kwyL4H6Lgzd/h0gLHQgzVOhLu0yz94ME7Uk 47En+XMa6FFZsNxtnHv7KffLo1a6qQERTn/T4ANWT6OJH/JDCS huAGwI4BfgFwV6txBr24X8V7oBZX8jevW0o+bxRvYke6gTt8LW wzI6hE9H5bNdLWfJjlmP3gZVH49yLyD1WtYVPdNsG Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, 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 On Wednesday 19 March 2014, Tony Lindgren wrote: > * Felipe Balbi [140319 13:06]: > > On Wed, Mar 19, 2014 at 02:59:13PM -0500, Felipe Balbi wrote: > > > I had sent a fix for months and months ago, what happened to it ? > > > > Here > > > > http://marc.info/?l=linux-omap&m=138963632408031&w=2 > > > > Tony, did you forget to send a pull request ? > > Hmm yes weird, can't see it in my omap-for-v3.14/fixes branch. > > I must have gotten interrupted while applying and then probably > ran git reset --hard before committing. > > Arnd, maybe pick up Felipe's earlier patch instead? > > Acked-by: Tony Lindgren Ok, using this version now, thanks! Arnd From 64cdcf550319a37d1419aa6a87903e67b9d3d031 Mon Sep 17 00:00:00 2001 From: Felipe Balbi Date: Sun, 16 Mar 2014 17:57:55 +0100 Subject: [PATCH] ARM: omap1: fix build when !CONFIG_OMAP_32K_TIMER If CONFIG_OMAP_32K_TIMER isn't enabled, we will try to use enable_dyn_sleep which wasn't defined anywhere. In order to fix the problem, we always define enable_dyn_sleep as 0 when !CONFIG_OMAP_32K_TIMER. Signed-off-by: Felipe Balbi Acked-by: Tony Lindgren Signed-off-by: Arnd Bergmann --- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c index 40a1ae3..dbee729 100644 --- a/arch/arm/mach-omap1/pm.c +++ b/arch/arm/mach-omap1/pm.c @@ -71,7 +71,11 @@ static unsigned int mpui7xx_sleep_save[MPUI7XX_SLEEP_SAVE_SIZE]; static unsigned int mpui1510_sleep_save[MPUI1510_SLEEP_SAVE_SIZE]; static unsigned int mpui1610_sleep_save[MPUI1610_SLEEP_SAVE_SIZE]; -#ifdef CONFIG_OMAP_32K_TIMER +#ifndef CONFIG_OMAP_32K_TIMER + +static unsigned short enable_dyn_sleep = 0; + +#else static unsigned short enable_dyn_sleep = 1;