* [PATCH v8 05/12] clk: exynos5250: add gate clock descriptions of System MMU @ 2013-07-26 11:27 Cho KyongHo 2013-07-26 20:01 ` Mike Turquette 0 siblings, 1 reply; 7+ messages in thread From: Cho KyongHo @ 2013-07-26 11:27 UTC (permalink / raw) To: 'Linux ARM Kernel', 'Linux IOMMU', 'Linux Kernel', 'Linux Samsung SOC' Cc: 'Hyunwoong Kim', 'Joerg Roedel', 'Kukjin Kim', 'Prathyush', 'Rahul Sharma', 'Subash Patel', 'Keyyoung Park', 'Grant Grundler', 'Antonios Motakis', kvmarm, 'Sachin Kamat', 'Thomas Abraham' This adds gate clocks of all System MMUs and their master IPs that are not apeared in clk-exynos5250.c Signed-off-by: Cho KyongHo <pullip.cho@samsung.com> --- .../devicetree/bindings/clock/exynos5250-clock.txt | 28 +++++++++- drivers/clk/samsung/clk-exynos5250.c | 57 ++++++++++++++++--- 2 files changed, 75 insertions(+), 10 deletions(-) diff --git a/Documentation/devicetree/bindings/clock/exynos5250-clock.txt b/Documentation/devicetree/bindings/clock/exynos5250-clock.txt index 781a627..df49694 100644 --- a/Documentation/devicetree/bindings/clock/exynos5250-clock.txt +++ b/Documentation/devicetree/bindings/clock/exynos5250-clock.txt @@ -154,7 +154,33 @@ clock which they consume. dsim0 341 dp 342 mixer 343 - hdmi 345 + hdmi 344 + camif_top 345 + smmu_fimc_lite0 346 + smmu_fimc_lite1 347 + smmu_fimc_lite2 348 + smmu_tv 349 + smmu_fimd1 350 + smmu_2d 351 + fimc_isp 352 + fimc_drc 353 + fimc_fd 354 + fimc_scc 355 + fimc_scp 356 + fimc_mcuctl 357 + fimc_odc 358 + fimc_dis 359 + fimc_3dnr 360 + smmu_fimc_isp 361 + smmu_fimc_drc 362 + smmu_fimc_fd 363 + smmu_fimc_scc 364 + smmu_fimc_scp 365 + smmu_fimc_mcuctl 366 + smmu_fimc_odc 367 + smmu_fimc_dis0 368 + smmu_fimc_dis1 369 + smmu_fimc_3dnr 370 Example 1: An example of a clock controller node is listed below. diff --git a/drivers/clk/samsung/clk-exynos5250.c b/drivers/clk/samsung/clk-exynos5250.c index 22d7699..e242bde 100644 --- a/drivers/clk/samsung/clk-exynos5250.c +++ b/drivers/clk/samsung/clk-exynos5250.c @@ -53,12 +53,15 @@ #define DIV_PERIC3 0x10564 #define DIV_PERIC4 0x10568 #define DIV_PERIC5 0x1056c +#define GATE_IP_ISP0 0x0C800 +#define GATE_IP_ISP1 0x0C800 #define GATE_IP_GSCL 0x10920 #define GATE_IP_MFC 0x1092c #define GATE_IP_GEN 0x10934 #define GATE_IP_FSYS 0x10944 #define GATE_IP_PERIC 0x10950 #define GATE_IP_PERIS 0x10960 +#define GATE_IP_ACP 0x18800 #define SRC_CDREX 0x20200 #define PLL_DIV2_SEL 0x20a24 #define GATE_IP_DISP1 0x10928 @@ -100,6 +103,14 @@ enum exynos5250_clks { tzpc2, tzpc3, tzpc4, tzpc5, tzpc6, tzpc7, tzpc8, tzpc9, hdmi_cec, mct, wdt, rtc, tmu, fimd1, mie1, dsim0, dp, mixer, hdmi, + camif_top, smmu_fimc_lite0, smmu_fimc_lite1, smmu_fimc_lite2, + smmu_tv, smmu_fimd1, smmu_2d, + fimc_isp, fimc_drc, fimc_fd, fimc_scc, fimc_scp, fimc_mcuctl, fimc_odc, + fimc_dis, fimc_3dnr, + smmu_fimc_isp, smmu_fimc_drc, smmu_fimc_fd, smmu_fimc_scc, + smmu_fimc_scp, smmu_fimc_mcuctl, smmu_fimc_odc, smmu_fimc_dis0, + smmu_fimc_dis1, smmu_fimc_3dnr, + nr_clks, }; @@ -320,19 +331,26 @@ struct samsung_gate_clock exynos5250_gate_clks[] __initdata = { GATE(gscl3, "gscl3", "aclk266", GATE_IP_GSCL, 3, 0, 0), GATE(gscl_wa, "gscl_wa", "div_gscl_wa", GATE_IP_GSCL, 5, 0, 0), GATE(gscl_wb, "gscl_wb", "div_gscl_wb", GATE_IP_GSCL, 6, 0, 0), - GATE(smmu_gscl0, "smmu_gscl0", "aclk266", GATE_IP_GSCL, 7, 0, 0), - GATE(smmu_gscl1, "smmu_gscl1", "aclk266", GATE_IP_GSCL, 8, 0, 0), - GATE(smmu_gscl2, "smmu_gscl2", "aclk266", GATE_IP_GSCL, 9, 0, 0), - GATE(smmu_gscl3, "smmu_gscl3", "aclk266", GATE_IP_GSCL, 10, 0, 0), + GATE(smmu_gscl0, "smmu_gscl0", "none", GATE_IP_GSCL, 7, 0, 0), + GATE(smmu_gscl1, "smmu_gscl1", "none", GATE_IP_GSCL, 8, 0, 0), + GATE(smmu_gscl2, "smmu_gscl2", "none", GATE_IP_GSCL, 9, 0, 0), + GATE(smmu_gscl3, "smmu_gscl3", "none", GATE_IP_GSCL, 10, 0, 0), + GATE(camif_top, "camif_top", "aclk266", GATE_IP_GSCL, 4, 0, 0), + GATE(smmu_fimc_lite0, "smmu_fimc_lite0", "none", + GATE_IP_GSCL, 12, 0, 0), + GATE(smmu_fimc_lite1, "smmu_fimc_lite1", "none", + GATE_IP_GSCL, 13, 0, 0), + GATE(smmu_fimc_lite2, "smmu_fimc_lite2", "none", + GATE_IP_GSCL, 14, 0, 0), GATE(mfc, "mfc", "aclk333", GATE_IP_MFC, 0, 0, 0), - GATE(smmu_mfcl, "smmu_mfcl", "aclk333", GATE_IP_MFC, 1, 0, 0), - GATE(smmu_mfcr, "smmu_mfcr", "aclk333", GATE_IP_MFC, 2, 0, 0), + GATE(smmu_mfcr, "smmu_mfcr", "none", GATE_IP_MFC, 1, 0, 0), + GATE(smmu_mfcl, "smmu_mfcl", "none", GATE_IP_MFC, 2, 0, 0), GATE(rotator, "rotator", "aclk266", GATE_IP_GEN, 1, 0, 0), GATE(jpeg, "jpeg", "aclk166", GATE_IP_GEN, 2, 0, 0), GATE(mdma1, "mdma1", "aclk266", GATE_IP_GEN, 4, 0, 0), - GATE(smmu_rotator, "smmu_rotator", "aclk266", GATE_IP_GEN, 6, 0, 0), - GATE(smmu_jpeg, "smmu_jpeg", "aclk166", GATE_IP_GEN, 7, 0, 0), - GATE(smmu_mdma1, "smmu_mdma1", "aclk266", GATE_IP_GEN, 9, 0, 0), + GATE(smmu_rotator, "smmu_rotator", "none", GATE_IP_GEN, 6, 0, 0), + GATE(smmu_jpeg, "smmu_jpeg", "none", GATE_IP_GEN, 7, 0, 0), + GATE(smmu_mdma1, "smmu_mdma1", "none", GATE_IP_GEN, 9, 0, 0), GATE(pdma0, "pdma0", "aclk200", GATE_IP_FSYS, 1, 0, 0), GATE(pdma1, "pdma1", "aclk200", GATE_IP_FSYS, 2, 0, 0), GATE(sata, "sata", "aclk200", GATE_IP_FSYS, 6, 0, 0), @@ -462,6 +480,27 @@ struct samsung_gate_clock exynos5250_gate_clks[] __initdata = { GATE(dp, "dp", "aclk200", GATE_IP_DISP1, 4, 0, 0), GATE(mixer, "mixer", "aclk200", GATE_IP_DISP1, 5, 0, 0), GATE(hdmi, "hdmi", "aclk200", GATE_IP_DISP1, 6, 0, 0), + GATE(smmu_tv, "smmu_tv", "none", GATE_IP_DISP1, 2, 0, 0), + GATE(smmu_fimd1, "smmu_fimd1", "none", GATE_IP_DISP1, 8, 0, 0), + + GATE(smmu_fimc_isp, "smmu_fimc_isp", "none", GATE_IP_ISP0, 8, 0, 0), + GATE(smmu_fimc_drc, "smmu_fimc_drc", "none", GATE_IP_ISP0, 9, 0, 0), + GATE(smmu_fimc_fd, "smmu_fimc_fd", "none", GATE_IP_ISP0, 10, 0, 0), + GATE(smmu_fimc_scc, "smmu_fimc_scc", "none", + GATE_IP_ISP0, 11, 0, 0), + GATE(smmu_fimc_scp, "smmu_fimc_scp", "none", + GATE_IP_ISP0, 12, 0, 0), + GATE(smmu_fimc_mcuctl, "smmu_fimc_mcuctl", "none", + GATE_IP_ISP0, 13, 0, 0), + GATE(smmu_fimc_odc, "smmu_fimc_odc", "none", GATE_IP_ISP1, 4, 0, 0), + GATE(smmu_fimc_dis0, "smmu_fimc_dis0", "none", + GATE_IP_ISP1, 5, 0, 0), + GATE(smmu_fimc_dis1, "smmu_fimc_dis1", "none", + GATE_IP_ISP1, 6, 0, 0), + GATE(smmu_fimc_3dnr, "smmu_fimc_3dnr", "none", + GATE_IP_ISP1, 7, 0, 0), + + GATE(smmu_2d, "smmu_2d", "none", GATE_IP_ACP, 7, 0, 0), }; static __initdata struct of_device_id ext_clk_match[] = { -- 1.7.2.5 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v8 05/12] clk: exynos5250: add gate clock descriptions of System MMU 2013-07-26 11:27 [PATCH v8 05/12] clk: exynos5250: add gate clock descriptions of System MMU Cho KyongHo @ 2013-07-26 20:01 ` Mike Turquette 2013-07-27 9:08 ` Cho KyongHo 0 siblings, 1 reply; 7+ messages in thread From: Mike Turquette @ 2013-07-26 20:01 UTC (permalink / raw) To: Cho KyongHo, 'Linux ARM Kernel', 'Linux IOMMU', 'Linux Kernel', 'Linux Samsung SOC' Cc: 'Kukjin Kim', 'Hyunwoong Kim', 'Prathyush', 'Grant Grundler', 'Joerg Roedel', 'Keyyoung Park', 'Subash Patel', 'Sachin Kamat', 'Thomas Abraham', 'Antonios Motakis', kvmarm, 'Rahul Sharma' Quoting Cho KyongHo (2013-07-26 04:27:54) > This adds gate clocks of all System MMUs and their master IPs > that are not apeared in clk-exynos5250.c > > Signed-off-by: Cho KyongHo <pullip.cho@samsung.com> Change looks good to me. Are you OK if I take it into the clk tree or do you want to keep this series together? Regards, Mike > --- > .../devicetree/bindings/clock/exynos5250-clock.txt | 28 +++++++++- > drivers/clk/samsung/clk-exynos5250.c | 57 ++++++++++++++++--- > 2 files changed, 75 insertions(+), 10 deletions(-) > > diff --git a/Documentation/devicetree/bindings/clock/exynos5250-clock.txt > b/Documentation/devicetree/bindings/clock/exynos5250-clock.txt > index 781a627..df49694 100644 > --- a/Documentation/devicetree/bindings/clock/exynos5250-clock.txt > +++ b/Documentation/devicetree/bindings/clock/exynos5250-clock.txt > @@ -154,7 +154,33 @@ clock which they consume. > dsim0 341 > dp 342 > mixer 343 > - hdmi 345 > + hdmi 344 > + camif_top 345 > + smmu_fimc_lite0 346 > + smmu_fimc_lite1 347 > + smmu_fimc_lite2 348 > + smmu_tv 349 > + smmu_fimd1 350 > + smmu_2d 351 > + fimc_isp 352 > + fimc_drc 353 > + fimc_fd 354 > + fimc_scc 355 > + fimc_scp 356 > + fimc_mcuctl 357 > + fimc_odc 358 > + fimc_dis 359 > + fimc_3dnr 360 > + smmu_fimc_isp 361 > + smmu_fimc_drc 362 > + smmu_fimc_fd 363 > + smmu_fimc_scc 364 > + smmu_fimc_scp 365 > + smmu_fimc_mcuctl 366 > + smmu_fimc_odc 367 > + smmu_fimc_dis0 368 > + smmu_fimc_dis1 369 > + smmu_fimc_3dnr 370 > > Example 1: An example of a clock controller node is listed below. > > diff --git a/drivers/clk/samsung/clk-exynos5250.c b/drivers/clk/samsung/clk-exynos5250.c > index 22d7699..e242bde 100644 > --- a/drivers/clk/samsung/clk-exynos5250.c > +++ b/drivers/clk/samsung/clk-exynos5250.c > @@ -53,12 +53,15 @@ > #define DIV_PERIC3 0x10564 > #define DIV_PERIC4 0x10568 > #define DIV_PERIC5 0x1056c > +#define GATE_IP_ISP0 0x0C800 > +#define GATE_IP_ISP1 0x0C800 > #define GATE_IP_GSCL 0x10920 > #define GATE_IP_MFC 0x1092c > #define GATE_IP_GEN 0x10934 > #define GATE_IP_FSYS 0x10944 > #define GATE_IP_PERIC 0x10950 > #define GATE_IP_PERIS 0x10960 > +#define GATE_IP_ACP 0x18800 > #define SRC_CDREX 0x20200 > #define PLL_DIV2_SEL 0x20a24 > #define GATE_IP_DISP1 0x10928 > @@ -100,6 +103,14 @@ enum exynos5250_clks { > tzpc2, tzpc3, tzpc4, tzpc5, tzpc6, tzpc7, tzpc8, tzpc9, hdmi_cec, mct, > wdt, rtc, tmu, fimd1, mie1, dsim0, dp, mixer, hdmi, > > + camif_top, smmu_fimc_lite0, smmu_fimc_lite1, smmu_fimc_lite2, > + smmu_tv, smmu_fimd1, smmu_2d, > + fimc_isp, fimc_drc, fimc_fd, fimc_scc, fimc_scp, fimc_mcuctl, fimc_odc, > + fimc_dis, fimc_3dnr, > + smmu_fimc_isp, smmu_fimc_drc, smmu_fimc_fd, smmu_fimc_scc, > + smmu_fimc_scp, smmu_fimc_mcuctl, smmu_fimc_odc, smmu_fimc_dis0, > + smmu_fimc_dis1, smmu_fimc_3dnr, > + > nr_clks, > }; > > @@ -320,19 +331,26 @@ struct samsung_gate_clock exynos5250_gate_clks[] __initdata = { > GATE(gscl3, "gscl3", "aclk266", GATE_IP_GSCL, 3, 0, 0), > GATE(gscl_wa, "gscl_wa", "div_gscl_wa", GATE_IP_GSCL, 5, 0, 0), > GATE(gscl_wb, "gscl_wb", "div_gscl_wb", GATE_IP_GSCL, 6, 0, 0), > - GATE(smmu_gscl0, "smmu_gscl0", "aclk266", GATE_IP_GSCL, 7, 0, 0), > - GATE(smmu_gscl1, "smmu_gscl1", "aclk266", GATE_IP_GSCL, 8, 0, 0), > - GATE(smmu_gscl2, "smmu_gscl2", "aclk266", GATE_IP_GSCL, 9, 0, 0), > - GATE(smmu_gscl3, "smmu_gscl3", "aclk266", GATE_IP_GSCL, 10, 0, 0), > + GATE(smmu_gscl0, "smmu_gscl0", "none", GATE_IP_GSCL, 7, 0, 0), > + GATE(smmu_gscl1, "smmu_gscl1", "none", GATE_IP_GSCL, 8, 0, 0), > + GATE(smmu_gscl2, "smmu_gscl2", "none", GATE_IP_GSCL, 9, 0, 0), > + GATE(smmu_gscl3, "smmu_gscl3", "none", GATE_IP_GSCL, 10, 0, 0), > + GATE(camif_top, "camif_top", "aclk266", GATE_IP_GSCL, 4, 0, 0), > + GATE(smmu_fimc_lite0, "smmu_fimc_lite0", "none", > + GATE_IP_GSCL, 12, 0, 0), > + GATE(smmu_fimc_lite1, "smmu_fimc_lite1", "none", > + GATE_IP_GSCL, 13, 0, 0), > + GATE(smmu_fimc_lite2, "smmu_fimc_lite2", "none", > + GATE_IP_GSCL, 14, 0, 0), > GATE(mfc, "mfc", "aclk333", GATE_IP_MFC, 0, 0, 0), > - GATE(smmu_mfcl, "smmu_mfcl", "aclk333", GATE_IP_MFC, 1, 0, 0), > - GATE(smmu_mfcr, "smmu_mfcr", "aclk333", GATE_IP_MFC, 2, 0, 0), > + GATE(smmu_mfcr, "smmu_mfcr", "none", GATE_IP_MFC, 1, 0, 0), > + GATE(smmu_mfcl, "smmu_mfcl", "none", GATE_IP_MFC, 2, 0, 0), > GATE(rotator, "rotator", "aclk266", GATE_IP_GEN, 1, 0, 0), > GATE(jpeg, "jpeg", "aclk166", GATE_IP_GEN, 2, 0, 0), > GATE(mdma1, "mdma1", "aclk266", GATE_IP_GEN, 4, 0, 0), > - GATE(smmu_rotator, "smmu_rotator", "aclk266", GATE_IP_GEN, 6, 0, 0), > - GATE(smmu_jpeg, "smmu_jpeg", "aclk166", GATE_IP_GEN, 7, 0, 0), > - GATE(smmu_mdma1, "smmu_mdma1", "aclk266", GATE_IP_GEN, 9, 0, 0), > + GATE(smmu_rotator, "smmu_rotator", "none", GATE_IP_GEN, 6, 0, 0), > + GATE(smmu_jpeg, "smmu_jpeg", "none", GATE_IP_GEN, 7, 0, 0), > + GATE(smmu_mdma1, "smmu_mdma1", "none", GATE_IP_GEN, 9, 0, 0), > GATE(pdma0, "pdma0", "aclk200", GATE_IP_FSYS, 1, 0, 0), > GATE(pdma1, "pdma1", "aclk200", GATE_IP_FSYS, 2, 0, 0), > GATE(sata, "sata", "aclk200", GATE_IP_FSYS, 6, 0, 0), > @@ -462,6 +480,27 @@ struct samsung_gate_clock exynos5250_gate_clks[] __initdata = { > GATE(dp, "dp", "aclk200", GATE_IP_DISP1, 4, 0, 0), > GATE(mixer, "mixer", "aclk200", GATE_IP_DISP1, 5, 0, 0), > GATE(hdmi, "hdmi", "aclk200", GATE_IP_DISP1, 6, 0, 0), > + GATE(smmu_tv, "smmu_tv", "none", GATE_IP_DISP1, 2, 0, 0), > + GATE(smmu_fimd1, "smmu_fimd1", "none", GATE_IP_DISP1, 8, 0, 0), > + > + GATE(smmu_fimc_isp, "smmu_fimc_isp", "none", GATE_IP_ISP0, 8, 0, 0), > + GATE(smmu_fimc_drc, "smmu_fimc_drc", "none", GATE_IP_ISP0, 9, 0, 0), > + GATE(smmu_fimc_fd, "smmu_fimc_fd", "none", GATE_IP_ISP0, 10, 0, 0), > + GATE(smmu_fimc_scc, "smmu_fimc_scc", "none", > + GATE_IP_ISP0, 11, 0, 0), > + GATE(smmu_fimc_scp, "smmu_fimc_scp", "none", > + GATE_IP_ISP0, 12, 0, 0), > + GATE(smmu_fimc_mcuctl, "smmu_fimc_mcuctl", "none", > + GATE_IP_ISP0, 13, 0, 0), > + GATE(smmu_fimc_odc, "smmu_fimc_odc", "none", GATE_IP_ISP1, 4, 0, 0), > + GATE(smmu_fimc_dis0, "smmu_fimc_dis0", "none", > + GATE_IP_ISP1, 5, 0, 0), > + GATE(smmu_fimc_dis1, "smmu_fimc_dis1", "none", > + GATE_IP_ISP1, 6, 0, 0), > + GATE(smmu_fimc_3dnr, "smmu_fimc_3dnr", "none", > + GATE_IP_ISP1, 7, 0, 0), > + > + GATE(smmu_2d, "smmu_2d", "none", GATE_IP_ACP, 7, 0, 0), > }; > > static __initdata struct of_device_id ext_clk_match[] = { > -- > 1.7.2.5 > > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 7+ messages in thread
* RE: [PATCH v8 05/12] clk: exynos5250: add gate clock descriptions of System MMU 2013-07-26 20:01 ` Mike Turquette @ 2013-07-27 9:08 ` Cho KyongHo 2013-07-30 6:46 ` Mike Turquette 0 siblings, 1 reply; 7+ messages in thread From: Cho KyongHo @ 2013-07-27 9:08 UTC (permalink / raw) To: 'Mike Turquette', 'Linux ARM Kernel', 'Linux IOMMU', 'Linux Kernel', 'Linux Samsung SOC' Cc: 'Kukjin Kim', 'Hyunwoong Kim', 'Prathyush', 'Grant Grundler', 'Joerg Roedel', 'Keyyoung Park', 'Subash Patel', 'Sachin Kamat', 'Thomas Abraham', 'Antonios Motakis', kvmarm, 'Rahul Sharma' > -----Original Message----- > From: Mike Turquette [mailto:mturquette@linaro.org] > Sent: Saturday, July 27, 2013 5:01 AM > > Quoting Cho KyongHo (2013-07-26 04:27:54) > > This adds gate clocks of all System MMUs and their master IPs > > that are not apeared in clk-exynos5250.c > > > > Signed-off-by: Cho KyongHo <pullip.cho@samsung.com> > > Change looks good to me. Are you OK if I take it into the clk tree or do > you want to keep this series together? I would like you to pick this to your tree and let me know which branch contains this patch. Then I will remove this from my patch series. Thank you, Cho KyongHo. > > Regards, > Mike > > > --- > > .../devicetree/bindings/clock/exynos5250-clock.txt | 28 +++++++++- > > drivers/clk/samsung/clk-exynos5250.c | 57 ++++++++++++++++--- > > 2 files changed, 75 insertions(+), 10 deletions(-) > > > > diff --git a/Documentation/devicetree/bindings/clock/exynos5250-clock.txt > > b/Documentation/devicetree/bindings/clock/exynos5250-clock.txt > > index 781a627..df49694 100644 > > --- a/Documentation/devicetree/bindings/clock/exynos5250-clock.txt > > +++ b/Documentation/devicetree/bindings/clock/exynos5250-clock.txt > > @@ -154,7 +154,33 @@ clock which they consume. > > dsim0 341 > > dp 342 > > mixer 343 > > - hdmi 345 > > + hdmi 344 > > + camif_top 345 > > + smmu_fimc_lite0 346 > > + smmu_fimc_lite1 347 > > + smmu_fimc_lite2 348 > > + smmu_tv 349 > > + smmu_fimd1 350 > > + smmu_2d 351 > > + fimc_isp 352 > > + fimc_drc 353 > > + fimc_fd 354 > > + fimc_scc 355 > > + fimc_scp 356 > > + fimc_mcuctl 357 > > + fimc_odc 358 > > + fimc_dis 359 > > + fimc_3dnr 360 > > + smmu_fimc_isp 361 > > + smmu_fimc_drc 362 > > + smmu_fimc_fd 363 > > + smmu_fimc_scc 364 > > + smmu_fimc_scp 365 > > + smmu_fimc_mcuctl 366 > > + smmu_fimc_odc 367 > > + smmu_fimc_dis0 368 > > + smmu_fimc_dis1 369 > > + smmu_fimc_3dnr 370 > > > > Example 1: An example of a clock controller node is listed below. > > > > diff --git a/drivers/clk/samsung/clk-exynos5250.c b/drivers/clk/samsung/clk-exynos5250.c > > index 22d7699..e242bde 100644 > > --- a/drivers/clk/samsung/clk-exynos5250.c > > +++ b/drivers/clk/samsung/clk-exynos5250.c > > @@ -53,12 +53,15 @@ > > #define DIV_PERIC3 0x10564 > > #define DIV_PERIC4 0x10568 > > #define DIV_PERIC5 0x1056c > > +#define GATE_IP_ISP0 0x0C800 > > +#define GATE_IP_ISP1 0x0C800 > > #define GATE_IP_GSCL 0x10920 > > #define GATE_IP_MFC 0x1092c > > #define GATE_IP_GEN 0x10934 > > #define GATE_IP_FSYS 0x10944 > > #define GATE_IP_PERIC 0x10950 > > #define GATE_IP_PERIS 0x10960 > > +#define GATE_IP_ACP 0x18800 > > #define SRC_CDREX 0x20200 > > #define PLL_DIV2_SEL 0x20a24 > > #define GATE_IP_DISP1 0x10928 > > @@ -100,6 +103,14 @@ enum exynos5250_clks { > > tzpc2, tzpc3, tzpc4, tzpc5, tzpc6, tzpc7, tzpc8, tzpc9, hdmi_cec, mct, > > wdt, rtc, tmu, fimd1, mie1, dsim0, dp, mixer, hdmi, > > > > + camif_top, smmu_fimc_lite0, smmu_fimc_lite1, smmu_fimc_lite2, > > + smmu_tv, smmu_fimd1, smmu_2d, > > + fimc_isp, fimc_drc, fimc_fd, fimc_scc, fimc_scp, fimc_mcuctl, fimc_odc, > > + fimc_dis, fimc_3dnr, > > + smmu_fimc_isp, smmu_fimc_drc, smmu_fimc_fd, smmu_fimc_scc, > > + smmu_fimc_scp, smmu_fimc_mcuctl, smmu_fimc_odc, smmu_fimc_dis0, > > + smmu_fimc_dis1, smmu_fimc_3dnr, > > + > > nr_clks, > > }; > > > > @@ -320,19 +331,26 @@ struct samsung_gate_clock exynos5250_gate_clks[] __initdata = { > > GATE(gscl3, "gscl3", "aclk266", GATE_IP_GSCL, 3, 0, 0), > > GATE(gscl_wa, "gscl_wa", "div_gscl_wa", GATE_IP_GSCL, 5, 0, 0), > > GATE(gscl_wb, "gscl_wb", "div_gscl_wb", GATE_IP_GSCL, 6, 0, 0), > > - GATE(smmu_gscl0, "smmu_gscl0", "aclk266", GATE_IP_GSCL, 7, 0, 0), > > - GATE(smmu_gscl1, "smmu_gscl1", "aclk266", GATE_IP_GSCL, 8, 0, 0), > > - GATE(smmu_gscl2, "smmu_gscl2", "aclk266", GATE_IP_GSCL, 9, 0, 0), > > - GATE(smmu_gscl3, "smmu_gscl3", "aclk266", GATE_IP_GSCL, 10, 0, 0), > > + GATE(smmu_gscl0, "smmu_gscl0", "none", GATE_IP_GSCL, 7, 0, 0), > > + GATE(smmu_gscl1, "smmu_gscl1", "none", GATE_IP_GSCL, 8, 0, 0), > > + GATE(smmu_gscl2, "smmu_gscl2", "none", GATE_IP_GSCL, 9, 0, 0), > > + GATE(smmu_gscl3, "smmu_gscl3", "none", GATE_IP_GSCL, 10, 0, 0), > > + GATE(camif_top, "camif_top", "aclk266", GATE_IP_GSCL, 4, 0, 0), > > + GATE(smmu_fimc_lite0, "smmu_fimc_lite0", "none", > > + GATE_IP_GSCL, 12, 0, 0), > > + GATE(smmu_fimc_lite1, "smmu_fimc_lite1", "none", > > + GATE_IP_GSCL, 13, 0, 0), > > + GATE(smmu_fimc_lite2, "smmu_fimc_lite2", "none", > > + GATE_IP_GSCL, 14, 0, 0), > > GATE(mfc, "mfc", "aclk333", GATE_IP_MFC, 0, 0, 0), > > - GATE(smmu_mfcl, "smmu_mfcl", "aclk333", GATE_IP_MFC, 1, 0, 0), > > - GATE(smmu_mfcr, "smmu_mfcr", "aclk333", GATE_IP_MFC, 2, 0, 0), > > + GATE(smmu_mfcr, "smmu_mfcr", "none", GATE_IP_MFC, 1, 0, 0), > > + GATE(smmu_mfcl, "smmu_mfcl", "none", GATE_IP_MFC, 2, 0, 0), > > GATE(rotator, "rotator", "aclk266", GATE_IP_GEN, 1, 0, 0), > > GATE(jpeg, "jpeg", "aclk166", GATE_IP_GEN, 2, 0, 0), > > GATE(mdma1, "mdma1", "aclk266", GATE_IP_GEN, 4, 0, 0), > > - GATE(smmu_rotator, "smmu_rotator", "aclk266", GATE_IP_GEN, 6, 0, 0), > > - GATE(smmu_jpeg, "smmu_jpeg", "aclk166", GATE_IP_GEN, 7, 0, 0), > > - GATE(smmu_mdma1, "smmu_mdma1", "aclk266", GATE_IP_GEN, 9, 0, 0), > > + GATE(smmu_rotator, "smmu_rotator", "none", GATE_IP_GEN, 6, 0, 0), > > + GATE(smmu_jpeg, "smmu_jpeg", "none", GATE_IP_GEN, 7, 0, 0), > > + GATE(smmu_mdma1, "smmu_mdma1", "none", GATE_IP_GEN, 9, 0, 0), > > GATE(pdma0, "pdma0", "aclk200", GATE_IP_FSYS, 1, 0, 0), > > GATE(pdma1, "pdma1", "aclk200", GATE_IP_FSYS, 2, 0, 0), > > GATE(sata, "sata", "aclk200", GATE_IP_FSYS, 6, 0, 0), > > @@ -462,6 +480,27 @@ struct samsung_gate_clock exynos5250_gate_clks[] __initdata = { > > GATE(dp, "dp", "aclk200", GATE_IP_DISP1, 4, 0, 0), > > GATE(mixer, "mixer", "aclk200", GATE_IP_DISP1, 5, 0, 0), > > GATE(hdmi, "hdmi", "aclk200", GATE_IP_DISP1, 6, 0, 0), > > + GATE(smmu_tv, "smmu_tv", "none", GATE_IP_DISP1, 2, 0, 0), > > + GATE(smmu_fimd1, "smmu_fimd1", "none", GATE_IP_DISP1, 8, 0, 0), > > + > > + GATE(smmu_fimc_isp, "smmu_fimc_isp", "none", GATE_IP_ISP0, 8, 0, 0), > > + GATE(smmu_fimc_drc, "smmu_fimc_drc", "none", GATE_IP_ISP0, 9, 0, 0), > > + GATE(smmu_fimc_fd, "smmu_fimc_fd", "none", GATE_IP_ISP0, 10, 0, 0), > > + GATE(smmu_fimc_scc, "smmu_fimc_scc", "none", > > + GATE_IP_ISP0, 11, 0, 0), > > + GATE(smmu_fimc_scp, "smmu_fimc_scp", "none", > > + GATE_IP_ISP0, 12, 0, 0), > > + GATE(smmu_fimc_mcuctl, "smmu_fimc_mcuctl", "none", > > + GATE_IP_ISP0, 13, 0, 0), > > + GATE(smmu_fimc_odc, "smmu_fimc_odc", "none", GATE_IP_ISP1, 4, 0, 0), > > + GATE(smmu_fimc_dis0, "smmu_fimc_dis0", "none", > > + GATE_IP_ISP1, 5, 0, 0), > > + GATE(smmu_fimc_dis1, "smmu_fimc_dis1", "none", > > + GATE_IP_ISP1, 6, 0, 0), > > + GATE(smmu_fimc_3dnr, "smmu_fimc_3dnr", "none", > > + GATE_IP_ISP1, 7, 0, 0), > > + > > + GATE(smmu_2d, "smmu_2d", "none", GATE_IP_ACP, 7, 0, 0), > > }; > > > > static __initdata struct of_device_id ext_clk_match[] = { > > -- > > 1.7.2.5 > > > > > > > > _______________________________________________ > > linux-arm-kernel mailing list > > linux-arm-kernel@lists.infradead.org > > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: RE: [PATCH v8 05/12] clk: exynos5250: add gate clock descriptions of System MMU 2013-07-27 9:08 ` Cho KyongHo @ 2013-07-30 6:46 ` Mike Turquette 2013-07-30 11:17 ` Cho KyongHo 0 siblings, 1 reply; 7+ messages in thread From: Mike Turquette @ 2013-07-30 6:46 UTC (permalink / raw) To: Cho KyongHo, 'Linux ARM Kernel', 'Linux IOMMU', 'Linux Kernel', 'Linux Samsung SOC' Cc: 'Kukjin Kim', 'Hyunwoong Kim', 'Prathyush', 'Grant Grundler', 'Joerg Roedel', 'Keyyoung Park', 'Subash Patel', 'Sachin Kamat', 'Thomas Abraham', 'Antonios Motakis', kvmarm, 'Rahul Sharma' Quoting Cho KyongHo (2013-07-27 02:08:11) > > -----Original Message----- > > From: Mike Turquette [mailto:mturquette@linaro.org] > > Sent: Saturday, July 27, 2013 5:01 AM > > > > Quoting Cho KyongHo (2013-07-26 04:27:54) > > > This adds gate clocks of all System MMUs and their master IPs > > > that are not apeared in clk-exynos5250.c > > > > > > Signed-off-by: Cho KyongHo <pullip.cho@samsung.com> > > > > Change looks good to me. Are you OK if I take it into the clk tree or do > > you want to keep this series together? > > I would like you to pick this to your tree and let me know which branch > contains this patch. > Then I will remove this from my patch series. camif_top corresponds to 345 in your patch, but this conflicts the g2d clock introduced in patch "clk: exynos5250: Add G2D gate clock" in the clk tree. I've pushed out the latest clk-next branch with this change: git://git.linaro.org/people/mturquette/linux.git clk-next Can you rebase your change on top of this and resolve the clock id mapping? Thanks, Mike > > Thank you, > Cho KyongHo. > > > > Regards, > > Mike > > > > > --- > > > .../devicetree/bindings/clock/exynos5250-clock.txt | 28 +++++++++- > > > drivers/clk/samsung/clk-exynos5250.c | 57 ++++++++++++++++--- > > > 2 files changed, 75 insertions(+), 10 deletions(-) > > > > > > diff --git a/Documentation/devicetree/bindings/clock/exynos5250-clock.txt > > > b/Documentation/devicetree/bindings/clock/exynos5250-clock.txt > > > index 781a627..df49694 100644 > > > --- a/Documentation/devicetree/bindings/clock/exynos5250-clock.txt > > > +++ b/Documentation/devicetree/bindings/clock/exynos5250-clock.txt > > > @@ -154,7 +154,33 @@ clock which they consume. > > > dsim0 341 > > > dp 342 > > > mixer 343 > > > - hdmi 345 > > > + hdmi 344 > > > + camif_top 345 > > > + smmu_fimc_lite0 346 > > > + smmu_fimc_lite1 347 > > > + smmu_fimc_lite2 348 > > > + smmu_tv 349 > > > + smmu_fimd1 350 > > > + smmu_2d 351 > > > + fimc_isp 352 > > > + fimc_drc 353 > > > + fimc_fd 354 > > > + fimc_scc 355 > > > + fimc_scp 356 > > > + fimc_mcuctl 357 > > > + fimc_odc 358 > > > + fimc_dis 359 > > > + fimc_3dnr 360 > > > + smmu_fimc_isp 361 > > > + smmu_fimc_drc 362 > > > + smmu_fimc_fd 363 > > > + smmu_fimc_scc 364 > > > + smmu_fimc_scp 365 > > > + smmu_fimc_mcuctl 366 > > > + smmu_fimc_odc 367 > > > + smmu_fimc_dis0 368 > > > + smmu_fimc_dis1 369 > > > + smmu_fimc_3dnr 370 > > > > > > Example 1: An example of a clock controller node is listed below. > > > > > > diff --git a/drivers/clk/samsung/clk-exynos5250.c b/drivers/clk/samsung/clk-exynos5250.c > > > index 22d7699..e242bde 100644 > > > --- a/drivers/clk/samsung/clk-exynos5250.c > > > +++ b/drivers/clk/samsung/clk-exynos5250.c > > > @@ -53,12 +53,15 @@ > > > #define DIV_PERIC3 0x10564 > > > #define DIV_PERIC4 0x10568 > > > #define DIV_PERIC5 0x1056c > > > +#define GATE_IP_ISP0 0x0C800 > > > +#define GATE_IP_ISP1 0x0C800 > > > #define GATE_IP_GSCL 0x10920 > > > #define GATE_IP_MFC 0x1092c > > > #define GATE_IP_GEN 0x10934 > > > #define GATE_IP_FSYS 0x10944 > > > #define GATE_IP_PERIC 0x10950 > > > #define GATE_IP_PERIS 0x10960 > > > +#define GATE_IP_ACP 0x18800 > > > #define SRC_CDREX 0x20200 > > > #define PLL_DIV2_SEL 0x20a24 > > > #define GATE_IP_DISP1 0x10928 > > > @@ -100,6 +103,14 @@ enum exynos5250_clks { > > > tzpc2, tzpc3, tzpc4, tzpc5, tzpc6, tzpc7, tzpc8, tzpc9, hdmi_cec, mct, > > > wdt, rtc, tmu, fimd1, mie1, dsim0, dp, mixer, hdmi, > > > > > > + camif_top, smmu_fimc_lite0, smmu_fimc_lite1, smmu_fimc_lite2, > > > + smmu_tv, smmu_fimd1, smmu_2d, > > > + fimc_isp, fimc_drc, fimc_fd, fimc_scc, fimc_scp, fimc_mcuctl, fimc_odc, > > > + fimc_dis, fimc_3dnr, > > > + smmu_fimc_isp, smmu_fimc_drc, smmu_fimc_fd, smmu_fimc_scc, > > > + smmu_fimc_scp, smmu_fimc_mcuctl, smmu_fimc_odc, smmu_fimc_dis0, > > > + smmu_fimc_dis1, smmu_fimc_3dnr, > > > + > > > nr_clks, > > > }; > > > > > > @@ -320,19 +331,26 @@ struct samsung_gate_clock exynos5250_gate_clks[] __initdata = { > > > GATE(gscl3, "gscl3", "aclk266", GATE_IP_GSCL, 3, 0, 0), > > > GATE(gscl_wa, "gscl_wa", "div_gscl_wa", GATE_IP_GSCL, 5, 0, 0), > > > GATE(gscl_wb, "gscl_wb", "div_gscl_wb", GATE_IP_GSCL, 6, 0, 0), > > > - GATE(smmu_gscl0, "smmu_gscl0", "aclk266", GATE_IP_GSCL, 7, 0, 0), > > > - GATE(smmu_gscl1, "smmu_gscl1", "aclk266", GATE_IP_GSCL, 8, 0, 0), > > > - GATE(smmu_gscl2, "smmu_gscl2", "aclk266", GATE_IP_GSCL, 9, 0, 0), > > > - GATE(smmu_gscl3, "smmu_gscl3", "aclk266", GATE_IP_GSCL, 10, 0, 0), > > > + GATE(smmu_gscl0, "smmu_gscl0", "none", GATE_IP_GSCL, 7, 0, 0), > > > + GATE(smmu_gscl1, "smmu_gscl1", "none", GATE_IP_GSCL, 8, 0, 0), > > > + GATE(smmu_gscl2, "smmu_gscl2", "none", GATE_IP_GSCL, 9, 0, 0), > > > + GATE(smmu_gscl3, "smmu_gscl3", "none", GATE_IP_GSCL, 10, 0, 0), > > > + GATE(camif_top, "camif_top", "aclk266", GATE_IP_GSCL, 4, 0, 0), > > > + GATE(smmu_fimc_lite0, "smmu_fimc_lite0", "none", > > > + GATE_IP_GSCL, 12, 0, 0), > > > + GATE(smmu_fimc_lite1, "smmu_fimc_lite1", "none", > > > + GATE_IP_GSCL, 13, 0, 0), > > > + GATE(smmu_fimc_lite2, "smmu_fimc_lite2", "none", > > > + GATE_IP_GSCL, 14, 0, 0), > > > GATE(mfc, "mfc", "aclk333", GATE_IP_MFC, 0, 0, 0), > > > - GATE(smmu_mfcl, "smmu_mfcl", "aclk333", GATE_IP_MFC, 1, 0, 0), > > > - GATE(smmu_mfcr, "smmu_mfcr", "aclk333", GATE_IP_MFC, 2, 0, 0), > > > + GATE(smmu_mfcr, "smmu_mfcr", "none", GATE_IP_MFC, 1, 0, 0), > > > + GATE(smmu_mfcl, "smmu_mfcl", "none", GATE_IP_MFC, 2, 0, 0), > > > GATE(rotator, "rotator", "aclk266", GATE_IP_GEN, 1, 0, 0), > > > GATE(jpeg, "jpeg", "aclk166", GATE_IP_GEN, 2, 0, 0), > > > GATE(mdma1, "mdma1", "aclk266", GATE_IP_GEN, 4, 0, 0), > > > - GATE(smmu_rotator, "smmu_rotator", "aclk266", GATE_IP_GEN, 6, 0, 0), > > > - GATE(smmu_jpeg, "smmu_jpeg", "aclk166", GATE_IP_GEN, 7, 0, 0), > > > - GATE(smmu_mdma1, "smmu_mdma1", "aclk266", GATE_IP_GEN, 9, 0, 0), > > > + GATE(smmu_rotator, "smmu_rotator", "none", GATE_IP_GEN, 6, 0, 0), > > > + GATE(smmu_jpeg, "smmu_jpeg", "none", GATE_IP_GEN, 7, 0, 0), > > > + GATE(smmu_mdma1, "smmu_mdma1", "none", GATE_IP_GEN, 9, 0, 0), > > > GATE(pdma0, "pdma0", "aclk200", GATE_IP_FSYS, 1, 0, 0), > > > GATE(pdma1, "pdma1", "aclk200", GATE_IP_FSYS, 2, 0, 0), > > > GATE(sata, "sata", "aclk200", GATE_IP_FSYS, 6, 0, 0), > > > @@ -462,6 +480,27 @@ struct samsung_gate_clock exynos5250_gate_clks[] __initdata = { > > > GATE(dp, "dp", "aclk200", GATE_IP_DISP1, 4, 0, 0), > > > GATE(mixer, "mixer", "aclk200", GATE_IP_DISP1, 5, 0, 0), > > > GATE(hdmi, "hdmi", "aclk200", GATE_IP_DISP1, 6, 0, 0), > > > + GATE(smmu_tv, "smmu_tv", "none", GATE_IP_DISP1, 2, 0, 0), > > > + GATE(smmu_fimd1, "smmu_fimd1", "none", GATE_IP_DISP1, 8, 0, 0), > > > + > > > + GATE(smmu_fimc_isp, "smmu_fimc_isp", "none", GATE_IP_ISP0, 8, 0, 0), > > > + GATE(smmu_fimc_drc, "smmu_fimc_drc", "none", GATE_IP_ISP0, 9, 0, 0), > > > + GATE(smmu_fimc_fd, "smmu_fimc_fd", "none", GATE_IP_ISP0, 10, 0, 0), > > > + GATE(smmu_fimc_scc, "smmu_fimc_scc", "none", > > > + GATE_IP_ISP0, 11, 0, 0), > > > + GATE(smmu_fimc_scp, "smmu_fimc_scp", "none", > > > + GATE_IP_ISP0, 12, 0, 0), > > > + GATE(smmu_fimc_mcuctl, "smmu_fimc_mcuctl", "none", > > > + GATE_IP_ISP0, 13, 0, 0), > > > + GATE(smmu_fimc_odc, "smmu_fimc_odc", "none", GATE_IP_ISP1, 4, 0, 0), > > > + GATE(smmu_fimc_dis0, "smmu_fimc_dis0", "none", > > > + GATE_IP_ISP1, 5, 0, 0), > > > + GATE(smmu_fimc_dis1, "smmu_fimc_dis1", "none", > > > + GATE_IP_ISP1, 6, 0, 0), > > > + GATE(smmu_fimc_3dnr, "smmu_fimc_3dnr", "none", > > > + GATE_IP_ISP1, 7, 0, 0), > > > + > > > + GATE(smmu_2d, "smmu_2d", "none", GATE_IP_ACP, 7, 0, 0), > > > }; > > > > > > static __initdata struct of_device_id ext_clk_match[] = { > > > -- > > > 1.7.2.5 > > > > > > > > > > > > _______________________________________________ > > > linux-arm-kernel mailing list > > > linux-arm-kernel@lists.infradead.org > > > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 7+ messages in thread
* RE: RE: [PATCH v8 05/12] clk: exynos5250: add gate clock descriptions of System MMU 2013-07-30 6:46 ` Mike Turquette @ 2013-07-30 11:17 ` Cho KyongHo 2013-08-01 10:21 ` Rahul Sharma 0 siblings, 1 reply; 7+ messages in thread From: Cho KyongHo @ 2013-07-30 11:17 UTC (permalink / raw) To: 'Mike Turquette', 'Linux ARM Kernel', 'Linux IOMMU', 'Linux Kernel', 'Linux Samsung SOC' Cc: 'Kukjin Kim', 'Hyunwoong Kim', 'Prathyush', 'Grant Grundler', 'Joerg Roedel', 'Keyyoung Park', 'Subash Patel', 'Sachin Kamat', 'Thomas Abraham', 'Antonios Motakis', kvmarm, 'Rahul Sharma' > -----Original Message----- > From: Mike Turquette [mailto:mturquette@linaro.org] > Sent: Tuesday, July 30, 2013 3:47 PM > To: Cho KyongHo; 'Linux ARM Kernel'; 'Linux IOMMU'; 'Linux Kernel'; 'Linux Samsung SOC' > Cc: 'Kukjin Kim'; 'Hyunwoong Kim'; 'Prathyush'; 'Grant Grundler'; 'Joerg Roedel'; 'Keyyoung Park'; > 'Subash Patel'; 'Sachin Kamat'; 'Thomas Abraham'; 'Antonios Motakis'; kvmarm@lists.cs.columbia.edu; > 'Rahul Sharma' > Subject: Re: RE: [PATCH v8 05/12] clk: exynos5250: add gate clock descriptions of System MMU > > Quoting Cho KyongHo (2013-07-27 02:08:11) > > > -----Original Message----- > > > From: Mike Turquette [mailto:mturquette@linaro.org] > > > Sent: Saturday, July 27, 2013 5:01 AM > > > > > > Quoting Cho KyongHo (2013-07-26 04:27:54) > > > > This adds gate clocks of all System MMUs and their master IPs > > > > that are not apeared in clk-exynos5250.c > > > > > > > > Signed-off-by: Cho KyongHo <pullip.cho@samsung.com> > > > > > > Change looks good to me. Are you OK if I take it into the clk tree or do > > > you want to keep this series together? > > > > I would like you to pick this to your tree and let me know which branch > > contains this patch. > > Then I will remove this from my patch series. > > camif_top corresponds to 345 in your patch, but this conflicts the g2d > clock introduced in patch "clk: exynos5250: Add G2D gate clock" in the > clk tree. I've pushed out the latest clk-next branch with this change: > > git://git.linaro.org/people/mturquette/linux.git clk-next > > Can you rebase your change on top of this and resolve the clock id > mapping? > Oh, I will rebase this patch on your git in the next patch version. Thank you. > Thanks, > Mike > > > > > Thank you, > > Cho KyongHo. > > > > > > Regards, > > > Mike > > > > > > > --- > > > > .../devicetree/bindings/clock/exynos5250-clock.txt | 28 +++++++++- > > > > drivers/clk/samsung/clk-exynos5250.c | 57 ++++++++++++++++--- > > > > 2 files changed, 75 insertions(+), 10 deletions(-) > > > > > > > > diff --git a/Documentation/devicetree/bindings/clock/exynos5250-clock.txt > > > > b/Documentation/devicetree/bindings/clock/exynos5250-clock.txt > > > > index 781a627..df49694 100644 > > > > --- a/Documentation/devicetree/bindings/clock/exynos5250-clock.txt > > > > +++ b/Documentation/devicetree/bindings/clock/exynos5250-clock.txt > > > > @@ -154,7 +154,33 @@ clock which they consume. > > > > dsim0 341 > > > > dp 342 > > > > mixer 343 > > > > - hdmi 345 > > > > + hdmi 344 > > > > + camif_top 345 > > > > + smmu_fimc_lite0 346 > > > > + smmu_fimc_lite1 347 > > > > + smmu_fimc_lite2 348 > > > > + smmu_tv 349 > > > > + smmu_fimd1 350 > > > > + smmu_2d 351 > > > > + fimc_isp 352 > > > > + fimc_drc 353 > > > > + fimc_fd 354 > > > > + fimc_scc 355 > > > > + fimc_scp 356 > > > > + fimc_mcuctl 357 > > > > + fimc_odc 358 > > > > + fimc_dis 359 > > > > + fimc_3dnr 360 > > > > + smmu_fimc_isp 361 > > > > + smmu_fimc_drc 362 > > > > + smmu_fimc_fd 363 > > > > + smmu_fimc_scc 364 > > > > + smmu_fimc_scp 365 > > > > + smmu_fimc_mcuctl 366 > > > > + smmu_fimc_odc 367 > > > > + smmu_fimc_dis0 368 > > > > + smmu_fimc_dis1 369 > > > > + smmu_fimc_3dnr 370 > > > > > > > > Example 1: An example of a clock controller node is listed below. > > > > > > > > diff --git a/drivers/clk/samsung/clk-exynos5250.c b/drivers/clk/samsung/clk-exynos5250.c > > > > index 22d7699..e242bde 100644 > > > > --- a/drivers/clk/samsung/clk-exynos5250.c > > > > +++ b/drivers/clk/samsung/clk-exynos5250.c > > > > @@ -53,12 +53,15 @@ > > > > #define DIV_PERIC3 0x10564 > > > > #define DIV_PERIC4 0x10568 > > > > #define DIV_PERIC5 0x1056c > > > > +#define GATE_IP_ISP0 0x0C800 > > > > +#define GATE_IP_ISP1 0x0C800 > > > > #define GATE_IP_GSCL 0x10920 > > > > #define GATE_IP_MFC 0x1092c > > > > #define GATE_IP_GEN 0x10934 > > > > #define GATE_IP_FSYS 0x10944 > > > > #define GATE_IP_PERIC 0x10950 > > > > #define GATE_IP_PERIS 0x10960 > > > > +#define GATE_IP_ACP 0x18800 > > > > #define SRC_CDREX 0x20200 > > > > #define PLL_DIV2_SEL 0x20a24 > > > > #define GATE_IP_DISP1 0x10928 > > > > @@ -100,6 +103,14 @@ enum exynos5250_clks { > > > > tzpc2, tzpc3, tzpc4, tzpc5, tzpc6, tzpc7, tzpc8, tzpc9, hdmi_cec, mct, > > > > wdt, rtc, tmu, fimd1, mie1, dsim0, dp, mixer, hdmi, > > > > > > > > + camif_top, smmu_fimc_lite0, smmu_fimc_lite1, smmu_fimc_lite2, > > > > + smmu_tv, smmu_fimd1, smmu_2d, > > > > + fimc_isp, fimc_drc, fimc_fd, fimc_scc, fimc_scp, fimc_mcuctl, fimc_odc, > > > > + fimc_dis, fimc_3dnr, > > > > + smmu_fimc_isp, smmu_fimc_drc, smmu_fimc_fd, smmu_fimc_scc, > > > > + smmu_fimc_scp, smmu_fimc_mcuctl, smmu_fimc_odc, smmu_fimc_dis0, > > > > + smmu_fimc_dis1, smmu_fimc_3dnr, > > > > + > > > > nr_clks, > > > > }; > > > > > > > > @@ -320,19 +331,26 @@ struct samsung_gate_clock exynos5250_gate_clks[] __initdata = { > > > > GATE(gscl3, "gscl3", "aclk266", GATE_IP_GSCL, 3, 0, 0), > > > > GATE(gscl_wa, "gscl_wa", "div_gscl_wa", GATE_IP_GSCL, 5, 0, 0), > > > > GATE(gscl_wb, "gscl_wb", "div_gscl_wb", GATE_IP_GSCL, 6, 0, 0), > > > > - GATE(smmu_gscl0, "smmu_gscl0", "aclk266", GATE_IP_GSCL, 7, 0, 0), > > > > - GATE(smmu_gscl1, "smmu_gscl1", "aclk266", GATE_IP_GSCL, 8, 0, 0), > > > > - GATE(smmu_gscl2, "smmu_gscl2", "aclk266", GATE_IP_GSCL, 9, 0, 0), > > > > - GATE(smmu_gscl3, "smmu_gscl3", "aclk266", GATE_IP_GSCL, 10, 0, 0), > > > > + GATE(smmu_gscl0, "smmu_gscl0", "none", GATE_IP_GSCL, 7, 0, 0), > > > > + GATE(smmu_gscl1, "smmu_gscl1", "none", GATE_IP_GSCL, 8, 0, 0), > > > > + GATE(smmu_gscl2, "smmu_gscl2", "none", GATE_IP_GSCL, 9, 0, 0), > > > > + GATE(smmu_gscl3, "smmu_gscl3", "none", GATE_IP_GSCL, 10, 0, 0), > > > > + GATE(camif_top, "camif_top", "aclk266", GATE_IP_GSCL, 4, 0, 0), > > > > + GATE(smmu_fimc_lite0, "smmu_fimc_lite0", "none", > > > > + GATE_IP_GSCL, 12, 0, 0), > > > > + GATE(smmu_fimc_lite1, "smmu_fimc_lite1", "none", > > > > + GATE_IP_GSCL, 13, 0, 0), > > > > + GATE(smmu_fimc_lite2, "smmu_fimc_lite2", "none", > > > > + GATE_IP_GSCL, 14, 0, 0), > > > > GATE(mfc, "mfc", "aclk333", GATE_IP_MFC, 0, 0, 0), > > > > - GATE(smmu_mfcl, "smmu_mfcl", "aclk333", GATE_IP_MFC, 1, 0, 0), > > > > - GATE(smmu_mfcr, "smmu_mfcr", "aclk333", GATE_IP_MFC, 2, 0, 0), > > > > + GATE(smmu_mfcr, "smmu_mfcr", "none", GATE_IP_MFC, 1, 0, 0), > > > > + GATE(smmu_mfcl, "smmu_mfcl", "none", GATE_IP_MFC, 2, 0, 0), > > > > GATE(rotator, "rotator", "aclk266", GATE_IP_GEN, 1, 0, 0), > > > > GATE(jpeg, "jpeg", "aclk166", GATE_IP_GEN, 2, 0, 0), > > > > GATE(mdma1, "mdma1", "aclk266", GATE_IP_GEN, 4, 0, 0), > > > > - GATE(smmu_rotator, "smmu_rotator", "aclk266", GATE_IP_GEN, 6, 0, 0), > > > > - GATE(smmu_jpeg, "smmu_jpeg", "aclk166", GATE_IP_GEN, 7, 0, 0), > > > > - GATE(smmu_mdma1, "smmu_mdma1", "aclk266", GATE_IP_GEN, 9, 0, 0), > > > > + GATE(smmu_rotator, "smmu_rotator", "none", GATE_IP_GEN, 6, 0, 0), > > > > + GATE(smmu_jpeg, "smmu_jpeg", "none", GATE_IP_GEN, 7, 0, 0), > > > > + GATE(smmu_mdma1, "smmu_mdma1", "none", GATE_IP_GEN, 9, 0, 0), > > > > GATE(pdma0, "pdma0", "aclk200", GATE_IP_FSYS, 1, 0, 0), > > > > GATE(pdma1, "pdma1", "aclk200", GATE_IP_FSYS, 2, 0, 0), > > > > GATE(sata, "sata", "aclk200", GATE_IP_FSYS, 6, 0, 0), > > > > @@ -462,6 +480,27 @@ struct samsung_gate_clock exynos5250_gate_clks[] __initdata = { > > > > GATE(dp, "dp", "aclk200", GATE_IP_DISP1, 4, 0, 0), > > > > GATE(mixer, "mixer", "aclk200", GATE_IP_DISP1, 5, 0, 0), > > > > GATE(hdmi, "hdmi", "aclk200", GATE_IP_DISP1, 6, 0, 0), > > > > + GATE(smmu_tv, "smmu_tv", "none", GATE_IP_DISP1, 2, 0, 0), > > > > + GATE(smmu_fimd1, "smmu_fimd1", "none", GATE_IP_DISP1, 8, 0, 0), > > > > + > > > > + GATE(smmu_fimc_isp, "smmu_fimc_isp", "none", GATE_IP_ISP0, 8, 0, 0), > > > > + GATE(smmu_fimc_drc, "smmu_fimc_drc", "none", GATE_IP_ISP0, 9, 0, 0), > > > > + GATE(smmu_fimc_fd, "smmu_fimc_fd", "none", GATE_IP_ISP0, 10, 0, 0), > > > > + GATE(smmu_fimc_scc, "smmu_fimc_scc", "none", > > > > + GATE_IP_ISP0, 11, 0, 0), > > > > + GATE(smmu_fimc_scp, "smmu_fimc_scp", "none", > > > > + GATE_IP_ISP0, 12, 0, 0), > > > > + GATE(smmu_fimc_mcuctl, "smmu_fimc_mcuctl", "none", > > > > + GATE_IP_ISP0, 13, 0, 0), > > > > + GATE(smmu_fimc_odc, "smmu_fimc_odc", "none", GATE_IP_ISP1, 4, 0, 0), > > > > + GATE(smmu_fimc_dis0, "smmu_fimc_dis0", "none", > > > > + GATE_IP_ISP1, 5, 0, 0), > > > > + GATE(smmu_fimc_dis1, "smmu_fimc_dis1", "none", > > > > + GATE_IP_ISP1, 6, 0, 0), > > > > + GATE(smmu_fimc_3dnr, "smmu_fimc_3dnr", "none", > > > > + GATE_IP_ISP1, 7, 0, 0), > > > > + > > > > + GATE(smmu_2d, "smmu_2d", "none", GATE_IP_ACP, 7, 0, 0), > > > > }; > > > > > > > > static __initdata struct of_device_id ext_clk_match[] = { > > > > -- > > > > 1.7.2.5 > > > > > > > > > > > > > > > > _______________________________________________ > > > > linux-arm-kernel mailing list > > > > linux-arm-kernel@lists.infradead.org > > > > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: RE: [PATCH v8 05/12] clk: exynos5250: add gate clock descriptions of System MMU 2013-07-30 11:17 ` Cho KyongHo @ 2013-08-01 10:21 ` Rahul Sharma 2013-08-01 12:50 ` Cho KyongHo 0 siblings, 1 reply; 7+ messages in thread From: Rahul Sharma @ 2013-08-01 10:21 UTC (permalink / raw) To: Cho KyongHo Cc: Mike Turquette, Linux ARM Kernel, Linux IOMMU, Linux Kernel, Linux Samsung SOC, Kukjin Kim, Hyunwoong Kim, Keyyoung Park, Grant Grundler, Prathyush, Subash Patel, Sachin Kamat, Thomas Abraham, Antonios Motakis, kvmarm, Rahul Sharma, sunil joshi Hi Cho, On Tue, Jul 30, 2013 at 4:47 PM, Cho KyongHo <pullip.cho@samsung.com> wrote: >> -----Original Message----- >> From: Mike Turquette [mailto:mturquette@linaro.org] >> Sent: Tuesday, July 30, 2013 3:47 PM >> To: Cho KyongHo; 'Linux ARM Kernel'; 'Linux IOMMU'; 'Linux Kernel'; 'Linux Samsung SOC' >> Cc: 'Kukjin Kim'; 'Hyunwoong Kim'; 'Prathyush'; 'Grant Grundler'; 'Joerg Roedel'; 'Keyyoung Park'; >> 'Subash Patel'; 'Sachin Kamat'; 'Thomas Abraham'; 'Antonios Motakis'; kvmarm@lists.cs.columbia.edu; >> 'Rahul Sharma' >> Subject: Re: RE: [PATCH v8 05/12] clk: exynos5250: add gate clock descriptions of System MMU >> >> Quoting Cho KyongHo (2013-07-27 02:08:11) >> > > -----Original Message----- >> > > From: Mike Turquette [mailto:mturquette@linaro.org] >> > > Sent: Saturday, July 27, 2013 5:01 AM >> > > >> > > Quoting Cho KyongHo (2013-07-26 04:27:54) >> > > > This adds gate clocks of all System MMUs and their master IPs >> > > > that are not apeared in clk-exynos5250.c >> > > > >> > > > Signed-off-by: Cho KyongHo <pullip.cho@samsung.com> >> > > >> > > Change looks good to me. Are you OK if I take it into the clk tree or do >> > > you want to keep this series together? >> > >> > I would like you to pick this to your tree and let me know which branch >> > contains this patch. >> > Then I will remove this from my patch series. >> >> camif_top corresponds to 345 in your patch, but this conflicts the g2d >> clock introduced in patch "clk: exynos5250: Add G2D gate clock" in the >> clk tree. I've pushed out the latest clk-next branch with this change: >> >> git://git.linaro.org/people/mturquette/linux.git clk-next >> >> Can you rebase your change on top of this and resolve the clock id >> mapping? >> > Oh, > I will rebase this patch on your git in the next patch version. > > Thank you. > >> Thanks, >> Mike >> >> > >> > Thank you, >> > Cho KyongHo. >> > > >> > > Regards, >> > > Mike >> > > >> > > > --- >> > > > .../devicetree/bindings/clock/exynos5250-clock.txt | 28 +++++++++- >> > > > drivers/clk/samsung/clk-exynos5250.c | 57 ++++++++++++++++--- >> > > > 2 files changed, 75 insertions(+), 10 deletions(-) >> > > > >> > > > diff --git a/Documentation/devicetree/bindings/clock/exynos5250-clock.txt >> > > > b/Documentation/devicetree/bindings/clock/exynos5250-clock.txt >> > > > index 781a627..df49694 100644 >> > > > --- a/Documentation/devicetree/bindings/clock/exynos5250-clock.txt >> > > > +++ b/Documentation/devicetree/bindings/clock/exynos5250-clock.txt >> > > > @@ -154,7 +154,33 @@ clock which they consume. >> > > > dsim0 341 >> > > > dp 342 >> > > > mixer 343 >> > > > - hdmi 345 >> > > > + hdmi 344 >> > > > + camif_top 345 >> > > > + smmu_fimc_lite0 346 >> > > > + smmu_fimc_lite1 347 >> > > > + smmu_fimc_lite2 348 >> > > > + smmu_tv 349 >> > > > + smmu_fimd1 350 >> > > > + smmu_2d 351 >> > > > + fimc_isp 352 >> > > > + fimc_drc 353 >> > > > + fimc_fd 354 >> > > > + fimc_scc 355 >> > > > + fimc_scp 356 >> > > > + fimc_mcuctl 357 >> > > > + fimc_odc 358 >> > > > + fimc_dis 359 >> > > > + fimc_3dnr 360 >> > > > + smmu_fimc_isp 361 >> > > > + smmu_fimc_drc 362 >> > > > + smmu_fimc_fd 363 >> > > > + smmu_fimc_scc 364 >> > > > + smmu_fimc_scp 365 >> > > > + smmu_fimc_mcuctl 366 >> > > > + smmu_fimc_odc 367 >> > > > + smmu_fimc_dis0 368 >> > > > + smmu_fimc_dis1 369 >> > > > + smmu_fimc_3dnr 370 >> > > > >> > > > Example 1: An example of a clock controller node is listed below. >> > > > >> > > > diff --git a/drivers/clk/samsung/clk-exynos5250.c b/drivers/clk/samsung/clk-exynos5250.c >> > > > index 22d7699..e242bde 100644 >> > > > --- a/drivers/clk/samsung/clk-exynos5250.c >> > > > +++ b/drivers/clk/samsung/clk-exynos5250.c >> > > > @@ -53,12 +53,15 @@ >> > > > #define DIV_PERIC3 0x10564 >> > > > #define DIV_PERIC4 0x10568 >> > > > #define DIV_PERIC5 0x1056c >> > > > +#define GATE_IP_ISP0 0x0C800 >> > > > +#define GATE_IP_ISP1 0x0C800 >> > > > #define GATE_IP_GSCL 0x10920 >> > > > #define GATE_IP_MFC 0x1092c >> > > > #define GATE_IP_GEN 0x10934 >> > > > #define GATE_IP_FSYS 0x10944 >> > > > #define GATE_IP_PERIC 0x10950 >> > > > #define GATE_IP_PERIS 0x10960 >> > > > +#define GATE_IP_ACP 0x18800 >> > > > #define SRC_CDREX 0x20200 >> > > > #define PLL_DIV2_SEL 0x20a24 >> > > > #define GATE_IP_DISP1 0x10928 >> > > > @@ -100,6 +103,14 @@ enum exynos5250_clks { >> > > > tzpc2, tzpc3, tzpc4, tzpc5, tzpc6, tzpc7, tzpc8, tzpc9, hdmi_cec, mct, >> > > > wdt, rtc, tmu, fimd1, mie1, dsim0, dp, mixer, hdmi, >> > > > >> > > > + camif_top, smmu_fimc_lite0, smmu_fimc_lite1, smmu_fimc_lite2, >> > > > + smmu_tv, smmu_fimd1, smmu_2d, >> > > > + fimc_isp, fimc_drc, fimc_fd, fimc_scc, fimc_scp, fimc_mcuctl, fimc_odc, >> > > > + fimc_dis, fimc_3dnr, >> > > > + smmu_fimc_isp, smmu_fimc_drc, smmu_fimc_fd, smmu_fimc_scc, >> > > > + smmu_fimc_scp, smmu_fimc_mcuctl, smmu_fimc_odc, smmu_fimc_dis0, >> > > > + smmu_fimc_dis1, smmu_fimc_3dnr, >> > > > + >> > > > nr_clks, >> > > > }; >> > > > >> > > > @@ -320,19 +331,26 @@ struct samsung_gate_clock exynos5250_gate_clks[] __initdata = { >> > > > GATE(gscl3, "gscl3", "aclk266", GATE_IP_GSCL, 3, 0, 0), >> > > > GATE(gscl_wa, "gscl_wa", "div_gscl_wa", GATE_IP_GSCL, 5, 0, 0), >> > > > GATE(gscl_wb, "gscl_wb", "div_gscl_wb", GATE_IP_GSCL, 6, 0, 0), >> > > > - GATE(smmu_gscl0, "smmu_gscl0", "aclk266", GATE_IP_GSCL, 7, 0, 0), >> > > > - GATE(smmu_gscl1, "smmu_gscl1", "aclk266", GATE_IP_GSCL, 8, 0, 0), >> > > > - GATE(smmu_gscl2, "smmu_gscl2", "aclk266", GATE_IP_GSCL, 9, 0, 0), >> > > > - GATE(smmu_gscl3, "smmu_gscl3", "aclk266", GATE_IP_GSCL, 10, 0, 0), >> > > > + GATE(smmu_gscl0, "smmu_gscl0", "none", GATE_IP_GSCL, 7, 0, 0), >> > > > + GATE(smmu_gscl1, "smmu_gscl1", "none", GATE_IP_GSCL, 8, 0, 0), >> > > > + GATE(smmu_gscl2, "smmu_gscl2", "none", GATE_IP_GSCL, 9, 0, 0), >> > > > + GATE(smmu_gscl3, "smmu_gscl3", "none", GATE_IP_GSCL, 10, 0, 0), >> > > > + GATE(camif_top, "camif_top", "aclk266", GATE_IP_GSCL, 4, 0, 0), >> > > > + GATE(smmu_fimc_lite0, "smmu_fimc_lite0", "none", >> > > > + GATE_IP_GSCL, 12, 0, 0), >> > > > + GATE(smmu_fimc_lite1, "smmu_fimc_lite1", "none", >> > > > + GATE_IP_GSCL, 13, 0, 0), >> > > > + GATE(smmu_fimc_lite2, "smmu_fimc_lite2", "none", >> > > > + GATE_IP_GSCL, 14, 0, 0), >> > > > GATE(mfc, "mfc", "aclk333", GATE_IP_MFC, 0, 0, 0), >> > > > - GATE(smmu_mfcl, "smmu_mfcl", "aclk333", GATE_IP_MFC, 1, 0, 0), >> > > > - GATE(smmu_mfcr, "smmu_mfcr", "aclk333", GATE_IP_MFC, 2, 0, 0), >> > > > + GATE(smmu_mfcr, "smmu_mfcr", "none", GATE_IP_MFC, 1, 0, 0), >> > > > + GATE(smmu_mfcl, "smmu_mfcl", "none", GATE_IP_MFC, 2, 0, 0), >> > > > GATE(rotator, "rotator", "aclk266", GATE_IP_GEN, 1, 0, 0), >> > > > GATE(jpeg, "jpeg", "aclk166", GATE_IP_GEN, 2, 0, 0), >> > > > GATE(mdma1, "mdma1", "aclk266", GATE_IP_GEN, 4, 0, 0), >> > > > - GATE(smmu_rotator, "smmu_rotator", "aclk266", GATE_IP_GEN, 6, 0, 0), >> > > > - GATE(smmu_jpeg, "smmu_jpeg", "aclk166", GATE_IP_GEN, 7, 0, 0), >> > > > - GATE(smmu_mdma1, "smmu_mdma1", "aclk266", GATE_IP_GEN, 9, 0, 0), >> > > > + GATE(smmu_rotator, "smmu_rotator", "none", GATE_IP_GEN, 6, 0, 0), >> > > > + GATE(smmu_jpeg, "smmu_jpeg", "none", GATE_IP_GEN, 7, 0, 0), >> > > > + GATE(smmu_mdma1, "smmu_mdma1", "none", GATE_IP_GEN, 9, 0, 0), >> > > > GATE(pdma0, "pdma0", "aclk200", GATE_IP_FSYS, 1, 0, 0), >> > > > GATE(pdma1, "pdma1", "aclk200", GATE_IP_FSYS, 2, 0, 0), >> > > > GATE(sata, "sata", "aclk200", GATE_IP_FSYS, 6, 0, 0), >> > > > @@ -462,6 +480,27 @@ struct samsung_gate_clock exynos5250_gate_clks[] __initdata = { >> > > > GATE(dp, "dp", "aclk200", GATE_IP_DISP1, 4, 0, 0), >> > > > GATE(mixer, "mixer", "aclk200", GATE_IP_DISP1, 5, 0, 0), >> > > > GATE(hdmi, "hdmi", "aclk200", GATE_IP_DISP1, 6, 0, 0), >> > > > + GATE(smmu_tv, "smmu_tv", "none", GATE_IP_DISP1, 2, 0, 0), It is 9th bit in GATE_IP_DISP1 for smmu_tv clock. All clocks without parents, are added to the list of orphan clocks. We should add correct parents to them. regards, Rahul Sharma. >> > > > + GATE(smmu_fimd1, "smmu_fimd1", "none", GATE_IP_DISP1, 8, 0, 0), >> > > > + >> > > > + GATE(smmu_fimc_isp, "smmu_fimc_isp", "none", GATE_IP_ISP0, 8, 0, 0), >> > > > + GATE(smmu_fimc_drc, "smmu_fimc_drc", "none", GATE_IP_ISP0, 9, 0, 0), >> > > > + GATE(smmu_fimc_fd, "smmu_fimc_fd", "none", GATE_IP_ISP0, 10, 0, 0), >> > > > + GATE(smmu_fimc_scc, "smmu_fimc_scc", "none", >> > > > + GATE_IP_ISP0, 11, 0, 0), >> > > > + GATE(smmu_fimc_scp, "smmu_fimc_scp", "none", >> > > > + GATE_IP_ISP0, 12, 0, 0), >> > > > + GATE(smmu_fimc_mcuctl, "smmu_fimc_mcuctl", "none", >> > > > + GATE_IP_ISP0, 13, 0, 0), >> > > > + GATE(smmu_fimc_odc, "smmu_fimc_odc", "none", GATE_IP_ISP1, 4, 0, 0), >> > > > + GATE(smmu_fimc_dis0, "smmu_fimc_dis0", "none", >> > > > + GATE_IP_ISP1, 5, 0, 0), >> > > > + GATE(smmu_fimc_dis1, "smmu_fimc_dis1", "none", >> > > > + GATE_IP_ISP1, 6, 0, 0), >> > > > + GATE(smmu_fimc_3dnr, "smmu_fimc_3dnr", "none", >> > > > + GATE_IP_ISP1, 7, 0, 0), >> > > > + >> > > > + GATE(smmu_2d, "smmu_2d", "none", GATE_IP_ACP, 7, 0, 0), >> > > > }; >> > > > >> > > > static __initdata struct of_device_id ext_clk_match[] = { >> > > > -- >> > > > 1.7.2.5 >> > > > >> > > > >> > > > >> > > > _______________________________________________ >> > > > linux-arm-kernel mailing list >> > > > linux-arm-kernel@lists.infradead.org >> > > > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > > _______________________________________________ > iommu mailing list > iommu@lists.linux-foundation.org > https://lists.linuxfoundation.org/mailman/listinfo/iommu ^ permalink raw reply [flat|nested] 7+ messages in thread
* RE: RE: [PATCH v8 05/12] clk: exynos5250: add gate clock descriptions of System MMU 2013-08-01 10:21 ` Rahul Sharma @ 2013-08-01 12:50 ` Cho KyongHo 0 siblings, 0 replies; 7+ messages in thread From: Cho KyongHo @ 2013-08-01 12:50 UTC (permalink / raw) To: 'Rahul Sharma' Cc: 'Mike Turquette', 'Linux ARM Kernel', 'Linux IOMMU', 'Linux Kernel', 'Linux Samsung SOC', 'Kukjin Kim', 'Hyunwoong Kim', 'Keyyoung Park', 'Grant Grundler', 'Prathyush', 'Subash Patel', 'Sachin Kamat', 'Thomas Abraham', 'Antonios Motakis', kvmarm, 'Rahul Sharma', 'sunil joshi' > -----Original Message----- > From: Rahul Sharma [mailto:r.sh.open@gmail.com] > Sent: Thursday, August 01, 2013 7:22 PM > > Hi Cho, > > On Tue, Jul 30, 2013 at 4:47 PM, Cho KyongHo <pullip.cho@samsung.com> wrote: > >> -----Original Message----- > >> From: Mike Turquette [mailto:mturquette@linaro.org] > >> Sent: Tuesday, July 30, 2013 3:47 PM > >> To: Cho KyongHo; 'Linux ARM Kernel'; 'Linux IOMMU'; 'Linux Kernel'; 'Linux Samsung SOC' > >> Cc: 'Kukjin Kim'; 'Hyunwoong Kim'; 'Prathyush'; 'Grant Grundler'; 'Joerg Roedel'; 'Keyyoung Park'; > >> 'Subash Patel'; 'Sachin Kamat'; 'Thomas Abraham'; 'Antonios Motakis'; kvmarm@lists.cs.columbia.edu; > >> 'Rahul Sharma' > >> Subject: Re: RE: [PATCH v8 05/12] clk: exynos5250: add gate clock descriptions of System MMU > >> > >> Quoting Cho KyongHo (2013-07-27 02:08:11) > >> > > -----Original Message----- > >> > > From: Mike Turquette [mailto:mturquette@linaro.org] > >> > > Sent: Saturday, July 27, 2013 5:01 AM > >> > > > >> > > Quoting Cho KyongHo (2013-07-26 04:27:54) > >> > > > This adds gate clocks of all System MMUs and their master IPs > >> > > > that are not apeared in clk-exynos5250.c > >> > > > > >> > > > Signed-off-by: Cho KyongHo <pullip.cho@samsung.com> > >> > > > >> > > Change looks good to me. Are you OK if I take it into the clk tree or do > >> > > you want to keep this series together? > >> > > >> > I would like you to pick this to your tree and let me know which branch > >> > contains this patch. > >> > Then I will remove this from my patch series. > >> > >> camif_top corresponds to 345 in your patch, but this conflicts the g2d > >> clock introduced in patch "clk: exynos5250: Add G2D gate clock" in the > >> clk tree. I've pushed out the latest clk-next branch with this change: > >> > >> git://git.linaro.org/people/mturquette/linux.git clk-next > >> > >> Can you rebase your change on top of this and resolve the clock id > >> mapping? > >> > > Oh, > > I will rebase this patch on your git in the next patch version. > > > > Thank you. > > > >> Thanks, > >> Mike > >> > >> > > >> > Thank you, > >> > Cho KyongHo. > >> > > > >> > > Regards, > >> > > Mike > >> > > > >> > > > --- > >> > > > .../devicetree/bindings/clock/exynos5250-clock.txt | 28 +++++++++- > >> > > > drivers/clk/samsung/clk-exynos5250.c | 57 ++++++++++++++++--- > >> > > > 2 files changed, 75 insertions(+), 10 deletions(-) > >> > > > > >> > > > diff --git a/Documentation/devicetree/bindings/clock/exynos5250-clock.txt > >> > > > b/Documentation/devicetree/bindings/clock/exynos5250-clock.txt > >> > > > index 781a627..df49694 100644 > >> > > > --- a/Documentation/devicetree/bindings/clock/exynos5250-clock.txt > >> > > > +++ b/Documentation/devicetree/bindings/clock/exynos5250-clock.txt > >> > > > @@ -154,7 +154,33 @@ clock which they consume. > >> > > > dsim0 341 > >> > > > dp 342 > >> > > > mixer 343 > >> > > > - hdmi 345 > >> > > > + hdmi 344 > >> > > > + camif_top 345 > >> > > > + smmu_fimc_lite0 346 > >> > > > + smmu_fimc_lite1 347 > >> > > > + smmu_fimc_lite2 348 > >> > > > + smmu_tv 349 > >> > > > + smmu_fimd1 350 > >> > > > + smmu_2d 351 > >> > > > + fimc_isp 352 > >> > > > + fimc_drc 353 > >> > > > + fimc_fd 354 > >> > > > + fimc_scc 355 > >> > > > + fimc_scp 356 > >> > > > + fimc_mcuctl 357 > >> > > > + fimc_odc 358 > >> > > > + fimc_dis 359 > >> > > > + fimc_3dnr 360 > >> > > > + smmu_fimc_isp 361 > >> > > > + smmu_fimc_drc 362 > >> > > > + smmu_fimc_fd 363 > >> > > > + smmu_fimc_scc 364 > >> > > > + smmu_fimc_scp 365 > >> > > > + smmu_fimc_mcuctl 366 > >> > > > + smmu_fimc_odc 367 > >> > > > + smmu_fimc_dis0 368 > >> > > > + smmu_fimc_dis1 369 > >> > > > + smmu_fimc_3dnr 370 > >> > > > > >> > > > Example 1: An example of a clock controller node is listed below. > >> > > > > >> > > > diff --git a/drivers/clk/samsung/clk-exynos5250.c b/drivers/clk/samsung/clk-exynos5250.c > >> > > > index 22d7699..e242bde 100644 > >> > > > --- a/drivers/clk/samsung/clk-exynos5250.c > >> > > > +++ b/drivers/clk/samsung/clk-exynos5250.c > >> > > > @@ -53,12 +53,15 @@ > >> > > > #define DIV_PERIC3 0x10564 > >> > > > #define DIV_PERIC4 0x10568 > >> > > > #define DIV_PERIC5 0x1056c > >> > > > +#define GATE_IP_ISP0 0x0C800 > >> > > > +#define GATE_IP_ISP1 0x0C800 > >> > > > #define GATE_IP_GSCL 0x10920 > >> > > > #define GATE_IP_MFC 0x1092c > >> > > > #define GATE_IP_GEN 0x10934 > >> > > > #define GATE_IP_FSYS 0x10944 > >> > > > #define GATE_IP_PERIC 0x10950 > >> > > > #define GATE_IP_PERIS 0x10960 > >> > > > +#define GATE_IP_ACP 0x18800 > >> > > > #define SRC_CDREX 0x20200 > >> > > > #define PLL_DIV2_SEL 0x20a24 > >> > > > #define GATE_IP_DISP1 0x10928 > >> > > > @@ -100,6 +103,14 @@ enum exynos5250_clks { > >> > > > tzpc2, tzpc3, tzpc4, tzpc5, tzpc6, tzpc7, tzpc8, tzpc9, hdmi_cec, mct, > >> > > > wdt, rtc, tmu, fimd1, mie1, dsim0, dp, mixer, hdmi, > >> > > > > >> > > > + camif_top, smmu_fimc_lite0, smmu_fimc_lite1, smmu_fimc_lite2, > >> > > > + smmu_tv, smmu_fimd1, smmu_2d, > >> > > > + fimc_isp, fimc_drc, fimc_fd, fimc_scc, fimc_scp, fimc_mcuctl, fimc_odc, > >> > > > + fimc_dis, fimc_3dnr, > >> > > > + smmu_fimc_isp, smmu_fimc_drc, smmu_fimc_fd, smmu_fimc_scc, > >> > > > + smmu_fimc_scp, smmu_fimc_mcuctl, smmu_fimc_odc, smmu_fimc_dis0, > >> > > > + smmu_fimc_dis1, smmu_fimc_3dnr, > >> > > > + > >> > > > nr_clks, > >> > > > }; > >> > > > > >> > > > @@ -320,19 +331,26 @@ struct samsung_gate_clock exynos5250_gate_clks[] __initdata = { > >> > > > GATE(gscl3, "gscl3", "aclk266", GATE_IP_GSCL, 3, 0, 0), > >> > > > GATE(gscl_wa, "gscl_wa", "div_gscl_wa", GATE_IP_GSCL, 5, 0, 0), > >> > > > GATE(gscl_wb, "gscl_wb", "div_gscl_wb", GATE_IP_GSCL, 6, 0, 0), > >> > > > - GATE(smmu_gscl0, "smmu_gscl0", "aclk266", GATE_IP_GSCL, 7, 0, 0), > >> > > > - GATE(smmu_gscl1, "smmu_gscl1", "aclk266", GATE_IP_GSCL, 8, 0, 0), > >> > > > - GATE(smmu_gscl2, "smmu_gscl2", "aclk266", GATE_IP_GSCL, 9, 0, 0), > >> > > > - GATE(smmu_gscl3, "smmu_gscl3", "aclk266", GATE_IP_GSCL, 10, 0, 0), > >> > > > + GATE(smmu_gscl0, "smmu_gscl0", "none", GATE_IP_GSCL, 7, 0, 0), > >> > > > + GATE(smmu_gscl1, "smmu_gscl1", "none", GATE_IP_GSCL, 8, 0, 0), > >> > > > + GATE(smmu_gscl2, "smmu_gscl2", "none", GATE_IP_GSCL, 9, 0, 0), > >> > > > + GATE(smmu_gscl3, "smmu_gscl3", "none", GATE_IP_GSCL, 10, 0, 0), > >> > > > + GATE(camif_top, "camif_top", "aclk266", GATE_IP_GSCL, 4, 0, 0), > >> > > > + GATE(smmu_fimc_lite0, "smmu_fimc_lite0", "none", > >> > > > + GATE_IP_GSCL, 12, 0, 0), > >> > > > + GATE(smmu_fimc_lite1, "smmu_fimc_lite1", "none", > >> > > > + GATE_IP_GSCL, 13, 0, 0), > >> > > > + GATE(smmu_fimc_lite2, "smmu_fimc_lite2", "none", > >> > > > + GATE_IP_GSCL, 14, 0, 0), > >> > > > GATE(mfc, "mfc", "aclk333", GATE_IP_MFC, 0, 0, 0), > >> > > > - GATE(smmu_mfcl, "smmu_mfcl", "aclk333", GATE_IP_MFC, 1, 0, 0), > >> > > > - GATE(smmu_mfcr, "smmu_mfcr", "aclk333", GATE_IP_MFC, 2, 0, 0), > >> > > > + GATE(smmu_mfcr, "smmu_mfcr", "none", GATE_IP_MFC, 1, 0, 0), > >> > > > + GATE(smmu_mfcl, "smmu_mfcl", "none", GATE_IP_MFC, 2, 0, 0), > >> > > > GATE(rotator, "rotator", "aclk266", GATE_IP_GEN, 1, 0, 0), > >> > > > GATE(jpeg, "jpeg", "aclk166", GATE_IP_GEN, 2, 0, 0), > >> > > > GATE(mdma1, "mdma1", "aclk266", GATE_IP_GEN, 4, 0, 0), > >> > > > - GATE(smmu_rotator, "smmu_rotator", "aclk266", GATE_IP_GEN, 6, 0, 0), > >> > > > - GATE(smmu_jpeg, "smmu_jpeg", "aclk166", GATE_IP_GEN, 7, 0, 0), > >> > > > - GATE(smmu_mdma1, "smmu_mdma1", "aclk266", GATE_IP_GEN, 9, 0, 0), > >> > > > + GATE(smmu_rotator, "smmu_rotator", "none", GATE_IP_GEN, 6, 0, 0), > >> > > > + GATE(smmu_jpeg, "smmu_jpeg", "none", GATE_IP_GEN, 7, 0, 0), > >> > > > + GATE(smmu_mdma1, "smmu_mdma1", "none", GATE_IP_GEN, 9, 0, 0), > >> > > > GATE(pdma0, "pdma0", "aclk200", GATE_IP_FSYS, 1, 0, 0), > >> > > > GATE(pdma1, "pdma1", "aclk200", GATE_IP_FSYS, 2, 0, 0), > >> > > > GATE(sata, "sata", "aclk200", GATE_IP_FSYS, 6, 0, 0), > >> > > > @@ -462,6 +480,27 @@ struct samsung_gate_clock exynos5250_gate_clks[] __initdata = { > >> > > > GATE(dp, "dp", "aclk200", GATE_IP_DISP1, 4, 0, 0), > >> > > > GATE(mixer, "mixer", "aclk200", GATE_IP_DISP1, 5, 0, 0), > >> > > > GATE(hdmi, "hdmi", "aclk200", GATE_IP_DISP1, 6, 0, 0), > >> > > > + GATE(smmu_tv, "smmu_tv", "none", GATE_IP_DISP1, 2, 0, 0), > > It is 9th bit in GATE_IP_DISP1 for smmu_tv clock. All clocks without > parents, are added to the list of orphan clocks. We should add correct > parents to them. > Yeah, you are right. It will be fixed in the next patch. Thanks. > regards, > Rahul Sharma. > > >> > > > + GATE(smmu_fimd1, "smmu_fimd1", "none", GATE_IP_DISP1, 8, 0, 0), > >> > > > + > >> > > > + GATE(smmu_fimc_isp, "smmu_fimc_isp", "none", GATE_IP_ISP0, 8, 0, 0), > >> > > > + GATE(smmu_fimc_drc, "smmu_fimc_drc", "none", GATE_IP_ISP0, 9, 0, 0), > >> > > > + GATE(smmu_fimc_fd, "smmu_fimc_fd", "none", GATE_IP_ISP0, 10, 0, 0), > >> > > > + GATE(smmu_fimc_scc, "smmu_fimc_scc", "none", > >> > > > + GATE_IP_ISP0, 11, 0, 0), > >> > > > + GATE(smmu_fimc_scp, "smmu_fimc_scp", "none", > >> > > > + GATE_IP_ISP0, 12, 0, 0), > >> > > > + GATE(smmu_fimc_mcuctl, "smmu_fimc_mcuctl", "none", > >> > > > + GATE_IP_ISP0, 13, 0, 0), > >> > > > + GATE(smmu_fimc_odc, "smmu_fimc_odc", "none", GATE_IP_ISP1, 4, 0, 0), > >> > > > + GATE(smmu_fimc_dis0, "smmu_fimc_dis0", "none", > >> > > > + GATE_IP_ISP1, 5, 0, 0), > >> > > > + GATE(smmu_fimc_dis1, "smmu_fimc_dis1", "none", > >> > > > + GATE_IP_ISP1, 6, 0, 0), > >> > > > + GATE(smmu_fimc_3dnr, "smmu_fimc_3dnr", "none", > >> > > > + GATE_IP_ISP1, 7, 0, 0), > >> > > > + > >> > > > + GATE(smmu_2d, "smmu_2d", "none", GATE_IP_ACP, 7, 0, 0), > >> > > > }; > >> > > > > >> > > > static __initdata struct of_device_id ext_clk_match[] = { > >> > > > -- > >> > > > 1.7.2.5 > >> > > > > >> > > > > >> > > > > >> > > > _______________________________________________ > >> > > > linux-arm-kernel mailing list > >> > > > linux-arm-kernel@lists.infradead.org > >> > > > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > > > > _______________________________________________ > > iommu mailing list > > iommu@lists.linux-foundation.org > > https://lists.linuxfoundation.org/mailman/listinfo/iommu ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-08-01 12:51 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-07-26 11:27 [PATCH v8 05/12] clk: exynos5250: add gate clock descriptions of System MMU Cho KyongHo 2013-07-26 20:01 ` Mike Turquette 2013-07-27 9:08 ` Cho KyongHo 2013-07-30 6:46 ` Mike Turquette 2013-07-30 11:17 ` Cho KyongHo 2013-08-01 10:21 ` Rahul Sharma 2013-08-01 12:50 ` Cho KyongHo
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox