Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 83427c23a44e34be2985f5b1440c645ea8577938

Authored by Sylwester Nawrocki
Committed by Kukjin Kim
1 parent b76f7cdca5
Exists in master and in 38 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

ARM: S5PV210: Rename sclk_cam clocks for FIMC media driver 

The sclk_cam clocks are now controlled by the top level FIMC media
device driver bound to "s5p-fimc-md" platform device.
Rename sclk_cam clocks so they accessible by the corresponding
driver.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

Showing 1 changed file with 2 additions and 4 deletions Side-by-side Diff

arch/arm/mach-s5pv210/clock.c
Diff comments   View file @ 83427c2
... ... @@ -815,8 +815,7 @@
815 815 .reg_div = { .reg = S5P_CLK_DIV3, .shift = 20, .size = 4 },
816 816 }, {
817 817 .clk = {
818   - .name = "sclk_cam",
819   - .devname = "s5pv210-fimc.0",
  818 + .name = "sclk_cam0",
820 819 .enable = s5pv210_clk_mask0_ctrl,
821 820 .ctrlbit = (1 << 3),
822 821 },
... ... @@ -825,8 +824,7 @@
825 824 .reg_div = { .reg = S5P_CLK_DIV1, .shift = 12, .size = 4 },
826 825 }, {
827 826 .clk = {
828   - .name = "sclk_cam",
829   - .devname = "s5pv210-fimc.1",
  827 + .name = "sclk_cam1",
830 828 .enable = s5pv210_clk_mask0_ctrl,
831 829 .ctrlbit = (1 << 4),
832 830 },