Need help modifying dtbs

Hi,

I want to change the setup of the LCD7 cape and AUDIO cape
in a way, that they work if used together with the Beaglebone
Black.

With my Beaglebone White (Robert Nelsons Linux kernel 3.2.x)
I had to disable in the board file
..../linux-dev/KERNEL/arch/arm/mach-omap2/board-am335xevm.c
the following code snippet:

  if (!strncmp("BB-BONE-AUDI-01", cape_config.partnumber, 15)) {
    pr_info("BeagleBone cape: initializing audio cape\n");

        // deactivated
    // beaglebone_leds_free = 0;
    // dvileds_init(0,0);

    beaglebone_spi1_free = 0;
    mcasp0_init(0,0);
  }

With this hack, both work together fine...

To get both capes working on the Beaglebone Black I booted
the Bone two times -- each time with one of the capes attached
and copied the relevant part of the pinmux information from /sys/....
to a save place and compared them afterwards.

This shows a pin clash:

LCD7 cape
    pin 16 (44e10840): gpio_keys.12 (GPIO UNCLAIMED) function pinmux_bone_lcd7_cape_keys_00A2_pins group pinmux_bone_lcd7_cape_keys_00A2_pins
    pin 17 (44e10844): gpio_keys.12 (GPIO UNCLAIMED) function pinmux_bone_lcd7_cape_keys_00A2_pins group pinmux_bone_lcd7_cape_keys_00A2_pins
    pin 18 (44e10848): backlight.10 (GPIO UNCLAIMED) function pinmux_pwm_bl_pins group pinmux_pwm_bl_pins
    pin 19 (44e1084c): gpio_keys.12 (GPIO UNCLAIMED) function pinmux_bone_lcd7_cape_keys_00A2_pins group pinmux_bone_lcd7_cape_keys_00A2_pins

AUDIO cape
    pin 16 (44e10840): (MUX UNCLAIMED) (GPIO UNCLAIMED)
    pin 17 (44e10844): (MUX UNCLAIMED) (GPIO UNCLAIMED)
<!> pin 18 (44e10848): gpio-leds-cape-audio.10 (GPIO UNCLAIMED) function pinmux_bone_audio_cape_led_pins group pinmux_bone_audio_cape_led_pins
<!> pin 19 (44e1084c): gpio-leds-cape-audio.10 (GPIO UNCLAIMED) function pinmux_bone_audio_cape_led_pins group pinmux_bone_audio_cape_led_pins

As far as I can see, the rest of the pins is not doubly assigned.

I tried to modify the dtbs for the AUDIO cape (which is in fact hidden
in a patch) by simply commenting out the LED part, but thi did not
work...the boot process hangs with no further output.

Unfortunately the new header for the serial debugging is not useable
while using a cape like the LCD7 cape due to limited space.

How can I modify what of the dtbs get both capes work together?

Thank you very much in advance for any help!

Best regards,
mcc

PS: Question is: Why does the Capemgr assigned an already used pin a
second time?