Skip to content

Conversation

@gtrainavicius
Copy link
Contributor

Continuing from #6728

Copy link
Contributor

@pelwell pelwell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a huge PR. Are the difference to the standard adau1961 driver so great that a complete fork was the best way forward?


Name: pisound-micro
Info: Configures the Blokas Labs Pisound Micro card
Load: dtoverlay=pisound-micro
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You'll have to add ,<param>=<val> here.

Name: pisound-micro
Info: Configures the Blokas Labs Pisound Micro card
Load: dtoverlay=pisound-micro
Params: input-mode 'differential' (default) or 'single-ended'.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indents are at fixed character positions. Each of these lines needs an extra space for the body text. Fortunately, there is room.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed both README issues.

};

__overrides__ {
input-mode=<&pisound_micro_codec>,"input-mode{single-ended,differential}";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a nice use of lookup tables for input validation.

};

__exports__ {
pisound_micro_ctrl;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How do you plan to use the label outside the overlay?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here's an example how rotary-encoder driver could be used with that:

/dts-v1/;
/plugin/;

#include <dt-bindings/gpio/gpio.h>

/ {
	compatible = "brcm,bcm2835";

	fragment@0 {
		target-path = "/";
		__overlay__ {
			rotary_encoder@0 {
				compatible = "rotary-encoder";
				gpios = <&pisound_micro_ctrl 0 GPIO_ACTIVE_LOW>, <&pisound_micro_ctrl 1 GPIO_ACTIVE_LOW>;
				linux,axis = <0>;
				rotary-encoder,encoding = "binary";
				rotary-encoder,rollover;
			};
		};
	};
};

@gtrainavicius
Copy link
Contributor Author

This is a huge PR. Are the difference to the standard adau1961 driver so great that a complete fork was the best way forward?

Yes, it does some things specific to Pisound Micro, like VGND short protection logic, as well as slightly different power management for better audio. These customizations make sense for Pisound Micro, it might not make sense for general users, so that's the main reason to have Pisound Micro specific fork of the code.

@gtrainavicius gtrainavicius force-pushed the pisound_micro_module_6.12 branch from 11b0c84 to 12bd258 Compare March 19, 2025 21:09
Signed-off-by: Giedrius Trainavičius <[email protected]>
@gtrainavicius gtrainavicius force-pushed the pisound_micro_module_6.12 branch from 12bd258 to dd3f78d Compare March 19, 2025 22:04
@pelwell
Copy link
Contributor

pelwell commented Mar 20, 2025

It's with a slightly heavy heart that I'm going to merge this, on the understanding that, as with similar sound cards, if forward porting becomes non-trivial in the future then it may get dropped.

@pelwell pelwell merged commit 46eddeb into raspberrypi:rpi-6.12.y Mar 20, 2025
11 of 12 checks passed
@gtrainavicius
Copy link
Contributor Author

Thank you! Please contact us in case there's any non trivial support issues in future kernel code, as you'll likely notice it sooner than we do.

popcornmix added a commit to raspberrypi/firmware that referenced this pull request Mar 25, 2025
kernel: fixup! dmaengine: dw-axi-dmac: Fixes for RP1
See: raspberrypi/linux#6729

kernel: drm/vc4: Correct arithmetic for shifting between columns of SAND images
See: raspberrypi/linux#6730

kernel: Adding Pisound Micro kernel module based on rpi-6.12.y
See: raspberrypi/linux#6731

kernel: Fix two more RP1 DMA bugs
See: raspberrypi/linux#6734

kernel: dts: bcm2712-rpi: Add uart0_nodma
See: raspberrypi/linux#6365
popcornmix added a commit to raspberrypi/rpi-firmware that referenced this pull request Mar 25, 2025
kernel: fixup! dmaengine: dw-axi-dmac: Fixes for RP1
See: raspberrypi/linux#6729

kernel: drm/vc4: Correct arithmetic for shifting between columns of SAND images
See: raspberrypi/linux#6730

kernel: Adding Pisound Micro kernel module based on rpi-6.12.y
See: raspberrypi/linux#6731

kernel: Fix two more RP1 DMA bugs
See: raspberrypi/linux#6734

kernel: dts: bcm2712-rpi: Add uart0_nodma
See: raspberrypi/linux#6365
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants