From patchwork Tue Jun 19 07:11:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 139097 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp4862377lji; Tue, 19 Jun 2018 00:16:08 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKKg1i5U2/WAIWWl1cptjWsN7vVLoY+Uh8tjbvqJM6ZwHzmWSLpYgt+DDz8sY450C2Gvv58 X-Received: by 2002:a50:ce03:: with SMTP id y3-v6mr13627779edi.300.1529392568273; Tue, 19 Jun 2018 00:16:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529392568; cv=none; d=google.com; s=arc-20160816; b=SgSaDGvhGZyLrSt9D5tNR5Ea6fXYSgLJ1u7mCMIwXyDT7UVqDFbFivO5YW7gZunVVV gIOMua2Ic4AkVqnMkM1zmISbuRxjKvhjwJNUBPLtDFwQOkNzt5Fi71eGZUgzqsu7Idy2 gDP0xzkZQy95gNXRnq7wza8vRVGz/9WmqzZBAA9oQ6roKmobJMmX+/vLJKPfixHyYjBZ tHiOsaNNK3LbBDr7bAVfkqdW3atnHpInP5/C/kg1wMnV4HBafE7sqC8xXDWIEB7n2naT j3NvGe7AS3otyVLu3SMj6wKBG11G9AdttH4+QkKQBg5+WzTsZ1YVoVR0u5b6Bq82mnY0 NaWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:dkim-signature:dkim-filter:arc-authentication-results; bh=1Ai7LOh/g3D/B8KyIJNmlVxlA/Sf7+hEqeWTXaGFMAc=; b=iMGj2028jqzTa6J70CuS4yTyvVeChLKs4POZ5IK7KhabA6zpIclbtvBWevhsANQVzr vuDQuuhURVx8ln8PcB3hUrRG/d/HyJRz59sZv7sj4nAkcZ8v9Sl43cSfcVNEhlmA2spp mWexJ1xdRkYSU69DwIty/NKlYX4V65ZXC+Ztr3pFA9v/hS5lK/OZCWvy+nTv+A4x6Hd8 uwyJ0sCKl0X4Hfl31r9UDx/RI1Hv9CpNqCI/uYRK7J+yD5gHug+p3PCOHuG4zYk5VYZZ /F42HllhdCXdADe0CzfleA1UO3HW5gxnAdZzAZBxvEoUGz0vNdbCAplDpIiqCtIykGyU 1vrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=kM7WZ0W3; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id q24-v6si8668706edr.390.2018.06.19.00.16.08; Tue, 19 Jun 2018 00:16:08 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=kM7WZ0W3; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id CB736C21FB9; Tue, 19 Jun 2018 07:13:35 +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=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 36343C21FAB; Tue, 19 Jun 2018 07:13:18 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6411CC21FBC; Tue, 19 Jun 2018 07:12:20 +0000 (UTC) Received: from conuserg-09.nifty.com (conuserg-09.nifty.com [210.131.2.76]) by lists.denx.de (Postfix) with ESMTPS id 3A730C21FCA for ; Tue, 19 Jun 2018 07:12:13 +0000 (UTC) Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id w5J7BnbC015508; Tue, 19 Jun 2018 16:11:49 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com w5J7BnbC015508 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1529392310; bh=HrF26NupmVg5OYvBccBtaTx12HS4vHsquaUhbw/w6j0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kM7WZ0W3tZXwEHIY6xVOzRrEw1n0X/gJk5Wpy7gbpnboP4hyPWvdamF5d2T94yLLP nb16rNdMtx7TB4RTaZXm0M2hJpATe8TIyT1QvvzVuqWLBM+APRTmuUTUNx1cipchlq hz+d7FCg6FysLS9wtpNbLSlAg4SFBrkh+S8YSiPFI1n73paCNRIArFRybNIOnelHJa LjMmlXnCoTn99lF2YnK/Dy1jESMZ0Nu+jFCVg3TS3w0ulYX5882/IZ5wAmTK0qclJ1 Wi9NNAq4ej6/9+uLDn3A0km9QAicBaeL1ciAr/bqnO/sOYVM1MzcxrsoCVPME6YaPW xOxQRh41f6l0A== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Tue, 19 Jun 2018 16:11:42 +0900 Message-Id: <1529392307-26656-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1529392307-26656-1-git-send-email-yamada.masahiro@socionext.com> References: <1529392307-26656-1-git-send-email-yamada.masahiro@socionext.com> Cc: Tom Rini Subject: [U-Boot] [PATCH 1/6] ARM: uniphier: enable CONFIG_SNI_AVE and disable CONFIG_SMC911X 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" Enable the on-chip ethernet driver for uniphier_{v7,v8}_defconfig. Disable the on-board SMC911x because it has not migrated to the driver model yet - it is not possible to enable DM and non-DM drivers at the same time. The CONFIG_SMC911X for uniphier_ld4_sld8_defconfig is still kept because the on-chip ethernet driver for LD4, sLD8 is not supported yet. Signed-off-by: Masahiro Yamada --- configs/uniphier_v7_defconfig | 6 ++---- configs/uniphier_v8_defconfig | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/configs/uniphier_v7_defconfig b/configs/uniphier_v7_defconfig index 785f1ab..89b7b4a 100644 --- a/configs/uniphier_v7_defconfig +++ b/configs/uniphier_v7_defconfig @@ -42,10 +42,8 @@ CONFIG_NAND=y CONFIG_NAND_DENALI_DT=y CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8 CONFIG_SPL_NAND_DENALI=y -CONFIG_NETDEVICES=y -CONFIG_SMC911X=y -CONFIG_SMC911X_BASE=0x0 -CONFIG_SMC911X_32_BIT=y +CONFIG_DM_ETH=y +CONFIG_SNI_AVE=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y diff --git a/configs/uniphier_v8_defconfig b/configs/uniphier_v8_defconfig index cb7680a..93df2f6 100644 --- a/configs/uniphier_v8_defconfig +++ b/configs/uniphier_v8_defconfig @@ -39,10 +39,8 @@ CONFIG_MMC_SDHCI_CADENCE=y CONFIG_NAND=y CONFIG_NAND_DENALI_DT=y CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8 -CONFIG_NETDEVICES=y -CONFIG_SMC911X=y -CONFIG_SMC911X_BASE=0x0 -CONFIG_SMC911X_32_BIT=y +CONFIG_DM_ETH=y +CONFIG_SNI_AVE=y CONFIG_PINCONF=y CONFIG_SYSRESET=y CONFIG_SYSRESET_PSCI=y From patchwork Tue Jun 19 07:11:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 139092 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp4858902lji; Tue, 19 Jun 2018 00:12:15 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLM43MQWN9DvhOWecBsnqzO3ZAxFSp99OOULiEKt7Ztq1zlceodDiHIsj4bI9N94Oegyf3P X-Received: by 2002:aa7:c486:: with SMTP id m6-v6mr13995780edq.266.1529392335049; Tue, 19 Jun 2018 00:12:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529392335; cv=none; d=google.com; s=arc-20160816; b=EAae0rjaNcSn0GlOqI5pvde2hJDUiTVa0cyet79UBmew7ywdAw1xY2r2MYY0Vwvs1c uwYO+7XvGpQr7RK8qVill/PI5+efAbNUa1kJlN9/+NfT1nPlI3ujEgWapMqRmXq86waD InwkYj+tFZ7QEsGwa9JKClYMreR2LTY1uQ1VfBgHRwv+wTWaRB5EII6CYbdJFyfzhMxq 92uaowr91ZKX8xHmsXmDGUl8ejM4FkEP5u++CQMk6yR2g1Zh2f1yXdYhBGzLUUi55bPh i9C4akK663u6BA35m7WmHTyi0iSN1fYdhhsDDgB0l6lCo5fgPHsB5CrZsvGfNQshz6/P lixQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:dkim-filter:arc-authentication-results; bh=ixPM3OqRmxrgeT3XHIMHfgf6uAg7J2qo9AW3Vz9sfvU=; b=EkJMMnqM9C9FuX/TtvMG4R/+mzjkJckgtz/SEWcs8NwI5c9s9coFZ0TPx720NpRjSV pwXwiWVtPaUVD3s5FaN5JyMyZCxfDQRsTSVCcIVxSbyp6vg1/SNeq1oZG2JvYPhgA6Zm W0qDilYRZ8AWUXVK39UvLvnd3P5PHftm9dn+BkGREBGDqjXCT0XWE1HO0hVtMljvvJtp +Rg3AAg5QuaU/Lmrz4N8n3ju88186NwMPGRvHMZ0y+eQttiGGBJvXfO3NvKSZi+fSKQe U6s1E693qd7F4AsKN/ZYPb/HgfRJns8Ih4Zx6E6hV9sKSQKk8Cg94OCV2X33Tl1O0GGj HsmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=djGDTEhH; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id q3-v6si6914043edg.240.2018.06.19.00.12.14; Tue, 19 Jun 2018 00:12:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=djGDTEhH; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id 88AA6C21F9F; Tue, 19 Jun 2018 07:12:10 +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=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 D82EFC21F02; Tue, 19 Jun 2018 07:12:07 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 24843C21EFB; Tue, 19 Jun 2018 07:12:06 +0000 (UTC) Received: from conuserg-09.nifty.com (conuserg-09.nifty.com [210.131.2.76]) by lists.denx.de (Postfix) with ESMTPS id 360B1C21FB6 for ; Tue, 19 Jun 2018 07:12:02 +0000 (UTC) Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id w5J7BnbD015508; Tue, 19 Jun 2018 16:11:50 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com w5J7BnbD015508 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1529392310; bh=1wV3jJrbNb3mW4u6lWzOe1Pb1NDAuKMrYc1QJXlGtFo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=djGDTEhHl9m1YHv+ItZB8lqQMAQwqKgRbnFK9ikpEo0I43rgjLPOLeFO9sX4EFr9o XuwKTEhtWgsgVO09IxCARdxqIslH4vE7e2QjLLcPB/PHfdt03W2QlK9Qvt0dWf0Uj6 KGPtfKJA8U/YgAAvFNnqpGvCx0PMj3uC1kFEnhkX8kx9OMpP27OvMOFuxMIDNP8H6B msFlcqJl3REXIq37qpJEZ81QWK7FjdBSatancYGSSBRyUdHsF+46d98K0tpAXGjDhB yo/BKdrAk8dy3HSGNXpiHAHGIFu4/HXHn2jOIPa6xRfj47bgCJ+8lLHclISLYO60gO g9lmUZv2m/XDg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Tue, 19 Jun 2018 16:11:43 +0900 Message-Id: <1529392307-26656-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1529392307-26656-1-git-send-email-yamada.masahiro@socionext.com> References: <1529392307-26656-1-git-send-email-yamada.masahiro@socionext.com> Subject: [U-Boot] [PATCH 2/6] reset: uniphier: sync reset data with Linux 4.18-rc1 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" Signed-off-by: Masahiro Yamada --- drivers/reset/reset-uniphier.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-uniphier.c index 657243a..39d684b 100644 --- a/drivers/reset/reset-uniphier.c +++ b/drivers/reset/reset-uniphier.c @@ -71,7 +71,7 @@ static const struct uniphier_reset_data uniphier_ld20_sys_reset_data[] = { UNIPHIER_RESETX(4, 0x200c, 2), /* eMMC */ UNIPHIER_RESETX(6, 0x200c, 6), /* ETHER */ UNIPHIER_RESETX(8, 0x200c, 8), /* STDMAC */ - UNIPHIER_RESETX(12, 0x200c, 5), /* GIO */ + UNIPHIER_RESETX(14, 0x200c, 5), /* USB30 */ UNIPHIER_RESETX(16, 0x200c, 12), /* USB30-PHY0 */ UNIPHIER_RESETX(17, 0x200c, 13), /* USB30-PHY1 */ UNIPHIER_RESETX(18, 0x200c, 14), /* USB30-PHY2 */ @@ -85,10 +85,13 @@ static const struct uniphier_reset_data uniphier_pxs3_sys_reset_data[] = { UNIPHIER_RESETX(6, 0x200c, 9), /* ETHER0 */ UNIPHIER_RESETX(7, 0x200c, 10), /* ETHER1 */ UNIPHIER_RESETX(8, 0x200c, 12), /* STDMAC */ - UNIPHIER_RESETX(12, 0x200c, 5), /* USB30 (GIO0) */ - UNIPHIER_RESETX(13, 0x200c, 6), /* USB31 (GIO1) */ - UNIPHIER_RESETX(16, 0x200c, 16), /* USB30-PHY */ - UNIPHIER_RESETX(20, 0x200c, 17), /* USB31-PHY */ + UNIPHIER_RESETX(12, 0x200c, 4), /* USB30 link */ + UNIPHIER_RESETX(13, 0x200c, 5), /* USB31 link */ + UNIPHIER_RESETX(16, 0x200c, 16), /* USB30-PHY0 */ + UNIPHIER_RESETX(17, 0x200c, 18), /* USB30-PHY1 */ + UNIPHIER_RESETX(18, 0x200c, 20), /* USB30-PHY2 */ + UNIPHIER_RESETX(20, 0x200c, 17), /* USB31-PHY0 */ + UNIPHIER_RESETX(21, 0x200c, 19), /* USB31-PHY1 */ UNIPHIER_RESET_END, }; From patchwork Tue Jun 19 07:11:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 139093 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp4859782lji; Tue, 19 Jun 2018 00:13:13 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJaIp7NEo2s32MV7S3cr6wZF5xuoaWKkBWIESYeXGZyer0hUZi/SxX6325RoyXP77lBVoLz X-Received: by 2002:a50:e08d:: with SMTP id f13-v6mr6303208edl.198.1529392393050; Tue, 19 Jun 2018 00:13:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529392393; cv=none; d=google.com; s=arc-20160816; b=OWLHyf4ChYkedQ9pz1xNdS1CnhNRzMpgRhNNpZDT/nxExHnCyOwtHoTsPo7QbzScgq Nhh1mVYeo2bnQjGDaPsbRdu7nZlaK+kNdZ+AHcBC6Ph6XiQm7PlmgM/+Rp6cTtXcmG6k hw6XuAUIbtruyLfGoKGBAj6EIjhj5JNWKbCwqqDuk3FKu3oLLtsms2ynRuJwAZJOr1Fy DJiVZto/GxAzw+wmlo6bDdfr9EjrUuFyvHR2Gs1AV//RpqjnIe6kbM9svNU2EoD8PW1z fVWvTEpM5g1EGGgQQ/gKIhxmSqmpFyAmgX6iAuL/sae/g8QRn8CGp6/MxS3IlyUg0j/B dVxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:dkim-filter:arc-authentication-results; bh=IZWG2O7P0NSP8QeN9/KuuM/Cm29OF6ryCQJIjkqb1mI=; b=YjtHAQZ9PJSM7Zv1s8K88t4BVQL+qSdh5X+R9Td3ax9guiU9WB0Bv+yJ3emfkOsMG8 ncjCf/daXksM28vrWm/78nXH6BSE1NXCrZW8IPT6v0gUjrVFciUy1LI29qdIEzGTSfpO E7yIuaTryIriciQUYUALI1a6BqGZLVvG74iG+rsHlJJQ+Q/cPiCc33Tb8W2SIabL8TBn ZJ7RO+AXh9TDCB2EEIZn+QPQC0n/lR/MKZBAfKQUivAq+VG1IWmE4+duF9i2BcHmJL8y WEPgIt6cKCbSEWi8Go7XUq5z5ioahXNHQV1VfXClRutCphxsfd46UZQx90+1xCn1SN4f PX7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=qqbzAkar; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id a4-v6si5461669edi.60.2018.06.19.00.13.12; Tue, 19 Jun 2018 00:13:13 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=qqbzAkar; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id A19F5C21F02; Tue, 19 Jun 2018 07:12:28 +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=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 AC3D9C21F92; Tue, 19 Jun 2018 07:12:08 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2EC92C21F02; Tue, 19 Jun 2018 07:12:06 +0000 (UTC) Received: from conuserg-09.nifty.com (conuserg-09.nifty.com [210.131.2.76]) by lists.denx.de (Postfix) with ESMTPS id 357E8C21FAB for ; Tue, 19 Jun 2018 07:12:02 +0000 (UTC) Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id w5J7BnbE015508; Tue, 19 Jun 2018 16:11:50 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com w5J7BnbE015508 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1529392311; bh=PMpsBwYeQlbgUuFAuLQzDGBBwUs9seDYRPjn1LKTdDU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qqbzAkardLnoBjOwK+IYBSAZoePbyq8Us9fZGqXg9u2gvzOFQyAzmcxRxjel+YNvT UHIVG2nEvnWD50nePtqoX164lJX2qfHXy4RtxGTAGwfH5rS2Zftj/0wtQIEcb2kqJL srsdL3bn7V8t4Veg3c4xh2UzF4nCKdf4ZRN/Lq/vsIZnb/FT+gooauW7q2Xw1QXpEG 8YzkqOGmQ0RrmBY+C2G0L5rLXEGtoeZ96z6tWl/h1xgWopiHymI11Cc87Tl2936tq1 EGpgm0yOwwNMTLARwyYwN2HO4HtsjYBPT4wOBlpSH/e/QFvKnFW3KOLugpbeDzEheU e8zvp6oHtYPPQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Tue, 19 Jun 2018 16:11:44 +0900 Message-Id: <1529392307-26656-4-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1529392307-26656-1-git-send-email-yamada.masahiro@socionext.com> References: <1529392307-26656-1-git-send-email-yamada.masahiro@socionext.com> Subject: [U-Boot] [PATCH 3/6] serial: uniphier: rename struct uniphier_serial_private_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" Just for making it shorter. Signed-off-by: Masahiro Yamada --- drivers/serial/serial_uniphier.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/serial/serial_uniphier.c b/drivers/serial/serial_uniphier.c index 8878079..b06fc00 100644 --- a/drivers/serial/serial_uniphier.c +++ b/drivers/serial/serial_uniphier.c @@ -33,17 +33,17 @@ struct uniphier_serial { u32 dlr; /* Divisor Latch Register */ }; -struct uniphier_serial_private_data { +struct uniphier_serial_priv { struct uniphier_serial __iomem *membase; unsigned int uartclk; }; #define uniphier_serial_port(dev) \ - ((struct uniphier_serial_private_data *)dev_get_priv(dev))->membase + ((struct uniphier_serial_priv *)dev_get_priv(dev))->membase static int uniphier_serial_setbrg(struct udevice *dev, int baudrate) { - struct uniphier_serial_private_data *priv = dev_get_priv(dev); + struct uniphier_serial_priv *priv = dev_get_priv(dev); struct uniphier_serial __iomem *port = uniphier_serial_port(dev); const unsigned int mode_x_div = 16; unsigned int divisor; @@ -90,7 +90,7 @@ static int uniphier_serial_pending(struct udevice *dev, bool input) static int uniphier_serial_probe(struct udevice *dev) { DECLARE_GLOBAL_DATA_PTR; - struct uniphier_serial_private_data *priv = dev_get_priv(dev); + struct uniphier_serial_priv *priv = dev_get_priv(dev); struct uniphier_serial __iomem *port; fdt_addr_t base; u32 tmp; @@ -133,6 +133,6 @@ U_BOOT_DRIVER(uniphier_serial) = { .id = UCLASS_SERIAL, .of_match = uniphier_uart_of_match, .probe = uniphier_serial_probe, - .priv_auto_alloc_size = sizeof(struct uniphier_serial_private_data), + .priv_auto_alloc_size = sizeof(struct uniphier_serial_priv), .ops = &uniphier_serial_ops, }; From patchwork Tue Jun 19 07:11:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 139095 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp4860818lji; Tue, 19 Jun 2018 00:14:26 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIAjnfBTdtDIFDcFTQHwlcDlocRQefM3HCmDsn/ebLpuGc5iw30aSWjN6qYP6M5PtX8q+5T X-Received: by 2002:a50:98e4:: with SMTP id j91-v6mr13763096edb.212.1529392466679; Tue, 19 Jun 2018 00:14:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529392466; cv=none; d=google.com; s=arc-20160816; b=nFbyeVKLEmlhdG8srBitA/jHcO+u2ISx1KfTjRWxDAKzNvTIkAotWdUnJNzBCKsYk4 cJom+WlArfoBNpMZVygZbxZb2k8pfcmlj4FNHiD8GBdrad7M6t4frfcfBCG4riquw009 V69C7qePzHTZEyuExm9yVgNOFSZb1J5g4m0DgIuFG7VJ6BOvMST9nMKVb82nQziyfZL8 k0COGgVHuzfh1nDmlsNDORDk1PuPX/m7YkRsZyyoHuD4YKAna4zcGmy8Da2T4KszxUdv ukMapP3MlrM0bQ7s8oRxEbV+Bx8t9jccPpJIx3CJSr2Fp7V9cTVWW2Pl/qZi27y96MnW r4Ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:dkim-filter:arc-authentication-results; bh=ja2XAdyPPEGgxLNO4gl9MBhbyuyngx6EqTZZZmsEwos=; b=B2MxQ6lpI4XlLA8ue1rkkS0wSgMlkvOlUCqBSsuBQFlYNA4yERt1qTwWG0OLRyMWQ7 dWG96+reMMxLNlVcFZAFmNaDIhR8XnmIH7NRlOzMv1hf2+A5e0usxymdAX9y4mh4dcSU A62MHOq9FT0/66EDBQJGMIuE4r4WWW3AM9fY0iMt7m05a5zykcRRaBySO92LQsOY/eqt 9aSMPUEf6FbSt0GynyyAOiW9trXN1qprEhKjPYL6xr9PHyDUKTyYNHvkq2wtUlgPE0JF 1CuqyrBSAOMAwEVZjw6hsiVwEY6VUcgz8P8m8w4gWJuTM2KCldOmZjMri26/mrH4iPlr Boow== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=t7xYg6hg; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id c5-v6si6501492edf.296.2018.06.19.00.14.26; Tue, 19 Jun 2018 00:14:26 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=t7xYg6hg; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id 3F143C21FB6; Tue, 19 Jun 2018 07:12:43 +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=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 CB1C8C21FC0; Tue, 19 Jun 2018 07:12:09 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 37041C21F3D; Tue, 19 Jun 2018 07:12:06 +0000 (UTC) Received: from conuserg-09.nifty.com (conuserg-09.nifty.com [210.131.2.76]) by lists.denx.de (Postfix) with ESMTPS id 2D31CC21FA4 for ; Tue, 19 Jun 2018 07:12:02 +0000 (UTC) Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id w5J7BnbF015508; Tue, 19 Jun 2018 16:11:51 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com w5J7BnbF015508 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1529392311; bh=5y2RrcCWt6qO+GV2ka4GPYQ5sZR/6Txvu1d2oiwqgw0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t7xYg6hgVKzJDUQIBeb4tplYEnEWvBSCSWwIxF6VreiVAra1lRBteubsYJ0iBrnBF k6r2ieF4gyEqpqHZ/gCnqcpo6Fj2t6vP5VYShq32VqSvGtczJ4ozbAdN+bPfhw5ZL7 GFyWR44wXSdWhz2P9EtqeXiXRGPkF70xM8JucVgcYPlL5OvxApdgoa6asmtE9oGbN3 t1FB7H5bHv/WJZMII6KxIE8xSIiO4JsWvi0NMsOYA5iXj5B9Ti8VaFVT9GKaA9qEGx SggQiHdcAVD4X2Rx7qZlXpcyt7BIwtidPgxFR1YyiuDt0Y+C0vyhIcBq3WO+N+zLQt J25XtUAX3lROg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Tue, 19 Jun 2018 16:11:45 +0900 Message-Id: <1529392307-26656-5-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1529392307-26656-1-git-send-email-yamada.masahiro@socionext.com> References: <1529392307-26656-1-git-send-email-yamada.masahiro@socionext.com> Subject: [U-Boot] [PATCH 4/6] serial: uniphier: set clock rate without clock-frequency property 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" In Linux, the clock rate of the UART is given by the clock driver. If you try to follow that in U-Boot, you would end up with adding more u-boot,dm-pre-reloc properties, and also the clock driver would be too big for SPL, which is used for UniPhier ARMv7 platform. The current solution is to add 'clock-frequency' property to the UART nodes, but it does not exist in the DT files in Linux. I do not want to let DT diverge for U-Boot. Check the SoC compatible and set the clock rate according to it. This will be helpful to sync DT between Linux and U-Boot. Signed-off-by: Masahiro Yamada --- drivers/serial/serial_uniphier.c | 41 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/drivers/serial/serial_uniphier.c b/drivers/serial/serial_uniphier.c index b06fc00..c7f46e5 100644 --- a/drivers/serial/serial_uniphier.c +++ b/drivers/serial/serial_uniphier.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include @@ -87,11 +88,34 @@ static int uniphier_serial_pending(struct udevice *dev, bool input) return !(readl(&port->lsr) & UART_LSR_THRE); } +/* + * SPL does not have enough memory footprint for the clock driver. + * Hardcode clock frequency for each SoC. + */ +struct uniphier_serial_clk_data { + const char *compatible; + unsigned int clk_rate; +}; + +static const struct uniphier_serial_clk_data uniphier_serial_clk_data[] = { + { .compatible = "socionext,uniphier-ld4", .clk_rate = 36864000 }, + { .compatible = "socionext,uniphier-pro4", .clk_rate = 73728000 }, + { .compatible = "socionext,uniphier-sld8", .clk_rate = 80000000 }, + { .compatible = "socionext,uniphier-pro5", .clk_rate = 73728000 }, + { .compatible = "socionext,uniphier-pxs2", .clk_rate = 88888888 }, + { .compatible = "socionext,uniphier-ld6b", .clk_rate = 88888888 }, + { .compatible = "socionext,uniphier-ld11", .clk_rate = 58823529 }, + { .compatible = "socionext,uniphier-ld20", .clk_rate = 58823529 }, + { .compatible = "socionext,uniphier-pxs3", .clk_rate = 58823529 }, + { /* sentinel */ }, +}; + static int uniphier_serial_probe(struct udevice *dev) { - DECLARE_GLOBAL_DATA_PTR; struct uniphier_serial_priv *priv = dev_get_priv(dev); struct uniphier_serial __iomem *port; + const struct uniphier_serial_clk_data *clk_data; + ofnode root_node; fdt_addr_t base; u32 tmp; @@ -105,8 +129,19 @@ static int uniphier_serial_probe(struct udevice *dev) priv->membase = port; - priv->uartclk = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev), - "clock-frequency", 0); + root_node = ofnode_path("/"); + clk_data = uniphier_serial_clk_data; + while (clk_data->compatible) { + if (ofnode_device_is_compatible(root_node, + clk_data->compatible)) + break; + clk_data++; + } + + if (WARN_ON(!clk_data->compatible)) + return -ENOTSUPP; + + priv->uartclk = clk_data->clk_rate; tmp = readl(&port->lcr_mcr); tmp &= ~LCR_MASK; From patchwork Tue Jun 19 07:11:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 139098 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp4862620lji; Tue, 19 Jun 2018 00:16:25 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIGRFuuaYq2OFlWS8/femdteTOqQ93ABKY5kM87Vvgx++C5rJzIH8Sd1f0dag4Bex+XR2mZ X-Received: by 2002:a50:d55e:: with SMTP id f30-v6mr13582441edj.73.1529392585550; Tue, 19 Jun 2018 00:16:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529392585; cv=none; d=google.com; s=arc-20160816; b=WzAYC5fBb9fPsC5xjNBgl5eVseMgHJY1pl8NLKC7vyZBMqqoRkSS4mSfZh3lnfVUg3 bpAhb/vhOkoZF09zgsOdpYhJxlUAt0q2gsuvIxs06yi2lKU10k4zKg2SGzpBVu+GOVpM R8xWycbML53dN6MfvnRYFqjsd8yNwYPIQPWka0u8qXsroar8Htih7R3UNf1sOJ30n8UO lpvszTf1I48f0AFHVnu16giugyPuDmPl2B7ztXjnuNvvCyQZqNq5n9OovtHHNHsaYClP 7OpegUbdyi2/pIIYZxtE4MdXsYVTZwScUj6eIk+ExFHuy8v2Ii5f0YCv7bwyiYMZuGSz pbXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:dkim-signature:dkim-filter:arc-authentication-results; bh=/Z1B0mdyYZsf94bx4MD5jzsMtnJdcaNRJvbMRN5B4BY=; b=eBaCdDVlwFHVSqUTdJ6hoy7N8yNsyqZhxoHH5tKjnzcCxaSHHMnEdyj2pHqF2Btf9f 1XhxYAR4XKDEyTgGxy6ctLJC36yQFL+5c1dUe5EdHXMTzEC5BRz7fguDn21Z1b0yBvcr i2Kmm8Ko7t2xR+7epidPxIhY6m/49tYcYAzTF56um7aRdINoLBTG1WidaaGe9QtuVdI/ roNGp40NR360b4Iy0btjddgQGz1RBX0QM89uIz0QJ3s2V9bXxmcJUNcREhHiw4ubdiVZ EhSSd+xh3Rz8WdCUzuboMY/GL3elfZEde45F3J+X9Hcrk+4gLnfX6CtJWrgrJFO/Ppe7 /JTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=LsN5gauv; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id c5-v6si6503425edf.296.2018.06.19.00.16.25; Tue, 19 Jun 2018 00:16:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=LsN5gauv; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id 2DBE7C21FAB; Tue, 19 Jun 2018 07:13:52 +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=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 3A488C21FBC; Tue, 19 Jun 2018 07:13:21 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A12D5C21F99; Tue, 19 Jun 2018 07:12:20 +0000 (UTC) Received: from conuserg-09.nifty.com (conuserg-09.nifty.com [210.131.2.76]) by lists.denx.de (Postfix) with ESMTPS id 2AF4EC21FC5 for ; Tue, 19 Jun 2018 07:12:13 +0000 (UTC) Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id w5J7BnbG015508; Tue, 19 Jun 2018 16:11:51 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com w5J7BnbG015508 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1529392312; bh=H6QcWzDYI3RUT96Lyh5NgzDus9OD/jmHpM7ql3t+z6s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LsN5gauvKvNZEAGRKA4qVzmTF5HoFpHHW2dQZHXizZO43LjparduKmdvnHcqCr9Um IRtD0HBmIyA1YVn/T78gEFMkENVS9H9g27+x9/Jgwdr0vte9SQEankcELHG5cYT4Zc Q+9RdSyuyFfx+MbyqVQszDZWVl4NIWIggCEllPQdFiRSY46h/5ronH11q4vDO6Qu8z HjoVGmlF3lS1AupfYs+iHrxTcngNuAwgMcg2RdNfeBMoGbIxNad+xXOmMdr9OReQWp A7JzaOWmeZNxNC6BdMN/t53sY+OTBM/Xr2T2wjBA6eeWr4ZE03LFUVLirNCq59+6qc AIOv7SGOxfMoQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Tue, 19 Jun 2018 16:11:46 +0900 Message-Id: <1529392307-26656-6-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1529392307-26656-1-git-send-email-yamada.masahiro@socionext.com> References: <1529392307-26656-1-git-send-email-yamada.masahiro@socionext.com> Cc: Jagan Teki , Tom Rini Subject: [U-Boot] [PATCH 5/6] ARM: dts: uniphier: sync DT with Linux 4.18-rc1 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" Now that the clock-frequency information has been moved to the driver, more DT sync is possible. Signed-off-by: Masahiro Yamada --- arch/arm/dts/uniphier-ld11.dtsi | 4 ---- arch/arm/dts/uniphier-ld20.dtsi | 4 ---- arch/arm/dts/uniphier-ld4.dtsi | 4 ---- arch/arm/dts/uniphier-pro4.dtsi | 6 +----- arch/arm/dts/uniphier-pro5.dtsi | 4 ---- arch/arm/dts/uniphier-pxs2.dtsi | 4 ---- arch/arm/dts/uniphier-pxs3.dtsi | 4 ---- arch/arm/dts/uniphier-sld8.dtsi | 4 ---- 8 files changed, 1 insertion(+), 33 deletions(-) diff --git a/arch/arm/dts/uniphier-ld11.dtsi b/arch/arm/dts/uniphier-ld11.dtsi index e7514f0..3f9237c 100644 --- a/arch/arm/dts/uniphier-ld11.dtsi +++ b/arch/arm/dts/uniphier-ld11.dtsi @@ -124,7 +124,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart0>; clocks = <&peri_clk 0>; - clock-frequency = <58820000>; resets = <&peri_rst 0>; }; @@ -136,7 +135,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart1>; clocks = <&peri_clk 1>; - clock-frequency = <58820000>; resets = <&peri_rst 1>; }; @@ -148,7 +146,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart2>; clocks = <&peri_clk 2>; - clock-frequency = <58820000>; resets = <&peri_rst 2>; }; @@ -160,7 +157,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart3>; clocks = <&peri_clk 3>; - clock-frequency = <58820000>; resets = <&peri_rst 3>; }; diff --git a/arch/arm/dts/uniphier-ld20.dtsi b/arch/arm/dts/uniphier-ld20.dtsi index 31bc124..6ffbf18 100644 --- a/arch/arm/dts/uniphier-ld20.dtsi +++ b/arch/arm/dts/uniphier-ld20.dtsi @@ -230,7 +230,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart0>; clocks = <&peri_clk 0>; - clock-frequency = <58820000>; resets = <&peri_rst 0>; }; @@ -242,7 +241,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart1>; clocks = <&peri_clk 1>; - clock-frequency = <58820000>; resets = <&peri_rst 1>; }; @@ -254,7 +252,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart2>; clocks = <&peri_clk 2>; - clock-frequency = <58820000>; resets = <&peri_rst 2>; }; @@ -266,7 +263,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart3>; clocks = <&peri_clk 3>; - clock-frequency = <58820000>; resets = <&peri_rst 3>; }; diff --git a/arch/arm/dts/uniphier-ld4.dtsi b/arch/arm/dts/uniphier-ld4.dtsi index 5e43a92..4545056 100644 --- a/arch/arm/dts/uniphier-ld4.dtsi +++ b/arch/arm/dts/uniphier-ld4.dtsi @@ -71,7 +71,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart0>; clocks = <&peri_clk 0>; - clock-frequency = <36864000>; resets = <&peri_rst 0>; }; @@ -83,7 +82,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart1>; clocks = <&peri_clk 1>; - clock-frequency = <36864000>; resets = <&peri_rst 1>; }; @@ -95,7 +93,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart2>; clocks = <&peri_clk 2>; - clock-frequency = <36864000>; resets = <&peri_rst 2>; }; @@ -107,7 +104,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart3>; clocks = <&peri_clk 3>; - clock-frequency = <36864000>; resets = <&peri_rst 3>; }; diff --git a/arch/arm/dts/uniphier-pro4.dtsi b/arch/arm/dts/uniphier-pro4.dtsi index 0004863..8185b54 100644 --- a/arch/arm/dts/uniphier-pro4.dtsi +++ b/arch/arm/dts/uniphier-pro4.dtsi @@ -79,7 +79,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart0>; clocks = <&peri_clk 0>; - clock-frequency = <73728000>; resets = <&peri_rst 0>; }; @@ -91,7 +90,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart1>; clocks = <&peri_clk 1>; - clock-frequency = <73728000>; resets = <&peri_rst 1>; }; @@ -103,7 +101,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart2>; clocks = <&peri_clk 2>; - clock-frequency = <73728000>; resets = <&peri_rst 2>; }; @@ -115,7 +112,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart3>; clocks = <&peri_clk 3>; - clock-frequency = <73728000>; resets = <&peri_rst 3>; }; @@ -429,7 +425,7 @@ pinctrl-0 = <&pinctrl_ether_rgmii>; clock-names = "gio", "ether", "ether-gb", "ether-phy"; clocks = <&sys_clk 12>, <&sys_clk 6>, <&sys_clk 7>, - <&sys_clk 10>; + <&sys_clk 10>; reset-names = "gio", "ether"; resets = <&sys_rst 12>, <&sys_rst 6>; phy-mode = "rgmii"; diff --git a/arch/arm/dts/uniphier-pro5.dtsi b/arch/arm/dts/uniphier-pro5.dtsi index 32debf5..6aea9af 100644 --- a/arch/arm/dts/uniphier-pro5.dtsi +++ b/arch/arm/dts/uniphier-pro5.dtsi @@ -164,7 +164,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart0>; clocks = <&peri_clk 0>; - clock-frequency = <73728000>; resets = <&peri_rst 0>; }; @@ -176,7 +175,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart1>; clocks = <&peri_clk 1>; - clock-frequency = <73728000>; resets = <&peri_rst 1>; }; @@ -188,7 +186,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart2>; clocks = <&peri_clk 2>; - clock-frequency = <73728000>; resets = <&peri_rst 2>; }; @@ -200,7 +197,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart3>; clocks = <&peri_clk 3>; - clock-frequency = <73728000>; resets = <&peri_rst 3>; }; diff --git a/arch/arm/dts/uniphier-pxs2.dtsi b/arch/arm/dts/uniphier-pxs2.dtsi index 20f3935..f4101c0 100644 --- a/arch/arm/dts/uniphier-pxs2.dtsi +++ b/arch/arm/dts/uniphier-pxs2.dtsi @@ -172,7 +172,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart0>; clocks = <&peri_clk 0>; - clock-frequency = <88900000>; resets = <&peri_rst 0>; }; @@ -184,7 +183,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart1>; clocks = <&peri_clk 1>; - clock-frequency = <88900000>; resets = <&peri_rst 1>; }; @@ -196,7 +194,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart2>; clocks = <&peri_clk 2>; - clock-frequency = <88900000>; resets = <&peri_rst 2>; }; @@ -208,7 +205,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart3>; clocks = <&peri_clk 3>; - clock-frequency = <88900000>; resets = <&peri_rst 3>; }; diff --git a/arch/arm/dts/uniphier-pxs3.dtsi b/arch/arm/dts/uniphier-pxs3.dtsi index ae867cb..cfeeecd 100644 --- a/arch/arm/dts/uniphier-pxs3.dtsi +++ b/arch/arm/dts/uniphier-pxs3.dtsi @@ -152,7 +152,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart0>; clocks = <&peri_clk 0>; - clock-frequency = <58820000>; resets = <&peri_rst 0>; }; @@ -164,7 +163,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart1>; clocks = <&peri_clk 1>; - clock-frequency = <58820000>; resets = <&peri_rst 1>; }; @@ -176,7 +174,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart2>; clocks = <&peri_clk 2>; - clock-frequency = <58820000>; resets = <&peri_rst 2>; }; @@ -188,7 +185,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart3>; clocks = <&peri_clk 3>; - clock-frequency = <58820000>; resets = <&peri_rst 3>; }; diff --git a/arch/arm/dts/uniphier-sld8.dtsi b/arch/arm/dts/uniphier-sld8.dtsi index 67d6977..f20926e 100644 --- a/arch/arm/dts/uniphier-sld8.dtsi +++ b/arch/arm/dts/uniphier-sld8.dtsi @@ -71,7 +71,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart0>; clocks = <&peri_clk 0>; - clock-frequency = <80000000>; resets = <&peri_rst 0>; }; @@ -83,7 +82,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart1>; clocks = <&peri_clk 1>; - clock-frequency = <80000000>; resets = <&peri_rst 1>; }; @@ -95,7 +93,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart2>; clocks = <&peri_clk 2>; - clock-frequency = <80000000>; resets = <&peri_rst 2>; }; @@ -107,7 +104,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart3>; clocks = <&peri_clk 3>; - clock-frequency = <80000000>; resets = <&peri_rst 3>; }; From patchwork Tue Jun 19 07:11:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 139096 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp4861289lji; Tue, 19 Jun 2018 00:14:58 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKsfUhT9/8CRXTvQLVMM0NaChprbC1p8suQsr1nki6Rt8tBxnzGGUu1io/ozzozN641E3sR X-Received: by 2002:a50:e282:: with SMTP id p2-v6mr13617907edl.253.1529392498935; Tue, 19 Jun 2018 00:14:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529392498; cv=none; d=google.com; s=arc-20160816; b=iBMznk3PDKKf0QVJCNCo70IfQlGzAaoR/UUH6kLivgI5YJ5u7PcuJQpknU+Uuauwn5 SFIV+UJ47GRiouA7QYGOa7VPaWfaIwS4d2Guqa/5Kw9CmKxiwx1V5/vn0MojQATCN2+L Wm8K32rroXxO0k/vvEqLZxBo9fYaD9MHcGmntlb6JA5TFTkNt43iE8bxQ4XsabePrlMf RtIM42iZE3CJ3b/PgFUgSXu7wM+63RIGf5olh0/JWx0tv7EsbkZvkLwwdXxkEPHP3+eY Gc63xENtuuhK//Sz6pmteY6qtPolkpBBY8IZXUCzrId1NSYdwju+KcrWdN0Ph/geNdv5 0P7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:dkim-signature:dkim-filter:arc-authentication-results; bh=osPNm7egisW3go3STd7CjlKy1B2CSZt7BFH7KNcOPlY=; b=C8/eXX3EFIgssMZwj39rRIh5lePS+ja/xgSR1N9BX1gj27+gjsGw3pHkGm8mtZlsZ1 SGfTDsKphV1Dx5ZazfMEqUyWqHsCYeqBFxbTM7/55+hl4lmdX6gjSScHXuf2foBFDngm kTYE4nUzngOeRtY7SfcwnuQBpVyuFutwUhX6V7CDUju8uORUdw9GGuTQmGvv1CaM3wO9 947wghNwyeeM3rybKUKqo5TUOsIkGeClmoBjFWuZiDV2ADgZW3mVL5gwBKYtQaOY2PaU iS4c1NHECKTbk8hoI6968CoTvybMHJKhi4HHVoWk6mSRi0hKPqUiXhsyPLQjK9m2U933 g1QQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=fslB4uz+; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id k91-v6si6834421edc.432.2018.06.19.00.14.58; Tue, 19 Jun 2018 00:14:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=fslB4uz+; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id 886BCC21FC0; Tue, 19 Jun 2018 07:13:18 +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=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 19FA6C21F9F; Tue, 19 Jun 2018 07:12:59 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 07884C21F58; Tue, 19 Jun 2018 07:12:20 +0000 (UTC) Received: from conuserg-09.nifty.com (conuserg-09.nifty.com [210.131.2.76]) by lists.denx.de (Postfix) with ESMTPS id 328FBC21FC6 for ; Tue, 19 Jun 2018 07:12:13 +0000 (UTC) Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id w5J7BnbH015508; Tue, 19 Jun 2018 16:11:52 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com w5J7BnbH015508 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1529392312; bh=QwEbG7kXh+1tON6S9vuh0N7YVeL5hr57OWq4+F0YnRs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fslB4uz+GVtJTWGATMfnv5DOBXM7vahx47mDeoatNAN0tuaSD/uX9tHuZYEysC9km RXAzzVBCuGGkmVTEsSFHLbr7Dz4NClmkIWzozjQXczEyLeHa5+UQs8kADeGbIT62XR u5JDJnV+diSNBC+AHPIKRx1Ed7+Oq53H7YltH+kBbS1DFNeOgS5atKea0GZcQl+Zr6 uHIthZFC/6ZtdwHiPuOkL48fLQMbg3XYFMULszRVjA5V2r7uYUjNM1wPkv/cJrWapO he0RcOuDk0qdjufggSjdfLQ3p0T7FK3dvZp3uk2ku8PcI79kapkc1BzgzHbjdP9aYf JhD9N1AyY1qpw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Tue, 19 Jun 2018 16:11:47 +0900 Message-Id: <1529392307-26656-7-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1529392307-26656-1-git-send-email-yamada.masahiro@socionext.com> References: <1529392307-26656-1-git-send-email-yamada.masahiro@socionext.com> Cc: Tom Rini Subject: [U-Boot] [PATCH 6/6] ARM: dts: uniphier: enable SD card for PXs3 reference board 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" Signed-off-by: Masahiro Yamada --- arch/arm/dts/uniphier-pxs3-ref.dts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/dts/uniphier-pxs3-ref.dts b/arch/arm/dts/uniphier-pxs3-ref.dts index 3b9931a..4fb12b8 100644 --- a/arch/arm/dts/uniphier-pxs3-ref.dts +++ b/arch/arm/dts/uniphier-pxs3-ref.dts @@ -75,6 +75,10 @@ status = "okay"; }; +&sd { + status = "okay"; +}; + ð0 { status = "okay"; phy-handle = <ðphy0>;