Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 25FA0C433FE for ; Tue, 18 Oct 2022 11:25:21 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4DE6584E7F; Tue, 18 Oct 2022 13:25:18 +0200 (CEST) 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="C4LzqCSQ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A0ED184F41; Tue, 18 Oct 2022 13:25:14 +0200 (CEST) Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) (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 B562284F52 for ; Tue, 18 Oct 2022 13:25:02 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jbx6244@gmail.com Received: by mail-ed1-x52a.google.com with SMTP id s30so19981018eds.1 for ; Tue, 18 Oct 2022 04:25:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:from:user-agent:mime-version:date:message-id:from:to :cc:subject:date:message-id:reply-to; bh=IEqpON0bHrgFNuL/3LaYWSrveU/RMTUSi2IixoqWLG4=; b=C4LzqCSQeHMQaX0frIgr12m4MrsLBuYXiulEpfbjmeVeDuN7THRYEw1pZ/r2vm8MUt ebXrBqhj+ZTSYE7mw6BFot1zPhtSUO251QzDe/7k/plq7+BUKs3XK5SC6LzH9RZNosZ3 a2Jvuy6rEUXvuFuQmWOn3tLockw0n/7TO9nZswlzPdHDzmmdsxISVSRoxK6K96lg1gUw Vfz3VRcy/MSY4DBgTLuh3SP6S5eY4Fxkiu+kqSnFqin7+hY3dSRs+oBHNAjWsB06zs8Z t65EmKdsZHf1Q/hQ6b9c58pDUWEE2Rdtx6qdbBQ71uzEQ8DwXp2asKuP9shoGZtvatP7 ItKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:from:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=IEqpON0bHrgFNuL/3LaYWSrveU/RMTUSi2IixoqWLG4=; b=1co5L698GaNL4fq8ZFqMW+BTjpmEbeH2BuLMh1HPS+jEPFRvh2n59eeCpR8Z6OUJay CMjGJn7nkAeXp43IbHdit2AiMEnZwLDkPyoRSk61qwdRsZAJdOAbH13kwI7dXmSx1V/8 3ysC2mJH5l7t8ckb0WDeubCr92rcdiHprGD/EJjiT7L7sFs/H8WtOc2QRhascdtfS7JI kK53dQPpAgJJc8ouLI2SZlHrB0poTttpLs9UozL4kBxfqu9SJoMflQKiJISSzTddKA3Z QXIiGlXRD2Y7o/7yLCZou7/khxaJ7NzSjLaBktWNLWBmZEYM6tsnEJH0av//d895M0Hm teAw== X-Gm-Message-State: ACrzQf28qyfQrrkUY4uc+uFyzWxoqvxxsDY6ApHiVMx55+uIiBHjGK0n VNDu5yuXK1bQVltmqPOvw4g= X-Google-Smtp-Source: AMsMyM6qS86wLcTo6RhF8TzOdjQ7I8wO94hAJvmv9mxgILpCEAjMKPQCznmdtP/HGqnzz3dWqCKwMQ== X-Received: by 2002:a05:6402:1f84:b0:455:27b8:27aa with SMTP id c4-20020a0564021f8400b0045527b827aamr2101967edc.243.1666092302061; Tue, 18 Oct 2022 04:25:02 -0700 (PDT) Received: from [192.168.2.4] (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id v3-20020a1709063bc300b0077a201f6d1esm7378233ejf.87.2022.10.18.04.25.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 18 Oct 2022 04:25:01 -0700 (PDT) Message-ID: Date: Tue, 18 Oct 2022 13:25:00 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.3.0 From: Johan Jonker Subject: [PATCH v1] rockchip: phycore_rk3288: remove phycore_init() function To: kever.yang@rock-chips.com Cc: sjg@chromium.org, philipp.tomsich@vrull.eu, w.egorov@phytec.de, u-boot@lists.denx.de References: <42876044-e20f-81fd-2bc7-96ff2268d19d@gmail.com> Content-Language: en-US In-Reply-To: <42876044-e20f-81fd-2bc7-96ff2268d19d@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.6 at phobos.denx.de X-Virus-Status: Clean The phycore_rk3288 board has a SPL size problem, so remove phycore_init() function to stay within the limits. Signed-off-by: Johan Jonker --- arch/arm/mach-rockchip/rk3288/Kconfig | 1 - board/phytec/phycore_rk3288/phycore-rk3288.c | 46 -------------------- 2 files changed, 47 deletions(-) diff --git a/arch/arm/mach-rockchip/rk3288/Kconfig b/arch/arm/mach-rockchip/rk3288/Kconfig index e8c57843..1be2b585 100644 --- a/arch/arm/mach-rockchip/rk3288/Kconfig +++ b/arch/arm/mach-rockchip/rk3288/Kconfig @@ -89,7 +89,6 @@ config TARGET_MIQI_RK3288 config TARGET_PHYCORE_RK3288 bool "phyCORE-RK3288" select BOARD_LATE_INIT - select SPL_BOARD_INIT if SPL help Add basic support for the PCM-947 carrier board, a RK3288 based development board made by PHYTEC. This board works in a combination diff --git a/board/phytec/phycore_rk3288/phycore-rk3288.c b/board/phytec/phycore_rk3288/phycore-rk3288.c index 17b987f6..3f49f39e 100644 --- a/board/phytec/phycore_rk3288/phycore-rk3288.c +++ b/board/phytec/phycore_rk3288/phycore-rk3288.c @@ -19,8 +19,6 @@ #include #include #include "som.h" -#include -#include static int valid_rk3288_som(struct rk3288_som *som) { @@ -77,47 +75,3 @@ int rk3288_board_late_init(void) return 0; } - -#ifdef CONFIG_SPL_BUILD -#if !defined(CONFIG_SPL_OF_PLATDATA) -static int phycore_init(void) -{ - struct udevice *pmic; - int ret; - - ret = uclass_first_device_err(UCLASS_PMIC, &pmic); - if (ret) - return ret; - -#if defined(CONFIG_SPL_POWER) - /* Increase USB input current to 2A */ - ret = rk818_spl_configure_usb_input_current(pmic, 2000); - if (ret) - return ret; - - /* Close charger when USB lower then 3.26V */ - ret = rk818_spl_configure_usb_chrg_shutdown(pmic, 3260000); - if (ret) - return ret; -#endif - - return 0; -} -#endif - -void spl_board_init(void) -{ -#if !defined(CONFIG_SPL_OF_PLATDATA) - int ret; - - if (of_machine_is_compatible("phytec,rk3288-phycore-som")) { - ret = phycore_init(); - if (ret) { - debug("Failed to set up phycore power settings: %d\n", - ret); - return; - } - } -#endif -} -#endif -- 2.20.1