iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Amlogic Drivers updates for v5.18:
- Add support for Amlogic S4 in meson-secure-pwrc power domain driver

* tag 'amlogic-drivers-for-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  soc: s4: Add support for power domains controller
  dt-bindings: power: add Amlogic s4 power domains bindings

Link: https://lore.kernel.org/r/c7471989-d929-c744-c0c3-c8e86eaaa225@baylibre.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2022-03-08 17:06:44 +01:00
parent 608f7cf3f5 f2b03c1056
commit c76edea0e5
3 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/devicetree/bindings/power/amlogic,meson-sec-pwrc.yaml
View File

@@ -12,13 +12,14 @@ maintainers:
- Jianxin Pan <jianxin.pan@amlogic.com> - Jianxin Pan <jianxin.pan@amlogic.com>
description: |+ description: |+
Secure Power Domains used in Meson A1/C1 SoCs, and should be the child node Secure Power Domains used in Meson A1/C1/S4 SoCs, and should be the child node
of secure-monitor. of secure-monitor.
properties: properties:
compatible: compatible:
enum: enum:
- amlogic,meson-a1-pwrc - amlogic,meson-a1-pwrc
- amlogic,meson-s4-pwrc
"#power-domain-cells": "#power-domain-cells":
const: 1 const: 1

22
drivers/soc/amlogic/meson-secure-pwrc.c
View File

@@ -11,6 +11,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/pm_domain.h> #include <linux/pm_domain.h>
#include <dt-bindings/power/meson-a1-power.h> #include <dt-bindings/power/meson-a1-power.h>
#include <dt-bindings/power/meson-s4-power.h>
#include <linux/arm-smccc.h> #include <linux/arm-smccc.h>
#include <linux/firmware/meson/meson_sm.h> #include <linux/firmware/meson/meson_sm.h>
#include <linux/module.h> #include <linux/module.h>
@@ -119,6 +120,18 @@ static struct meson_secure_pwrc_domain_desc a1_pwrc_domains[] = {
SEC_PD(RSA, 0), SEC_PD(RSA, 0),
}; };
static struct meson_secure_pwrc_domain_desc s4_pwrc_domains[] = {
SEC_PD(S4_DOS_HEVC, 0),
SEC_PD(S4_DOS_VDEC, 0),
SEC_PD(S4_VPU_HDMI, 0),
SEC_PD(S4_USB_COMB, 0),
SEC_PD(S4_GE2D, 0),
/* ETH is for ethernet online wakeup, and should be always on */
SEC_PD(S4_ETH, GENPD_FLAG_ALWAYS_ON),
SEC_PD(S4_DEMOD, 0),
SEC_PD(S4_AUDIO, 0),
};
static int meson_secure_pwrc_probe(struct platform_device *pdev) static int meson_secure_pwrc_probe(struct platform_device *pdev)
{ {
int i; int i;
@@ -187,11 +200,20 @@ static struct meson_secure_pwrc_domain_data meson_secure_a1_pwrc_data = {
.count = ARRAY_SIZE(a1_pwrc_domains), .count = ARRAY_SIZE(a1_pwrc_domains),
}; };
static struct meson_secure_pwrc_domain_data meson_secure_s4_pwrc_data = {
.domains = s4_pwrc_domains,
.count = ARRAY_SIZE(s4_pwrc_domains),
};
static const struct of_device_id meson_secure_pwrc_match_table[] = { static const struct of_device_id meson_secure_pwrc_match_table[] = {
{ {
.compatible = "amlogic,meson-a1-pwrc", .compatible = "amlogic,meson-a1-pwrc",
.data = &meson_secure_a1_pwrc_data, .data = &meson_secure_a1_pwrc_data,
}, },
{
.compatible = "amlogic,meson-s4-pwrc",
.data = &meson_secure_s4_pwrc_data,
},
{ /* sentinel */ } { /* sentinel */ }
}; };
MODULE_DEVICE_TABLE(of, meson_secure_pwrc_match_table); MODULE_DEVICE_TABLE(of, meson_secure_pwrc_match_table);

19
include/dt-bindings/power/meson-s4-power.h Normal file
View File

@@ -0,0 +1,19 @@
/* SPDX-License-Identifier: (GPL-2.0+ or MIT) */
/*
* Copyright (c) 2021 Amlogic, Inc.
* Author: Shunzhou Jiang <shunzhou.jiang@amlogic.com>
*/
#ifndef _DT_BINDINGS_MESON_S4_POWER_H
#define _DT_BINDINGS_MESON_S4_POWER_H
#define PWRC_S4_DOS_HEVC_ID 0
#define PWRC_S4_DOS_VDEC_ID 1
#define PWRC_S4_VPU_HDMI_ID 2
#define PWRC_S4_USB_COMB_ID 3
#define PWRC_S4_GE2D_ID 4
#define PWRC_S4_ETH_ID 5
#define PWRC_S4_DEMOD_ID 6
#define PWRC_S4_AUDIO_ID 7
#endif