Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32f15dc5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32 

* 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32: (21 commits)
  [AVR32] Fix compile error with gcc 4.1
  avr32: remove unneeded cast in atomic.h
  AVR32: Remove useless config option "GENERIC_BUST_SPINLOCK".
  [AVR32] Optimize the TLB miss handler
  [AVR32] Board code for ATNGW100
  [AVR32] Use memcpy/memset in memcpy_{from,to}_io and memset_io
  [AVR32] Get rid of board_setup_fbmem()
  [AVR32] Reserve framebuffer memory in early_parse_fbmem()
  [AVR32] Simplify early handling of memory regions
  [AVR32] Move setup_bootmem() from mm/init.c to kernel/setup.c
  [AVR32] Make I/O access macros work with external devices
  [AVR32] Fix NMI handler
  [AVR32] Clean up exception handling code
  [AVR32] Clean up cpu identification and add features bitmap
  [AVR32] Clean up asm/sysreg.h
  [AVR32] Don't enable clocks with no users
  [AVR32] Put cpu in sleep 0 when idle.
  [AVR32] Change system timer from count-compare to Timer/Counter 0
  [AVR32] Add mach-specific Kconfig
  [AVR32] Add nwait and tdf parameters to SMC configuration
  ...
parents 07db59bd 8224ca19

arch/avr32/Kconfig

+10 −3
Original line number Diff line number Diff line
@@ -57,9 +57,6 @@ config ARCH_HAS_ILOG2_U64 
	bool

	default n



config GENERIC_BUST_SPINLOCK

	bool



config GENERIC_HWEIGHT

	bool

	default y
@@ -68,6 +65,11 @@ config GENERIC_CALIBRATE_DELAY 
	bool

	default y



config GENERIC_BUG

	bool

	default y

	depends on BUG



source "init/Kconfig"



menu "System Type and features"
@@ -106,6 +108,9 @@ choice 
config BOARD_ATSTK1000

	bool "ATSTK1000 evaluation board"

	select BOARD_ATSTK1002 if CPU_AT32AP7000



config BOARD_ATNGW100

	bool "ATNGW100 Network Gateway"

endchoice



choice
@@ -116,6 +121,8 @@ config LOADER_U_BOOT 
	bool "U-Boot (or similar) bootloader"

endchoice



source "arch/avr32/mach-at32ap/Kconfig"



config LOAD_ADDRESS

	hex

	default 0x10000000 if LOADER_U_BOOT=y && CPU_AT32AP7000=y

arch/avr32/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ head-$(CONFIG_LOADER_U_BOOT) += arch/avr32/boot/u-boot/head.o 
head-y					+= arch/avr32/kernel/head.o

core-$(CONFIG_PLATFORM_AT32AP)		+= arch/avr32/mach-at32ap/

core-$(CONFIG_BOARD_ATSTK1000)		+= arch/avr32/boards/atstk1000/

core-$(CONFIG_BOARD_ATNGW100)		+= arch/avr32/boards/atngw100/

core-$(CONFIG_LOADER_U_BOOT)		+= arch/avr32/boot/u-boot/

core-y					+= arch/avr32/kernel/

core-y					+= arch/avr32/mm/

arch/avr32/boards/atngw100/Makefile

0 → 100644
+1 −0
Original line number Diff line number Diff line 
obj-y				+= setup.o flash.o

arch/avr32/boards/atngw100/flash.c

0 → 100644
+95 −0
Original line number Diff line number Diff line 
/*

 * ATNGW100 board-specific flash initialization

 *

 * Copyright (C) 2005-2006 Atmel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>

#include <linux/mtd/physmap.h>



#include <asm/arch/smc.h>



static struct smc_config flash_config __initdata = {

	.ncs_read_setup		= 0,

	.nrd_setup		= 40,

	.ncs_write_setup	= 0,

	.nwe_setup		= 10,



	.ncs_read_pulse		= 80,

	.nrd_pulse		= 40,

	.ncs_write_pulse	= 65,

	.nwe_pulse		= 55,



	.read_cycle		= 120,

	.write_cycle		= 120,



	.bus_width		= 2,

	.nrd_controlled		= 1,

	.nwe_controlled		= 1,

	.byte_write		= 1,

};



static struct mtd_partition flash_parts[] = {

	{

		.name           = "u-boot",

		.offset         = 0x00000000,

		.size           = 0x00020000,           /* 128 KiB */

		.mask_flags     = MTD_WRITEABLE,

	},

	{

		.name           = "root",

		.offset         = 0x00020000,

		.size           = 0x007d0000,

	},

	{

		.name           = "env",

		.offset         = 0x007f0000,

		.size           = 0x00010000,

		.mask_flags     = MTD_WRITEABLE,

	},

};



static struct physmap_flash_data flash_data = {

	.width		= 2,

	.nr_parts	= ARRAY_SIZE(flash_parts),

	.parts		= flash_parts,

};



static struct resource flash_resource = {

	.start		= 0x00000000,

	.end		= 0x007fffff,

	.flags		= IORESOURCE_MEM,

};



static struct platform_device flash_device = {

	.name		= "physmap-flash",

	.id		= 0,

	.resource	= &flash_resource,

	.num_resources	= 1,

	.dev		= {

		.platform_data = &flash_data,

	},

};



/* This needs to be called after the SMC has been initialized */

static int __init atngw100_flash_init(void)

{

	int ret;



	ret = smc_set_configuration(0, &flash_config);

	if (ret < 0) {

		printk(KERN_ERR "atngw100: failed to set NOR flash timing\n");

		return ret;

	}



	platform_device_register(&flash_device);



	return 0;

}

device_initcall(atngw100_flash_init);

arch/avr32/boards/atngw100/setup.c

0 → 100644
+124 −0
Original line number Diff line number Diff line 
/*

 * Board-specific setup code for the ATNGW100 Network Gateway

 *

 * Copyright (C) 2005-2006 Atmel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

#include <linux/clk.h>

#include <linux/etherdevice.h>

#include <linux/init.h>

#include <linux/linkage.h>

#include <linux/platform_device.h>

#include <linux/types.h>

#include <linux/spi/spi.h>



#include <asm/io.h>

#include <asm/setup.h>



#include <asm/arch/at32ap7000.h>

#include <asm/arch/board.h>

#include <asm/arch/init.h>



/* Initialized by bootloader-specific startup code. */

struct tag *bootloader_tags __initdata;



struct eth_addr {

	u8 addr[6];

};

static struct eth_addr __initdata hw_addr[2];

static struct eth_platform_data __initdata eth_data[2];



static struct spi_board_info spi0_board_info[] __initdata = {

	{

		.modalias	= "mtd_dataflash",

		.max_speed_hz	= 10000000,

		.chip_select	= 0,

	},

};



/*

 * The next two functions should go away as the boot loader is

 * supposed to initialize the macb address registers with a valid

 * ethernet address. But we need to keep it around for a while until

 * we can be reasonably sure the boot loader does this.

 *

 * The phy_id is ignored as the driver will probe for it.

 */

static int __init parse_tag_ethernet(struct tag *tag)

{

	int i;



	i = tag->u.ethernet.mac_index;

	if (i < ARRAY_SIZE(hw_addr))

		memcpy(hw_addr[i].addr, tag->u.ethernet.hw_address,

		       sizeof(hw_addr[i].addr));



	return 0;

}

__tagtable(ATAG_ETHERNET, parse_tag_ethernet);



static void __init set_hw_addr(struct platform_device *pdev)

{

	struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	const u8 *addr;

	void __iomem *regs;

	struct clk *pclk;



	if (!res)

		return;

	if (pdev->id >= ARRAY_SIZE(hw_addr))

		return;



	addr = hw_addr[pdev->id].addr;

	if (!is_valid_ether_addr(addr))

		return;



	/*

	 * Since this is board-specific code, we'll cheat and use the

	 * physical address directly as we happen to know that it's

	 * the same as the virtual address.

	 */

	regs = (void __iomem __force *)res->start;

	pclk = clk_get(&pdev->dev, "pclk");

	if (!pclk)

		return;



	clk_enable(pclk);

	__raw_writel((addr[3] << 24) | (addr[2] << 16)

		     | (addr[1] << 8) | addr[0], regs + 0x98);

	__raw_writel((addr[5] << 8) | addr[4], regs + 0x9c);

	clk_disable(pclk);

	clk_put(pclk);

}



struct platform_device *at32_usart_map[1];

unsigned int at32_nr_usarts = 1;



void __init setup_board(void)

{

	at32_map_usart(1, 0);	/* USART 1: /dev/ttyS0, DB9 */

	at32_setup_serial_console(0);

}



static int __init atngw100_init(void)

{

	/*

	 * ATNGW100 uses 16-bit SDRAM interface, so we don't need to

	 * reserve any pins for it.

	 */



	at32_add_system_devices();



	at32_add_device_usart(0);



	set_hw_addr(at32_add_device_eth(0, &eth_data[0]));

	set_hw_addr(at32_add_device_eth(1, &eth_data[1]));



	at32_add_device_spi(0, spi0_board_info, ARRAY_SIZE(spi0_board_info));



	return 0;

}

postcore_initcall(atngw100_init);