Merge branch 'bits/002-backports' into asahi-wip

Author: jannau

drivers/bus/simple-pm-bus.c

@@ -142,6 +142,15 @@ static const struct of_device_id simple_pm_bus_of_match[] = {
 	{ .compatible = "simple-mfd",	.data = ONLY_BUS },
 	{ .compatible = "isa",		.data = ONLY_BUS },
 	{ .compatible = "arm,amba-bus",	.data = ONLY_BUS },
+	{ .compatible = "apple,s5l8960x-pmgr",	.data = ONLY_BUS },
+	{ .compatible = "apple,t7000-pmgr",	.data = ONLY_BUS },
+	{ .compatible = "apple,s8000-pmgr",	.data = ONLY_BUS },
+	{ .compatible = "apple,t8010-pmgr",	.data = ONLY_BUS },
+	{ .compatible = "apple,t8015-pmgr",	.data = ONLY_BUS },
+	{ .compatible = "apple,t8103-pmgr",	.data = ONLY_BUS },
+	{ .compatible = "apple,t8112-pmgr",	.data = ONLY_BUS },
+	{ .compatible = "apple,t6000-pmgr",	.data = ONLY_BUS },
+	{ .compatible = "apple,t6020-pmgr",	.data = ONLY_BUS },
 	{ /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, simple_pm_bus_of_match);

drivers/media/common/videobuf2/videobuf2-dma-sg.c

@@ -345,6 +345,7 @@ static int vb2_dma_sg_mmap(void *buf_priv, struct vm_area_struct *vma)
 		return err;
 	}
 
+	vm_flags_set(vma, VM_DONTEXPAND | VM_DONTDUMP);
 	/*
 	 * Use common vm_area operations to track buffer refcount.
 	 */

drivers/mfd/macsmc.c

@@ -413,6 +413,7 @@ static int apple_smc_probe(struct platform_device *pdev)
 	if (!smc)
 		return -ENOMEM;
 
+	mutex_init(&smc->mutex);
 	smc->dev = &pdev->dev;
 	smc->sram_base = devm_platform_get_and_ioremap_resource(pdev, 1, &smc->sram);
 	if (IS_ERR(smc->sram_base))

drivers/nvmem/core.c

@@ -1618,12 +1618,14 @@ static void nvmem_shift_read_buffer_in_place(struct nvmem_cell_entry *cell, void
 		*p = *b++ >> bit_offset;
 
 		/* setup rest of the bytes if any */
-		for (i = 1; i < cell->bytes; i++) {
+		for (i = 1; i < (cell->bytes - bytes_offset); i++) {
 			/* Get bits from next byte and shift them towards msb */
 			*p++ |= *b << (BITS_PER_BYTE - bit_offset);
 
 			*p = *b++ >> bit_offset;
 		}
+		/* point to end of the buffer unused bits will be cleared */
+		p = buf + cell->bytes - 1;
 	} else if (p != b) {
 		memmove(p, b, cell->bytes - bytes_offset);
 		p += cell->bytes - 1;