From patchwork Fri Jul 15 14:16:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Harvey X-Patchwork-Id: 648829 X-Patchwork-Delegate: sbabic@denx.de 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 3rrZHQ3g7Zz9s6r for ; Sat, 16 Jul 2016 00:11:14 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gateworks-com.20150623.gappssmtp.com header.i=@gateworks-com.20150623.gappssmtp.com header.b=ziMKLzY0; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 18E41A758E; Fri, 15 Jul 2016 16:11:12 +0200 (CEST) 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 7Okxk-1fEtii; Fri, 15 Jul 2016 16:11:11 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 845D8A7594; Fri, 15 Jul 2016 16:11:06 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 42119A7514 for ; Fri, 15 Jul 2016 16:11:02 +0200 (CEST) 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 Eb2MfVJEwLTt for ; Fri, 15 Jul 2016 16:11:02 +0200 (CEST) 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-pa0-f46.google.com (mail-pa0-f46.google.com [209.85.220.46]) by theia.denx.de (Postfix) with ESMTPS id CB145A74DB for ; Fri, 15 Jul 2016 16:10:59 +0200 (CEST) Received: by mail-pa0-f46.google.com with SMTP id pp5so33083388pac.3 for ; Fri, 15 Jul 2016 07:10:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gateworks-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zDXrKyFKbsIfX4Kp1NbT8WzEPqFyIHzB4h5xTFNg7Vo=; b=ziMKLzY0Pt+XvZXdd+1zm8PqDwHqfEb2yj8gmbkFFgsVjU+Jd/7yjNaLrGqSMerGBk KsscutB8gRrAIPepOKRNEdTilrXr7ToRV0hEATkvSl1re6WoFUdGUf/wy6AB1oB/54lq IFpWwdqzopqETEaYluIjw6I541bjqNhm2XUIqdtl/Hwu49ERKPExU5BeOsgm0frSvtn0 RqinTMqjTQu+qIHJu/9IdGafe7UtUkoxapdMfz5fltKdpEkpVlQdFyUPVn7P88D24qOd nfg+emKwMQ8E2EXnilezbzeBq+M9CQWtQgrk5VwYbVAGHdSTcoDEeiK9kzkXAbt0fh7v /KeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zDXrKyFKbsIfX4Kp1NbT8WzEPqFyIHzB4h5xTFNg7Vo=; b=QaAOyqx0dhLB091a7KHlmpJ1LwwRvBevQQpBqt9pwWKxkIp0m7fBYQW6nNTqok7FJd JLjUPx1BdZ7HwNk4VHD1WOK8FbOSFR/UV+vAoyGc4wzvuO+ZF3PF/c3T9AgTEzzDAKag 3YAyq2cAXM9JFEsR/vRrsdEo1fkHqLecLbkmV4L+qTdtMMwZy0o5cze/CUZaRZvk8p5Y 054LzDPKO5Jj3wa9DCwoGrhTxWQBL4xK3n0xKDrA6U/Xg2PjgRD2lM23I3oBRN8S+kCf DiUKXoPSI0EJvNM8ECyvpQd7LUx+LrmaLnebuECfwOvX2rxMM3YYLzGvCTo/ZZw5B0nQ /H5g== X-Gm-Message-State: ALyK8tIKItFt2Uqko9vLsC6ouzkcdb2EOh66wgL7IGg2DGfnXnI9AsI4+tlAH+suqtdWCQ== X-Received: by 10.66.158.68 with SMTP id ws4mr32494855pab.144.1468591858355; Fri, 15 Jul 2016 07:10:58 -0700 (PDT) Received: from tharvey.pdc.gateworks.com (68-189-91-139.static.snlo.ca.charter.com. [68.189.91.139]) by smtp.gmail.com with ESMTPSA id w67sm3313928pfw.41.2016.07.15.07.10.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 15 Jul 2016 07:10:57 -0700 (PDT) From: Tim Harvey To: Stefano Babic Date: Fri, 15 Jul 2016 07:16:29 -0700 Message-Id: <1468592189-20889-3-git-send-email-tharvey@gateworks.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1468592189-20889-1-git-send-email-tharvey@gateworks.com> References: <1468592189-20889-1-git-send-email-tharvey@gateworks.com> Cc: U-Boot@lists.denx.de Subject: [U-Boot] [PATCH 2/2] imx: ventana: add dt fixup for watchdog external reset 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" Added removal of the fsl,ext-reset-output property in the wdog node for board revisions that pre-date the addition of the external watchdog reset signal. This property is a recent addition to mainline linux kernel in order to specify that the IMX watchdog external reset should be used instead of the internal chip-level reset. Signed-off-by: Tim Harvey --- board/gateworks/gw_ventana/gw_ventana.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c index bb792c2..5d871ce 100644 --- a/board/gateworks/gw_ventana/gw_ventana.c +++ b/board/gateworks/gw_ventana/gw_ventana.c @@ -1085,6 +1085,7 @@ void ft_board_pci_fixup(void *blob, bd_t *bd) */ #define UART1_PATH "/soc/aips-bus@02100000/serial@021ec000" #define WDOG1_PATH "/soc/aips-bus@02000000/wdog@020bc000" +#define WDOG2_PATH "/soc/aips-bus@02000000/wdog@020c0000" #define GPIO3_PATH "/soc/aips-bus@02000000/gpio@020a4000" int ft_board_setup(void *blob, bd_t *bd) { @@ -1152,6 +1153,11 @@ int ft_board_setup(void *blob, bd_t *bd) if (i) fdt_status_disabled(blob, i); } + + /* GW51xx-E adds WDOG1_B external reset */ + if (rev < 'E') + ft_delprop_path(blob, WDOG1_PATH, + "fsl,ext-reset-output"); break; case GW52xx: @@ -1180,10 +1186,24 @@ int ft_board_setup(void *blob, bd_t *bd) if (strstr((const char *)info->model, "SP318-B") || strstr((const char *)info->model, "SP331-B")) gpio_cfg[board_type].usd_vsel = 0; + + /* GW520x-E adds WDOG1_B external reset */ + if (info->model[4] == '0' && rev < 'E') + ft_delprop_path(blob, WDOG1_PATH, + "fsl,ext-reset-output"); + + /* GW522x-B adds WDOG1_B external reset */ + if (info->model[4] == '2' && rev < 'B') + ft_delprop_path(blob, WDOG1_PATH, + "fsl,ext-reset-output"); } break; case GW53xx: + /* GW53xx-E adds WDOG1_B external reset */ + if (rev < 'E') + ft_delprop_path(blob, WDOG1_PATH, + "fsl,ext-reset-output"); break; case GW54xx: @@ -1194,6 +1214,11 @@ int ft_board_setup(void *blob, bd_t *bd) i = fdt_path_offset(blob, UART1_PATH); if (i) fdt_del_node(blob, i); + + /* GW54xx-E adds WDOG2_B external reset */ + if (rev < 'E') + ft_delprop_path(blob, WDOG2_PATH, + "fsl,ext-reset-output"); break; case GW551x: @@ -1239,6 +1264,11 @@ int ft_board_setup(void *blob, bd_t *bd) /* set BT656 video format */ ft_sethdmiinfmt(blob, "yuv422bt656"); } + + /* GW551x-C adds WDOG1_B external reset */ + if (rev < 'C') + ft_delprop_path(blob, WDOG1_PATH, + "fsl,ext-reset-output"); break; }