On 8/16/19 4:43 AM, Vinod Koul wrote:
On 12-08-19, 18:59, Pierre-Louis Bossart wrote:This patchset enables debugfs support and corrects all the feedback provided on an earlier RFC ('soundwire: updates for 5.4') There is one remaining hard-coded value in intel.c that will need to be fixed in a follow-up patchset not specific to debugfs: we need to remove hard-coded Intel-specific configurations from cadence_master.c (PDI offsets, etc). Changes since v1 (Feedback from GKH) Handle debugfs in a more self-contained way (no dentry as return or parameter) Used CONFIG_DEBUG_FS in structures and code to make it easier to remove if need be. No functional change for register dumps. Changes since RFC (Feedback from GKH, Vinod, Guennadi, Cezary, Sanyog): removed error checks used DEFINE_SHOW_ATTRIBUTE and seq_file fixed copyright dates fixed SPDX license info to use GPL2.0 only fixed Makefile to include debugfs only if CONFIG_DEBUG_FS is selected used static inlines for fallback compilation removed intermediate variables removed hard-coded constants in loops (used registers offsets and hardware capabilities) squashed patch 3These looks good but failed to apply. Please rebase on soundwire-next and resend
Could you do us a favor and make sure your soundwire/fixes branch is actually merged in soundwire/next? in this case the Makefile is changed in soundwire/fixes and not in next.
If you use git am --3way things work fine and the conflict is resolved. Applying: soundwire: add debugfs support Using index info to reconstruct a base tree... M drivers/soundwire/Makefile M include/linux/soundwire/sdw.h Falling back to patching base and 3-way merge... Auto-merging include/linux/soundwire/sdw.h Auto-merging drivers/soundwire/Makefile Applying: soundwire: cadence_master: add debugfs register dump Applying: soundwire: intel: add debugfs register dump _______________________________________________ Alsa-devel mailing list Alsa-devel@xxxxxxxxxxxxxxxx https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
