On 01/29/2018 10:09 AM, argus.lin@xxxxxxxxxxxx wrote: > From: Argus Lin <argus.lin@xxxxxxxxxxxx> > > New pwrap support int1_en flag for starvation and channel > request exception. We need to register it for interrupt > handler. > We also add pwrap capability flag used to declare if we "We also" wording is nearly always a hint, that this should be done in two independent patches. > support BRIDGE, RESET, DCM, PRIORITY_SEL and INT1_EN > or not. > > Signed-off-by: Argus Lin <argus.lin@xxxxxxxxxxxx> > --- > drivers/soc/mediatek/mtk-pmic-wrap.c | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c > index e9e054a15b7d..9f924d3f8645 100644 > --- a/drivers/soc/mediatek/mtk-pmic-wrap.c > +++ b/drivers/soc/mediatek/mtk-pmic-wrap.c > @@ -76,6 +76,13 @@ > #define PWRAP_SLV_CAP_SECURITY BIT(2) > #define HAS_CAP(_c, _x) (((_c) & (_x)) == (_x)) > > +/* Group of bits used for shown pwrap capability */ > +#define PWRAP_CAP_BRIDGE BIT(0) > +#define PWRAP_CAP_RESET BIT(1) > +#define PWRAP_CAP_DCM BIT(2) As you told me the driver will be upstreamed in April, please add this flag when you upstream the driver, as this will be in a different kernel version. > +#define PWRAP_CAP_PRIORITY_SEL BIT(3) > +#define PWRAP_CAP_INT1_EN BIT(4) > + Add each flag when you add the user of the flag. > /* defines for slave device wrapper registers */ > enum dew_regs { > PWRAP_DEW_BASE, > @@ -681,9 +688,11 @@ struct pmic_wrapper_type { > enum pwrap_type type; > u32 arb_en_all; > u32 int_en_all; > + u32 int1_en_all; > u32 spi_w; > u32 wdt_src; > - unsigned int has_bridge:1; > + /* Flags indicating the capability for the target pwrap */ > + u32 caps; NAK, this will not compile. Please make sure that every patch on it's own does not break compilation. Regards, Matthias > int (*init_reg_clock)(struct pmic_wrapper *wrp); > int (*init_soc_specific)(struct pmic_wrapper *wrp); > }; > -- > 2.12.5 > > ************* Email Confidentiality Notice > ******************** > The information contained in this e-mail message (including any > attachments) may be confidential, proprietary, privileged, or otherwise > exempt from disclosure under applicable laws. It is intended to be > conveyed only to the designated recipient(s). Any use, dissemination, > distribution, printing, retaining or copying of this e-mail (including its > attachments) by unintended recipient(s) is strictly prohibited and may > be unlawful. If you are not an intended recipient of this e-mail, or believe > > that you have received this e-mail in error, please notify the sender > immediately (by replying to this e-mail), delete any and all copies of > this e-mail (including any attachments) from your system, and do not > disclose the content of this e-mail to any other person. Thank > you! > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html