Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[karo-tx-linux.git] / drivers / cpufreq / cpufreq-dt-platdev.c

diff --git a/drivers/cpufreq/cpufreq-dt-platdev.c b/drivers/cpufreq/cpufreq-dt-platdev.c
index 71267626456ba7870c5e023c45b06482840c1dc8..bc97b6a4b1cf67a4897a412ff785e1350b4ee0ce 100644 (file)
--- a/drivers/cpufreq/cpufreq-dt-platdev.c
+++ b/drivers/cpufreq/cpufreq-dt-platdev.c
@@ -26,6 +26,9 @@ static const struct of_device_id machines[] __initconst = {
        { .compatible = "allwinner,sun8i-a83t", },
        { .compatible = "allwinner,sun8i-h3", },
 
+       { .compatible = "arm,integrator-ap", },
+       { .compatible = "arm,integrator-cp", },
+
        { .compatible = "hisilicon,hi6220", },
 
        { .compatible = "fsl,imx27", },
@@ -34,6 +37,8 @@ static const struct of_device_id machines[] __initconst = {
        { .compatible = "fsl,imx7d", },
 
        { .compatible = "marvell,berlin", },
+       { .compatible = "marvell,pxa250", },
+       { .compatible = "marvell,pxa270", },
 
        { .compatible = "samsung,exynos3250", },
        { .compatible = "samsung,exynos4210", },
@@ -50,6 +55,8 @@ static const struct of_device_id machines[] __initconst = {
        { .compatible = "renesas,r7s72100", },
        { .compatible = "renesas,r8a73a4", },
        { .compatible = "renesas,r8a7740", },
+       { .compatible = "renesas,r8a7743", },
+       { .compatible = "renesas,r8a7745", },
        { .compatible = "renesas,r8a7778", },
        { .compatible = "renesas,r8a7779", },
        { .compatible = "renesas,r8a7790", },
@@ -72,6 +79,12 @@ static const struct of_device_id machines[] __initconst = {
 
        { .compatible = "sigma,tango4" },
 
+       { .compatible = "socionext,uniphier-pro5", },
+       { .compatible = "socionext,uniphier-pxs2", },
+       { .compatible = "socionext,uniphier-ld6b", },
+       { .compatible = "socionext,uniphier-ld11", },
+       { .compatible = "socionext,uniphier-ld20", },
+
        { .compatible = "ti,am33xx", },
        { .compatible = "ti,dra7", },
        { .compatible = "ti,omap2", },
@@ -81,6 +94,8 @@ static const struct of_device_id machines[] __initconst = {
 
        { .compatible = "xlnx,zynq-7000", },
 
+       { .compatible = "zte,zx296718", },
+
        { }
 };