shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-03-24 19:40:21 +09:00
Code Issues Packages Projects Releases Wiki Activity

power: add the power domain control API [1/1]

Browse Source 
PD#SWPL-17563

Problem:
add power domain control API for TM2 and SM1

Solution:
add power domain control API for TM2 and SM1

Verify:
T962E2

Change-Id: I2587b2b554281ee7c81d77e8978a2640e5f73be5
Signed-off-by: zhiqiang liang <zhiqiang.liang@amlogic.com>
Signed-off-by: chunlong.cao <chunlong.cao@amlogic.com>
This commit is contained in:
zhiqiang liang
2019-11-28 15:30:30 +08:00
committed by Chris
parent d513d92d48
commit 2fac8361fb
5 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
MAINTAINERS
View File

@@ -13552,10 +13552,10 @@ F: arch/arm/include/asm/kasan.h
F: arch/arm/mm/kasan_init.c
HDMITX OUTPUT DRIVER
M: Zongdong Jiao <zongdong.jiao@amlogic.com>
M: Zongdong Jiao <zongdong.jiao@amlogic.com>
M: Zhengrong Zhu <zhengrong.zhu@amlogic.com>
S: Maintained
F: drivers/amlogic/media/vout/hdmitx/*
F: drivers/amlogic/media/vout/hdmitx/
F: drivers/amlogic/media/vout/hdmitx/hdcp/*
F: include/linux/amlogic/media/vout/hdmi_tx/*
F: drivers/amlogic/esm/*
@@ -15246,4 +15246,3 @@ F: include/linux/amlogic/media/video_sink/v4lvideo_ext.h
AMLOGIC POWER DOMAIN DRIVER
M: Zhiqiang Liang <zhiqiang.liang@amlogic.com>
F: drivers/amlogic/power/power_domain.c

13
arch/arm/boot/dts/amlogic/mesonsm1.dtsi
View File

@@ -487,10 +487,15 @@
reg = <0xff809000 0x48>;
};
power_ctrl: power_ctrl@ff8000e8 {
compatible = "amlogic, sm1-powerctrl";
reg = <0xff8000e8 0x10>,
<0xff63c100 0x10>;
pwrdm: power-domains {
compatible = "amlogic,sm1-power-domain";
reg = <0xff62fc00 0xf0>,
<0xff8000e8 0x10>,
<0xff63c100 0x40>,
<0xffd01080 0x20>;
vpu_mempd_reg3 = <0xc>;
vpu_mempd_reg4 = <0x10>;
status = "okay";
};
bl40: bl40 {

13
arch/arm64/boot/dts/amlogic/mesonsm1.dtsi
View File

@@ -487,10 +487,15 @@
reg = <0x0 0xff809000 0x0 0x48>;
};
power_ctrl: power_ctrl@ff8000e8 {
compatible = "amlogic, sm1-powerctrl";
reg = <0x0 0xff8000e8 0x0 0x10>,
<0x0 0xff63c100 0x0 0x10>;
pwrdm: power-domains {
compatible = "amlogic,sm1-power-domain";
reg = <0x0 0xff62fc00 0x0 0xf0>,
<0x0 0xff8000e8 0x0 0x10>,
<0x0 0xff63c100 0x0 0x40>,
<0x0 0xffd01080 0x0 0x20>;
vpu_mempd_reg3 = <0xc>;
vpu_mempd_reg4 = <0x10>;
status = "okay";
};
bl40: bl40 {

10
drivers/amlogic/media/common/ge2d/ge2d_wq.c
View File

@@ -479,11 +479,6 @@ static int ge2d_process_work_queue(struct ge2d_context_s *wq)
pos = pos->next;
list_move_tail(&pitem->list, &wq->free_queue);
spin_unlock(&wq->lock);
/* if block mode (cmd) */
if (block_mode) {
pitem->cmd.wait_done_flag = 0;
wake_up_interruptible(&wq->cmd_complete);
}
/* if dma buf detach it */
for (i = 0; i < MAX_PLANE; i++) {
if (pitem->config.src_dma_cfg[i].dma_used) {
@@ -505,6 +500,11 @@ static int ge2d_process_work_queue(struct ge2d_context_s *wq)
kfree(pitem->config.dst_dma_cfg[i].dma_cfg);
}
}
/* if block mode (cmd) */
if (block_mode) {
pitem->cmd.wait_done_flag = 0;
wake_up_interruptible(&wq->cmd_complete);
}
pitem = (struct ge2d_queue_item_s *)pos;
} while (pos != head);
ge2d_manager.last_wq = wq;

2
drivers/amlogic/power/Makefile
View File

@@ -4,4 +4,4 @@ obj-$(CONFIG_AMLOGIC_PMU_OF) += aml_pmu_of_common.o
obj-$(CONFIG_AMLOGIC_M8B_DVFS) += aml_dvfs/
obj-$(CONFIG_AMLOGIC_POWER) += power_ctrl.o
#obj-$(CONFIG_AMLOGIC_POWER) += power_domain.o
obj-$(CONFIG_AMLOGIC_POWER) += power_domain.o