Merge of non-HW specific i9000 bcm4330 logic (minor improvement to 0x886c)