aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Schiller <ms@dev.tdt.de>2017-05-30 00:34:34 -0400
committerJames Hogan <jhogan@kernel.org>2017-11-07 17:40:15 -0500
commit44a374c0667df6b5de63266a4cf15f400827a29a (patch)
tree3d5a8b5133e05c3e8e0bbc69ef485c9ae9fdd1bb
parent8530762f2391164394fc8d99d7a5a55f521b6131 (diff)
MIPS: Lantiq: Fix ASC0/ASC1 clocks
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>
-rw-r--r--arch/mips/lantiq/xway/sysctrl.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/mips/lantiq/xway/sysctrl.c b/arch/mips/lantiq/xway/sysctrl.c
index 7611c3013793..52500d3b7004 100644
--- a/arch/mips/lantiq/xway/sysctrl.c
+++ b/arch/mips/lantiq/xway/sysctrl.c
@@ -446,9 +446,9 @@ void __init ltq_soc_init(void)
446 446
447 /* add our generic xway clocks */ 447 /* add our generic xway clocks */
448 clkdev_add_pmu("10000000.fpi", NULL, 0, 0, PMU_FPI); 448 clkdev_add_pmu("10000000.fpi", NULL, 0, 0, PMU_FPI);
449 clkdev_add_pmu("1e100400.serial", NULL, 0, 0, PMU_ASC0);
450 clkdev_add_pmu("1e100a00.gptu", NULL, 1, 0, PMU_GPT); 449 clkdev_add_pmu("1e100a00.gptu", NULL, 1, 0, PMU_GPT);
451 clkdev_add_pmu("1e100bb0.stp", NULL, 1, 0, PMU_STP); 450 clkdev_add_pmu("1e100bb0.stp", NULL, 1, 0, PMU_STP);
451 clkdev_add_pmu("1e100c00.serial", NULL, 0, 0, PMU_ASC1);
452 clkdev_add_pmu("1e104100.dma", NULL, 1, 0, PMU_DMA); 452 clkdev_add_pmu("1e104100.dma", NULL, 1, 0, PMU_DMA);
453 clkdev_add_pmu("1e100800.spi", NULL, 1, 0, PMU_SPI); 453 clkdev_add_pmu("1e100800.spi", NULL, 1, 0, PMU_SPI);
454 clkdev_add_pmu("1e105300.ebu", NULL, 0, 0, PMU_EBU); 454 clkdev_add_pmu("1e105300.ebu", NULL, 0, 0, PMU_EBU);
@@ -462,10 +462,8 @@ void __init ltq_soc_init(void)
462 clkdev_add_pmu("1e180000.etop", NULL, 1, 0, PMU_PPE); 462 clkdev_add_pmu("1e180000.etop", NULL, 1, 0, PMU_PPE);
463 } 463 }
464 464
465 if (!of_machine_is_compatible("lantiq,ase")) { 465 if (!of_machine_is_compatible("lantiq,ase"))
466 clkdev_add_pmu("1e100c00.serial", NULL, 0, 0, PMU_ASC1);
467 clkdev_add_pci(); 466 clkdev_add_pci();
468 }
469 467
470 if (of_machine_is_compatible("lantiq,grx390") || 468 if (of_machine_is_compatible("lantiq,grx390") ||
471 of_machine_is_compatible("lantiq,ar10")) { 469 of_machine_is_compatible("lantiq,ar10")) {