ARM: clps711x: convert to clockevents
Subsystems (2)
PATCH 1/7 ARM: clps711x: convert to clockevents
This patch converts CLPS711X-platform to use modern clockevent API.
--- arch/arm/Kconfig | 2 +- arch/arm/mach-clps711x/common.c | 38 +++++++++++++++++--------------------- 2 files changed, 18 insertions(+), 22 deletions(-)
arch/arm/Kconfig +1 -1
@@ -354,9 +354,9 @@ config ARCH_BCM2835 config ARCH_CLPS711X bool "Cirrus Logic CLPS711x/EP721x/EP731x-based" select CPU_ARM720T - select ARCH_USES_GETTIMEOFFSET select COMMON_CLK select CLKDEV_LOOKUP + select GENERIC_CLOCKEVENTS select NEED_MACH_MEMORY_H help Support for Cirrus Logic 711x/721x/731x based boards.
arch/arm/mach-clps711x/common.c +17 -21
@@ -21,13 +21,14 @@*/ #include <linux/io.h> #include <linux/init.h> +#include <linux/sizes.h> #include <linux/interrupt.h> #include <linux/irq.h> #include <linux/clk.h> #include <linux/clkdev.h> +#include <linux/clockchips.h> #include <linux/clk-provider.h> -#include <asm/sizes.h> #include <asm/mach/map.h> #include <asm/mach/time.h> #include <asm/system_misc.h>
@@ -36,7 +37,6 @@static struct clk *clk_pll, *clk_bus, *clk_uart, *clk_timerl, *clk_timerh, *clk_tint, *clk_spi; -static unsigned long latch;/* * This maps the generic CLPS711x registers
@@ -158,32 +158,29 @@ void __init clps711x_init_irq(void)clps_writel (0 ,KBDEOI ); } -/* -* gettimeoffset() returns time since last timer tick, in usecs. -* -* 'LATCH' is hwclock ticks (see CLOCK_TICK_RATE in timex.h) per jiffy. -* 'tick' is usecs per jiffy. -*/ -static unsigned long clps711x_gettimeoffset (void ) +static void clps711x_clockevent_set_mode (enum clock_event_mode mode, +struct clock_event_device *evt) { -unsigned long hwticks; - hwticks = latch - (clps_readl (TC2D ) &0xffff ); -return (hwticks * (tick_nsec /1000 )) / latch; } -/* -* IRQ handler for the timer -*/ -static irqreturn_t p720t_timer_interrupt (int irq,void *dev_id) +static struct clock_event_device clockevent_clps711x = { + .name ="CLPS711x Clockevents" , + .rating =300 , + .features =CLOCK_EVT_FEAT_PERIODIC , + .set_mode = clps711x_clockevent_set_mode, +}; + +static irqreturn_t clps711x_timer_interrupt (int irq,void *dev_id) { -timer_tick (); + clockevent_clps711x.event_handler (&clockevent_clps711x); +return IRQ_HANDLED ; }static struct irqaction clps711x_timer_irq = { .name ="CLPS711x Timer Tick" , .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , - .handler = p720t_timer_interrupt, + .handler = clps711x_timer_interrupt, };static void add_fixed_clk (struct clk *clk,const char *name,int rate)
@@ -244,20 +241,19 @@ static void __init clps711x_timer_init(void)pr_info ("CPU frequency set at %i Hz.\n" , cpu); - latch = (timh +HZ /2 ) /HZ ; +clps_writew (DIV_ROUND_CLOSEST (timh,HZ ),TC2D ); tmp =clps_readl (SYSCON1 ); tmp |=SYSCON1_TC2S |SYSCON1_TC2M ;clps_writel (tmp,SYSCON1 ); -clps_writel (latch -1 ,TC2D ); +clockevents_config_and_register (&clockevent_clps711x, timh,1 ,0xffff );setup_irq (IRQ_TC2OI , &clps711x_timer_irq); }struct sys_timer clps711x_timer = { .init = clps711x_timer_init, - .offset = clps711x_gettimeoffset, };void clps711x_restart (char mode,const char *cmd)
Signature · 1 line
1.7.8.6
PATCH 2/7 ARM: clps711x: p720t: remove missing #include
--- arch/arm/mach-clps711x/p720t.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
arch/arm/mach-clps711x/p720t.c +0 -2
@@ -36,8 +36,6 @@#include <asm/mach/map.h> #include <mach/syspld.h> -#include <asm/hardware/clps7111.h> -#include "common.h" /*
Signature · 1 line
1.7.8.6
PATCH 3/7 ARM: clps711x: rework IRQ sybsustem initialization
In reply to Alexander ShiyanReworked IRQ subsystem to be able to use some interrupts with "End of interrupt" handler.
--- arch/arm/mach-clps711x/common.c | 91 +++++++++++++++++++--------- arch/arm/mach-clps711x/include/mach/irqs.h | 4 - 2 files changed, 62 insertions(+), 33 deletions(-)
arch/arm/mach-clps711x/common.c +62 -29
@@ -66,6 +66,10 @@ static void int1_mask(struct irq_data *d)static void int1_ack (struct irq_data *d) { +} + +static void int1_eoi (struct irq_data *d) +{switch (d->irq) {case IRQ_CSINT :clps_writel (0 ,COEOI );break ;case IRQ_TC1OI :clps_writel (0 ,TC1EOI );break ;
@@ -86,7 +90,9 @@ static void int1_unmask(struct irq_data *d) }static struct irq_chip int1_chip = { + .name ="Interrupt Vector 1 " , .irq_ack = int1_ack, + .irq_eoi = int1_eoi, .irq_mask = int1_mask, .irq_unmask = int1_unmask, };
@@ -102,6 +108,10 @@ static void int2_mask(struct irq_data *d)static void int2_ack (struct irq_data *d) { +} + +static void int2_eoi (struct irq_data *d) +{switch (d->irq) {case IRQ_KBDINT :clps_writel (0 ,KBDEOI );break ; }
@@ -117,45 +127,68 @@ static void int2_unmask(struct irq_data *d) }static struct irq_chip int2_chip = { + .name ="Interrupt Vector 2 " , .irq_ack = int2_ack, + .irq_eoi = int2_eoi, .irq_mask = int2_mask, .irq_unmask = int2_unmask, }; +struct clps711x_irqdesc { +int nr; +struct irq_chip *chip; +irq_flow_handler_t handle; +}; + +static struct clps711x_irqdesc clps711x_irqdescs[]__initdata = { + {IRQ_CSINT , &int1_chip, handle_fasteoi_irq, }, + {IRQ_EINT1 , &int1_chip, handle_level_irq, }, + {IRQ_EINT2 , &int1_chip, handle_level_irq, }, + {IRQ_EINT3 , &int1_chip, handle_level_irq, }, + {IRQ_TC1OI , &int1_chip, handle_fasteoi_irq, }, + {IRQ_TC2OI , &int1_chip, handle_fasteoi_irq, }, + {IRQ_RTCMI , &int1_chip, handle_fasteoi_irq, }, + {IRQ_TINT , &int1_chip, handle_fasteoi_irq, }, + {IRQ_UTXINT1 , &int1_chip, handle_level_irq, }, + {IRQ_URXINT1 , &int1_chip, handle_level_irq, }, + {IRQ_UMSINT , &int1_chip, handle_fasteoi_irq, }, + {IRQ_SSEOTI , &int1_chip, handle_level_irq, }, + {IRQ_KBDINT , &int2_chip, handle_fasteoi_irq, }, + {IRQ_SS2RX , &int2_chip, handle_level_irq, }, + {IRQ_SS2TX , &int2_chip, handle_level_irq, }, + {IRQ_UTXINT2 , &int2_chip, handle_level_irq, }, + {IRQ_URXINT2 , &int2_chip, handle_level_irq, }, +}; +void __init clps711x_init_irq (void ) {unsigned int i; -for (i =0 ; i <NR_IRQS ; i++) { -if (INT1_IRQS & (1 << i)) { -irq_set_chip_and_handler (i, &int1_chip, - handle_level_irq); -set_irq_flags (i,IRQF_VALID |IRQF_PROBE ); - } -if (INT2_IRQS & (1 << i)) { -irq_set_chip_and_handler (i, &int2_chip, - handle_level_irq); -set_irq_flags (i,IRQF_VALID |IRQF_PROBE ); - } +/* Disable interrupts */ +clps_writel (0 ,INTMR1 ); +clps_writel (0 ,INTMR2 ); +clps_writel (0 ,INTMR3 ); + +/* Clear down any pending interrupts */ +clps_writel (0 ,BLEOI ); +clps_writel (0 ,MCEOI ); +clps_writel (0 ,COEOI ); +clps_writel (0 ,TC1EOI ); +clps_writel (0 ,TC2EOI ); +clps_writel (0 ,RTCEOI ); +clps_writel (0 ,TEOI ); +clps_writel (0 ,UMSEOI ); +clps_writel (0 ,KBDEOI ); +clps_writel (0 ,SRXEOF ); +clps_writel (0xffffffff ,DAISR ); + +for (i =0 ; i <ARRAY_SIZE (clps711x_irqdescs); i++) { +irq_set_chip_and_handler (clps711x_irqdescs[i].nr, + clps711x_irqdescs[i].chip, + clps711x_irqdescs[i].handle); +set_irq_flags (clps711x_irqdescs[i].nr, +IRQF_VALID |IRQF_PROBE ); } - -/* -* Disable interrupts -*/ -clps_writel (0 ,INTMR1 ); -clps_writel (0 ,INTMR2 ); - -/* -* Clear down any pending interrupts -*/ -clps_writel (0 ,COEOI ); -clps_writel (0 ,TC1EOI ); -clps_writel (0 ,TC2EOI ); -clps_writel (0 ,RTCEOI ); -clps_writel (0 ,TEOI ); -clps_writel (0 ,UMSEOI ); -clps_writel (0 ,SYNCIO ); -clps_writel (0 ,KBDEOI ); } static void clps711x_clockevent_set_mode(enum clock_event_mode mode,
arch/arm/mach-clps711x/include/mach/irqs.h +0 -4
@@ -34,8 +34,6 @@#define IRQ_UMSINT 14#define IRQ_SSEOTI 15 -#define INT1_IRQS (0x0000fff0) -/* * Interrupts from INTSR2 */
@@ -45,6 +43,4 @@#define IRQ_UTXINT2 (16+12)/* bit 12 */ #define IRQ_URXINT2 (16+13)/* bit 13 */ -#define INT2_IRQS (0x30070000) -#define NR_IRQS 30
Signature · 1 line
1.7.8.6
PATCH 4/7 ARM: clps711x: added missing definitions
In reply to Alexander Shiyan--- arch/arm/mach-clps711x/include/mach/clps711x.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
arch/arm/mach-clps711x/include/mach/clps711x.h +3 -0
@@ -257,6 +257,9 @@#define MEMCFG_BUS_WIDTH_16 (0)#define MEMCFG_BUS_WIDTH_8 (3) +#define MEMCFG_SQAEN (1 << 6) +#define MEMCFG_CLKENB (1 << 7) +#define MEMCFG_WAITSTATE_8_3 (0 << 2)#define MEMCFG_WAITSTATE_7_3 (1 << 2)#define MEMCFG_WAITSTATE_6_3 (2 << 2)
Signature · 1 line
1.7.8.6
PATCH 5/7 ARM: clps711x: make all virtual addresses definition via one macro
In reply to Alexander ShiyanThis patch make all virtual addresses definition via one macro. This modification allows to avoid warning "BUG: mapping for 0x80000000 at 0xff000000 out of vmalloc space".
--- arch/arm/mach-clps711x/autcpu12.c | 15 +----- arch/arm/mach-clps711x/cdb89712.c | 4 +- arch/arm/mach-clps711x/common.c | 2 +- arch/arm/mach-clps711x/edb7211-mm.c | 16 +++--- arch/arm/mach-clps711x/include/mach/autcpu12.h | 14 ++---- arch/arm/mach-clps711x/include/mach/hardware.h | 56 ++++++------------------ arch/arm/mach-clps711x/include/mach/syspld.h | 9 +--- arch/arm/mach-clps711x/p720t.c | 16 ++----- 8 files changed, 38 insertions(+), 94 deletions(-)
arch/arm/mach-clps711x/autcpu12.c +3 -12
@@ -39,19 +39,10 @@#include "common.h" -/* -* The on-chip registers are given a size of 1MB so that a section can -* be used to map them; this saves a page table. This is the place to -* add mappings for ROM, expansion memory, PCMCIA, etc. (if static -* mappings are chosen for those areas). -* -*/ -static struct map_desc autcpu12_io_desc[]__initdata = { -/* memory-mapped extra io and CS8900A Ethernet chip */ -/* ethernet chip */ - { - .virtual =AUTCPU12_VIRT_CS8900A , +/* Memory-mapped extra io and CS8900A Ethernet chip */ + { + .virtual =IO_ADDRESS (AUTCPU12_PHYS_CS8900A ), .pfn =__phys_to_pfn (AUTCPU12_PHYS_CS8900A ), .length =SZ_1M , .type =MT_DEVICE
arch/arm/mach-clps711x/cdb89712.c +2 -2
@@ -40,8 +40,8 @@*/ static struct map_desc cdb89712_io_desc[]__initdata = { { - .virtual =ETHER_BASE , - .pfn =__phys_to_pfn (ETHER_START ), + .virtual =IO_ADDRESS (ETHER_PHYS_BASE ), + .pfn =__phys_to_pfn (ETHER_PHYS_BASE ), .length =ETHER_SIZE , .type =MT_DEVICE }
arch/arm/mach-clps711x/common.c +1 -1
@@ -45,7 +45,7 @@ static struct map_desc clps711x_io_desc[] __initdata = { { .virtual = (unsigned long)CLPS711X_VIRT_BASE, .pfn = __phys_to_pfn(CLPS711X_PHYS_BASE), - .length = SZ_1M, + .length = SZ_64K, .type = MT_DEVICE } };
arch/arm/mach-clps711x/edb7211-mm.c +8 -8
@@ -51,23 +51,23 @@ extern void clps711x_map_io(void);* happens). */ static struct map_desc edb7211_io_desc[]__initdata = { - {/* memory-mapped extra keyboard row */ - .virtual =EP7211_VIRT_EXTKBD , + {/* Memory-mapped extra keyboard row */ + .virtual =IO_ADDRESS (EP7211_PHYS_EXTKBD ), .pfn =__phys_to_pfn (EP7211_PHYS_EXTKBD ), .length =SZ_1M , .type =MT_DEVICE , - }, {/* and CS8900A Ethernet chip */ - .virtual =EP7211_VIRT_CS8900A , + }, {/* CS8900A Ethernet chip */ + .virtual =IO_ADDRESS (EP7211_PHYS_CS8900A ), .pfn =__phys_to_pfn (EP7211_PHYS_CS8900A ), .length =SZ_1M , .type =MT_DEVICE , - }, {/* flash banks */ - .virtual =EP7211_VIRT_FLASH1 , + }, {/* Flash bank 0 */ + .virtual =IO_ADDRESS (EP7211_PHYS_FLASH1 ), .pfn =__phys_to_pfn (EP7211_PHYS_FLASH1 ), .length =SZ_8M , .type =MT_DEVICE , - }, { - .virtual =EP7211_VIRT_FLASH2 , + }, {/* Flash bank 1 */ + .virtual =IO_ADDRESS (EP7211_PHYS_FLASH2 ), .pfn =__phys_to_pfn (EP7211_PHYS_FLASH2 ), .length =SZ_8M , .type =MT_DEVICE ,
arch/arm/mach-clps711x/include/mach/autcpu12.h +4 -10
@@ -20,12 +20,8 @@#ifndef __ASM_ARCH_AUTCPU12_H#define __ASM_ARCH_AUTCPU12_H -/* -* The CS8900A ethernet chip has its I/O registers wired to chip select 2 -* (nCS2). This is the mapping for it. -*/ -#define AUTCPU12_PHYS_CS8900A CS2_PHYS_BASE/* physical */ -#define AUTCPU12_VIRT_CS8900A (0xfe000000)/* virtual */ +/* The CS8900A ethernet chip has its I/O registers wired to chip select 2 */ +#define AUTCPU12_PHYS_CS8900A CS2_PHYS_BASE/* * The flash bank is wired to chip select 0
@@ -34,11 +30,9 @@/* offset for device specific information structure */ #define AUTCPU12_LCDINFO_OFFS (0x00010000) -/* -* Videomemory is the internal SRAM (CS 6) -*/ + +/* Videomemory in the internal SRAM (CS 6) */ #define AUTCPU12_PHYS_VIDEO CS6_PHYS_BASE -#define AUTCPU12_VIRT_VIDEO (0xfd000000)/* * All special IO's are tied to CS1
arch/arm/mach-clps711x/include/mach/hardware.h +13 -43
78 lines not on this page · raw message
arch/arm/mach-clps711x/include/mach/syspld.h +2 -7
@@ -23,14 +23,9 @@#define __ASM_ARCH_SYSPLD_H#define SYSPLD_PHYS_BASE (0x10000000) +#define SYSPLD_VIRT_BASE IO_ADDRESS(SYSPLD_PHYS_BASE) -#ifndef __ASSEMBLY__ -#include <asm/types.h> - -#define SYSPLD_REG (type,off) (*(volatile type *)(SYSPLD_BASE + off)) -#else -#define SYSPLD_REG (type,off) (off) -#endif +#define SYSPLD_REG (type, off) (*(volatile type *)(SYSPLD_VIRT_BASE + (off)))#define PLD_INT SYSPLD_REG(u32, 0x000000)#define PLD_INT_PENIRQ (1 << 5)
arch/arm/mach-clps711x/p720t.c +5 -11
@@ -39,22 +39,16 @@#include "common.h" /* -* Map the P720T system PLD. It occupies two address spaces: -* SYSPLD_PHYS_BASE and SYSPLD_PHYS_BASE + 0x00400000 -* We map both here. +* Map the P720T system PLD. It occupies two address spaces: +* 0x10000000 and 0x10400000. We map both regions as one. */ static struct map_desc p720t_io_desc[]__initdata = { { .virtual =SYSPLD_VIRT_BASE , .pfn =__phys_to_pfn (SYSPLD_PHYS_BASE ), - .length =SZ_1M , - .type =MT_DEVICE - }, { - .virtual =0xfe400000 , - .pfn =__phys_to_pfn (0x10400000 ), - .length =SZ_1M , - .type =MT_DEVICE - } + .length =SZ_8M , + .type =MT_DEVICE , + }, }; static void __init
Signature · 1 line
1.7.8.6
PATCH 5/7 ARM: clps711x: make all virtual addresses definition via one macro
Quoted 5 lines · Alexander Shiyan
This patch make all virtual addresses definition via one macro. This modification allows to avoid warning "BUG: mapping for
0x80000000at0xff000000out of vmalloc space".Signed-off-by Alexander Shiyan <[email protected]>
Two comments on this one:
* I wonder if we could just kill off some of the mappings if no driver relies on the registers being mapped in advance, especially for those that don't benefit from section mapping like the ethernet one that is only a page anyway.
* I would recommend defining the IO_ADDRESS macro in a way that the result is of type 'void __iomem *', and you add a cast in the map_desc array. We will probably clean those up eventually and require that they are pointers at that place anyway, based on recent discussions.
Arnd
PATCH 5/7 ARM: clps711x: make all virtual addresses definition via one macro
Quoted 5 lines · On Wed, 10 Oct 2012 18:25:49 +0000 Arnd Bergmann <[email protected]> wrote:
Quoted 4 lines · Alexander Shiyan
This patch make all virtual addresses definition via one macro. This modification allows to avoid warning "BUG: mapping for
0x80000000at0xff000000out of vmalloc space".
Quoted 8 lines
Quoted 1 line
Signed-off-by Alexander Shiyan <[email protected]>Two comments on this one:
* I wonder if we could just kill off some of the mappings if no driver relies on the registers being mapped in advance, especially for those that don't benefit from section mapping like the ethernet one that is only a page anyway.
I'm working on this and the next series of patches will be is almost completely free of static mappings.
Quoted 5 lines
* I would recommend defining the
IO_ADDRESSmacro in a way that the result is of type 'void__iomem*', and you add a cast in themap_descarray. We will probably clean those up eventually and require that they are pointers at that place anyway, based on recent discussions.
It's easy to do. Will be considered in the next series of patches.
Signature · 1 line
Alexander Shiyan <[email protected]>
PATCH 6/7 ARM: clps711x: merge all CLPS711X-defconfigs into one
In reply to Alexander Shiyan--- arch/arm/configs/clps711x_defconfig | 78 +++++++++++++++++++++++++++++++++++ arch/arm/configs/edb7211_defconfig | 27 ------------ arch/arm/configs/fortunet_defconfig | 28 ------------ 3 files changed, 78 insertions(+), 55 deletions(-) create mode 100644 arch/arm/configs/clps711x_defconfig delete mode 100644 arch/arm/configs/edb7211_defconfig delete mode 100644 arch/arm/configs/fortunet_defconfig
arch/arm/configs/clps711x_defconfig new file +78 -0
@@ -0,0 +1,78 @@ +CONFIG_EXPERIMENTAL=y +CONFIG_SYSVIPC=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_BLK_DEV_INITRD=y +CONFIG_EMBEDDED=y +CONFIG_PARTITION_ADVANCED=y +# CONFIG_MSDOS_PARTITION is not set +CONFIG_ARCH_CLPS711X=y +CONFIG_ARCH_AUTCPU12=y +CONFIG_ARCH_CDB89712=y +CONFIG_ARCH_CLEP7312=y +CONFIG_ARCH_EDB7211=y +CONFIG_ARCH_P720T=y +CONFIG_ARCH_FORTUNET=y +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +# CONFIG_IPV6 is not set +CONFIG_IRDA=y +CONFIG_IRTTY_SIR=y +CONFIG_EP7211_DONGLE=y +CONFIG_MTD=y +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_CFI=y +CONFIG_MTD_JEDECPROBE=y +CONFIG_MTD_CFI_INTELEXT=y +CONFIG_MTD_CFI_AMDSTD=y +CONFIG_MTD_CFI_STAA=y +CONFIG_MTD_CDB89712=y +CONFIG_MTD_AUTCPU12=y +CONFIG_MTD_PLATRAM=y +CONFIG_BLK_DEV_RAM=y +CONFIG_NETDEVICES=y +# CONFIG_NET_VENDOR_3COM is not set +# CONFIG_NET_VENDOR_AMD is not set +# CONFIG_NET_VENDOR_BROADCOM is not set +# CONFIG_NET_VENDOR_CHELSIO is not set +CONFIG_CS89x0=y +# CONFIG_NET_VENDOR_FARADAY is not set +# CONFIG_NET_VENDOR_FUJITSU is not set +# CONFIG_NET_VENDOR_HP is not set +# CONFIG_NET_VENDOR_INTEL is not set +# CONFIG_NET_VENDOR_MARVELL is not set +# CONFIG_NET_VENDOR_MICREL is not set +# CONFIG_NET_VENDOR_NATSEMI is not set +# CONFIG_NET_VENDOR_RACAL is not set +# CONFIG_NET_VENDOR_SEEQ is not set +# CONFIG_NET_VENDOR_SMSC is not set +# CONFIG_NET_VENDOR_STMICRO is not set +# CONFIG_NET_VENDOR_WIZNET is not set +# CONFIG_WLAN is not set +# CONFIG_INPUT is not set +# CONFIG_SERIO is not set +# CONFIG_VT is not set +CONFIG_SERIAL_CLPS711X_CONSOLE=y +# CONFIG_HW_RANDOM is not set +# CONFIG_HWMON is not set +CONFIG_FB=y +CONFIG_FB_CLPS711X=y +# CONFIG_USB_SUPPORT is not set +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +# CONFIG_IOMMU_SUPPORT is not set +CONFIG_EXT2_FS=y +CONFIG_MINIX_FS=y +# CONFIG_NETWORK_FILESYSTEMS is not set +# CONFIG_FTRACE is not set +CONFIG_DEBUG_USER=y +CONFIG_DEBUG_LL=y +CONFIG_EARLY_PRINTK=y +# CONFIG_CRYPTO_ANSI_CPRNG is not set +# CONFIG_CRYPTO_HW is not set +# CONFIG_CRC32 is not set
arch/arm/configs/edb7211_defconfig deleted +0 -27
@@ -1,27 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y -# CONFIG_HOTPLUG is not set -CONFIG_ARCH_CLPS711X=y -CONFIG_ARCH_EDB7211=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -# CONFIG_IPV6 is not set -CONFIG_BLK_DEV_RAM=y -CONFIG_NETDEVICES=y -# CONFIG_INPUT is not set -CONFIG_SERIO_LIBPS2=y -# CONFIG_VT is not set -CONFIG_SERIAL_CLPS711X=y -CONFIG_SERIAL_CLPS711X_CONSOLE=y -CONFIG_EXT2_FS=y -CONFIG_MINIX_FS=y -CONFIG_PARTITION_ADVANCED=y -# CONFIG_MSDOS_PARTITION is not set -CONFIG_DEBUG_USER=y
arch/arm/configs/fortunet_defconfig deleted +0 -28
@@ -1,28 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y -# CONFIG_HOTPLUG is not set -CONFIG_ARCH_CLPS711X=y -CONFIG_ARCH_FORTUNET=y -# CONFIG_ARM_THUMB is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_FPE_FASTFPE=y -CONFIG_BINFMT_AOUT=y -CONFIG_NET=y -CONFIG_UNIX=y -CONFIG_MTD=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_BLK_DEV_RAM=y -# CONFIG_INPUT is not set -# CONFIG_SERIO is not set -# CONFIG_VT is not set -CONFIG_SERIAL_CLPS711X=y -CONFIG_SERIAL_CLPS711X_CONSOLE=y -CONFIG_EXT2_FS=y -CONFIG_DEBUG_USER=y
Signature · 1 line
1.7.8.6
PATCH 7/7 ARM: clps711x: merge files related to EDB7211-board into one
In reply to Alexander Shiyan--- arch/arm/mach-clps711x/Makefile | 2 +- arch/arm/mach-clps711x/edb7211-arch.c | 66 ------------------------ arch/arm/mach-clps711x/edb7211-mm.c | 82 ------------------------------ arch/arm/mach-clps711x/edb7211.c | 88 +++++++++++++++++++++++++++++++++ 4 files changed, 89 insertions(+), 149 deletions(-) delete mode 100644 arch/arm/mach-clps711x/edb7211-arch.c delete mode 100644 arch/arm/mach-clps711x/edb7211-mm.c create mode 100644 arch/arm/mach-clps711x/edb7211.c
arch/arm/mach-clps711x/Makefile +1 -1
@@ -12,6 +12,6 @@ obj- := obj-$(CONFIG_ARCH_AUTCPU12) += autcpu12.o obj-$(CONFIG_ARCH_CDB89712) += cdb89712.o obj-$(CONFIG_ARCH_CLEP7312) += clep7312.o -obj-$(CONFIG_ARCH_EDB7211) += edb7211-arch.o edb7211-mm.o +obj-$(CONFIG_ARCH_EDB7211) += edb7211.o obj-$(CONFIG_ARCH_FORTUNET) += fortunet.o obj-$(CONFIG_ARCH_P720T) += p720t.o
arch/arm/mach-clps711x/edb7211-arch.c deleted +0 -66
66 lines not on this page · raw message
arch/arm/mach-clps711x/edb7211-mm.c deleted +0 -82
82 lines not on this page · raw message
arch/arm/mach-clps711x/edb7211.c new file +88 -0
88 lines not on this page · raw message
Signature · 1 line
1.7.8.6
PATCH 1/7 ARM: clps711x: convert to clockevents
In reply to Alexander ShiyanQuoted 7 lines · Alexander Shiyan
This patch converts CLPS711X-platform to use modern clockevent API.
Signed-off-by Alexander Shiyan <[email protected]>--- arch/arm/Kconfig | 2 +- arch/arm/mach-clps711x/common.c | 38 +++++++++++++++++--------------------- 2 files changed, 18 insertions(+), 22 deletions(-)
Overall a very nice series, all 7 patches. I just have a few trivial comments for patch 5.
Arnd
PATCH 1/7 ARM: clps711x: convert to clockevents
In reply to Alexander ShiyanQuoted 3 lines · Alexander Shiyan
This patch converts CLPS711X-platform to use modern clockevent API.
Signed-off-by Alexander Shiyan <[email protected]>
Applied the entire series. There are a few things that you can do to simplify the process so you don't have to remind us to pull in patches you send:
* Use 'git format-patch --cover-letter' to create an introductory email, and in that mail, ask us specifically to pull it into arm-soc of that is the idea, or to just do a review for the first version.
* Send one patch to add yourself to the maintainers file. You are the only person who is sending patches for clps711x at the moment, and we don't have a formal maintainer besides you, so I think you should do it officially.
* If possible, provide a git URL to pull from directly, and use a signed tag to describe the series overall. Use "git request-pull" to send the email asking for your changes to be pulled in.
The patches from this set are now in the clps711x/soc branch, merged into the next/soc branch that will be sent in the 3.8 merge window and they are part of the for-next branch to get testing in the linux-next kernel.
Arnd