Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Subject: Re: [PATCH] clk: meson: remove obsolete register access
To:     Jerome Brunet <jbrunet@baylibre.com>,
        Kevin Hilman <khilman@baylibre.com>,
        Carlo Caione <carlo@caione.org>
Cc:     linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org,
        linux-kernel@vger.kernel.org
References: <20180619160050.26958-1-jbrunet@baylibre.com>
From:   Neil Armstrong <narmstrong@baylibre.com>
Openpgp: preference=signencrypt
Autocrypt: addr=narmstrong@baylibre.com; prefer-encrypt=mutual; keydata=
 xsBNBE1ZBs8BCAD78xVLsXPwV/2qQx2FaO/7mhWL0Qodw8UcQJnkrWmgTFRobtTWxuRx8WWP
 GTjuhvbleoQ5Cxjr+v+1ARGCH46MxFP5DwauzPekwJUD5QKZlaw/bURTLmS2id5wWi3lqVH4
 BVF2WzvGyyeV1o4RTCYDnZ9VLLylJ9bneEaIs/7cjCEbipGGFlfIML3sfqnIvMAxIMZrvcl9
 qPV2k+KQ7q+aXavU5W+yLNn7QtXUB530Zlk/d2ETgzQ5FLYYnUDAaRl+8JUTjc0CNOTpCeik
 80TZcE6f8M76Xa6yU8VcNko94Ck7iB4vj70q76P/J7kt98hklrr85/3NU3oti3nrIHmHABEB
 AAHNKE5laWwgQXJtc3Ryb25nIDxuYXJtc3Ryb25nQGJheWxpYnJlLmNvbT7CwHsEEwEKACUC
 GyMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheABQJXDO2CAhkBAAoJEBaat7Gkz/iubGIH/iyk
 RqvgB62oKOFlgOTYCMkYpm2aAOZZLf6VKHKc7DoVwuUkjHfIRXdslbrxi4pk5VKU6ZP9AKsN
 NtMZntB8WrBTtkAZfZbTF7850uwd3eU5cN/7N1Q6g0JQihE7w4GlIkEpQ8vwSg5W7hkx3yQ6
 2YzrUZh/b7QThXbNZ7xOeSEms014QXazx8+txR7jrGF3dYxBsCkotO/8DNtZ1R+aUvRfpKg5
 ZgABTC0LmAQnuUUf2PHcKFAHZo5KrdO+tyfL+LgTUXIXkK+tenkLsAJ0cagz1EZ5gntuheLD
 YJuzS4zN+1Asmb9kVKxhjSQOcIh6g2tw7vaYJgL/OzJtZi6JlIXOwE0ETVkGzwEIALyKDN/O
 GURaHBVzwjgYq+ZtifvekdrSNl8TIDH8g1xicBYpQTbPn6bbSZbdvfeQPNCcD4/EhXZuhQXM
 coJsQQQnO4vwVULmPGgtGf8PVc7dxKOeta+qUh6+SRh3vIcAUFHDT3f/Zdspz+e2E0hPV2hi
 SvICLk11qO6cyJE13zeNFoeY3ggrKY+IzbFomIZY4yG6xI99NIPEVE9lNBXBKIlewIyVlkOa
 YvJWSV+p5gdJXOvScNN1epm5YHmf9aE2ZjnqZGoMMtsyw18YoX9BqMFInxqYQQ3j/HpVgTSv
 mo5ea5qQDDUaCsaTf8UeDcwYOtgI8iL4oHcsGtUXoUk33HEAEQEAAcLAXwQYAQIACQUCTVkG
 zwIbDAAKCRAWmrexpM/4rrXiB/sGbkQ6itMrAIfnM7IbRuiSZS1unlySUVYu3SD6YBYnNi3G
 5EpbwfBNuT3H8//rVvtOFK4OD8cRYkxXRQmTvqa33eDIHu/zr1HMKErm+2SD6PO9umRef8V8
 2o2oaCLvf4WeIssFjwB0b6a12opuRP7yo3E3gTCSKmbUuLv1CtxKQF+fUV1cVaTPMyT25Od+
 RC1K+iOR0F54oUJvJeq7fUzbn/KdlhA8XPGzwGRy4zcsPWvwnXgfe5tk680fEKZVwOZKIEuJ
 C3v+/yZpQzDvGYJvbyix0lHnrCzq43WefRHI5XTTQbM0WUIBIcGmq38+OgUsMYu4NzLu7uZF
 Acmp6h8g
Organization: Baylibre
Message-ID: <0e57617b-0ece-3c6d-f124-6197ef82b1c7@baylibre.com>
Date:   Wed, 20 Jun 2018 10:31:56 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
 Thunderbird/52.8.0
MIME-Version: 1.0
In-Reply-To: <20180619160050.26958-1-jbrunet@baylibre.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On 19/06/2018 18:00, Jerome Brunet wrote:
> The legacy method to access the hhi register space is not longer used.
> We can safely drop it now.
> 
> Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
> ---
>  drivers/clk/meson/axg.c  | 37 ++-----------------------------------
>  drivers/clk/meson/gxbb.c | 36 ++----------------------------------
>  2 files changed, 4 insertions(+), 69 deletions(-)
> 
> diff --git a/drivers/clk/meson/axg.c b/drivers/clk/meson/axg.c
> index bd4dbc696b88..3fb884db1b10 100644
> --- a/drivers/clk/meson/axg.c
> +++ b/drivers/clk/meson/axg.c
> @@ -12,7 +12,6 @@
>  #include <linux/clk.h>
>  #include <linux/clk-provider.h>
>  #include <linux/init.h>
> -#include <linux/of_address.h>
>  #include <linux/of_device.h>
>  #include <linux/mfd/syscon.h>
>  #include <linux/platform_device.h>
> @@ -995,49 +994,17 @@ static const struct of_device_id clkc_match_table[] = {
>  	{}
>  };
>  
> -static const struct regmap_config clkc_regmap_config = {
> -	.reg_bits       = 32,
> -	.val_bits       = 32,
> -	.reg_stride     = 4,
> -};
> -
>  static int axg_clkc_probe(struct platform_device *pdev)
>  {
>  	struct device *dev = &pdev->dev;
> -	struct resource *res;
> -	void __iomem *clk_base = NULL;
>  	struct regmap *map;
>  	int ret, i;
>  
>  	/* Get the hhi system controller node if available */
>  	map = syscon_node_to_regmap(of_get_parent(dev->of_node));
>  	if (IS_ERR(map)) {
> -		dev_err(dev,
> -			"failed to get HHI regmap - Trying obsolete regs\n");
> -
> -		/*
> -		 * FIXME: HHI registers should be accessed through
> -		 * the appropriate system controller. This is required because
> -		 * there is more than just clocks in this register space
> -		 *
> -		 * This fallback method is only provided temporarily until
> -		 * all the platform DTs are properly using the syscon node
> -		 */
> -		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> -		if (!res)
> -			return -EINVAL;
> -
> -
> -		clk_base = devm_ioremap(dev, res->start, resource_size(res));
> -		if (!clk_base) {
> -			dev_err(dev, "Unable to map clk base\n");
> -			return -ENXIO;
> -		}
> -
> -		map = devm_regmap_init_mmio(dev, clk_base,
> -					    &clkc_regmap_config);
> -		if (IS_ERR(map))
> -			return PTR_ERR(map);
> +		dev_err(dev, "failed to get HHI regmap\n");
> +		return PTR_ERR(map);
>  	}
>  
>  	/* Populate regmap for the regmap backed clocks */
> diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c
> index 177fffb9ebef..297ebc391475 100644
> --- a/drivers/clk/meson/gxbb.c
> +++ b/drivers/clk/meson/gxbb.c
> @@ -7,7 +7,6 @@
>  #include <linux/clk.h>
>  #include <linux/clk-provider.h>
>  #include <linux/init.h>
> -#include <linux/of_address.h>
>  #include <linux/of_device.h>
>  #include <linux/mfd/syscon.h>
>  #include <linux/platform_device.h>
> @@ -2228,17 +2227,9 @@ static const struct of_device_id clkc_match_table[] = {
>  	{},
>  };
>  
> -static const struct regmap_config clkc_regmap_config = {
> -	.reg_bits       = 32,
> -	.val_bits       = 32,
> -	.reg_stride     = 4,
> -};
> -
>  static int gxbb_clkc_probe(struct platform_device *pdev)
>  {
>  	const struct clkc_data *clkc_data;
> -	struct resource *res;
> -	void __iomem *clk_base;
>  	struct regmap *map;
>  	int ret, i;
>  	struct device *dev = &pdev->dev;
> @@ -2250,31 +2241,8 @@ static int gxbb_clkc_probe(struct platform_device *pdev)
>  	/* Get the hhi system controller node if available */
>  	map = syscon_node_to_regmap(of_get_parent(dev->of_node));
>  	if (IS_ERR(map)) {
> -		dev_err(dev,
> -			"failed to get HHI regmap - Trying obsolete regs\n");
> -
> -		/*
> -		 * FIXME: HHI registers should be accessed through
> -		 * the appropriate system controller. This is required because
> -		 * there is more than just clocks in this register space
> -		 *
> -		 * This fallback method is only provided temporarily until
> -		 * all the platform DTs are properly using the syscon node
> -		 */
> -		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> -		if (!res)
> -			return -EINVAL;
> -
> -		clk_base = devm_ioremap(dev, res->start, resource_size(res));
> -		if (!clk_base) {
> -			dev_err(dev, "Unable to map clk base\n");
> -			return -ENXIO;
> -		}
> -
> -		map = devm_regmap_init_mmio(dev, clk_base,
> -					    &clkc_regmap_config);
> -		if (IS_ERR(map))
> -			return PTR_ERR(map);
> +		dev_err(dev, "failed to get HHI regmap\n");
> +		return PTR_ERR(map);
>  	}
>  
>  	/* Populate regmap for the common regmap backed clocks */
> 

Acked-by: Neil Armstrong <narmstrong@baylibre.com>