From patchwork Wed Sep 20 22:23:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 13393543 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3D534CD13D3 for ; Wed, 20 Sep 2023 22:24:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=EL4/eYZvCCwyuz7rPZOnKtkBh1Mf/T49tL2poGrIuiU=; b=I/NFXso/NoPZOB NRjlNqfaQps6wA9p0Ap6qFdyv8LjmO0abyPCe6VNjh/MS4+aDGdYL814PP8Yii7aMymb9OBTvmQ5G dBP5jzIn1gv7VEcOchOe9tf+0+KNMgV5uKLZOcEzPZyzwgclNUu9j+oScw8soGUAw8UaO7cM6yXne 1T+717TJCLCkD/45Ju49FCvp2pDkPhg3P7M2gUMOfH2/8e6vkT1TJCLoKMrp+Gj1BFmxDdO1m9EfO lGpyGbQVZz3QZKiNad03vu6gvpOikvdDWAZ4zDih2r/to3GDXomCoR5X+dueie8SXjDKCCgM3mV3A 15H1USA99asfyUKu8NRQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qj5c8-004M4p-0g; Wed, 20 Sep 2023 22:24:08 +0000 Received: from mail-lf1-x12e.google.com ([2a00:1450:4864:20::12e]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qj5bt-004M0D-2o for linux-arm-kernel@lists.infradead.org; Wed, 20 Sep 2023 22:23:55 +0000 Received: by mail-lf1-x12e.google.com with SMTP id 2adb3069b0e04-50307acd445so634415e87.0 for ; Wed, 20 Sep 2023 15:23:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1695248632; x=1695853432; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=vLjkgT3erisd8thNh77YSEgF45UAom1/3ug+bR94eRg=; b=U+BOgC4R8S5emKVFAQPpWtnFS0cta5lzV397qQ7CZd61H1nHpHL+qaVFYhMXviSNCV ACu+92hBaKfzm9jnIEKAXg1mLE9j2sKDvzzgyRCCMddNhbvZXaDaWiVz3CtoZuavvz3F RgPEKqFTjY5TtELK4eKBlE1WZWRT7UTRp9u9pMctdq889SGYFAmYq3hWS4noX4ptbJJT sSJcmM49HYz7YEatMNNWRjDbvejvTmK5LaLVCWSvYTH06m19WP3rm7awB4T1AzZEwIk9 HIT+2vqLQkSQeIoJ5gToXLzAd6xqxvzMcpnF0BGaQnj9pCH2VCnPAP6xZyxEHBSwC52u cFWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695248632; x=1695853432; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vLjkgT3erisd8thNh77YSEgF45UAom1/3ug+bR94eRg=; b=XNxezgXUCUHcqeP7pJmIqs0Gt8+UZLvhckZ/iY5vjsb2cOSycnfF1AmN1ZdwFtTYvP YyB0g+GmjSDKsVPzBFqPnhbKbZMA6P1h0kr0rPvu7hmXjv5Q2FGKSlB+9QUy4GfnUY/4 XDsHWyUur3DUaU+aVnk8OwU31uk5AV6dAkGXfoZFWXco1c5v2NwXbSAHSF/IbMFezKF0 Y93pREhyaD1d41jEpSHN0ppY4DOAUYpgnYWCqPllaA9AWAOC6rML7RrnoJ6OmlvqKXWZ fpDsyUS+QJYkZnJwiaGw/vZK2FYKJnGQvVvkDZNpN57eGi63hiZ6Y0A9DpY5QZLXgOHd 752g== X-Gm-Message-State: AOJu0Yz6xspugzF5Ra/E8WvXDVMEo2e8BQTRW63BnfRh9SeTMOar8WJM yQOltt4wAInLA2EepbpFhEAEPg== X-Google-Smtp-Source: AGHT+IFH1+VG7sJVN2LpzTzfZwbtQcp/ITUJsCKlrEFwWrMWXLwatBlfdkhi+mqAWOgOpqVxBMjZbQ== X-Received: by 2002:a05:6512:3f03:b0:500:b8a3:1bf1 with SMTP id y3-20020a0565123f0300b00500b8a31bf1mr4205773lfa.43.1695248632103; Wed, 20 Sep 2023 15:23:52 -0700 (PDT) Received: from [192.168.1.2] (c-05d8225c.014-348-6c756e10.bbcust.telenor.se. [92.34.216.5]) by smtp.gmail.com with ESMTPSA id u14-20020ac2518e000000b004fe0fead9e2sm14557lfi.165.2023.09.20.15.23.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Sep 2023 15:23:51 -0700 (PDT) From: Linus Walleij Date: Thu, 21 Sep 2023 00:23:46 +0200 Subject: [PATCH 2/2] gpio: ixp4xx: Handle clock output on pin 14 and 15 MIME-Version: 1.0 Message-Id: <20230921-ixp4xx-gpio-clocks-v1-2-574942bf944a@linaro.org> References: <20230921-ixp4xx-gpio-clocks-v1-0-574942bf944a@linaro.org> In-Reply-To: <20230921-ixp4xx-gpio-clocks-v1-0-574942bf944a@linaro.org> To: Linus Walleij , Imre Kaloz , Krzysztof Halasa , Bartosz Golaszewski , Andy Shevchenko , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org, devicetree@vger.kernel.org, Linus Walleij X-Mailer: b4 0.12.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230920_152353_910567_13A4D40C X-CRM114-Status: GOOD ( 18.04 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This makes it possible to provide basic clock output on pins 14 and 15. The clocks are typically used by random electronics, not modeled in the device tree, so they just need to be provided on request. Signed-off-by: Linus Walleij --- drivers/gpio/gpio-ixp4xx.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/drivers/gpio/gpio-ixp4xx.c b/drivers/gpio/gpio-ixp4xx.c index dde6cf3a5779..6a9d32b4d0d7 100644 --- a/drivers/gpio/gpio-ixp4xx.c +++ b/drivers/gpio/gpio-ixp4xx.c @@ -38,6 +38,18 @@ #define IXP4XX_GPIO_STYLE_MASK GENMASK(2, 0) #define IXP4XX_GPIO_STYLE_SIZE 3 +/* + * Clock output control register defines. + */ +#define IXP4XX_GPCLK_CLK0DC_SHIFT 0 +#define IXP4XX_GPCLK_CLK0TC_SHIFT 4 +#define IXP4XX_GPCLK_CLK0_MASK GENMASK(7, 0) +#define IXP4XX_GPCLK_MUX14 BIT(8) +#define IXP4XX_GPCLK_CLK1DC_SHIFT 16 +#define IXP4XX_GPCLK_CLK1TC_SHIFT 20 +#define IXP4XX_GPCLK_CLK1_MASK GENMASK(23, 16) +#define IXP4XX_GPCLK_MUX15 BIT(24) + /** * struct ixp4xx_gpio - IXP4 GPIO state container * @dev: containing device for this instance @@ -202,6 +214,7 @@ static int ixp4xx_gpio_probe(struct platform_device *pdev) struct ixp4xx_gpio *g; struct gpio_irq_chip *girq; struct device_node *irq_parent; + u32 val; int ret; g = devm_kzalloc(dev, sizeof(*g), GFP_KERNEL); @@ -225,13 +238,34 @@ static int ixp4xx_gpio_probe(struct platform_device *pdev) } g->fwnode = of_node_to_fwnode(np); + val = __raw_readl(g->base + IXP4XX_REG_GPCLK); /* * Make sure GPIO 14 and 15 are NOT used as clocks but GPIO on * specific machines. */ if (of_machine_is_compatible("dlink,dsm-g600-a") || of_machine_is_compatible("iom,nas-100d")) - __raw_writel(0x0, g->base + IXP4XX_REG_GPCLK); + val = 0; + + /* + * Enable clock outputs with default timings of requested clock. + * If you need control over TC and DC, add these to the device + * tree bindings and use them here. + */ + if (of_property_read_bool(np, "intel,ixp4xx-gpio14-clkout")) { + val &= ~IXP4XX_GPCLK_CLK0_MASK; + val |= (0 << IXP4XX_GPCLK_CLK0DC_SHIFT); + val |= (1 << IXP4XX_GPCLK_CLK0TC_SHIFT); + val |= IXP4XX_GPCLK_MUX14; + } + + if (of_property_read_bool(np, "intel,ixp4xx-gpio15-clkout")) { + val &= ~IXP4XX_GPCLK_CLK1_MASK; + val |= (0 << IXP4XX_GPCLK_CLK1DC_SHIFT); + val |= (1 << IXP4XX_GPCLK_CLK1TC_SHIFT); + val |= IXP4XX_GPCLK_MUX15; + } + __raw_writel(val, g->base + IXP4XX_REG_GPCLK); /* * This is a very special big-endian ARM issue: when the IXP4xx is