clock: tegra21: Assign clock IDs to EMC users

Assigned clock IDs to EMC shared bus users.

Bug 1608456

Change-Id: I3cd7eb92be2cfeec7f343b6cb7e9f9503038ce6e
Signed-off-by: Alex Frid <afrid@nvidia.com>
Reviewed-on: http://git-master/r/740948
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>

diff --git a/drivers/platform/tegra/tegra21_clocks.c b/drivers/platform/tegra/tegra21_clocks.c
index 904c949d343158348e0756ced2547c1538b58ded..ef09c30ccb65532a64cacd54dd6e7d371180b786 100644 (file)
--- a/drivers/platform/tegra/tegra21_clocks.c
+++ b/drivers/platform/tegra/tegra21_clocks.c
@@ -9518,44 +9518,44 @@ static struct clk tegra_list_clks[] = {
        SHARED_SCLK("qspi.sclk", "qspi",                "sclk", &tegra_clk_apb,        NULL, 0, 0, 0),
        SHARED_SCLK("boot.apb.sclk", "boot.apb.sclk",   NULL,   &tegra_clk_apb,        NULL, 0, 0, 0),
 
-       SHARED_EMC_CLK("avp.emc",       "nvavp",        "emc",  &tegra_clk_emc, NULL, 0, 0, 0, 0),
-       SHARED_EMC_CLK("cpu.emc",       "tegra-cpu", "cpu_emc", &tegra_clk_emc, NULL, 0, 0, 0, 0),
-       SHARED_EMC_CLK("disp1.emc",     "tegradc.0",    "emc",  &tegra_clk_emc, NULL, 0, SHARED_ISO_BW, BIT(EMC_USER_DC1), 0),
-       SHARED_EMC_CLK("disp2.emc",     "tegradc.1",    "emc",  &tegra_clk_emc, NULL, 0, SHARED_ISO_BW, BIT(EMC_USER_DC2), 0),
-       SHARED_EMC_CLK("disp1.la.emc",  "tegradc.0",    "emc.la", &tegra_clk_emc, NULL, 0, 0, 0, 0),
-       SHARED_EMC_CLK("disp2.la.emc",  "tegradc.1",    "emc.la", &tegra_clk_emc, NULL, 0, 0, 0, 0),
-       SHARED_EMC_CLK("usbd.emc",      "tegra-udc.0",  "emc",  &tegra_clk_emc, NULL, 0, 0, 0, 0),
-       SHARED_EMC_CLK("usb1.emc",      "tegra-ehci.0", "emc",  &tegra_clk_emc, NULL, 0, 0, 0, 0),
-       SHARED_EMC_CLK("usb2.emc",      "tegra-ehci.1", "emc",  &tegra_clk_emc, NULL, 0, 0, 0, 0),
+       SHARED_EMC_CLK("avp.emc",       "nvavp",        "emc",  &tegra_clk_emc, NULL, 0, 0, 0, TEGRA210_CLK_ID_EMC_AVP_USER),
+       SHARED_EMC_CLK("cpu.emc",       "tegra-cpu", "cpu_emc", &tegra_clk_emc, NULL, 0, 0, 0, TEGRA210_CLK_ID_EMC_CPU_USER),
+       SHARED_EMC_CLK("disp1.emc",     "tegradc.0",    "emc",  &tegra_clk_emc, NULL, 0, SHARED_ISO_BW, BIT(EMC_USER_DC1), TEGRA210_CLK_ID_EMC_DISP1_USER),
+       SHARED_EMC_CLK("disp2.emc",     "tegradc.1",    "emc",  &tegra_clk_emc, NULL, 0, SHARED_ISO_BW, BIT(EMC_USER_DC2), TEGRA210_CLK_ID_EMC_DISP2_USER),
+       SHARED_EMC_CLK("disp1.la.emc",  "tegradc.0",    "emc.la", &tegra_clk_emc, NULL, 0, 0, 0, TEGRA210_CLK_ID_EMC_DISP1_LA_USER),
+       SHARED_EMC_CLK("disp2.la.emc",  "tegradc.1",    "emc.la", &tegra_clk_emc, NULL, 0, 0, 0, TEGRA210_CLK_ID_EMC_DISP2_LA_USER),
+       SHARED_EMC_CLK("usbd.emc",      "tegra-udc.0",  "emc",  &tegra_clk_emc, NULL, 0, 0, 0, TEGRA210_CLK_ID_EMC_USBD_USER),
+       SHARED_EMC_CLK("usb1.emc",      "tegra-ehci.0", "emc",  &tegra_clk_emc, NULL, 0, 0, 0, TEGRA210_CLK_ID_EMC_USB1_USER),
+       SHARED_EMC_CLK("usb2.emc",      "tegra-ehci.1", "emc",  &tegra_clk_emc, NULL, 0, 0, 0, TEGRA210_CLK_ID_EMC_USB2_USER),
        SHARED_EMC_CLK("usb3.emc",      "tegra-ehci.2", "emc",  &tegra_clk_emc, NULL, 0, 0, 0, 0),
-       SHARED_EMC_CLK("sdmmc3.emc",    "sdhci-tegra.2", "emc", &tegra_clk_emc, NULL, 0, 0, 0, 0),
-       SHARED_EMC_CLK("sdmmc4.emc",    "sdhci-tegra.3", "emc", &tegra_clk_emc, NULL, 0, 0, 0, 0),
-       SHARED_EMC_CLK("mon.emc",       "tegra_actmon", "emc",  &tegra_clk_emc, NULL, 0, 0, 0, 0),
+       SHARED_EMC_CLK("sdmmc3.emc",    "sdhci-tegra.2", "emc", &tegra_clk_emc, NULL, 0, 0, 0, TEGRA210_CLK_ID_EMC_SDMMC3_USER),
+       SHARED_EMC_CLK("sdmmc4.emc",    "sdhci-tegra.3", "emc", &tegra_clk_emc, NULL, 0, 0, 0, TEGRA210_CLK_ID_EMC_SDMMC4_USER),
+       SHARED_EMC_CLK("mon.emc",       "tegra_actmon", "emc",  &tegra_clk_emc, NULL, 0, 0, 0, TEGRA210_CLK_ID_EMC_MON_USER),
        SHARED_EMC_CLK("cap.emc",       "cap.emc",      NULL,   &tegra_clk_emc, NULL, 0, SHARED_CEILING, 0, 0),
        SHARED_EMC_CLK("cap.vcore.emc", "cap.vcore.emc", NULL,  &tegra_clk_emc, NULL, 0, SHARED_CEILING, 0, 0),
        SHARED_EMC_CLK("cap.throttle.emc", "cap_throttle", NULL, &tegra_clk_emc, NULL, 0, SHARED_CEILING_BUT_ISO, 0, 0),
-       SHARED_EMC_CLK("3d.emc",        "tegra_gpu.0",  "emc",  &tegra_clk_emc, NULL, 0, 0,             BIT(EMC_USER_3D), 0),
-       SHARED_EMC_CLK("msenc.emc",     "tegra_msenc",  "emc",  &tegra_clk_emc, NULL, 0, SHARED_BW,     BIT(EMC_USER_MSENC), 0),
-       SHARED_EMC_CLK("nvjpg.emc",     "tegra_nvjpg",  "emc",  &tegra_clk_emc, NULL, 0, SHARED_BW,     BIT(EMC_USER_NVJPG), 0),
-       SHARED_EMC_CLK("nvdec.emc",     "tegra_nvdec",  "emc",  &tegra_clk_emc, NULL, 0, 0, 0, 0),
-       SHARED_EMC_CLK("tsec.emc",      "tegra_tsec",   "emc",  &tegra_clk_emc, NULL, 0, 0, 0, 0),
-       SHARED_EMC_CLK("tsecb.emc",     "tegra_tsecb",  "emc",  &tegra_clk_emc, NULL, 0, 0, 0, 0),
+       SHARED_EMC_CLK("3d.emc",        "tegra_gpu.0",  "emc",  &tegra_clk_emc, NULL, 0, 0,             BIT(EMC_USER_3D), TEGRA210_CLK_ID_EMC_3D_USER),
+       SHARED_EMC_CLK("msenc.emc",     "tegra_msenc",  "emc",  &tegra_clk_emc, NULL, 0, SHARED_BW,     BIT(EMC_USER_MSENC), TEGRA210_CLK_ID_EMC_NVENC_USER),
+       SHARED_EMC_CLK("nvjpg.emc",     "tegra_nvjpg",  "emc",  &tegra_clk_emc, NULL, 0, SHARED_BW,     BIT(EMC_USER_NVJPG), TEGRA210_CLK_ID_EMC_NVJPG_USER),
+       SHARED_EMC_CLK("nvdec.emc",     "tegra_nvdec",  "emc",  &tegra_clk_emc, NULL, 0, 0, 0, TEGRA210_CLK_ID_EMC_NVDEC_USER),
+       SHARED_EMC_CLK("tsec.emc",      "tegra_tsec",   "emc",  &tegra_clk_emc, NULL, 0, 0, 0, TEGRA210_CLK_ID_EMC_TSEC_USER),
+       SHARED_EMC_CLK("tsecb.emc",     "tegra_tsecb",  "emc",  &tegra_clk_emc, NULL, 0, 0, 0, TEGRA210_CLK_ID_EMC_TSECB_USER),
 #ifdef CONFIG_VI_ONE_DEVICE
-       SHARED_EMC_CLK("vi.emc",        "tegra_vi",     "emc",  &tegra_clk_emc, NULL, 0, SHARED_ISO_BW, BIT(EMC_USER_VI), 0),
+       SHARED_EMC_CLK("vi.emc",        "tegra_vi",     "emc",  &tegra_clk_emc, NULL, 0, SHARED_ISO_BW, BIT(EMC_USER_VI), TEGRA210_CLK_ID_EMC_VI_USER),
 #else
-       SHARED_EMC_CLK("via.emc",       "tegra_vi.0",   "emc",  &tegra_clk_emc, NULL, 0, SHARED_ISO_BW, BIT(EMC_USER_VI), 0),
-       SHARED_EMC_CLK("vib.emc",       "tegra_vi.1",   "emc",  &tegra_clk_emc, NULL, 0, SHARED_ISO_BW, BIT(EMC_USER_VI2), 0),
+       SHARED_EMC_CLK("via.emc",       "tegra_vi.0",   "emc",  &tegra_clk_emc, NULL, 0, SHARED_ISO_BW, BIT(EMC_USER_VI), TEGRA210_CLK_ID_EMC_VIA_USER),
+       SHARED_EMC_CLK("vib.emc",       "tegra_vi.1",   "emc",  &tegra_clk_emc, NULL, 0, SHARED_ISO_BW, BIT(EMC_USER_VI2), TEGRA210_CLK_ID_EMC_VIB_USER),
 #endif
-       SHARED_EMC_CLK("ispa.emc",      "tegra_isp.0",  "emc",  &tegra_clk_emc, NULL, 0, SHARED_ISO_BW, BIT(EMC_USER_ISP1), 0),
-       SHARED_EMC_CLK("ispb.emc",      "tegra_isp.1",  "emc",  &tegra_clk_emc, NULL, 0, SHARED_ISO_BW, BIT(EMC_USER_ISP2), 0),
-       SHARED_EMC_CLK("camera.emc", "tegra_camera_ctrl",       "emc",  &tegra_clk_emc, NULL, 0, SHARED_BW, 0, 0),
-       SHARED_EMC_CLK("iso.emc",       "iso",          "emc",  &tegra_clk_emc, NULL, 0, 0, 0, 0),
+       SHARED_EMC_CLK("ispa.emc",      "tegra_isp.0",  "emc",  &tegra_clk_emc, NULL, 0, SHARED_ISO_BW, BIT(EMC_USER_ISP1), TEGRA210_CLK_ID_EMC_ISPA_USER),
+       SHARED_EMC_CLK("ispb.emc",      "tegra_isp.1",  "emc",  &tegra_clk_emc, NULL, 0, SHARED_ISO_BW, BIT(EMC_USER_ISP2), TEGRA210_CLK_ID_EMC_ISPB_USER),
+       SHARED_EMC_CLK("camera.emc", "tegra_camera_ctrl",       "emc",  &tegra_clk_emc, NULL, 0, SHARED_BW, 0, TEGRA210_CLK_ID_EMC_CAMERA_USER),
+       SHARED_EMC_CLK("iso.emc",       "iso",          "emc",  &tegra_clk_emc, NULL, 0, 0, 0, TEGRA210_CLK_ID_EMC_ISO_USER),
        SHARED_EMC_CLK("floor.emc",     "floor.emc",    NULL,   &tegra_clk_emc, NULL, 0, 0, 0, 0),
        SHARED_EMC_CLK("override.emc", "override.emc",  NULL,   &tegra_clk_emc, NULL, 0, SHARED_OVERRIDE, 0, 0),
-       SHARED_EMC_CLK("vic.emc",       "tegra_vic03",  "emc",  &tegra_clk_emc, NULL, 0, 0, 0, 0),
-       SHARED_EMC_CLK("vic_shared.emc",        "tegra_vic03",  "emc_shared",  &tegra_clk_emc, NULL, 0, SHARED_BW, 0, 0),
-       SHARED_EMC_CLK("ape.emc", "ape", "emc",  &tegra_clk_emc, NULL, 0, 0, 0, 0),
-       SHARED_EMC_CLK("pcie.emc", "tegra_pcie", "emc",  &tegra_clk_emc, NULL, 0, 0, 0, 0),
+       SHARED_EMC_CLK("vic.emc",       "tegra_vic03",  "emc",  &tegra_clk_emc, NULL, 0, 0, 0, TEGRA210_CLK_ID_EMC_VIC_USER),
+       SHARED_EMC_CLK("vic_shared.emc",        "tegra_vic03",  "emc_shared",  &tegra_clk_emc, NULL, 0, SHARED_BW, 0, TEGRA210_CLK_ID_EMC_VIC_SHARED_USER),
+       SHARED_EMC_CLK("ape.emc", "ape", "emc",  &tegra_clk_emc, NULL, 0, 0, 0, TEGRA210_CLK_ID_EMC_APE_USER),
+       SHARED_EMC_CLK("pcie.emc", "tegra_pcie", "emc",  &tegra_clk_emc, NULL, 0, 0, 0, TEGRA210_CLK_ID_EMC_PCIE_USER),
 
        DUAL_CBUS_CLK("vic03.cbus",     "tegra_vic03",          "vic03", &tegra_clk_c2bus, "vic03", 0, 0, TEGRA210_CLK_ID_CXBUS_VIC_USER),
        DUAL_CBUS_CLK("nvjpg.cbus",     "tegra_nvjpg",          "nvjpg", &tegra_clk_c2bus, "nvjpg", 0, 0, TEGRA210_CLK_ID_CXBUS_NVJPG_USER),

diff --git a/include/dt-bindings/clk/tegra210-clk.h b/include/dt-bindings/clk/tegra210-clk.h
index 8fd842d30fe504d775897717bc0812a9a40408ca..5c259089392fcae929db34c13e19461ca8f28bcc 100644 (file)
--- a/include/dt-bindings/clk/tegra210-clk.h
+++ b/include/dt-bindings/clk/tegra210-clk.h
@@ -312,7 +312,37 @@
 #define TEGRA210_CLK_ID_APE_ADMA_USER                  405
 #define TEGRA210_CLK_ID_APE_ADSP_USER                  406
 #define TEGRA210_CLK_ID_APE_XBAR_USER                  407
+/* IDs 408 ... 419 are reserved */
+#define TEGRA210_CLK_ID_EMC_AVP_USER                   420
+#define TEGRA210_CLK_ID_EMC_CPU_USER                   421
+#define TEGRA210_CLK_ID_EMC_DISP1_USER                 422
+#define TEGRA210_CLK_ID_EMC_DISP2_USER                 423
+#define TEGRA210_CLK_ID_EMC_DISP1_LA_USER              424
+#define TEGRA210_CLK_ID_EMC_DISP2_LA_USER              425
+#define TEGRA210_CLK_ID_EMC_USBD_USER                  426
+#define TEGRA210_CLK_ID_EMC_USB1_USER                  427
+#define TEGRA210_CLK_ID_EMC_USB2_USER                  428
+#define TEGRA210_CLK_ID_EMC_SDMMC3_USER                        429
+#define TEGRA210_CLK_ID_EMC_SDMMC4_USER                        430
+#define TEGRA210_CLK_ID_EMC_MON_USER                   431
+#define TEGRA210_CLK_ID_EMC_3D_USER                    432
+#define TEGRA210_CLK_ID_EMC_NVENC_USER                 433
+#define TEGRA210_CLK_ID_EMC_NVJPG_USER                 434
+#define TEGRA210_CLK_ID_EMC_NVDEC_USER                 435
+#define TEGRA210_CLK_ID_EMC_TSEC_USER                  436
+#define TEGRA210_CLK_ID_EMC_TSECB_USER                 437
+#define TEGRA210_CLK_ID_EMC_VI_USER                    438
+#define TEGRA210_CLK_ID_EMC_VIA_USER                   439
+#define TEGRA210_CLK_ID_EMC_VIB_USER                   440
+#define TEGRA210_CLK_ID_EMC_ISPA_USER                  441
+#define TEGRA210_CLK_ID_EMC_ISPB_USER                  442
+#define TEGRA210_CLK_ID_EMC_CAMERA_USER                        443
+#define TEGRA210_CLK_ID_EMC_ISO_USER                   444
+#define TEGRA210_CLK_ID_EMC_VIC_USER                   445
+#define TEGRA210_CLK_ID_EMC_VIC_SHARED_USER            446
+#define TEGRA210_CLK_ID_EMC_APE_USER                   447
+#define TEGRA210_CLK_ID_EMC_PCIE_USER                  448
 
-/* FIXME: IDs 408 ... 479 to be assigned */
+/* FIXME: IDs 449 ... 479 to be assigned */
 
 #endif /* _DT_BINDINGS_CLK_TEGRA210_CLK_ID_H */