From patchwork Tue Feb 16 05:19:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 79530 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 o1G5IEIQ018643 for ; Tue, 16 Feb 2010 05:19:40 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750930Ab0BPFTk (ORCPT ); Tue, 16 Feb 2010 00:19:40 -0500 Received: from mail-yx0-f200.google.com ([209.85.210.200]:41384 "EHLO mail-yx0-f200.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750964Ab0BPFTj (ORCPT ); Tue, 16 Feb 2010 00:19:39 -0500 Received: by yxe38 with SMTP id 38so3909805yxe.4 for ; Mon, 15 Feb 2010 21:19:39 -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=6fZbNAKGpvVUJjsfxYY/ml88Zsd8aIKysUgXtQNHXtA=; b=SWbWO2NsnttHZ32e6btcyfvGpmEfo3vBHA2kFs9qMB/DZoPpRIK70r4zOuH9HSvDKt Jz9HEnLdCWUYJyae/mcRzJJR6MnKDcO3zLShHpXIUvyelmmtCSQix+QHyE0OSa91TJh7 txHTG2QuDKvCi0araZX597h5pRLCEUiWP6LTk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:date:message-id:subject; b=ANIDeQyG2a5APZXnqDu09KD4xvW6412G+5uKhsDv+/yYLNps1b4gWHtS49O6ZA43iK heUOt+ZuYBvYj9XyJKR64ILFaZw7BoF2+FL81V/+7cEAhssw2AwfcgNuqlwMrR68bGFp zyYUAzSBu+AW7YSyeRWSIL+7xqupj9DG9/WRo= Received: by 10.91.142.16 with SMTP id u16mr2511618agn.11.1266297578822; Mon, 15 Feb 2010 21:19:38 -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 13sm4979350gxk.5.2010.02.15.21.19.37 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 15 Feb 2010 21:19:37 -0800 (PST) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: Magnus Damm , lethal@linux-sh.org Date: Tue, 16 Feb 2010 14:19:19 +0900 Message-Id: <20100216051919.6975.99782.sendpatchset@t400s> Subject: [PATCH] sh: fix sh7723 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:19:40 +0000 (UTC) --- 0001/arch/sh/kernel/cpu/sh4a/setup-sh7723.c +++ work/arch/sh/kernel/cpu/sh4a/setup-sh7723.c 2010-02-16 14:10:22.000000000 +0900 @@ -602,6 +602,7 @@ void l2_cache_init(void) enum { UNUSED=0, ENABLED, + DISABLED, /* interrupt sources */ IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7, @@ -745,7 +746,7 @@ static struct intc_group groups[] __init static struct intc_mask_reg mask_registers[] __initdata = { { 0xa4080080, 0xa40800c0, 8, /* IMR0 / IMCR0 */ { 0, TMU1_TUNI2, TMU1_TUNI1, TMU1_TUNI0, - 0, 0, ENABLED, ENABLED } }, + 0, DISABLED, ENABLED, ENABLED } }, { 0xa4080084, 0xa40800c4, 8, /* IMR1 / IMCR1 */ { VIO_VOUI, VIO_VEU2HI,VIO_BEUI,VIO_CEUI,DMAC0A_DEI3,DMAC0A_DEI2,DMAC0A_DEI1,DMAC0A_DEI0 } }, { 0xa4080088, 0xa40800c8, 8, /* IMR2 / IMCR2 */ @@ -762,7 +763,7 @@ static struct intc_mask_reg mask_registe { I2C_DTEI, I2C_WAITI, I2C_TACKI, I2C_ALI, FLCTL_FLTREQ1I, FLCTL_FLTREQ0I, FLCTL_FLTENDI, FLCTL_FLSTEI } }, { 0xa40800a0, 0xa40800e0, 8, /* IMR8 / IMCR8 */ - { 0, 0, ENABLED, ENABLED, + { 0, DISABLED, ENABLED, ENABLED, 0, 0, SCIFA_SCIFA2, SIU_SIUI } }, { 0xa40800a4, 0xa40800e4, 8, /* IMR9 / IMCR9 */ { 0, 0, 0, CMT_CMTI, 0, 0, USB_USI0,0 } }, @@ -806,6 +807,7 @@ static struct intc_mask_reg ack_register static struct intc_desc intc_desc __initdata = { .name = "sh7723", .force_enable = ENABLED, + .force_disable = DISABLED, .hw = INTC_HW_DESC(vectors, groups, mask_registers, prio_registers, sense_registers, ack_registers), };