From patchwork Fri Nov 24 15:25:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 119593 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp2377418qgn; Fri, 24 Nov 2017 07:29:50 -0800 (PST) X-Google-Smtp-Source: AGs4zMa1RXs9YnUIeXpgqHvvn/DlOERgFCgWJSZQJsH/myiP8RSpySOxeHKJMc56NhS4KesEnjEb X-Received: by 10.80.134.18 with SMTP id o18mr39660651edo.306.1511537390641; Fri, 24 Nov 2017 07:29:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511537390; cv=none; d=google.com; s=arc-20160816; b=GPb/Gg2KcPz3HmpecILZVNWifgHSkXFIZAOzxzPuhLO55Rs4o5+oEw9cokr0VruKfn Ewb2dyDw5F/e/cQMOy2x3v86vhcpxnmuaXAXnDUEc2PXPizIyd3Qx1odP9FzZylkYBLG TLBvEwDQEFQVWrJdzdccRrkSnDSjxMEHJa9yfR86hXl/34ZYJgsdBtX8OtUig5vqK2tg pyr944159rMKAPJTFjiqauy+AWaVGOLlk6OJ9XjBe/6dQ467S4Exby9qjaoD1vohwEgj Gc2MuoQhnUml6tqwRhVgMTHesRJtmX/VjFTZCAwZ2bxUhbc1tDNgU5BKsp17ZyT28pvy TEfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:dkim-filter:arc-authentication-results; bh=PEUYf+YD8M8cu7wc2xOSMC4Saaa3N48ooWdW+ZaqReQ=; b=BCyG1/4SLrnPVGEO8NK6T9aUkKF3f57tFXuaCTJLk9YNUv/YXpXdfKBF59Qao6MIL+ NWC2LFL/3VUO9bgUoq5zT2VksK3AqiGBfd6X6Fi/V3Zsx/jasIfSJulspv8YUY3DdJsQ cYThj3CNUNS1zrmkzevmKGZkr9Yvvw2ji4xz6B5ODP0FNxGOLz2j68/azmIjxqG5qQlx pQySdqduRwgzGsXcqBecxMIeSKkTQAgGXDP7L8rmFH6OIjHdJ7BfpC3umhypmYN6HYHq zgH2g9P5WEighsh5uaL4hPgjh5/r9YZ897KHZYs+uQVJu98psQMPlQs8Cb6IBLYfjEDu YiOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=ILePPLXr; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id n17si890018eda.409.2017.11.24.07.29.50; Fri, 24 Nov 2017 07:29:50 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=ILePPLXr; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id 3C238C21E42; Fri, 24 Nov 2017 15:27:53 +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 15C44C21E33; Fri, 24 Nov 2017 15:27:13 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 23991C21E22; Fri, 24 Nov 2017 15:25:53 +0000 (UTC) Received: from conuserg-11.nifty.com (conuserg-11.nifty.com [210.131.2.78]) by lists.denx.de (Postfix) with ESMTPS id E6655C21E1E for ; Fri, 24 Nov 2017 15:25:52 +0000 (UTC) Received: from grover.sesame (FL1-125-199-20-195.osk.mesh.ad.jp [125.199.20.195]) (authenticated) by conuserg-11.nifty.com with ESMTP id vAOFPbJl011993; Sat, 25 Nov 2017 00:25:38 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com vAOFPbJl011993 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1511537139; bh=v+Y6knRmJ9DTTgbF+/cyISX8UqyEkhns2RzylhW6GpA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ILePPLXrJLOnBySARLlzT+PL4b4CfvGgPja6owBqbXBmxHUZuK5V/nnbIJIIs1OuM aLN6kjggGhZWgXmew0VlsPw/huZtzysecgIaTQddbY/L41emSJe+78bBVm4HzqZR2o 0exksyA3mJoxwTgQ6s4K/+XXUg5Hi1zwsY4ORjvPFvYfrs8FJ9GoZCP9WoOTdeHAXt s13uhfQzudnR/QUqV42TerUE0ztrN98QI9k0S6gqDBaZ7rFHWJFGDKC/dXJrFF0olG NpsICCBFb6CzoViz+bY4ZlU+g9AzPT9EzgDXq0vqR0y92yyXheyQK2tCQyUQIRiH79 yyGtE5QrSnt6g== X-Nifty-SrcIP: [125.199.20.195] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Sat, 25 Nov 2017 00:25:32 +0900 Message-Id: <1511537135-26482-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511537135-26482-1-git-send-email-yamada.masahiro@socionext.com> References: <1511537135-26482-1-git-send-email-yamada.masahiro@socionext.com> 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");