forked from skristiansson/linux
-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
…/git/gerg/m68knommu * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: arch/m68knommu/platform/68360/commproc.c: Checkpatch cleanup arch/m68knommu/mm/fault.c: Checkpatch cleanup m68knommu: improve short help of m68knommu/Kconfig/RAMSIZE for '0' case m68knommu: remove un-used mcfsmc.h m68knommu: add smc91x support for ColdFire NETtel boards m68knommu: add smc91x support to ColdFire 5249 platform m68knommu: remove size limit on non-MMU TASK_SIZE m68knommu: fix broken use of BUAD_TABLE_SIZE in 68328serial driver m68knommu: Coldfire QSPI platform support
- Loading branch information
Showing
20 changed files
with
1,226 additions
and
262 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| /* | ||
| * Definitions for Freescale Coldfire QSPI module | ||
| * | ||
| * Copyright 2010 Steven King <sfking@fdwdc.com> | ||
| * | ||
| * 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. | ||
| * | ||
| * 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. | ||
| * | ||
| * You should have received a copy of the GNU General Public License along | ||
| * with this program; if not, write to the Free Software Foundation, Inc., | ||
| * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| * | ||
| */ | ||
|
|
||
| #ifndef mcfqspi_h | ||
| #define mcfqspi_h | ||
|
|
||
| #if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) | ||
| #define MCFQSPI_IOBASE (MCF_IPSBAR + 0x340) | ||
| #elif defined(CONFIG_M5249) | ||
| #define MCFQSPI_IOBASE (MCF_MBAR + 0x300) | ||
| #elif defined(CONFIG_M520x) || defined(CONFIG_M532x) | ||
| #define MCFQSPI_IOBASE 0xFC058000 | ||
| #endif | ||
| #define MCFQSPI_IOSIZE 0x40 | ||
|
|
||
| /** | ||
| * struct mcfqspi_cs_control - chip select control for the coldfire qspi driver | ||
| * @setup: setup the control; allocate gpio's, etc. May be NULL. | ||
| * @teardown: finish with the control; free gpio's, etc. May be NULL. | ||
| * @select: output the signals to select the device. Can not be NULL. | ||
| * @deselect: output the signals to deselect the device. Can not be NULL. | ||
| * | ||
| * The QSPI module has 4 hardware chip selects. We don't use them. Instead | ||
| * platforms are required to supply a mcfqspi_cs_control as a part of the | ||
| * platform data for each QSPI master controller. Only the select and | ||
| * deselect functions are required. | ||
| */ | ||
| struct mcfqspi_cs_control { | ||
| int (*setup)(struct mcfqspi_cs_control *); | ||
| void (*teardown)(struct mcfqspi_cs_control *); | ||
| void (*select)(struct mcfqspi_cs_control *, u8, bool); | ||
| void (*deselect)(struct mcfqspi_cs_control *, u8, bool); | ||
| }; | ||
|
|
||
| /** | ||
| * struct mcfqspi_platform_data - platform data for the coldfire qspi driver | ||
| * @bus_num: board specific identifier for this qspi driver. | ||
| * @num_chipselects: number of chip selects supported by this qspi driver. | ||
| * @cs_control: platform dependent chip select control. | ||
| */ | ||
| struct mcfqspi_platform_data { | ||
| s16 bus_num; | ||
| u16 num_chipselect; | ||
| struct mcfqspi_cs_control *cs_control; | ||
| }; | ||
|
|
||
| #endif /* mcfqspi_h */ |
Oops, something went wrong.