Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/net/ethernet/rocker/rocker.c

The rocker commit was two overlapping changes, one to rename
the ->vport member to ->pport, and another making the bitmask
expression use '1ULL' instead of plain '1'.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 14 insertions, 0 deletions

diff --git a/drivers/mfd/sun6i-prcm.c b/drivers/mfd/sun6i-prcm.c
index 2f2e9f062571..191173166d65 100644
--- a/drivers/mfd/sun6i-prcm.c
+++ b/drivers/mfd/sun6i-prcm.c
@@ -41,6 +41,14 @@ static const struct resource sun6i_a31_apb0_gates_clk_res[] = {
         },
 };
 
+static const struct resource sun6i_a31_ir_clk_res[] = {
+        {
+                .start = 0x54,
+                .end = 0x57,
+                .flags = IORESOURCE_MEM,
+        },
+};
+
 static const struct resource sun6i_a31_apb0_rstc_res[] = {
         {
                 .start = 0xb0,
@@ -69,6 +77,12 @@ static const struct mfd_cell sun6i_a31_prcm_subdevs[] = {
                 .resources = sun6i_a31_apb0_gates_clk_res,
         },
         {
+                .name = "sun6i-a31-ir-clk",
+                .of_compatible = "allwinner,sun4i-a10-mod0-clk",
+                .num_resources = ARRAY_SIZE(sun6i_a31_ir_clk_res),
+                .resources = sun6i_a31_ir_clk_res,
+        },
+        {
                 .name = "sun6i-a31-apb0-clock-reset",
                 .of_compatible = "allwinner,sun6i-a31-clock-reset",
                 .num_resources = ARRAY_SIZE(sun6i_a31_apb0_rstc_res),