From patchwork Tue Feb 16 05:17:52 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 79529 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o1G5IEIO018643 for ; Tue, 16 Feb 2010 05:18:14 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750899Ab0BPFSN (ORCPT ); Tue, 16 Feb 2010 00:18:13 -0500 Received: from mail-yx0-f200.google.com ([209.85.210.200]:55153 "EHLO mail-yx0-f200.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750740Ab0BPFSN (ORCPT ); Tue, 16 Feb 2010 00:18:13 -0500 Received: by yxe38 with SMTP id 38so3909203yxe.4 for ; Mon, 15 Feb 2010 21:18:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:date:message-id :subject; bh=8AzVtbCwspAxTSfgCofyc7uxrA2DBdqGHLtg5JQT1a8=; b=deuli32FkEFz6P2A/+YHBgC/8SmjCjmv9Mpa5HMLk+Kp9unXuFko0vOtsIEisyvzn+ nt0wkMds+SuxW3cFPBrWUnSQElJ70qjiEU/QUltodHC50PB8dD7HoOXZ+U0QxWHQ1gUN ZiS5W20naY1rCvCBYEgWZza8+uy/FH4NWe0hQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:date:message-id:subject; b=JYIDnSd3NNwuWsR81gJLWeNRyZdA4HYZIppcDlQhEk5d9l18i3++nWrLkhgPVCWVGp iAZvzqzFOGjM7HjYWBEWR8ONBAzNXpWWc0N79R0JHj74ekdmEIFTh8OPzGnqKjhOa1oW 9BNU1UAWOSQNGyzYt1/wwZ0QlhDp7MjyAdTm4= Received: by 10.101.2.4 with SMTP id e4mr3709788ani.49.1266297492109; Mon, 15 Feb 2010 21:18:12 -0800 (PST) Received: from ?127.0.0.1? (49.14.32.202.bf.2iij.net [202.32.14.49]) by mx.google.com with ESMTPS id 16sm260225gxk.3.2010.02.15.21.18.10 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 15 Feb 2010 21:18:11 -0800 (PST) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: Magnus Damm , lethal@linux-sh.org Date: Tue, 16 Feb 2010 14:17:52 +0900 Message-Id: <20100216051752.6966.30761.sendpatchset@t400s> Subject: [PATCH] sh: fix sh7722 SDHI support using INTC force_disable Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 16 Feb 2010 05:18:14 +0000 (UTC) --- 0001/arch/sh/kernel/cpu/sh4a/setup-sh7722.c +++ work/arch/sh/kernel/cpu/sh4a/setup-sh7722.c 2010-02-16 12:45:52.000000000 +0900 @@ -447,6 +447,7 @@ void __init plat_early_device_setup(void enum { UNUSED=0, ENABLED, + DISABLED, /* interrupt sources */ IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7, @@ -534,7 +535,7 @@ static struct intc_mask_reg mask_registe { I2C_DTEI, I2C_WAITI, I2C_TACKI, I2C_ALI, FLCTL_FLTREQ1I, FLCTL_FLTREQ0I, FLCTL_FLENDI, FLCTL_FLSTEI } }, { 0xa40800a0, 0xa40800e0, 8, /* IMR8 / IMCR8 */ - { 0, 0, ENABLED, ENABLED, 0, 0, TWODG, SIU } }, + { DISABLED, DISABLED, ENABLED, ENABLED, 0, 0, TWODG, SIU } }, { 0xa40800a4, 0xa40800e4, 8, /* IMR9 / IMCR9 */ { 0, 0, 0, CMT, 0, USB_USBI1, USB_USBI0, } }, { 0xa40800a8, 0xa40800e8, 8, /* IMR10 / IMCR10 */ @@ -575,6 +576,7 @@ static struct intc_mask_reg ack_register static struct intc_desc intc_desc __initdata = { .name = "sh7722", .force_enable = ENABLED, + .force_disable = DISABLED, .hw = INTC_HW_DESC(vectors, groups, mask_registers, prio_registers, sense_registers, ack_registers), };