Skip to content

Commit

Permalink
kernel: drm/vc4: Partial revert of 4441
Browse files Browse the repository at this point in the history
See: raspberrypi/linux#4478

kernel: Modify overlay and add driver for Chipdip DAC
See: raspberrypi/linux#4476

kernel: ARM: dts: Correct CM4 PHY MDIO address

kernel: brcmfmac: Try product-specific clm_blob names first
See: raspberrypi/linux#4469

kernel: overlays: Set CMA to 512MB on Pi 4 for vc4
  • Loading branch information
popcornmix committed Jul 27, 2021
1 parent 1fad1d2 commit b986fda
Show file tree
Hide file tree
Showing 57 changed files with 41 additions and 8 deletions.
Binary file modified bcm2711-rpi-cm4.dtb
Binary file not shown.
2 changes: 1 addition & 1 deletion git_hash
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2697f7403187bb2bb61cc716f33ee9f6cfb9af7c
86729e78125d4f3d203457940feee8bc97b11f6c
Binary file modified kernel.img
Binary file not shown.
Binary file modified kernel7.img
Binary file not shown.
Binary file modified kernel7l.img
Binary file not shown.
Binary file modified kernel8.img
Binary file not shown.
Binary file modified modules/5.10.52+/kernel/drivers/gpu/drm/vc4/vc4.ko
Binary file not shown.
Binary file not shown.
Binary file modified modules/5.10.52+/kernel/kernel/configs.ko
Binary file not shown.
Binary file not shown.
2 changes: 2 additions & 0 deletions modules/5.10.52+/modules.alias
Original file line number Diff line number Diff line change
Expand Up @@ -10989,6 +10989,8 @@ alias of:N*T*Cjustboom,justboom-digiC* snd_soc_rpi_wm8804_soundcard
alias of:N*T*Cjustboom,justboom-digi snd_soc_rpi_wm8804_soundcard
alias of:N*T*Cpifi,pifi-40C* snd_soc_pifi_40
alias of:N*T*Cpifi,pifi-40 snd_soc_pifi_40
alias of:N*T*Cchipdip,chipdip-dacC* snd_soc_chipdip_dac
alias of:N*T*Cchipdip,chipdip-dac snd_soc_chipdip_dac
alias act_xt act_ipt
alias sch_clsact sch_ingress
alias ematch-kind-1 em_cmp
Expand Down
Binary file modified modules/5.10.52+/modules.alias.bin
Binary file not shown.
1 change: 1 addition & 0 deletions modules/5.10.52+/modules.dep
Original file line number Diff line number Diff line change
Expand Up @@ -1289,6 +1289,7 @@ kernel/sound/soc/bcm/snd-soc-fe-pi-audio.ko: kernel/sound/soc/snd-soc-core.ko ke
kernel/sound/soc/bcm/snd-soc-rpi-simple-soundcard.ko: kernel/sound/soc/snd-soc-core.ko kernel/sound/core/snd-compress.ko kernel/sound/core/snd-pcm-dmaengine.ko kernel/sound/core/snd-pcm.ko kernel/sound/core/snd-timer.ko kernel/sound/core/snd.ko
kernel/sound/soc/bcm/snd-soc-rpi-wm8804-soundcard.ko: kernel/sound/soc/snd-soc-core.ko kernel/sound/core/snd-compress.ko kernel/sound/core/snd-pcm-dmaengine.ko kernel/sound/core/snd-pcm.ko kernel/sound/core/snd-timer.ko kernel/sound/core/snd.ko
kernel/sound/soc/bcm/snd-soc-pifi-40.ko: kernel/sound/soc/snd-soc-core.ko kernel/sound/core/snd-compress.ko kernel/sound/core/snd-pcm-dmaengine.ko kernel/sound/core/snd-pcm.ko kernel/sound/core/snd-timer.ko kernel/sound/core/snd.ko
kernel/sound/soc/bcm/snd-soc-chipdip-dac.ko: kernel/sound/soc/snd-soc-core.ko kernel/sound/core/snd-compress.ko kernel/sound/core/snd-pcm-dmaengine.ko kernel/sound/core/snd-pcm.ko kernel/sound/core/snd-timer.ko kernel/sound/core/snd.ko
kernel/net/core/pktgen.ko:
kernel/net/802/p8022.ko: kernel/net/llc/llc.ko
kernel/net/802/psnap.ko: kernel/net/llc/llc.ko
Expand Down
Binary file modified modules/5.10.52+/modules.dep.bin
Binary file not shown.
1 change: 1 addition & 0 deletions modules/5.10.52+/modules.order
Original file line number Diff line number Diff line change
Expand Up @@ -1289,6 +1289,7 @@ kernel/sound/soc/bcm/snd-soc-fe-pi-audio.ko
kernel/sound/soc/bcm/snd-soc-rpi-simple-soundcard.ko
kernel/sound/soc/bcm/snd-soc-rpi-wm8804-soundcard.ko
kernel/sound/soc/bcm/snd-soc-pifi-40.ko
kernel/sound/soc/bcm/snd-soc-chipdip-dac.ko
kernel/net/core/pktgen.ko
kernel/net/802/p8022.ko
kernel/net/802/psnap.ko
Expand Down
Binary file modified modules/5.10.52+/modules.symbols.bin
Binary file not shown.
Binary file modified modules/5.10.52-v7+/kernel/drivers/gpu/drm/vc4/vc4.ko
Binary file not shown.
Binary file not shown.
Binary file modified modules/5.10.52-v7+/kernel/kernel/configs.ko
Binary file not shown.
Binary file not shown.
2 changes: 2 additions & 0 deletions modules/5.10.52-v7+/modules.alias
Original file line number Diff line number Diff line change
Expand Up @@ -10980,6 +10980,8 @@ alias of:N*T*Cjustboom,justboom-digiC* snd_soc_rpi_wm8804_soundcard
alias of:N*T*Cjustboom,justboom-digi snd_soc_rpi_wm8804_soundcard
alias of:N*T*Cpifi,pifi-40C* snd_soc_pifi_40
alias of:N*T*Cpifi,pifi-40 snd_soc_pifi_40
alias of:N*T*Cchipdip,chipdip-dacC* snd_soc_chipdip_dac
alias of:N*T*Cchipdip,chipdip-dac snd_soc_chipdip_dac
alias act_xt act_ipt
alias sch_clsact sch_ingress
alias ematch-kind-1 em_cmp
Expand Down
Binary file modified modules/5.10.52-v7+/modules.alias.bin
Binary file not shown.
1 change: 1 addition & 0 deletions modules/5.10.52-v7+/modules.dep
Original file line number Diff line number Diff line change
Expand Up @@ -1279,6 +1279,7 @@ kernel/sound/soc/bcm/snd-soc-fe-pi-audio.ko: kernel/sound/soc/snd-soc-core.ko ke
kernel/sound/soc/bcm/snd-soc-rpi-simple-soundcard.ko: kernel/sound/soc/snd-soc-core.ko kernel/sound/core/snd-compress.ko kernel/sound/core/snd-pcm-dmaengine.ko kernel/sound/core/snd-pcm.ko kernel/sound/core/snd-timer.ko kernel/sound/core/snd.ko
kernel/sound/soc/bcm/snd-soc-rpi-wm8804-soundcard.ko: kernel/sound/soc/snd-soc-core.ko kernel/sound/core/snd-compress.ko kernel/sound/core/snd-pcm-dmaengine.ko kernel/sound/core/snd-pcm.ko kernel/sound/core/snd-timer.ko kernel/sound/core/snd.ko
kernel/sound/soc/bcm/snd-soc-pifi-40.ko: kernel/sound/soc/snd-soc-core.ko kernel/sound/core/snd-compress.ko kernel/sound/core/snd-pcm-dmaengine.ko kernel/sound/core/snd-pcm.ko kernel/sound/core/snd-timer.ko kernel/sound/core/snd.ko
kernel/sound/soc/bcm/snd-soc-chipdip-dac.ko: kernel/sound/soc/snd-soc-core.ko kernel/sound/core/snd-compress.ko kernel/sound/core/snd-pcm-dmaengine.ko kernel/sound/core/snd-pcm.ko kernel/sound/core/snd-timer.ko kernel/sound/core/snd.ko
kernel/net/core/pktgen.ko:
kernel/net/802/p8022.ko: kernel/net/llc/llc.ko
kernel/net/802/psnap.ko: kernel/net/llc/llc.ko
Expand Down
Binary file modified modules/5.10.52-v7+/modules.dep.bin
Binary file not shown.
1 change: 1 addition & 0 deletions modules/5.10.52-v7+/modules.order
Original file line number Diff line number Diff line change
Expand Up @@ -1279,6 +1279,7 @@ kernel/sound/soc/bcm/snd-soc-fe-pi-audio.ko
kernel/sound/soc/bcm/snd-soc-rpi-simple-soundcard.ko
kernel/sound/soc/bcm/snd-soc-rpi-wm8804-soundcard.ko
kernel/sound/soc/bcm/snd-soc-pifi-40.ko
kernel/sound/soc/bcm/snd-soc-chipdip-dac.ko
kernel/net/core/pktgen.ko
kernel/net/802/p8022.ko
kernel/net/802/psnap.ko
Expand Down
Binary file modified modules/5.10.52-v7+/modules.symbols.bin
Binary file not shown.
Binary file modified modules/5.10.52-v7l+/kernel/drivers/gpu/drm/vc4/vc4.ko
Binary file not shown.
Binary file not shown.
Binary file modified modules/5.10.52-v7l+/kernel/kernel/configs.ko
Binary file not shown.
Binary file not shown.
2 changes: 2 additions & 0 deletions modules/5.10.52-v7l+/modules.alias
Original file line number Diff line number Diff line change
Expand Up @@ -11438,6 +11438,8 @@ alias of:N*T*Cjustboom,justboom-digiC* snd_soc_rpi_wm8804_soundcard
alias of:N*T*Cjustboom,justboom-digi snd_soc_rpi_wm8804_soundcard
alias of:N*T*Cpifi,pifi-40C* snd_soc_pifi_40
alias of:N*T*Cpifi,pifi-40 snd_soc_pifi_40
alias of:N*T*Cchipdip,chipdip-dacC* snd_soc_chipdip_dac
alias of:N*T*Cchipdip,chipdip-dac snd_soc_chipdip_dac
alias act_xt act_ipt
alias sch_clsact sch_ingress
alias ematch-kind-1 em_cmp
Expand Down
Binary file modified modules/5.10.52-v7l+/modules.alias.bin
Binary file not shown.
1 change: 1 addition & 0 deletions modules/5.10.52-v7l+/modules.dep
Original file line number Diff line number Diff line change
Expand Up @@ -1288,6 +1288,7 @@ kernel/sound/soc/bcm/snd-soc-fe-pi-audio.ko: kernel/sound/soc/snd-soc-core.ko ke
kernel/sound/soc/bcm/snd-soc-rpi-simple-soundcard.ko: kernel/sound/soc/snd-soc-core.ko kernel/sound/core/snd-compress.ko kernel/sound/core/snd-pcm-dmaengine.ko kernel/sound/core/snd-pcm.ko kernel/sound/core/snd-timer.ko kernel/sound/core/snd.ko
kernel/sound/soc/bcm/snd-soc-rpi-wm8804-soundcard.ko: kernel/sound/soc/snd-soc-core.ko kernel/sound/core/snd-compress.ko kernel/sound/core/snd-pcm-dmaengine.ko kernel/sound/core/snd-pcm.ko kernel/sound/core/snd-timer.ko kernel/sound/core/snd.ko
kernel/sound/soc/bcm/snd-soc-pifi-40.ko: kernel/sound/soc/snd-soc-core.ko kernel/sound/core/snd-compress.ko kernel/sound/core/snd-pcm-dmaengine.ko kernel/sound/core/snd-pcm.ko kernel/sound/core/snd-timer.ko kernel/sound/core/snd.ko
kernel/sound/soc/bcm/snd-soc-chipdip-dac.ko: kernel/sound/soc/snd-soc-core.ko kernel/sound/core/snd-compress.ko kernel/sound/core/snd-pcm-dmaengine.ko kernel/sound/core/snd-pcm.ko kernel/sound/core/snd-timer.ko kernel/sound/core/snd.ko
kernel/net/core/pktgen.ko:
kernel/net/802/p8022.ko: kernel/net/llc/llc.ko
kernel/net/802/psnap.ko: kernel/net/llc/llc.ko
Expand Down
Binary file modified modules/5.10.52-v7l+/modules.dep.bin
Binary file not shown.
1 change: 1 addition & 0 deletions modules/5.10.52-v7l+/modules.order
Original file line number Diff line number Diff line change
Expand Up @@ -1288,6 +1288,7 @@ kernel/sound/soc/bcm/snd-soc-fe-pi-audio.ko
kernel/sound/soc/bcm/snd-soc-rpi-simple-soundcard.ko
kernel/sound/soc/bcm/snd-soc-rpi-wm8804-soundcard.ko
kernel/sound/soc/bcm/snd-soc-pifi-40.ko
kernel/sound/soc/bcm/snd-soc-chipdip-dac.ko
kernel/net/core/pktgen.ko
kernel/net/802/p8022.ko
kernel/net/802/psnap.ko
Expand Down
Binary file modified modules/5.10.52-v7l+/modules.symbols.bin
Binary file not shown.
Binary file modified modules/5.10.52-v8+/kernel/drivers/gpu/drm/vc4/vc4.ko
Binary file not shown.
Binary file not shown.
Binary file modified modules/5.10.52-v8+/kernel/kernel/configs.ko
Binary file not shown.
Binary file not shown.
2 changes: 2 additions & 0 deletions modules/5.10.52-v8+/modules.alias
Original file line number Diff line number Diff line change
Expand Up @@ -11437,6 +11437,8 @@ alias of:N*T*Cjustboom,justboom-digiC* snd_soc_rpi_wm8804_soundcard
alias of:N*T*Cjustboom,justboom-digi snd_soc_rpi_wm8804_soundcard
alias of:N*T*Cpifi,pifi-40C* snd_soc_pifi_40
alias of:N*T*Cpifi,pifi-40 snd_soc_pifi_40
alias of:N*T*Cchipdip,chipdip-dacC* snd_soc_chipdip_dac
alias of:N*T*Cchipdip,chipdip-dac snd_soc_chipdip_dac
alias act_xt act_ipt
alias sch_clsact sch_ingress
alias ematch-kind-1 em_cmp
Expand Down
Binary file modified modules/5.10.52-v8+/modules.alias.bin
Binary file not shown.
1 change: 1 addition & 0 deletions modules/5.10.52-v8+/modules.dep
Original file line number Diff line number Diff line change
Expand Up @@ -1297,6 +1297,7 @@ kernel/sound/soc/bcm/snd-soc-fe-pi-audio.ko: kernel/sound/soc/snd-soc-core.ko ke
kernel/sound/soc/bcm/snd-soc-rpi-simple-soundcard.ko: kernel/sound/soc/snd-soc-core.ko kernel/sound/core/snd-compress.ko kernel/sound/core/snd-pcm-dmaengine.ko kernel/sound/core/snd-pcm.ko kernel/sound/core/snd-timer.ko kernel/sound/core/snd.ko
kernel/sound/soc/bcm/snd-soc-rpi-wm8804-soundcard.ko: kernel/sound/soc/snd-soc-core.ko kernel/sound/core/snd-compress.ko kernel/sound/core/snd-pcm-dmaengine.ko kernel/sound/core/snd-pcm.ko kernel/sound/core/snd-timer.ko kernel/sound/core/snd.ko
kernel/sound/soc/bcm/snd-soc-pifi-40.ko: kernel/sound/soc/snd-soc-core.ko kernel/sound/core/snd-compress.ko kernel/sound/core/snd-pcm-dmaengine.ko kernel/sound/core/snd-pcm.ko kernel/sound/core/snd-timer.ko kernel/sound/core/snd.ko
kernel/sound/soc/bcm/snd-soc-chipdip-dac.ko: kernel/sound/soc/snd-soc-core.ko kernel/sound/core/snd-compress.ko kernel/sound/core/snd-pcm-dmaengine.ko kernel/sound/core/snd-pcm.ko kernel/sound/core/snd-timer.ko kernel/sound/core/snd.ko
kernel/net/core/pktgen.ko:
kernel/net/802/p8022.ko: kernel/net/llc/llc.ko
kernel/net/802/psnap.ko: kernel/net/llc/llc.ko
Expand Down
Binary file modified modules/5.10.52-v8+/modules.dep.bin
Binary file not shown.
1 change: 1 addition & 0 deletions modules/5.10.52-v8+/modules.order
Original file line number Diff line number Diff line change
Expand Up @@ -1297,6 +1297,7 @@ kernel/sound/soc/bcm/snd-soc-fe-pi-audio.ko
kernel/sound/soc/bcm/snd-soc-rpi-simple-soundcard.ko
kernel/sound/soc/bcm/snd-soc-rpi-wm8804-soundcard.ko
kernel/sound/soc/bcm/snd-soc-pifi-40.ko
kernel/sound/soc/bcm/snd-soc-chipdip-dac.ko
kernel/net/core/pktgen.ko
kernel/net/802/p8022.ko
kernel/net/802/psnap.ko
Expand Down
Binary file modified modules/5.10.52-v8+/modules.symbols.bin
Binary file not shown.
23 changes: 20 additions & 3 deletions overlays/README
Original file line number Diff line number Diff line change
Expand Up @@ -628,9 +628,9 @@ Load: dtoverlay=cap1106,<param>=<val>
Params: int_pin GPIO pin for interrupt signal (default 23)


Name: chipdip-i2s-master-dac
Info: Configures Raspberry PI to work as I2S slave with BCLK=64Fs.
Load: dtoverlay=chipdip-i2s-master-dac
Name: chipdip-dac
Info: Configures Chip Dip audio cards.
Load: dtoverlay=chipdip-dac
Params: <None>


Expand Down Expand Up @@ -3268,6 +3268,23 @@ Params: cma-512 CMA is 512MB (needs 1GB)
cma-default Use upstream's default value


Name: vc4-fkms-v3d-pi4
Info: Enable Eric Anholt's DRM VC4 V3D driver on top of the dispmanx
display stack.
Load: dtoverlay=vc4-fkms-v3d-pi4,<param>
Params: cma-512 CMA is 512MB (needs 1GB)
cma-448 CMA is 448MB (needs 1GB)
cma-384 CMA is 384MB (needs 1GB)
cma-320 CMA is 320MB (needs 1GB)
cma-256 CMA is 256MB (needs 1GB)
cma-192 CMA is 192MB (needs 1GB)
cma-128 CMA is 128MB
cma-96 CMA is 96MB
cma-64 CMA is 64MB
cma-size CMA size in bytes, 4MB aligned
cma-default Use upstream's default value


Name: vc4-kms-dpi-at056tn53v1
Info: Enable an Innolux 5.6in VGA TFT connected to DPI interface under KMS.
Requires vc4-kms-v3d to be loaded.
Expand Down
Binary file added overlays/chipdip-dac.dtbo
Binary file not shown.
Binary file removed overlays/chipdip-i2s-master-dac.dtbo
Binary file not shown.
Binary file modified overlays/overlay_map.dtb
Binary file not shown.
Binary file modified overlays/upstream-pi4.dtbo
Binary file not shown.
Binary file added overlays/vc4-fkms-v3d-pi4.dtbo
Binary file not shown.
Binary file modified overlays/vc4-kms-v3d-pi4.dtbo
Binary file not shown.
2 changes: 1 addition & 1 deletion uname_string
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Linux version 5.10.52+ (dom@buildbot) (arm-linux-gnueabihf-gcc-8 (Ubuntu/Linaro 8.4.0-3ubuntu1) 8.4.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #1439 Thu Jul 22 15:36:50 BST 2021
Linux version 5.10.52+ (dom@buildbot) (arm-linux-gnueabihf-gcc-8 (Ubuntu/Linaro 8.4.0-3ubuntu1) 8.4.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #1440 Tue Jul 27 09:53:08 BST 2021
2 changes: 1 addition & 1 deletion uname_string7
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Linux version 5.10.52-v7+ (dom@buildbot) (arm-linux-gnueabihf-gcc-8 (Ubuntu/Linaro 8.4.0-3ubuntu1) 8.4.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #1439 SMP Thu Jul 22 15:39:00 BST 2021
Linux version 5.10.52-v7+ (dom@buildbot) (arm-linux-gnueabihf-gcc-8 (Ubuntu/Linaro 8.4.0-3ubuntu1) 8.4.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #1440 SMP Tue Jul 27 09:54:13 BST 2021
2 changes: 1 addition & 1 deletion uname_string7l
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Linux version 5.10.52-v7l+ (dom@buildbot) (arm-linux-gnueabihf-gcc-8 (Ubuntu/Linaro 8.4.0-3ubuntu1) 8.4.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #1439 SMP Thu Jul 22 15:41:13 BST 2021
Linux version 5.10.52-v7l+ (dom@buildbot) (arm-linux-gnueabihf-gcc-8 (Ubuntu/Linaro 8.4.0-3ubuntu1) 8.4.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #1440 SMP Tue Jul 27 09:55:21 BST 2021
2 changes: 1 addition & 1 deletion uname_string8
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Linux version 5.10.52-v8+ (dom@buildbot) (aarch64-linux-gnu-gcc-8 (Ubuntu/Linaro 8.4.0-3ubuntu1) 8.4.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #1439 SMP PREEMPT Thu Jul 22 15:43:49 BST 2021
Linux version 5.10.52-v8+ (dom@buildbot) (aarch64-linux-gnu-gcc-8 (Ubuntu/Linaro 8.4.0-3ubuntu1) 8.4.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #1440 SMP PREEMPT Tue Jul 27 09:56:40 BST 2021

0 comments on commit b986fda

Please sign in to comment.