Skip to content
Snippets Groups Projects
Commit 5d037f90 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Updates for 3.6

A bigger set of updates than I'm entirely comfortable with - things
backed up a bit due to travel.  As ever the majority of these are small,
focused updates for specific drivers though there are a couple of core
changes.  There's been good exposure in -next.

The AT91 patch fixes a build break.
parents 64f1e00d 985b11fa
No related branches found
No related tags found
No related merge requests found
Showing
with 163 additions and 119 deletions
...@@ -224,8 +224,8 @@ all your transactions. ...@@ -224,8 +224,8 @@ all your transactions.
</para> </para>
<para> <para>
Then at umount time , in your put_super() (2.4) or write_super() (2.5) Then at umount time , in your put_super() you can then call journal_destroy()
you can then call journal_destroy() to clean up your in-core journal object. to clean up your in-core journal object.
</para> </para>
<para> <para>
......
...@@ -114,7 +114,6 @@ prototypes: ...@@ -114,7 +114,6 @@ prototypes:
int (*drop_inode) (struct inode *); int (*drop_inode) (struct inode *);
void (*evict_inode) (struct inode *); void (*evict_inode) (struct inode *);
void (*put_super) (struct super_block *); void (*put_super) (struct super_block *);
void (*write_super) (struct super_block *);
int (*sync_fs)(struct super_block *sb, int wait); int (*sync_fs)(struct super_block *sb, int wait);
int (*freeze_fs) (struct super_block *); int (*freeze_fs) (struct super_block *);
int (*unfreeze_fs) (struct super_block *); int (*unfreeze_fs) (struct super_block *);
...@@ -136,7 +135,6 @@ write_inode: ...@@ -136,7 +135,6 @@ write_inode:
drop_inode: !!!inode->i_lock!!! drop_inode: !!!inode->i_lock!!!
evict_inode: evict_inode:
put_super: write put_super: write
write_super: read
sync_fs: read sync_fs: read
freeze_fs: write freeze_fs: write
unfreeze_fs: write unfreeze_fs: write
......
...@@ -94,9 +94,8 @@ protected. ...@@ -94,9 +94,8 @@ protected.
--- ---
[mandatory] [mandatory]
BKL is also moved from around sb operations. ->write_super() Is now called BKL is also moved from around sb operations. BKL should have been shifted into
without BKL held. BKL should have been shifted into individual fs sb_op individual fs sb_op functions. If you don't need it, remove it.
functions. If you don't need it, remove it.
--- ---
[informational] [informational]
......
...@@ -216,7 +216,6 @@ struct super_operations { ...@@ -216,7 +216,6 @@ struct super_operations {
void (*drop_inode) (struct inode *); void (*drop_inode) (struct inode *);
void (*delete_inode) (struct inode *); void (*delete_inode) (struct inode *);
void (*put_super) (struct super_block *); void (*put_super) (struct super_block *);
void (*write_super) (struct super_block *);
int (*sync_fs)(struct super_block *sb, int wait); int (*sync_fs)(struct super_block *sb, int wait);
int (*freeze_fs) (struct super_block *); int (*freeze_fs) (struct super_block *);
int (*unfreeze_fs) (struct super_block *); int (*unfreeze_fs) (struct super_block *);
...@@ -273,9 +272,6 @@ or bottom half). ...@@ -273,9 +272,6 @@ or bottom half).
put_super: called when the VFS wishes to free the superblock put_super: called when the VFS wishes to free the superblock
(i.e. unmount). This is called with the superblock lock held (i.e. unmount). This is called with the superblock lock held
write_super: called when the VFS superblock needs to be written to
disc. This method is optional
sync_fs: called when VFS is writing out all dirty data associated with sync_fs: called when VFS is writing out all dirty data associated with
a superblock. The second parameter indicates whether the method a superblock. The second parameter indicates whether the method
should wait until the write out has been completed. Optional. should wait until the write out has been completed. Optional.
......
...@@ -262,9 +262,9 @@ MINIMUM_BATTERY_MINUTES=10 ...@@ -262,9 +262,9 @@ MINIMUM_BATTERY_MINUTES=10
# #
# Allowed dirty background ratio, in percent. Once DIRTY_RATIO has been # Allowed dirty background ratio, in percent. Once DIRTY_RATIO has been
# exceeded, the kernel will wake pdflush which will then reduce the amount # exceeded, the kernel will wake flusher threads which will then reduce the
# of dirty memory to dirty_background_ratio. Set this nice and low, so once # amount of dirty memory to dirty_background_ratio. Set this nice and low,
# some writeout has commenced, we do a lot of it. # so once some writeout has commenced, we do a lot of it.
# #
#DIRTY_BACKGROUND_RATIO=5 #DIRTY_BACKGROUND_RATIO=5
...@@ -384,9 +384,9 @@ CPU_MAXFREQ=${CPU_MAXFREQ:-'slowest'} ...@@ -384,9 +384,9 @@ CPU_MAXFREQ=${CPU_MAXFREQ:-'slowest'}
# #
# Allowed dirty background ratio, in percent. Once DIRTY_RATIO has been # Allowed dirty background ratio, in percent. Once DIRTY_RATIO has been
# exceeded, the kernel will wake pdflush which will then reduce the amount # exceeded, the kernel will wake flusher threads which will then reduce the
# of dirty memory to dirty_background_ratio. Set this nice and low, so once # amount of dirty memory to dirty_background_ratio. Set this nice and low,
# some writeout has commenced, we do a lot of it. # so once some writeout has commenced, we do a lot of it.
# #
DIRTY_BACKGROUND_RATIO=${DIRTY_BACKGROUND_RATIO:-'5'} DIRTY_BACKGROUND_RATIO=${DIRTY_BACKGROUND_RATIO:-'5'}
......
...@@ -46,14 +46,13 @@ restrictions, it can call prctl(PR_SET_PTRACER, PR_SET_PTRACER_ANY, ...) ...@@ -46,14 +46,13 @@ restrictions, it can call prctl(PR_SET_PTRACER, PR_SET_PTRACER_ANY, ...)
so that any otherwise allowed process (even those in external pid namespaces) so that any otherwise allowed process (even those in external pid namespaces)
may attach. may attach.
These restrictions do not change how ptrace via PTRACE_TRACEME operates. The sysctl settings (writable only with CAP_SYS_PTRACE) are:
The sysctl settings are:
0 - classic ptrace permissions: a process can PTRACE_ATTACH to any other 0 - classic ptrace permissions: a process can PTRACE_ATTACH to any other
process running under the same uid, as long as it is dumpable (i.e. process running under the same uid, as long as it is dumpable (i.e.
did not transition uids, start privileged, or have called did not transition uids, start privileged, or have called
prctl(PR_SET_DUMPABLE...) already). prctl(PR_SET_DUMPABLE...) already). Similarly, PTRACE_TRACEME is
unchanged.
1 - restricted ptrace: a process must have a predefined relationship 1 - restricted ptrace: a process must have a predefined relationship
with the inferior it wants to call PTRACE_ATTACH on. By default, with the inferior it wants to call PTRACE_ATTACH on. By default,
...@@ -61,12 +60,13 @@ The sysctl settings are: ...@@ -61,12 +60,13 @@ The sysctl settings are:
classic criteria is also met. To change the relationship, an classic criteria is also met. To change the relationship, an
inferior can call prctl(PR_SET_PTRACER, debugger, ...) to declare inferior can call prctl(PR_SET_PTRACER, debugger, ...) to declare
an allowed debugger PID to call PTRACE_ATTACH on the inferior. an allowed debugger PID to call PTRACE_ATTACH on the inferior.
Using PTRACE_TRACEME is unchanged.
2 - admin-only attach: only processes with CAP_SYS_PTRACE may use ptrace 2 - admin-only attach: only processes with CAP_SYS_PTRACE may use ptrace
with PTRACE_ATTACH. with PTRACE_ATTACH, or through children calling PTRACE_TRACEME.
3 - no attach: no processes may use ptrace with PTRACE_ATTACH. Once set, 3 - no attach: no processes may use ptrace with PTRACE_ATTACH nor via
this sysctl cannot be changed to a lower value. PTRACE_TRACEME. Once set, this sysctl value cannot be changed.
The original children-only logic was based on the restrictions in grsecurity. The original children-only logic was based on the restrictions in grsecurity.
......
...@@ -76,8 +76,8 @@ huge pages although processes will also directly compact memory as required. ...@@ -76,8 +76,8 @@ huge pages although processes will also directly compact memory as required.
dirty_background_bytes dirty_background_bytes
Contains the amount of dirty memory at which the pdflush background writeback Contains the amount of dirty memory at which the background kernel
daemon will start writeback. flusher threads will start writeback.
Note: dirty_background_bytes is the counterpart of dirty_background_ratio. Only Note: dirty_background_bytes is the counterpart of dirty_background_ratio. Only
one of them may be specified at a time. When one sysctl is written it is one of them may be specified at a time. When one sysctl is written it is
...@@ -89,7 +89,7 @@ other appears as 0 when read. ...@@ -89,7 +89,7 @@ other appears as 0 when read.
dirty_background_ratio dirty_background_ratio
Contains, as a percentage of total system memory, the number of pages at which Contains, as a percentage of total system memory, the number of pages at which
the pdflush background writeback daemon will start writing out dirty data. the background kernel flusher threads will start writing out dirty data.
============================================================== ==============================================================
...@@ -112,9 +112,9 @@ retained. ...@@ -112,9 +112,9 @@ retained.
dirty_expire_centisecs dirty_expire_centisecs
This tunable is used to define when dirty data is old enough to be eligible This tunable is used to define when dirty data is old enough to be eligible
for writeout by the pdflush daemons. It is expressed in 100'ths of a second. for writeout by the kernel flusher threads. It is expressed in 100'ths
Data which has been dirty in-memory for longer than this interval will be of a second. Data which has been dirty in-memory for longer than this
written out next time a pdflush daemon wakes up. interval will be written out next time a flusher thread wakes up.
============================================================== ==============================================================
...@@ -128,7 +128,7 @@ data. ...@@ -128,7 +128,7 @@ data.
dirty_writeback_centisecs dirty_writeback_centisecs
The pdflush writeback daemons will periodically wake up and write `old' data The kernel flusher threads will periodically wake up and write `old' data
out to disk. This tunable expresses the interval between those wakeups, in out to disk. This tunable expresses the interval between those wakeups, in
100'ths of a second. 100'ths of a second.
......
...@@ -827,24 +827,24 @@ F: arch/arm/mach-pxa/colibri-pxa270-income.c ...@@ -827,24 +827,24 @@ F: arch/arm/mach-pxa/colibri-pxa270-income.c
ARM/INTEL IOP32X ARM ARCHITECTURE ARM/INTEL IOP32X ARM ARCHITECTURE
M: Lennert Buytenhek <kernel@wantstofly.org> M: Lennert Buytenhek <kernel@wantstofly.org>
M: Dan Williams <dan.j.williams@intel.com> M: Dan Williams <djbw@fb.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained S: Maintained
ARM/INTEL IOP33X ARM ARCHITECTURE ARM/INTEL IOP33X ARM ARCHITECTURE
M: Dan Williams <dan.j.williams@intel.com> M: Dan Williams <djbw@fb.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained S: Maintained
ARM/INTEL IOP13XX ARM ARCHITECTURE ARM/INTEL IOP13XX ARM ARCHITECTURE
M: Lennert Buytenhek <kernel@wantstofly.org> M: Lennert Buytenhek <kernel@wantstofly.org>
M: Dan Williams <dan.j.williams@intel.com> M: Dan Williams <djbw@fb.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained S: Maintained
ARM/INTEL IQ81342EX MACHINE SUPPORT ARM/INTEL IQ81342EX MACHINE SUPPORT
M: Lennert Buytenhek <kernel@wantstofly.org> M: Lennert Buytenhek <kernel@wantstofly.org>
M: Dan Williams <dan.j.williams@intel.com> M: Dan Williams <djbw@fb.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained S: Maintained
...@@ -869,7 +869,7 @@ F: drivers/pcmcia/pxa2xx_stargate2.c ...@@ -869,7 +869,7 @@ F: drivers/pcmcia/pxa2xx_stargate2.c
ARM/INTEL XSC3 (MANZANO) ARM CORE ARM/INTEL XSC3 (MANZANO) ARM CORE
M: Lennert Buytenhek <kernel@wantstofly.org> M: Lennert Buytenhek <kernel@wantstofly.org>
M: Dan Williams <dan.j.williams@intel.com> M: Dan Williams <djbw@fb.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained S: Maintained
...@@ -925,14 +925,14 @@ S: Maintained ...@@ -925,14 +925,14 @@ S: Maintained
ARM/NOMADIK ARCHITECTURE ARM/NOMADIK ARCHITECTURE
M: Alessandro Rubini <rubini@unipv.it> M: Alessandro Rubini <rubini@unipv.it>
M: Linus Walleij <linus.walleij@stericsson.com> M: Linus Walleij <linus.walleij@linaro.org>
M: STEricsson <STEricsson_nomadik_linux@list.st.com> M: STEricsson <STEricsson_nomadik_linux@list.st.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained S: Maintained
F: arch/arm/mach-nomadik/ F: arch/arm/mach-nomadik/
F: arch/arm/plat-nomadik/ F: arch/arm/plat-nomadik/
F: drivers/i2c/busses/i2c-nomadik.c F: drivers/i2c/busses/i2c-nomadik.c
T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git
ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT
M: Nelson Castillo <arhuaco@freaks-unidos.net> M: Nelson Castillo <arhuaco@freaks-unidos.net>
...@@ -1146,7 +1146,7 @@ F: drivers/usb/host/ehci-w90x900.c ...@@ -1146,7 +1146,7 @@ F: drivers/usb/host/ehci-w90x900.c
F: drivers/video/nuc900fb.c F: drivers/video/nuc900fb.c
ARM/U300 MACHINE SUPPORT ARM/U300 MACHINE SUPPORT
M: Linus Walleij <linus.walleij@stericsson.com> M: Linus Walleij <linus.walleij@linaro.org>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Supported S: Supported
F: arch/arm/mach-u300/ F: arch/arm/mach-u300/
...@@ -1161,15 +1161,20 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git ...@@ -1161,15 +1161,20 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
ARM/Ux500 ARM ARCHITECTURE ARM/Ux500 ARM ARCHITECTURE
M: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com> M: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
M: Linus Walleij <linus.walleij@stericsson.com> M: Linus Walleij <linus.walleij@linaro.org>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained S: Maintained
F: arch/arm/mach-ux500/ F: arch/arm/mach-ux500/
F: drivers/clocksource/clksrc-dbx500-prcmu.c
F: drivers/dma/ste_dma40* F: drivers/dma/ste_dma40*
F: drivers/hwspinlock/u8500_hsem.c
F: drivers/mfd/abx500* F: drivers/mfd/abx500*
F: drivers/mfd/ab8500* F: drivers/mfd/ab8500*
F: drivers/mfd/stmpe* F: drivers/mfd/dbx500*
F: drivers/mfd/db8500*
F: drivers/pinctrl/pinctrl-nomadik*
F: drivers/rtc/rtc-ab8500.c F: drivers/rtc/rtc-ab8500.c
F: drivers/rtc/rtc-pl031.c
T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
ARM/VFP SUPPORT ARM/VFP SUPPORT
...@@ -1227,9 +1232,9 @@ S: Maintained ...@@ -1227,9 +1232,9 @@ S: Maintained
F: drivers/hwmon/asb100.c F: drivers/hwmon/asb100.c
ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API
M: Dan Williams <dan.j.williams@intel.com> M: Dan Williams <djbw@fb.com>
W: http://sourceforge.net/projects/xscaleiop W: http://sourceforge.net/projects/xscaleiop
S: Supported S: Maintained
F: Documentation/crypto/async-tx-api.txt F: Documentation/crypto/async-tx-api.txt
F: crypto/async_tx/ F: crypto/async_tx/
F: drivers/dma/ F: drivers/dma/
...@@ -2359,7 +2364,7 @@ T: git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git ...@@ -2359,7 +2364,7 @@ T: git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git
DMA GENERIC OFFLOAD ENGINE SUBSYSTEM DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
M: Vinod Koul <vinod.koul@intel.com> M: Vinod Koul <vinod.koul@intel.com>
M: Dan Williams <dan.j.williams@intel.com> M: Dan Williams <djbw@fb.com>
S: Supported S: Supported
F: drivers/dma/ F: drivers/dma/
F: include/linux/dma* F: include/linux/dma*
...@@ -3094,7 +3099,7 @@ F: include/linux/gigaset_dev.h ...@@ -3094,7 +3099,7 @@ F: include/linux/gigaset_dev.h
GPIO SUBSYSTEM GPIO SUBSYSTEM
M: Grant Likely <grant.likely@secretlab.ca> M: Grant Likely <grant.likely@secretlab.ca>
M: Linus Walleij <linus.walleij@stericsson.com> M: Linus Walleij <linus.walleij@linaro.org>
S: Maintained S: Maintained
T: git git://git.secretlab.ca/git/linux-2.6.git T: git git://git.secretlab.ca/git/linux-2.6.git
F: Documentation/gpio.txt F: Documentation/gpio.txt
...@@ -3547,7 +3552,6 @@ K: \b(ABS|SYN)_MT_ ...@@ -3547,7 +3552,6 @@ K: \b(ABS|SYN)_MT_
INTEL C600 SERIES SAS CONTROLLER DRIVER INTEL C600 SERIES SAS CONTROLLER DRIVER
M: Intel SCU Linux support <intel-linux-scu@intel.com> M: Intel SCU Linux support <intel-linux-scu@intel.com>
M: Dan Williams <dan.j.williams@intel.com>
M: Dave Jiang <dave.jiang@intel.com> M: Dave Jiang <dave.jiang@intel.com>
M: Ed Nadolski <edmund.nadolski@intel.com> M: Ed Nadolski <edmund.nadolski@intel.com>
L: linux-scsi@vger.kernel.org L: linux-scsi@vger.kernel.org
...@@ -3590,8 +3594,8 @@ F: arch/x86/kernel/microcode_core.c ...@@ -3590,8 +3594,8 @@ F: arch/x86/kernel/microcode_core.c
F: arch/x86/kernel/microcode_intel.c F: arch/x86/kernel/microcode_intel.c
INTEL I/OAT DMA DRIVER INTEL I/OAT DMA DRIVER
M: Dan Williams <dan.j.williams@intel.com> M: Dan Williams <djbw@fb.com>
S: Supported S: Maintained
F: drivers/dma/ioat* F: drivers/dma/ioat*
INTEL IOMMU (VT-d) INTEL IOMMU (VT-d)
...@@ -3603,8 +3607,8 @@ F: drivers/iommu/intel-iommu.c ...@@ -3603,8 +3607,8 @@ F: drivers/iommu/intel-iommu.c
F: include/linux/intel-iommu.h F: include/linux/intel-iommu.h
INTEL IOP-ADMA DMA DRIVER INTEL IOP-ADMA DMA DRIVER
M: Dan Williams <dan.j.williams@intel.com> M: Dan Williams <djbw@fb.com>
S: Maintained S: Odd fixes
F: drivers/dma/iop-adma.c F: drivers/dma/iop-adma.c
INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
...@@ -5329,14 +5333,15 @@ PIN CONTROL SUBSYSTEM ...@@ -5329,14 +5333,15 @@ PIN CONTROL SUBSYSTEM
M: Linus Walleij <linus.walleij@linaro.org> M: Linus Walleij <linus.walleij@linaro.org>
S: Maintained S: Maintained
F: drivers/pinctrl/ F: drivers/pinctrl/
F: include/linux/pinctrl/
PIN CONTROLLER - ST SPEAR PIN CONTROLLER - ST SPEAR
M: Viresh Kumar <viresh.linux@gmail.com> M: Viresh Kumar <viresh.linux@gmail.com>
L: spear-devel@list.st.com L: spear-devel@list.st.com
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
W: http://www.st.com/spear W: http://www.st.com/spear
S: Maintained S: Maintained
F: driver/pinctrl/spear/ F: drivers/pinctrl/spear/
PKTCDVD DRIVER PKTCDVD DRIVER
M: Peter Osterlund <petero2@telia.com> M: Peter Osterlund <petero2@telia.com>
......
VERSION = 3 VERSION = 3
PATCHLEVEL = 6 PATCHLEVEL = 6
SUBLEVEL = 0 SUBLEVEL = 0
EXTRAVERSION = -rc1 EXTRAVERSION = -rc2
NAME = Saber-toothed Squirrel NAME = Saber-toothed Squirrel
# *DOCUMENTATION* # *DOCUMENTATION*
......
...@@ -51,11 +51,11 @@ ...@@ -51,11 +51,11 @@
dma-apbh@80004000 { dma-apbh@80004000 {
compatible = "fsl,imx23-dma-apbh"; compatible = "fsl,imx23-dma-apbh";
reg = <0x80004000 2000>; reg = <0x80004000 0x2000>;
}; };
ecc@80008000 { ecc@80008000 {
reg = <0x80008000 2000>; reg = <0x80008000 0x2000>;
status = "disabled"; status = "disabled";
}; };
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
compatible = "fsl,imx23-gpmi-nand"; compatible = "fsl,imx23-gpmi-nand";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
reg = <0x8000c000 2000>, <0x8000a000 2000>; reg = <0x8000c000 0x2000>, <0x8000a000 0x2000>;
reg-names = "gpmi-nand", "bch"; reg-names = "gpmi-nand", "bch";
interrupts = <13>, <56>; interrupts = <13>, <56>;
interrupt-names = "gpmi-dma", "bch"; interrupt-names = "gpmi-dma", "bch";
...@@ -72,14 +72,14 @@ ...@@ -72,14 +72,14 @@
}; };
ssp0: ssp@80010000 { ssp0: ssp@80010000 {
reg = <0x80010000 2000>; reg = <0x80010000 0x2000>;
interrupts = <15 14>; interrupts = <15 14>;
fsl,ssp-dma-channel = <1>; fsl,ssp-dma-channel = <1>;
status = "disabled"; status = "disabled";
}; };
etm@80014000 { etm@80014000 {
reg = <0x80014000 2000>; reg = <0x80014000 0x2000>;
status = "disabled"; status = "disabled";
}; };
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
compatible = "fsl,imx23-pinctrl", "simple-bus"; compatible = "fsl,imx23-pinctrl", "simple-bus";
reg = <0x80018000 2000>; reg = <0x80018000 0x2000>;
gpio0: gpio@0 { gpio0: gpio@0 {
compatible = "fsl,imx23-gpio", "fsl,mxs-gpio"; compatible = "fsl,imx23-gpio", "fsl,mxs-gpio";
...@@ -273,32 +273,32 @@ ...@@ -273,32 +273,32 @@
}; };
emi@80020000 { emi@80020000 {
reg = <0x80020000 2000>; reg = <0x80020000 0x2000>;
status = "disabled"; status = "disabled";
}; };
dma-apbx@80024000 { dma-apbx@80024000 {
compatible = "fsl,imx23-dma-apbx"; compatible = "fsl,imx23-dma-apbx";
reg = <0x80024000 2000>; reg = <0x80024000 0x2000>;
}; };
dcp@80028000 { dcp@80028000 {
reg = <0x80028000 2000>; reg = <0x80028000 0x2000>;
status = "disabled"; status = "disabled";
}; };
pxp@8002a000 { pxp@8002a000 {
reg = <0x8002a000 2000>; reg = <0x8002a000 0x2000>;
status = "disabled"; status = "disabled";
}; };
ocotp@8002c000 { ocotp@8002c000 {
reg = <0x8002c000 2000>; reg = <0x8002c000 0x2000>;
status = "disabled"; status = "disabled";
}; };
axi-ahb@8002e000 { axi-ahb@8002e000 {
reg = <0x8002e000 2000>; reg = <0x8002e000 0x2000>;
status = "disabled"; status = "disabled";
}; };
...@@ -310,14 +310,14 @@ ...@@ -310,14 +310,14 @@
}; };
ssp1: ssp@80034000 { ssp1: ssp@80034000 {
reg = <0x80034000 2000>; reg = <0x80034000 0x2000>;
interrupts = <2 20>; interrupts = <2 20>;
fsl,ssp-dma-channel = <2>; fsl,ssp-dma-channel = <2>;
status = "disabled"; status = "disabled";
}; };
tvenc@80038000 { tvenc@80038000 {
reg = <0x80038000 2000>; reg = <0x80038000 0x2000>;
status = "disabled"; status = "disabled";
}; };
}; };
...@@ -330,37 +330,37 @@ ...@@ -330,37 +330,37 @@
ranges; ranges;
clkctl@80040000 { clkctl@80040000 {
reg = <0x80040000 2000>; reg = <0x80040000 0x2000>;
status = "disabled"; status = "disabled";
}; };
saif0: saif@80042000 { saif0: saif@80042000 {
reg = <0x80042000 2000>; reg = <0x80042000 0x2000>;
status = "disabled"; status = "disabled";
}; };
power@80044000 { power@80044000 {
reg = <0x80044000 2000>; reg = <0x80044000 0x2000>;
status = "disabled"; status = "disabled";
}; };
saif1: saif@80046000 { saif1: saif@80046000 {
reg = <0x80046000 2000>; reg = <0x80046000 0x2000>;
status = "disabled"; status = "disabled";
}; };
audio-out@80048000 { audio-out@80048000 {
reg = <0x80048000 2000>; reg = <0x80048000 0x2000>;
status = "disabled"; status = "disabled";
}; };
audio-in@8004c000 { audio-in@8004c000 {
reg = <0x8004c000 2000>; reg = <0x8004c000 0x2000>;
status = "disabled"; status = "disabled";
}; };
lradc@80050000 { lradc@80050000 {
reg = <0x80050000 2000>; reg = <0x80050000 0x2000>;
status = "disabled"; status = "disabled";
}; };
...@@ -370,26 +370,26 @@ ...@@ -370,26 +370,26 @@
}; };
i2c@80058000 { i2c@80058000 {
reg = <0x80058000 2000>; reg = <0x80058000 0x2000>;
status = "disabled"; status = "disabled";
}; };
rtc@8005c000 { rtc@8005c000 {
compatible = "fsl,imx23-rtc", "fsl,stmp3xxx-rtc"; compatible = "fsl,imx23-rtc", "fsl,stmp3xxx-rtc";
reg = <0x8005c000 2000>; reg = <0x8005c000 0x2000>;
interrupts = <22>; interrupts = <22>;
}; };
pwm: pwm@80064000 { pwm: pwm@80064000 {
compatible = "fsl,imx23-pwm"; compatible = "fsl,imx23-pwm";
reg = <0x80064000 2000>; reg = <0x80064000 0x2000>;
#pwm-cells = <2>; #pwm-cells = <2>;
fsl,pwm-number = <5>; fsl,pwm-number = <5>;
status = "disabled"; status = "disabled";
}; };
timrot@80068000 { timrot@80068000 {
reg = <0x80068000 2000>; reg = <0x80068000 0x2000>;
status = "disabled"; status = "disabled";
}; };
...@@ -429,7 +429,7 @@ ...@@ -429,7 +429,7 @@
ranges; ranges;
usbctrl@80080000 { usbctrl@80080000 {
reg = <0x80080000 0x10000>; reg = <0x80080000 0x40000>;
status = "disabled"; status = "disabled";
}; };
}; };
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
status = "okay"; status = "okay";
}; };
uart@1000a000 { uart1: serial@1000a000 {
fsl,uart-has-rtscts; fsl,uart-has-rtscts;
status = "okay"; status = "okay";
}; };
......
...@@ -19,6 +19,12 @@ ...@@ -19,6 +19,12 @@
serial3 = &uart4; serial3 = &uart4;
serial4 = &uart5; serial4 = &uart5;
serial5 = &uart6; serial5 = &uart6;
gpio0 = &gpio1;
gpio1 = &gpio2;
gpio2 = &gpio3;
gpio3 = &gpio4;
gpio4 = &gpio5;
gpio5 = &gpio6;
}; };
avic: avic-interrupt-controller@e0000000 { avic: avic-interrupt-controller@e0000000 {
......
...@@ -57,18 +57,18 @@ ...@@ -57,18 +57,18 @@
}; };
hsadc@80002000 { hsadc@80002000 {
reg = <0x80002000 2000>; reg = <0x80002000 0x2000>;
interrupts = <13 87>; interrupts = <13 87>;
status = "disabled"; status = "disabled";
}; };
dma-apbh@80004000 { dma-apbh@80004000 {
compatible = "fsl,imx28-dma-apbh"; compatible = "fsl,imx28-dma-apbh";
reg = <0x80004000 2000>; reg = <0x80004000 0x2000>;
}; };
perfmon@80006000 { perfmon@80006000 {
reg = <0x80006000 800>; reg = <0x80006000 0x800>;
interrupts = <27>; interrupts = <27>;
status = "disabled"; status = "disabled";
}; };
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
compatible = "fsl,imx28-gpmi-nand"; compatible = "fsl,imx28-gpmi-nand";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
reg = <0x8000c000 2000>, <0x8000a000 2000>; reg = <0x8000c000 0x2000>, <0x8000a000 0x2000>;
reg-names = "gpmi-nand", "bch"; reg-names = "gpmi-nand", "bch";
interrupts = <88>, <41>; interrupts = <88>, <41>;
interrupt-names = "gpmi-dma", "bch"; interrupt-names = "gpmi-dma", "bch";
...@@ -86,28 +86,28 @@ ...@@ -86,28 +86,28 @@
}; };
ssp0: ssp@80010000 { ssp0: ssp@80010000 {
reg = <0x80010000 2000>; reg = <0x80010000 0x2000>;
interrupts = <96 82>; interrupts = <96 82>;
fsl,ssp-dma-channel = <0>; fsl,ssp-dma-channel = <0>;
status = "disabled"; status = "disabled";
}; };
ssp1: ssp@80012000 { ssp1: ssp@80012000 {
reg = <0x80012000 2000>; reg = <0x80012000 0x2000>;
interrupts = <97 83>; interrupts = <97 83>;
fsl,ssp-dma-channel = <1>; fsl,ssp-dma-channel = <1>;
status = "disabled"; status = "disabled";
}; };
ssp2: ssp@80014000 { ssp2: ssp@80014000 {
reg = <0x80014000 2000>; reg = <0x80014000 0x2000>;
interrupts = <98 84>; interrupts = <98 84>;
fsl,ssp-dma-channel = <2>; fsl,ssp-dma-channel = <2>;
status = "disabled"; status = "disabled";
}; };
ssp3: ssp@80016000 { ssp3: ssp@80016000 {
reg = <0x80016000 2000>; reg = <0x80016000 0x2000>;
interrupts = <99 85>; interrupts = <99 85>;
fsl,ssp-dma-channel = <3>; fsl,ssp-dma-channel = <3>;
status = "disabled"; status = "disabled";
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
compatible = "fsl,imx28-pinctrl", "simple-bus"; compatible = "fsl,imx28-pinctrl", "simple-bus";
reg = <0x80018000 2000>; reg = <0x80018000 0x2000>;
gpio0: gpio@0 { gpio0: gpio@0 {
compatible = "fsl,imx28-gpio", "fsl,mxs-gpio"; compatible = "fsl,imx28-gpio", "fsl,mxs-gpio";
...@@ -510,96 +510,96 @@ ...@@ -510,96 +510,96 @@
}; };
digctl@8001c000 { digctl@8001c000 {
reg = <0x8001c000 2000>; reg = <0x8001c000 0x2000>;
interrupts = <89>; interrupts = <89>;
status = "disabled"; status = "disabled";
}; };
etm@80022000 { etm@80022000 {
reg = <0x80022000 2000>; reg = <0x80022000 0x2000>;
status = "disabled"; status = "disabled";
}; };
dma-apbx@80024000 { dma-apbx@80024000 {
compatible = "fsl,imx28-dma-apbx"; compatible = "fsl,imx28-dma-apbx";
reg = <0x80024000 2000>; reg = <0x80024000 0x2000>;
}; };
dcp@80028000 { dcp@80028000 {
reg = <0x80028000 2000>; reg = <0x80028000 0x2000>;
interrupts = <52 53 54>; interrupts = <52 53 54>;
status = "disabled"; status = "disabled";
}; };
pxp@8002a000 { pxp@8002a000 {
reg = <0x8002a000 2000>; reg = <0x8002a000 0x2000>;
interrupts = <39>; interrupts = <39>;
status = "disabled"; status = "disabled";
}; };
ocotp@8002c000 { ocotp@8002c000 {
reg = <0x8002c000 2000>; reg = <0x8002c000 0x2000>;
status = "disabled"; status = "disabled";
}; };
axi-ahb@8002e000 { axi-ahb@8002e000 {
reg = <0x8002e000 2000>; reg = <0x8002e000 0x2000>;
status = "disabled"; status = "disabled";
}; };
lcdif@80030000 { lcdif@80030000 {
compatible = "fsl,imx28-lcdif"; compatible = "fsl,imx28-lcdif";
reg = <0x80030000 2000>; reg = <0x80030000 0x2000>;
interrupts = <38 86>; interrupts = <38 86>;
status = "disabled"; status = "disabled";
}; };
can0: can@80032000 { can0: can@80032000 {
compatible = "fsl,imx28-flexcan", "fsl,p1010-flexcan"; compatible = "fsl,imx28-flexcan", "fsl,p1010-flexcan";
reg = <0x80032000 2000>; reg = <0x80032000 0x2000>;
interrupts = <8>; interrupts = <8>;
status = "disabled"; status = "disabled";
}; };
can1: can@80034000 { can1: can@80034000 {
compatible = "fsl,imx28-flexcan", "fsl,p1010-flexcan"; compatible = "fsl,imx28-flexcan", "fsl,p1010-flexcan";
reg = <0x80034000 2000>; reg = <0x80034000 0x2000>;
interrupts = <9>; interrupts = <9>;
status = "disabled"; status = "disabled";
}; };
simdbg@8003c000 { simdbg@8003c000 {
reg = <0x8003c000 200>; reg = <0x8003c000 0x200>;
status = "disabled"; status = "disabled";
}; };
simgpmisel@8003c200 { simgpmisel@8003c200 {
reg = <0x8003c200 100>; reg = <0x8003c200 0x100>;
status = "disabled"; status = "disabled";
}; };
simsspsel@8003c300 { simsspsel@8003c300 {
reg = <0x8003c300 100>; reg = <0x8003c300 0x100>;
status = "disabled"; status = "disabled";
}; };
simmemsel@8003c400 { simmemsel@8003c400 {
reg = <0x8003c400 100>; reg = <0x8003c400 0x100>;
status = "disabled"; status = "disabled";
}; };
gpiomon@8003c500 { gpiomon@8003c500 {
reg = <0x8003c500 100>; reg = <0x8003c500 0x100>;
status = "disabled"; status = "disabled";
}; };
simenet@8003c700 { simenet@8003c700 {
reg = <0x8003c700 100>; reg = <0x8003c700 0x100>;
status = "disabled"; status = "disabled";
}; };
armjtag@8003c800 { armjtag@8003c800 {
reg = <0x8003c800 100>; reg = <0x8003c800 0x100>;
status = "disabled"; status = "disabled";
}; };
}; };
...@@ -612,45 +612,45 @@ ...@@ -612,45 +612,45 @@
ranges; ranges;
clkctl@80040000 { clkctl@80040000 {
reg = <0x80040000 2000>; reg = <0x80040000 0x2000>;
status = "disabled"; status = "disabled";
}; };
saif0: saif@80042000 { saif0: saif@80042000 {
compatible = "fsl,imx28-saif"; compatible = "fsl,imx28-saif";
reg = <0x80042000 2000>; reg = <0x80042000 0x2000>;
interrupts = <59 80>; interrupts = <59 80>;
fsl,saif-dma-channel = <4>; fsl,saif-dma-channel = <4>;
status = "disabled"; status = "disabled";
}; };
power@80044000 { power@80044000 {
reg = <0x80044000 2000>; reg = <0x80044000 0x2000>;
status = "disabled"; status = "disabled";
}; };
saif1: saif@80046000 { saif1: saif@80046000 {
compatible = "fsl,imx28-saif"; compatible = "fsl,imx28-saif";
reg = <0x80046000 2000>; reg = <0x80046000 0x2000>;
interrupts = <58 81>; interrupts = <58 81>;
fsl,saif-dma-channel = <5>; fsl,saif-dma-channel = <5>;
status = "disabled"; status = "disabled";
}; };
lradc@80050000 { lradc@80050000 {
reg = <0x80050000 2000>; reg = <0x80050000 0x2000>;
status = "disabled"; status = "disabled";
}; };
spdif@80054000 { spdif@80054000 {
reg = <0x80054000 2000>; reg = <0x80054000 0x2000>;
interrupts = <45 66>; interrupts = <45 66>;
status = "disabled"; status = "disabled";
}; };
rtc@80056000 { rtc@80056000 {
compatible = "fsl,imx28-rtc", "fsl,stmp3xxx-rtc"; compatible = "fsl,imx28-rtc", "fsl,stmp3xxx-rtc";
reg = <0x80056000 2000>; reg = <0x80056000 0x2000>;
interrupts = <29>; interrupts = <29>;
}; };
...@@ -658,7 +658,7 @@ ...@@ -658,7 +658,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
compatible = "fsl,imx28-i2c"; compatible = "fsl,imx28-i2c";
reg = <0x80058000 2000>; reg = <0x80058000 0x2000>;
interrupts = <111 68>; interrupts = <111 68>;
clock-frequency = <100000>; clock-frequency = <100000>;
status = "disabled"; status = "disabled";
...@@ -668,7 +668,7 @@ ...@@ -668,7 +668,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
compatible = "fsl,imx28-i2c"; compatible = "fsl,imx28-i2c";
reg = <0x8005a000 2000>; reg = <0x8005a000 0x2000>;
interrupts = <110 69>; interrupts = <110 69>;
clock-frequency = <100000>; clock-frequency = <100000>;
status = "disabled"; status = "disabled";
...@@ -676,14 +676,14 @@ ...@@ -676,14 +676,14 @@
pwm: pwm@80064000 { pwm: pwm@80064000 {
compatible = "fsl,imx28-pwm", "fsl,imx23-pwm"; compatible = "fsl,imx28-pwm", "fsl,imx23-pwm";
reg = <0x80064000 2000>; reg = <0x80064000 0x2000>;
#pwm-cells = <2>; #pwm-cells = <2>;
fsl,pwm-number = <8>; fsl,pwm-number = <8>;
status = "disabled"; status = "disabled";
}; };
timrot@80068000 { timrot@80068000 {
reg = <0x80068000 2000>; reg = <0x80068000 0x2000>;
status = "disabled"; status = "disabled";
}; };
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
spi-max-frequency = <6000000>; spi-max-frequency = <6000000>;
reg = <0>; reg = <0>;
interrupt-parent = <&gpio1>; interrupt-parent = <&gpio1>;
interrupts = <8>; interrupts = <8 0x4>;
regulators { regulators {
sw1_reg: sw1 { sw1_reg: sw1 {
......
...@@ -17,6 +17,10 @@ ...@@ -17,6 +17,10 @@
serial0 = &uart1; serial0 = &uart1;
serial1 = &uart2; serial1 = &uart2;
serial2 = &uart3; serial2 = &uart3;
gpio0 = &gpio1;
gpio1 = &gpio2;
gpio2 = &gpio3;
gpio3 = &gpio4;
}; };
tzic: tz-interrupt-controller@e0000000 { tzic: tz-interrupt-controller@e0000000 {
......
...@@ -64,12 +64,32 @@ ...@@ -64,12 +64,32 @@
reg = <0xf4000000 0x2000000>; reg = <0xf4000000 0x2000000>;
phy-mode = "mii"; phy-mode = "mii";
interrupt-parent = <&gpio2>; interrupt-parent = <&gpio2>;
interrupts = <31>; interrupts = <31 0x8>;
reg-io-width = <4>; reg-io-width = <4>;
/*
* VDD33A and VDDVARIO of LAN9220 are supplied by
* SW4_3V3 of LTC3589. Before the regulator driver
* for this PMIC is available, we use a fixed dummy
* 3V3 regulator to get LAN9220 driver probing work.
*/
vdd33a-supply = <&reg_3p3v>;
vddvario-supply = <&reg_3p3v>;
smsc,irq-push-pull; smsc,irq-push-pull;
}; };
}; };
regulators {
compatible = "simple-bus";
reg_3p3v: 3p3v {
compatible = "regulator-fixed";
regulator-name = "3P3V";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
};
gpio-keys { gpio-keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
......
...@@ -19,6 +19,13 @@ ...@@ -19,6 +19,13 @@
serial2 = &uart3; serial2 = &uart3;
serial3 = &uart4; serial3 = &uart4;
serial4 = &uart5; serial4 = &uart5;
gpio0 = &gpio1;
gpio1 = &gpio2;
gpio2 = &gpio3;
gpio3 = &gpio4;
gpio4 = &gpio5;
gpio5 = &gpio6;
gpio6 = &gpio7;
}; };
tzic: tz-interrupt-controller@0fffc000 { tzic: tz-interrupt-controller@0fffc000 {
......
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
fsl,pins = < fsl,pins = <
144 0x80000000 /* MX6Q_PAD_EIM_D22__GPIO_3_22 */ 144 0x80000000 /* MX6Q_PAD_EIM_D22__GPIO_3_22 */
121 0x80000000 /* MX6Q_PAD_EIM_D19__GPIO_3_19 */ 121 0x80000000 /* MX6Q_PAD_EIM_D19__GPIO_3_19 */
953 0x80000000 /* MX6Q_PAD_GPIO_0__CCM_CLKO */
>; >;
}; };
}; };
......
...@@ -19,6 +19,13 @@ ...@@ -19,6 +19,13 @@
serial2 = &uart3; serial2 = &uart3;
serial3 = &uart4; serial3 = &uart4;
serial4 = &uart5; serial4 = &uart5;
gpio0 = &gpio1;
gpio1 = &gpio2;
gpio2 = &gpio3;
gpio3 = &gpio4;
gpio4 = &gpio5;
gpio5 = &gpio6;
gpio6 = &gpio7;
}; };
cpus { cpus {
......
...@@ -192,6 +192,7 @@ CONFIG_RTC_DRV_MC13XXX=y ...@@ -192,6 +192,7 @@ CONFIG_RTC_DRV_MC13XXX=y
CONFIG_RTC_DRV_MXC=y CONFIG_RTC_DRV_MXC=y
CONFIG_DMADEVICES=y CONFIG_DMADEVICES=y
CONFIG_IMX_SDMA=y CONFIG_IMX_SDMA=y
CONFIG_MXS_DMA=y
CONFIG_COMMON_CLK_DEBUG=y CONFIG_COMMON_CLK_DEBUG=y
# CONFIG_IOMMU_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set
CONFIG_EXT2_FS=y CONFIG_EXT2_FS=y
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment