From patchwork Mon Jan 6 14:09:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 1218174 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=prevas.dk Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.b="bfBE1lY7"; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47ry8c2kFjz9sQp for ; Tue, 7 Jan 2020 01:10:40 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C3B0D81732; Mon, 6 Jan 2020 15:10:01 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.b="bfBE1lY7"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1F0B28171B; Mon, 6 Jan 2020 15:09:56 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: * X-Spam-Status: No, score=1.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, FORGED_SPF_HELO, SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-am5eur02on0714.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe07::714]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 222B28170D for ; Mon, 6 Jan 2020 15:09:52 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=rasmus.villemoes@prevas.dk ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hwdbF4dWidrCjVtWEYUBxTWtxIW3ApeLPNQEYT99DA4YgMi8RbRfVuhofmvoladAiLoBpRJOoeeI/Eirvs2jaO99H7zai60ut12OifUNZ+iIX+IJHdGM121XyWOG7O/QUDIX4AaQ0/nJmCpItZ89ES+RqKG47QK8Q38HNQPsPLgjQiIfbrl3jTN3riD1rXudTKzXmxAQFbZ24reeJbSHNEzDqadpHCKaoy7BtOmsnuKiHnZjOxucDnY6P2KTjiOZBY2qlx35dBgRcjjBnb8McPfeXVoUUi6e1tjGfOqPBKqhOkDLsdGMcErGVAwI6Ylc5kjXi4tGiQfrhvmV8POAMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wM25/iXfdym5IukjPvMPhUjXPRlCxd6BOs3wuMYNOIg=; b=GNPcgIWE1221N8z6ad+Na6Vvnaa/DrpQsUfDT0EJpQpHKDHAWy6Q1rC03q9eaJ0Z5dOw+yvGPsDfN8VqabkRnNQyz9ZW823bLd55pPWKdrJf/tIUleEcqRevOJO3qPGdvzy3pqzX9rXLHqMGUMj1cLFfuabyAOAmaR188r1hTfYOM60zz9JlJEjflM+vjJYEdXQFJN6qM/MamC4LWR5VfJpo5L0j/4IN1BCXSQ8fz5PaOPLGk8APX6eNKR21jdxnurQ7VC3fev1bkqxPP0jSzOmINBNtOR3xruTeLLutZqS4deWyFikrwpjMaVSYSUMc0qzOM0viPGlRCHR9Wk3cAg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=prevas.dk; dmarc=pass action=none header.from=prevas.dk; dkim=pass header.d=prevas.dk; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=prevas.dk; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wM25/iXfdym5IukjPvMPhUjXPRlCxd6BOs3wuMYNOIg=; b=bfBE1lY7SlRLx5KONcY3Koy53zxqDzE57kwYpkMhGrQgIZou8sXNuYP7DY4L8VeH1/J83eVIa/an8RYhQns1i073/B5Cq07EzFVDQ8+OL8d8hIupyfl9kVT0UD6l1NbaxKl12rm64SH07fVLeayRS5eqhNyQ/Fu+NnagDfhg1Zo= Received: from VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM (20.178.126.85) by VI1PR10MB2144.EURPRD10.PROD.OUTLOOK.COM (20.177.62.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2602.15; Mon, 6 Jan 2020 14:09:51 +0000 Received: from VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM ([fe80::8175:5aa2:2870:766d]) by VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM ([fe80::8175:5aa2:2870:766d%6]) with mapi id 15.20.2602.015; Mon, 6 Jan 2020 14:09:51 +0000 Received: from prevas-ravi.prevas.se (81.216.59.226) by HE1P192CA0016.EURP192.PROD.OUTLOOK.COM (2603:10a6:3:fe::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2602.12 via Frontend Transport; Mon, 6 Jan 2020 14:09:49 +0000 From: Rasmus Villemoes To: "u-boot@lists.denx.de" Subject: [PATCH 4/4] mpc8xxx_spi: implement real ->set_speed Thread-Topic: [PATCH 4/4] mpc8xxx_spi: implement real ->set_speed Thread-Index: AQHVxJr1QHQEzuoVYEK4u86K+YxERQ== Date: Mon, 6 Jan 2020 14:09:50 +0000 Message-ID: <20200106140931.1136-5-rasmus.villemoes@prevas.dk> References: <20200106140931.1136-1-rasmus.villemoes@prevas.dk> In-Reply-To: <20200106140931.1136-1-rasmus.villemoes@prevas.dk> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HE1P192CA0016.EURP192.PROD.OUTLOOK.COM (2603:10a6:3:fe::26) To VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:803:e1::21) x-mailer: git-send-email 2.23.0 authentication-results: spf=none (sender IP is ) smtp.mailfrom=rasmus.villemoes@prevas.dk; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [81.216.59.226] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: c7be991d-5335-4586-c2de-08d792b217f8 x-ms-traffictypediagnostic: VI1PR10MB2144: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:494; x-forefront-prvs: 0274272F87 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(396003)(346002)(136003)(366004)(39850400004)(376002)(189003)(199004)(6666004)(66476007)(8676002)(64756008)(66446008)(66556008)(66946007)(54906003)(86362001)(6486002)(81166006)(81156014)(16526019)(52116002)(186003)(26005)(6506007)(316002)(4326008)(36756003)(5660300002)(71200400001)(2906002)(44832011)(6916009)(1076003)(66574012)(2616005)(6512007)(107886003)(8976002)(8936002)(956004)(478600001); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR10MB2144; H:VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: prevas.dk does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 4DN063tt9MCMQgetOUfrlokZTHV9n0Uk6MPSU0qbqFy33TK9XMsrgeTPCGhmF6QFv/YVGZM+0WYmNPifrBUkXBE2cHNGvfB/3jmomu0lGQnSucSb7HH9EF1t2T62PrxwrG8J4HMq7puPCYBWXazNTciZ5ub/kFKl8kzrzPGbdDPvfO/OnUxjiVLYNRG0kN3W/F8vvqgFNDxJjTLOlkEEBB6Kkf/vmqePFcL2N7x9qR31qkDKUT0X+Eq9i5eYlh+0R8QhFmy8x3XQDIfpwRgaypCLuUFX7MHdW6SZOTUgFehZumT6IzyGwTYwwlZ+Op77si0Ve7Cx/RILLMPyMaievCfvRoZZhbutPpAedxQOSv5aqqy7xGO038PWtcB2URlPXOe/IMzWctgPcVvCwOVB94yinIS1N4C2s2dJ4TfdXdLQcAcHBys8PCHNmC+2JmGl Content-ID: <0AF62F80EDDFFC409B4D3766448750C7@EURPRD10.PROD.OUTLOOK.COM> MIME-Version: 1.0 X-OriginatorOrg: prevas.dk X-MS-Exchange-CrossTenant-Network-Message-Id: c7be991d-5335-4586-c2de-08d792b217f8 X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Jan 2020 14:09:50.6623 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: d350cf71-778d-4780-88f5-071a4cb1ed61 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 2iRRSki3bDVkBN7htO1OGdz8jRommZ4PaXOabvOOlrhP1cjxA8flE52KlmQXAw+2APZ6uOsA6B7X7SyzO+6geCAH+SGhZCeNnV6oj5yt+os= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR10MB2144 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Klaus_Henning_S=C3=B8rensen?= Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean Not all boards have the same CSB frequency, nor do every SPI slave necessarily support running at 16.7 MHz. So implement ->set_speed; that also allows using a smaller PM (i.e., 0) for slaves that do support a higher speed. Based on work by Klaus H. Sørensen. Cc: Klaus H. Sorensen Signed-off-by: Rasmus Villemoes --- drivers/spi/mpc8xxx_spi.c | 64 ++++++++++++++++++++++++++++++++------- 1 file changed, 53 insertions(+), 11 deletions(-) diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c index 8ef2451411..1bde31ad34 100644 --- a/drivers/spi/mpc8xxx_spi.c +++ b/drivers/spi/mpc8xxx_spi.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include @@ -28,6 +29,7 @@ enum { SPI_MODE_LEN_MASK = 0xf00000, SPI_MODE_LEN_SHIFT = 20, + SPI_MODE_PM_SHIFT = 16, SPI_MODE_PM_MASK = 0xf0000, SPI_COM_LST = BIT(31 - 9), @@ -37,24 +39,19 @@ struct mpc8xxx_priv { spi8xxx_t *spi; struct gpio_desc gpios[16]; int cs_count; + ulong clk_rate; }; -static inline u32 to_prescale_mod(u32 val) -{ - return (min(val, (u32)15) << 16); -} - #define SPI_TIMEOUT 1000 static int mpc8xxx_spi_ofdata_to_platdata(struct udevice *dev) { struct mpc8xxx_priv *priv = dev_get_priv(dev); + struct clk clk; int ret; priv->spi = (spi8xxx_t *)dev_read_addr(dev); - /* TODO(mario.six@gdsys.cc): Read clock and save the value */ - ret = gpio_request_list_by_name(dev, "gpios", priv->gpios, ARRAY_SIZE(priv->gpios), GPIOD_IS_OUT | GPIOD_ACTIVE_LOW); if (ret < 0) @@ -62,6 +59,18 @@ static int mpc8xxx_spi_ofdata_to_platdata(struct udevice *dev) priv->cs_count = ret; + ret = clk_get_by_index(dev, 0, &clk); + if (ret) { + dev_err(dev, "%s: clock not defined\n", __func__); + return ret; + } + + priv->clk_rate = clk_get_rate(&clk); + if (!priv->clk_rate) { + dev_err(dev, "%s: failed to get clock rate\n", __func__); + return -EINVAL; + } + return 0; } @@ -79,10 +88,6 @@ static int mpc8xxx_spi_probe(struct udevice *dev) /* set len to 8 bits */ setbits_be32(&spi->mode, (8 - 1) << SPI_MODE_LEN_SHIFT); - /* TODO(mario.six@gdsys.cc): This only ever sets one fixed speed */ - /* Use SYSCLK / 8 (16.67MHz typ.) */ - clrsetbits_be32(&spi->mode, SPI_MODE_PM_MASK, to_prescale_mod(1)); - setbits_be32(&spi->mode, SPI_MODE_EN); /* Clear all SPI events */ @@ -204,6 +209,43 @@ static int mpc8xxx_spi_xfer(struct udevice *dev, uint bitlen, static int mpc8xxx_spi_set_speed(struct udevice *dev, uint speed) { + struct mpc8xxx_priv *priv = dev_get_priv(dev); + spi8xxx_t *spi = priv->spi; + u32 bits, mask, div16, pm; + u32 mode; + ulong clk; + + clk = priv->clk_rate; + if (clk / 64 > speed) { + div16 = SPI_MODE_DIV16; + clk /= 16; + } else { + div16 = 0; + } + pm = (clk - 1)/(4*speed) + 1; + if (pm > 16) { + dev_err(dev, "requested speed %u too small\n", speed); + return -EINVAL; + } + pm--; + + bits = div16 | (pm << SPI_MODE_PM_SHIFT); + mask = SPI_MODE_DIV16 | SPI_MODE_PM_MASK; + mode = in_be32(&spi->mode); + if ((mode & mask) != bits) { + /* Must clear mode[EN] while changing speed. */ + mode &= ~(mask | SPI_MODE_EN); + out_be32(&spi->mode, mode); + mode |= bits; + out_be32(&spi->mode, mode); + mode |= SPI_MODE_EN; + out_be32(&spi->mode, mode); + } + + debug("requested speed %u, set speed to %lu/(%s4*%u) == %lu\n", + speed, priv->clk_rate, div16 ? "16*" : "", pm + 1, + clk/(4*(pm + 1))); + return 0; }