Move DT kirkwood into mach-mvebu
Subsystems (14)
Andrew Lunn
maintainerv4 cover Move DT kirkwood into mach-mvebu
The process of making most kirkwood boards boot using DT is nearly complete. We can now move these boards into mach-mvebu, freeing them of the legacy code needed for none-DT systems. At the same time, they can become part of ARCH_MULTI_V5.
This patchset can also be found in:
https://github.com/lunn/linux.git v3.14-rc1-mvebu-v4
Since v3:
Dropped the last patch removing DT support from mach-kirkwood. This will help Debian until we complete moving all boards to DT and into mach-mvebu. Also allow the DTB files to be compiled for both. Added back the watchdog to the *_config files.
Added Tested-by's and Acked-by's
Since v2:
The L2 Cache binding has been re-written again. No more wt-override in the binding, respect CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH Fixed a few typos in changelogs
Added a few Cc: for maintainers outside of the ARM world. Added Acked-by:s
Since v1:mv88f6281gtw_ge switch really does now use DT.
The L2 Cache binding has been re-written. kirkwood.dtsi changes have been placed into there own patch. Added mvebu_v5_defconfig
Fixed a few typos in changelogs
Added a few Cc:s
Andrew Lunn (22):
ARM: Kirkwood: Give pm.c its own header file.
irqchip: Orion: Fix getting generic chip pointer.
ARM: Kirkwood: Convert mv88f6281gtw_ge switch setup to DT
ARM: Kirkwood: Drop printing the SoC type and revision
ARM: Kirkwood: Seperate board-dt from common and pcie code.
ARM: Kirkwood: ioremap the cpu_config register before using it.
ARM: Kirkwood: ioremap memory control register
ARM: MVEBU: Add ARCH_MULTI_V7 to SoCs
ARM: Orion: Move cache-feroceon-l2.h out of plat-orion
ARM: MM: Add DT binding for Feroceon L2 cache
ARM: Kirkwood: Instantiate L2 cache from DT.
ARM: Fix default CPU selection for ARCH_MULTI_V5
ARM: Fix MULTI_TLB for feroceon
ARM: MM Enable building Feroceon L2 cache controller with ARCH_MVEBU
ARM: Move kirkwood DT boards into mach-mvebu
ARM: MVEBU: Let kirkwood use the system controller for restart
ARM: MVEBU: Instantiate system controller in kirkwood.dtsi
drivers: Enable building of Kirkwood drivers for mach-mvebu
ARM: MVEBU: Enable mvebu-soc-id on Kirkwood
ARM: config: Add a multi_v5_defconfig
ARM: MVEBU: Simplifiy headers and make local
ARM: config: Add mvebu_v5_defconfig
.../devicetree/bindings/arm/mrvl/feroceon.txt | 16 ++ arch/arm/Kconfig | 2 +- arch/arm/boot/dts/Makefile | 9 +- arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 62 +++++++ arch/arm/boot/dts/kirkwood.dtsi | 10 ++ arch/arm/configs/multi_v5_defconfig | 185 ++++++++++++++++++++ arch/arm/configs/mvebu_v5_defconfig | 172 +++++++++++++++++++ arch/arm/include/asm/hardware/cache-feroceon-l2.h | 13 ++ arch/arm/mach-kirkwood/Kconfig | 7 - arch/arm/mach-kirkwood/Makefile | 4 +- arch/arm/mach-kirkwood/board-dt.c | 108 ++++++++++-- arch/arm/mach-kirkwood/board-mv88f6281gtw_ge.c | 50 ------ arch/arm/mach-kirkwood/common.c | 3 +- arch/arm/mach-kirkwood/common.h | 13 -- arch/arm/mach-kirkwood/include/mach/bridge-regs.h | 2 + arch/arm/mach-kirkwood/pm.c | 9 +- arch/arm/mach-kirkwood/pm.h | 26 +++ arch/arm/mach-mv78xx0/common.c | 2 +- arch/arm/mach-mvebu/Kconfig | 23 ++- arch/arm/mach-mvebu/Makefile | 1 + arch/arm/mach-mvebu/kirkwood-pm.c | 76 +++++++++ arch/arm/mach-mvebu/kirkwood-pm.h | 26 +++ arch/arm/mach-mvebu/kirkwood.c | 190 +++++++++++++++++++++ arch/arm/mach-mvebu/kirkwood.h | 22 +++ arch/arm/mach-mvebu/mvebu-soc-id.c | 1 + arch/arm/mm/Kconfig | 2 +- arch/arm/mm/cache-feroceon-l2.c | 45 ++++- arch/arm/mm/proc-feroceon.S | 2 +- arch/arm/mm/tlb-v4wbi.S | 3 + .../plat-orion/include/plat/cache-feroceon-l2.h | 11 -- drivers/cpufreq/Kconfig.arm | 2 +- drivers/cpuidle/Kconfig.arm | 2 +- drivers/irqchip/irq-orion.c | 3 +- drivers/leds/Kconfig | 4 +- drivers/phy/Kconfig | 2 +- drivers/thermal/Kconfig | 2 +- sound/soc/kirkwood/Kconfig | 2 +- 37 files changed, 990 insertions(+), 122 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/mrvl/feroceon.txt create mode 100644 arch/arm/configs/multi_v5_defconfig create mode 100644 arch/arm/configs/mvebu_v5_defconfig create mode 100644 arch/arm/include/asm/hardware/cache-feroceon-l2.h delete mode 100644 arch/arm/mach-kirkwood/board-mv88f6281gtw_ge.c create mode 100644 arch/arm/mach-kirkwood/pm.h create mode 100644 arch/arm/mach-mvebu/kirkwood-pm.c create mode 100644 arch/arm/mach-mvebu/kirkwood-pm.h create mode 100644 arch/arm/mach-mvebu/kirkwood.c create mode 100644 arch/arm/mach-mvebu/kirkwood.h delete mode 100644 arch/arm/plat-orion/include/plat/cache-feroceon-l2.h
Signature · 1 line
1.8.5.3
Andrew Lunn
maintainerPATCH v4 1/22 ARM: Kirkwood: Give pm.c its own header file.
The pm code needs to be separated from common.h in order to split DT and non-DT systems apart. Move the declarations into a header file of its own and include it where needed.
---
v3:
s/seperated/separated
--- arch/arm/mach-kirkwood/board-dt.c | 1 + arch/arm/mach-kirkwood/common.c | 1 + arch/arm/mach-kirkwood/common.h | 6 ------ arch/arm/mach-kirkwood/pm.h | 26 ++++++++++++++++++++++++++ 4 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 arch/arm/mach-kirkwood/pm.h
arch/arm/mach-kirkwood/board-dt.c +1 -0
@@ -24,6 +24,7 @@#include <mach/bridge-regs.h> #include <plat/common.h> #include "common.h" +#include "pm.h" #define MV643XX_ETH_MAC_ADDR_LOW 0x0414#define MV643XX_ETH_MAC_ADDR_HIGH 0x0418
arch/arm/mach-kirkwood/common.c +1 -0
@@ -36,6 +36,7 @@#include <plat/time.h> #include <linux/platform_data/dma-mv_xor.h> #include "common.h" +#include "pm.h" /* These can go away once Kirkwood uses the mvebu-mbus DT binding */ #define KIRKWOOD_MBUS_NAND_TARGET 0x01
arch/arm/mach-kirkwood/common.h +0 -6
@@ -58,12 +58,6 @@ void kirkwood_cpufreq_init(void);void kirkwood_restart (enum reboot_mode ,const char *);void kirkwood_clk_init (void ); -#ifdef CONFIG_PM -void kirkwood_pm_init (void ); -#else -static inline void kirkwood_pm_init (void ) {}; -#endif -/* board init functions for boards not fully converted to fdt */ #ifdef CONFIG_MACH_MV88F6281GTW_GE_DT void mv88f6281gtw_ge_init (void );
arch/arm/mach-kirkwood/pm.h new file +26 -0
@@ -0,0 +1,26 @@ +/* +* Power Management driver for Marvell Kirkwood SoCs +* +* Copyright (C) 2013 Ezequiel Garcia <[email protected]> +* Copyright (C) 2010 Simon Guinot <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License, +* version 2 of the License. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ + +#ifndef __ARCH_KIRKWOOD_PM_H +#define __ARCH_KIRKWOOD_PM_H + +#ifdef CONFIG_PM +void kirkwood_pm_init (void ); +#else +static inline void kirkwood_pm_init (void ) {}; +#endif + +#endif
Signature · 1 line
1.8.5.3
Andrew Lunn
maintainerPATCH v4 2/22 irqchip: Orion: Fix getting generic chip pointer.
In reply to Andrew LunnEnabling SPARSE_IRQ shows up a bug in the irq-orion bridge interrupt handler. The bridge interrupt is implemented using a single generic chip. Thus the parameter passed to irq_get_domain_generic_chip() should always be zero.
--- drivers/irqchip/irq-orion.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/irqchip/irq-orion.c +2 -1
@@ -111,7 +111,8 @@ IRQCHIP_DECLARE(orion_intc, "marvell,orion-intc", orion_irq_init);static void orion_bridge_irq_handler (unsigned int irq,struct irq_desc *desc) {struct irq_domain *d =irq_get_handler_data (irq); -struct irq_chip_generic *gc =irq_get_domain_generic_chip (d, irq); + +struct irq_chip_generic *gc =irq_get_domain_generic_chip (d,0 );u32 stat =readl_relaxed (gc->reg_base +ORION_BRIDGE_IRQ_CAUSE ) & gc->mask_cache;
Signature · 1 line
1.8.5.3
PATCH v4 2/22 irqchip: Orion: Fix getting generic chip pointer.
Quoted 5 lines · Andrew Lunn
Enabling
SPARSE_IRQshows up a bug in the irq-orion bridge interrupt handler. The bridge interrupt is implemented using a single generic chip. Thus the parameter passed toirq_get_domain_generic_chip()should always be zero.
Quoted 7 lines
Signed-off-by Andrew Lunn <[email protected]>Acked-by Arnd Bergmann <[email protected]>--- drivers/irqchip/irq-orion.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tglx has already taken pull request containing this fix.
thx,
Jason.
Quoted 17 lines
drivers/irqchip/irq-orion.c +2
-1@@ -111,7 +111,8 @@ IRQCHIP_DECLARE(orion_intc, "marvell,orion-intc", orion_irq_init);static void orion_bridge_irq_handler (unsigned int irq,struct irq_desc *desc) {struct irq_domain *d =irq_get_handler_data (irq); -struct irq_chip_generic *gc =irq_get_domain_generic_chip (d, irq); + +struct irq_chip_generic *gc =irq_get_domain_generic_chip (d,0 );u32 stat =readl_relaxed (gc->reg_base +ORION_BRIDGE_IRQ_CAUSE ) & gc->mask_cache;Signature · 1 line
1.8.5.3
Andrew Lunn
maintainerPATCH v4 3/22 ARM: Kirkwood: Convert mv88f6281gtw_ge switch setup to DT
In reply to Andrew LunnThe mv88f6281gtw_ge has a ethernet switch connected to the ethernet port of the SoC. Convert the platform device instantiation to a DT instantiation.
---
v2
Remove the spurius Module.symvers
Really do describe the switch in DT.
--- arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 62 ++++++++++++++++++++++++++ arch/arm/mach-kirkwood/Kconfig | 7 --- arch/arm/mach-kirkwood/Makefile | 1 - arch/arm/mach-kirkwood/board-dt.c | 3 -- arch/arm/mach-kirkwood/board-mv88f6281gtw_ge.c | 50 --------------------- arch/arm/mach-kirkwood/common.h | 7 --- 6 files changed, 62 insertions(+), 68 deletions(-) delete mode 100644 arch/arm/mach-kirkwood/board-mv88f6281gtw_ge.c
arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts +62 -0
@@ -122,4 +122,66 @@ gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; }; }; + + dsa at 0 { + compatible = "marvell,dsa"; + #address-cells = <2>; + #size-cells = <0>; + + dsa,ethernet = <ð0>; + dsa,mii-bus = <ðphy0>; + + switch at 0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0 0>; /* MDIO address 0, switch 0 in tree */ + + port at 0 { + reg = <0>; + label = "lan1"; + }; + + port at 1 { + reg = <1>; + label = "lan2"; + }; + + port at 2 { + reg = <2>; + label = "lan3"; + }; + + port at 3 { + reg = <3>; + label = "lan4"; + }; + + port at 4 { + reg = <4>; + label = "wan"; + }; + + port at 5 { + reg = <5>; + label = "cpu"; + }; + }; + }; +}; + +&mdio { + status = "okay"; + + ethphy0: ethernet-phy at ff { + reg = <0xff>; /* No phy attached */ + speed = <1000>; + duplex = <1>; + }; +}; + +ð0 { + status = "okay"; + ethernet0-port at 0 { + phy-handle = <ðphy0>; + }; };
arch/arm/mach-kirkwood/Kconfig +0 -7
@@ -106,13 +106,6 @@ config ARCH_KIRKWOOD_DT Say 'Y' here if you want your kernel to support the Marvell Kirkwood using flattened device tree. -config MACH_MV88F6281GTW_GE_DT - bool "Marvell 88F6281 GTW GE Board (Flattened Device Tree)" - depends on ARCH_KIRKWOOD_DT - help - Say 'Y' here if you want your kernel to support the - Marvell 88F6281 GTW GE Board (Flattened Device Tree). - endmenu endif
arch/arm/mach-kirkwood/Makefile +0 -1
@@ -13,4 +13,3 @@ obj-$(CONFIG_MACH_TS219) += ts219-setup.o tsx1x-common.o obj-$(CONFIG_MACH_TS41X) += ts41x-setup.o tsx1x-common.o obj-$(CONFIG_ARCH_KIRKWOOD_DT) += board-dt.o -obj-$(CONFIG_MACH_MV88F6281GTW_GE_DT) += board-mv88f6281gtw_ge.o
arch/arm/mach-kirkwood/board-dt.c +0 -3
@@ -131,9 +131,6 @@ static void __init kirkwood_dt_init(void) kexec_reinit = kirkwood_enable_pcie;#endif -if (of_machine_is_compatible ("marvell,mv88f6281gtw-ge" )) -mv88f6281gtw_ge_init (); -of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL ); }
arch/arm/mach-kirkwood/board-mv88f6281gtw_ge.c deleted +0 -50
50 lines not on this page · raw message
arch/arm/mach-kirkwood/common.h +0 -7
@@ -58,13 +58,6 @@ void kirkwood_cpufreq_init(void);void kirkwood_restart (enum reboot_mode ,const char *);void kirkwood_clk_init (void ); -/* board init functions for boards not fully converted to fdt */ -#ifdef CONFIG_MACH_MV88F6281GTW_GE_DT -void mv88f6281gtw_ge_init (void ); -#else -static inline void mv88f6281gtw_ge_init (void ) {}; -#endif -/* early init functions not converted to fdt yet */ char *kirkwood_id (void );void kirkwood_l2_init (void );
Signature · 1 line
1.8.5.3
PATCH v4 3/22 ARM: Kirkwood: Convert mv88f6281gtw_ge switch setup to DT
Quoted 12 lines · Andrew Lunn
The
mv88f6281gtw_gehas a ethernet switch connected to the ethernet port of the SoC. Convert the platform device instantiation to a DT instantiation.Signed-off-by Andrew Lunn <[email protected]>Acked-by Arnd Bergmann <[email protected]>Tested-by Jason Gunthorpe <[email protected]>Cc florian at openwrt.org---
v2
Remove the spurius Module.symvers
Really do describe the switch in DT.
Quoted 9 lines
--- arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 62 ++++++++++++++++++++++++++ arch/arm/mach-kirkwood/Kconfig | 7 --- arch/arm/mach-kirkwood/Makefile | 1 - arch/arm/mach-kirkwood/board-dt.c | 3 -- arch/arm/mach-kirkwood/board-mv88f6281gtw_ge.c | 50 --------------------- arch/arm/mach-kirkwood/common.h | 7 --- 6 files changed, 62 insertions(+), 68 deletions(-) delete mode 100644 arch/arm/mach-kirkwood/board-mv88f6281gtw_ge.c
You know, I think this is the last time we'll have to tie code changes and dts file changes together...
:)
thx,
Jason.
Quoted 189 lines
arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts +62
-0@@ -122,4 +122,66 @@ gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; }; }; + + dsa at 0 { + compatible = "marvell,dsa"; + #address-cells = <2>; + #size-cells = <0>; + + dsa,ethernet = <ð0>; + dsa,mii-bus = <ðphy0>; + + switch at 0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0 0>; /* MDIO address 0, switch 0 in tree */ + + port at 0 { + reg = <0>; + label = "lan1"; + }; + + port at 1 { + reg = <1>; + label = "lan2"; + }; + + port at 2 { + reg = <2>; + label = "lan3"; + }; + + port at 3 { + reg = <3>; + label = "lan4"; + }; + + port at 4 { + reg = <4>; + label = "wan"; + }; + + port at 5 { + reg = <5>; + label = "cpu"; + }; + }; + }; +}; + +&mdio { + status = "okay"; + + ethphy0: ethernet-phy at ff { + reg = <0xff>; /* No phy attached */ + speed = <1000>; + duplex = <1>; + }; +}; + +ð0 { + status = "okay"; + ethernet0-port at 0 { + phy-handle = <ðphy0>; + }; };arch/arm/mach-kirkwood/Kconfig +0
-7@@ -106,13 +106,6 @@ config ARCH_KIRKWOOD_DT Say 'Y' here if you want your kernel to support the Marvell Kirkwood using flattened device tree. -config MACH_MV88F6281GTW_GE_DT - bool "Marvell 88F6281 GTW GE Board (Flattened Device Tree)" - depends on ARCH_KIRKWOOD_DT - help - Say 'Y' here if you want your kernel to support the - Marvell 88F6281 GTW GE Board (Flattened Device Tree). - endmenu endifarch/arm/mach-kirkwood/Makefile +0
-1@@ -13,4 +13,3 @@ obj-$(CONFIG_MACH_TS219) += ts219-setup.o tsx1x-common.o obj-$(CONFIG_MACH_TS41X) += ts41x-setup.o tsx1x-common.o obj-$(CONFIG_ARCH_KIRKWOOD_DT) += board-dt.o -obj-$(CONFIG_MACH_MV88F6281GTW_GE_DT) += board-mv88f6281gtw_ge.oarch/arm/mach-kirkwood/board-dt.c +0
-3@@ -131,9 +131,6 @@ static void __init kirkwood_dt_init(void) kexec_reinit = kirkwood_enable_pcie;#endif -if (of_machine_is_compatible ("marvell,mv88f6281gtw-ge" )) -mv88f6281gtw_ge_init (); -of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL ); }arch/arm/mach-kirkwood/board-mv88f6281gtw_ge.c deleted +0
-50@@ -1,50 +0,0 @@ -/* -* arch/arm/mach-kirkwood/board-mv88f6281gtw_ge.c -* -* Marvell 88F6281 GTW GE Board Setup -* -* This file is licensed under the terms of the GNU General Public -* License version 2. This program is licensed "as is" without any -* warranty of any kind, whether express or implied. -*/ - -#include <linux/kernel.h> -#include <linux/init.h> -#include <linux/platform_device.h> -#include <linux/irq.h> -#include <linux/timer.h> -#include <linux/mv643xx_eth.h> -#include <linux/ethtool.h> -#include <linux/gpio.h> -#include <net/dsa.h> -#include <asm/mach-types.h> -#include <asm/mach/arch.h> -#include <asm/mach/pci.h> -#include <mach/kirkwood.h> -#include "common.h" - -static struct mv643xx_eth_platform_data mv88f6281gtw_ge_ge00_data = { - .phy_addr =MV643XX_ETH_PHY_NONE , - .speed =SPEED_1000 , - .duplex =DUPLEX_FULL , -}; - -static struct dsa_chip_data mv88f6281gtw_ge_switch_chip_data = { - .port_names[0 ] ="lan1" , - .port_names[1 ] ="lan2" , - .port_names[2 ] ="lan3" , - .port_names[3 ] ="lan4" , - .port_names[4 ] ="wan" , - .port_names[5 ] ="cpu" , -}; - -static struct dsa_platform_data mv88f6281gtw_ge_switch_plat_data = { - .nr_chips =1 , - .chip = &mv88f6281gtw_ge_switch_chip_data, -}; - -void __init mv88f6281gtw_ge_init (void ) -{ -kirkwood_ge00_init (&mv88f6281gtw_ge_ge00_data); -kirkwood_ge00_switch_init (&mv88f6281gtw_ge_switch_plat_data,NO_IRQ ); -}arch/arm/mach-kirkwood/common.h +0
-7@@ -58,13 +58,6 @@ void kirkwood_cpufreq_init(void);void kirkwood_restart (enum reboot_mode ,const char *);void kirkwood_clk_init (void ); -/* board init functions for boards not fully converted to fdt */ -#ifdef CONFIG_MACH_MV88F6281GTW_GE_DT -void mv88f6281gtw_ge_init (void ); -#else -static inline void mv88f6281gtw_ge_init (void ) {}; -#endif -/* early init functions not converted to fdt yet */ char *kirkwood_id (void );void kirkwood_l2_init (void );Signature · 1 line
1.8.5.3
Andrew Lunn
maintainerPATCH v4 3/22 ARM: Kirkwood: Convert mv88f6281gtw_ge switch setup to DT
Quoted 23 lines · Jason Cooper
Quoted 12 lines · Andrew Lunn
The
mv88f6281gtw_gehas a ethernet switch connected to the ethernet port of the SoC. Convert the platform device instantiation to a DT instantiation.Signed-off-by Andrew Lunn <[email protected]>Acked-by Arnd Bergmann <[email protected]>Tested-by Jason Gunthorpe <[email protected]>Cc florian at openwrt.org---
v2
Remove the spurius Module.symvers
Really do describe the switch in DT.Quoted 9 lines
--- arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 62 ++++++++++++++++++++++++++ arch/arm/mach-kirkwood/Kconfig | 7 --- arch/arm/mach-kirkwood/Makefile | 1 - arch/arm/mach-kirkwood/board-dt.c | 3 -- arch/arm/mach-kirkwood/board-mv88f6281gtw_ge.c | 50 --------------------- arch/arm/mach-kirkwood/common.h | 7 --- 6 files changed, 62 insertions(+), 68 deletions(-) delete mode 100644 arch/arm/mach-kirkwood/board-mv88f6281gtw_ge.c
Quoted 2 lines
You know, I think this is the last time we'll have to tie code changes and dts file changes together...
Humm, if we part convert T5325 and OpenRD it won't be.
Andrew
PATCH v4 3/22 ARM: Kirkwood: Convert mv88f6281gtw_ge switch setup to DT
Quoted 24 lines · Andrew Lunn
Quoted 23 lines · Jason Cooper
Quoted 21 lines · Andrew Lunn
The
mv88f6281gtw_gehas a ethernet switch connected to the ethernet port of the SoC. Convert the platform device instantiation to a DT instantiation.Signed-off-by Andrew Lunn <[email protected]>Acked-by Arnd Bergmann <[email protected]>Tested-by Jason Gunthorpe <[email protected]>Cc florian at openwrt.org---
v2
Remove the spurius Module.symvers
Really do describe the switch in DT.--- arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 62 ++++++++++++++++++++++++++ arch/arm/mach-kirkwood/Kconfig | 7 --- arch/arm/mach-kirkwood/Makefile | 1 - arch/arm/mach-kirkwood/board-dt.c | 3 -- arch/arm/mach-kirkwood/board-mv88f6281gtw_ge.c | 50 --------------------- arch/arm/mach-kirkwood/common.h | 7 --- 6 files changed, 62 insertions(+), 68 deletions(-) delete mode 100644 arch/arm/mach-kirkwood/board-mv88f6281gtw_ge.c
Quoted 4 lines
Quoted 2 lines
You know, I think this is the last time we'll have to tie code changes and dts file changes together...
Humm, if we part convert T5325 and OpenRD it won't be.
Depends on how critical we think audio and leds are to those boards...
thx,
Jason.
Andrew Lunn
maintainerPATCH v4 4/22 ARM: Kirkwood: Drop printing the SoC type and revision
In reply to Andrew LunnThis will be added back using the mach-mvebu equivalent once the move has been made.
--- arch/arm/mach-kirkwood/board-dt.c | 2 -- 1 file changed, 2 deletions(-)
arch/arm/mach-kirkwood/board-dt.c +0 -2
@@ -107,8 +107,6 @@ eth_fixup_skip:static void __init kirkwood_dt_init (void ) { -pr_info ("Kirkwood: %s.\n" ,kirkwood_id ()); -/* * Disable propagation of mbus errors to the CPU local bus, * as this causes mbus errors (which can occur for example
Signature · 1 line
1.8.5.3
Andrew Lunn
maintainerPATCH v4 5/22 ARM: Kirkwood: Seperate board-dt from common and pcie code.
In reply to Andrew LunnIn order to be able to move DT support into mach-mvebu, the DT code needs to be cleanly separated from common and pcie code. Import the needed bits of these files into board-dt.c. The "common" code then becomes purely legacy, supporting none DT boards, so reflect this in the Makefile targets.
--- arch/arm/mach-kirkwood/Makefile | 3 +- arch/arm/mach-kirkwood/board-dt.c | 88 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 88 insertions(+), 3 deletions(-)
arch/arm/mach-kirkwood/Makefile +1 -2
@@ -1,5 +1,4 @@ -obj-y += common.o pcie.o -obj-$(CONFIG_KIRKWOOD_LEGACY) += irq.o mpp.o +obj-$(CONFIG_KIRKWOOD_LEGACY) += irq.o mpp.o common.o pcie.o obj-$(CONFIG_PM) += pm.o obj-$(CONFIG_MACH_D2NET_V2) += d2net_v2-setup.o lacie_v2-common.o
arch/arm/mach-kirkwood/board-dt.c +87 -1
98 lines not on this page · raw message
Signature · 1 line
1.8.5.3
Andrew Lunn
maintainerPATCH v4 6/22 ARM: Kirkwood: ioremap the cpu_config register before using it.
In reply to Andrew LunnWith the move to mach-mvebu and MULTI_V5, the global iomap for all registers will be going away. So explicitly map the CPU configuration register before using it.
---
v3:
Make static __init.
Unmap the region when finished.
--- arch/arm/mach-kirkwood/board-dt.c | 22 +++++++++++++++------- arch/arm/mach-kirkwood/include/mach/bridge-regs.h | 1 + 2 files changed, 16 insertions(+), 7 deletions(-)
arch/arm/mach-kirkwood/board-dt.c +15 -7
@@ -191,15 +191,23 @@ eth_fixup_skip: } } +/* +* Disable propagation of mbus errors to the CPU local bus, as this +* causes mbus errors (which can occur for example for PCI aborts) to +* throw CPU aborts, which we're not set up to deal with. +*/ +static void __init kirkwood_disable_mbus_error_propagation (void ) +{ +void __iomem *cpu_config; + + cpu_config =ioremap (CPU_CONFIG_PHYS ,4 ); +writel (readl (cpu_config) & ~CPU_CONFIG_ERROR_PROP , cpu_config); +iounmap (cpu_config); +} +static void __init kirkwood_dt_init (void ) { -/* -* Disable propagation of mbus errors to the CPU local bus, -* as this causes mbus errors (which can occur for example -* for PCI aborts) to throw CPU aborts, which we're not set -* up to deal with. -*/ -writel (readl (CPU_CONFIG ) & ~CPU_CONFIG_ERROR_PROP ,CPU_CONFIG ); +kirkwood_disable_mbus_error_propagation ();BUG_ON (mvebu_mbus_dt_init ());
arch/arm/mach-kirkwood/include/mach/bridge-regs.h +1 -0
@@ -14,6 +14,7 @@#include <mach/kirkwood.h> #define CPU_CONFIG (BRIDGE_VIRT_BASE + 0x0100) +#define CPU_CONFIG_PHYS (BRIDGE_PHYS_BASE + 0x0100)#define CPU_CONFIG_ERROR_PROP 0x00000004#define CPU_CONTROL (BRIDGE_VIRT_BASE + 0x0104)
Signature · 1 line
1.8.5.3
Andrew Lunn
maintainerPATCH v4 7/22 ARM: Kirkwood: ioremap memory control register
In reply to Andrew LunnTo allow removal of the global map of registers, make the pm code ioremap the registers it needs.
--- arch/arm/mach-kirkwood/include/mach/bridge-regs.h | 1 + arch/arm/mach-kirkwood/pm.c | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-)
arch/arm/mach-kirkwood/include/mach/bridge-regs.h +1 -0
@@ -80,5 +80,6 @@#define CGC_RESERVED (0x6 << 21)#define MEMORY_PM_CTRL (BRIDGE_VIRT_BASE + 0x118) +#define MEMORY_PM_CTRL_PHYS (BRIDGE_PHYS_BASE + 0x118)#endif
arch/arm/mach-kirkwood/pm.c +6 -3
@@ -21,15 +21,16 @@#include "common.h" static void __iomem *ddr_operation_base; +static void __iomem *memory_pm_ctrl;static void kirkwood_low_power (void ) {u32 mem_pm_ctrl; - mem_pm_ctrl =readl (MEMORY_PM_CTRL ); + mem_pm_ctrl =readl (memory_pm_ctrl);/* Set peripherals to low-power mode */ -writel_relaxed (~0 ,MEMORY_PM_CTRL ); +writel_relaxed (~0 , memory_pm_ctrl);/* Set DDR in self-refresh */ writel_relaxed (0x7 , ddr_operation_base);
@@ -41,7 +42,7 @@ static void kirkwood_low_power(void)*/ cpu_do_idle (); -writel_relaxed (mem_pm_ctrl,MEMORY_PM_CTRL ); +writel_relaxed (mem_pm_ctrl, memory_pm_ctrl); }static int kirkwood_suspend_enter (suspend_state_t state)
@@ -69,5 +70,7 @@ static const struct platform_suspend_ops kirkwood_suspend_ops = {void __init kirkwood_pm_init (void ) { ddr_operation_base =ioremap (DDR_OPERATION_BASE ,4 ); + memory_pm_ctrl =ioremap (MEMORY_PM_CTRL_PHYS ,4 ); +suspend_set_ops (&kirkwood_suspend_ops); }
Signature · 1 line
1.8.5.3
Andrew Lunn
maintainerPATCH v4 8/22 ARM: MVEBU: Add ARCH_MULTI_V7 to SoCs
In reply to Andrew LunnPrepare mach-mvebu to house both ARCH_MULTI_V7 and ARCH_MULTI_V5 systems by adding ARCH_MULTI_V7 to the existing SOCs.
--- arch/arm/mach-mvebu/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-mvebu/Kconfig +2 -2
@@ -29,7 +29,7 @@ config MACH_ARMADA_370_XP select CPU_PJ4B config MACH_ARMADA_370 - bool "Marvell Armada 370 boards" + bool "Marvell Armada 370 boards" if ARCH_MULTI_V7 select ARMADA_370_CLK select MACH_ARMADA_370_XP select PINCTRL_ARMADA_370
@@ -38,7 +38,7 @@ config MACH_ARMADA_370 on the Marvell Armada 370 SoC with device tree. config MACH_ARMADA_XP - bool "Marvell Armada XP boards" + bool "Marvell Armada XP boards" if ARCH_MULTI_V7 select ARMADA_XP_CLK select MACH_ARMADA_370_XP select PINCTRL_ARMADA_XP
Signature · 1 line
1.8.5.3
Andrew Lunn
maintainerPATCH v4 9/22 ARM: Orion: Move cache-feroceon-l2.h out of plat-orion
In reply to Andrew LunnWith the gradual move to DT, kirkwood has become a lot less dependent on plat-orion. cache-feroceon-l2.h is the last dependency. Move it out so we can drop plat-orion when building DT only kirkwood boards.
--- arch/arm/include/asm/hardware/cache-feroceon-l2.h | 11 +++++++++++ arch/arm/mach-kirkwood/board-dt.c | 2 +- arch/arm/mach-kirkwood/common.c | 2 +- arch/arm/mach-mv78xx0/common.c | 2 +- arch/arm/mm/cache-feroceon-l2.c | 2 +- arch/arm/plat-orion/include/plat/cache-feroceon-l2.h | 11 ----------- 6 files changed, 15 insertions(+), 15 deletions(-) create mode 100644 arch/arm/include/asm/hardware/cache-feroceon-l2.h delete mode 100644 arch/arm/plat-orion/include/plat/cache-feroceon-l2.h
arch/arm/include/asm/hardware/cache-feroceon-l2.h new file +11 -0
@@ -0,0 +1,11 @@ +/* +* arch/arm/include/asm/hardware/cache-feroceon-l2.h +* +* Copyright (C) 2008 Marvell Semiconductor +* +* This file is licensed under the terms of the GNU General Public +* License version 2. This program is licensed "as is" without any +* warranty of any kind, whether express or implied. +*/ + +extern void __init feroceon_l2_init (int l2_wt_override);
arch/arm/mach-kirkwood/board-dt.c +1 -1
@@ -20,11 +20,11 @@#include <linux/dma-mapping.h> #include <linux/irqchip.h> #include <linux/kexec.h> +#include <asm/hardware/cache-feroceon-l2.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> #include <mach/bridge-regs.h> #include <plat/common.h> -#include <plat/cache-feroceon-l2.h> #include <plat/pcie.h> #include "pm.h"
arch/arm/mach-kirkwood/common.c +1 -1
@@ -25,10 +25,10 @@#include <asm/page.h> #include <asm/mach/map.h> #include <asm/mach/time.h> +#include <asm/hardware/cache-feroceon-l2.h> #include <mach/kirkwood.h> #include <mach/bridge-regs.h> #include <linux/platform_data/asoc-kirkwood.h> -#include <plat/cache-feroceon-l2.h> #include <linux/platform_data/mmc-mvsdio.h> #include <linux/platform_data/mtd-orion_nand.h> #include <linux/platform_data/usb-ehci-orion.h>
arch/arm/mach-mv78xx0/common.c +1 -1
@@ -15,11 +15,11 @@#include <linux/ata_platform.h> #include <linux/clk-provider.h> #include <linux/ethtool.h> +#include <asm/hardware/cache-feroceon-l2.h> #include <asm/mach/map.h> #include <asm/mach/time.h> #include <mach/mv78xx0.h> #include <mach/bridge-regs.h> -#include <plat/cache-feroceon-l2.h> #include <linux/platform_data/usb-ehci-orion.h> #include <linux/platform_data/mtd-orion_nand.h> #include <plat/time.h>
arch/arm/mm/cache-feroceon-l2.c +1 -1
@@ -16,7 +16,7 @@#include <linux/highmem.h> #include <asm/cacheflush.h> #include <asm/cp15.h> -#include <plat/cache-feroceon-l2.h> +#include <asm/hardware/cache-feroceon-l2.h> /* * Low-level cache maintenance operations.
arch/arm/plat-orion/include/plat/cache-feroceon-l2.h deleted +0 -11
@@ -1,11 +0,0 @@ -/* -* arch/arm/plat-orion/include/plat/cache-feroceon-l2.h -* -* Copyright (C) 2008 Marvell Semiconductor -* -* This file is licensed under the terms of the GNU General Public -* License version 2. This program is licensed "as is" without any -* warranty of any kind, whether express or implied. -*/ - -extern void __init feroceon_l2_init (int l2_wt_override);
Signature · 1 line
1.8.5.3
Andrew Lunn
maintainerPATCH v4 10/22 ARM: MM: Add DT binding for Feroceon L2 cache
In reply to Andrew LunnInstantiate the L2 cache from DT. Indicate in DT where the cache control register is so that it is possible to enable/disable write through on the CPU.
---
v2:
Change compatible strings to follow l2x0 convention Only expect register for kirkwood-cache.
Default to write through if no DT node.
Rename writethrough to wt-override to follow l2cc binding. Split kirkwood.dtsi change into a patch of its own. v3
Remove wt-override from the binding
Respect CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH
--- .../devicetree/bindings/arm/mrvl/feroceon.txt | 16 ++++++++ arch/arm/include/asm/hardware/cache-feroceon-l2.h | 2 + arch/arm/mach-kirkwood/board-dt.c | 18 ++------- arch/arm/mm/cache-feroceon-l2.c | 43 ++++++++++++++++++++++ 4 files changed, 64 insertions(+), 15 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/mrvl/feroceon.txt
Documentation/devicetree/bindings/arm/mrvl/feroceon.txt new file +16 -0
@@ -0,0 +1,16 @@ +* Marvell Feroceon Cache + +Required properties: +- compatible : Should be either "marvell,feroceon-cache" or + "marvell,kirkwood-cache". + +Optional properties: +- reg : Address of the L2 cache control register. Mandatory for + "marvell,kirkwood-cache", not used by "marvell,feroceon-cache" + + +Example: + l2: l2-cache at 20128 { + compatible = "marvell,kirkwood-cache"; + reg = <0x20128 0x4>; + };
arch/arm/include/asm/hardware/cache-feroceon-l2.h +2 -0
@@ -9,3 +9,5 @@*/ extern void __init feroceon_l2_init (int l2_wt_override); +extern int __init feroceon_of_init (void ); +
arch/arm/mach-kirkwood/board-dt.c +3 -15
@@ -42,19 +42,6 @@ static void __init kirkwood_map_io(void)iotable_init (kirkwood_io_desc,ARRAY_SIZE (kirkwood_io_desc)); } -static void __init kirkwood_l2_init (void ) -{ -#ifdef CONFIG_CACHE_FEROCEON_L2 -#ifdef CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH -writel (readl (L2_CONFIG_REG ) |L2_WRITETHROUGH ,L2_CONFIG_REG ); -feroceon_l2_init (1 ); -#else -writel (readl (L2_CONFIG_REG ) & ~L2_WRITETHROUGH ,L2_CONFIG_REG ); -feroceon_l2_init (0 ); -#endif -#endif -} -static struct resource kirkwood_cpufreq_resources[] = { [0 ] = { .start =CPU_CONTROL_PHYS ,
@@ -211,8 +198,9 @@ static void __init kirkwood_dt_init(void)BUG_ON (mvebu_mbus_dt_init ()); -kirkwood_l2_init (); - +#ifdef CONFIG_CACHE_FEROCEON_L2 +feroceon_of_init (); +#endif kirkwood_cpufreq_init ();kirkwood_cpuidle_init ();
arch/arm/mm/cache-feroceon-l2.c +43 -0
57 lines not on this page · raw message
Signature · 1 line
1.8.5.3
PATCH v4 10/22 ARM: MM: Add DT binding for Feroceon L2 cache
Russell,
Quoted 17 lines · Andrew Lunn
Instantiate the L2 cache from DT. Indicate in DT where the cache control register is so that it is possible to enable/disable write through on the CPU.
Signed-off-by Andrew Lunn <[email protected]>Tested-by Jason Gunthorpe <[email protected]>cc devicetree at vger.kernel.org---
v2:
Change compatible strings to follow l2x0 convention Only expect register for kirkwood-cache.
Default to write through if no DT node.
Rename writethrough to wt-override to follow l2cc binding. Splitkirkwood.dtsichange into a patch of its own. v3
Remove wt-override from the binding
RespectCONFIG_CACHE_FEROCEON_L2_WRITETHROUGH
Quoted 7 lines
--- .../devicetree/bindings/arm/mrvl/feroceon.txt | 16 ++++++++ arch/arm/include/asm/hardware/cache-feroceon-l2.h | 2 + arch/arm/mach-kirkwood/board-dt.c | 18 ++------- arch/arm/mm/cache-feroceon-l2.c | 43 ++++++++++++++++++++++ 4 files changed, 64 insertions(+), 15 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/mrvl/feroceon.txt
I've asked Andrew to place the other two patches into your patch tracker. The rest of the series depends on this one, though. Could you please Ack it so that we can keep it together through mvebu/arm-soc?
thx,
Jason.
Quoted 134 lines
Documentation/devicetree/bindings/arm/mrvl/feroceon.txt new file +16
-0@@ -0,0 +1,16 @@ +* Marvell Feroceon Cache + +Required properties: +- compatible : Should be either "marvell,feroceon-cache" or + "marvell,kirkwood-cache". + +Optional properties: +- reg : Address of the L2 cache control register. Mandatory for + "marvell,kirkwood-cache", not used by "marvell,feroceon-cache" + + +Example: + l2: l2-cache at 20128 { + compatible = "marvell,kirkwood-cache"; + reg = <0x20128 0x4>; + };arch/arm/include/asm/hardware/cache-feroceon-l2.h +2
-0@@ -9,3 +9,5 @@*/ extern void __init feroceon_l2_init (int l2_wt_override); +extern int __init feroceon_of_init (void ); +arch/arm/mach-kirkwood/board-dt.c +3
-15@@ -42,19 +42,6 @@ static void __init kirkwood_map_io(void)iotable_init (kirkwood_io_desc,ARRAY_SIZE (kirkwood_io_desc)); } -static void __init kirkwood_l2_init (void ) -{ -#ifdef CONFIG_CACHE_FEROCEON_L2 -#ifdef CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH -writel (readl (L2_CONFIG_REG ) |L2_WRITETHROUGH ,L2_CONFIG_REG ); -feroceon_l2_init (1 ); -#else -writel (readl (L2_CONFIG_REG ) & ~L2_WRITETHROUGH ,L2_CONFIG_REG ); -feroceon_l2_init (0 ); -#endif -#endif -} -static struct resource kirkwood_cpufreq_resources[] = { [0 ] = { .start =CPU_CONTROL_PHYS ,@@ -211,8 +198,9 @@ static void __init kirkwood_dt_init(void)BUG_ON (mvebu_mbus_dt_init ()); -kirkwood_l2_init (); - +#ifdef CONFIG_CACHE_FEROCEON_L2 +feroceon_of_init (); +#endif kirkwood_cpufreq_init ();kirkwood_cpuidle_init ();arch/arm/mm/cache-feroceon-l2.c +43
-0@@ -13,11 +13,16 @@*/ #include <linux/init.h> +#include <linux/of.h> +#include <linux/of_address.h> #include <linux/highmem.h> +#include <linux/io.h> #include <asm/cacheflush.h> #include <asm/cp15.h> #include <asm/hardware/cache-feroceon-l2.h> +#define L2_WRITETHROUGH_KIRKWOOD BIT(4) +/* * Low-level cache maintenance operations. * @@ -350,3 +355,41 @@ void __init feroceon_l2_init(int __l2_wt_override)printk (KERN_INFO "Feroceon L2: Cache support initialised%s.\n" , l2_wt_override ?", in WT override mode" :"" ); } +#ifdef CONFIG_OF +static const struct of_device_id feroceon_ids[]__initconst = { + { .compatible ="marvell,kirkwood-cache" }, + { .compatible ="marvell,feroceon-cache" }, + {} +}; + +int __init feroceon_of_init (void ) +{ +struct device_node *node; +void __iomem *base; +bool l2_wt_override = false; +struct resource res; + +#if defined(CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH ) + l2_wt_override = true; +#endif + + node =of_find_matching_node (NULL , feroceon_ids); +if (node &&of_device_is_compatible (node,"marvell,kirkwood-cache" )) { +if (of_address_to_resource (node,0 , &res)) +return -ENODEV ; + + base =ioremap (res.start,resource_size (&res)); +if (!base) +return -ENOMEM ; + +if (l2_wt_override) +writel (readl (base) |L2_WRITETHROUGH_KIRKWOOD , base); +else +writel (readl (base) & ~L2_WRITETHROUGH_KIRKWOOD , base); + } + +feroceon_l2_init (l2_wt_override); + +return 0 ; +} +#endif Signature · 1 line
1.8.5.3
Andrew Lunn
maintainerPATCH v4 11/22 ARM: Kirkwood: Instantiate L2 cache from DT.
In reply to Andrew LunnNow that the Ferocean L2 cache has a DT binding, make use of it.
--- arch/arm/boot/dts/kirkwood.dtsi | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm/boot/dts/kirkwood.dtsi +5 -0
@@ -161,6 +161,11 @@ #clock-cells = <1>; }; + l2: l2-cache at 20128 { + compatible = "marvell,kirkwood-cache"; + reg = <0x20128 0x4>; + }; + intc: main-interrupt-ctrl at 20200 { compatible = "marvell,orion-intc"; interrupt-controller;
Signature · 1 line
1.8.5.3
Andrew Lunn
maintainerPATCH v4 12/22 ARM: Fix default CPU selection for ARCH_MULTI_V5
In reply to Andrew LunnCPU_ARM926T should be selected if no other CPU is. Put the ! in the right place so this works.
--- arch/arm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/Kconfig +1 -1
@@ -898,7 +898,7 @@ config ARCH_MULTI_V5 bool "ARMv5 based platforms (ARM926T, XSCALE, PJ1, ...)" depends on !ARCH_MULTI_V6_V7 select ARCH_MULTI_V4_V5 - select CPU_ARM926T if (!CPU_ARM946E || CPU_ARM1020 || \ + select CPU_ARM926T if !(CPU_ARM946E || CPU_ARM1020 || \ CPU_ARM1020E || CPU_ARM1022 || CPU_ARM1026 || \ CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_FEROCEON)
Signature · 1 line
1.8.5.3
PATCH v4 12/22 ARM: Fix default CPU selection for ARCH_MULTI_V5
Andrew,
Quoted 9 lines · Andrew Lunn
CPU_ARM926Tshould be selected if no other CPU is. Put the ! in the right place so this works.Signed-off-by Andrew Lunn <[email protected]>Acked-by Arnd Bergmann <[email protected]>Tested-by Jason Gunthorpe <[email protected]>--- arch/arm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Please put this in rmk's patch tracker:
thx,
Jason.
Quoted 16 lines
arch/arm/Kconfig +1
-1@@ -898,7 +898,7 @@ config ARCH_MULTI_V5 bool "ARMv5 based platforms (ARM926T, XSCALE, PJ1, ...)" depends on !ARCH_MULTI_V6_V7 select ARCH_MULTI_V4_V5 - select CPU_ARM926T if (!CPU_ARM946E || CPU_ARM1020 || \ + select CPU_ARM926T if !(CPU_ARM946E || CPU_ARM1020 || \ CPU_ARM1020E || CPU_ARM1022 || CPU_ARM1026 || \ CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_FEROCEON)Signature · 1 line
1.8.5.3
Andrew Lunn
maintainerPATCH v4 13/22 ARM: Fix MULTI_TLB for feroceon
In reply to Andrew LunnFeroceon has the same flush operations as v4wbi, but has an additional flag, TLB_L2CLEAN_FR. When building with MULTI_TLB this flag is placed into cpu_tlb.tlb_flags, so there needs to be a cpu_tlb specifically for feroceon, rather than sharing the v4wbi.
--- arch/arm/mm/proc-feroceon.S | 2 +- arch/arm/mm/tlb-v4wbi.S | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)
arch/arm/mm/proc-feroceon.S +1 -1
@@ -607,7 +607,7 @@ __\name\()_proc_info: .long HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP .long \cpu_name .long feroceon_processor_functions - .long v4wbi_tlb_fns + .long fr_tlb_fns .long feroceon_user_fns .long \cache .size __\name\()_proc_info, . - __\name\()_proc_info
arch/arm/mm/tlb-v4wbi.S +3 -0
@@ -28,6 +28,7 @@ * - mm - mm_struct describing address space */ .align 5 +ENTRY(fr_flush_user_tlb_range) ENTRY(v4wbi_flush_user_tlb_range) vma_vm_mm ip, r2 act_mm r3 @ get current->active_mm
@@ -46,6 +47,7 @@ ENTRY(v4wbi_flush_user_tlb_range) blo 1b mov pc, lr +ENTRY(fr_flush_kern_tlb_range) ENTRY(v4wbi_flush_kern_tlb_range) mov r3, #0 mcr p15, 0, r3, c7, c10, 4 @ drain WB
@@ -62,3 +64,4 @@ ENTRY(v4wbi_flush_kern_tlb_range) /* define struct cpu_tlb_fns (see <asm/tlbflush.h> and proc-macros.S) */ define_tlb_functions v4wbi, v4wbi_tlb_flags + define_tlb_functions fr, fr_tlb_flags
Signature · 1 line
1.8.5.3
PATCH v4 13/22 ARM: Fix MULTI_TLB for feroceon
Quoted 5 lines · Andrew Lunn
Feroceon has the same flush operations as v4wbi, but has an additional flag,
TLB_L2CLEAN_FR. When building withMULTI_TLBthis flag is placed into cpu_tlb.tlb_flags, so there needs to be acpu_tlbspecifically for feroceon, rather than sharing the v4wbi.
Quoted 8 lines
Signed-off-by Andrew Lunn <[email protected]>Acked-by Arnd Bergmann <[email protected]>Tested-by Jason Gunthorpe <[email protected]>Cc Russell King <[email protected]>--- arch/arm/mm/proc-feroceon.S | 2 +- arch/arm/mm/tlb-v4wbi.S | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)
This is a bit beyond me, so I'll just ask. Does the rest of this series have a build dependency on this patch? If not, please put it in rmk's patch tracker.
thx,
Jason.
Quoted 41 lines
arch/arm/mm/proc-feroceon.S +1
-1@@ -607,7 +607,7 @@ __\name\()_proc_info: .long HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP .long \cpu_name .long feroceon_processor_functions - .long v4wbi_tlb_fns + .long fr_tlb_fns .long feroceon_user_fns .long \cache .size __\name\()_proc_info, . - __\name\()_proc_infoarch/arm/mm/tlb-v4wbi.S +3
-0@@ -28,6 +28,7 @@ * - mm - mm_struct describing address space */ .align 5 +ENTRY(fr_flush_user_tlb_range) ENTRY(v4wbi_flush_user_tlb_range) vma_vm_mm ip, r2 act_mm r3 @ get current->active_mm@@ -46,6 +47,7 @@ ENTRY(v4wbi_flush_user_tlb_range) blo 1b mov pc, lr +ENTRY(fr_flush_kern_tlb_range) ENTRY(v4wbi_flush_kern_tlb_range) mov r3, #0 mcr p15, 0, r3, c7, c10, 4 @ drain WB@@ -62,3 +64,4 @@ ENTRY(v4wbi_flush_kern_tlb_range) /* define struct cpu_tlb_fns (see <asm/tlbflush.h> and proc-macros.S) */ define_tlb_functions v4wbi, v4wbi_tlb_flags + define_tlb_functions fr, fr_tlb_flagsSignature · 1 line
1.8.5.3
Andrew Lunn
maintainerPATCH v4 14/22 ARM: MM Enable building Feroceon L2 cache controller with ARCH_MVEBU
In reply to Andrew LunnKirkwood, which uses the Feroceon L2 cache controller will soon be moving into mach-mvebu. Allow the cache controller to be built in this situation.
--- arch/arm/mm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mm/Kconfig +1 -1
@@ -855,7 +855,7 @@ config OUTER_CACHE_SYNC config CACHE_FEROCEON_L2 bool "Enable the Feroceon L2 cache controller" - depends on ARCH_KIRKWOOD || ARCH_MV78XX0 + depends on ARCH_KIRKWOOD || ARCH_MV78XX0 || ARCH_MVEBU default y select OUTER_CACHE help
Signature · 1 line
1.8.5.3
Andrew Lunn
maintainerPATCH v4 15/22 ARM: Move kirkwood DT boards into mach-mvebu
In reply to Andrew LunnMove the kirkwood DT support into mach-mvebu, and make them part of ARCH_MULTI_V5. Minimal changes have been made in order to make it boot. Cleanup of the header files and integration with mvebu will take place in following patches.
In order to help Debian transition between mach-kirkwood and mach-mvebu, the DTS files are compiled for both, allowing Debian to continue using mach-kirkwood until all remaining boards are supported by mach-mvebu. Debian is then expected to simply swap from mach-kirkwood to mach-mvebu and mach-kirkwood will be removed.
---
v4
Remove from Kconfig:
select POWER_SUPPLY
select POWER_RESET
select POWER_RESET_GPIO
select REGULATOR
select REGULATOR_FIXED_VOLTAGE
All DTB to build for both mach-kirkwood and mach-mvebu
--- arch/arm/boot/dts/Makefile | 9 +- arch/arm/mach-mvebu/Kconfig | 19 ++- arch/arm/mach-mvebu/Makefile | 1 + arch/arm/mach-mvebu/include/mach/bridge-regs.h | 85 ++++++++++ arch/arm/mach-mvebu/include/mach/kirkwood.h | 142 +++++++++++++++++ arch/arm/mach-mvebu/kirkwood-pm.c | 76 +++++++++ arch/arm/mach-mvebu/kirkwood-pm.h | 26 +++ arch/arm/mach-mvebu/kirkwood.c | 209 +++++++++++++++++++++++++ 8 files changed, 563 insertions(+), 4 deletions(-) create mode 100644 arch/arm/mach-mvebu/include/mach/bridge-regs.h create mode 100644 arch/arm/mach-mvebu/include/mach/kirkwood.h create mode 100644 arch/arm/mach-mvebu/kirkwood-pm.c create mode 100644 arch/arm/mach-mvebu/kirkwood-pm.h create mode 100644 arch/arm/mach-mvebu/kirkwood.c
arch/arm/boot/dts/Makefile +6 -3
@@ -81,8 +81,8 @@ dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb \ ecx-2000.dtb dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \ integratorcp.dtb -dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb -dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \ +kirkwood := \ + kirkwood-cloudbox.dtb \ kirkwood-db-88f6281.dtb \ kirkwood-db-88f6282.dtb \ kirkwood-dns320.dtb \
@@ -116,6 +116,8 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \ kirkwood-topkick.dtb \ kirkwood-ts219-6281.dtb \ kirkwood-ts219-6282.dtb +dtb-$(CONFIG_ARCH_KIRKWOOD) += $(kirkwood) +dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb dtb-$(CONFIG_ARCH_MSM) += qcom-msm8660-surf.dtb \
@@ -131,7 +133,8 @@ dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \ armada-xp-gp.dtb \ armada-xp-netgear-rn2120.dtb \ armada-xp-matrix.dtb \ - armada-xp-openblocks-ax3-4.dtb + armada-xp-openblocks-ax3-4.dtb \ + $(kirkwood) dtb-$(CONFIG_ARCH_MXC) += \ imx25-karo-tx25.dtb \ imx25-pdk.dtb \
arch/arm/mach-mvebu/Kconfig +18 -1
@@ -1,5 +1,5 @@ config ARCH_MVEBU - bool "Marvell SOCs with Device Tree support" if ARCH_MULTI_V7 + bool "Marvell SOCs with Device Tree support" if (ARCH_MULTI_V7 || ARCH_MULTI_V5) select ARCH_SUPPORTS_BIG_ENDIAN select CLKSRC_MMIO select COMMON_CLK
@@ -46,6 +46,23 @@ config MACH_ARMADA_XP Say 'Y' here if you want your kernel to support boards based on the Marvell Armada XP SoC with device tree. +config MACH_KIRKWOOD + bool "Marvell Kirkwood boards" if ARCH_MULTI_V5 + select ARCH_HAS_CPUFREQ + select ARCH_REQUIRE_GPIOLIB + select CPU_FEROCEON + select KIRKWOOD_CLK + select OF_IRQ + select ORION_IRQCHIP + select ORION_TIMER + select PCI + select PCI_QUIRKS + select PINCTRL_KIRKWOOD + select USE_OF + help + Say 'Y' here if you want your kernel to support boards based + on the Marvell Kirkwood device tree. + endmenu endif
arch/arm/mach-mvebu/Makefile +1 -0
@@ -8,3 +8,4 @@ obj-$(CONFIG_MACH_ARMADA_370_XP) += armada-370-xp.o obj-$(CONFIG_ARCH_MVEBU) += coherency.o coherency_ll.o pmsu.o obj-$(CONFIG_SMP) += platsmp.o headsmp.o obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o +obj-$(CONFIG_MACH_KIRKWOOD) += kirkwood.o kirkwood-pm.o
arch/arm/mach-mvebu/include/mach/bridge-regs.h new file +85 -0
85 lines not on this page · raw message
arch/arm/mach-mvebu/include/mach/kirkwood.h new file +142 -0
142 lines not on this page · raw message
arch/arm/mach-mvebu/kirkwood-pm.c new file +76 -0
76 lines not on this page · raw message
arch/arm/mach-mvebu/kirkwood-pm.h new file +26 -0
@@ -0,0 +1,26 @@ +/* +* Power Management driver for Marvell Kirkwood SoCs +* +* Copyright (C) 2013 Ezequiel Garcia <[email protected]> +* Copyright (C) 2010 Simon Guinot <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License, +* version 2 of the License. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ + +#ifndef __ARCH_KIRKWOOD_PM_H +#define __ARCH_KIRKWOOD_PM_H + +#ifdef CONFIG_PM +void kirkwood_pm_init (void ); +#else +static inline void kirkwood_pm_init (void ) {}; +#endif + +#endif
arch/arm/mach-mvebu/kirkwood.c new file +209 -0
209 lines not on this page · raw message
Signature · 1 line
1.8.5.3
Andrew Lunn
maintainerPATCH v4 16/22 ARM: MVEBU: Let kirkwood use the system controller for restart
In reply to Andrew LunnThe mvebu system controller already supports restarting orion systems. Remove all the C code which will be replaced by the system controller.
---
v2
Split the patch into two, DT goes into a new patch
--- arch/arm/mach-mvebu/kirkwood.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-)
arch/arm/mach-mvebu/kirkwood.c +2 -18
@@ -27,6 +27,7 @@#include <plat/common.h> #include <plat/pcie.h> #include "kirkwood-pm.h" +#include "common.h" static struct resource kirkwood_cpufreq_resources[] = { [0 ] = {
@@ -68,23 +69,6 @@ static void __init kirkwood_cpuidle_init(void)platform_device_register (&kirkwood_cpuidle); } -/* Temporary here since mach-mvebu has a function we can use */ -static void kirkwood_restart (enum reboot_mode mode,const char *cmd) -{ -/* -* Enable soft reset to assert RSTOUTn. -*/ -writel (SOFT_RESET_OUT_EN , RSTOUTn_MASK); - -/* -* Assert soft reset. -*/ -writel (SOFT_RESET ,SYSTEM_SOFT_RESET ); - -while (1 ) - ; -} -#define MV643XX_ETH_MAC_ADDR_LOW 0x0414#define MV643XX_ETH_MAC_ADDR_HIGH 0x0418
@@ -204,6 +188,6 @@ static const char * const kirkwood_dt_board_compat[] = {DT_MACHINE_START (KIRKWOOD_DT ,"Marvell Kirkwood (Flattened Device Tree)" )/* Maintainer: Jason Cooper <[email protected]> */ .init_machine = kirkwood_dt_init, - .restart = kirkwood_restart, + .restart = mvebu_restart, .dt_compat = kirkwood_dt_board_compat,MACHINE_END
Signature · 1 line
1.8.5.3
Andrew Lunn
maintainerPATCH v4 17/22 ARM: MVEBU: Instantiate system controller in kirkwood.dtsi
In reply to Andrew LunnMake use of the mvebu system controller, by placing a node into the dtsi file.
--- arch/arm/boot/dts/kirkwood.dtsi | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm/boot/dts/kirkwood.dtsi +5 -0
@@ -145,6 +145,11 @@ reg = <0x20000 0x80>, <0x1500 0x20>; }; + system-controller at 20000 { + compatible = "marvell,orion-system-controller"; + reg = <0x20000 0x120>; + }; + bridge_intc: bridge-interrupt-ctrl at 20110 { compatible = "marvell,orion-bridge-intc"; interrupt-controller;
Signature · 1 line
1.8.5.3
Andrew Lunn
maintainerPATCH v4 18/22 drivers: Enable building of Kirkwood drivers for mach-mvebu
In reply to Andrew LunnWith the move of kirkwood into mach-mvebu, drivers Kconfig need tweeking to allow the kirkwood specific drivers to be built.
---
v2
Simplify cpufreq/Kconfig.arm
Still needs ACKs from cpufreq, led and thermal maintainers.
--- drivers/cpufreq/Kconfig.arm | 2 +- drivers/cpuidle/Kconfig.arm | 2 +- drivers/leds/Kconfig | 4 ++-- drivers/phy/Kconfig | 2 +- drivers/thermal/Kconfig | 2 +- sound/soc/kirkwood/Kconfig | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-)
drivers/cpufreq/Kconfig.arm +1 -1
@@ -113,7 +113,7 @@ config ARM_INTEGRATOR If in doubt, say Y. config ARM_KIRKWOOD_CPUFREQ - def_bool ARCH_KIRKWOOD && OF + def_bool MACH_KIRKWOOD help This adds the CPUFreq driver for Marvell Kirkwood SoCs.
drivers/cpuidle/Kconfig.arm +1 -1
@@ -22,7 +22,7 @@ config ARM_HIGHBANK_CPUIDLE config ARM_KIRKWOOD_CPUIDLE bool "CPU Idle Driver for Marvell Kirkwood SoCs" - depends on ARCH_KIRKWOOD + depends on ARCH_KIRKWOOD || MACH_KIRKWOOD help This adds the CPU Idle driver for Marvell Kirkwood SoCs.
drivers/leds/Kconfig +2 -2
@@ -421,7 +421,7 @@ config LEDS_MC13783 config LEDS_NS2 tristate "LED support for Network Space v2 GPIO LEDs" depends on LEDS_CLASS - depends on ARCH_KIRKWOOD + depends on ARCH_KIRKWOOD || MACH_KIRKWOOD default y help This option enable support for the dual-GPIO LED found on the
@@ -431,7 +431,7 @@ config LEDS_NS2 config LEDS_NETXBIG tristate "LED support for Big Network series LEDs" depends on LEDS_CLASS - depends on ARCH_KIRKWOOD + depends on ARCH_KIRKWOOD || MACH_KIRKWOOD default y help This option enable support for LEDs found on the LaCie 2Big
drivers/phy/Kconfig +1 -1
@@ -24,7 +24,7 @@ config PHY_EXYNOS_MIPI_VIDEO config PHY_MVEBU_SATA def_bool y - depends on ARCH_KIRKWOOD || ARCH_DOVE + depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_KIRKWOOD depends on OF select GENERIC_PHY
drivers/thermal/Kconfig +1 -1
@@ -142,7 +142,7 @@ config RCAR_THERMAL config KIRKWOOD_THERMAL tristate "Temperature sensor on Marvell Kirkwood SoCs" - depends on ARCH_KIRKWOOD + depends on ARCH_KIRKWOOD || MACH_KIRKWOOD depends on OF help Support for the Kirkwood thermal sensor driver into the Linux thermal
sound/soc/kirkwood/Kconfig +1 -1
@@ -1,6 +1,6 @@ config SND_KIRKWOOD_SOC tristate "SoC Audio for the Marvell Kirkwood and Dove chips" - depends on ARCH_KIRKWOOD || ARCH_DOVE || COMPILE_TEST + depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_KIRKWOOD || COMPILE_TEST help Say Y or M if you want to add support for codecs attached to the Kirkwood I2S interface. You will also need to select the
Signature · 1 line
1.8.5.3
Viresh Kumar
maintainerPATCH v4 18/22 drivers: Enable building of Kirkwood drivers for mach-mvebu
Quoted 15 lines · Andrew Lunn
With the move of kirkwood into mach-mvebu, drivers
Kconfigneed tweeking to allow the kirkwood specific drivers to be built.Signed-off-by Andrew Lunn <[email protected]>Acked-by Arnd Bergmann <[email protected]>Acked-by Mark Brown <[email protected]>Acked-by Daniel Lezcano <[email protected]>Tested-by Jason Gunthorpe <[email protected]>Cc Viresh Kumar <[email protected]>Cc Rafael J. Wysocki <[email protected]>Cc Richard Purdie <[email protected]>Cc Bryan Wu <[email protected]>Cc Zhang Rui <[email protected]>Cc Eduardo Valentin <[email protected]>
Quoted 7 lines
---
v2
Simplify cpufreq/Kconfig.armStill needs ACKs from cpufreq, led and thermal maintainers.
--- drivers/cpufreq/Kconfig.arm | 2 +-
PATCH v4 18/22 drivers: Enable building of Kirkwood drivers for mach-mvebu
Quoted 20 lines · Viresh Kumar
Quoted 19 lines · Andrew Lunn
With the move of kirkwood into mach-mvebu, drivers
Kconfigneed tweeking to allow the kirkwood specific drivers to be built.Signed-off-by Andrew Lunn <[email protected]>Acked-by Arnd Bergmann <[email protected]>Acked-by Mark Brown <[email protected]>Acked-by Daniel Lezcano <[email protected]>Tested-by Jason Gunthorpe <[email protected]>Cc Viresh Kumar <[email protected]>Cc Rafael J. Wysocki <[email protected]>Cc Richard Purdie <[email protected]>Cc Bryan Wu <[email protected]>Cc Zhang Rui <[email protected]>Cc Eduardo Valentin <[email protected]>---
v2
Simplify cpufreq/Kconfig.arm
Quoted 5 lines
Quoted 3 lines
Still needs ACKs from cpufreq, led and thermal maintainers.
--- drivers/cpufreq/Kconfig.arm | 2 +-Acked-by Viresh Kumar <[email protected]>
Added and pushed, thanks Viresh.
thx,
Jason.
PATCH v4 18/22 drivers: Enable building of Kirkwood drivers for mach-mvebu
In reply to Andrew LunnQuoted 69 lines · Andrew Lunn
With the move of kirkwood into mach-mvebu, drivers
Kconfigneed tweeking to allow the kirkwood specific drivers to be built.Signed-off-by Andrew Lunn <[email protected]>Acked-by Arnd Bergmann <[email protected]>Acked-by Mark Brown <[email protected]>Acked-by Daniel Lezcano <[email protected]>Tested-by Jason Gunthorpe <[email protected]>Cc Viresh Kumar <[email protected]>Cc Rafael J. Wysocki <[email protected]>Cc Richard Purdie <[email protected]>Cc Bryan Wu <[email protected]>Cc Zhang Rui <[email protected]>Cc Eduardo Valentin <[email protected]>---
v2
Simplify cpufreq/Kconfig.armStill needs ACKs from cpufreq, led and thermal maintainers.
--- drivers/cpufreq/Kconfig.arm | 2 +- drivers/cpuidle/Kconfig.arm | 2 +- drivers/leds/Kconfig | 4 ++-- drivers/phy/Kconfig | 2 +- drivers/thermal/Kconfig | 2 +- sound/soc/kirkwood/Kconfig | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-)drivers/cpufreq/Kconfig.arm +1
-1@@ -113,7 +113,7 @@ config ARM_INTEGRATOR If in doubt, say Y. config ARM_KIRKWOOD_CPUFREQ - def_bool ARCH_KIRKWOOD && OF + def_bool MACH_KIRKWOOD help This adds the CPUFreq driver for Marvell Kirkwood SoCs.drivers/cpuidle/Kconfig.arm +1
-1@@ -22,7 +22,7 @@ config ARM_HIGHBANK_CPUIDLE config ARM_KIRKWOOD_CPUIDLE bool "CPU Idle Driver for Marvell Kirkwood SoCs" - depends on ARCH_KIRKWOOD + depends on ARCH_KIRKWOOD || MACH_KIRKWOOD help This adds the CPU Idle driver for Marvell Kirkwood SoCs.drivers/leds/Kconfig +1
-1@@ -421,7 +421,7 @@ config LEDS_MC13783 config LEDS_NS2 tristate "LED support for Network Space v2 GPIO LEDs" depends on LEDS_CLASS - depends on ARCH_KIRKWOOD + depends on ARCH_KIRKWOOD || MACH_KIRKWOOD default y help This option enable support for the dual-GPIO LED found on the
drivers/leds/Kconfig config LEDS_NS2 · line 437
Quoted 8 lines
drivers/leds/Kconfig +1
-1@@ -431,7 +431,7 @@ config LEDS_NS2 config LEDS_NETXBIG tristate "LED support for Big Network series LEDs" depends on LEDS_CLASS - depends on ARCH_KIRKWOOD + depends on ARCH_KIRKWOOD || MACH_KIRKWOOD default y help This option enable support for LEDs found on the LaCie 2Big
Thanks,
-Bryan
Quoted 41 lines
drivers/phy/Kconfig +1
-1@@ -24,7 +24,7 @@ config PHY_EXYNOS_MIPI_VIDEO config PHY_MVEBU_SATA def_bool y - depends on ARCH_KIRKWOOD || ARCH_DOVE + depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_KIRKWOOD depends on OF select GENERIC_PHYdrivers/thermal/Kconfig +1
-1@@ -142,7 +142,7 @@ config RCAR_THERMAL config KIRKWOOD_THERMAL tristate "Temperature sensor on Marvell Kirkwood SoCs" - depends on ARCH_KIRKWOOD + depends on ARCH_KIRKWOOD || MACH_KIRKWOOD depends on OF help Support for the Kirkwood thermal sensor driver into the Linux thermalsound/soc/kirkwood/Kconfig +1
-2@@ -1,6 +1,6 @@ config SND_KIRKWOOD_SOC tristate "SoC Audio for the Marvell Kirkwood and Dove chips" - depends on ARCH_KIRKWOOD || ARCH_DOVE || COMPILE_TEST + depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_KIRKWOOD || COMPILE_TEST help Say Y or M if you want to add support for codecs attached to the Kirkwood I2S interface. You will also need to select the --1.8.5.3
Andrew Lunn
maintainerPATCH v4 19/22 ARM: MVEBU: Enable mvebu-soc-id on Kirkwood
In reply to Andrew LunnAdd the Kirkwood PCIe compatibility string to mvebu-soc-id, so that it can get the SoC ID and revision from the PCIe endpoints.
--- arch/arm/mach-mvebu/mvebu-soc-id.c | 1 + 1 file changed, 1 insertion(+)
arch/arm/mach-mvebu/mvebu-soc-id.c +1 -0
@@ -38,6 +38,7 @@ static bool is_id_valid;static const struct of_device_id mvebu_pcie_of_match_table[] = { { .compatible ="marvell,armada-xp-pcie" , }, { .compatible ="marvell,armada-370-pcie" , }, + { .compatible ="marvell,kirkwood-pcie" }, {}, };
Signature · 1 line
1.8.5.3
Andrew Lunn
maintainerPATCH v4 20/22 ARM: config: Add a multi_v5_defconfig
In reply to Andrew LunnTo allow regression build testing of multi v5 systems, add a multi_v5_defconfig, similar to the multi_v7_defconfig. This is based on kirkwood_defconfig, but with a few other boards added which claim to be MULTI_v5.
---
v4
Disable low level debug
Enable more drivers needed by Kirkwood devices.
Ensure ORION_WATCHDOG is enabled.
--- arch/arm/configs/multi_v5_defconfig | 185 ++++++++++++++++++++++++++++++++++++ 1 file changed, 185 insertions(+) create mode 100644 arch/arm/configs/multi_v5_defconfig
arch/arm/configs/multi_v5_defconfig new file +185 -0
@@ -0,0 +1,185 @@ +CONFIG_SYSVIPC=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_LOG_BUF_SHIFT=19 +CONFIG_PROFILING=y +CONFIG_OPROFILE=y +CONFIG_KPROBES=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_BLK_DEV_BSG is not set +# CONFIG_ARCH_MULTI_V7 is not set +CONFIG_ARCH_MVEBU=y +CONFIG_MACH_KIRKWOOD=y +CONFIG_ARCH_MXC=y +CONFIG_MACH_IMX25_DT=y +CONFIG_MACH_IMX27_DT=y +CONFIG_ARCH_U300=y +CONFIG_PCI_MVEBU=y +CONFIG_PREEMPT=y +CONFIG_AEABI=y +CONFIG_HIGHMEM=y +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_ARM_APPENDED_DTB=y +CONFIG_ARM_ATAG_DTB_COMPAT=y +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_STAT_DETAILS=y +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +CONFIG_CPU_IDLE=y +CONFIG_ARM_KIRKWOOD_CPUIDLE=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +# CONFIG_IPV6 is not set +CONFIG_NET_PKTGEN=m +CONFIG_CFG80211=y +CONFIG_MAC80211=y +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_MTD=y +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_CFI=y +CONFIG_MTD_JEDECPROBE=y +CONFIG_MTD_CFI_ADV_OPTIONS=y +CONFIG_MTD_CFI_GEOMETRY=y +# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set +CONFIG_MTD_CFI_INTELEXT=y +CONFIG_MTD_CFI_STAA=y +CONFIG_MTD_PHYSMAP=y +CONFIG_MTD_M25P80=y +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_ORION=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_EEPROM_AT24=y +# CONFIG_SCSI_PROC_FS is not set +CONFIG_BLK_DEV_SD=y +CONFIG_BLK_DEV_SR=m +CONFIG_CHR_DEV_SG=m +CONFIG_ATA=y +CONFIG_SATA_AHCI=y +CONFIG_SATA_MV=y +CONFIG_NETDEVICES=y +CONFIG_NET_DSA_MV88E6123_61_65=y +CONFIG_MV643XX_ETH=y +CONFIG_R8169=y +CONFIG_MARVELL_PHY=y +CONFIG_LIBERTAS=y +CONFIG_LIBERTAS_SDIO=y +CONFIG_INPUT_EVDEV=y +CONFIG_KEYBOARD_GPIO=y +# CONFIG_INPUT_MOUSE is not set +CONFIG_LEGACY_PTY_COUNT=16 +# CONFIG_DEVKMEM is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_RUNTIME_UARTS=2 +CONFIG_SERIAL_OF_PLATFORM=y +# CONFIG_HW_RANDOM is not set +CONFIG_I2C=y +# CONFIG_I2C_COMPAT is not set +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_MV64XXX=y +CONFIG_I2C_NOMADIK=y +CONFIG_SPI=y +CONFIG_SPI_ORION=y +CONFIG_GPIO_SYSFS=y +CONFIG_POWER_SUPPLY=y +CONFIG_POWER_RESET=y +CONFIG_POWER_RESET_GPIO=y +CONFIG_POWER_RESET_QNAP=y +CONFIG_SENSORS_ADT7475=y +CONFIG_SENSORS_LM63=y +CONFIG_SENSORS_LM75=y +CONFIG_SENSORS_LM85=y +CONFIG_THERMAL=y +CONFIG_KIRKWOOD_THERMAL=y +CONFIG_WATCHDOG=y +CONFIG_ORION_WATCHDOG=y +# CONFIG_ABX500_CORE is not set +CONFIG_REGULATOR=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_SOC=y +CONFIG_SND_KIRKWOOD_SOC=y +CONFIG_HID_DRAGONRISE=y +CONFIG_HID_GYRATION=y +CONFIG_HID_TWINHAN=y +CONFIG_HID_NTRIG=y +CONFIG_HID_PANTHERLORD=y +CONFIG_HID_PETALYNX=y +CONFIG_HID_SAMSUNG=y +CONFIG_HID_SONY=y +CONFIG_HID_SUNPLUS=y +CONFIG_HID_GREENASIA=y +CONFIG_HID_SMARTJOYPLUS=y +CONFIG_HID_TOPSEED=y +CONFIG_HID_THRUSTMASTER=y +CONFIG_HID_ZEROPLUS=y +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_ROOT_HUB_TT=y +CONFIG_USB_PRINTER=m +CONFIG_USB_STORAGE=y +CONFIG_USB_STORAGE_DATAFAB=y +CONFIG_USB_STORAGE_FREECOM=y +CONFIG_USB_STORAGE_SDDR09=y +CONFIG_USB_STORAGE_SDDR55=y +CONFIG_USB_STORAGE_JUMPSHOT=y +CONFIG_MMC=y +CONFIG_SDIO_UART=y +CONFIG_MMC_MVSDIO=y +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +CONFIG_LEDS_TRIGGER_DEFAULT_ON=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_RS5C372=y +CONFIG_RTC_DRV_PCF8563=y +CONFIG_RTC_DRV_S35390A=y +CONFIG_RTC_DRV_MV=y +CONFIG_DMADEVICES=y +CONFIG_MV_XOR=y +CONFIG_EXT2_FS=y +CONFIG_EXT3_FS=y +# CONFIG_EXT3_FS_XATTR is not set +CONFIG_EXT4_FS=y +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_UDF_FS=m +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_TMPFS=y +CONFIG_JFFS2_FS=y +CONFIG_CRAMFS=y +CONFIG_NFS_FS=y +CONFIG_ROOT_NFS=y +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_850=y +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_2=y +CONFIG_NLS_UTF8=y +CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_FS=y +CONFIG_MAGIC_SYSRQ=y +CONFIG_DEBUG_KERNEL=y +# CONFIG_SCHED_DEBUG is not set +# CONFIG_DEBUG_PREEMPT is not set +# CONFIG_FTRACE is not set +CONFIG_DEBUG_USER=y +CONFIG_CRYPTO_CBC=m +CONFIG_CRYPTO_PCBC=m +# CONFIG_CRYPTO_ANSI_CPRNG is not set +CONFIG_CRYPTO_DEV_MV_CESA=y +CONFIG_CRC_CCITT=y +CONFIG_LIBCRC32C=y
Signature · 1 line
1.8.5.3
Andrew Lunn
maintainerPATCH v4 21/22 ARM: MVEBU: Simplifiy headers and make local
In reply to Andrew Lunnkirkwood is very nearly fully DT. Remove most of the address definitions from the header files and make it a local header file.
---
v2
Squash in the patch which removed unneeded includes.
--- arch/arm/mach-mvebu/include/mach/bridge-regs.h | 85 --------------- arch/arm/mach-mvebu/include/mach/kirkwood.h | 142 ------------------------- arch/arm/mach-mvebu/kirkwood-pm.c | 2 +- arch/arm/mach-mvebu/kirkwood.c | 9 +- arch/arm/mach-mvebu/kirkwood.h | 22 ++++ 5 files changed, 26 insertions(+), 234 deletions(-) delete mode 100644 arch/arm/mach-mvebu/include/mach/bridge-regs.h delete mode 100644 arch/arm/mach-mvebu/include/mach/kirkwood.h create mode 100644 arch/arm/mach-mvebu/kirkwood.h
arch/arm/mach-mvebu/include/mach/bridge-regs.h deleted +0 -85
@@ -1,85 +0,0 @@ -/* -* arch/arm/mach-mvebu/include/mach/bridge-regs.h -* -* Mbus-L to Mbus Bridge Registers -* -* This file is licensed under the terms of the GNU General Public -* License version 2. This program is licensed "as is" without any -* warranty of any kind, whether express or implied. -*/ - -#ifndef __ASM_ARCH_BRIDGE_REGS_H -#define __ASM_ARCH_BRIDGE_REGS_H - -#include <mach/kirkwood.h> - -#define CPU_CONFIG (BRIDGE_VIRT_BASE + 0x0100) -#define CPU_CONFIG_PHYS (BRIDGE_PHYS_BASE + 0x0100) -#define CPU_CONFIG_ERROR_PROP 0x00000004 - -#define CPU_CONTROL (BRIDGE_VIRT_BASE + 0x0104) -#define CPU_CONTROL_PHYS (BRIDGE_PHYS_BASE + 0x0104) -#define CPU_RESET 0x00000002 - -#define RSTOUTn_MASK (BRIDGE_VIRT_BASE + 0x0108) -#define SOFT_RESET_OUT_EN 0x00000004 - -#define SYSTEM_SOFT_RESET (BRIDGE_VIRT_BASE + 0x010c) -#define SOFT_RESET 0x00000001 - -#define BRIDGE_CAUSE (BRIDGE_VIRT_BASE + 0x0110) - -#define BRIDGE_INT_TIMER1_CLR (~0x0004) - -#define IRQ_VIRT_BASE (BRIDGE_VIRT_BASE + 0x0200) -#define IRQ_CAUSE_LOW_OFF 0x0000 -#define IRQ_MASK_LOW_OFF 0x0004 -#define IRQ_CAUSE_HIGH_OFF 0x0010 -#define IRQ_MASK_HIGH_OFF 0x0014 - -#define TIMER_VIRT_BASE (BRIDGE_VIRT_BASE + 0x0300) -#define TIMER_PHYS_BASE (BRIDGE_PHYS_BASE + 0x0300) - -#define L2_CONFIG_REG (BRIDGE_VIRT_BASE + 0x0128) -#define L2_WRITETHROUGH 0x00000010 - -#define CLOCK_GATING_CTRL (BRIDGE_VIRT_BASE + 0x11c) -#define CGC_BIT_GE0 (0) -#define CGC_BIT_PEX0 (2) -#define CGC_BIT_USB0 (3) -#define CGC_BIT_SDIO (4) -#define CGC_BIT_TSU (5) -#define CGC_BIT_DUNIT (6) -#define CGC_BIT_RUNIT (7) -#define CGC_BIT_XOR0 (8) -#define CGC_BIT_AUDIO (9) -#define CGC_BIT_SATA0 (14) -#define CGC_BIT_SATA1 (15) -#define CGC_BIT_XOR1 (16) -#define CGC_BIT_CRYPTO (17) -#define CGC_BIT_PEX1 (18) -#define CGC_BIT_GE1 (19) -#define CGC_BIT_TDM (20) -#define CGC_GE0 (1 << 0) -#define CGC_PEX0 (1 << 2) -#define CGC_USB0 (1 << 3) -#define CGC_SDIO (1 << 4) -#define CGC_TSU (1 << 5) -#define CGC_DUNIT (1 << 6) -#define CGC_RUNIT (1 << 7) -#define CGC_XOR0 (1 << 8) -#define CGC_AUDIO (1 << 9) -#define CGC_POWERSAVE (1 << 11) -#define CGC_SATA0 (1 << 14) -#define CGC_SATA1 (1 << 15) -#define CGC_XOR1 (1 << 16) -#define CGC_CRYPTO (1 << 17) -#define CGC_PEX1 (1 << 18) -#define CGC_GE1 (1 << 19) -#define CGC_TDM (1 << 20) -#define CGC_RESERVED (0x6 << 21) - -#define MEMORY_PM_CTRL (BRIDGE_VIRT_BASE + 0x118) -#define MEMORY_PM_CTRL_PHYS (BRIDGE_PHYS_BASE + 0x118) - -#endif
arch/arm/mach-mvebu/include/mach/kirkwood.h deleted +0 -142
142 lines not on this page · raw message
arch/arm/mach-mvebu/kirkwood-pm.c +1 -1
@@ -17,7 +17,7 @@#include <linux/kernel.h> #include <linux/suspend.h> #include <linux/io.h> -#include <mach/bridge-regs.h> +#include "kirkwood.h" static void __iomem *ddr_operation_base;static void __iomem *memory_pm_ctrl;
arch/arm/mach-mvebu/kirkwood.c +3 -6
@@ -13,19 +13,16 @@#include <linux/clk.h> #include <linux/kernel.h> #include <linux/init.h> +#include <linux/mbus.h> #include <linux/of.h> #include <linux/of_address.h> #include <linux/of_net.h> #include <linux/of_platform.h> -#include <linux/dma-mapping.h> -#include <linux/irqchip.h> -#include <linux/kexec.h> +#include <linux/slab.h> #include <asm/hardware/cache-feroceon-l2.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/bridge-regs.h> -#include <plat/common.h> -#include <plat/pcie.h> +#include "kirkwood.h" #include "kirkwood-pm.h" #include "common.h"
arch/arm/mach-mvebu/kirkwood.h new file +22 -0
@@ -0,0 +1,22 @@ +/* +* arch/arm/mach-mvebu/kirkwood.h +* +* Generic definitions for Marvell Kirkwood SoC flavors: +* 88F6180, 88F6192 and 88F6281. +* +* This file is licensed under the terms of the GNU General Public +* License version 2. This program is licensed "as is" without any +* warranty of any kind, whether express or implied. +*/ + +#define KIRKWOOD_REGS_PHYS_BASE 0xf1000000 +#define DDR_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE + 0x00000) +#define BRIDGE_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE + 0x20000) + +#define DDR_OPERATION_BASE (DDR_PHYS_BASE + 0x1418) + +#define CPU_CONFIG_PHYS (BRIDGE_PHYS_BASE + 0x0100) +#define CPU_CONFIG_ERROR_PROP 0x00000004 + +#define CPU_CONTROL_PHYS (BRIDGE_PHYS_BASE + 0x0104) +#define MEMORY_PM_CTRL_PHYS (BRIDGE_PHYS_BASE + 0x0118)
Signature · 1 line
1.8.5.3
Andrew Lunn
maintainerPATCH v4 22/22 ARM: config: Add mvebu_v5_defconfig
In reply to Andrew LunnNow that there is both v5 and v7 systems in mach-mvebu, the mvebu_defconfig is not sufficient, since these systems cannot be combined. Add a v5 defconfig which is based on kirkwood_defconfig, but purely DT.
---
v4
Disable low level debug
Enable drivers needed by boards
Ensure ORION_WATCHDOG is enabled
--- arch/arm/configs/mvebu_v5_defconfig | 172 ++++++++++++++++++++++++++++++++++++ 1 file changed, 172 insertions(+) create mode 100644 arch/arm/configs/mvebu_v5_defconfig
arch/arm/configs/mvebu_v5_defconfig new file +172 -0
@@ -0,0 +1,172 @@ +CONFIG_SYSVIPC=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_LOG_BUF_SHIFT=19 +CONFIG_PROFILING=y +CONFIG_OPROFILE=y +CONFIG_KPROBES=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_BLK_DEV_BSG is not set +# CONFIG_ARCH_MULTI_V7 is not set +CONFIG_ARCH_MVEBU=y +CONFIG_MACH_KIRKWOOD=y +# CONFIG_CPU_FEROCEON_OLD_ID is not set +CONFIG_PCI_MVEBU=y +CONFIG_PREEMPT=y +CONFIG_AEABI=y +CONFIG_HIGHMEM=y +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_STAT_DETAILS=y +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +CONFIG_CPU_IDLE=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +# CONFIG_IPV6 is not set +CONFIG_NET_PKTGEN=m +CONFIG_CFG80211=y +CONFIG_MAC80211=y +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_MTD=y +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_CFI=y +CONFIG_MTD_JEDECPROBE=y +CONFIG_MTD_CFI_ADV_OPTIONS=y +CONFIG_MTD_CFI_GEOMETRY=y +# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set +CONFIG_MTD_CFI_INTELEXT=y +CONFIG_MTD_CFI_STAA=y +CONFIG_MTD_PHYSMAP=y +CONFIG_MTD_M25P80=y +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_ORION=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_EEPROM_AT24=y +# CONFIG_SCSI_PROC_FS is not set +CONFIG_BLK_DEV_SD=y +CONFIG_BLK_DEV_SR=m +CONFIG_CHR_DEV_SG=m +CONFIG_ATA=y +CONFIG_SATA_AHCI=y +CONFIG_SATA_MV=y +CONFIG_NETDEVICES=y +CONFIG_NET_DSA_MV88E6123_61_65=y +CONFIG_MV643XX_ETH=y +CONFIG_R8169=y +CONFIG_MARVELL_PHY=y +CONFIG_LIBERTAS=y +CONFIG_LIBERTAS_SDIO=y +CONFIG_INPUT_EVDEV=y +CONFIG_KEYBOARD_GPIO=y +# CONFIG_INPUT_MOUSE is not set +CONFIG_LEGACY_PTY_COUNT=16 +# CONFIG_DEVKMEM is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_RUNTIME_UARTS=2 +CONFIG_SERIAL_OF_PLATFORM=y +# CONFIG_HW_RANDOM is not set +CONFIG_I2C=y +# CONFIG_I2C_COMPAT is not set +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_MV64XXX=y +CONFIG_SPI=y +CONFIG_SPI_ORION=y +CONFIG_GPIO_SYSFS=y +CONFIG_POWER_SUPPLY=y +CONFIG_POWER_RESET=y +CONFIG_POWER_RESET_GPIO=y +CONFIG_POWER_RESET_QNAP=y +CONFIG_SENSORS_ADT7475=y +CONFIG_SENSORS_LM63=y +CONFIG_SENSORS_LM75=y +CONFIG_SENSORS_LM85=y +CONFIG_THERMAL=y +CONFIG_WATCHDOG=y +CONFIG_ORION_WATCHDOG=y +CONFIG_REGULATOR=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y +CONFIG_HID_DRAGONRISE=y +CONFIG_HID_GYRATION=y +CONFIG_HID_TWINHAN=y +CONFIG_HID_NTRIG=y +CONFIG_HID_PANTHERLORD=y +CONFIG_HID_PETALYNX=y +CONFIG_HID_SAMSUNG=y +CONFIG_HID_SONY=y +CONFIG_HID_SUNPLUS=y +CONFIG_HID_GREENASIA=y +CONFIG_HID_SMARTJOYPLUS=y +CONFIG_HID_TOPSEED=y +CONFIG_HID_THRUSTMASTER=y +CONFIG_HID_ZEROPLUS=y +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_ROOT_HUB_TT=y +CONFIG_USB_PRINTER=m +CONFIG_USB_STORAGE=y +CONFIG_USB_STORAGE_DATAFAB=y +CONFIG_USB_STORAGE_FREECOM=y +CONFIG_USB_STORAGE_SDDR09=y +CONFIG_USB_STORAGE_SDDR55=y +CONFIG_USB_STORAGE_JUMPSHOT=y +CONFIG_MMC=y +CONFIG_SDIO_UART=y +CONFIG_MMC_MVSDIO=y +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +CONFIG_LEDS_TRIGGER_DEFAULT_ON=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_RS5C372=y +CONFIG_RTC_DRV_PCF8563=y +CONFIG_RTC_DRV_S35390A=y +CONFIG_RTC_DRV_MV=y +CONFIG_DMADEVICES=y +CONFIG_MV_XOR=y +CONFIG_EXT2_FS=y +CONFIG_EXT3_FS=y +# CONFIG_EXT3_FS_XATTR is not set +CONFIG_EXT4_FS=y +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_UDF_FS=m +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_TMPFS=y +CONFIG_JFFS2_FS=y +CONFIG_CRAMFS=y +CONFIG_NFS_FS=y +CONFIG_ROOT_NFS=y +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_850=y +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_2=y +CONFIG_NLS_UTF8=y +CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_FS=y +CONFIG_MAGIC_SYSRQ=y +CONFIG_DEBUG_KERNEL=y +# CONFIG_SCHED_DEBUG is not set +# CONFIG_DEBUG_PREEMPT is not set +# CONFIG_FTRACE is not set +CONFIG_DEBUG_USER=y +CONFIG_CRYPTO_CBC=m +CONFIG_CRYPTO_PCBC=m +# CONFIG_CRYPTO_ANSI_CPRNG is not set +CONFIG_CRYPTO_DEV_MV_CESA=y +CONFIG_CRC_CCITT=y +CONFIG_LIBCRC32C=y
Signature · 1 line
1.8.5.3
Jason Cooper
Appliedv4 cover Move DT kirkwood into mach-mvebu
In reply to Andrew LunnAndrew,
I've tentatively pulled this in as detailed below. The only outlier is an Ack from rmk on one patch.
Quoted 5 lines · Andrew Lunn
The process of making most kirkwood boards boot using DT is nearly complete. We can now move these boards into mach-mvebu, freeing them of the legacy code needed for none-DT systems. At the same time, they can become part of
ARCH_MULTI_V5.
...
Quoted 2 lines
Andrew Lunn (22):
ARM: Kirkwood: Givepm.cits own header file.
applied to mvebu/soc-kw
Quoted 1 line
irqchip: Orion: Fix getting generic chip pointer.
in mvebu/irqchip-fixes and already taken by tglx
Quoted 7 lines
ARM: Kirkwood: Convert
mv88f6281gtw_geswitch setup to DT
ARM: Kirkwood: Drop printing the SoC type and revision
ARM: Kirkwood: Seperate board-dt from common and pcie code.
ARM: Kirkwood: ioremap thecpu_configregister before using it.
ARM: Kirkwood: ioremap memory control register
ARM: MVEBU: AddARCH_MULTI_V7to SoCs
ARM: Orion: Movecache-feroceon-l2.hout of plat-orion
applied to mvebu/soc-kw
Quoted 1 line
ARM: MM: Add DT binding for Feroceon L2 cache
applied to mvebu/soc-kw (needs Ack from rmk)
Quoted 1 line
ARM: Kirkwood: Instantiate L2 cache from DT.
applied to mvebu/dt
Quoted 1 line
ARM: Fix default CPU selection for
ARCH_MULTI_V5
applied to mvebu/soc-kw
Quoted 1 line
ARM: Fix
MULTI_TLBfor feroceon
for rmk's patch tracker
Quoted 3 lines
ARM: MM Enable building Feroceon L2 cache controller with
ARCH_MVEBU
ARM: Move kirkwood DT boards into mach-mvebu
ARM: MVEBU: Let kirkwood use the system controller for restart
applied to mvebu/soc-kw
Quoted 1 line
ARM: MVEBU: Instantiate system controller in
kirkwood.dtsi
applied to mvebu/dt
Quoted 1 line
drivers: Enable building of Kirkwood drivers for mach-mvebu
applied to mvebu/drivers
Quoted 1 line
ARM: MVEBU: Enable mvebu-soc-id on Kirkwood
applied to mvebu/soc-kw
Quoted 1 line
ARM: config: Add a
multi_v5_defconfig
applied to mvebu/defconfig
Quoted 1 line
ARM: MVEBU: Simplifiy headers and make local
applied to mvebu/soc-kw
Quoted 1 line
ARM: config: Add
mvebu_v5_defconfig
applied to mvebu/defconfig
Great work Andrew!
thx,
Jason.
Andrew Lunn
maintainerv4 cover Move DT kirkwood into mach-mvebu
Quoted 4 lines · Jason Cooper
Andrew,
I've tentatively pulled this in as detailed below. The only outlier is an Ack from rmk on one patch.
Thanks for pulling. I just built mvebu/for-next with mvebu_v5_defconfig and booted it on my QNAP. Looks good.
Andrew