From patchwork Sun Nov 1 04:58:56 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Abraham X-Patchwork-Id: 37370 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 4734AB7C1D for ; Sun, 1 Nov 2009 16:02:44 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750947AbZKAFCh (ORCPT ); Sun, 1 Nov 2009 01:02:37 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750973AbZKAFCh (ORCPT ); Sun, 1 Nov 2009 01:02:37 -0400 Received: from ganesha.gnumonks.org ([213.95.27.120]:50864 "EHLO ganesha.gnumonks.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750925AbZKAFCh (ORCPT ); Sun, 1 Nov 2009 01:02:37 -0400 Received: from uucp by ganesha.gnumonks.org with local-bsmtp (Exim 4.69) (envelope-from ) id 1N4SaP-0003uu-Se; Sun, 01 Nov 2009 06:02:41 +0100 Received: from [12.23.106.52] (helo=localhost.localdomain) by jackpot.kr.gnumonks.org with esmtp (Exim 4.69) (envelope-from ) id 1N4SKq-00056x-2E; Sun, 01 Nov 2009 13:46:36 +0900 From: Thomas Abraham To: ben-linux@fluff.org Cc: linux-arm-kernel@lists.infradead.org, linux-ide@vger.kernel.org, Thomas Abraham Subject: [PATCH 6/7] S3C6410: Add platform data for S3C IDE controller driver Date: Sun, 1 Nov 2009 13:58:56 +0900 Message-Id: <1257051536-8170-1-git-send-email-thomas.ab@samsung.com> X-Mailer: git-send-email 1.6.0.4 Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org This patch adds platform data for S3C IDE controller driver in S3C6410 platform. Signed-off-by: Abhilash Kesavan Signed-off-by: Thomas Abraham --- arch/arm/mach-s3c6410/mach-smdk6410.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-s3c6410/mach-smdk6410.c b/arch/arm/mach-s3c6410/mach-smdk6410.c index ea51dbe..81b435e 100644 --- a/arch/arm/mach-s3c6410/mach-smdk6410.c +++ b/arch/arm/mach-s3c6410/mach-smdk6410.c @@ -50,6 +50,7 @@ #include #include #include +#include #include #include @@ -153,6 +154,12 @@ static struct s3c_fb_platdata smdk6410_lcd_pdata __initdata = { .vidcon1 = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC, }; +#ifdef CONFIG_BLK_DEV_IDE_S3C +static struct s3c_ide_platdata smdk6410_ide_pdata __initdata = { + .setup_gpio = s3c64xx_ide_setup_gpio, +}; +#endif + static struct resource smdk6410_smsc911x_resources[] = { [0] = { .start = 0x18000000, @@ -199,7 +204,9 @@ static struct platform_device *smdk6410_devices[] __initdata = { &s3c_device_usb, &s3c_device_usb_hsotg, &smdk6410_lcd_powerdev, - +#ifdef CONFIG_BLK_DEV_IDE_S3C + &s3c_device_cfcon, +#endif &smdk6410_smsc911x, }; @@ -377,6 +382,9 @@ static void __init smdk6410_machine_init(void) s3c_i2c0_set_platdata(NULL); s3c_i2c1_set_platdata(NULL); s3c_fb_set_platdata(&smdk6410_lcd_pdata); +#ifdef CONFIG_BLK_DEV_IDE_S3C + s3c_ide_set_platdata(&smdk6410_ide_pdata); +#endif gpio_request(S3C64XX_GPN(5), "LCD power"); gpio_request(S3C64XX_GPF(13), "LCD power");