+++ /dev/null
-From d90739a8962b541969b4c5f7ef1df8fec9c7f153 Mon Sep 17 00:00:00 2001
-From: John Crispin <blogic@openwrt.org>
-Date: Wed, 10 Aug 2011 14:57:04 +0200
-Subject: [PATCH 04/24] MIPS: lantiq: reorganize xway code
-
-Inside the folder arch/mips/lantiq/xway, there were alot of small files with
-lots of duplicated code. This patch adds a wrapper function for inserting and
-requesting resources and unifies the small files into one bigger file.
-
-This patch makes the xway code consistent with the falcon support added later
-in this series.
-
-Signed-off-by: John Crispin <blogic@openwrt.org>
-Signed-off-by: Thomas Langer <thomas.langer@lantiq.com>
-Cc: linux-mips@linux-mips.org
----
- arch/mips/include/asm/mach-lantiq/lantiq.h | 14 +---
- .../mips/include/asm/mach-lantiq/xway/lantiq_soc.h | 14 ++++
- arch/mips/lantiq/clk.c | 25 +------
- arch/mips/lantiq/devices.c | 30 ++------
- arch/mips/lantiq/devices.h | 4 +
- arch/mips/lantiq/prom.c | 50 +++++++++++--
- arch/mips/lantiq/prom.h | 4 +
- arch/mips/lantiq/xway/Makefile | 6 +-
- arch/mips/lantiq/xway/devices.c | 42 ++---------
- arch/mips/lantiq/xway/dma.c | 21 ++----
- arch/mips/lantiq/xway/ebu.c | 53 --------------
- arch/mips/lantiq/xway/pmu.c | 70 ------------------
- arch/mips/lantiq/xway/prom-ase.c | 9 +++
- arch/mips/lantiq/xway/prom-xway.c | 10 +++
- arch/mips/lantiq/xway/reset.c | 21 ++----
- arch/mips/lantiq/xway/setup-ase.c | 19 -----
- arch/mips/lantiq/xway/setup-xway.c | 20 -----
- arch/mips/lantiq/xway/sysctrl.c | 77 ++++++++++++++++++++
- drivers/watchdog/lantiq_wdt.c | 2 +-
- 19 files changed, 197 insertions(+), 294 deletions(-)
- delete mode 100644 arch/mips/lantiq/xway/ebu.c
- delete mode 100644 arch/mips/lantiq/xway/pmu.c
- delete mode 100644 arch/mips/lantiq/xway/setup-ase.c
- delete mode 100644 arch/mips/lantiq/xway/setup-xway.c
- create mode 100644 arch/mips/lantiq/xway/sysctrl.c
-
---- a/arch/mips/include/asm/mach-lantiq/lantiq.h
-+++ b/arch/mips/include/asm/mach-lantiq/lantiq.h
-@@ -9,6 +9,7 @@
- #define _LANTIQ_H__
-
- #include <linux/irq.h>
-+#include <linux/ioport.h>
-
- /* generic reg access functions */
- #define ltq_r32(reg) __raw_readl(reg)
-@@ -18,15 +19,6 @@
- #define ltq_r8(reg) __raw_readb(reg)
- #define ltq_w8(val, reg) __raw_writeb(val, reg)
-
--/* register access macros for EBU and CGU */
--#define ltq_ebu_w32(x, y) ltq_w32((x), ltq_ebu_membase + (y))
--#define ltq_ebu_r32(x) ltq_r32(ltq_ebu_membase + (x))
--#define ltq_cgu_w32(x, y) ltq_w32((x), ltq_cgu_membase + (y))
--#define ltq_cgu_r32(x) ltq_r32(ltq_cgu_membase + (x))
--
--extern __iomem void *ltq_ebu_membase;
--extern __iomem void *ltq_cgu_membase;
--
- extern unsigned int ltq_get_cpu_ver(void);
- extern unsigned int ltq_get_soc_type(void);
-
-@@ -51,7 +43,9 @@ extern void ltq_enable_irq(struct irq_da
-
- /* find out what caused the last cpu reset */
- extern int ltq_reset_cause(void);
--#define LTQ_RST_CAUSE_WDTRST 0x20
-+
-+/* helper for requesting and remapping resources */
-+extern void __iomem *ltq_remap_resource(struct resource *res);
-
- #define IOPORT_RESOURCE_START 0x10000000
- #define IOPORT_RESOURCE_END 0xffffffff
---- a/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h
-+++ b/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h
-@@ -65,6 +65,8 @@
- #define LTQ_CGU_BASE_ADDR 0x1F103000
- #define LTQ_CGU_SIZE 0x1000
-
-+#define CGU_EPHY 0x10
-+
- /* ICU - interrupt control unit */
- #define LTQ_ICU_BASE_ADDR 0x1F880200
- #define LTQ_ICU_SIZE 0x100
-@@ -101,6 +103,8 @@
- #define LTQ_WDT_BASE_ADDR 0x1F8803F0
- #define LTQ_WDT_SIZE 0x10
-
-+#define LTQ_RST_CAUSE_WDTRST 0x20
-+
- /* STP - serial to parallel conversion unit */
- #define LTQ_STP_BASE_ADDR 0x1E100BB0
- #define LTQ_STP_SIZE 0x40
-@@ -125,11 +129,21 @@
- #define LTQ_MPS_BASE_ADDR (KSEG1 + 0x1F107000)
- #define LTQ_MPS_CHIPID ((u32 *)(LTQ_MPS_BASE_ADDR + 0x0344))
-
-+/* register access macros for EBU and CGU */
-+#define ltq_ebu_w32(x, y) ltq_w32((x), ltq_ebu_membase + (y))
-+#define ltq_ebu_r32(x) ltq_r32(ltq_ebu_membase + (x))
-+#define ltq_cgu_w32(x, y) ltq_w32((x), ltq_cgu_membase + (y))
-+#define ltq_cgu_r32(x) ltq_r32(ltq_cgu_membase + (x))
-+
-+extern __iomem void *ltq_ebu_membase;
-+extern __iomem void *ltq_cgu_membase;
-+
- /* request a non-gpio and set the PIO config */
- extern int ltq_gpio_request(unsigned int pin, unsigned int alt0,
- unsigned int alt1, unsigned int dir, const char *name);
- extern void ltq_pmu_enable(unsigned int module);
- extern void ltq_pmu_disable(unsigned int module);
-+extern void ltq_cgu_enable(unsigned int clk);
-
- static inline int ltq_is_ar9(void)
- {
---- a/arch/mips/lantiq/clk.c
-+++ b/arch/mips/lantiq/clk.c
-@@ -22,6 +22,7 @@
- #include <lantiq_soc.h>
-
- #include "clk.h"
-+#include "prom.h"
-
- struct clk {
- const char *name;
-@@ -46,16 +47,6 @@ static struct clk cpu_clk_generic[] = {
- },
- };
-
--static struct resource ltq_cgu_resource = {
-- .name = "cgu",
-- .start = LTQ_CGU_BASE_ADDR,
-- .end = LTQ_CGU_BASE_ADDR + LTQ_CGU_SIZE - 1,
-- .flags = IORESOURCE_MEM,
--};
--
--/* remapped clock register range */
--void __iomem *ltq_cgu_membase;
--
- void clk_init(void)
- {
- cpu_clk = cpu_clk_generic;
-@@ -133,21 +124,11 @@ void __init plat_time_init(void)
- {
- struct clk *clk;
-
-- if (insert_resource(&iomem_resource, <q_cgu_resource) < 0)
-- panic("Failed to insert cgu memory\n");
-+ ltq_soc_init();
-
-- if (request_mem_region(ltq_cgu_resource.start,
-- resource_size(<q_cgu_resource), "cgu") < 0)
-- panic("Failed to request cgu memory\n");
--
-- ltq_cgu_membase = ioremap_nocache(ltq_cgu_resource.start,
-- resource_size(<q_cgu_resource));
-- if (!ltq_cgu_membase) {
-- pr_err("Failed to remap cgu memory\n");
-- unreachable();
-- }
- clk = clk_get(0, "cpu");
- mips_hpt_frequency = clk_get_rate(clk) / ltq_get_counter_resolution();
- write_c0_compare(read_c0_count());
-+ pr_info("CPU Clock: %ldMHz\n", clk_get_rate(clk) / 1000000);
- clk_put(clk);
- }
---- a/arch/mips/lantiq/devices.c
-+++ b/arch/mips/lantiq/devices.c
-@@ -27,12 +27,8 @@
- #include "devices.h"
-
- /* nor flash */
--static struct resource ltq_nor_resource = {
-- .name = "nor",
-- .start = LTQ_FLASH_START,
-- .end = LTQ_FLASH_START + LTQ_FLASH_MAX - 1,
-- .flags = IORESOURCE_MEM,
--};
-+static struct resource ltq_nor_resource =
-+ MEM_RES("nor", LTQ_FLASH_START, LTQ_FLASH_MAX);
-
- static struct platform_device ltq_nor = {
- .name = "ltq_nor",
-@@ -47,12 +43,8 @@ void __init ltq_register_nor(struct phys
- }
-
- /* watchdog */
--static struct resource ltq_wdt_resource = {
-- .name = "watchdog",
-- .start = LTQ_WDT_BASE_ADDR,
-- .end = LTQ_WDT_BASE_ADDR + LTQ_WDT_SIZE - 1,
-- .flags = IORESOURCE_MEM,
--};
-+static struct resource ltq_wdt_resource =
-+ MEM_RES("watchdog", LTQ_WDT_BASE_ADDR, LTQ_WDT_SIZE);
-
- void __init ltq_register_wdt(void)
- {
-@@ -61,24 +53,14 @@ void __init ltq_register_wdt(void)
-
- /* asc ports */
- static struct resource ltq_asc0_resources[] = {
-- {
-- .name = "asc0",
-- .start = LTQ_ASC0_BASE_ADDR,
-- .end = LTQ_ASC0_BASE_ADDR + LTQ_ASC_SIZE - 1,
-- .flags = IORESOURCE_MEM,
-- },
-+ MEM_RES("asc0", LTQ_ASC0_BASE_ADDR, LTQ_ASC_SIZE),
- IRQ_RES(tx, LTQ_ASC_TIR(0)),
- IRQ_RES(rx, LTQ_ASC_RIR(0)),
- IRQ_RES(err, LTQ_ASC_EIR(0)),
- };
-
- static struct resource ltq_asc1_resources[] = {
-- {
-- .name = "asc1",
-- .start = LTQ_ASC1_BASE_ADDR,
-- .end = LTQ_ASC1_BASE_ADDR + LTQ_ASC_SIZE - 1,
-- .flags = IORESOURCE_MEM,
-- },
-+ MEM_RES("asc1", LTQ_ASC1_BASE_ADDR, LTQ_ASC_SIZE),
- IRQ_RES(tx, LTQ_ASC_TIR(1)),
- IRQ_RES(rx, LTQ_ASC_RIR(1)),
- IRQ_RES(err, LTQ_ASC_EIR(1)),
---- a/arch/mips/lantiq/devices.h
-+++ b/arch/mips/lantiq/devices.h
-@@ -14,6 +14,10 @@
-
- #define IRQ_RES(resname, irq) \
- {.name = #resname, .start = (irq), .flags = IORESOURCE_IRQ}
-+#define MEM_RES(resname, adr_start, adr_size) \
-+ { .name = resname, .flags = IORESOURCE_MEM, \
-+ .start = ((adr_start) & ~KSEG1), \
-+ .end = ((adr_start + adr_size - 1) & ~KSEG1) }
-
- extern void ltq_register_nor(struct physmap_flash_data *data);
- extern void ltq_register_wdt(void);
---- a/arch/mips/lantiq/prom.c
-+++ b/arch/mips/lantiq/prom.c
-@@ -16,6 +16,10 @@
- #include "prom.h"
- #include "clk.h"
-
-+/* access to the ebu needs to be locked between different drivers */
-+DEFINE_SPINLOCK(ebu_lock);
-+EXPORT_SYMBOL_GPL(ebu_lock);
-+
- static struct ltq_soc_info soc_info;
-
- unsigned int ltq_get_cpu_ver(void)
-@@ -57,16 +61,50 @@ static void __init prom_init_cmdline(voi
- }
- }
-
--void __init prom_init(void)
-+void __iomem *ltq_remap_resource(struct resource *res)
- {
-- struct clk *clk;
-+ __iomem void *ret = NULL;
-+ struct resource *lookup = lookup_resource(&iomem_resource, res->start);
-
-+ if (lookup && strcmp(lookup->name, res->name)) {
-+ panic("conflicting memory range %s\n", res->name);
-+ return NULL;
-+ }
-+ if (!lookup) {
-+ if (insert_resource(&iomem_resource, res) < 0) {
-+ panic("Failed to insert %s memory\n", res->name);
-+ return NULL;
-+ }
-+ }
-+ if (request_mem_region(res->start,
-+ resource_size(res), res->name) < 0) {
-+ panic("Failed to request %s memory\n", res->name);
-+ goto err_res;
-+ }
-+
-+ ret = ioremap_nocache(res->start, resource_size(res));
-+ if (!ret)
-+ goto err_mem;
-+
-+ pr_debug("remap: 0x%08X-0x%08X : \"%s\"\n",
-+ res->start, res->end, res->name);
-+ return ret;
-+
-+err_mem:
-+ panic("Failed to remap %s memory\n", res->name);
-+ release_mem_region(res->start, resource_size(res));
-+
-+err_res:
-+ release_resource(res);
-+ return NULL;
-+}
-+
-+void __init prom_init(void)
-+{
- ltq_soc_detect(&soc_info);
- clk_init();
-- clk = clk_get(0, "cpu");
-- snprintf(soc_info.sys_type, LTQ_SYS_TYPE_LEN - 1, "%s rev1.%d",
-- soc_info.name, soc_info.rev);
-- clk_put(clk);
-+ snprintf(soc_info.sys_type, LTQ_SYS_TYPE_LEN - 1, "%s rev %s",
-+ soc_info.name, soc_info.rev_type);
- soc_info.sys_type[LTQ_SYS_TYPE_LEN - 1] = '\0';
- pr_info("SoC: %s\n", soc_info.sys_type);
- prom_init_cmdline();
---- a/arch/mips/lantiq/prom.h
-+++ b/arch/mips/lantiq/prom.h
-@@ -9,17 +9,21 @@
- #ifndef _LTQ_PROM_H__
- #define _LTQ_PROM_H__
-
-+#define LTQ_SYS_REV_LEN 0x10
- #define LTQ_SYS_TYPE_LEN 0x100
-
- struct ltq_soc_info {
- unsigned char *name;
- unsigned int rev;
-+ unsigned char rev_type[LTQ_SYS_REV_LEN];
-+ unsigned int srev;
- unsigned int partnum;
- unsigned int type;
- unsigned char sys_type[LTQ_SYS_TYPE_LEN];
- };
-
- extern void ltq_soc_detect(struct ltq_soc_info *i);
-+extern void ltq_soc_init(void);
- extern void ltq_soc_setup(void);
-
- #endif
---- a/arch/mips/lantiq/xway/Makefile
-+++ b/arch/mips/lantiq/xway/Makefile
-@@ -1,7 +1,7 @@
--obj-y := pmu.o ebu.o reset.o gpio.o gpio_stp.o gpio_ebu.o devices.o dma.o
-+obj-y := sysctrl.o reset.o gpio.o gpio_stp.o gpio_ebu.o devices.o dma.o
-
--obj-$(CONFIG_SOC_XWAY) += clk-xway.o prom-xway.o setup-xway.o
--obj-$(CONFIG_SOC_AMAZON_SE) += clk-ase.o prom-ase.o setup-ase.o
-+obj-$(CONFIG_SOC_XWAY) += clk-xway.o prom-xway.o
-+obj-$(CONFIG_SOC_AMAZON_SE) += clk-ase.o prom-ase.o
-
- obj-$(CONFIG_LANTIQ_MACH_EASY50712) += mach-easy50712.o
- obj-$(CONFIG_LANTIQ_MACH_EASY50601) += mach-easy50601.o
---- a/arch/mips/lantiq/xway/devices.c
-+++ b/arch/mips/lantiq/xway/devices.c
-@@ -31,22 +31,9 @@
-
- /* gpio */
- static struct resource ltq_gpio_resource[] = {
-- {
-- .name = "gpio0",
-- .start = LTQ_GPIO0_BASE_ADDR,
-- .end = LTQ_GPIO0_BASE_ADDR + LTQ_GPIO_SIZE - 1,
-- .flags = IORESOURCE_MEM,
-- }, {
-- .name = "gpio1",
-- .start = LTQ_GPIO1_BASE_ADDR,
-- .end = LTQ_GPIO1_BASE_ADDR + LTQ_GPIO_SIZE - 1,
-- .flags = IORESOURCE_MEM,
-- }, {
-- .name = "gpio2",
-- .start = LTQ_GPIO2_BASE_ADDR,
-- .end = LTQ_GPIO2_BASE_ADDR + LTQ_GPIO_SIZE - 1,
-- .flags = IORESOURCE_MEM,
-- }
-+ MEM_RES("gpio0", LTQ_GPIO0_BASE_ADDR, LTQ_GPIO_SIZE),
-+ MEM_RES("gpio1", LTQ_GPIO1_BASE_ADDR, LTQ_GPIO_SIZE),
-+ MEM_RES("gpio2", LTQ_GPIO2_BASE_ADDR, LTQ_GPIO_SIZE),
- };
-
- void __init ltq_register_gpio(void)
-@@ -64,12 +51,8 @@ void __init ltq_register_gpio(void)
- }
-
- /* serial to parallel conversion */
--static struct resource ltq_stp_resource = {
-- .name = "stp",
-- .start = LTQ_STP_BASE_ADDR,
-- .end = LTQ_STP_BASE_ADDR + LTQ_STP_SIZE - 1,
-- .flags = IORESOURCE_MEM,
--};
-+static struct resource ltq_stp_resource =
-+ MEM_RES("stp", LTQ_STP_BASE_ADDR, LTQ_STP_SIZE);
-
- void __init ltq_register_gpio_stp(void)
- {
-@@ -78,12 +61,7 @@ void __init ltq_register_gpio_stp(void)
-
- /* asc ports - amazon se has its own serial mapping */
- static struct resource ltq_ase_asc_resources[] = {
-- {
-- .name = "asc0",
-- .start = LTQ_ASC1_BASE_ADDR,
-- .end = LTQ_ASC1_BASE_ADDR + LTQ_ASC_SIZE - 1,
-- .flags = IORESOURCE_MEM,
-- },
-+ MEM_RES("asc0", LTQ_ASC1_BASE_ADDR, LTQ_ASC_SIZE),
- IRQ_RES(tx, LTQ_ASC_ASE_TIR),
- IRQ_RES(rx, LTQ_ASC_ASE_RIR),
- IRQ_RES(err, LTQ_ASC_ASE_EIR),
-@@ -96,12 +74,8 @@ void __init ltq_register_ase_asc(void)
- }
-
- /* ethernet */
--static struct resource ltq_etop_resources = {
-- .name = "etop",
-- .start = LTQ_ETOP_BASE_ADDR,
-- .end = LTQ_ETOP_BASE_ADDR + LTQ_ETOP_SIZE - 1,
-- .flags = IORESOURCE_MEM,
--};
-+static struct resource ltq_etop_resources =
-+ MEM_RES("etop", LTQ_ETOP_BASE_ADDR, LTQ_ETOP_SIZE);
-
- static struct platform_device ltq_etop = {
- .name = "ltq_etop",
---- a/arch/mips/lantiq/xway/dma.c
-+++ b/arch/mips/lantiq/xway/dma.c
-@@ -23,6 +23,8 @@
- #include <lantiq_soc.h>
- #include <xway_dma.h>
-
-+#include "../devices.h"
-+
- #define LTQ_DMA_CTRL 0x10
- #define LTQ_DMA_CPOLL 0x14
- #define LTQ_DMA_CS 0x18
-@@ -54,12 +56,8 @@
- #define ltq_dma_w32_mask(x, y, z) ltq_w32_mask(x, y, \
- ltq_dma_membase + (z))
-
--static struct resource ltq_dma_resource = {
-- .name = "dma",
-- .start = LTQ_DMA_BASE_ADDR,
-- .end = LTQ_DMA_BASE_ADDR + LTQ_DMA_SIZE - 1,
-- .flags = IORESOURCE_MEM,
--};
-+static struct resource ltq_dma_resource =
-+ MEM_RES("dma", LTQ_DMA_BASE_ADDR, LTQ_DMA_SIZE);
-
- static void __iomem *ltq_dma_membase;
-
-@@ -219,17 +217,8 @@ ltq_dma_init(void)
- {
- int i;
-
-- /* insert and request the memory region */
-- if (insert_resource(&iomem_resource, <q_dma_resource) < 0)
-- panic("Failed to insert dma memory\n");
--
-- if (request_mem_region(ltq_dma_resource.start,
-- resource_size(<q_dma_resource), "dma") < 0)
-- panic("Failed to request dma memory\n");
--
- /* remap dma register range */
-- ltq_dma_membase = ioremap_nocache(ltq_dma_resource.start,
-- resource_size(<q_dma_resource));
-+ ltq_dma_membase = ltq_remap_resource(<q_dma_resource);
- if (!ltq_dma_membase)
- panic("Failed to remap dma memory\n");
-
---- a/arch/mips/lantiq/xway/ebu.c
-+++ /dev/null
-@@ -1,52 +0,0 @@
--/*
-- * This program is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 as published
-- * by the Free Software Foundation.
-- *
-- * EBU - the external bus unit attaches PCI, NOR and NAND
-- *
-- * Copyright (C) 2010 John Crispin <blogic@openwrt.org>
-- */
--
--#include <linux/kernel.h>
--#include <linux/module.h>
--#include <linux/ioport.h>
--
--#include <lantiq_soc.h>
--
--/* all access to the ebu must be locked */
--DEFINE_SPINLOCK(ebu_lock);
--EXPORT_SYMBOL_GPL(ebu_lock);
--
--static struct resource ltq_ebu_resource = {
-- .name = "ebu",
-- .start = LTQ_EBU_BASE_ADDR,
-- .end = LTQ_EBU_BASE_ADDR + LTQ_EBU_SIZE - 1,
-- .flags = IORESOURCE_MEM,
--};
--
--/* remapped base addr of the clock unit and external bus unit */
--void __iomem *ltq_ebu_membase;
--
--static int __init lantiq_ebu_init(void)
--{
-- /* insert and request the memory region */
-- if (insert_resource(&iomem_resource, <q_ebu_resource) < 0)
-- panic("Failed to insert ebu memory\n");
--
-- if (request_mem_region(ltq_ebu_resource.start,
-- resource_size(<q_ebu_resource), "ebu") < 0)
-- panic("Failed to request ebu memory\n");
--
-- /* remap ebu register range */
-- ltq_ebu_membase = ioremap_nocache(ltq_ebu_resource.start,
-- resource_size(<q_ebu_resource));
-- if (!ltq_ebu_membase)
-- panic("Failed to remap ebu memory\n");
--
-- /* make sure to unprotect the memory region where flash is located */
-- ltq_ebu_w32(ltq_ebu_r32(LTQ_EBU_BUSCON0) & ~EBU_WRDIS, LTQ_EBU_BUSCON0);
-- return 0;
--}
--
--postcore_initcall(lantiq_ebu_init);
---- a/arch/mips/lantiq/xway/pmu.c
-+++ /dev/null
-@@ -1,69 +0,0 @@
--/*
-- * This program is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 as published
-- * by the Free Software Foundation.
-- *
-- * Copyright (C) 2010 John Crispin <blogic@openwrt.org>
-- */
--
--#include <linux/kernel.h>
--#include <linux/module.h>
--#include <linux/ioport.h>
--
--#include <lantiq_soc.h>
--
--/* PMU - the power management unit allows us to turn part of the core
-- * on and off
-- */
--
--/* the enable / disable registers */
--#define LTQ_PMU_PWDCR 0x1C
--#define LTQ_PMU_PWDSR 0x20
--
--#define ltq_pmu_w32(x, y) ltq_w32((x), ltq_pmu_membase + (y))
--#define ltq_pmu_r32(x) ltq_r32(ltq_pmu_membase + (x))
--
--static struct resource ltq_pmu_resource = {
-- .name = "pmu",
-- .start = LTQ_PMU_BASE_ADDR,
-- .end = LTQ_PMU_BASE_ADDR + LTQ_PMU_SIZE - 1,
-- .flags = IORESOURCE_MEM,
--};
--
--static void __iomem *ltq_pmu_membase;
--
--void ltq_pmu_enable(unsigned int module)
--{
-- int err = 1000000;
--
-- ltq_pmu_w32(ltq_pmu_r32(LTQ_PMU_PWDCR) & ~module, LTQ_PMU_PWDCR);
-- do {} while (--err && (ltq_pmu_r32(LTQ_PMU_PWDSR) & module));
--
-- if (!err)
-- panic("activating PMU module failed!\n");
--}
--EXPORT_SYMBOL(ltq_pmu_enable);
--
--void ltq_pmu_disable(unsigned int module)
--{
-- ltq_pmu_w32(ltq_pmu_r32(LTQ_PMU_PWDCR) | module, LTQ_PMU_PWDCR);
--}
--EXPORT_SYMBOL(ltq_pmu_disable);
--
--int __init ltq_pmu_init(void)
--{
-- if (insert_resource(&iomem_resource, <q_pmu_resource) < 0)
-- panic("Failed to insert pmu memory\n");
--
-- if (request_mem_region(ltq_pmu_resource.start,
-- resource_size(<q_pmu_resource), "pmu") < 0)
-- panic("Failed to request pmu memory\n");
--
-- ltq_pmu_membase = ioremap_nocache(ltq_pmu_resource.start,
-- resource_size(<q_pmu_resource));
-- if (!ltq_pmu_membase)
-- panic("Failed to remap pmu memory\n");
-- return 0;
--}
--
--core_initcall(ltq_pmu_init);
---- a/arch/mips/lantiq/xway/prom-ase.c
-+++ b/arch/mips/lantiq/xway/prom-ase.c
-@@ -13,6 +13,7 @@
-
- #include <lantiq_soc.h>
-
-+#include "devices.h"
- #include "../prom.h"
-
- #define SOC_AMAZON_SE "Amazon_SE"
-@@ -26,6 +27,7 @@ void __init ltq_soc_detect(struct ltq_so
- {
- i->partnum = (ltq_r32(LTQ_MPS_CHIPID) & PART_MASK) >> PART_SHIFT;
- i->rev = (ltq_r32(LTQ_MPS_CHIPID) & REV_MASK) >> REV_SHIFT;
-+ sprintf(i->rev_type, "1.%d", i->rev);
- switch (i->partnum) {
- case SOC_ID_AMAZON_SE:
- i->name = SOC_AMAZON_SE;
-@@ -37,3 +39,10 @@ void __init ltq_soc_detect(struct ltq_so
- break;
- }
- }
-+
-+void __init ltq_soc_setup(void)
-+{
-+ ltq_register_ase_asc();
-+ ltq_register_gpio();
-+ ltq_register_wdt();
-+}
---- a/arch/mips/lantiq/xway/prom-xway.c
-+++ b/arch/mips/lantiq/xway/prom-xway.c
-@@ -13,6 +13,7 @@
-
- #include <lantiq_soc.h>
-
-+#include "devices.h"
- #include "../prom.h"
-
- #define SOC_DANUBE "Danube"
-@@ -28,6 +29,7 @@ void __init ltq_soc_detect(struct ltq_so
- {
- i->partnum = (ltq_r32(LTQ_MPS_CHIPID) & PART_MASK) >> PART_SHIFT;
- i->rev = (ltq_r32(LTQ_MPS_CHIPID) & REV_MASK) >> REV_SHIFT;
-+ sprintf(i->rev_type, "1.%d", i->rev);
- switch (i->partnum) {
- case SOC_ID_DANUBE1:
- case SOC_ID_DANUBE2:
-@@ -52,3 +54,11 @@ void __init ltq_soc_detect(struct ltq_so
- break;
- }
- }
-+
-+void __init ltq_soc_setup(void)
-+{
-+ ltq_register_asc(0);
-+ ltq_register_asc(1);
-+ ltq_register_gpio();
-+ ltq_register_wdt();
-+}
---- a/arch/mips/lantiq/xway/reset.c
-+++ b/arch/mips/lantiq/xway/reset.c
-@@ -15,6 +15,8 @@
-
- #include <lantiq_soc.h>
-
-+#include "../devices.h"
-+
- #define ltq_rcu_w32(x, y) ltq_w32((x), ltq_rcu_membase + (y))
- #define ltq_rcu_r32(x) ltq_r32(ltq_rcu_membase + (x))
-
-@@ -25,12 +27,8 @@
- #define LTQ_RCU_RST_STAT 0x0014
- #define LTQ_RCU_STAT_SHIFT 26
-
--static struct resource ltq_rcu_resource = {
-- .name = "rcu",
-- .start = LTQ_RCU_BASE_ADDR,
-- .end = LTQ_RCU_BASE_ADDR + LTQ_RCU_SIZE - 1,
-- .flags = IORESOURCE_MEM,
--};
-+static struct resource ltq_rcu_resource =
-+ MEM_RES("rcu", LTQ_RCU_BASE_ADDR, LTQ_RCU_SIZE);
-
- /* remapped base addr of the reset control unit */
- static void __iomem *ltq_rcu_membase;
-@@ -67,17 +65,8 @@ static void ltq_machine_power_off(void)
-
- static int __init mips_reboot_setup(void)
- {
-- /* insert and request the memory region */
-- if (insert_resource(&iomem_resource, <q_rcu_resource) < 0)
-- panic("Failed to insert rcu memory\n");
--
-- if (request_mem_region(ltq_rcu_resource.start,
-- resource_size(<q_rcu_resource), "rcu") < 0)
-- panic("Failed to request rcu memory\n");
--
- /* remap rcu register range */
-- ltq_rcu_membase = ioremap_nocache(ltq_rcu_resource.start,
-- resource_size(<q_rcu_resource));
-+ ltq_rcu_membase = ltq_remap_resource(<q_rcu_resource);
- if (!ltq_rcu_membase)
- panic("Failed to remap rcu memory\n");
-
---- a/arch/mips/lantiq/xway/setup-ase.c
-+++ /dev/null
-@@ -1,19 +0,0 @@
--/*
-- * This program is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 as published
-- * by the Free Software Foundation.
-- *
-- * Copyright (C) 2011 John Crispin <blogic@openwrt.org>
-- */
--
--#include <lantiq_soc.h>
--
--#include "../prom.h"
--#include "devices.h"
--
--void __init ltq_soc_setup(void)
--{
-- ltq_register_ase_asc();
-- ltq_register_gpio();
-- ltq_register_wdt();
--}
---- a/arch/mips/lantiq/xway/setup-xway.c
-+++ /dev/null
-@@ -1,20 +0,0 @@
--/*
-- * This program is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 as published
-- * by the Free Software Foundation.
-- *
-- * Copyright (C) 2011 John Crispin <blogic@openwrt.org>
-- */
--
--#include <lantiq_soc.h>
--
--#include "../prom.h"
--#include "devices.h"
--
--void __init ltq_soc_setup(void)
--{
-- ltq_register_asc(0);
-- ltq_register_asc(1);
-- ltq_register_gpio();
-- ltq_register_wdt();
--}
---- /dev/null
-+++ b/arch/mips/lantiq/xway/sysctrl.c
-@@ -0,0 +1,77 @@
-+/*
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 as published
-+ * by the Free Software Foundation.
-+ *
-+ * Copyright (C) 2011 John Crispin <blogic@openwrt.org>
-+ */
-+
-+#include <linux/ioport.h>
-+
-+#include <lantiq_soc.h>
-+
-+#include "../devices.h"
-+
-+/* clock control register */
-+#define LTQ_CGU_IFCCR 0x0018
-+
-+/* the enable / disable registers */
-+#define LTQ_PMU_PWDCR 0x1C
-+#define LTQ_PMU_PWDSR 0x20
-+
-+#define ltq_pmu_w32(x, y) ltq_w32((x), ltq_pmu_membase + (y))
-+#define ltq_pmu_r32(x) ltq_r32(ltq_pmu_membase + (x))
-+
-+static struct resource ltq_cgu_resource =
-+ MEM_RES("cgu", LTQ_CGU_BASE_ADDR, LTQ_CGU_SIZE);
-+
-+static struct resource ltq_pmu_resource =
-+ MEM_RES("pmu", LTQ_PMU_BASE_ADDR, LTQ_PMU_SIZE);
-+
-+static struct resource ltq_ebu_resource =
-+ MEM_RES("ebu", LTQ_EBU_BASE_ADDR, LTQ_EBU_SIZE);
-+
-+void __iomem *ltq_cgu_membase;
-+void __iomem *ltq_ebu_membase;
-+static void __iomem *ltq_pmu_membase;
-+
-+void ltq_cgu_enable(unsigned int clk)
-+{
-+ ltq_cgu_w32(ltq_cgu_r32(LTQ_CGU_IFCCR) | clk, LTQ_CGU_IFCCR);
-+}
-+
-+void ltq_pmu_enable(unsigned int module)
-+{
-+ int err = 1000000;
-+
-+ ltq_pmu_w32(ltq_pmu_r32(LTQ_PMU_PWDCR) & ~module, LTQ_PMU_PWDCR);
-+ do {} while (--err && (ltq_pmu_r32(LTQ_PMU_PWDSR) & module));
-+
-+ if (!err)
-+ panic("activating PMU module failed!\n");
-+}
-+EXPORT_SYMBOL(ltq_pmu_enable);
-+
-+void ltq_pmu_disable(unsigned int module)
-+{
-+ ltq_pmu_w32(ltq_pmu_r32(LTQ_PMU_PWDCR) | module, LTQ_PMU_PWDCR);
-+}
-+EXPORT_SYMBOL(ltq_pmu_disable);
-+
-+void __init ltq_soc_init(void)
-+{
-+ ltq_pmu_membase = ltq_remap_resource(<q_pmu_resource);
-+ if (!ltq_pmu_membase)
-+ panic("Failed to remap pmu memory\n");
-+
-+ ltq_cgu_membase = ltq_remap_resource(<q_cgu_resource);
-+ if (!ltq_cgu_membase)
-+ panic("Failed to remap cgu memory\n");
-+
-+ ltq_ebu_membase = ltq_remap_resource(<q_ebu_resource);
-+ if (!ltq_ebu_membase)
-+ panic("Failed to remap ebu memory\n");
-+
-+ /* make sure to unprotect the memory region where flash is located */
-+ ltq_ebu_w32(ltq_ebu_r32(LTQ_EBU_BUSCON0) & ~EBU_WRDIS, LTQ_EBU_BUSCON0);
-+}
---- a/drivers/watchdog/lantiq_wdt.c
-+++ b/drivers/watchdog/lantiq_wdt.c
-@@ -16,7 +16,7 @@
- #include <linux/clk.h>
- #include <linux/io.h>
-
--#include <lantiq.h>
-+#include <lantiq_soc.h>
-
- /* Section 3.4 of the datasheet
- * The password sequence protects the WDT control register from unintended
projects / openwrt.git / blobdiff