From patchwork Mon Feb 15 11:53:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 79381 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 o1FBs794008436 for ; Mon, 15 Feb 2010 11:54:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755430Ab0BOLyG (ORCPT ); Mon, 15 Feb 2010 06:54:06 -0500 Received: from mail-yx0-f200.google.com ([209.85.210.200]:43658 "EHLO mail-yx0-f200.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755425Ab0BOLyD (ORCPT ); Mon, 15 Feb 2010 06:54:03 -0500 Received: by yxe38 with SMTP id 38so3407108yxe.4 for ; Mon, 15 Feb 2010 03:54:02 -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=nneM/WUut+qNxxKEJhSlD6/QQte5eY3oHmPPNRL0j9M=; b=bvay/G367zuGTnS9YRzD/c+Soa9IXmqonCly4BF7Rdoo+RMUaw4J2rjluTzmapt4IK PVh8hFeHy5HCyY3tBffunu7/HZcfSZnF9iEYl1nxbKrE/CLT8uAa5t9xcpkta1H4NG2c zw1RcRS+TnJRNsYJTY0DLgk5N9Gdk+DXcOiFo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:date:message-id:subject; b=UF9uZ2mzrxgzwxHHgdb3LbrI7ULp/f603G5aEFVfyYMgZoXJi3EfbG6NPZ6XNXz7es i0FNwCASJwaApJLu3AZ/zcYSIw41S/GyiNVmYewNtcX98w2KFgtMhJd7b06rWkvPBQmL LPJ4lDJ6J9QnVg+PNJTEMjBQERhRLWirDI/Rg= Received: by 10.150.127.38 with SMTP id z38mr5912733ybc.22.1266234842710; Mon, 15 Feb 2010 03:54:02 -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 16sm4365854gxk.11.2010.02.15.03.54.01 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 15 Feb 2010 03:54:02 -0800 (PST) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: Magnus Damm , lethal@linux-sh.org Date: Mon, 15 Feb 2010 20:53:43 +0900 Message-Id: <20100215115343.22072.41994.sendpatchset@t400s> Subject: [PATCH] sh: fix sh7724 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]); Mon, 15 Feb 2010 11:54:07 +0000 (UTC) --- 0001/arch/sh/kernel/cpu/sh4a/setup-sh7724.c +++ work/arch/sh/kernel/cpu/sh4a/setup-sh7724.c 2010-02-15 20:06:48.000000000 +0900 @@ -724,6 +724,7 @@ void l2_cache_init(void) enum { UNUSED = 0, ENABLED, + DISABLED, /* interrupt sources */ IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7, @@ -890,7 +891,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_VOU, VIO_VEU1, VIO_BEU0, VIO_CEU0, DMAC0A_DEI3, DMAC0A_DEI2, DMAC0A_DEI1, DMAC0A_DEI0 } }, @@ -912,7 +913,7 @@ static struct intc_mask_reg mask_registe { I2C0_DTEI, I2C0_WAITI, I2C0_TACKI, I2C0_ALI, I2C1_DTEI, I2C1_WAITI, I2C1_TACKI, I2C1_ALI } }, { 0xa40800a0, 0xa40800e0, 8, /* IMR8 / IMCR8 */ - { 0, 0, ENABLED, ENABLED, + { DISABLED, DISABLED, ENABLED, ENABLED, 0, 0, SCIFA5, FSI } }, { 0xa40800a4, 0xa40800e4, 8, /* IMR9 / IMCR9 */ { 0, 0, 0, CMT, 0, USB1, USB0, 0 } }, @@ -962,6 +963,7 @@ static struct intc_mask_reg ack_register static struct intc_desc intc_desc __initdata = { .name = "sh7724", .force_enable = ENABLED, + .force_disable = DISABLED, .hw = INTC_HW_DESC(vectors, groups, mask_registers, prio_registers, sense_registers, ack_registers), };