Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09a94865 authored by Todor Tomov's avatar Todor Tomov Committed by Mauro Carvalho Chehab
Browse files

media: camss: Unify the clock names 



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: default avatarTodor Tomov <todor.tomov@linaro.org>
Signed-off-by: default avatarHans Verkuil <hansverk@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent d9707ae2

drivers/media/platform/qcom/camss/camss.c

+8 −12
Original line number Diff line number Diff line
@@ -32,8 +32,7 @@ static const struct resources csiphy_res[] = { 
	/* CSIPHY0 */

	{

		.regulator = { NULL },

		.clock = { "camss_top_ahb", "ispif_ahb",

			   "camss_ahb", "csiphy0_timer" },

		.clock = { "top_ahb", "ispif_ahb", "ahb", "csiphy0_timer" },

		.clock_rate = { { 0 },

				{ 0 },

				{ 0 },
@@ -45,8 +44,7 @@ static const struct resources csiphy_res[] = { 
	/* CSIPHY1 */

	{

		.regulator = { NULL },

		.clock = { "camss_top_ahb", "ispif_ahb",

			   "camss_ahb", "csiphy1_timer" },

		.clock = { "top_ahb", "ispif_ahb", "ahb", "csiphy1_timer" },

		.clock_rate = { { 0 },

				{ 0 },

				{ 0 },
@@ -60,8 +58,7 @@ static const struct resources csid_res[] = { 
	/* CSID0 */

	{

		.regulator = { "vdda" },

		.clock = { "camss_top_ahb", "ispif_ahb",

			   "csi0_ahb", "camss_ahb",

		.clock = { "top_ahb", "ispif_ahb", "csi0_ahb", "ahb",

			   "csi0", "csi0_phy", "csi0_pix", "csi0_rdi" },

		.clock_rate = { { 0 },

				{ 0 },
@@ -78,8 +75,7 @@ static const struct resources csid_res[] = { 
	/* CSID1 */

	{

		.regulator = { "vdda" },

		.clock = { "camss_top_ahb", "ispif_ahb",

			   "csi1_ahb", "camss_ahb",

		.clock = { "top_ahb", "ispif_ahb", "csi1_ahb", "ahb",

			   "csi1", "csi1_phy", "csi1_pix", "csi1_rdi" },

		.clock_rate = { { 0 },

				{ 0 },
@@ -96,10 +92,10 @@ static const struct resources csid_res[] = { 


static const struct resources_ispif ispif_res = {

	/* ISPIF */

	.clock = { "camss_top_ahb", "camss_ahb", "ispif_ahb",

	.clock = { "top_ahb", "ahb", "ispif_ahb",

		   "csi0", "csi0_pix", "csi0_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" },

	.interrupt = "ispif"
@@ -108,8 +104,8 @@ static const struct resources_ispif ispif_res = { 
static const struct resources vfe_res = {

	/* VFE0 */

	.regulator = { NULL },

	.clock = { "camss_top_ahb", "camss_vfe_vfe", "camss_csi_vfe",

		   "iface", "bus", "camss_ahb" },

	.clock = { "top_ahb", "vfe0", "csi_vfe0",

		   "vfe_ahb", "vfe_axi", "ahb" },

	.clock_rate = { { 0 },

			{ 50000000, 80000000, 100000000, 160000000,

			  177780000, 200000000, 266670000, 320000000,