diff options
author | Jonas Gorski <jogo@openwrt.org> | 2013-02-04 10:19:50 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2013-02-04 10:19:50 +0000 |
commit | 05706dae3239038ce82820d11fae8d8dea489b13 (patch) | |
tree | 2a0a6f9f6e49e2f6fc676b151fff168991ff6ffe /target/linux/brcm63xx/patches-3.7/002-MIPS-BCM63XX-add-core-reset-helper.patch | |
parent | 0b7d986ae018486f3884af0e774fb47f3818e4e3 (diff) | |
download | upstream-05706dae3239038ce82820d11fae8d8dea489b13.tar.gz upstream-05706dae3239038ce82820d11fae8d8dea489b13.tar.bz2 upstream-05706dae3239038ce82820d11fae8d8dea489b13.zip |
bcm63xx: add support for linux 3.7
Based on 3.7.6.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35481 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-3.7/002-MIPS-BCM63XX-add-core-reset-helper.patch')
-rw-r--r-- | target/linux/brcm63xx/patches-3.7/002-MIPS-BCM63XX-add-core-reset-helper.patch | 278 |
1 files changed, 278 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-3.7/002-MIPS-BCM63XX-add-core-reset-helper.patch b/target/linux/brcm63xx/patches-3.7/002-MIPS-BCM63XX-add-core-reset-helper.patch new file mode 100644 index 0000000000..9885fcca86 --- /dev/null +++ b/target/linux/brcm63xx/patches-3.7/002-MIPS-BCM63XX-add-core-reset-helper.patch @@ -0,0 +1,278 @@ +From c029c7520b110472164073f3a5b84841a2624c40 Mon Sep 17 00:00:00 2001 +From: Jonas Gorski <jonas.gorski@gmail.com> +Date: Mon, 3 Sep 2012 01:07:40 +0200 +Subject: [PATCH 2/3] MIPS: BCM63XX: add core reset helper + +Add a reset helper for resetting the different cores. + +Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> +--- + arch/mips/bcm63xx/Makefile | 6 +- + arch/mips/bcm63xx/reset.c | 223 ++++++++++++++++++++ + arch/mips/include/asm/mach-bcm63xx/bcm63xx_reset.h | 21 ++ + 3 files changed, 247 insertions(+), 3 deletions(-) + create mode 100644 arch/mips/bcm63xx/reset.c + create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_reset.h + +--- a/arch/mips/bcm63xx/Makefile ++++ b/arch/mips/bcm63xx/Makefile +@@ -1,6 +1,6 @@ +-obj-y += clk.o cpu.o cs.o gpio.o irq.o prom.o setup.o timer.o \ +- dev-dsp.o dev-enet.o dev-flash.o dev-pcmcia.o dev-rng.o \ +- dev-spi.o dev-uart.o dev-wdt.o dev-usb-usbd.o ++obj-y += clk.o cpu.o cs.o gpio.o irq.o prom.o reset.o setup.o \ ++ timer.o dev-dsp.o dev-enet.o dev-flash.o dev-pcmcia.o \ ++ dev-rng.o dev-spi.o dev-uart.o dev-wdt.o dev-usb-usbd.o + obj-$(CONFIG_EARLY_PRINTK) += early_printk.o + + obj-y += boards/ +--- /dev/null ++++ b/arch/mips/bcm63xx/reset.c +@@ -0,0 +1,223 @@ ++/* ++ * This file is subject to the terms and conditions of the GNU General Public ++ * License. See the file "COPYING" in the main directory of this archive ++ * for more details. ++ * ++ * Copyright (C) 2012 Jonas Gorski <jonas.gorski@gmail.com> ++ */ ++ ++#include <linux/module.h> ++#include <linux/mutex.h> ++#include <linux/err.h> ++#include <linux/clk.h> ++#include <linux/delay.h> ++#include <bcm63xx_cpu.h> ++#include <bcm63xx_io.h> ++#include <bcm63xx_regs.h> ++#include <bcm63xx_reset.h> ++ ++#define __GEN_RESET_BITS_TABLE(__cpu) \ ++ [BCM63XX_RESET_SPI] = BCM## __cpu ##_RESET_SPI, \ ++ [BCM63XX_RESET_ENET] = BCM## __cpu ##_RESET_ENET, \ ++ [BCM63XX_RESET_USBH] = BCM## __cpu ##_RESET_USBH, \ ++ [BCM63XX_RESET_USBD] = BCM## __cpu ##_RESET_USBD, \ ++ [BCM63XX_RESET_DSL] = BCM## __cpu ##_RESET_DSL, \ ++ [BCM63XX_RESET_SAR] = BCM## __cpu ##_RESET_SAR, \ ++ [BCM63XX_RESET_EPHY] = BCM## __cpu ##_RESET_EPHY, \ ++ [BCM63XX_RESET_ENETSW] = BCM## __cpu ##_RESET_ENETSW, \ ++ [BCM63XX_RESET_PCM] = BCM## __cpu ##_RESET_PCM, \ ++ [BCM63XX_RESET_MPI] = BCM## __cpu ##_RESET_MPI, \ ++ [BCM63XX_RESET_PCIE] = BCM## __cpu ##_RESET_PCIE, \ ++ [BCM63XX_RESET_PCIE_EXT] = BCM## __cpu ##_RESET_PCIE_EXT, ++ ++#define BCM6328_RESET_SPI SOFTRESET_6328_SPI_MASK ++#define BCM6328_RESET_ENET 0 ++#define BCM6328_RESET_USBH SOFTRESET_6328_USBH_MASK ++#define BCM6328_RESET_USBD SOFTRESET_6328_USBS_MASK ++#define BCM6328_RESET_DSL 0 ++#define BCM6328_RESET_SAR SOFTRESET_6328_SAR_MASK ++#define BCM6328_RESET_EPHY SOFTRESET_6328_EPHY_MASK ++#define BCM6328_RESET_ENETSW SOFTRESET_6328_ENETSW_MASK ++#define BCM6328_RESET_PCM SOFTRESET_6328_PCM_MASK ++#define BCM6328_RESET_MPI 0 ++#define BCM6328_RESET_PCIE \ ++ (SOFTRESET_6328_PCIE_MASK | \ ++ SOFTRESET_6328_PCIE_CORE_MASK | \ ++ SOFTRESET_6328_PCIE_HARD_MASK) ++#define BCM6328_RESET_PCIE_EXT SOFTRESET_6328_PCIE_EXT_MASK ++ ++#define BCM6338_RESET_SPI SOFTRESET_6338_SPI_MASK ++#define BCM6338_RESET_ENET SOFTRESET_6338_ENET_MASK ++#define BCM6338_RESET_USBH SOFTRESET_6338_USBH_MASK ++#define BCM6338_RESET_USBD SOFTRESET_6338_USBS_MASK ++#define BCM6338_RESET_DSL SOFTRESET_6338_ADSL_MASK ++#define BCM6338_RESET_SAR SOFTRESET_6338_SAR_MASK ++#define BCM6338_RESET_EPHY 0 ++#define BCM6338_RESET_ENETSW 0 ++#define BCM6338_RESET_PCM 0 ++#define BCM6338_RESET_MPI 0 ++#define BCM6338_RESET_PCIE 0 ++#define BCM6338_RESET_PCIE_EXT 0 ++ ++#define BCM6348_RESET_SPI SOFTRESET_6348_SPI_MASK ++#define BCM6348_RESET_ENET SOFTRESET_6348_ENET_MASK ++#define BCM6348_RESET_USBH SOFTRESET_6348_USBH_MASK ++#define BCM6348_RESET_USBD SOFTRESET_6348_USBS_MASK ++#define BCM6348_RESET_DSL SOFTRESET_6348_ADSL_MASK ++#define BCM6348_RESET_SAR SOFTRESET_6348_SAR_MASK ++#define BCM6348_RESET_EPHY 0 ++#define BCM6348_RESET_ENETSW 0 ++#define BCM6348_RESET_PCM 0 ++#define BCM6348_RESET_MPI 0 ++#define BCM6348_RESET_PCIE 0 ++#define BCM6348_RESET_PCIE_EXT 0 ++ ++#define BCM6358_RESET_SPI SOFTRESET_6358_SPI_MASK ++#define BCM6358_RESET_ENET SOFTRESET_6358_ENET_MASK ++#define BCM6358_RESET_USBH SOFTRESET_6358_USBH_MASK ++#define BCM6358_RESET_USBD 0 ++#define BCM6358_RESET_DSL SOFTRESET_6358_ADSL_MASK ++#define BCM6358_RESET_SAR SOFTRESET_6358_SAR_MASK ++#define BCM6358_RESET_EPHY SOFTRESET_6358_EPHY_MASK ++#define BCM6358_RESET_ENETSW 0 ++#define BCM6358_RESET_PCM SOFTRESET_6358_PCM_MASK ++#define BCM6358_RESET_MPI SOFTRESET_6358_MPI_MASK ++#define BCM6358_RESET_PCIE 0 ++#define BCM6358_RESET_PCIE_EXT 0 ++ ++#define BCM6368_RESET_SPI SOFTRESET_6368_SPI_MASK ++#define BCM6368_RESET_ENET 0 ++#define BCM6368_RESET_USBH SOFTRESET_6368_USBH_MASK ++#define BCM6368_RESET_USBD SOFTRESET_6368_USBS_MASK ++#define BCM6368_RESET_DSL 0 ++#define BCM6368_RESET_SAR SOFTRESET_6368_SAR_MASK ++#define BCM6368_RESET_EPHY SOFTRESET_6368_EPHY_MASK ++#define BCM6368_RESET_ENETSW 0 ++#define BCM6368_RESET_PCM SOFTRESET_6368_PCM_MASK ++#define BCM6368_RESET_MPI SOFTRESET_6368_MPI_MASK ++#define BCM6368_RESET_PCIE 0 ++#define BCM6368_RESET_PCIE_EXT 0 ++ ++#ifdef BCMCPU_RUNTIME_DETECT ++ ++/* ++ * core reset bits ++ */ ++static const u32 bcm6328_reset_bits[] = { ++ __GEN_RESET_BITS_TABLE(6328) ++}; ++ ++static const u32 bcm6338_reset_bits[] = { ++ __GEN_RESET_BITS_TABLE(6338) ++}; ++ ++static const u32 bcm6348_reset_bits[] = { ++ __GEN_RESET_BITS_TABLE(6348) ++}; ++ ++static const u32 bcm6358_reset_bits[] = { ++ __GEN_RESET_BITS_TABLE(6358) ++}; ++ ++static const u32 bcm6368_reset_bits[] = { ++ __GEN_RESET_BITS_TABLE(6368) ++}; ++ ++const u32 *bcm63xx_reset_bits; ++static int reset_reg; ++ ++static int __init bcm63xx_reset_bits_init(void) ++{ ++ if (BCMCPU_IS_6328()) { ++ reset_reg = PERF_SOFTRESET_6328_REG; ++ bcm63xx_reset_bits = bcm6328_reset_bits; ++ } else if (BCMCPU_IS_6338()) { ++ reset_reg = PERF_SOFTRESET_REG; ++ bcm63xx_reset_bits = bcm6338_reset_bits; ++ } else if (BCMCPU_IS_6348()) { ++ reset_reg = PERF_SOFTRESET_REG; ++ bcm63xx_reset_bits = bcm6348_reset_bits; ++ } else if (BCMCPU_IS_6358()) { ++ reset_reg = PERF_SOFTRESET_6358_REG; ++ bcm63xx_reset_bits = bcm6358_reset_bits; ++ } else if (BCMCPU_IS_6368()) { ++ reset_reg = PERF_SOFTRESET_6368_REG; ++ bcm63xx_reset_bits = bcm6368_reset_bits; ++ } ++ ++ return 0; ++} ++#else ++ ++#ifdef CONFIG_BCM63XX_CPU_6328 ++static const u32 bcm63xx_reset_bits[] = { ++ __GEN_RESET_BITS_TABLE(6328) ++}; ++#define reset_reg PERF_SOFTRESET_6328_REG ++#endif ++ ++#ifdef CONFIG_BCM63XX_CPU_6338 ++static const u32 bcm63xx_reset_bits[] = { ++ __GEN_RESET_BITS_TABLE(6338) ++}; ++#define reset_reg PERF_SOFTRESET_REG ++#endif ++ ++#ifdef CONFIG_BCM63XX_CPU_6345 ++static const u32 bcm63xx_reset_bits[] = { }; ++#define reset_reg 0 ++#endif ++ ++#ifdef CONFIG_BCM63XX_CPU_6348 ++static const u32 bcm63xx_reset_bits[] = { ++ __GEN_RESET_BITS_TABLE(6348) ++}; ++#define reset_reg PERF_SOFTRESET_REG ++#endif ++ ++#ifdef CONFIG_BCM63XX_CPU_6358 ++static const u32 bcm63xx_reset_bits[] = { ++ __GEN_RESET_BITS_TABLE(6358) ++}; ++#define reset_reg PERF_SOFTRESET_6358_REG ++#endif ++ ++#ifdef CONFIG_BCM63XX_CPU_6368 ++static const u32 bcm63xx_reset_bits[] = { ++ __GEN_RESET_BITS_TABLE(6368) ++}; ++#define reset_reg PERF_SOFTRESET_6368_REG ++#endif ++ ++static int __init bcm63xx_reset_bits_init(void) { return 0; } ++#endif ++ ++static DEFINE_SPINLOCK(reset_mutex); ++ ++static void __bcm63xx_core_set_reset(u32 mask, int enable) ++{ ++ unsigned long flags; ++ u32 val; ++ ++ if (!mask) ++ return; ++ ++ spin_lock_irqsave(&reset_mutex, flags); ++ val = bcm_perf_readl(reset_reg); ++ ++ if (enable) ++ val &= ~mask; ++ else ++ val |= mask; ++ ++ bcm_perf_writel(val, reset_reg); ++ spin_unlock_irqrestore(&reset_mutex, flags); ++} ++ ++void bcm63xx_core_set_reset(enum bcm63xx_core_reset core, int reset) ++{ ++ __bcm63xx_core_set_reset(bcm63xx_reset_bits[core], reset); ++} ++EXPORT_SYMBOL(bcm63xx_core_set_reset); ++ ++postcore_initcall(bcm63xx_reset_bits_init); +--- /dev/null ++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_reset.h +@@ -0,0 +1,21 @@ ++#ifndef __BCM63XX_RESET_H ++#define __BCM63XX_RESET_H ++ ++enum bcm63xx_core_reset { ++ BCM63XX_RESET_SPI, ++ BCM63XX_RESET_ENET, ++ BCM63XX_RESET_USBH, ++ BCM63XX_RESET_USBD, ++ BCM63XX_RESET_SAR, ++ BCM63XX_RESET_DSL, ++ BCM63XX_RESET_EPHY, ++ BCM63XX_RESET_ENETSW, ++ BCM63XX_RESET_PCM, ++ BCM63XX_RESET_MPI, ++ BCM63XX_RESET_PCIE, ++ BCM63XX_RESET_PCIE_EXT, ++}; ++ ++void bcm63xx_core_set_reset(enum bcm63xx_core_reset, int reset); ++ ++#endif |