firmware: I2C: Reference count the IMASK enables and disables

See: raspberrypi/firmware#585 kernel: Enable hid-betopff module (#1396) See: raspberrypi/linux#1396 kernel: bcm2835-sdhost: Firmware manages the clock divisor See: raspberrypi/linux@dff460c kernel: cpufreq: Temporarily ignore io_is_busy=1
Hexxeh · Apr 11, 2016 · 771a503 · 771a503
1 parent 826a755
commit 771a503
Show file tree

Hide file tree

Showing 29 changed files with 13 additions and 1 deletion.
diff --git a/fixup.dat b/fixup.dat
diff --git a/fixup_cd.dat b/fixup_cd.dat
diff --git a/fixup_db.dat b/fixup_db.dat
diff --git a/fixup_x.dat b/fixup_x.dat
diff --git a/git_hash b/git_hash
@@ -1 +1 @@
-698134278274540606b37c491dae94b44c6dcea4
+b698f506b9c461583291ef42a174e96d47eb031c
diff --git a/kernel.img b/kernel.img
diff --git a/kernel7.img b/kernel7.img
diff --git a/modules/4.1.21+/kernel/drivers/gpu/drm/vc4/vc4.ko b/modules/4.1.21+/kernel/drivers/gpu/drm/vc4/vc4.ko
diff --git a/modules/4.1.21+/kernel/drivers/hid/hid-betopff.ko b/modules/4.1.21+/kernel/drivers/hid/hid-betopff.ko
diff --git a/modules/4.1.21+/kernel/kernel/configs.ko b/modules/4.1.21+/kernel/kernel/configs.ko
diff --git a/modules/4.1.21+/modules.alias b/modules/4.1.21+/modules.alias
@@ -6858,6 +6858,10 @@ alias hid:b0003g*v000005ACp0000020E hid_apple
 alias hid:b0003g*v000005ACp00000304 hid_apple
 alias hid:b0003g*v00001020p00000006 hid_belkin
 alias hid:b0003g*v0000050Dp00003201 hid_belkin
+alias hid:b0003g*v000020BCp00005500 hid_betopff
+alias hid:b0003g*v00008380p00001850 hid_betopff
+alias hid:b0003g*v000011C0p00005506 hid_betopff
+alias hid:b0003g*v000011C2p00002208 hid_betopff
 alias hid:b0003g*v0000046Ap00000027 hid_cherry
 alias hid:b0003g*v0000046Ap00000023 hid_cherry
 alias hid:b0003g*v000004F2p00001125 hid_chicony

diff --git a/modules/4.1.21+/modules.alias.bin b/modules/4.1.21+/modules.alias.bin
diff --git a/modules/4.1.21+/modules.dep b/modules/4.1.21+/modules.dep
@@ -893,6 +893,7 @@ kernel/drivers/hid/hid-a4tech.ko:
 kernel/drivers/hid/hid-axff.ko:
 kernel/drivers/hid/hid-apple.ko:
 kernel/drivers/hid/hid-belkin.ko:
+kernel/drivers/hid/hid-betopff.ko: kernel/drivers/input/ff-memless.ko
 kernel/drivers/hid/hid-cherry.ko:
 kernel/drivers/hid/hid-chicony.ko:
 kernel/drivers/hid/hid-cypress.ko:

diff --git a/modules/4.1.21+/modules.dep.bin b/modules/4.1.21+/modules.dep.bin
diff --git a/modules/4.1.21+/modules.order b/modules/4.1.21+/modules.order
@@ -893,6 +893,7 @@ kernel/drivers/hid/hid-a4tech.ko
 kernel/drivers/hid/hid-axff.ko
 kernel/drivers/hid/hid-apple.ko
 kernel/drivers/hid/hid-belkin.ko
+kernel/drivers/hid/hid-betopff.ko
 kernel/drivers/hid/hid-cherry.ko
 kernel/drivers/hid/hid-chicony.ko
 kernel/drivers/hid/hid-cypress.ko

diff --git a/modules/4.1.21+/modules.symbols.bin b/modules/4.1.21+/modules.symbols.bin
diff --git a/modules/4.1.21-v7+/kernel/drivers/gpu/drm/vc4/vc4.ko b/modules/4.1.21-v7+/kernel/drivers/gpu/drm/vc4/vc4.ko
diff --git a/modules/4.1.21-v7+/kernel/drivers/hid/hid-betopff.ko b/modules/4.1.21-v7+/kernel/drivers/hid/hid-betopff.ko
diff --git a/modules/4.1.21-v7+/kernel/kernel/configs.ko b/modules/4.1.21-v7+/kernel/kernel/configs.ko
diff --git a/modules/4.1.21-v7+/modules.alias b/modules/4.1.21-v7+/modules.alias
@@ -6864,6 +6864,10 @@ alias hid:b0003g*v000005ACp0000020E hid_apple
 alias hid:b0003g*v000005ACp00000304 hid_apple
 alias hid:b0003g*v00001020p00000006 hid_belkin
 alias hid:b0003g*v0000050Dp00003201 hid_belkin
+alias hid:b0003g*v000020BCp00005500 hid_betopff
+alias hid:b0003g*v00008380p00001850 hid_betopff
+alias hid:b0003g*v000011C0p00005506 hid_betopff
+alias hid:b0003g*v000011C2p00002208 hid_betopff
 alias hid:b0003g*v0000046Ap00000027 hid_cherry
 alias hid:b0003g*v0000046Ap00000023 hid_cherry
 alias hid:b0003g*v000004F2p00001125 hid_chicony

diff --git a/modules/4.1.21-v7+/modules.alias.bin b/modules/4.1.21-v7+/modules.alias.bin
diff --git a/modules/4.1.21-v7+/modules.dep b/modules/4.1.21-v7+/modules.dep
@@ -897,6 +897,7 @@ kernel/drivers/hid/hid-a4tech.ko:
 kernel/drivers/hid/hid-axff.ko:
 kernel/drivers/hid/hid-apple.ko:
 kernel/drivers/hid/hid-belkin.ko:
+kernel/drivers/hid/hid-betopff.ko: kernel/drivers/input/ff-memless.ko
 kernel/drivers/hid/hid-cherry.ko:
 kernel/drivers/hid/hid-chicony.ko:
 kernel/drivers/hid/hid-cypress.ko:

diff --git a/modules/4.1.21-v7+/modules.dep.bin b/modules/4.1.21-v7+/modules.dep.bin
diff --git a/modules/4.1.21-v7+/modules.order b/modules/4.1.21-v7+/modules.order
@@ -897,6 +897,7 @@ kernel/drivers/hid/hid-a4tech.ko
 kernel/drivers/hid/hid-axff.ko
 kernel/drivers/hid/hid-apple.ko
 kernel/drivers/hid/hid-belkin.ko
+kernel/drivers/hid/hid-betopff.ko
 kernel/drivers/hid/hid-cherry.ko
 kernel/drivers/hid/hid-chicony.ko
 kernel/drivers/hid/hid-cypress.ko

diff --git a/modules/4.1.21-v7+/modules.symbols.bin b/modules/4.1.21-v7+/modules.symbols.bin
diff --git a/start.elf b/start.elf
diff --git a/start_cd.elf b/start_cd.elf
diff --git a/start_db.elf b/start_db.elf
diff --git a/start_x.elf b/start_x.elf
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		698134278274540606b37c491dae94b44c6dcea4
		b698f506b9c461583291ef42a174e96d47eb031c