On Fri, Sep 02, 2016 at 10:55:19AM -0500, Bjorn Helgaas wrote: > > --- > drivers/pci/host/pcie-rockchip.c | 148 +++++++++++++++++++------------------- > 1 file changed, 74 insertions(+), 74 deletions(-) > > diff --git a/drivers/pci/host/pcie-rockchip.c b/drivers/pci/host/pcie-rockchip.c > index 6edfce5..fe1b52f 100644 > --- a/drivers/pci/host/pcie-rockchip.c > +++ b/drivers/pci/host/pcie-rockchip.c > @@ -37,21 +37,27 @@ > #include <linux/reset.h> > #include <linux/regmap.h> > > -#define PCIE_CLIENT_BASE 0x0 > -#define PCIE_RC_CONFIG_BASE 0xa00000 > -#define PCIE_RC_CONFIG_L1_SUBSTATE_CTRL2 (PCIE_RC_CONFIG_BASE + 0x90c) > -#define PCIE_RC_CONFIG_LCS (PCIE_RC_CONFIG_BASE + 0x0d0) > -#define PCIE_RC_CONFIG_LCS_RETRAIN_LINK BIT(5) > -#define PCIE_RC_CONFIG_LCS_LBMIE BIT(10) > -#define PCIE_RC_CONFIG_LCS_LABIE BIT(11) > -#define PCIE_RC_CONFIG_LCS_LBMS BIT(30) > -#define PCIE_RC_CONFIG_LCS_LAMS BIT(31) > -#define PCIE_CORE_CTRL_MGMT_BASE 0x900000 > -#define PCIE_CORE_AXI_CONF_BASE 0xc00000 > -#define PCIE_CORE_AXI_INBOUND_BASE 0xc00800 > -#define PCIE_CLIENT_BASIC_STATUS1 (PCIE_CLIENT_BASE + 0x48) > -#define PCIE_CLIENT_INT_MASK (PCIE_CLIENT_BASE + 0x4c) > -#define PCIE_CLIENT_INT_STATUS (PCIE_CLIENT_BASE + 0x50) > +/* > + * The upper 16 bits of PCIE_CLIENT_BASE are a write mask for the lower 16 > + * bits. This allows atomic updates of the register without locking. > + */ > +#define HIWORD_UPDATE(mask, val) ((mask << 16) | val) > + (mask), (val) > +#define ENCODE_LANES(x) (((x >> 1) & 3) << 4) (x) Guenter -- 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
