From patchwork Thu Jul 12 11:49:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 942956 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.b="VCYjdR9o"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41RDjz6Sqsz9s1R for ; Thu, 12 Jul 2018 21:49:11 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id D3151C21F37; Thu, 12 Jul 2018 11:49:09 +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=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 50569C21D4A; Thu, 12 Jul 2018 11:49:06 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 100D5C21D4A; Thu, 12 Jul 2018 11:49:04 +0000 (UTC) Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by lists.denx.de (Postfix) with ESMTPS id AF089C21BE5 for ; Thu, 12 Jul 2018 11:49:04 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id s14-v6so5748990wmc.1 for ; Thu, 12 Jul 2018 04:49:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:subject:date:message-id; bh=kOqpKtgJLNPa1+Z0PCbxF1yS9omkFWghShY0YA8RuQc=; b=VCYjdR9oR5G8nkZiLc+JPK1n74Bnat48PdS7QD2EySJPmJXO4o71vxpHQRwsNBP5am nrpneT/Ukr+msGir2lf0m6zRyAaw0foikxzwksB63BPAgN0tu0BUh4AQxJbjcDiz1jUm 4JK4m0g/ocSnRfAyEpz2i2ETQHqNDBIYfj11pKNlPG2Kwn1EoDwJaHGuO8KuDlyREzZf Ge8a/F9SQeecSoeUVY9tMoVhCdAFzLqnNJanpDng/4aVA7VgSyH4bk+sKVjP3zR9JzAs zHMldSnqYMv/2Mer8CpOvmuO2z9IDrt/XTWmR6uRwglJj73apvV8nyoeA8Dq+NPGXc9p nZ9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id; bh=kOqpKtgJLNPa1+Z0PCbxF1yS9omkFWghShY0YA8RuQc=; b=JSkHlkHTOW2yiiv9If27mTpLXd4K3sA0pXxyIkVnbnqualqtk4nGgo1D2RxRqxHsfk w8iSdYiRXuMtOC7FKNrfDblsPzBoOITuDyudEpNn2TQmdrMcSlZqrTVy7kjC1qCtQWwZ iOdiObHs1dQI3JHZe9lDkaR4USNlN7hQr7wxYzfMBsvy9kqD59pLoqDPG3A8p8adIfw5 WEWmhXyanRHhcCFuHTOkjw6pbPnnmCdCf1YcL1JxW7RyPEt14vafIMDskH5fRzjonIb8 vU2r8TOV8crvqeYSOMriOOkg3bqllWIyz6jc6Lrvyp57UKchqV2t8wqGKHKZRpodauMF jj4w== X-Gm-Message-State: AOUpUlHvva2UD4YocpX312GRLL54HEODjfdYeS0SobKanFSA4N6SQ+NF ZvJJCsGDPQFrNBMtYVofrxxgUg/q X-Google-Smtp-Source: AAOMgpdC+sXX+RbTBSr8F9y0xMXLgy/Pc2eLadBx/BsSa27Lp2oHhXcbckiTAu+f/Sboi0Put71vKg== X-Received: by 2002:a1c:5b09:: with SMTP id p9-v6mr1298369wmb.0.1531396144147; Thu, 12 Jul 2018 04:49:04 -0700 (PDT) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id l127-v6sm7427489wma.41.2018.07.12.04.49.03 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Thu, 12 Jul 2018 04:49:03 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de, Simon Glass Date: Thu, 12 Jul 2018 13:49:02 +0200 Message-Id: X-Mailer: git-send-email 1.9.1 Subject: [U-Boot] [PATCH] gpio: zynq: Read of mach data in platdata with dev_get_driver_data 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" Remove bogus zynq_gpio_getplat_data() and read driver data directly. Signed-off-by: Michal Simek Reviewed-by: Simon Glass --- Driver should use platdata structure but this change should be fine before this is fixed. Simon: Is ofdata_to_platdata correct function where this should be read? --- drivers/gpio/zynq_gpio.c | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/drivers/gpio/zynq_gpio.c b/drivers/gpio/zynq_gpio.c index 9a915544784d..26f69b1a713f 100644 --- a/drivers/gpio/zynq_gpio.c +++ b/drivers/gpio/zynq_gpio.c @@ -15,8 +15,6 @@ #include #include -DECLARE_GLOBAL_DATA_PTR; - /* Maximum banks */ #define ZYNQ_GPIO_MAX_BANK 4 @@ -334,36 +332,11 @@ static const struct udevice_id zynq_gpio_ids[] = { { } }; -static void zynq_gpio_getplat_data(struct udevice *dev) -{ - const struct udevice_id *of_match = zynq_gpio_ids; - int ret; - struct zynq_gpio_privdata *priv = dev_get_priv(dev); - - while (of_match->compatible) { - ret = fdt_node_offset_by_compatible(gd->fdt_blob, -1, - of_match->compatible); - if (ret >= 0) { - priv->p_data = - (struct zynq_platform_data *)of_match->data; - break; - } else { - of_match++; - continue; - } - } - - if (!priv->p_data) - printf("No Platform data found\n"); -} - static int zynq_gpio_probe(struct udevice *dev) { struct zynq_gpio_privdata *priv = dev_get_priv(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); - zynq_gpio_getplat_data(dev); - if (priv->p_data) uc_priv->gpio_count = priv->p_data->ngpio; @@ -376,6 +349,8 @@ static int zynq_gpio_ofdata_to_platdata(struct udevice *dev) priv->base = (phys_addr_t)dev_read_addr(dev); + priv->p_data = (struct zynq_platform_data *)dev_get_driver_data(dev); + return 0; }