Loading Documentation/filesystems/ntfs.txt +3 −0 Original line number Diff line number Diff line Loading @@ -457,6 +457,9 @@ ChangeLog Note, a technical ChangeLog aimed at kernel hackers is in fs/ntfs/ChangeLog. 2.1.30: - Fix writev() (it kept writing the first segment over and over again instead of moving onto subsequent segments). 2.1.29: - Fix a deadlock when mounting read-write. 2.1.28: Loading MAINTAINERS +3 −3 Original line number Diff line number Diff line Loading @@ -4383,11 +4383,11 @@ F: Documentation/scsi/NinjaSCSI.txt F: drivers/scsi/nsp32* NTFS FILESYSTEM M: Anton Altaparmakov <aia21@cantab.net> M: Anton Altaparmakov <anton@tuxera.com> L: linux-ntfs-dev@lists.sourceforge.net W: http://www.linux-ntfs.org/ W: http://www.tuxera.com/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6.git S: Maintained S: Supported F: Documentation/filesystems/ntfs.txt F: fs/ntfs/ Loading arch/sh/boards/Kconfig +18 −0 Original line number Diff line number Diff line Loading @@ -3,6 +3,9 @@ menu "Board support" config SOLUTION_ENGINE bool config SH_ALPHA_BOARD bool config SH_SOLUTION_ENGINE bool "SolutionEngine" select SOLUTION_ENGINE Loading Loading @@ -320,6 +323,21 @@ config SH_SH2007 Compact Flash socket, two serial ports and PC-104 bus. More information at <http://sh2000.sh-linux.org>. config SH_APSH4A3A bool "AP-SH4A-3A" select SH_ALPHA_BOARD depends on CPU_SUBTYPE_SH7785 help Select AP-SH4A-3A if configuring for an ALPHAPROJECT AP-SH4A-3A. config SH_APSH4AD0A bool "AP-SH4AD-0A" select SH_ALPHA_BOARD select SYS_SUPPORTS_PCI depends on CPU_SUBTYPE_SH7786 help Select AP-SH4AD-0A if configuring for an ALPHAPROJECT AP-SH4AD-0A. endmenu source "arch/sh/boards/mach-r2d/Kconfig" Loading arch/sh/boards/Makefile +2 −0 Original line number Diff line number Diff line Loading @@ -13,3 +13,5 @@ obj-$(CONFIG_SH_ESPT) += board-espt.o obj-$(CONFIG_SH_POLARIS) += board-polaris.o obj-$(CONFIG_SH_TITAN) += board-titan.o obj-$(CONFIG_SH_SH7757LCR) += board-sh7757lcr.o obj-$(CONFIG_SH_APSH4A3A) += board-apsh4a3a.o obj-$(CONFIG_SH_APSH4AD0A) += board-apsh4ad0a.o arch/sh/boards/board-apsh4a3a.c 0 → 100644 +175 −0 Original line number Diff line number Diff line /* * ALPHAPROJECT AP-SH4A-3A Support. * * Copyright (C) 2010 ALPHAPROJECT Co.,Ltd. * Copyright (C) 2008 Yoshihiro Shimoda * Copyright (C) 2009 Paul Mundt * * This file is subject to the terms and conditions of the GNU General Public * License. See the file "COPYING" in the main directory of this archive * for more details. */ #include <linux/init.h> #include <linux/platform_device.h> #include <linux/io.h> #include <linux/mtd/physmap.h> #include <linux/smsc911x.h> #include <linux/irq.h> #include <linux/clk.h> #include <asm/machvec.h> #include <asm/sizes.h> #include <asm/clock.h> static struct mtd_partition nor_flash_partitions[] = { { .name = "loader", .offset = 0x00000000, .size = 512 * 1024, }, { .name = "bootenv", .offset = MTDPART_OFS_APPEND, .size = 512 * 1024, }, { .name = "kernel", .offset = MTDPART_OFS_APPEND, .size = 4 * 1024 * 1024, }, { .name = "data", .offset = MTDPART_OFS_APPEND, .size = MTDPART_SIZ_FULL, }, }; static struct physmap_flash_data nor_flash_data = { .width = 4, .parts = nor_flash_partitions, .nr_parts = ARRAY_SIZE(nor_flash_partitions), }; static struct resource nor_flash_resources[] = { [0] = { .start = 0x00000000, .end = 0x01000000 - 1, .flags = IORESOURCE_MEM, } }; static struct platform_device nor_flash_device = { .name = "physmap-flash", .dev = { .platform_data = &nor_flash_data, }, .num_resources = ARRAY_SIZE(nor_flash_resources), .resource = nor_flash_resources, }; static struct resource smsc911x_resources[] = { [0] = { .name = "smsc911x-memory", .start = 0xA4000000, .end = 0xA4000000 + SZ_256 - 1, .flags = IORESOURCE_MEM, }, [1] = { .name = "smsc911x-irq", .start = evt2irq(0x200), .end = evt2irq(0x200), .flags = IORESOURCE_IRQ, }, }; static struct smsc911x_platform_config smsc911x_config = { .irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_LOW, .irq_type = SMSC911X_IRQ_TYPE_OPEN_DRAIN, .flags = SMSC911X_USE_16BIT, .phy_interface = PHY_INTERFACE_MODE_MII, }; static struct platform_device smsc911x_device = { .name = "smsc911x", .id = -1, .num_resources = ARRAY_SIZE(smsc911x_resources), .resource = smsc911x_resources, .dev = { .platform_data = &smsc911x_config, }, }; static struct platform_device *apsh4a3a_devices[] __initdata = { &nor_flash_device, &smsc911x_device, }; static int __init apsh4a3a_devices_setup(void) { return platform_add_devices(apsh4a3a_devices, ARRAY_SIZE(apsh4a3a_devices)); } device_initcall(apsh4a3a_devices_setup); static int apsh4a3a_clk_init(void) { struct clk *clk; int ret; clk = clk_get(NULL, "extal"); if (!clk || IS_ERR(clk)) return PTR_ERR(clk); ret = clk_set_rate(clk, 33333000); clk_put(clk); return ret; } /* Initialize the board */ static void __init apsh4a3a_setup(char **cmdline_p) { printk(KERN_INFO "Alpha Project AP-SH4A-3A support:\n"); } static void __init apsh4a3a_init_irq(void) { plat_irq_setup_pins(IRQ_MODE_IRQ7654); } /* Return the board specific boot mode pin configuration */ static int apsh4a3a_mode_pins(void) { int value = 0; /* These are the factory default settings of SW1 and SW2. * If you change these dip switches then you will need to * adjust the values below as well. */ value &= ~MODE_PIN0; /* Clock Mode 16 */ value &= ~MODE_PIN1; value &= ~MODE_PIN2; value &= ~MODE_PIN3; value |= MODE_PIN4; value &= ~MODE_PIN5; /* 16-bit Area0 bus width */ value |= MODE_PIN6; /* Area 0 SRAM interface */ value |= MODE_PIN7; value |= MODE_PIN8; /* Little Endian */ value |= MODE_PIN9; /* Master Mode */ value |= MODE_PIN10; /* Crystal resonator */ value |= MODE_PIN11; /* Display Unit */ value |= MODE_PIN12; value &= ~MODE_PIN13; /* 29-bit address mode */ value |= MODE_PIN14; /* No PLL step-up */ return value; } /* * The Machine Vector */ static struct sh_machine_vector mv_apsh4a3a __initmv = { .mv_name = "AP-SH4A-3A", .mv_setup = apsh4a3a_setup, .mv_clk_init = apsh4a3a_clk_init, .mv_init_irq = apsh4a3a_init_irq, .mv_mode_pins = apsh4a3a_mode_pins, }; Loading
Documentation/filesystems/ntfs.txt +3 −0 Original line number Diff line number Diff line Loading @@ -457,6 +457,9 @@ ChangeLog Note, a technical ChangeLog aimed at kernel hackers is in fs/ntfs/ChangeLog. 2.1.30: - Fix writev() (it kept writing the first segment over and over again instead of moving onto subsequent segments). 2.1.29: - Fix a deadlock when mounting read-write. 2.1.28: Loading
MAINTAINERS +3 −3 Original line number Diff line number Diff line Loading @@ -4383,11 +4383,11 @@ F: Documentation/scsi/NinjaSCSI.txt F: drivers/scsi/nsp32* NTFS FILESYSTEM M: Anton Altaparmakov <aia21@cantab.net> M: Anton Altaparmakov <anton@tuxera.com> L: linux-ntfs-dev@lists.sourceforge.net W: http://www.linux-ntfs.org/ W: http://www.tuxera.com/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6.git S: Maintained S: Supported F: Documentation/filesystems/ntfs.txt F: fs/ntfs/ Loading
arch/sh/boards/Kconfig +18 −0 Original line number Diff line number Diff line Loading @@ -3,6 +3,9 @@ menu "Board support" config SOLUTION_ENGINE bool config SH_ALPHA_BOARD bool config SH_SOLUTION_ENGINE bool "SolutionEngine" select SOLUTION_ENGINE Loading Loading @@ -320,6 +323,21 @@ config SH_SH2007 Compact Flash socket, two serial ports and PC-104 bus. More information at <http://sh2000.sh-linux.org>. config SH_APSH4A3A bool "AP-SH4A-3A" select SH_ALPHA_BOARD depends on CPU_SUBTYPE_SH7785 help Select AP-SH4A-3A if configuring for an ALPHAPROJECT AP-SH4A-3A. config SH_APSH4AD0A bool "AP-SH4AD-0A" select SH_ALPHA_BOARD select SYS_SUPPORTS_PCI depends on CPU_SUBTYPE_SH7786 help Select AP-SH4AD-0A if configuring for an ALPHAPROJECT AP-SH4AD-0A. endmenu source "arch/sh/boards/mach-r2d/Kconfig" Loading
arch/sh/boards/Makefile +2 −0 Original line number Diff line number Diff line Loading @@ -13,3 +13,5 @@ obj-$(CONFIG_SH_ESPT) += board-espt.o obj-$(CONFIG_SH_POLARIS) += board-polaris.o obj-$(CONFIG_SH_TITAN) += board-titan.o obj-$(CONFIG_SH_SH7757LCR) += board-sh7757lcr.o obj-$(CONFIG_SH_APSH4A3A) += board-apsh4a3a.o obj-$(CONFIG_SH_APSH4AD0A) += board-apsh4ad0a.o
arch/sh/boards/board-apsh4a3a.c 0 → 100644 +175 −0 Original line number Diff line number Diff line /* * ALPHAPROJECT AP-SH4A-3A Support. * * Copyright (C) 2010 ALPHAPROJECT Co.,Ltd. * Copyright (C) 2008 Yoshihiro Shimoda * Copyright (C) 2009 Paul Mundt * * This file is subject to the terms and conditions of the GNU General Public * License. See the file "COPYING" in the main directory of this archive * for more details. */ #include <linux/init.h> #include <linux/platform_device.h> #include <linux/io.h> #include <linux/mtd/physmap.h> #include <linux/smsc911x.h> #include <linux/irq.h> #include <linux/clk.h> #include <asm/machvec.h> #include <asm/sizes.h> #include <asm/clock.h> static struct mtd_partition nor_flash_partitions[] = { { .name = "loader", .offset = 0x00000000, .size = 512 * 1024, }, { .name = "bootenv", .offset = MTDPART_OFS_APPEND, .size = 512 * 1024, }, { .name = "kernel", .offset = MTDPART_OFS_APPEND, .size = 4 * 1024 * 1024, }, { .name = "data", .offset = MTDPART_OFS_APPEND, .size = MTDPART_SIZ_FULL, }, }; static struct physmap_flash_data nor_flash_data = { .width = 4, .parts = nor_flash_partitions, .nr_parts = ARRAY_SIZE(nor_flash_partitions), }; static struct resource nor_flash_resources[] = { [0] = { .start = 0x00000000, .end = 0x01000000 - 1, .flags = IORESOURCE_MEM, } }; static struct platform_device nor_flash_device = { .name = "physmap-flash", .dev = { .platform_data = &nor_flash_data, }, .num_resources = ARRAY_SIZE(nor_flash_resources), .resource = nor_flash_resources, }; static struct resource smsc911x_resources[] = { [0] = { .name = "smsc911x-memory", .start = 0xA4000000, .end = 0xA4000000 + SZ_256 - 1, .flags = IORESOURCE_MEM, }, [1] = { .name = "smsc911x-irq", .start = evt2irq(0x200), .end = evt2irq(0x200), .flags = IORESOURCE_IRQ, }, }; static struct smsc911x_platform_config smsc911x_config = { .irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_LOW, .irq_type = SMSC911X_IRQ_TYPE_OPEN_DRAIN, .flags = SMSC911X_USE_16BIT, .phy_interface = PHY_INTERFACE_MODE_MII, }; static struct platform_device smsc911x_device = { .name = "smsc911x", .id = -1, .num_resources = ARRAY_SIZE(smsc911x_resources), .resource = smsc911x_resources, .dev = { .platform_data = &smsc911x_config, }, }; static struct platform_device *apsh4a3a_devices[] __initdata = { &nor_flash_device, &smsc911x_device, }; static int __init apsh4a3a_devices_setup(void) { return platform_add_devices(apsh4a3a_devices, ARRAY_SIZE(apsh4a3a_devices)); } device_initcall(apsh4a3a_devices_setup); static int apsh4a3a_clk_init(void) { struct clk *clk; int ret; clk = clk_get(NULL, "extal"); if (!clk || IS_ERR(clk)) return PTR_ERR(clk); ret = clk_set_rate(clk, 33333000); clk_put(clk); return ret; } /* Initialize the board */ static void __init apsh4a3a_setup(char **cmdline_p) { printk(KERN_INFO "Alpha Project AP-SH4A-3A support:\n"); } static void __init apsh4a3a_init_irq(void) { plat_irq_setup_pins(IRQ_MODE_IRQ7654); } /* Return the board specific boot mode pin configuration */ static int apsh4a3a_mode_pins(void) { int value = 0; /* These are the factory default settings of SW1 and SW2. * If you change these dip switches then you will need to * adjust the values below as well. */ value &= ~MODE_PIN0; /* Clock Mode 16 */ value &= ~MODE_PIN1; value &= ~MODE_PIN2; value &= ~MODE_PIN3; value |= MODE_PIN4; value &= ~MODE_PIN5; /* 16-bit Area0 bus width */ value |= MODE_PIN6; /* Area 0 SRAM interface */ value |= MODE_PIN7; value |= MODE_PIN8; /* Little Endian */ value |= MODE_PIN9; /* Master Mode */ value |= MODE_PIN10; /* Crystal resonator */ value |= MODE_PIN11; /* Display Unit */ value |= MODE_PIN12; value &= ~MODE_PIN13; /* 29-bit address mode */ value |= MODE_PIN14; /* No PLL step-up */ return value; } /* * The Machine Vector */ static struct sh_machine_vector mv_apsh4a3a __initmv = { .mv_name = "AP-SH4A-3A", .mv_setup = apsh4a3a_setup, .mv_clk_init = apsh4a3a_clk_init, .mv_init_irq = apsh4a3a_init_irq, .mv_mode_pins = apsh4a3a_mode_pins, };
