korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-14 06:24:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

media: camss: Unify the clock names

Browse Source 
Use more logical clock names - similar to the names in documentation.
This will allow better handling of the clocks in the driver when support
for more hardware versions is added - equivalent clocks on different
hardware versions will have the same name.

Signed-off-by: Todor Tomov <todor.tomov@linaro.org>
Signed-off-by: Hans Verkuil <hansverk@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Todor Tomov 2018-07-25 12:38:18 -04:00 committed by Mauro Carvalho Chehab
parent d9707ae272
commit 09a94865d4
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/media/platform/qcom/camss/camss.c
View File

@ -32,8 +32,7 @@ static const struct resources csiphy_res[] = {
/* CSIPHY0 */ /* CSIPHY0 */
{ {
.regulator = { NULL }, .regulator = { NULL },
.clock = { "camss_top_ahb", "ispif_ahb", .clock = { "top_ahb", "ispif_ahb", "ahb", "csiphy0_timer" },
"camss_ahb", "csiphy0_timer" },
.clock_rate = { { 0 }, .clock_rate = { { 0 },
{ 0 }, { 0 },
{ 0 }, { 0 },
@ -45,8 +44,7 @@ static const struct resources csiphy_res[] = {
/* CSIPHY1 */ /* CSIPHY1 */
{ {
.regulator = { NULL }, .regulator = { NULL },
.clock = { "camss_top_ahb", "ispif_ahb", .clock = { "top_ahb", "ispif_ahb", "ahb", "csiphy1_timer" },
"camss_ahb", "csiphy1_timer" },
.clock_rate = { { 0 }, .clock_rate = { { 0 },
{ 0 }, { 0 },
{ 0 }, { 0 },
@ -60,8 +58,7 @@ static const struct resources csid_res[] = {
/* CSID0 */ /* CSID0 */
{ {
.regulator = { "vdda" }, .regulator = { "vdda" },
.clock = { "camss_top_ahb", "ispif_ahb", .clock = { "top_ahb", "ispif_ahb", "csi0_ahb", "ahb",
"csi0_ahb", "camss_ahb",
"csi0", "csi0_phy", "csi0_pix", "csi0_rdi" }, "csi0", "csi0_phy", "csi0_pix", "csi0_rdi" },
.clock_rate = { { 0 }, .clock_rate = { { 0 },
{ 0 }, { 0 },
@ -78,8 +75,7 @@ static const struct resources csid_res[] = {
/* CSID1 */ /* CSID1 */
{ {
.regulator = { "vdda" }, .regulator = { "vdda" },
.clock = { "camss_top_ahb", "ispif_ahb", .clock = { "top_ahb", "ispif_ahb", "csi1_ahb", "ahb",
"csi1_ahb", "camss_ahb",
"csi1", "csi1_phy", "csi1_pix", "csi1_rdi" }, "csi1", "csi1_phy", "csi1_pix", "csi1_rdi" },
.clock_rate = { { 0 }, .clock_rate = { { 0 },
{ 0 }, { 0 },
@ -96,10 +92,10 @@ static const struct resources csid_res[] = {
static const struct resources_ispif ispif_res = { static const struct resources_ispif ispif_res = {
/* ISPIF */ /* ISPIF */
.clock = { "camss_top_ahb", "camss_ahb", "ispif_ahb", .clock = { "top_ahb", "ahb", "ispif_ahb",
"csi0", "csi0_pix", "csi0_rdi", "csi0", "csi0_pix", "csi0_rdi",
"csi1", "csi1_pix", "csi1_rdi" }, "csi1", "csi1_pix", "csi1_rdi" },
.clock_for_reset = { "camss_vfe_vfe", "camss_csi_vfe" }, .clock_for_reset = { "vfe0", "csi_vfe0" },
.reg = { "ispif", "csi_clk_mux" }, .reg = { "ispif", "csi_clk_mux" },
.interrupt = "ispif" .interrupt = "ispif"
@ -108,8 +104,8 @@ static const struct resources_ispif ispif_res = {
static const struct resources vfe_res = { static const struct resources vfe_res = {
/* VFE0 */ /* VFE0 */
.regulator = { NULL }, .regulator = { NULL },
.clock = { "camss_top_ahb", "camss_vfe_vfe", "camss_csi_vfe", .clock = { "top_ahb", "vfe0", "csi_vfe0",
"iface", "bus", "camss_ahb" }, "vfe_ahb", "vfe_axi", "ahb" },
.clock_rate = { { 0 }, .clock_rate = { { 0 },
{ 50000000, 80000000, 100000000, 160000000, { 50000000, 80000000, 100000000, 160000000,
177780000, 200000000, 266670000, 320000000, 177780000, 200000000, 266670000, 320000000,