MIPS: Lantiq: Fix ASC0/ASC1 clocks
authorMartin Schiller <ms@dev.tdt.de>
Tue, 30 May 2017 04:34:34 +0000 (06:34 +0200)
committerJames Hogan <jhogan@kernel.org>
Tue, 7 Nov 2017 22:40:15 +0000 (22:40 +0000)
ASC1 is available on every Lantiq SoC (also AmazonSE) and should be
enabled like the other generic xway clocks instead of ASC0, which is
only available for AR9 and Danube.

Signed-off-by: Martin Schiller <ms@dev.tdt.de>
Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: John Crispin <john@phrozen.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Felix Fietkau <nbd@nbd.name>
Cc: Martin Schiller <ms@dev.tdt.de>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/16145/
[jhogan@kernel.org: Drop braces]
Signed-off-by: James Hogan <jhogan@kernel.org>
arch/mips/lantiq/xway/sysctrl.c

index 7611c3013793feac519b07025b70206efa320397..52500d3b7004be3be3eda4364baef23cd5c47dc4 100644 (file)
@@ -446,9 +446,9 @@ void __init ltq_soc_init(void)
 
        /* add our generic xway clocks */
        clkdev_add_pmu("10000000.fpi", NULL, 0, 0, PMU_FPI);
-       clkdev_add_pmu("1e100400.serial", NULL, 0, 0, PMU_ASC0);
        clkdev_add_pmu("1e100a00.gptu", NULL, 1, 0, PMU_GPT);
        clkdev_add_pmu("1e100bb0.stp", NULL, 1, 0, PMU_STP);
+       clkdev_add_pmu("1e100c00.serial", NULL, 0, 0, PMU_ASC1);
        clkdev_add_pmu("1e104100.dma", NULL, 1, 0, PMU_DMA);
        clkdev_add_pmu("1e100800.spi", NULL, 1, 0, PMU_SPI);
        clkdev_add_pmu("1e105300.ebu", NULL, 0, 0, PMU_EBU);
@@ -462,10 +462,8 @@ void __init ltq_soc_init(void)
                clkdev_add_pmu("1e180000.etop", NULL, 1, 0, PMU_PPE);
        }
 
-       if (!of_machine_is_compatible("lantiq,ase")) {
-               clkdev_add_pmu("1e100c00.serial", NULL, 0, 0, PMU_ASC1);
+       if (!of_machine_is_compatible("lantiq,ase"))
                clkdev_add_pci();
-       }
 
        if (of_machine_is_compatible("lantiq,grx390") ||
            of_machine_is_compatible("lantiq,ar10")) {