From mboxrd@z Thu Jan 1 00:00:00 1970 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 B6E53C433EF for ; Sat, 9 Apr 2022 16:56:58 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 329F783DE1; Sat, 9 Apr 2022 18:56:08 +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="knGlgMbr"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9EF4C83A97; Sat, 9 Apr 2022 18:55:37 +0200 (CEST) Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) (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 464F882DD7 for ; Sat, 9 Apr 2022 18:55:32 +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-ej1-x62f.google.com with SMTP id r13so22995106ejd.5 for ; Sat, 09 Apr 2022 09:55:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WsHH7zf96hBgor/eF+bI2hzxduRS1mijNS54GFJ6Uao=; b=knGlgMbrezTeBaaW/6kbB9KAWLVemby4/P20qU+seGYJzZEtU7D8OmcRzU+byoj9kD tZFsNK21cqrpL7W3XdN2KBbV2+KSqeRuwolC75HhBAcyBGABQgTPCsxYAClT5wqoI2g/ t5rKt0WjbrrLkSQ+mStKNbmFtJsdZh0mB5ojeLcQr6PkyqugN0Sue3ypEEpBIPK3UyuU G68ODW8hnlDeFuAZqQHKcewOvWh1sLY/PIXKuz+8rM0reCiQuSDQmgMxfY73LDMXwwLI AJIyAyeQA/oG2dlNvKo/V1cpvuI1dDYd9SIE2zNo5lVK/UZjvogHSGmQSqDCwYdqVTpP PhHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WsHH7zf96hBgor/eF+bI2hzxduRS1mijNS54GFJ6Uao=; b=RV9RlkFA4Itj4Jl+1QyJHFOVfejLEhcbv6uqztPLWv3lWq7k9He/4+tZjQVNikj4TS db9oy+hu4SYMwAmT+LSOKH8zg2lZNgho+zvLyGio4UU4lU9P6GhcYuGhzUaa0gJ3IiUv bzmIOrgOGawWJSGx8L7vxXubvfGWb2OXBURpuSHj2obttYzcy/T5wie0136VI5PIK/St /BXAHTK7QDynkU8GEwTPGbs0sdEXJBWl9QHNbL9/iblvGhUtMna3l+Uh0mtFet+tNi0p m/Rtx3zUVeBxBpzEyDAx5ZgoLuccbFCLsU1Zc3wqy6F5seARxFZSN6WF0699RgsbL4Au I0iw== X-Gm-Message-State: AOAM533u053zE9lBYcKzZANbV4TcoYD96t1fwwpvkNklJsmYi6yTc9Ru w2GTdHMjQ1TOQ+Sm5pdmCho= X-Google-Smtp-Source: ABdhPJxjJHe/z/yXsiP88NPVzfvITuNH27UQX24O/aMy068ok47eBPTBdgmXGiccnQtI/9ZPbTk32g== X-Received: by 2002:a17:907:2cc5:b0:6e8:344b:98d1 with SMTP id hg5-20020a1709072cc500b006e8344b98d1mr13581620ejc.174.1649523331918; Sat, 09 Apr 2022 09:55:31 -0700 (PDT) Received: from debian.home (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id t14-20020a170906608e00b006d1455acc62sm10004538ejj.74.2022.04.09.09.55.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Apr 2022 09:55:31 -0700 (PDT) From: Johan Jonker To: kever.yang@rock-chips.com Cc: sjg@chromium.org, philipp.tomsich@vrull.eu, heiko@sntech.de, peng.fan@nxp.com, jh80.chung@samsung.com, u-boot@lists.denx.de Subject: [PATCH v5 09/13] rockchip: serial: restyle the serial_rockchip.c driver Date: Sat, 9 Apr 2022 18:55:10 +0200 Message-Id: <20220409165514.19220-10-jbx6244@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220409165514.19220-1-jbx6244@gmail.com> References: <20220409165514.19220-1-jbx6244@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.5 at phobos.denx.de X-Virus-Status: Clean The ns16550.c driver has the following conditions for .of_match: CONFIG_IS_ENABLED(OF_REAL) For Rockchip SoCs with TPL/SPL and platform data that need serial support the serial_rockchip.c driver was made. It copies this data and then calls ns16550_serial_probe(). With the addition of yet an other SoC type this driver is in need for a little restyle. Simplify struct rockchip_uart_plat and add extra SoCs with DM_DRIVER_ALIAS(). Return -ENODEV when the ns16550.c driver probe function is available. Signed-off-by: Johan Jonker Reviewed-by: Simon Glass Reviewed-by: Kever Yang --- Changed V4: add empty line --- drivers/serial/serial_rockchip.c | 37 +++++++++++++------------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/drivers/serial/serial_rockchip.c b/drivers/serial/serial_rockchip.c index 97d40869a2..f5ac705f4d 100644 --- a/drivers/serial/serial_rockchip.c +++ b/drivers/serial/serial_rockchip.c @@ -12,22 +12,20 @@ #include #include -#if defined(CONFIG_ROCKCHIP_RK3188) -struct rockchip_uart_plat { - struct dtd_rockchip_rk3188_uart dtplat; - struct ns16550_plat plat; -}; -struct dtd_rockchip_rk3188_uart *dtplat, s_dtplat; -#elif defined(CONFIG_ROCKCHIP_RK3288) struct rockchip_uart_plat { +#if CONFIG_IS_ENABLED(OF_PLATDATA) struct dtd_rockchip_rk3288_uart dtplat; +#endif struct ns16550_plat plat; }; + +#if CONFIG_IS_ENABLED(OF_PLATDATA) struct dtd_rockchip_rk3288_uart *dtplat, s_dtplat; #endif static int rockchip_serial_probe(struct udevice *dev) { +#if CONFIG_IS_ENABLED(OF_PLATDATA) struct rockchip_uart_plat *plat = dev_get_plat(dev); /* Create some new platform data for the standard driver */ @@ -38,24 +36,19 @@ static int rockchip_serial_probe(struct udevice *dev) dev_set_plat(dev, &plat->plat); return ns16550_serial_probe(dev); +#else + return -ENODEV; +#endif } -U_BOOT_DRIVER(rockchip_rk3188_uart) = { - .name = "rockchip_rk3188_uart", - .id = UCLASS_SERIAL, - .priv_auto = sizeof(struct ns16550), - .plat_auto = sizeof(struct rockchip_uart_plat), - .probe = rockchip_serial_probe, - .ops = &ns16550_serial_ops, - .flags = DM_FLAG_PRE_RELOC, -}; - U_BOOT_DRIVER(rockchip_rk3288_uart) = { - .name = "rockchip_rk3288_uart", - .id = UCLASS_SERIAL, + .name = "rockchip_rk3288_uart", + .id = UCLASS_SERIAL, .priv_auto = sizeof(struct ns16550), .plat_auto = sizeof(struct rockchip_uart_plat), - .probe = rockchip_serial_probe, - .ops = &ns16550_serial_ops, - .flags = DM_FLAG_PRE_RELOC, + .probe = rockchip_serial_probe, + .ops = &ns16550_serial_ops, + .flags = DM_FLAG_PRE_RELOC, }; +DM_DRIVER_ALIAS(rockchip_rk3288_uart, rockchip_rk3066_uart) +DM_DRIVER_ALIAS(rockchip_rk3288_uart, rockchip_rk3188_uart) -- 2.20.1