From patchwork Sat May 11 21:26:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 2554591 Return-Path: X-Original-To: patchwork-ltsi-dev@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) by patchwork2.kernel.org (Postfix) with ESMTP id 58DCADF230 for ; Sat, 11 May 2013 21:26:46 +0000 (UTC) Received: from mail.linux-foundation.org (localhost [IPv6:::1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 52895718; Sat, 11 May 2013 21:26:46 +0000 (UTC) X-Original-To: ltsi-dev@lists.linuxfoundation.org Delivered-To: ltsi-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTP id BFD76718 for ; Sat, 11 May 2013 21:26:44 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-la0-f43.google.com (mail-la0-f43.google.com [209.85.215.43]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 0C1F21F8D2 for ; Sat, 11 May 2013 21:26:43 +0000 (UTC) Received: by mail-la0-f43.google.com with SMTP id ea20so5044574lab.16 for ; Sat, 11 May 2013 14:26:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:to:subject:cc:from:organization:date:mime-version :content-type:content-transfer-encoding:message-id :x-gm-message-state; bh=ysJVDcHwZfUIu/V4KYaiM0edtST0FrjOzyp+Nvn220U=; b=RkDRRlYXtfB3kMPuD3KZHTH6SsTO/sK+uirv/YkeWvtjtd7KaJLwjhz8jx8Eax8RBW Bn+HBuP3vfBVO66w7FhPeL7xV+9sVKSr+idp07DfIxvf1gz3QVwgLQpJ5NptvC05Ar2p alsEAjaxwsM6My+8UcB052it/PQXqEwYjLUp4zGHD8fig1nEU7jzAgUGnXTRMaIQuEHI J1HqSoe+Rp0CagzhSJ0/ubwMNo6IdY/roFHGqtHYrrsMm5a1xnuXUI0qLBkR5q2RFGTb NAvH7p2YZw8Qxw4GhJ9kkrBd7gP7WwOz3QDIwIgkywVGGwBJ/lUYXK6OiZARhDCwlm3D XlYg== X-Received: by 10.112.149.8 with SMTP id tw8mr9933743lbb.117.1368307602181; Sat, 11 May 2013 14:26:42 -0700 (PDT) Received: from wasted.dev.rtsoft.ru (ppp91-76-152-225.pppoe.mtu-net.ru. [91.76.152.225]) by mx.google.com with ESMTPSA id u4sm2913430lbq.2.2013.05.11.14.26.40 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 11 May 2013 14:26:41 -0700 (PDT) To: ltsi-dev@lists.linuxfoundation.org From: Sergei Shtylyov Organization: Cogent Embedded Date: Sun, 12 May 2013 01:26:55 +0400 MIME-Version: 1.0 Message-Id: <201305120126.55306.sergei.shtylyov@cogentembedded.com> X-Gm-Message-State: ALoCoQmpipkX1KpKQy407pQGSJ3U9vmKEE2onXkC0HTCAyyDHm2ylH896ct6BYrtYI+6U16BOZfc X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: vladimir.barinov@cogentembedded.com Subject: [LTSI-dev] [PATCH 2/2] ARM: mach-shmobile: marzen: add SATA support X-BeenThere: ltsi-dev@lists.linuxfoundation.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: "A list to discuss patches, development, and other things related to the LTSI project" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: ltsi-dev-bounces@lists.linuxfoundation.org Errors-To: ltsi-dev-bounces@lists.linuxfoundation.org From: Vladimir Barinov Add SATA support to marzen_defconfig. Signed-off-by: Vladimir Barinov Signed-off-by: Sergei Shtylyov Signed-off-by: Simon Horman (cherry picked from commit db30abdf3c07c564d4af0f991bb7f38b728f9035) --- This patch (already merged by Linus) is intended for the Marzen patch series. Changes from the upstream version: - resolved reject due to missing interim patches. arch/arm/configs/marzen_defconfig | 4 ++++ 1 file changed, 4 insertions(+) Index: linux-3.4.39/arch/arm/configs/marzen_defconfig =================================================================== --- linux-3.4.39.orig/arch/arm/configs/marzen_defconfig +++ linux-3.4.39/arch/arm/configs/marzen_defconfig @@ -47,6 +47,10 @@ CONFIG_DEVTMPFS_MOUNT=y # CONFIG_STANDALONE is not set # CONFIG_PREVENT_FIRMWARE_BUILD is not set # CONFIG_FW_LOADER is not set +CONFIG_ATA=y +CONFIG_ATA_SFF=y +CONFIG_ATA_BMDMA=y +CONFIG_SATA_RCAR=y CONFIG_NETDEVICES=y # CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_FARADAY is not set