From patchwork Thu Jun 20 15:30:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2756891 Return-Path: X-Original-To: patchwork-linux-arm@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 CC215C0AB1 for ; Thu, 20 Jun 2013 15:31:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1E8522036A for ; Thu, 20 Jun 2013 15:31:16 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C4144203C4 for ; Thu, 20 Jun 2013 15:31:14 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UpgpL-0004A4-Hv; Thu, 20 Jun 2013 15:31:11 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UpgpJ-0002S8-1W; Thu, 20 Jun 2013 15:31:09 +0000 Received: from moutng.kundenserver.de ([212.227.17.9]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UpgpG-0002Rd-0B for linux-arm-kernel@lists.infradead.org; Thu, 20 Jun 2013 15:31:06 +0000 Received: from klappe2.localnet (HSI-KBW-095-208-002-043.hsi5.kabel-badenwuerttemberg.de [95.208.2.43]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0MBWuQ-1Uz0k91SiM-00A0oT; Thu, 20 Jun 2013 17:30:43 +0200 From: Arnd Bergmann To: Kukjin Kim Subject: Re: [GIT PULL 01/10] Samsung cleanup-1 for v3.11 Date: Thu, 20 Jun 2013 17:30:37 +0200 User-Agent: KMail/1.12.2 (Linux/3.8.0-22-generic; KDE/4.3.2; x86_64; ; ) References: <51C0BC37.7090604@samsung.com> In-Reply-To: <51C0BC37.7090604@samsung.com> MIME-Version: 1.0 Message-Id: <201306201730.38049.arnd@arndb.de> X-Provags-ID: V02:K0:IKoNomAkc6XkOqs1ToUFKC2goyJ4rdQGK41xjhARAsg /qnw5mQyXTgN1YlbpeKmwbJqSv2IqkKtmxTzEVxm/oXh8oa3Ze rXHcbdd9QpTPwdHiY5avOSKWL/BT1A9deXsGxcEPtS7k3ILdns Efpau66BjhwjiW0VaNCOrrO0vmd2hlqQZHfnRAnHM5caW8qOMH KodA7WwhvTXGwX3OODhAazlYsoqVk5ftt5OzB9oJQ8HQ2vgrsy 5BhV1ISLPoRksrYxRV4199O6W7enG7ed7fZEwJGVWA5kwfxX5n 0JB8eK9XlPmVaSQL6kuPdOLbtUUBT/bBiyaEjF3uu8381Ld6uw F2kDx6qBfguppDtXuv/A= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130620_113106_272865_A4C6CA18 X-CRM114-Status: GOOD ( 12.62 ) X-Spam-Score: -1.9 (-) Cc: 'Olof Johansson' , Tomasz Figa , "linux-samsung-soc@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , Tushar Behera X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 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=-5.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Tuesday 18 June 2013, Kukjin Kim wrote: > > The following changes since commit 317ddd256b9c24b0d78fa8018f80f1e495481a10: > > Linux 3.10-rc5 (2013-06-08 17:41:04 -0700) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git > tags/samsung-cleanup-1 > > for you to fetch changes up to db3824e6bf0b0f421b0d43f08d905935e826a965: > > ARM: SAMSUNG: Remove unused plat/regs-watchdog.h header (2013-06-19 > 03:13:18 +0900) > > ---------------------------------------------------------------- > - Consolidate uncompress subroutines and s5p64x0-uncompress > - Cleanup watchdog support on Samsung to support multiplatform > > ---------------------------------------------------------------- > Tomasz Figa (7): > ARM: S5P64X0: Use common uncompress.h part for plat-samsung > watchdog: s3c2410_wdt: Use local register definitions > ARM: SAMSUNG: Use local definitions of watchdog registers > ARM: SAMSUNG: Add watchdog reset driver > ARM: SAMSUNG: Let platforms use the new watchdog reset driver > ARM: SAMSUNG: Remove legacy watchdog reset code > ARM: SAMSUNG: Remove unused plat/regs-watchdog.h header > > Tushar Behera (1): > ARM: SAMSUNG: Consolidate uncompress subroutine I've had to apply this patch on top to get s5p to build cleanly again. It's part of next/cleanup now as well. Arnd From 854f1c88e6ab7c8a12a49913e8b1648f96af0701 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Thu, 20 Jun 2013 17:27:13 +0200 Subject: [PATCH] ARM: s5p64x0: avoid build warning for uncompress.h Commit 5336539 "ARM: S5P64X0: Use common uncompress.h part for plat-samsung" was missing a type cast, this brings it in line with the other samsung platforms. Signed-off-by: Arnd Bergmann Acked-by: Kukjin Kim diff --git a/arch/arm/mach-s5p64x0/include/mach/uncompress.h b/arch/arm/mach-s5p64x0/include/mach/uncompress.h index bc04bd5..bbcc3f6 100644 --- a/arch/arm/mach-s5p64x0/include/mach/uncompress.h +++ b/arch/arm/mach-s5p64x0/include/mach/uncompress.h @@ -23,9 +23,9 @@ static void arch_detect_cpu(void) chipid = *(const volatile unsigned int __force *) 0xE0100118; if ((chipid & 0xff000) == 0x50000) - uart_base = S5P6450_PA_UART(CONFIG_S3C_LOWLEVEL_UART_PORT); + uart_base = (volatile u8 *)S5P6450_PA_UART(CONFIG_S3C_LOWLEVEL_UART_PORT); else - uart_base = S5P6440_PA_UART(CONFIG_S3C_LOWLEVEL_UART_PORT); + uart_base = (volatile u8 *)S5P6440_PA_UART(CONFIG_S3C_LOWLEVEL_UART_PORT); fifo_mask = S3C2440_UFSTAT_TXMASK; fifo_max = 63 << S3C2440_UFSTAT_TXSHIFT;