From patchwork Wed Mar 8 16:46:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 9611701 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C3B6E602B4 for ; Wed, 8 Mar 2017 16:59:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B4493285EE for ; Wed, 8 Mar 2017 16:59:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A91A32860E; Wed, 8 Mar 2017 16:59:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 466A5285EE for ; Wed, 8 Mar 2017 16:59:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753922AbdCHQ7X (ORCPT ); Wed, 8 Mar 2017 11:59:23 -0500 Received: from mailout4.samsung.com ([203.254.224.34]:34387 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751906AbdCHQ7F (ORCPT ); Wed, 8 Mar 2017 11:59:05 -0500 Received: from epcas5p2.samsung.com (unknown [182.195.41.40]) by mailout4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OMI018S699ZU4B0@mailout4.samsung.com>; Thu, 09 Mar 2017 01:46:47 +0900 (KST) Received: from epsmges5p4.samsung.com (unknown [182.195.42.88]) by epcas5p1.samsung.com (KnoxPortal) with ESMTP id 20170308164646epcas5p122bf355d47324308bbb2fa961c1337ea~p9fozrZF_2422124221epcas5p1Y; Wed, 8 Mar 2017 16:46:46 +0000 (GMT) Received: from epcas5p2.samsung.com ( [182.195.41.40]) by epsmges5p4.samsung.com (EPCPMTA) with SMTP id 41.04.04908.67530C85; Thu, 9 Mar 2017 01:46:46 +0900 (KST) Received: from epcpsbgm2new.samsung.com (u27.gpu120.samsung.co.kr [203.254.230.27]) by epcas5p1.samsung.com (KnoxPortal) with ESMTP id 20170308164645epcas5p12a4884b620557266609e1b941f7ba938~p9foCNDMc2381723817epcas5p1c; Wed, 8 Mar 2017 16:46:45 +0000 (GMT) X-AuditID: b6c32a58-f79f16d00000132c-f4-58c03576a84e Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2new.samsung.com (EPCPMTA) with SMTP id 71.FF.06422.57530C85; Thu, 9 Mar 2017 01:46:45 +0900 (KST) Received: from amdc3058.localnet ([106.120.53.102]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OMI000IQ99W5L90@mmp2.samsung.com>; Thu, 09 Mar 2017 01:46:45 +0900 (KST) From: Bartlomiej Zolnierkiewicz To: Andrew Morton Cc: Yoshinori Sato , Rich Felker , linux-sh@vger.kernel.org, linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] sh: cayman: IDE support fix Date: Wed, 08 Mar 2017 17:46:43 +0100 Message-id: <1990884.yFoE6lSB9G@amdc3058> User-Agent: KMail/4.13.3 (Linux/3.13.0-96-generic; KDE/4.13.3; x86_64; ; ) MIME-version: 1.0 Content-transfer-encoding: 7Bit Content-type: text/plain; charset=us-ascii X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrDIsWRmVeSWpSXmKPExsWy7bCmhm6Z6YEIgwm7dC3mrF/DZrHw5y9W i2M7HjFZXN41h81izp8pzBb3J+1lcmDzODf7A4vHiRm/WTyWbL3J6PF5k1wASxSXTUpqTmZZ apG+XQJXxpk/19gL3nFX3H3zla2BsYuri5GTQ0LAROLYryMsELaYxIV769m6GLk4hASWMkr8 2v6WBcJpZ5JYuX0GUxcjB1hHyy0diPgcRokVX68wQzhfGSUObJvBDjKKTcBKYmL7KkYQW0RA V2LV811gRcwgYze/mAS2T1hAR6Ll+n4mEJtFQFVi6+o+sAZeAU2JN2+usoHYogJeElv2tTNB xAUlfky+B9bLLCAvsW//VFYIW0fi7LF1jCALJASa2SW+7N/JDnGqrMSmA8wQv7lIbJ3UzQRh C0u8Or6FHcKWlvi79BYjhD2dUWL7bwmIOZsZJVbtngBVZC1x+PhFqGV8Er2/n0CDgleio00I osRDYsYhUEiAhB0lHlwKBgkLCcRKzD77nn0Co9wsJB/MQvLBLCQfLGBkXsUollpQnJueWmxa YKJXnJhbXJqXrpecn7uJEZwmtCJ2MP6bEXSIUYCDUYmHN0P0QIQQa2JZcWXuIUYJDmYlEd7H RkAh3pTEyqrUovz4otKc1OJDjNIcLErivFEGEyOEBNITS1KzU1MLUotgskwcnFINjM256T9+ cWu+jcmqZd/ZlNDfECAssuZc40cR1YM6LB5RL7+6NItxHNAPEpTvnvlEV2FS0rJ+EfsvHj9V HeU4hWb/m+zW4L63b7PA/KVn8xszN70LOGUsftnP9co+tZ3vimKuO3VVH3V/UvKa+5Prqn02 r9h5r0373jJf+LC9l3H1jp4Pxd0xSizFGYmGWsxFxYkANdx6ig8DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprMIsWRmVeSWpSXmKPExsVy+t9jQd1S0wMRBn/bLSzmrF/DZrHw5y9W i2M7HjFZXN41h81izp8pzBb3J+1lcmDzODf7A4vHiRm/WTyWbL3J6PF5k1wAS5SbTUZqYkpq kUJqXnJ+SmZeuq1SaIibroWSQl5ibqqtUoSub0iQkkJZYk4pkGdkgAYcnAPcg5X07RLcMs78 ucZe8I674u6br2wNjF1cXYwcHBICJhItt3S6GDmBTDGJC/fWs3UxcnEICcxilLiw4yCU85VR Ykt7ByNIFZuAlcTE9lVgtoiArsSq57uYQYqYBZYySvz7doMdJCEsoCPRcn0/E4jNIqAqsXV1 H1gDr4CmxJs3V9lAbFEBL4kt+9qZIOKCEj8m32MBsZkF5CX27Z/KCmFrSazfeZxpAiPfLCRl s5CUzUJStoCReRWjRGpBckFxUnquUV5quV5xYm5xaV66XnJ+7iZGcIQ8k97BeHiX+yFGAQ5G JR5eAeEDEUKsiWXFlbmHGCU4mJVEeB8bAYV4UxIrq1KL8uOLSnNSiw8xmgI9MpFZSjQ5Hxi9 eSXxhibmJubGBhbmlpYmRkrivI2zn4ULCaQnlqRmp6YWpBbB9DFxcEo1MPapdx1qVNU5tFLb Ve7TDvN5rQXCTgcmCebYXpHvEruYbDEjIk+B4/km+ds6S95fv7rrzvHL3b/lpF/U7OhTv7Nj 5j33qLOvA9c55+x4t6L2M2se+wmmZffKZqhl50/WkRG1vhxR/Pp9rUVr0M993P6rAh+KRB48 ozO3srp/xfyp56bXFxx07VBiKc5INNRiLipOBAAOk0plpgIAAA== X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170308164645epcas5p12a4884b620557266609e1b941f7ba938 X-Msg-Generator: CA X-Sender-IP: 203.254.230.27 X-Local-Sender: =?UTF-8?B?QmFydGxvbWllaiBab2xuaWVya2lld2ljehtTUlBPTC1LZXJu?= =?UTF-8?B?ZWwgKFRQKRvsgrzshLHsoITsnpAbU2VuaW9yIFNvZnR3YXJlIEVuZ2luZWVy?= X-Global-Sender: =?UTF-8?B?QmFydGxvbWllaiBab2xuaWVya2lld2ljehtTUlBPTC1LZXJu?= =?UTF-8?B?ZWwgKFRQKRtTYW1zdW5nIEVsZWN0cm9uaWNzG1NlbmlvciBTb2Z0d2FyZSBF?= =?UTF-8?B?bmdpbmVlcg==?= X-Sender-Code: =?UTF-8?B?QzEwG0VIURtDMTBDRDAyQ0QwMjczOTI=?= CMS-TYPE: 105P X-HopCount: 7 X-CMS-RootMailID: 20170308164645epcas5p12a4884b620557266609e1b941f7ba938 X-RootMTR: 20170308164645epcas5p12a4884b620557266609e1b941f7ba938 References: Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Remove incorrect CONFIG_IDE ifdef (CONFIG_IDE config option is for internal drivers/ide/ use) and make IDE hardware interface always initialized (not only when IDE subsystem is built-in). This patch allows Cayman board to work with modular IDE subsystem support and removes the requirement of having the whole core IDE subsystem built-in when using libata PATA support. Cc: Yoshinori Sato Cc: Rich Felker Signed-off-by: Bartlomiej Zolnierkiewicz --- Untested. arch/sh/boards/mach-cayman/setup.c | 2 -- 1 file changed, 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: b/arch/sh/boards/mach-cayman/setup.c =================================================================== --- a/arch/sh/boards/mach-cayman/setup.c 2017-03-08 17:42:01.641323406 +0100 +++ b/arch/sh/boards/mach-cayman/setup.c 2017-03-08 17:42:01.637323406 +0100 @@ -128,7 +128,6 @@ static int __init smsc_superio_setup(voi SMSC_SUPERIO_WRITE_INDEXED(1, SMSC_PRIMARY_INT_INDEX); SMSC_SUPERIO_WRITE_INDEXED(12, SMSC_SECONDARY_INT_INDEX); -#ifdef CONFIG_IDE /* * Only IDE1 exists on the Cayman */ @@ -158,7 +157,6 @@ static int __init smsc_superio_setup(voi SMSC_SUPERIO_WRITE_INDEXED(0x01, 0xc5); /* GP45 = IDE1_IRQ */ SMSC_SUPERIO_WRITE_INDEXED(0x00, 0xc6); /* GP46 = nIOROP */ SMSC_SUPERIO_WRITE_INDEXED(0x00, 0xc7); /* GP47 = nIOWOP */ -#endif /* Exit the configuration state */ outb(SMSC_EXIT_CONFIG_KEY, SMSC_CONFIG_PORT_ADDR);