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

Commit dff9e6d0 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: clock-krypton: Add block control registers for usb"

parents 4072f93c 6afb8a9b

arch/arm/mach-msm/clock-krypton.c

+4 −0
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ static DEFINE_VDD_REGULATORS(vdd_dig, VDD_DIG_NUM, 1, vdd_corner, NULL); 
#define USB_HS_AHB_CBCR                                    (0x0488)

#define USB_HS_SYSTEM_CMD_RCGR                             (0x0490)

#define USB2A_PHY_SLEEP_CBCR                               (0x04AC)

#define USB2B_PHY_BCR                                      (0x04B0)

#define USB2B_PHY_SLEEP_CBCR                               (0x04B4)

#define SDCC2_APPS_CMD_RCGR                                (0x0510)

#define SDCC2_APPS_CBCR                                    (0x0504)
@@ -250,6 +251,7 @@ static DEFINE_VDD_REGULATORS(vdd_dig, VDD_DIG_NUM, 1, vdd_corner, NULL); 
#define CLOCK_FRQ_MEASURE_CTL                              (0x1884)

#define CLOCK_FRQ_MEASURE_STATUS                           (0x1888)

#define PLLTEST_PAD_CFG                                    (0x188C)

#define USB3PHY_PHY_BCR                                    (0x1B8C)

#define PCIE_CFG_AHB_CBCR                                  (0x1C04)

#define PCIE_PIPE_CBCR                                     (0x1C08)

#define PCIE_AXI_CBCR                                      (0x1C0C)
@@ -1454,6 +1456,7 @@ static struct branch_clk gcc_usb2a_phy_sleep_clk = { 


static struct branch_clk gcc_usb2b_phy_sleep_clk = {

	.cbcr_reg = USB2B_PHY_SLEEP_CBCR,

	.bcr_reg = USB2B_PHY_BCR,

	.has_sibling = 1,

	.base = &virt_bases[GCC_BASE],

	.c = {
@@ -1488,6 +1491,7 @@ static struct branch_clk gcc_usb3_aux_clk = { 


static struct branch_clk gcc_usb3_pipe_clk = {

	.cbcr_reg = USB3_PIPE_CBCR,

	.bcr_reg = USB3PHY_PHY_BCR,

	.has_sibling = 0,

	.base = &virt_bases[GCC_BASE],

	.c = {