From patchwork Fri Nov 24 15:24:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 841094 X-Patchwork-Delegate: yamada.m@jp.panasonic.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=nifty.com header.i=@nifty.com header.b="UxOqENiM"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3yk0Nd3wv3z9s03 for ; Sat, 25 Nov 2017 02:24:32 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 1D92FC21E13; Fri, 24 Nov 2017 15:24:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id C723DC21D72; Fri, 24 Nov 2017 15:24:21 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id CCC84C21DA9; Fri, 24 Nov 2017 15:24:19 +0000 (UTC) Received: from conuserg-10.nifty.com (conuserg-10.nifty.com [210.131.2.77]) by lists.denx.de (Postfix) with ESMTPS id 93728C21D72 for ; Fri, 24 Nov 2017 15:24:18 +0000 (UTC) Received: from grover.sesame (FL1-125-199-20-195.osk.mesh.ad.jp [125.199.20.195]) (authenticated) by conuserg-10.nifty.com with ESMTP id vAOFO63l016678; Sat, 25 Nov 2017 00:24:08 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com vAOFO63l016678 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1511537048; bh=v+Y6knRmJ9DTTgbF+/cyISX8UqyEkhns2RzylhW6GpA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UxOqENiM4MpsZELFNeJ2Iw+lQi3sqKO65vpanhiz+J2bSO/n+E9GbLEWuWE/gs1S4 SmcxlN50wOICR2DIWlCrdOYZmLdptbXgdB2eUp1naZ91yDsZNOrA8Pel7xeEHprMdB NovO6F0mkmolyfILcLt+z2kPCn5mAjI//k2w5c78RGtCu1BeRENQsezYQ4AFmk/2WJ nJ4JBJBn69K8ilNCWTwIB2y+xsRshIoc5jiS7xJEgFUeJ0s+204p7uCgEvrybDEwEZ iMBNFXi90cO46crG1MWQX+pBJtIA6qRCsBIXDA7mIAkX4IphSyRAP3wtpPLubVtoG8 /uffjlSLcspLA== X-Nifty-SrcIP: [125.199.20.195] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Sat, 25 Nov 2017 00:24:03 +0900 Message-Id: <1511537046-7456-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511537046-7456-1-git-send-email-yamada.masahiro@socionext.com> References: <1511537046-7456-1-git-send-email-yamada.masahiro@socionext.com> Cc: Scott Wood Subject: [U-Boot] [PATCH 2/5] ARM: uniphier: remove IRQ settings X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This work-around has been here in U-Boot because the AIDET and GPIO drivers were missing in the upstream Linux. Both are now available in Linus' tree: - drivers/irqchip/irq-uniphier-aidet.c - drivers/gpio/gpio-uniphier.c Signed-off-by: Masahiro Yamada --- arch/arm/mach-uniphier/board_init.c | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/arch/arm/mach-uniphier/board_init.c b/arch/arm/mach-uniphier/board_init.c index a6ee22e..28784ea 100644 --- a/arch/arm/mach-uniphier/board_init.c +++ b/arch/arm/mach-uniphier/board_init.c @@ -17,37 +17,6 @@ DECLARE_GLOBAL_DATA_PTR; -static void uniphier_setup_xirq(void) -{ - const void *fdt = gd->fdt_blob; - int soc_node, aidet_node; - const fdt32_t *val; - unsigned long aidet_base; - u32 tmp; - - soc_node = fdt_path_offset(fdt, "/soc"); - if (soc_node < 0) - return; - - aidet_node = fdt_subnode_offset_namelen(fdt, soc_node, "aidet", 5); - if (aidet_node < 0) - return; - - val = fdt_getprop(fdt, aidet_node, "reg", NULL); - if (!val) - return; - - aidet_base = fdt32_to_cpu(*val); - - tmp = readl(aidet_base + 8); /* AIDET DETCONFR2 */ - tmp |= 0x00ff0000; /* Set XIRQ0-7 low active */ - writel(tmp, aidet_base + 8); - - tmp = readl(0x55000090); /* IRQCTL */ - tmp |= 0x000000ff; - writel(tmp, 0x55000090); -} - #ifdef CONFIG_ARCH_UNIPHIER_LD11 static void uniphier_ld11_misc_init(void) { @@ -192,10 +161,6 @@ int board_init(void) led_puts("U3"); - uniphier_setup_xirq(); - - led_puts("U4"); - support_card_late_init(); led_puts("Uboo");