From patchwork Tue Dec 8 03:39:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 553740 X-Patchwork-Delegate: bmeng.cn@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 2BA7414029C for ; Tue, 8 Dec 2015 14:53:07 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=DO9eHuWS; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 75BE94B7E4; Tue, 8 Dec 2015 04:51:28 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 80HJgXpu1eTE; Tue, 8 Dec 2015 04:51:28 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 48A22A74C2; Tue, 8 Dec 2015 04:50:33 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AEDF14B794 for ; Tue, 8 Dec 2015 04:49:41 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gaVbk8uxv9o0 for ; Tue, 8 Dec 2015 04:49:41 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-oi0-f47.google.com (mail-oi0-f47.google.com [209.85.218.47]) by theia.denx.de (Postfix) with ESMTPS id 5511A4B752 for ; Tue, 8 Dec 2015 04:49:23 +0100 (CET) Received: by oies6 with SMTP id s6so4035864oie.1 for ; Mon, 07 Dec 2015 19:49:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=/FUp3ntDP9Wj4+JvC/3wHXRTsuK4AV7fABVRBZpCJfs=; b=DO9eHuWSYhCElbo3tX73oZAlaps/t9bXYtSw9f4FNz0WWMMJ26H10afJ78tm9lLzr7 cmJNTLxoy5lLdXtdydzTvizy7awlXMeKsnM2D7U16h+y8VorO+YrMqUD2PzP7RZLpxQN 5B/YSYKY7lM2Iww0I/8NANZ5JgZQqrXvLajBFqAb12A3WLpjX/ZWajtmhZW1VOeoyIyg XLniTBZyOw0aCdxAExJinGe4jIV9lYL+2DLCSh+g5X5O1CINsCSFDbwQyOTZ/1jaE2ME xO2dwlcsrxJXIjcLHCzOONQy/x45r2UA4tGXs3HJY07fVXujZ5jUTAj99aG3ZI2GngOu uI8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=/FUp3ntDP9Wj4+JvC/3wHXRTsuK4AV7fABVRBZpCJfs=; b=VzLrPcJ8lHrjCQ5GhsUR7/pPCbqdmbLljai/9MAADEzEI8sfcMcuMvW84pzJJ+3+eW 8pX59zq9VOSM0madnJXgbno7GFoJGZa/JpimqDXV4oP+Oe8SbDcBDi3JQ6neMTKhYpd1 StsxPYNhUPAZTj4LUMYkF67uGbcsHadB731U/l81WryI9pNwJ54+pCGRpR7PNsbqt7vO 7cLoMoq4qOGHECzDTcu0pjtFUaKRtkcAqSmEgAOzrAzJWJVRbxhxzMcms/zcMe396B9s N2m32NYgZ33YVglzpXwln5ukJIhoBg46DPwlgQmI706JcVblLedQisI8yyQzaAjKZgkB uoyw== X-Gm-Message-State: ALoCoQmvGnMEFrWndhE5hNHPvwN+6iocX9Aiq/1X3tJdgY4hrmJa/95ntiQjgkDQh9ihaaqq53oqR1224Ytcf6hzz2ldrVWZHA== X-Received: by 10.202.73.133 with SMTP id w127mr929919oia.43.1449546561998; Mon, 07 Dec 2015 19:49:21 -0800 (PST) Received: from kaki.bld.corp.google.com ([2620:0:1005:1100:b183:2592:94e4:a79]) by smtp.gmail.com with ESMTPSA id kw1sm572416obb.28.2015.12.07.19.49.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Dec 2015 19:49:18 -0800 (PST) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 68DA1222B0A; Mon, 7 Dec 2015 20:39:25 -0700 (MST) From: Simon Glass To: U-Boot Mailing List Date: Mon, 7 Dec 2015 20:39:16 -0700 Message-Id: <1449545956-2772-58-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.6.0.rc2.230.g3dd15c0 In-Reply-To: <1449545956-2772-1-git-send-email-sjg@chromium.org> References: <1449545956-2772-1-git-send-email-sjg@chromium.org> Cc: Graeme Russ , Jerry Van Baren Subject: [U-Boot] [PATCH 57/57] x86: fdt: Drop the unused compatible strings in fdtdec X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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" We have drivers for several more devices now, so drop the strings which are no-longer used. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- arch/x86/cpu/ivybridge/lpc.c | 6 ------ include/fdtdec.h | 5 ----- lib/fdtdec.c | 5 ----- 3 files changed, 16 deletions(-) diff --git a/arch/x86/cpu/ivybridge/lpc.c b/arch/x86/cpu/ivybridge/lpc.c index 6536555..fcbdece 100644 --- a/arch/x86/cpu/ivybridge/lpc.c +++ b/arch/x86/cpu/ivybridge/lpc.c @@ -501,8 +501,6 @@ static int lpc_early_init(struct udevice *dev) static int lpc_init_extra(struct udevice *dev) { struct udevice *pch = dev->parent; - const void *blob = gd->fdt_blob; - int node; debug("pch: lpc_init\n"); dm_pci_write_bar32(pch, 0, 0); @@ -511,10 +509,6 @@ static int lpc_init_extra(struct udevice *dev) dm_pci_write_bar32(pch, 3, 0x800); dm_pci_write_bar32(pch, 4, 0x900); - node = fdtdec_next_compatible(blob, 0, COMPAT_INTEL_PCH); - if (node < 0) - return -ENOENT; - /* Set the value for PCI command register. */ dm_pci_write_config16(pch, PCI_COMMAND, 0x000f); diff --git a/include/fdtdec.h b/include/fdtdec.h index 018d151..e95c154 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -155,15 +155,10 @@ enum fdt_compat_id { COMPAT_SAMSUNG_EXYNOS_SYSMMU, /* Exynos sysmmu */ COMPAT_INTEL_MICROCODE, /* Intel microcode update */ COMPAT_MEMORY_SPD, /* Memory SPD information */ - COMPAT_INTEL_PANTHERPOINT_AHCI, /* Intel Pantherpoint AHCI */ - COMPAT_INTEL_MODEL_206AX, /* Intel Model 206AX CPU */ - COMPAT_INTEL_GMA, /* Intel Graphics Media Accelerator */ COMPAT_AMS_AS3722, /* AMS AS3722 PMIC */ - COMPAT_INTEL_ICH_SPI, /* Intel ICH7/9 SPI controller */ COMPAT_INTEL_QRK_MRC, /* Intel Quark MRC */ COMPAT_INTEL_X86_PINCTRL, /* Intel ICH7/9 pin control */ COMPAT_SOCIONEXT_XHCI, /* Socionext UniPhier xHCI */ - COMPAT_INTEL_PCH, /* Intel PCH */ COMPAT_INTEL_IRQ_ROUTER, /* Intel Interrupt Router */ COMPAT_ALTERA_SOCFPGA_DWMAC, /* SoCFPGA Ethernet controller */ COMPAT_ALTERA_SOCFPGA_DWMMC, /* SoCFPGA DWMMC controller */ diff --git a/lib/fdtdec.c b/lib/fdtdec.c index f6f23ae..4dc7514 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -60,15 +60,10 @@ static const char * const compat_names[COMPAT_COUNT] = { COMPAT(SAMSUNG_EXYNOS_SYSMMU, "samsung,sysmmu-v3.3"), COMPAT(INTEL_MICROCODE, "intel,microcode"), COMPAT(MEMORY_SPD, "memory-spd"), - COMPAT(INTEL_PANTHERPOINT_AHCI, "intel,pantherpoint-ahci"), - COMPAT(INTEL_MODEL_206AX, "intel,model-206ax"), - COMPAT(INTEL_GMA, "intel,gma"), COMPAT(AMS_AS3722, "ams,as3722"), - COMPAT(INTEL_ICH_SPI, "intel,ich-spi"), COMPAT(INTEL_QRK_MRC, "intel,quark-mrc"), COMPAT(INTEL_X86_PINCTRL, "intel,x86-pinctrl"), COMPAT(SOCIONEXT_XHCI, "socionext,uniphier-xhci"), - COMPAT(COMPAT_INTEL_PCH, "intel,bd82x6x"), COMPAT(COMPAT_INTEL_IRQ_ROUTER, "intel,irq-router"), COMPAT(ALTERA_SOCFPGA_DWMAC, "altr,socfpga-stmmac"), COMPAT(ALTERA_SOCFPGA_DWMMC, "altr,socfpga-dw-mshc"),