On Tue 04 Dec 07:13 PST 2018, Jeffrey Hugo wrote: > The current list of defined resets is incomplete compared to what the > hardware implements. Enumerate the remaining resets according to the > hardware documentation. > > Signed-off-by: Jeffrey Hugo <jhugo@xxxxxxxxxxxxxx> Acked-by: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx> Regards, Bjorn > --- > > Based upon "Merge branch 'clk-qcom-8998-resets' into clk-next" to hopefully > avoid any merge conflicts. > > drivers/clk/qcom/gcc-msm8998.c | 87 ++++++++++++++++++++++++++++ > include/dt-bindings/clock/qcom,gcc-msm8998.h | 87 ++++++++++++++++++++++++++++ > 2 files changed, 174 insertions(+) > > diff --git a/drivers/clk/qcom/gcc-msm8998.c b/drivers/clk/qcom/gcc-msm8998.c > index c3bb9ff..14c507d 100644 > --- a/drivers/clk/qcom/gcc-msm8998.c > +++ b/drivers/clk/qcom/gcc-msm8998.c > @@ -2761,6 +2761,93 @@ enum { > [GCC_TSIF_BCR] = { 0x36000 }, > [GCC_UFS_BCR] = { 0x75000 }, > [GCC_USB_30_BCR] = { 0xf000 }, > + [GCC_SYSTEM_NOC_BCR] = { 0x4000 }, > + [GCC_CONFIG_NOC_BCR] = { 0x5000 }, > + [GCC_AHB2PHY_EAST_BCR] = { 0x7000 }, > + [GCC_IMEM_BCR] = { 0x8000 }, > + [GCC_PIMEM_BCR] = { 0xa000 }, > + [GCC_MMSS_BCR] = { 0xb000 }, > + [GCC_QDSS_BCR] = { 0xc000 }, > + [GCC_WCSS_BCR] = { 0x11000 }, > + [GCC_BLSP1_BCR] = { 0x17000 }, > + [GCC_BLSP1_UART1_BCR] = { 0x1a000 }, > + [GCC_BLSP1_UART2_BCR] = { 0x1c000 }, > + [GCC_BLSP1_UART3_BCR] = { 0x1e000 }, > + [GCC_CM_PHY_REFGEN1_BCR] = { 0x22000 }, > + [GCC_CM_PHY_REFGEN2_BCR] = { 0x24000 }, > + [GCC_BLSP2_BCR] = { 0x25000 }, > + [GCC_BLSP2_UART1_BCR] = { 0x27000 }, > + [GCC_BLSP2_UART2_BCR] = { 0x29000 }, > + [GCC_BLSP2_UART3_BCR] = { 0x2b000 }, > + [GCC_SRAM_SENSOR_BCR] = { 0x2d000 }, > + [GCC_PRNG_BCR] = { 0x34000 }, > + [GCC_TSIF_0_RESET] = { 0x36024 }, > + [GCC_TSIF_1_RESET] = { 0x36028 }, > + [GCC_TCSR_BCR] = { 0x37000 }, > + [GCC_BOOT_ROM_BCR] = { 0x38000 }, > + [GCC_MSG_RAM_BCR] = { 0x39000 }, > + [GCC_TLMM_BCR] = { 0x3a000 }, > + [GCC_MPM_BCR] = { 0x3b000 }, > + [GCC_SEC_CTRL_BCR] = { 0x3d000 }, > + [GCC_SPMI_BCR] = { 0x3f000 }, > + [GCC_SPDM_BCR] = { 0x40000 }, > + [GCC_CE1_BCR] = { 0x41000 }, > + [GCC_BIMC_BCR] = { 0x44000 }, > + [GCC_SNOC_BUS_TIMEOUT0_BCR] = { 0x49000 }, > + [GCC_SNOC_BUS_TIMEOUT1_BCR] = { 0x49008 }, > + [GCC_SNOC_BUS_TIMEOUT3_BCR] = { 0x49010 }, > + [GCC_SNOC_BUS_TIMEOUT_EXTREF_BCR] = { 0x49018 }, > + [GCC_PNOC_BUS_TIMEOUT0_BCR] = { 0x4a000 }, > + [GCC_CNOC_PERIPH_BUS_TIMEOUT1_BCR] = { 0x4a004 }, > + [GCC_CNOC_PERIPH_BUS_TIMEOUT2_BCR] = { 0x4a00c }, > + [GCC_CNOC_BUS_TIMEOUT0_BCR] = { 0x4b000 }, > + [GCC_CNOC_BUS_TIMEOUT1_BCR] = { 0x4b008 }, > + [GCC_CNOC_BUS_TIMEOUT2_BCR] = { 0x4b010 }, > + [GCC_CNOC_BUS_TIMEOUT3_BCR] = { 0x4b018 }, > + [GCC_CNOC_BUS_TIMEOUT4_BCR] = { 0x4b020 }, > + [GCC_CNOC_BUS_TIMEOUT5_BCR] = { 0x4b028 }, > + [GCC_CNOC_BUS_TIMEOUT6_BCR] = { 0x4b030 }, > + [GCC_CNOC_BUS_TIMEOUT7_BCR] = { 0x4b038 }, > + [GCC_APB2JTAG_BCR] = { 0x4c000 }, > + [GCC_RBCPR_CX_BCR] = { 0x4e000 }, > + [GCC_RBCPR_MX_BCR] = { 0x4f000 }, > + [GCC_USB3_PHY_BCR] = { 0x50020 }, > + [GCC_USB3PHY_PHY_BCR] = { 0x50024 }, > + [GCC_USB3_DP_PHY_BCR] = { 0x50028 }, > + [GCC_SSC_BCR] = { 0x63000 }, > + [GCC_SSC_RESET] = { 0x63020 }, > + [GCC_USB_PHY_CFG_AHB2PHY_BCR] = { 0x6a000 }, > + [GCC_PCIE_0_LINK_DOWN_BCR] = { 0x6c014 }, > + [GCC_PCIE_0_PHY_BCR] = { 0x6c01c }, > + [GCC_PCIE_0_NOCSR_COM_PHY_BCR] = { 0x6c020 }, > + [GCC_PCIE_PHY_BCR] = { 0x6f000 }, > + [GCC_PCIE_PHY_NOCSR_COM_PHY_BCR] = { 0x6f00c }, > + [GCC_PCIE_PHY_CFG_AHB_BCR] = { 0x6f010 }, > + [GCC_PCIE_PHY_COM_BCR] = { 0x6f014 }, > + [GCC_GPU_BCR] = { 0x71000 }, > + [GCC_SPSS_BCR] = { 0x72000 }, > + [GCC_OBT_ODT_BCR] = { 0x73000 }, > + [GCC_VS_BCR] = { 0x7a000 }, > + [GCC_MSS_VS_RESET] = { 0x7a100 }, > + [GCC_GPU_VS_RESET] = { 0x7a104 }, > + [GCC_APC0_VS_RESET] = { 0x7a108 }, > + [GCC_APC1_VS_RESET] = { 0x7a10c }, > + [GCC_CNOC_BUS_TIMEOUT8_BCR] = { 0x80000 }, > + [GCC_CNOC_BUS_TIMEOUT9_BCR] = { 0x80008 }, > + [GCC_CNOC_BUS_TIMEOUT10_BCR] = { 0x80010 }, > + [GCC_CNOC_BUS_TIMEOUT11_BCR] = { 0x80018 }, > + [GCC_CNOC_BUS_TIMEOUT12_BCR] = { 0x80020 }, > + [GCC_CNOC_BUS_TIMEOUT13_BCR] = { 0x80028 }, > + [GCC_CNOC_BUS_TIMEOUT14_BCR] = { 0x80030 }, > + [GCC_CNOC_BUS_TIMEOUT_EXTREF_BCR] = { 0x80038 }, > + [GCC_AGGRE1_NOC_BCR] = { 0x82000 }, > + [GCC_AGGRE2_NOC_BCR] = { 0x83000 }, > + [GCC_DCC_BCR] = { 0x84000 }, > + [GCC_QREFS_VBG_CAL_BCR] = { 0x88028 }, > + [GCC_IPA_BCR] = { 0x89000 }, > + [GCC_GLM_BCR] = { 0x8b000 }, > + [GCC_SKL_BCR] = { 0x8c000 }, > + [GCC_MSMPU_BCR] = { 0x8d000 }, > }; > > static const struct regmap_config gcc_msm8998_regmap_config = { > diff --git a/include/dt-bindings/clock/qcom,gcc-msm8998.h b/include/dt-bindings/clock/qcom,gcc-msm8998.h > index 58a242e..c751a40 100644 > --- a/include/dt-bindings/clock/qcom,gcc-msm8998.h > +++ b/include/dt-bindings/clock/qcom,gcc-msm8998.h > @@ -204,5 +204,92 @@ > #define GCC_TSIF_BCR 16 > #define GCC_UFS_BCR 17 > #define GCC_USB_30_BCR 18 > +#define GCC_SYSTEM_NOC_BCR 19 > +#define GCC_CONFIG_NOC_BCR 20 > +#define GCC_AHB2PHY_EAST_BCR 21 > +#define GCC_IMEM_BCR 22 > +#define GCC_PIMEM_BCR 23 > +#define GCC_MMSS_BCR 24 > +#define GCC_QDSS_BCR 25 > +#define GCC_WCSS_BCR 26 > +#define GCC_BLSP1_BCR 27 > +#define GCC_BLSP1_UART1_BCR 28 > +#define GCC_BLSP1_UART2_BCR 29 > +#define GCC_BLSP1_UART3_BCR 30 > +#define GCC_CM_PHY_REFGEN1_BCR 31 > +#define GCC_CM_PHY_REFGEN2_BCR 32 > +#define GCC_BLSP2_BCR 33 > +#define GCC_BLSP2_UART1_BCR 34 > +#define GCC_BLSP2_UART2_BCR 35 > +#define GCC_BLSP2_UART3_BCR 36 > +#define GCC_SRAM_SENSOR_BCR 37 > +#define GCC_PRNG_BCR 38 > +#define GCC_TSIF_0_RESET 39 > +#define GCC_TSIF_1_RESET 40 > +#define GCC_TCSR_BCR 41 > +#define GCC_BOOT_ROM_BCR 42 > +#define GCC_MSG_RAM_BCR 43 > +#define GCC_TLMM_BCR 44 > +#define GCC_MPM_BCR 45 > +#define GCC_SEC_CTRL_BCR 46 > +#define GCC_SPMI_BCR 47 > +#define GCC_SPDM_BCR 48 > +#define GCC_CE1_BCR 49 > +#define GCC_BIMC_BCR 50 > +#define GCC_SNOC_BUS_TIMEOUT0_BCR 51 > +#define GCC_SNOC_BUS_TIMEOUT1_BCR 52 > +#define GCC_SNOC_BUS_TIMEOUT3_BCR 53 > +#define GCC_SNOC_BUS_TIMEOUT_EXTREF_BCR 54 > +#define GCC_PNOC_BUS_TIMEOUT0_BCR 55 > +#define GCC_CNOC_PERIPH_BUS_TIMEOUT1_BCR 56 > +#define GCC_CNOC_PERIPH_BUS_TIMEOUT2_BCR 57 > +#define GCC_CNOC_BUS_TIMEOUT0_BCR 58 > +#define GCC_CNOC_BUS_TIMEOUT1_BCR 59 > +#define GCC_CNOC_BUS_TIMEOUT2_BCR 60 > +#define GCC_CNOC_BUS_TIMEOUT3_BCR 61 > +#define GCC_CNOC_BUS_TIMEOUT4_BCR 62 > +#define GCC_CNOC_BUS_TIMEOUT5_BCR 63 > +#define GCC_CNOC_BUS_TIMEOUT6_BCR 64 > +#define GCC_CNOC_BUS_TIMEOUT7_BCR 65 > +#define GCC_APB2JTAG_BCR 66 > +#define GCC_RBCPR_CX_BCR 67 > +#define GCC_RBCPR_MX_BCR 68 > +#define GCC_USB3_PHY_BCR 69 > +#define GCC_USB3PHY_PHY_BCR 70 > +#define GCC_USB3_DP_PHY_BCR 71 > +#define GCC_SSC_BCR 72 > +#define GCC_SSC_RESET 73 > +#define GCC_USB_PHY_CFG_AHB2PHY_BCR 74 > +#define GCC_PCIE_0_LINK_DOWN_BCR 75 > +#define GCC_PCIE_0_PHY_BCR 76 > +#define GCC_PCIE_0_NOCSR_COM_PHY_BCR 77 > +#define GCC_PCIE_PHY_BCR 78 > +#define GCC_PCIE_PHY_NOCSR_COM_PHY_BCR 79 > +#define GCC_PCIE_PHY_CFG_AHB_BCR 80 > +#define GCC_PCIE_PHY_COM_BCR 81 > +#define GCC_GPU_BCR 82 > +#define GCC_SPSS_BCR 83 > +#define GCC_OBT_ODT_BCR 84 > +#define GCC_VS_BCR 85 > +#define GCC_MSS_VS_RESET 86 > +#define GCC_GPU_VS_RESET 87 > +#define GCC_APC0_VS_RESET 88 > +#define GCC_APC1_VS_RESET 89 > +#define GCC_CNOC_BUS_TIMEOUT8_BCR 90 > +#define GCC_CNOC_BUS_TIMEOUT9_BCR 91 > +#define GCC_CNOC_BUS_TIMEOUT10_BCR 92 > +#define GCC_CNOC_BUS_TIMEOUT11_BCR 93 > +#define GCC_CNOC_BUS_TIMEOUT12_BCR 94 > +#define GCC_CNOC_BUS_TIMEOUT13_BCR 95 > +#define GCC_CNOC_BUS_TIMEOUT14_BCR 96 > +#define GCC_CNOC_BUS_TIMEOUT_EXTREF_BCR 97 > +#define GCC_AGGRE1_NOC_BCR 98 > +#define GCC_AGGRE2_NOC_BCR 99 > +#define GCC_DCC_BCR 100 > +#define GCC_QREFS_VBG_CAL_BCR 101 > +#define GCC_IPA_BCR 102 > +#define GCC_GLM_BCR 103 > +#define GCC_SKL_BCR 104 > +#define GCC_MSMPU_BCR 105 > > #endif > -- > Qualcomm Datacenter Technologies as an affiliate of Qualcomm Technologies, Inc. > Qualcomm Technologies, Inc. is a member of the > Code Aurora Forum, a Linux Foundation Collaborative Project. >