From patchwork Sat May 18 22:37:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 2589361 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 3AC4EDF2E5 for ; Sat, 18 May 2013 22:37:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753425Ab3ERWhb (ORCPT ); Sat, 18 May 2013 18:37:31 -0400 Received: from mail-ea0-f182.google.com ([209.85.215.182]:48284 "EHLO mail-ea0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753318Ab3ERWhb (ORCPT ); Sat, 18 May 2013 18:37:31 -0400 Received: by mail-ea0-f182.google.com with SMTP id r16so3317473ead.13 for ; Sat, 18 May 2013 15:37:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=GJNwxULqwajGTSW6SlnUwNtb5Q2ljsMdnvgqMePDuK8=; b=fsGWmYRaPItwn/GRYYmwgOnUZfWocLm3NBA58Eg9G7Ja85aLhD58vfPVu5SAKUn0Xy yL1Q7h8tFVv6QjSU2hkl/tgatLh/a96qfiGgDcPA2/WlxrNla/UDtiYUIRzOKXS5KKwk gcLXs9Jccz+XTtc2nc+FF1fpmP7EB3N9O2xzR4Zd2Y44IwUkE4FjEMklTJiE41FjbnQw 2s4evg3fflpZaWp7XKR+eoiN9WF0i95Nz7we3ju1ZYUSELEuSjIPI9q6Mc39fTaTlJz4 JKrCmFGJxrcKYNCJN14TGdiI0gi5GaOsWBZtNWVAHAA/grVLhVXpG6T0M7DQaNax+g9z 7pIw== X-Received: by 10.15.82.201 with SMTP id a49mr147513747eez.44.1368916649705; Sat, 18 May 2013 15:37:29 -0700 (PDT) Received: from flatron.tomeq (87-207-52-162.dynamic.chello.pl. [87.207.52.162]) by mx.google.com with ESMTPSA id i3sm28210104eev.1.2013.05.18.15.37.27 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 18 May 2013 15:37:28 -0700 (PDT) From: Tomasz Figa To: linux-arm-kernel@lists.infradead.org Cc: linux-samsung-soc@vger.kernel.org, Kukjin Kim , Sylwester Nawrocki , =?UTF-8?q?Heiko=20St=C3=BCbner?= , Wim Van Sebroeck , linux-watchdog@vger.kernel.org, jhbird.choi@samsung.com, Tomasz Figa Subject: [PATCH 2/6] ARM: SAMSUNG: uncompress: Use local definitions of watchdog registers Date: Sun, 19 May 2013 00:37:03 +0200 Message-Id: <1368916627-23139-3-git-send-email-tomasz.figa@gmail.com> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1368916627-23139-1-git-send-email-tomasz.figa@gmail.com> References: <1368916627-23139-1-git-send-email-tomasz.figa@gmail.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org Signed-off-by: Tomasz Figa --- arch/arm/plat-samsung/include/plat/uncompress.h | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/arch/arm/plat-samsung/include/plat/uncompress.h b/arch/arm/plat-samsung/include/plat/uncompress.h index 438b248..e8954b8 100644 --- a/arch/arm/plat-samsung/include/plat/uncompress.h +++ b/arch/arm/plat-samsung/include/plat/uncompress.h @@ -28,11 +28,20 @@ static void arch_detect_cpu(void); /* defines for UART registers */ #include -#include /* working in physical space... */ -#undef S3C2410_WDOGREG -#define S3C2410_WDOGREG(x) ((S3C24XX_PA_WATCHDOG + (x))) +#define S3C_WDOGREG(x) ((S3C_PA_WDT + (x))) + +#define S3C2410_WTCON S3C_WDOGREG(0x00) +#define S3C2410_WTDAT S3C_WDOGREG(0x04) +#define S3C2410_WTCNT S3C_WDOGREG(0x08) + +#define S3C2410_WTCON_RSTEN (1 << 0) +#define S3C2410_WTCON_ENABLE (1 << 5) + +#define S3C2410_WTCON_DIV128 (3 << 3) + +#define S3C2410_WTCON_PRESCALE(x) ((x) << 8) /* how many bytes we allow into the FIFO at a time in FIFO mode */ #define FIFO_MAX (14)