-LINUX_VERSION-6.6 = .100
-LINUX_KERNEL_HASH-6.6.100 = d6c0ec4d55b14814f55b62a0b23a2d95faf66877e48fbfb4b83523e4afdf97ba
+LINUX_VERSION-6.6 = .101
+LINUX_KERNEL_HASH-6.6.101 = 8c4ff2869736538b9b0d88ea8dbf0332b79c6ecc40a32066768a754df1fae1c0
struct vchiq_drvdata {
const unsigned int cache_line_size;
-@@ -1825,6 +1826,7 @@ static int vchiq_probe(struct platform_d
+@@ -1824,6 +1825,7 @@ static int vchiq_probe(struct platform_d
goto error_exit;
}
bcm2835_camera = vchiq_register_child(pdev, "bcm2835-camera");
bcm2835_audio = vchiq_register_child(pdev, "bcm2835_audio");
-@@ -1840,6 +1842,7 @@ static void vchiq_remove(struct platform
+@@ -1839,6 +1841,7 @@ static void vchiq_remove(struct platform
{
platform_device_unregister(bcm2835_audio);
platform_device_unregister(bcm2835_camera);
static struct platform_device *vcsm_cma;
struct vchiq_drvdata {
-@@ -1827,6 +1828,7 @@ static int vchiq_probe(struct platform_d
+@@ -1826,6 +1827,7 @@ static int vchiq_probe(struct platform_d
}
vcsm_cma = vchiq_register_child(pdev, "vcsm-cma");
bcm2835_camera = vchiq_register_child(pdev, "bcm2835-camera");
bcm2835_audio = vchiq_register_child(pdev, "bcm2835_audio");
-@@ -1842,6 +1844,7 @@ static void vchiq_remove(struct platform
+@@ -1841,6 +1843,7 @@ static void vchiq_remove(struct platform
{
platform_device_unregister(bcm2835_audio);
platform_device_unregister(bcm2835_camera);
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-@@ -1777,6 +1777,12 @@ vchiq_register_child(struct platform_dev
+@@ -1776,6 +1776,12 @@ vchiq_register_child(struct platform_dev
child = NULL;
}
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-@@ -1763,6 +1763,7 @@ vchiq_register_child(struct platform_dev
+@@ -1762,6 +1762,7 @@ vchiq_register_child(struct platform_dev
{
struct platform_device_info pdevinfo;
struct platform_device *child;
memset(&pdevinfo, 0, sizeof(pdevinfo));
-@@ -1778,10 +1779,20 @@ vchiq_register_child(struct platform_dev
+@@ -1777,10 +1778,20 @@ vchiq_register_child(struct platform_dev
}
/*
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-@@ -1772,12 +1772,20 @@ vchiq_register_child(struct platform_dev
+@@ -1771,12 +1771,20 @@ vchiq_register_child(struct platform_dev
pdevinfo.id = PLATFORM_DEVID_NONE;
pdevinfo.dma_mask = DMA_BIT_MASK(32);
struct vchiq_drvdata {
const unsigned int cache_line_size;
-@@ -1856,6 +1857,7 @@ static int vchiq_probe(struct platform_d
+@@ -1855,6 +1856,7 @@ static int vchiq_probe(struct platform_d
bcm2835_codec = vchiq_register_child(pdev, "bcm2835-codec");
bcm2835_camera = vchiq_register_child(pdev, "bcm2835-camera");
bcm2835_audio = vchiq_register_child(pdev, "bcm2835_audio");
return 0;
-@@ -1867,6 +1869,7 @@ error_exit:
+@@ -1866,6 +1868,7 @@ error_exit:
static void vchiq_remove(struct platform_device *pdev)
{
vchiq_log_info(vchiq_arm_log_level, "vchiq_init - done (slots %pK, phys %pad)",
vchiq_slot_zero, &slot_phys);
-@@ -1755,6 +1823,7 @@ void vchiq_platform_conn_state_changed(s
+@@ -1754,6 +1822,7 @@ void vchiq_platform_conn_state_changed(s
static const struct of_device_id vchiq_of_match[] = {
{ .compatible = "brcm,bcm2835-vchiq", .data = &bcm2835_drvdata },
{ .compatible = "brcm,bcm2836-vchiq", .data = &bcm2836_drvdata },
{},
};
MODULE_DEVICE_TABLE(of, vchiq_of_match);
-@@ -1787,22 +1856,8 @@ vchiq_register_child(struct platform_dev
+@@ -1786,22 +1855,8 @@ vchiq_register_child(struct platform_dev
child->dev.of_node = np;
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-@@ -1856,8 +1856,18 @@ vchiq_register_child(struct platform_dev
+@@ -1855,8 +1855,18 @@ vchiq_register_child(struct platform_dev
child->dev.of_node = np;
#include <linux/mutex.h>
#include <linux/err.h>
#include <linux/property.h>
-@@ -3483,3 +3484,5 @@ static int __init regmap_initcall(void)
+@@ -3485,3 +3486,5 @@ static int __init regmap_initcall(void)
return 0;
}
postcore_initcall(regmap_initcall);