Amlogic Drivers changes for v6.1:

- Hold reference returned by of_get_parent() in meson_pwrc
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEPVPGJshWBf4d9CyLd9zb2sjISdEFAmMV/tcACgkQd9zb2sjI
 SdF8ahAAptU1Uwy3jQIzp+A6mDpTRLDP++yFPygNBkCiLi2PukPQBAnFKYjujpx2
 ygk2ECU5DO4xBL8IdAVabz7CI9uAoIdmCgKi3nMiaLjeIDhWpgLhEc2t4B9mD4Nf
 Vh5c904guPUoa4cOZK8K2obpSIpDS1WfvFRv8X9DR9oYhVGrvQYgEm9cPsyEZIMy
 wBHkVIh0m1NJ4fn9JSeps7Fo5zVKjsoLeN5QAUkl0A4sbXddJAAYhVqzsIHt8FSy
 Zl/FOckoSH8nxYws+rcaUqv1qcVUJ1cAM018NFtN8DwFJvOGnHFGJ1qgZVlKB+sV
 JyLFJeJRt4naF84oLLO7R0IORV7GLJ+i4vxmTHbGZKS0dXb81oPBjz56N/CbZMCN
 yf2gIyMi8aaDSN1IWtyQIJiI8bWu7o3kKhrbwRJIIjSkIMZCa/UXNqP7WWMCZs0y
 Va7Dmfjb7WsrHtFK7pKU0h4jYBjA/Ry5KvrI+n4WiVOdKKkaxD3hNZT8y5IczOkD
 fhIOm8yZNeOJxkK5jGNWdrDeCiksEg/Tag6DkasaOeLq8mb67AU01mYqmnPshvfu
 Vu+BRodnjAuosF6Dlmr9pes+/f8S0zdcj98V1iowtzo8ijhpWx/zdPvVmgLnm1Jb
 wCeSTKsoj5FjutWY7eLMxWib1fOI0pec3hfU8bwedbjg0QgA7cw=
 =0oZH
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmMZ9lwACgkQmmx57+YA
 GNnhLg/+KLYuNXk0Tt7pOP1N7nchT7FZnsHOhGyeRS1NVxnVInOS7KAunav1+66/
 Q2KQuo2WQJ5wAw408vtXQqiIokUcGz2cfoipA/0JQpe0m0P+HESiNj8MtBGd60cH
 IYEJ/BpInRp6lTvnYxlmYocoa20i3h622zTS00ZoqctkYjkLItr2qwDfB2ENMioU
 etg2r5J+I/W7cinFvaraGp/qaNeLZh9XMGCe3C7vOSjWuT+Ewg2Z0XOrZeiLjWgo
 teCYBj7POKoBXkT6+HGKGpXuZunMMoWxViuEp1bst4NwRaPVavKJ4tLggvrX8zjI
 FLftyi78oPz6czrrHsapez7EqwOnu8BFWMdjDkCN/5fi366iYrutQy7upRi5XOzV
 PeCMbbrV0HbMoSgwRQ8uH0IbOWDo0kF6Q3P14pqk2rBM64f8yaMpTPrOmUrourCY
 bUwC7iY8LjYDLZO5TpFLWYxNhrFnPmY8GnDSIqokf5qXG21+E7AAZ48RPUMMDcEo
 VPr0+w8xg8dxrVyScJXmCeX3mDdbsu0ET6D1wGsbUl4tNvCE5X1pEa0qd6SV6gIM
 knTQh5Izo1o4MN8abNgEVIURQ08lAhLzniLf9eTdhI2L3GlPKRzxaVVfO0TlEkdh
 8oE9lnar6ECFHe7Vem9diuCRXdd5SJFncoT/DEaVsaMg0v+wU9Y=
 =HzXE
 -----END PGP SIGNATURE-----

Merge tag 'amlogic-drivers-for-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into arm/drivers

Amlogic Drivers changes for v6.1:
- Hold reference returned by of_get_parent() in meson_pwrc

* tag 'amlogic-drivers-for-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  soc: amlogic: meson-pwrc: Hold reference returned by of_get_parent()

Link: https://lore.kernel.org/r/ea093c00-a4bb-fb80-3430-71916b2853f8@baylibre.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2022-09-08 16:04:10 +02:00
Родитель c9a2577d41 9491cff16a
Коммит 3e3dcb464c
2 изменённых файлов: 8 добавлений и 2 удалений

Просмотреть файл

@ -469,6 +469,7 @@ static int meson_ee_pwrc_probe(struct platform_device *pdev)
{
const struct meson_ee_pwrc_domain_data *match;
struct regmap *regmap_ao, *regmap_hhi;
struct device_node *parent_np;
struct meson_ee_pwrc *pwrc;
int i, ret;
@ -495,7 +496,9 @@ static int meson_ee_pwrc_probe(struct platform_device *pdev)
pwrc->xlate.num_domains = match->count;
regmap_hhi = syscon_node_to_regmap(of_get_parent(pdev->dev.of_node));
parent_np = of_get_parent(pdev->dev.of_node);
regmap_hhi = syscon_node_to_regmap(parent_np);
of_node_put(parent_np);
if (IS_ERR(regmap_hhi)) {
dev_err(&pdev->dev, "failed to get HHI regmap\n");
return PTR_ERR(regmap_hhi);

Просмотреть файл

@ -273,6 +273,7 @@ static int meson_gx_pwrc_vpu_probe(struct platform_device *pdev)
const struct meson_gx_pwrc_vpu *vpu_pd_match;
struct regmap *regmap_ao, *regmap_hhi;
struct meson_gx_pwrc_vpu *vpu_pd;
struct device_node *parent_np;
struct reset_control *rstc;
struct clk *vpu_clk;
struct clk *vapb_clk;
@ -291,7 +292,9 @@ static int meson_gx_pwrc_vpu_probe(struct platform_device *pdev)
memcpy(vpu_pd, vpu_pd_match, sizeof(*vpu_pd));
regmap_ao = syscon_node_to_regmap(of_get_parent(pdev->dev.of_node));
parent_np = of_get_parent(pdev->dev.of_node);
regmap_ao = syscon_node_to_regmap(parent_np);
of_node_put(parent_np);
if (IS_ERR(regmap_ao)) {
dev_err(&pdev->dev, "failed to get regmap\n");
return PTR_ERR(regmap_ao);