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

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

Merge "clock-samarium: Add BCR reg for camss_micro_ahb_clk"

parents 430ea012 47f89027

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

+2 −0
Original line number Diff line number Diff line
@@ -330,6 +330,7 @@ static DEFINE_VDD_REGULATORS(vdd_dig, VDD_DIG_NUM, 1, vdd_corner, NULL); 
#define CAMSS_GP1_CBCR                                     (0x3474)

#define CAMSS_TOP_AHB_CBCR                                 (0x3484)

#define CAMSS_AHB_CBCR                                     (0x348C)

#define CAMSS_MICRO_BCR                                    (0x3490)

#define CAMSS_MICRO_AHB_CBCR                               (0x3494)

#define JPEG0_CMD_RCGR                                     (0x3500)

#define CAMSS_JPEG_JPEG0_CBCR                              (0x35A8)
@@ -2529,6 +2530,7 @@ static struct branch_clk camss_mclk2_clk = { 


static struct branch_clk camss_micro_ahb_clk = {

	.cbcr_reg = CAMSS_MICRO_AHB_CBCR,

	.bcr_reg = CAMSS_MICRO_BCR,

	.has_sibling = 1,

	.base = &virt_bases[MMSS_BASE],

	.c = {