From patchwork Thu Dec 3 03:24:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 1410107 X-Patchwork-Delegate: priyanka.jain@nxp.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=KES1tX4C; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Cmh6R26kCz9sT5 for ; Thu, 3 Dec 2020 14:24:57 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 517A68271E; Thu, 3 Dec 2020 04:24:48 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="KES1tX4C"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4F1F282742; Thu, 3 Dec 2020 04:24:46 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pj1-x1043.google.com (mail-pj1-x1043.google.com [IPv6:2607:f8b0:4864:20::1043]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 40EE082705 for ; Thu, 3 Dec 2020 04:24:43 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=judge.packham@gmail.com Received: by mail-pj1-x1043.google.com with SMTP id iq13so329345pjb.3 for ; Wed, 02 Dec 2020 19:24:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=vs/0SlIrKWzOhGnR55Ptvpdk2blr71hXM3bWHR3FYoM=; b=KES1tX4CIBHWmG+2EVL0UChnHgqHD630e7m01CiyNy8ZT494pZofVUjX0TpPOH2owK Jh0j4FPtzOFz7Ytm8SiMq08lSEg0nEyj+rlUVLMIKHV2Q61/IUyXiOWK3dKL95c0C4ZL ihlXvb/Y8QkJEM5I3ObH3pFIGeLEvj6LoqCzuktQ6Yq4xNKqPB8A2zkz7lXRsiGk05cx fEarjH5nTQ191OI34RxgaMgSNbTxTXjhFwSRn0XFJwHyUZBRUaUJI/laLyqhrkIufKo3 ccaQHVKXM0x3UdQE6gciEngXLn5k5Tv1tk5zeFwAUsJugMT33Us8vDMCLLMqB7ifDqey GEgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=vs/0SlIrKWzOhGnR55Ptvpdk2blr71hXM3bWHR3FYoM=; b=paK2NSRJmtKynAbiO1kWCXHinPYTQ5t4r5KUnkvmLo//+BRkUbx0uAyLksNyE7PRja mg12InXCftyZubE8zaAWiltwN/4RkprV1kVEFL22yXmKVWG0xY+OGmyRmSrvCdhY0TgI /qHvGM3zBNEh8zwmeYfeask8iIGmgwAx8lwISJ1ssGZuE1QgfZ3vGYlspuXI2KX0C+jI Ovs7UMdpvzUdJQ+j0IDFZPR7yhaLexVa40RMnaFRZQdalgJZQz/N2ti0mK9mvLtrQAQw Gv7yNq+c94QboxO/sqJjRsnG+51a+OYy3x7g7SS12szy2fg+HZdAB1Hm6QIqT1YPfxh2 IeHA== X-Gm-Message-State: AOAM531rsJx//AAsrJAa5YniF3LkMKDPYzMjAVn3QLB8cqjwE3iE3LJx 9QDWO7l9RD3u/ylZJdacl9w8pO/5a7LBTw== X-Google-Smtp-Source: ABdhPJy3Df2f0D4QwHvw8P44bvdLbBPHhF4yaCdcvkO7huKM7gYLMRGQ7ci6Au0TSKr0XlXbhoJwCQ== X-Received: by 2002:a17:902:a504:b029:d8:ebc7:a864 with SMTP id s4-20020a170902a504b02900d8ebc7a864mr1190222plq.60.1606965881250; Wed, 02 Dec 2020 19:24:41 -0800 (PST) Received: from chrisp-dl.atlnz.lc ([2001:df5:b000:22:a019:df18:2a6e:fd26]) by smtp.gmail.com with ESMTPSA id p14sm340617pgm.69.2020.12.02.19.24.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Dec 2020 19:24:40 -0800 (PST) From: Chris Packham To: u-boot@lists.denx.de Cc: Chris Packham , Andy Fleming , Mario Six , Priyanka Jain , Stefan Roese , Wolfgang Denk , Yangbo Lu Subject: [PATCH] powerpc: mpc85xx: Allow boards to override CONFIG_USB_MAX_CONTROLLER_COUNT Date: Thu, 3 Dec 2020 16:24:29 +1300 Message-Id: <20201203032429.25005-1-judge.packham@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean If the board isn't strapped to enable USB1 then attempting to access it will result in a hang. Avoid this by allowing boards to define CONFIG_USB_MAX_CONTROLLER_COUNT. Signed-off-by: Chris Packham --- arch/powerpc/include/asm/config_mpc85xx.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index 4ca1e2b325f1..f25ba1af0928 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -116,7 +116,9 @@ #define CONFIG_SYS_NUM_FMAN 1 #define CONFIG_SYS_NUM_FM1_DTSEC 5 #define CONFIG_SYS_NUM_FM1_10GEC 1 +#ifndef CONFIG_USB_MAX_CONTROLLER_COUNT #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 +#endif #define CONFIG_SYS_FM_MURAM_SIZE 0x28000 #define CONFIG_SYS_FSL_TBCLK_DIV 32 #define CONFIG_SYS_FSL_PCIE_COMPAT "fsl,qoriq-pcie-v2.2"