Skip to content

Commit 49a5de2

Browse files
WhatAmISupposedToPutHerejannau
authored andcommitted
DO NOT MERGE: dmaengine: apple-admac: Add temporary aop-admac compatible
The ADMAC attached to the AOP has complex power sequencing, and is power gated when the probe callback runs. To avoid issues downstream with mixing new devicetree and old kernel use a new compatible string for aop-admac. The fix "dmaengine: apple-admac: Avoid accessing registers in probe" is in the meantime upstreamed so aop-admac can be upstreamed with the the correct compatible string. Signed-off-by: Sasha Finkelstein <fnkl.kernel@gmail.com> Signed-off-by: Janne Grunau <j@jannau.net>
1 parent 41ace55 commit 49a5de2

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

drivers/dma/apple-admac.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -936,6 +936,7 @@ static void admac_remove(struct platform_device *pdev)
936936
}
937937

938938
static const struct of_device_id admac_of_match[] = {
939+
{ .compatible = "apple,admac2", },
939940
{ .compatible = "apple,admac", },
940941
{ }
941942
};

0 commit comments

Comments
 (0)