From patchwork Sat Sep 23 16:02:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 13396841 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 06E99CE7A89 for ; Sat, 23 Sep 2023 16:03:05 +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=nN9dNXRP2JxturXQTBqZwZM5/M0blol90sqBqkk3m20=; b=rIQQ4IkHinEUL0 7biJYxOUfbFIjM9N3jO01AdfJLoidypRdK4t818lgwKPh6GM1EqagIybO6bvj/jTPjiT+gAcQ0fKi tFEzctgW2d4bjLeQi9k60LneDRS0EygO2KBShkY2KGQtClnXPdUdQpGgActRkbjr6WmLvUEbXOcJ9 k7T4awCUKwmO12t32Evn/UtjUVXrGU+lYJcKa8gm8KNIiYg5Qu5UA0eTN27i1l7CfEyjst6ntRe9B jggfJbiJrq8ae02+3mmwc4PaZcuSvOfBmTI1yxmwJQCPcNEsOokfi5EhiKwUiGs4gE9PGKSV1TGN9 kGCk+dclPmM1lw8rMnKA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qk55c-00BAb5-2P; Sat, 23 Sep 2023 16:02:40 +0000 Received: from mail-lj1-x236.google.com ([2a00:1450:4864:20::236]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qk55Z-00BAZR-0u for linux-arm-kernel@lists.infradead.org; Sat, 23 Sep 2023 16:02:39 +0000 Received: by mail-lj1-x236.google.com with SMTP id 38308e7fff4ca-2c147b96af8so24567531fa.0 for ; Sat, 23 Sep 2023 09:02:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1695484953; x=1696089753; 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=qT4V244MIYb7HC5hpsM98rjOj8T0H65YgdniWFrcK+Y=; b=ThaDNi31Pr4Gl54Esz9JOkkyqNN9U8E+2r29/1qgYpPXOMH1uT+oki3V+ya8VS61dW ROzEbrziY311mpCDMpdtvxt8QTHt12gTU/EcANkS3wutWV/pFB74V1XqjecJT8FYAQuC rLYCJlzjIcqe3fN4wkptGSNAdYCjV6vnWmDgKUgN5LWbq7U/WUNfxBTWcqB0Ztn0RtQ0 w3NLGJ2Jw6YlH/3zJQzXnCxB8SYl4uqxWOOSAsg+2fjpZAMvtq0Qn4ufg2Vnvf4Trlg4 E6blNKHmiTSRnl4D+5WoL1KO2C/ZRhwRAkUxYmsA8DnzpWMzCwEcNFqyDrSlr+B5sGaP /etg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695484953; x=1696089753; 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=qT4V244MIYb7HC5hpsM98rjOj8T0H65YgdniWFrcK+Y=; b=gOp0/P11Z1RVQ5GwdroVhwYyCSJ9iWPvsx5ji+VtF5MaJRie6QSLdIl0IxNTPXYCtt Z35aJiJAD2ZQwfssc5j9WARLwm0RhZAZuiCNNmbNTKO/41ZMZls6B7XiXH0IcO6vJHol v2UyflLiwmGcEGXrLCjctqdZVRmKrXnb+xk7ArXbckyPYIFqhfC1xDb9Tk1gZXqc6wFD E0iDE0/jqPDaCKkACnL3aa7cszcBdDGkwxZaOr6iBIOTK2ysh6ahcwhUoAHjREcoDJTF LcJIclTlmOMlEm6D5KzYuKtUlGGngvy1mBfraZRrJRwsoDz46M9l4afWQ29dPphmySYz /ZVA== X-Gm-Message-State: AOJu0YyxcgMWvxGL8GArMxCEZUYEgK/ZndS+X6GlqQr7tKWN8glnyVRM C7sXNMki69fC/sTBjgAn7ZH4uQ== X-Google-Smtp-Source: AGHT+IEKURJkGJhP0mJeakLX/wl7+J+oe8KSwlc2/02jmyzxZIWMc+9FCake5IJFQu/VzWEJmuYBCQ== X-Received: by 2002:a05:6512:251e:b0:502:a588:6609 with SMTP id be30-20020a056512251e00b00502a5886609mr2212028lfb.3.1695484953360; Sat, 23 Sep 2023 09:02:33 -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 v30-20020a056512049e00b004fdde1db756sm1132835lfq.26.2023.09.23.09.02.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Sep 2023 09:02:32 -0700 (PDT) From: Linus Walleij Date: Sat, 23 Sep 2023 18:02:29 +0200 Subject: [PATCH v3 2/2] gpio: ixp4xx: Handle clock output on pin 14 and 15 MIME-Version: 1.0 Message-Id: <20230923-ixp4xx-gpio-clocks-v3-2-66f8fe4e7f15@linaro.org> References: <20230923-ixp4xx-gpio-clocks-v3-0-66f8fe4e7f15@linaro.org> In-Reply-To: <20230923-ixp4xx-gpio-clocks-v3-0-66f8fe4e7f15@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-20230923_090237_319919_6413E8B7 X-CRM114-Status: GOOD ( 20.47 ) 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. In order to not disturb old systems that require that the hardware defaults are kept in the clock setting bits, we only manipulate these if either device tree property is present. Once we know a device needs one of the clocks we can set it in the device tree. Signed-off-by: Linus Walleij Reviewed-by: Andy Shevchenko --- drivers/gpio/gpio-ixp4xx.c | 49 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/drivers/gpio/gpio-ixp4xx.c b/drivers/gpio/gpio-ixp4xx.c index dde6cf3a5779..1ca3217d0aab 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,8 @@ static int ixp4xx_gpio_probe(struct platform_device *pdev) struct ixp4xx_gpio *g; struct gpio_irq_chip *girq; struct device_node *irq_parent; + bool clk_14, clk_15; + u32 val; int ret; g = devm_kzalloc(dev, sizeof(*g), GFP_KERNEL); @@ -231,7 +245,40 @@ static int ixp4xx_gpio_probe(struct platform_device *pdev) */ 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; + else + val = __raw_readl(g->base + IXP4XX_REG_GPCLK); + + /* + * If either clock output is enabled explicitly in the device tree + * we take full control of the clock by masking off all bits for + * the clock control and selectively enabling them. Otherwise + * we leave the hardware default settings. + * + * 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. + */ + clk_14 = of_property_read_bool(np, "intel,ixp4xx-gpio14-clkout"); + clk_15 = of_property_read_bool(np, "intel,ixp4xx-gpio15-clkout"); + if (clk_14 || clk_15) { + val &= ~(IXP4XX_GPCLK_MUX14 | IXP4XX_GPCLK_MUX15); + val &= ~IXP4XX_GPCLK_CLK0_MASK; + val &= ~IXP4XX_GPCLK_CLK1_MASK; + if (clk_14) { + val |= (0 << IXP4XX_GPCLK_CLK0DC_SHIFT); + val |= (1 << IXP4XX_GPCLK_CLK0TC_SHIFT); + val |= IXP4XX_GPCLK_MUX14; + } + + if (clk_15) { + 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