ASoC: Fixes for v3.12
A number of small, fairly unexciting, fixes for drivers - nothing stand out. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.15 (GNU/Linux) iQIcBAABAgAGBQJSYWzPAAoJELSic+t+oim92SQP/j3VAY0EMslcV2xMPk8ly9qK 7YqSNfwdF3YQVoM5kEdlIB3f84j82qRQ3A6/ZQui9OsZ0j5x1OZ5XCQ2csE+IzuB e3wkDWdPfw59lCi+zS5YthpgnpuorBPpW14QcjPFp+Iqv13ajOEe0cRPnxAAL7aD j4Uszxx1aPj5HLsjJQmwzq7ooy6BXw5pg4DrzoZ0dEp+YYmLug5j6ml7e2HicUrH IlSz0cgcMGaD8vfN+DiUjeUU3Hf5t2v5YREqy643oFkjFREiPCd4XKBm0nD3zQZ3 rtQXVUNTVkm1AuTtCboUaGvDzQBtI8EX9DSNLi3CsLg1CNgUVUXII4IizZF5pxYA vYaSN7GdARD4SkRtUWKZhGmohnj1ATPG9XXlfunHKJkKJN5C99b12oACT4ewxOTc yBYxgkApfjj0VpPTjsTocfMDUt17bZMF6jzWa6GIk5ABw6yFCtPn3jspa5XJO/eo HZ4FtlA9uY+X3oVEzFBh+btxaIyBMJ1zCZVNu0GqvZEVGhuIuV0TiiE94e6v+XOz Cijx8Wt4m6Ohw2NCkBI7IEusv6bHnwaDRScBiUgIFo7Cmn0htd8por+br3gn7dF7 6Rcge3n6LUrzrWa7eesFoQ4rGlq8rzv8Nml0C2fW04Nom8J4u8z4nnxVEkVUI0g2 U1vsg7JszqtIoh1mvi8+ =aZuy -----END PGP SIGNATURE----- Merge tag 'asoc-v3.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus ASoC: Fixes for v3.12 A number of small, fairly unexciting, fixes for drivers - nothing stand out.
This commit is contained in:
commit
20c87bd40e
3
CREDITS
3
CREDITS
|
@ -2808,8 +2808,7 @@ S: Ottawa, Ontario
|
||||||
S: Canada K2P 0X8
|
S: Canada K2P 0X8
|
||||||
|
|
||||||
N: Mikael Pettersson
|
N: Mikael Pettersson
|
||||||
E: mikpe@it.uu.se
|
E: mikpelinux@gmail.com
|
||||||
W: http://user.it.uu.se/~mikpe/linux/
|
|
||||||
D: Miscellaneous fixes
|
D: Miscellaneous fixes
|
||||||
|
|
||||||
N: Reed H. Petty
|
N: Reed H. Petty
|
||||||
|
|
|
@ -6,6 +6,8 @@ capability.txt
|
||||||
- Generic Block Device Capability (/sys/block/<device>/capability)
|
- Generic Block Device Capability (/sys/block/<device>/capability)
|
||||||
cfq-iosched.txt
|
cfq-iosched.txt
|
||||||
- CFQ IO scheduler tunables
|
- CFQ IO scheduler tunables
|
||||||
|
cmdline-partition.txt
|
||||||
|
- how to specify block device partitions on kernel command line
|
||||||
data-integrity.txt
|
data-integrity.txt
|
||||||
- Block data integrity
|
- Block data integrity
|
||||||
deadline-iosched.txt
|
deadline-iosched.txt
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
Embedded device command line partition
|
Embedded device command line partition parsing
|
||||||
=====================================================================
|
=====================================================================
|
||||||
|
|
||||||
Read block device partition table from command line.
|
Support for reading the block device partition table from the command line.
|
||||||
The partition used for fixed block device (eMMC) embedded device.
|
It is typically used for fixed block (eMMC) embedded devices.
|
||||||
It is no MBR, save storage space. Bootloader can be easily accessed
|
It has no MBR, so saves storage space. Bootloader can be easily accessed
|
||||||
by absolute address of data on the block device.
|
by absolute address of data on the block device.
|
||||||
Users can easily change the partition.
|
Users can easily change the partition.
|
||||||
|
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
* Samsung Exynos specific extensions to the Synopsis Designware Mobile
|
* Samsung Exynos specific extensions to the Synopsys Designware Mobile
|
||||||
Storage Host Controller
|
Storage Host Controller
|
||||||
|
|
||||||
The Synopsis designware mobile storage host controller is used to interface
|
The Synopsys designware mobile storage host controller is used to interface
|
||||||
a SoC with storage medium such as eMMC or SD/MMC cards. This file documents
|
a SoC with storage medium such as eMMC or SD/MMC cards. This file documents
|
||||||
differences between the core Synopsis dw mshc controller properties described
|
differences between the core Synopsys dw mshc controller properties described
|
||||||
by synopsis-dw-mshc.txt and the properties used by the Samsung Exynos specific
|
by synopsys-dw-mshc.txt and the properties used by the Samsung Exynos specific
|
||||||
extensions to the Synopsis Designware Mobile Storage Host Controller.
|
extensions to the Synopsys Designware Mobile Storage Host Controller.
|
||||||
|
|
||||||
Required Properties:
|
Required Properties:
|
||||||
|
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
* Rockchip specific extensions to the Synopsis Designware Mobile
|
* Rockchip specific extensions to the Synopsys Designware Mobile
|
||||||
Storage Host Controller
|
Storage Host Controller
|
||||||
|
|
||||||
The Synopsis designware mobile storage host controller is used to interface
|
The Synopsys designware mobile storage host controller is used to interface
|
||||||
a SoC with storage medium such as eMMC or SD/MMC cards. This file documents
|
a SoC with storage medium such as eMMC or SD/MMC cards. This file documents
|
||||||
differences between the core Synopsis dw mshc controller properties described
|
differences between the core Synopsys dw mshc controller properties described
|
||||||
by synopsis-dw-mshc.txt and the properties used by the Rockchip specific
|
by synopsys-dw-mshc.txt and the properties used by the Rockchip specific
|
||||||
extensions to the Synopsis Designware Mobile Storage Host Controller.
|
extensions to the Synopsys Designware Mobile Storage Host Controller.
|
||||||
|
|
||||||
Required Properties:
|
Required Properties:
|
||||||
|
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
* Synopsis Designware Mobile Storage Host Controller
|
* Synopsys Designware Mobile Storage Host Controller
|
||||||
|
|
||||||
The Synopsis designware mobile storage host controller is used to interface
|
The Synopsys designware mobile storage host controller is used to interface
|
||||||
a SoC with storage medium such as eMMC or SD/MMC cards. This file documents
|
a SoC with storage medium such as eMMC or SD/MMC cards. This file documents
|
||||||
differences between the core mmc properties described by mmc.txt and the
|
differences between the core mmc properties described by mmc.txt and the
|
||||||
properties used by the Synopsis Designware Mobile Storage Host Controller.
|
properties used by the Synopsys Designware Mobile Storage Host Controller.
|
||||||
|
|
||||||
Required Properties:
|
Required Properties:
|
||||||
|
|
||||||
* compatible: should be
|
* compatible: should be
|
||||||
- snps,dw-mshc: for controllers compliant with synopsis dw-mshc.
|
- snps,dw-mshc: for controllers compliant with synopsys dw-mshc.
|
||||||
* #address-cells: should be 1.
|
* #address-cells: should be 1.
|
||||||
* #size-cells: should be 0.
|
* #size-cells: should be 0.
|
||||||
|
|
|
@ -9,12 +9,15 @@ compulsory and any optional properties, common to all SD/MMC drivers, as
|
||||||
described in mmc.txt, can be used. Additionally the following tmio_mmc-specific
|
described in mmc.txt, can be used. Additionally the following tmio_mmc-specific
|
||||||
optional bindings can be used.
|
optional bindings can be used.
|
||||||
|
|
||||||
|
Required properties:
|
||||||
|
- compatible: "renesas,sdhi-shmobile" - a generic sh-mobile SDHI unit
|
||||||
|
"renesas,sdhi-sh7372" - SDHI IP on SH7372 SoC
|
||||||
|
"renesas,sdhi-sh73a0" - SDHI IP on SH73A0 SoC
|
||||||
|
"renesas,sdhi-r8a73a4" - SDHI IP on R8A73A4 SoC
|
||||||
|
"renesas,sdhi-r8a7740" - SDHI IP on R8A7740 SoC
|
||||||
|
"renesas,sdhi-r8a7778" - SDHI IP on R8A7778 SoC
|
||||||
|
"renesas,sdhi-r8a7779" - SDHI IP on R8A7779 SoC
|
||||||
|
"renesas,sdhi-r8a7790" - SDHI IP on R8A7790 SoC
|
||||||
|
|
||||||
Optional properties:
|
Optional properties:
|
||||||
- toshiba,mmc-wrprotect-disable: write-protect detection is unavailable
|
- toshiba,mmc-wrprotect-disable: write-protect detection is unavailable
|
||||||
|
|
||||||
When used with Renesas SDHI hardware, the following compatibility strings
|
|
||||||
configure various model-specific properties:
|
|
||||||
|
|
||||||
"renesas,sh7372-sdhi": (default) compatible with SH7372
|
|
||||||
"renesas,r8a7740-sdhi": compatible with R8A7740: certain MMC/SD commands have to
|
|
||||||
wait for the interface to become idle.
|
|
||||||
|
|
|
@ -86,6 +86,7 @@ General Properties:
|
||||||
|
|
||||||
Clock Properties:
|
Clock Properties:
|
||||||
|
|
||||||
|
- fsl,cksel Timer reference clock source.
|
||||||
- fsl,tclk-period Timer reference clock period in nanoseconds.
|
- fsl,tclk-period Timer reference clock period in nanoseconds.
|
||||||
- fsl,tmr-prsc Prescaler, divides the output clock.
|
- fsl,tmr-prsc Prescaler, divides the output clock.
|
||||||
- fsl,tmr-add Frequency compensation value.
|
- fsl,tmr-add Frequency compensation value.
|
||||||
|
@ -97,7 +98,7 @@ Clock Properties:
|
||||||
clock. You must choose these carefully for the clock to work right.
|
clock. You must choose these carefully for the clock to work right.
|
||||||
Here is how to figure good values:
|
Here is how to figure good values:
|
||||||
|
|
||||||
TimerOsc = system clock MHz
|
TimerOsc = selected reference clock MHz
|
||||||
tclk_period = desired clock period nanoseconds
|
tclk_period = desired clock period nanoseconds
|
||||||
NominalFreq = 1000 / tclk_period MHz
|
NominalFreq = 1000 / tclk_period MHz
|
||||||
FreqDivRatio = TimerOsc / NominalFreq (must be greater that 1.0)
|
FreqDivRatio = TimerOsc / NominalFreq (must be greater that 1.0)
|
||||||
|
@ -114,6 +115,20 @@ Clock Properties:
|
||||||
Pulse Per Second (PPS) signal, since this will be offered to the PPS
|
Pulse Per Second (PPS) signal, since this will be offered to the PPS
|
||||||
subsystem to synchronize the Linux clock.
|
subsystem to synchronize the Linux clock.
|
||||||
|
|
||||||
|
Reference clock source is determined by the value, which is holded
|
||||||
|
in CKSEL bits in TMR_CTRL register. "fsl,cksel" property keeps the
|
||||||
|
value, which will be directly written in those bits, that is why,
|
||||||
|
according to reference manual, the next clock sources can be used:
|
||||||
|
|
||||||
|
<0> - external high precision timer reference clock (TSEC_TMR_CLK
|
||||||
|
input is used for this purpose);
|
||||||
|
<1> - eTSEC system clock;
|
||||||
|
<2> - eTSEC1 transmit clock;
|
||||||
|
<3> - RTC clock input.
|
||||||
|
|
||||||
|
When this attribute is not used, eTSEC system clock will serve as
|
||||||
|
IEEE 1588 timer reference clock.
|
||||||
|
|
||||||
Example:
|
Example:
|
||||||
|
|
||||||
ptp_clock@24E00 {
|
ptp_clock@24E00 {
|
||||||
|
@ -121,6 +136,7 @@ Example:
|
||||||
reg = <0x24E00 0xB0>;
|
reg = <0x24E00 0xB0>;
|
||||||
interrupts = <12 0x8 13 0x8>;
|
interrupts = <12 0x8 13 0x8>;
|
||||||
interrupt-parent = < &ipic >;
|
interrupt-parent = < &ipic >;
|
||||||
|
fsl,cksel = <1>;
|
||||||
fsl,tclk-period = <10>;
|
fsl,tclk-period = <10>;
|
||||||
fsl,tmr-prsc = <100>;
|
fsl,tmr-prsc = <100>;
|
||||||
fsl,tmr-add = <0x999999A4>;
|
fsl,tmr-add = <0x999999A4>;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
* Synopsis Designware PCIe interface
|
* Synopsys Designware PCIe interface
|
||||||
|
|
||||||
Required properties:
|
Required properties:
|
||||||
- compatible: should contain "snps,dw-pcie" to identify the
|
- compatible: should contain "snps,dw-pcie" to identify the
|
||||||
|
|
|
@ -480,6 +480,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
|
||||||
Format: <io>,<irq>,<mode>
|
Format: <io>,<irq>,<mode>
|
||||||
See header of drivers/net/hamradio/baycom_ser_hdx.c.
|
See header of drivers/net/hamradio/baycom_ser_hdx.c.
|
||||||
|
|
||||||
|
blkdevparts= Manual partition parsing of block device(s) for
|
||||||
|
embedded devices based on command line input.
|
||||||
|
See Documentation/block/cmdline-partition.txt
|
||||||
|
|
||||||
boot_delay= Milliseconds to delay each printk during boot.
|
boot_delay= Milliseconds to delay each printk during boot.
|
||||||
Values larger than 10 seconds (10000) are changed to
|
Values larger than 10 seconds (10000) are changed to
|
||||||
no delay (0).
|
no delay (0).
|
||||||
|
@ -1357,7 +1361,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
|
||||||
pages. In the event, a node is too small to have both
|
pages. In the event, a node is too small to have both
|
||||||
kernelcore and Movable pages, kernelcore pages will
|
kernelcore and Movable pages, kernelcore pages will
|
||||||
take priority and other nodes will have a larger number
|
take priority and other nodes will have a larger number
|
||||||
of kernelcore pages. The Movable zone is used for the
|
of Movable pages. The Movable zone is used for the
|
||||||
allocation of pages that may be reclaimed or moved
|
allocation of pages that may be reclaimed or moved
|
||||||
by the page migration subsystem. This means that
|
by the page migration subsystem. This means that
|
||||||
HugeTLB pages may not be allocated from this zone.
|
HugeTLB pages may not be allocated from this zone.
|
||||||
|
@ -3485,6 +3489,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
|
||||||
the unplug protocol
|
the unplug protocol
|
||||||
never -- do not unplug even if version check succeeds
|
never -- do not unplug even if version check succeeds
|
||||||
|
|
||||||
|
xen_nopvspin [X86,XEN]
|
||||||
|
Disables the ticketlock slowpath using Xen PV
|
||||||
|
optimizations.
|
||||||
|
|
||||||
xirc2ps_cs= [NET,PCMCIA]
|
xirc2ps_cs= [NET,PCMCIA]
|
||||||
Format:
|
Format:
|
||||||
<irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]]
|
<irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]]
|
||||||
|
|
40
MAINTAINERS
40
MAINTAINERS
|
@ -824,15 +824,21 @@ S: Maintained
|
||||||
F: arch/arm/mach-gemini/
|
F: arch/arm/mach-gemini/
|
||||||
|
|
||||||
ARM/CSR SIRFPRIMA2 MACHINE SUPPORT
|
ARM/CSR SIRFPRIMA2 MACHINE SUPPORT
|
||||||
M: Barry Song <baohua.song@csr.com>
|
M: Barry Song <baohua@kernel.org>
|
||||||
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
||||||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux.git
|
T: git git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux.git
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: arch/arm/mach-prima2/
|
F: arch/arm/mach-prima2/
|
||||||
|
F: drivers/clk/clk-prima2.c
|
||||||
|
F: drivers/clocksource/timer-prima2.c
|
||||||
|
F: drivers/clocksource/timer-marco.c
|
||||||
F: drivers/dma/sirf-dma.c
|
F: drivers/dma/sirf-dma.c
|
||||||
F: drivers/i2c/busses/i2c-sirf.c
|
F: drivers/i2c/busses/i2c-sirf.c
|
||||||
|
F: drivers/input/misc/sirfsoc-onkey.c
|
||||||
|
F: drivers/irqchip/irq-sirfsoc.c
|
||||||
F: drivers/mmc/host/sdhci-sirf.c
|
F: drivers/mmc/host/sdhci-sirf.c
|
||||||
F: drivers/pinctrl/sirf/
|
F: drivers/pinctrl/sirf/
|
||||||
|
F: drivers/rtc/rtc-sirfsoc.c
|
||||||
F: drivers/spi/spi-sirf.c
|
F: drivers/spi/spi-sirf.c
|
||||||
|
|
||||||
ARM/EBSA110 MACHINE SUPPORT
|
ARM/EBSA110 MACHINE SUPPORT
|
||||||
|
@ -1812,7 +1818,8 @@ S: Supported
|
||||||
F: drivers/net/ethernet/broadcom/bnx2x/
|
F: drivers/net/ethernet/broadcom/bnx2x/
|
||||||
|
|
||||||
BROADCOM BCM281XX/BCM11XXX ARM ARCHITECTURE
|
BROADCOM BCM281XX/BCM11XXX ARM ARCHITECTURE
|
||||||
M: Christian Daudt <csd@broadcom.com>
|
M: Christian Daudt <bcm@fixthebug.org>
|
||||||
|
L: bcm-kernel-feedback-list@broadcom.com
|
||||||
T: git git://git.github.com/broadcom/bcm11351
|
T: git git://git.github.com/broadcom/bcm11351
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: arch/arm/mach-bcm/
|
F: arch/arm/mach-bcm/
|
||||||
|
@ -2639,6 +2646,18 @@ F: include/linux/device-mapper.h
|
||||||
F: include/linux/dm-*.h
|
F: include/linux/dm-*.h
|
||||||
F: include/uapi/linux/dm-*.h
|
F: include/uapi/linux/dm-*.h
|
||||||
|
|
||||||
|
DIGI NEO AND CLASSIC PCI PRODUCTS
|
||||||
|
M: Lidza Louina <lidza.louina@gmail.com>
|
||||||
|
L: driverdev-devel@linuxdriverproject.org
|
||||||
|
S: Maintained
|
||||||
|
F: drivers/staging/dgnc/
|
||||||
|
|
||||||
|
DIGI EPCA PCI PRODUCTS
|
||||||
|
M: Lidza Louina <lidza.louina@gmail.com>
|
||||||
|
L: driverdev-devel@linuxdriverproject.org
|
||||||
|
S: Maintained
|
||||||
|
F: drivers/staging/dgap/
|
||||||
|
|
||||||
DIOLAN U2C-12 I2C DRIVER
|
DIOLAN U2C-12 I2C DRIVER
|
||||||
M: Guenter Roeck <linux@roeck-us.net>
|
M: Guenter Roeck <linux@roeck-us.net>
|
||||||
L: linux-i2c@vger.kernel.org
|
L: linux-i2c@vger.kernel.org
|
||||||
|
@ -4457,6 +4476,13 @@ L: linux-serial@vger.kernel.org
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: drivers/tty/serial/ioc3_serial.c
|
F: drivers/tty/serial/ioc3_serial.c
|
||||||
|
|
||||||
|
IOMMU DRIVERS
|
||||||
|
M: Joerg Roedel <joro@8bytes.org>
|
||||||
|
L: iommu@lists.linux-foundation.org
|
||||||
|
T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
|
||||||
|
S: Maintained
|
||||||
|
F: drivers/iommu/
|
||||||
|
|
||||||
IP MASQUERADING
|
IP MASQUERADING
|
||||||
M: Juanjo Ciarlante <jjciarla@raiz.uncu.edu.ar>
|
M: Juanjo Ciarlante <jjciarla@raiz.uncu.edu.ar>
|
||||||
S: Maintained
|
S: Maintained
|
||||||
|
@ -6595,7 +6621,7 @@ S: Obsolete
|
||||||
F: drivers/net/wireless/prism54/
|
F: drivers/net/wireless/prism54/
|
||||||
|
|
||||||
PROMISE SATA TX2/TX4 CONTROLLER LIBATA DRIVER
|
PROMISE SATA TX2/TX4 CONTROLLER LIBATA DRIVER
|
||||||
M: Mikael Pettersson <mikpe@it.uu.se>
|
M: Mikael Pettersson <mikpelinux@gmail.com>
|
||||||
L: linux-ide@vger.kernel.org
|
L: linux-ide@vger.kernel.org
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: drivers/ata/sata_promise.*
|
F: drivers/ata/sata_promise.*
|
||||||
|
@ -7258,9 +7284,9 @@ F: include/linux/sched.h
|
||||||
F: include/uapi/linux/sched.h
|
F: include/uapi/linux/sched.h
|
||||||
|
|
||||||
SCORE ARCHITECTURE
|
SCORE ARCHITECTURE
|
||||||
M: Chen Liqin <liqin.chen@sunplusct.com>
|
M: Chen Liqin <liqin.linux@gmail.com>
|
||||||
M: Lennox Wu <lennox.wu@gmail.com>
|
M: Lennox Wu <lennox.wu@gmail.com>
|
||||||
W: http://www.sunplusct.com
|
W: http://www.sunplus.com
|
||||||
S: Supported
|
S: Supported
|
||||||
F: arch/score/
|
F: arch/score/
|
||||||
|
|
||||||
|
@ -8724,9 +8750,8 @@ F: Documentation/hid/hiddev.txt
|
||||||
F: drivers/hid/usbhid/
|
F: drivers/hid/usbhid/
|
||||||
|
|
||||||
USB/IP DRIVERS
|
USB/IP DRIVERS
|
||||||
M: Matt Mooney <mfm@muteddisk.com>
|
|
||||||
L: linux-usb@vger.kernel.org
|
L: linux-usb@vger.kernel.org
|
||||||
S: Maintained
|
S: Orphan
|
||||||
F: drivers/staging/usbip/
|
F: drivers/staging/usbip/
|
||||||
|
|
||||||
USB ISP116X DRIVER
|
USB ISP116X DRIVER
|
||||||
|
@ -9366,6 +9391,7 @@ F: arch/arm64/include/asm/xen/
|
||||||
|
|
||||||
XEN NETWORK BACKEND DRIVER
|
XEN NETWORK BACKEND DRIVER
|
||||||
M: Ian Campbell <ian.campbell@citrix.com>
|
M: Ian Campbell <ian.campbell@citrix.com>
|
||||||
|
M: Wei Liu <wei.liu2@citrix.com>
|
||||||
L: xen-devel@lists.xenproject.org (moderated for non-subscribers)
|
L: xen-devel@lists.xenproject.org (moderated for non-subscribers)
|
||||||
L: netdev@vger.kernel.org
|
L: netdev@vger.kernel.org
|
||||||
S: Supported
|
S: Supported
|
||||||
|
|
2
Makefile
2
Makefile
|
@ -1,7 +1,7 @@
|
||||||
VERSION = 3
|
VERSION = 3
|
||||||
PATCHLEVEL = 12
|
PATCHLEVEL = 12
|
||||||
SUBLEVEL = 0
|
SUBLEVEL = 0
|
||||||
EXTRAVERSION = -rc2
|
EXTRAVERSION = -rc5
|
||||||
NAME = One Giant Leap for Frogkind
|
NAME = One Giant Leap for Frogkind
|
||||||
|
|
||||||
# *DOCUMENTATION*
|
# *DOCUMENTATION*
|
||||||
|
|
|
@ -286,9 +286,6 @@ config HAVE_PERF_USER_STACK_DUMP
|
||||||
config HAVE_ARCH_JUMP_LABEL
|
config HAVE_ARCH_JUMP_LABEL
|
||||||
bool
|
bool
|
||||||
|
|
||||||
config HAVE_ARCH_MUTEX_CPU_RELAX
|
|
||||||
bool
|
|
||||||
|
|
||||||
config HAVE_RCU_TABLE_FREE
|
config HAVE_RCU_TABLE_FREE
|
||||||
bool
|
bool
|
||||||
|
|
||||||
|
|
|
@ -45,7 +45,14 @@ static inline int arch_spin_trylock(arch_spinlock_t *lock)
|
||||||
|
|
||||||
static inline void arch_spin_unlock(arch_spinlock_t *lock)
|
static inline void arch_spin_unlock(arch_spinlock_t *lock)
|
||||||
{
|
{
|
||||||
lock->slock = __ARCH_SPIN_LOCK_UNLOCKED__;
|
unsigned int tmp = __ARCH_SPIN_LOCK_UNLOCKED__;
|
||||||
|
|
||||||
|
__asm__ __volatile__(
|
||||||
|
" ex %0, [%1] \n"
|
||||||
|
: "+r" (tmp)
|
||||||
|
: "r"(&(lock->slock))
|
||||||
|
: "memory");
|
||||||
|
|
||||||
smp_mb();
|
smp_mb();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -43,7 +43,7 @@
|
||||||
* Because it essentially checks if buffer end is within limit and @len is
|
* Because it essentially checks if buffer end is within limit and @len is
|
||||||
* non-ngeative, which implies that buffer start will be within limit too.
|
* non-ngeative, which implies that buffer start will be within limit too.
|
||||||
*
|
*
|
||||||
* The reason for rewriting being, for majorit yof cases, @len is generally
|
* The reason for rewriting being, for majority of cases, @len is generally
|
||||||
* compile time constant, causing first sub-expression to be compile time
|
* compile time constant, causing first sub-expression to be compile time
|
||||||
* subsumed.
|
* subsumed.
|
||||||
*
|
*
|
||||||
|
@ -53,7 +53,7 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
#define __user_ok(addr, sz) (((sz) <= TASK_SIZE) && \
|
#define __user_ok(addr, sz) (((sz) <= TASK_SIZE) && \
|
||||||
(((addr)+(sz)) <= get_fs()))
|
((addr) <= (get_fs() - (sz))))
|
||||||
#define __access_ok(addr, sz) (unlikely(__kernel_ok) || \
|
#define __access_ok(addr, sz) (unlikely(__kernel_ok) || \
|
||||||
likely(__user_ok((addr), (sz))))
|
likely(__user_ok((addr), (sz))))
|
||||||
|
|
||||||
|
|
|
@ -102,7 +102,7 @@ static int genregs_set(struct task_struct *target,
|
||||||
REG_IGNORE_ONE(pad2);
|
REG_IGNORE_ONE(pad2);
|
||||||
REG_IN_CHUNK(callee, efa, cregs); /* callee_regs[r25..r13] */
|
REG_IN_CHUNK(callee, efa, cregs); /* callee_regs[r25..r13] */
|
||||||
REG_IGNORE_ONE(efa); /* efa update invalid */
|
REG_IGNORE_ONE(efa); /* efa update invalid */
|
||||||
REG_IN_ONE(stop_pc, &ptregs->ret); /* stop_pc: PC update */
|
REG_IGNORE_ONE(stop_pc); /* PC updated via @ret */
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
|
@ -101,7 +101,6 @@ SYSCALL_DEFINE0(rt_sigreturn)
|
||||||
{
|
{
|
||||||
struct rt_sigframe __user *sf;
|
struct rt_sigframe __user *sf;
|
||||||
unsigned int magic;
|
unsigned int magic;
|
||||||
int err;
|
|
||||||
struct pt_regs *regs = current_pt_regs();
|
struct pt_regs *regs = current_pt_regs();
|
||||||
|
|
||||||
/* Always make any pending restarted system calls return -EINTR */
|
/* Always make any pending restarted system calls return -EINTR */
|
||||||
|
@ -119,15 +118,16 @@ SYSCALL_DEFINE0(rt_sigreturn)
|
||||||
if (!access_ok(VERIFY_READ, sf, sizeof(*sf)))
|
if (!access_ok(VERIFY_READ, sf, sizeof(*sf)))
|
||||||
goto badframe;
|
goto badframe;
|
||||||
|
|
||||||
err = restore_usr_regs(regs, sf);
|
if (__get_user(magic, &sf->sigret_magic))
|
||||||
err |= __get_user(magic, &sf->sigret_magic);
|
|
||||||
if (err)
|
|
||||||
goto badframe;
|
goto badframe;
|
||||||
|
|
||||||
if (unlikely(is_do_ss_needed(magic)))
|
if (unlikely(is_do_ss_needed(magic)))
|
||||||
if (restore_altstack(&sf->uc.uc_stack))
|
if (restore_altstack(&sf->uc.uc_stack))
|
||||||
goto badframe;
|
goto badframe;
|
||||||
|
|
||||||
|
if (restore_usr_regs(regs, sf))
|
||||||
|
goto badframe;
|
||||||
|
|
||||||
/* Don't restart from sigreturn */
|
/* Don't restart from sigreturn */
|
||||||
syscall_wont_restart(regs);
|
syscall_wont_restart(regs);
|
||||||
|
|
||||||
|
@ -190,6 +190,15 @@ setup_rt_frame(int signo, struct k_sigaction *ka, siginfo_t *info,
|
||||||
if (!sf)
|
if (!sf)
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* w/o SA_SIGINFO, struct ucontext is partially populated (only
|
||||||
|
* uc_mcontext/uc_sigmask) for kernel's normal user state preservation
|
||||||
|
* during signal handler execution. This works for SA_SIGINFO as well
|
||||||
|
* although the semantics are now overloaded (the same reg state can be
|
||||||
|
* inspected by userland: but are they allowed to fiddle with it ?
|
||||||
|
*/
|
||||||
|
err |= stash_usr_regs(sf, regs, set);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* SA_SIGINFO requires 3 args to signal handler:
|
* SA_SIGINFO requires 3 args to signal handler:
|
||||||
* #1: sig-no (common to any handler)
|
* #1: sig-no (common to any handler)
|
||||||
|
@ -213,14 +222,6 @@ setup_rt_frame(int signo, struct k_sigaction *ka, siginfo_t *info,
|
||||||
magic = MAGIC_SIGALTSTK;
|
magic = MAGIC_SIGALTSTK;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* w/o SA_SIGINFO, struct ucontext is partially populated (only
|
|
||||||
* uc_mcontext/uc_sigmask) for kernel's normal user state preservation
|
|
||||||
* during signal handler execution. This works for SA_SIGINFO as well
|
|
||||||
* although the semantics are now overloaded (the same reg state can be
|
|
||||||
* inspected by userland: but are they allowed to fiddle with it ?
|
|
||||||
*/
|
|
||||||
err |= stash_usr_regs(sf, regs, set);
|
|
||||||
err |= __put_user(magic, &sf->sigret_magic);
|
err |= __put_user(magic, &sf->sigret_magic);
|
||||||
if (err)
|
if (err)
|
||||||
return err;
|
return err;
|
||||||
|
|
|
@ -227,12 +227,9 @@ void __attribute__((weak)) arc_local_timer_setup(unsigned int cpu)
|
||||||
{
|
{
|
||||||
struct clock_event_device *clk = &per_cpu(arc_clockevent_device, cpu);
|
struct clock_event_device *clk = &per_cpu(arc_clockevent_device, cpu);
|
||||||
|
|
||||||
clockevents_calc_mult_shift(clk, arc_get_core_freq(), 5);
|
|
||||||
|
|
||||||
clk->max_delta_ns = clockevent_delta2ns(ARC_TIMER_MAX, clk);
|
|
||||||
clk->cpumask = cpumask_of(cpu);
|
clk->cpumask = cpumask_of(cpu);
|
||||||
|
clockevents_config_and_register(clk, arc_get_core_freq(),
|
||||||
clockevents_register_device(clk);
|
0, ARC_TIMER_MAX);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* setup the per-cpu timer IRQ handler - for all cpus
|
* setup the per-cpu timer IRQ handler - for all cpus
|
||||||
|
|
|
@ -245,6 +245,12 @@ int misaligned_fixup(unsigned long address, struct pt_regs *regs,
|
||||||
regs->status32 &= ~STATUS_DE_MASK;
|
regs->status32 &= ~STATUS_DE_MASK;
|
||||||
} else {
|
} else {
|
||||||
regs->ret += state.instr_len;
|
regs->ret += state.instr_len;
|
||||||
|
|
||||||
|
/* handle zero-overhead-loop */
|
||||||
|
if ((regs->ret == regs->lp_end) && (regs->lp_count)) {
|
||||||
|
regs->ret = regs->lp_start;
|
||||||
|
regs->lp_count--;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -2217,8 +2217,7 @@ config NEON
|
||||||
|
|
||||||
config KERNEL_MODE_NEON
|
config KERNEL_MODE_NEON
|
||||||
bool "Support for NEON in kernel mode"
|
bool "Support for NEON in kernel mode"
|
||||||
default n
|
depends on NEON && AEABI
|
||||||
depends on NEON
|
|
||||||
help
|
help
|
||||||
Say Y to include support for NEON in kernel mode.
|
Say Y to include support for NEON in kernel mode.
|
||||||
|
|
||||||
|
|
|
@ -296,10 +296,15 @@ archprepare:
|
||||||
# Convert bzImage to zImage
|
# Convert bzImage to zImage
|
||||||
bzImage: zImage
|
bzImage: zImage
|
||||||
|
|
||||||
zImage Image xipImage bootpImage uImage: vmlinux
|
BOOT_TARGETS = zImage Image xipImage bootpImage uImage
|
||||||
|
INSTALL_TARGETS = zinstall uinstall install
|
||||||
|
|
||||||
|
PHONY += bzImage $(BOOT_TARGETS) $(INSTALL_TARGETS)
|
||||||
|
|
||||||
|
$(BOOT_TARGETS): vmlinux
|
||||||
$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@
|
$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@
|
||||||
|
|
||||||
zinstall uinstall install: vmlinux
|
$(INSTALL_TARGETS):
|
||||||
$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
|
$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
|
||||||
|
|
||||||
%.dtb: | scripts
|
%.dtb: | scripts
|
||||||
|
|
|
@ -95,24 +95,24 @@ initrd:
|
||||||
@test "$(INITRD)" != "" || \
|
@test "$(INITRD)" != "" || \
|
||||||
(echo You must specify INITRD; exit -1)
|
(echo You must specify INITRD; exit -1)
|
||||||
|
|
||||||
install: $(obj)/Image
|
install:
|
||||||
$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \
|
$(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \
|
||||||
$(obj)/Image System.map "$(INSTALL_PATH)"
|
$(obj)/Image System.map "$(INSTALL_PATH)"
|
||||||
|
|
||||||
zinstall: $(obj)/zImage
|
zinstall:
|
||||||
$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \
|
$(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \
|
||||||
$(obj)/zImage System.map "$(INSTALL_PATH)"
|
$(obj)/zImage System.map "$(INSTALL_PATH)"
|
||||||
|
|
||||||
uinstall: $(obj)/uImage
|
uinstall:
|
||||||
$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \
|
$(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \
|
||||||
$(obj)/uImage System.map "$(INSTALL_PATH)"
|
$(obj)/uImage System.map "$(INSTALL_PATH)"
|
||||||
|
|
||||||
zi:
|
zi:
|
||||||
$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \
|
$(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \
|
||||||
$(obj)/zImage System.map "$(INSTALL_PATH)"
|
$(obj)/zImage System.map "$(INSTALL_PATH)"
|
||||||
|
|
||||||
i:
|
i:
|
||||||
$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \
|
$(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \
|
||||||
$(obj)/Image System.map "$(INSTALL_PATH)"
|
$(obj)/Image System.map "$(INSTALL_PATH)"
|
||||||
|
|
||||||
subdir- := bootp compressed dts
|
subdir- := bootp compressed dts
|
||||||
|
|
|
@ -41,6 +41,8 @@ dtb-$(CONFIG_ARCH_AT91) += sama5d33ek.dtb
|
||||||
dtb-$(CONFIG_ARCH_AT91) += sama5d34ek.dtb
|
dtb-$(CONFIG_ARCH_AT91) += sama5d34ek.dtb
|
||||||
dtb-$(CONFIG_ARCH_AT91) += sama5d35ek.dtb
|
dtb-$(CONFIG_ARCH_AT91) += sama5d35ek.dtb
|
||||||
|
|
||||||
|
dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb
|
||||||
|
|
||||||
dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
|
dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
|
||||||
dtb-$(CONFIG_ARCH_BCM) += bcm11351-brt.dtb \
|
dtb-$(CONFIG_ARCH_BCM) += bcm11351-brt.dtb \
|
||||||
bcm28155-ap.dtb
|
bcm28155-ap.dtb
|
||||||
|
|
|
@ -27,6 +27,25 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
soc {
|
soc {
|
||||||
|
ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000
|
||||||
|
MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000>;
|
||||||
|
|
||||||
|
pcie-controller {
|
||||||
|
status = "okay";
|
||||||
|
|
||||||
|
/* Connected to Marvell SATA controller */
|
||||||
|
pcie@1,0 {
|
||||||
|
/* Port 0, Lane 0 */
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
|
||||||
|
/* Connected to FL1009 USB 3.0 controller */
|
||||||
|
pcie@2,0 {
|
||||||
|
/* Port 1, Lane 0 */
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
internal-regs {
|
internal-regs {
|
||||||
serial@12000 {
|
serial@12000 {
|
||||||
clock-frequency = <200000000>;
|
clock-frequency = <200000000>;
|
||||||
|
@ -57,6 +76,11 @@
|
||||||
marvell,pins = "mpp56";
|
marvell,pins = "mpp56";
|
||||||
marvell,function = "gpio";
|
marvell,function = "gpio";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
poweroff: poweroff {
|
||||||
|
marvell,pins = "mpp8";
|
||||||
|
marvell,function = "gpio";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
mdio {
|
mdio {
|
||||||
|
@ -89,22 +113,6 @@
|
||||||
pwm_polarity = <0>;
|
pwm_polarity = <0>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
pcie-controller {
|
|
||||||
status = "okay";
|
|
||||||
|
|
||||||
/* Connected to Marvell SATA controller */
|
|
||||||
pcie@1,0 {
|
|
||||||
/* Port 0, Lane 0 */
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
|
|
||||||
/* Connected to FL1009 USB 3.0 controller */
|
|
||||||
pcie@2,0 {
|
|
||||||
/* Port 1, Lane 0 */
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -160,7 +168,7 @@
|
||||||
button@1 {
|
button@1 {
|
||||||
label = "Power Button";
|
label = "Power Button";
|
||||||
linux,code = <116>; /* KEY_POWER */
|
linux,code = <116>; /* KEY_POWER */
|
||||||
gpios = <&gpio1 30 1>;
|
gpios = <&gpio1 30 0>;
|
||||||
};
|
};
|
||||||
|
|
||||||
button@2 {
|
button@2 {
|
||||||
|
@ -176,4 +184,11 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
gpio_poweroff {
|
||||||
|
compatible = "gpio-poweroff";
|
||||||
|
pinctrl-0 = <&poweroff>;
|
||||||
|
pinctrl-names = "default";
|
||||||
|
gpios = <&gpio0 8 1>;
|
||||||
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -70,6 +70,8 @@
|
||||||
|
|
||||||
timer@20300 {
|
timer@20300 {
|
||||||
compatible = "marvell,armada-xp-timer";
|
compatible = "marvell,armada-xp-timer";
|
||||||
|
clocks = <&coreclk 2>, <&refclk>;
|
||||||
|
clock-names = "nbclk", "fixed";
|
||||||
};
|
};
|
||||||
|
|
||||||
coreclk: mvebu-sar@18230 {
|
coreclk: mvebu-sar@18230 {
|
||||||
|
@ -169,4 +171,13 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
clocks {
|
||||||
|
/* 25 MHz reference crystal */
|
||||||
|
refclk: oscillator {
|
||||||
|
compatible = "fixed-clock";
|
||||||
|
#clock-cells = <0>;
|
||||||
|
clock-frequency = <25000000>;
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -190,12 +190,12 @@
|
||||||
AT91_PIOA 8 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA8 periph A */
|
AT91_PIOA 8 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA8 periph A */
|
||||||
};
|
};
|
||||||
|
|
||||||
pinctrl_uart2_rts: uart2_rts-0 {
|
pinctrl_usart2_rts: usart2_rts-0 {
|
||||||
atmel,pins =
|
atmel,pins =
|
||||||
<AT91_PIOB 0 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PB0 periph B */
|
<AT91_PIOB 0 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PB0 periph B */
|
||||||
};
|
};
|
||||||
|
|
||||||
pinctrl_uart2_cts: uart2_cts-0 {
|
pinctrl_usart2_cts: usart2_cts-0 {
|
||||||
atmel,pins =
|
atmel,pins =
|
||||||
<AT91_PIOB 1 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PB1 periph B */
|
<AT91_PIOB 1 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PB1 periph B */
|
||||||
};
|
};
|
||||||
|
@ -556,6 +556,7 @@
|
||||||
interrupts = <12 IRQ_TYPE_LEVEL_HIGH 0>;
|
interrupts = <12 IRQ_TYPE_LEVEL_HIGH 0>;
|
||||||
dmas = <&dma0 1 AT91_DMA_CFG_PER_ID(0)>;
|
dmas = <&dma0 1 AT91_DMA_CFG_PER_ID(0)>;
|
||||||
dma-names = "rxtx";
|
dma-names = "rxtx";
|
||||||
|
pinctrl-names = "default";
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
|
@ -567,6 +568,7 @@
|
||||||
interrupts = <26 IRQ_TYPE_LEVEL_HIGH 0>;
|
interrupts = <26 IRQ_TYPE_LEVEL_HIGH 0>;
|
||||||
dmas = <&dma1 1 AT91_DMA_CFG_PER_ID(0)>;
|
dmas = <&dma1 1 AT91_DMA_CFG_PER_ID(0)>;
|
||||||
dma-names = "rxtx";
|
dma-names = "rxtx";
|
||||||
|
pinctrl-names = "default";
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
|
|
|
@ -181,6 +181,8 @@
|
||||||
interrupts = <17>;
|
interrupts = <17>;
|
||||||
fifosize = <128>;
|
fifosize = <128>;
|
||||||
clocks = <&clks 13>;
|
clocks = <&clks 13>;
|
||||||
|
sirf,uart-dma-rx-channel = <21>;
|
||||||
|
sirf,uart-dma-tx-channel = <2>;
|
||||||
};
|
};
|
||||||
|
|
||||||
uart1: uart@b0060000 {
|
uart1: uart@b0060000 {
|
||||||
|
@ -199,6 +201,8 @@
|
||||||
interrupts = <19>;
|
interrupts = <19>;
|
||||||
fifosize = <128>;
|
fifosize = <128>;
|
||||||
clocks = <&clks 15>;
|
clocks = <&clks 15>;
|
||||||
|
sirf,uart-dma-rx-channel = <6>;
|
||||||
|
sirf,uart-dma-tx-channel = <7>;
|
||||||
};
|
};
|
||||||
|
|
||||||
usp0: usp@b0080000 {
|
usp0: usp@b0080000 {
|
||||||
|
@ -206,7 +210,10 @@
|
||||||
compatible = "sirf,prima2-usp";
|
compatible = "sirf,prima2-usp";
|
||||||
reg = <0xb0080000 0x10000>;
|
reg = <0xb0080000 0x10000>;
|
||||||
interrupts = <20>;
|
interrupts = <20>;
|
||||||
|
fifosize = <128>;
|
||||||
clocks = <&clks 28>;
|
clocks = <&clks 28>;
|
||||||
|
sirf,usp-dma-rx-channel = <17>;
|
||||||
|
sirf,usp-dma-tx-channel = <18>;
|
||||||
};
|
};
|
||||||
|
|
||||||
usp1: usp@b0090000 {
|
usp1: usp@b0090000 {
|
||||||
|
@ -214,7 +221,10 @@
|
||||||
compatible = "sirf,prima2-usp";
|
compatible = "sirf,prima2-usp";
|
||||||
reg = <0xb0090000 0x10000>;
|
reg = <0xb0090000 0x10000>;
|
||||||
interrupts = <21>;
|
interrupts = <21>;
|
||||||
|
fifosize = <128>;
|
||||||
clocks = <&clks 29>;
|
clocks = <&clks 29>;
|
||||||
|
sirf,usp-dma-rx-channel = <14>;
|
||||||
|
sirf,usp-dma-tx-channel = <15>;
|
||||||
};
|
};
|
||||||
|
|
||||||
dmac0: dma-controller@b00b0000 {
|
dmac0: dma-controller@b00b0000 {
|
||||||
|
@ -237,6 +247,8 @@
|
||||||
compatible = "sirf,prima2-vip";
|
compatible = "sirf,prima2-vip";
|
||||||
reg = <0xb00C0000 0x10000>;
|
reg = <0xb00C0000 0x10000>;
|
||||||
clocks = <&clks 31>;
|
clocks = <&clks 31>;
|
||||||
|
interrupts = <14>;
|
||||||
|
sirf,vip-dma-rx-channel = <16>;
|
||||||
};
|
};
|
||||||
|
|
||||||
spi0: spi@b00d0000 {
|
spi0: spi@b00d0000 {
|
||||||
|
|
|
@ -96,6 +96,11 @@
|
||||||
<1 14 0xf08>,
|
<1 14 0xf08>,
|
||||||
<1 11 0xf08>,
|
<1 11 0xf08>,
|
||||||
<1 10 0xf08>;
|
<1 10 0xf08>;
|
||||||
|
/* Unfortunately we need this since some versions of U-Boot
|
||||||
|
* on Exynos don't set the CNTFRQ register, so we need the
|
||||||
|
* value from DT.
|
||||||
|
*/
|
||||||
|
clock-frequency = <24000000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
mct@101C0000 {
|
mct@101C0000 {
|
||||||
|
|
|
@ -13,6 +13,7 @@
|
||||||
cpu@0 {
|
cpu@0 {
|
||||||
device_type = "cpu";
|
device_type = "cpu";
|
||||||
compatible = "marvell,feroceon";
|
compatible = "marvell,feroceon";
|
||||||
|
reg = <0>;
|
||||||
clocks = <&core_clk 1>, <&core_clk 3>, <&gate_clk 11>;
|
clocks = <&core_clk 1>, <&core_clk 3>, <&gate_clk 11>;
|
||||||
clock-names = "cpu_clk", "ddrclk", "powersave";
|
clock-names = "cpu_clk", "ddrclk", "powersave";
|
||||||
};
|
};
|
||||||
|
@ -167,7 +168,7 @@
|
||||||
xor@60900 {
|
xor@60900 {
|
||||||
compatible = "marvell,orion-xor";
|
compatible = "marvell,orion-xor";
|
||||||
reg = <0x60900 0x100
|
reg = <0x60900 0x100
|
||||||
0xd0B00 0x100>;
|
0x60B00 0x100>;
|
||||||
status = "okay";
|
status = "okay";
|
||||||
clocks = <&gate_clk 16>;
|
clocks = <&gate_clk 16>;
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
model = "TI OMAP3 BeagleBoard xM";
|
model = "TI OMAP3 BeagleBoard xM";
|
||||||
compatible = "ti,omap3-beagle-xm", "ti,omap3-beagle", "ti,omap3";
|
compatible = "ti,omap3-beagle-xm", "ti,omap36xx", "ti,omap3";
|
||||||
|
|
||||||
cpus {
|
cpus {
|
||||||
cpu@0 {
|
cpu@0 {
|
||||||
|
|
|
@ -108,7 +108,7 @@
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
pinctrl-single,register-width = <16>;
|
pinctrl-single,register-width = <16>;
|
||||||
pinctrl-single,function-mask = <0x7f1f>;
|
pinctrl-single,function-mask = <0xff1f>;
|
||||||
};
|
};
|
||||||
|
|
||||||
omap3_pmx_wkup: pinmux@0x48002a00 {
|
omap3_pmx_wkup: pinmux@0x48002a00 {
|
||||||
|
@ -117,7 +117,7 @@
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
pinctrl-single,register-width = <16>;
|
pinctrl-single,register-width = <16>;
|
||||||
pinctrl-single,function-mask = <0x7f1f>;
|
pinctrl-single,function-mask = <0xff1f>;
|
||||||
};
|
};
|
||||||
|
|
||||||
gpio1: gpio@48310000 {
|
gpio1: gpio@48310000 {
|
||||||
|
|
|
@ -171,7 +171,8 @@
|
||||||
compatible = "simple-bus";
|
compatible = "simple-bus";
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <1>;
|
#size-cells = <1>;
|
||||||
ranges = <0xb0000000 0xb0000000 0x180000>;
|
ranges = <0xb0000000 0xb0000000 0x180000>,
|
||||||
|
<0x56000000 0x56000000 0x1b00000>;
|
||||||
|
|
||||||
timer@b0020000 {
|
timer@b0020000 {
|
||||||
compatible = "sirf,prima2-tick";
|
compatible = "sirf,prima2-tick";
|
||||||
|
@ -196,25 +197,32 @@
|
||||||
uart0: uart@b0050000 {
|
uart0: uart@b0050000 {
|
||||||
cell-index = <0>;
|
cell-index = <0>;
|
||||||
compatible = "sirf,prima2-uart";
|
compatible = "sirf,prima2-uart";
|
||||||
reg = <0xb0050000 0x10000>;
|
reg = <0xb0050000 0x1000>;
|
||||||
interrupts = <17>;
|
interrupts = <17>;
|
||||||
|
fifosize = <128>;
|
||||||
clocks = <&clks 13>;
|
clocks = <&clks 13>;
|
||||||
|
sirf,uart-dma-rx-channel = <21>;
|
||||||
|
sirf,uart-dma-tx-channel = <2>;
|
||||||
};
|
};
|
||||||
|
|
||||||
uart1: uart@b0060000 {
|
uart1: uart@b0060000 {
|
||||||
cell-index = <1>;
|
cell-index = <1>;
|
||||||
compatible = "sirf,prima2-uart";
|
compatible = "sirf,prima2-uart";
|
||||||
reg = <0xb0060000 0x10000>;
|
reg = <0xb0060000 0x1000>;
|
||||||
interrupts = <18>;
|
interrupts = <18>;
|
||||||
|
fifosize = <32>;
|
||||||
clocks = <&clks 14>;
|
clocks = <&clks 14>;
|
||||||
};
|
};
|
||||||
|
|
||||||
uart2: uart@b0070000 {
|
uart2: uart@b0070000 {
|
||||||
cell-index = <2>;
|
cell-index = <2>;
|
||||||
compatible = "sirf,prima2-uart";
|
compatible = "sirf,prima2-uart";
|
||||||
reg = <0xb0070000 0x10000>;
|
reg = <0xb0070000 0x1000>;
|
||||||
interrupts = <19>;
|
interrupts = <19>;
|
||||||
|
fifosize = <128>;
|
||||||
clocks = <&clks 15>;
|
clocks = <&clks 15>;
|
||||||
|
sirf,uart-dma-rx-channel = <6>;
|
||||||
|
sirf,uart-dma-tx-channel = <7>;
|
||||||
};
|
};
|
||||||
|
|
||||||
usp0: usp@b0080000 {
|
usp0: usp@b0080000 {
|
||||||
|
@ -222,7 +230,10 @@
|
||||||
compatible = "sirf,prima2-usp";
|
compatible = "sirf,prima2-usp";
|
||||||
reg = <0xb0080000 0x10000>;
|
reg = <0xb0080000 0x10000>;
|
||||||
interrupts = <20>;
|
interrupts = <20>;
|
||||||
|
fifosize = <128>;
|
||||||
clocks = <&clks 28>;
|
clocks = <&clks 28>;
|
||||||
|
sirf,usp-dma-rx-channel = <17>;
|
||||||
|
sirf,usp-dma-tx-channel = <18>;
|
||||||
};
|
};
|
||||||
|
|
||||||
usp1: usp@b0090000 {
|
usp1: usp@b0090000 {
|
||||||
|
@ -230,7 +241,10 @@
|
||||||
compatible = "sirf,prima2-usp";
|
compatible = "sirf,prima2-usp";
|
||||||
reg = <0xb0090000 0x10000>;
|
reg = <0xb0090000 0x10000>;
|
||||||
interrupts = <21>;
|
interrupts = <21>;
|
||||||
|
fifosize = <128>;
|
||||||
clocks = <&clks 29>;
|
clocks = <&clks 29>;
|
||||||
|
sirf,usp-dma-rx-channel = <14>;
|
||||||
|
sirf,usp-dma-tx-channel = <15>;
|
||||||
};
|
};
|
||||||
|
|
||||||
usp2: usp@b00a0000 {
|
usp2: usp@b00a0000 {
|
||||||
|
@ -238,7 +252,10 @@
|
||||||
compatible = "sirf,prima2-usp";
|
compatible = "sirf,prima2-usp";
|
||||||
reg = <0xb00a0000 0x10000>;
|
reg = <0xb00a0000 0x10000>;
|
||||||
interrupts = <22>;
|
interrupts = <22>;
|
||||||
|
fifosize = <128>;
|
||||||
clocks = <&clks 30>;
|
clocks = <&clks 30>;
|
||||||
|
sirf,usp-dma-rx-channel = <10>;
|
||||||
|
sirf,usp-dma-tx-channel = <11>;
|
||||||
};
|
};
|
||||||
|
|
||||||
dmac0: dma-controller@b00b0000 {
|
dmac0: dma-controller@b00b0000 {
|
||||||
|
@ -261,6 +278,8 @@
|
||||||
compatible = "sirf,prima2-vip";
|
compatible = "sirf,prima2-vip";
|
||||||
reg = <0xb00C0000 0x10000>;
|
reg = <0xb00C0000 0x10000>;
|
||||||
clocks = <&clks 31>;
|
clocks = <&clks 31>;
|
||||||
|
interrupts = <14>;
|
||||||
|
sirf,vip-dma-rx-channel = <16>;
|
||||||
};
|
};
|
||||||
|
|
||||||
spi0: spi@b00d0000 {
|
spi0: spi@b00d0000 {
|
||||||
|
|
|
@ -193,7 +193,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
sdhi0: sdhi@ee100000 {
|
sdhi0: sdhi@ee100000 {
|
||||||
compatible = "renesas,r8a73a4-sdhi";
|
compatible = "renesas,sdhi-r8a73a4";
|
||||||
reg = <0 0xee100000 0 0x100>;
|
reg = <0 0xee100000 0 0x100>;
|
||||||
interrupt-parent = <&gic>;
|
interrupt-parent = <&gic>;
|
||||||
interrupts = <0 165 4>;
|
interrupts = <0 165 4>;
|
||||||
|
@ -202,7 +202,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
sdhi1: sdhi@ee120000 {
|
sdhi1: sdhi@ee120000 {
|
||||||
compatible = "renesas,r8a73a4-sdhi";
|
compatible = "renesas,sdhi-r8a73a4";
|
||||||
reg = <0 0xee120000 0 0x100>;
|
reg = <0 0xee120000 0 0x100>;
|
||||||
interrupt-parent = <&gic>;
|
interrupt-parent = <&gic>;
|
||||||
interrupts = <0 166 4>;
|
interrupts = <0 166 4>;
|
||||||
|
@ -211,7 +211,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
sdhi2: sdhi@ee140000 {
|
sdhi2: sdhi@ee140000 {
|
||||||
compatible = "renesas,r8a73a4-sdhi";
|
compatible = "renesas,sdhi-r8a73a4";
|
||||||
reg = <0 0xee140000 0 0x100>;
|
reg = <0 0xee140000 0 0x100>;
|
||||||
interrupt-parent = <&gic>;
|
interrupt-parent = <&gic>;
|
||||||
interrupts = <0 167 4>;
|
interrupts = <0 167 4>;
|
||||||
|
|
|
@ -96,6 +96,5 @@
|
||||||
pfc: pfc@fffc0000 {
|
pfc: pfc@fffc0000 {
|
||||||
compatible = "renesas,pfc-r8a7778";
|
compatible = "renesas,pfc-r8a7778";
|
||||||
reg = <0xfffc000 0x118>;
|
reg = <0xfffc000 0x118>;
|
||||||
#gpio-range-cells = <3>;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -188,7 +188,6 @@
|
||||||
pfc: pfc@fffc0000 {
|
pfc: pfc@fffc0000 {
|
||||||
compatible = "renesas,pfc-r8a7779";
|
compatible = "renesas,pfc-r8a7779";
|
||||||
reg = <0xfffc0000 0x23c>;
|
reg = <0xfffc0000 0x23c>;
|
||||||
#gpio-range-cells = <3>;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
thermal@ffc48000 {
|
thermal@ffc48000 {
|
||||||
|
|
|
@ -148,11 +148,10 @@
|
||||||
pfc: pfc@e6060000 {
|
pfc: pfc@e6060000 {
|
||||||
compatible = "renesas,pfc-r8a7790";
|
compatible = "renesas,pfc-r8a7790";
|
||||||
reg = <0 0xe6060000 0 0x250>;
|
reg = <0 0xe6060000 0 0x250>;
|
||||||
#gpio-range-cells = <3>;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
sdhi0: sdhi@ee100000 {
|
sdhi0: sdhi@ee100000 {
|
||||||
compatible = "renesas,r8a7790-sdhi";
|
compatible = "renesas,sdhi-r8a7790";
|
||||||
reg = <0 0xee100000 0 0x100>;
|
reg = <0 0xee100000 0 0x100>;
|
||||||
interrupt-parent = <&gic>;
|
interrupt-parent = <&gic>;
|
||||||
interrupts = <0 165 4>;
|
interrupts = <0 165 4>;
|
||||||
|
@ -161,7 +160,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
sdhi1: sdhi@ee120000 {
|
sdhi1: sdhi@ee120000 {
|
||||||
compatible = "renesas,r8a7790-sdhi";
|
compatible = "renesas,sdhi-r8a7790";
|
||||||
reg = <0 0xee120000 0 0x100>;
|
reg = <0 0xee120000 0 0x100>;
|
||||||
interrupt-parent = <&gic>;
|
interrupt-parent = <&gic>;
|
||||||
interrupts = <0 166 4>;
|
interrupts = <0 166 4>;
|
||||||
|
@ -170,7 +169,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
sdhi2: sdhi@ee140000 {
|
sdhi2: sdhi@ee140000 {
|
||||||
compatible = "renesas,r8a7790-sdhi";
|
compatible = "renesas,sdhi-r8a7790";
|
||||||
reg = <0 0xee140000 0 0x100>;
|
reg = <0 0xee140000 0 0x100>;
|
||||||
interrupt-parent = <&gic>;
|
interrupt-parent = <&gic>;
|
||||||
interrupts = <0 167 4>;
|
interrupts = <0 167 4>;
|
||||||
|
@ -179,7 +178,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
sdhi3: sdhi@ee160000 {
|
sdhi3: sdhi@ee160000 {
|
||||||
compatible = "renesas,r8a7790-sdhi";
|
compatible = "renesas,sdhi-r8a7790";
|
||||||
reg = <0 0xee160000 0 0x100>;
|
reg = <0 0xee160000 0 0x100>;
|
||||||
interrupt-parent = <&gic>;
|
interrupt-parent = <&gic>;
|
||||||
interrupts = <0 168 4>;
|
interrupts = <0 168 4>;
|
||||||
|
|
|
@ -196,7 +196,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
sdhi0: sdhi@ee100000 {
|
sdhi0: sdhi@ee100000 {
|
||||||
compatible = "renesas,r8a7740-sdhi";
|
compatible = "renesas,sdhi-r8a7740";
|
||||||
reg = <0xee100000 0x100>;
|
reg = <0xee100000 0x100>;
|
||||||
interrupt-parent = <&gic>;
|
interrupt-parent = <&gic>;
|
||||||
interrupts = <0 83 4
|
interrupts = <0 83 4
|
||||||
|
@ -208,7 +208,7 @@
|
||||||
|
|
||||||
/* SDHI1 and SDHI2 have no CD pins, no need for CD IRQ */
|
/* SDHI1 and SDHI2 have no CD pins, no need for CD IRQ */
|
||||||
sdhi1: sdhi@ee120000 {
|
sdhi1: sdhi@ee120000 {
|
||||||
compatible = "renesas,r8a7740-sdhi";
|
compatible = "renesas,sdhi-r8a7740";
|
||||||
reg = <0xee120000 0x100>;
|
reg = <0xee120000 0x100>;
|
||||||
interrupt-parent = <&gic>;
|
interrupt-parent = <&gic>;
|
||||||
interrupts = <0 88 4
|
interrupts = <0 88 4
|
||||||
|
@ -219,7 +219,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
sdhi2: sdhi@ee140000 {
|
sdhi2: sdhi@ee140000 {
|
||||||
compatible = "renesas,r8a7740-sdhi";
|
compatible = "renesas,sdhi-r8a7740";
|
||||||
reg = <0xee140000 0x100>;
|
reg = <0xee140000 0x100>;
|
||||||
interrupt-parent = <&gic>;
|
interrupt-parent = <&gic>;
|
||||||
interrupts = <0 104 4
|
interrupts = <0 104 4
|
||||||
|
|
|
@ -20,6 +20,20 @@
|
||||||
# $4 - default install path (blank if root directory)
|
# $4 - default install path (blank if root directory)
|
||||||
#
|
#
|
||||||
|
|
||||||
|
verify () {
|
||||||
|
if [ ! -f "$1" ]; then
|
||||||
|
echo "" 1>&2
|
||||||
|
echo " *** Missing file: $1" 1>&2
|
||||||
|
echo ' *** You need to run "make" before "make install".' 1>&2
|
||||||
|
echo "" 1>&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# Make sure the files actually exist
|
||||||
|
verify "$2"
|
||||||
|
verify "$3"
|
||||||
|
|
||||||
# User may have a custom install script
|
# User may have a custom install script
|
||||||
if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi
|
if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi
|
||||||
if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi
|
if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi
|
||||||
|
|
|
@ -269,6 +269,11 @@ static const struct edmacc_param dummy_paramset = {
|
||||||
.ccnt = 1,
|
.ccnt = 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static const struct of_device_id edma_of_ids[] = {
|
||||||
|
{ .compatible = "ti,edma3", },
|
||||||
|
{}
|
||||||
|
};
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
static void map_dmach_queue(unsigned ctlr, unsigned ch_no,
|
static void map_dmach_queue(unsigned ctlr, unsigned ch_no,
|
||||||
|
@ -560,14 +565,38 @@ static int reserve_contiguous_slots(int ctlr, unsigned int id,
|
||||||
static int prepare_unused_channel_list(struct device *dev, void *data)
|
static int prepare_unused_channel_list(struct device *dev, void *data)
|
||||||
{
|
{
|
||||||
struct platform_device *pdev = to_platform_device(dev);
|
struct platform_device *pdev = to_platform_device(dev);
|
||||||
int i, ctlr;
|
int i, count, ctlr;
|
||||||
|
struct of_phandle_args dma_spec;
|
||||||
|
|
||||||
|
if (dev->of_node) {
|
||||||
|
count = of_property_count_strings(dev->of_node, "dma-names");
|
||||||
|
if (count < 0)
|
||||||
|
return 0;
|
||||||
|
for (i = 0; i < count; i++) {
|
||||||
|
if (of_parse_phandle_with_args(dev->of_node, "dmas",
|
||||||
|
"#dma-cells", i,
|
||||||
|
&dma_spec))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (!of_match_node(edma_of_ids, dma_spec.np)) {
|
||||||
|
of_node_put(dma_spec.np);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
clear_bit(EDMA_CHAN_SLOT(dma_spec.args[0]),
|
||||||
|
edma_cc[0]->edma_unused);
|
||||||
|
of_node_put(dma_spec.np);
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* For non-OF case */
|
||||||
for (i = 0; i < pdev->num_resources; i++) {
|
for (i = 0; i < pdev->num_resources; i++) {
|
||||||
if ((pdev->resource[i].flags & IORESOURCE_DMA) &&
|
if ((pdev->resource[i].flags & IORESOURCE_DMA) &&
|
||||||
(int)pdev->resource[i].start >= 0) {
|
(int)pdev->resource[i].start >= 0) {
|
||||||
ctlr = EDMA_CTLR(pdev->resource[i].start);
|
ctlr = EDMA_CTLR(pdev->resource[i].start);
|
||||||
clear_bit(EDMA_CHAN_SLOT(pdev->resource[i].start),
|
clear_bit(EDMA_CHAN_SLOT(pdev->resource[i].start),
|
||||||
edma_cc[ctlr]->edma_unused);
|
edma_cc[ctlr]->edma_unused);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1762,11 +1791,6 @@ static int edma_probe(struct platform_device *pdev)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct of_device_id edma_of_ids[] = {
|
|
||||||
{ .compatible = "ti,edma3", },
|
|
||||||
{}
|
|
||||||
};
|
|
||||||
|
|
||||||
static struct platform_driver edma_driver = {
|
static struct platform_driver edma_driver = {
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "edma",
|
.name = "edma",
|
||||||
|
|
|
@ -135,6 +135,7 @@ CONFIG_MMC=y
|
||||||
CONFIG_MMC_ARMMMCI=y
|
CONFIG_MMC_ARMMMCI=y
|
||||||
CONFIG_MMC_SDHCI=y
|
CONFIG_MMC_SDHCI=y
|
||||||
CONFIG_MMC_SDHCI_PLTFM=y
|
CONFIG_MMC_SDHCI_PLTFM=y
|
||||||
|
CONFIG_MMC_SDHCI_ESDHC_IMX=y
|
||||||
CONFIG_MMC_SDHCI_TEGRA=y
|
CONFIG_MMC_SDHCI_TEGRA=y
|
||||||
CONFIG_MMC_SDHCI_SPEAR=y
|
CONFIG_MMC_SDHCI_SPEAR=y
|
||||||
CONFIG_MMC_OMAP=y
|
CONFIG_MMC_OMAP=y
|
||||||
|
|
|
@ -148,7 +148,7 @@ AES_Te:
|
||||||
@ const AES_KEY *key) {
|
@ const AES_KEY *key) {
|
||||||
.align 5
|
.align 5
|
||||||
ENTRY(AES_encrypt)
|
ENTRY(AES_encrypt)
|
||||||
sub r3,pc,#8 @ AES_encrypt
|
adr r3,AES_encrypt
|
||||||
stmdb sp!,{r1,r4-r12,lr}
|
stmdb sp!,{r1,r4-r12,lr}
|
||||||
mov r12,r0 @ inp
|
mov r12,r0 @ inp
|
||||||
mov r11,r2
|
mov r11,r2
|
||||||
|
@ -381,7 +381,7 @@ _armv4_AES_encrypt:
|
||||||
.align 5
|
.align 5
|
||||||
ENTRY(private_AES_set_encrypt_key)
|
ENTRY(private_AES_set_encrypt_key)
|
||||||
_armv4_AES_set_encrypt_key:
|
_armv4_AES_set_encrypt_key:
|
||||||
sub r3,pc,#8 @ AES_set_encrypt_key
|
adr r3,_armv4_AES_set_encrypt_key
|
||||||
teq r0,#0
|
teq r0,#0
|
||||||
moveq r0,#-1
|
moveq r0,#-1
|
||||||
beq .Labrt
|
beq .Labrt
|
||||||
|
@ -843,7 +843,7 @@ AES_Td:
|
||||||
@ const AES_KEY *key) {
|
@ const AES_KEY *key) {
|
||||||
.align 5
|
.align 5
|
||||||
ENTRY(AES_decrypt)
|
ENTRY(AES_decrypt)
|
||||||
sub r3,pc,#8 @ AES_decrypt
|
adr r3,AES_decrypt
|
||||||
stmdb sp!,{r1,r4-r12,lr}
|
stmdb sp!,{r1,r4-r12,lr}
|
||||||
mov r12,r0 @ inp
|
mov r12,r0 @ inp
|
||||||
mov r11,r2
|
mov r11,r2
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
|
|
||||||
static __always_inline bool arch_static_branch(struct static_key *key)
|
static __always_inline bool arch_static_branch(struct static_key *key)
|
||||||
{
|
{
|
||||||
asm goto("1:\n\t"
|
asm_volatile_goto("1:\n\t"
|
||||||
JUMP_LABEL_NOP "\n\t"
|
JUMP_LABEL_NOP "\n\t"
|
||||||
".pushsection __jump_table, \"aw\"\n\t"
|
".pushsection __jump_table, \"aw\"\n\t"
|
||||||
".word 1b, %l[l_yes], %c0\n\t"
|
".word 1b, %l[l_yes], %c0\n\t"
|
||||||
|
|
|
@ -19,6 +19,13 @@
|
||||||
#include <asm/unified.h>
|
#include <asm/unified.h>
|
||||||
#include <asm/compiler.h>
|
#include <asm/compiler.h>
|
||||||
|
|
||||||
|
#if __LINUX_ARM_ARCH__ < 6
|
||||||
|
#include <asm-generic/uaccess-unaligned.h>
|
||||||
|
#else
|
||||||
|
#define __get_user_unaligned __get_user
|
||||||
|
#define __put_user_unaligned __put_user
|
||||||
|
#endif
|
||||||
|
|
||||||
#define VERIFY_READ 0
|
#define VERIFY_READ 0
|
||||||
#define VERIFY_WRITE 1
|
#define VERIFY_WRITE 1
|
||||||
|
|
||||||
|
|
|
@ -442,10 +442,10 @@ local_restart:
|
||||||
ldrcc pc, [tbl, scno, lsl #2] @ call sys_* routine
|
ldrcc pc, [tbl, scno, lsl #2] @ call sys_* routine
|
||||||
|
|
||||||
add r1, sp, #S_OFF
|
add r1, sp, #S_OFF
|
||||||
cmp scno, #(__ARM_NR_BASE - __NR_SYSCALL_BASE)
|
2: cmp scno, #(__ARM_NR_BASE - __NR_SYSCALL_BASE)
|
||||||
eor r0, scno, #__NR_SYSCALL_BASE @ put OS number back
|
eor r0, scno, #__NR_SYSCALL_BASE @ put OS number back
|
||||||
bcs arm_syscall
|
bcs arm_syscall
|
||||||
2: mov why, #0 @ no longer a real syscall
|
mov why, #0 @ no longer a real syscall
|
||||||
b sys_ni_syscall @ not private func
|
b sys_ni_syscall @ not private func
|
||||||
|
|
||||||
#if defined(CONFIG_OABI_COMPAT) || !defined(CONFIG_AEABI)
|
#if defined(CONFIG_OABI_COMPAT) || !defined(CONFIG_AEABI)
|
||||||
|
|
|
@ -329,10 +329,10 @@
|
||||||
#ifdef CONFIG_CONTEXT_TRACKING
|
#ifdef CONFIG_CONTEXT_TRACKING
|
||||||
.if \save
|
.if \save
|
||||||
stmdb sp!, {r0-r3, ip, lr}
|
stmdb sp!, {r0-r3, ip, lr}
|
||||||
bl user_exit
|
bl context_tracking_user_exit
|
||||||
ldmia sp!, {r0-r3, ip, lr}
|
ldmia sp!, {r0-r3, ip, lr}
|
||||||
.else
|
.else
|
||||||
bl user_exit
|
bl context_tracking_user_exit
|
||||||
.endif
|
.endif
|
||||||
#endif
|
#endif
|
||||||
.endm
|
.endm
|
||||||
|
@ -341,10 +341,10 @@
|
||||||
#ifdef CONFIG_CONTEXT_TRACKING
|
#ifdef CONFIG_CONTEXT_TRACKING
|
||||||
.if \save
|
.if \save
|
||||||
stmdb sp!, {r0-r3, ip, lr}
|
stmdb sp!, {r0-r3, ip, lr}
|
||||||
bl user_enter
|
bl context_tracking_user_enter
|
||||||
ldmia sp!, {r0-r3, ip, lr}
|
ldmia sp!, {r0-r3, ip, lr}
|
||||||
.else
|
.else
|
||||||
bl user_enter
|
bl context_tracking_user_enter
|
||||||
.endif
|
.endif
|
||||||
#endif
|
#endif
|
||||||
.endm
|
.endm
|
||||||
|
|
|
@ -58,14 +58,14 @@ static const struct kvm_irq_level a15_vtimer_irq = {
|
||||||
*/
|
*/
|
||||||
int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
|
int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
|
||||||
{
|
{
|
||||||
struct kvm_regs *cpu_reset;
|
struct kvm_regs *reset_regs;
|
||||||
const struct kvm_irq_level *cpu_vtimer_irq;
|
const struct kvm_irq_level *cpu_vtimer_irq;
|
||||||
|
|
||||||
switch (vcpu->arch.target) {
|
switch (vcpu->arch.target) {
|
||||||
case KVM_ARM_TARGET_CORTEX_A15:
|
case KVM_ARM_TARGET_CORTEX_A15:
|
||||||
if (vcpu->vcpu_id > a15_max_cpu_idx)
|
if (vcpu->vcpu_id > a15_max_cpu_idx)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
cpu_reset = &a15_regs_reset;
|
reset_regs = &a15_regs_reset;
|
||||||
vcpu->arch.midr = read_cpuid_id();
|
vcpu->arch.midr = read_cpuid_id();
|
||||||
cpu_vtimer_irq = &a15_vtimer_irq;
|
cpu_vtimer_irq = &a15_vtimer_irq;
|
||||||
break;
|
break;
|
||||||
|
@ -74,7 +74,7 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Reset core registers */
|
/* Reset core registers */
|
||||||
memcpy(&vcpu->arch.regs, cpu_reset, sizeof(vcpu->arch.regs));
|
memcpy(&vcpu->arch.regs, reset_regs, sizeof(vcpu->arch.regs));
|
||||||
|
|
||||||
/* Reset CP15 registers */
|
/* Reset CP15 registers */
|
||||||
kvm_reset_coprocs(vcpu);
|
kvm_reset_coprocs(vcpu);
|
||||||
|
|
|
@ -93,7 +93,7 @@ static irqreturn_t at91rm9200_timer_interrupt(int irq, void *dev_id)
|
||||||
|
|
||||||
static struct irqaction at91rm9200_timer_irq = {
|
static struct irqaction at91rm9200_timer_irq = {
|
||||||
.name = "at91_tick",
|
.name = "at91_tick",
|
||||||
.flags = IRQF_SHARED | IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,
|
.flags = IRQF_SHARED | IRQF_TIMER | IRQF_IRQPOLL,
|
||||||
.handler = at91rm9200_timer_interrupt,
|
.handler = at91rm9200_timer_interrupt,
|
||||||
.irq = NR_IRQS_LEGACY + AT91_ID_SYS,
|
.irq = NR_IRQS_LEGACY + AT91_ID_SYS,
|
||||||
};
|
};
|
||||||
|
|
|
@ -171,7 +171,7 @@ static irqreturn_t at91sam926x_pit_interrupt(int irq, void *dev_id)
|
||||||
|
|
||||||
static struct irqaction at91sam926x_pit_irq = {
|
static struct irqaction at91sam926x_pit_irq = {
|
||||||
.name = "at91_tick",
|
.name = "at91_tick",
|
||||||
.flags = IRQF_SHARED | IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,
|
.flags = IRQF_SHARED | IRQF_TIMER | IRQF_IRQPOLL,
|
||||||
.handler = at91sam926x_pit_interrupt,
|
.handler = at91sam926x_pit_interrupt,
|
||||||
.irq = NR_IRQS_LEGACY + AT91_ID_SYS,
|
.irq = NR_IRQS_LEGACY + AT91_ID_SYS,
|
||||||
};
|
};
|
||||||
|
|
|
@ -16,11 +16,17 @@
|
||||||
#include "at91_rstc.h"
|
#include "at91_rstc.h"
|
||||||
.arm
|
.arm
|
||||||
|
|
||||||
|
/*
|
||||||
|
* at91_ramc_base is an array void*
|
||||||
|
* init at NULL if only one DDR controler is present in or DT
|
||||||
|
*/
|
||||||
.globl at91sam9g45_restart
|
.globl at91sam9g45_restart
|
||||||
|
|
||||||
at91sam9g45_restart:
|
at91sam9g45_restart:
|
||||||
ldr r5, =at91_ramc_base @ preload constants
|
ldr r5, =at91_ramc_base @ preload constants
|
||||||
ldr r0, [r5]
|
ldr r0, [r5]
|
||||||
|
ldr r5, [r5, #4] @ ddr1
|
||||||
|
cmp r5, #0
|
||||||
ldr r4, =at91_rstc_base
|
ldr r4, =at91_rstc_base
|
||||||
ldr r1, [r4]
|
ldr r1, [r4]
|
||||||
|
|
||||||
|
@ -30,6 +36,8 @@ at91sam9g45_restart:
|
||||||
|
|
||||||
.balign 32 @ align to cache line
|
.balign 32 @ align to cache line
|
||||||
|
|
||||||
|
strne r2, [r5, #AT91_DDRSDRC_RTR] @ disable DDR1 access
|
||||||
|
strne r3, [r5, #AT91_DDRSDRC_LPR] @ power down DDR1
|
||||||
str r2, [r0, #AT91_DDRSDRC_RTR] @ disable DDR0 access
|
str r2, [r0, #AT91_DDRSDRC_RTR] @ disable DDR0 access
|
||||||
str r3, [r0, #AT91_DDRSDRC_LPR] @ power down DDR0
|
str r3, [r0, #AT91_DDRSDRC_LPR] @ power down DDR0
|
||||||
str r4, [r1, #AT91_RSTC_CR] @ reset processor
|
str r4, [r1, #AT91_RSTC_CR] @ reset processor
|
||||||
|
|
|
@ -57,7 +57,7 @@ static irqreturn_t at91x40_timer_interrupt(int irq, void *dev_id)
|
||||||
|
|
||||||
static struct irqaction at91x40_timer_irq = {
|
static struct irqaction at91x40_timer_irq = {
|
||||||
.name = "at91_tick",
|
.name = "at91_tick",
|
||||||
.flags = IRQF_DISABLED | IRQF_TIMER,
|
.flags = IRQF_TIMER,
|
||||||
.handler = at91x40_timer_interrupt
|
.handler = at91x40_timer_interrupt
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -176,7 +176,7 @@ static struct at24_platform_data eeprom_info = {
|
||||||
.context = (void *)0x7f00,
|
.context = (void *)0x7f00,
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct snd_platform_data dm365_evm_snd_data = {
|
static struct snd_platform_data dm365_evm_snd_data __maybe_unused = {
|
||||||
.asp_chan_q = EVENTQ_3,
|
.asp_chan_q = EVENTQ_3,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -15,8 +15,6 @@
|
||||||
|
|
||||||
#include <mach/hardware.h>
|
#include <mach/hardware.h>
|
||||||
|
|
||||||
#include <linux/platform_device.h>
|
|
||||||
|
|
||||||
#define DAVINCI_UART0_BASE (IO_PHYS + 0x20000)
|
#define DAVINCI_UART0_BASE (IO_PHYS + 0x20000)
|
||||||
#define DAVINCI_UART1_BASE (IO_PHYS + 0x20400)
|
#define DAVINCI_UART1_BASE (IO_PHYS + 0x20400)
|
||||||
#define DAVINCI_UART2_BASE (IO_PHYS + 0x20800)
|
#define DAVINCI_UART2_BASE (IO_PHYS + 0x20800)
|
||||||
|
@ -39,6 +37,8 @@
|
||||||
#define UART_DM646X_SCR_TX_WATERMARK 0x08
|
#define UART_DM646X_SCR_TX_WATERMARK 0x08
|
||||||
|
|
||||||
#ifndef __ASSEMBLY__
|
#ifndef __ASSEMBLY__
|
||||||
|
#include <linux/platform_device.h>
|
||||||
|
|
||||||
extern int davinci_serial_init(struct platform_device *);
|
extern int davinci_serial_init(struct platform_device *);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -1,2 +1,9 @@
|
||||||
/* Simple oneliner include to the PCIv3 early init */
|
/* Simple oneliner include to the PCIv3 early init */
|
||||||
|
#ifdef CONFIG_PCI
|
||||||
extern int pci_v3_early_init(void);
|
extern int pci_v3_early_init(void);
|
||||||
|
#else
|
||||||
|
static inline int pci_v3_early_init(void)
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
|
@ -140,6 +140,7 @@ int __init coherency_init(void)
|
||||||
coherency_base = of_iomap(np, 0);
|
coherency_base = of_iomap(np, 0);
|
||||||
coherency_cpu_base = of_iomap(np, 1);
|
coherency_cpu_base = of_iomap(np, 1);
|
||||||
set_cpu_coherent(cpu_logical_map(smp_processor_id()), 0);
|
set_cpu_coherent(cpu_logical_map(smp_processor_id()), 0);
|
||||||
|
of_node_put(np);
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -147,9 +148,14 @@ int __init coherency_init(void)
|
||||||
|
|
||||||
static int __init coherency_late_init(void)
|
static int __init coherency_late_init(void)
|
||||||
{
|
{
|
||||||
if (of_find_matching_node(NULL, of_coherency_table))
|
struct device_node *np;
|
||||||
|
|
||||||
|
np = of_find_matching_node(NULL, of_coherency_table);
|
||||||
|
if (np) {
|
||||||
bus_register_notifier(&platform_bus_type,
|
bus_register_notifier(&platform_bus_type,
|
||||||
&mvebu_hwcc_platform_nb);
|
&mvebu_hwcc_platform_nb);
|
||||||
|
of_node_put(np);
|
||||||
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -67,6 +67,7 @@ int __init armada_370_xp_pmsu_init(void)
|
||||||
pr_info("Initializing Power Management Service Unit\n");
|
pr_info("Initializing Power Management Service Unit\n");
|
||||||
pmsu_mp_base = of_iomap(np, 0);
|
pmsu_mp_base = of_iomap(np, 0);
|
||||||
pmsu_reset_base = of_iomap(np, 1);
|
pmsu_reset_base = of_iomap(np, 1);
|
||||||
|
of_node_put(np);
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -98,6 +98,7 @@ static int __init mvebu_system_controller_init(void)
|
||||||
BUG_ON(!match);
|
BUG_ON(!match);
|
||||||
system_controller_base = of_iomap(np, 0);
|
system_controller_base = of_iomap(np, 0);
|
||||||
mvebu_sc = (struct mvebu_system_controller *)match->data;
|
mvebu_sc = (struct mvebu_system_controller *)match->data;
|
||||||
|
of_node_put(np);
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -129,6 +129,24 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)")
|
||||||
.restart = omap3xxx_restart,
|
.restart = omap3xxx_restart,
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
||||||
|
static const char *omap36xx_boards_compat[] __initdata = {
|
||||||
|
"ti,omap36xx",
|
||||||
|
NULL,
|
||||||
|
};
|
||||||
|
|
||||||
|
DT_MACHINE_START(OMAP36XX_DT, "Generic OMAP36xx (Flattened Device Tree)")
|
||||||
|
.reserve = omap_reserve,
|
||||||
|
.map_io = omap3_map_io,
|
||||||
|
.init_early = omap3630_init_early,
|
||||||
|
.init_irq = omap_intc_of_init,
|
||||||
|
.handle_irq = omap3_intc_handle_irq,
|
||||||
|
.init_machine = omap_generic_init,
|
||||||
|
.init_late = omap3_init_late,
|
||||||
|
.init_time = omap3_sync32k_timer_init,
|
||||||
|
.dt_compat = omap36xx_boards_compat,
|
||||||
|
.restart = omap3xxx_restart,
|
||||||
|
MACHINE_END
|
||||||
|
|
||||||
static const char *omap3_gp_boards_compat[] __initdata = {
|
static const char *omap3_gp_boards_compat[] __initdata = {
|
||||||
"ti,omap3-beagle",
|
"ti,omap3-beagle",
|
||||||
"timll,omap3-devkit8000",
|
"timll,omap3-devkit8000",
|
||||||
|
|
|
@ -167,38 +167,47 @@ static struct lp55xx_led_config rx51_lp5523_led_config[] = {
|
||||||
.name = "lp5523:kb1",
|
.name = "lp5523:kb1",
|
||||||
.chan_nr = 0,
|
.chan_nr = 0,
|
||||||
.led_current = 50,
|
.led_current = 50,
|
||||||
|
.max_current = 100,
|
||||||
}, {
|
}, {
|
||||||
.name = "lp5523:kb2",
|
.name = "lp5523:kb2",
|
||||||
.chan_nr = 1,
|
.chan_nr = 1,
|
||||||
.led_current = 50,
|
.led_current = 50,
|
||||||
|
.max_current = 100,
|
||||||
}, {
|
}, {
|
||||||
.name = "lp5523:kb3",
|
.name = "lp5523:kb3",
|
||||||
.chan_nr = 2,
|
.chan_nr = 2,
|
||||||
.led_current = 50,
|
.led_current = 50,
|
||||||
|
.max_current = 100,
|
||||||
}, {
|
}, {
|
||||||
.name = "lp5523:kb4",
|
.name = "lp5523:kb4",
|
||||||
.chan_nr = 3,
|
.chan_nr = 3,
|
||||||
.led_current = 50,
|
.led_current = 50,
|
||||||
|
.max_current = 100,
|
||||||
}, {
|
}, {
|
||||||
.name = "lp5523:b",
|
.name = "lp5523:b",
|
||||||
.chan_nr = 4,
|
.chan_nr = 4,
|
||||||
.led_current = 50,
|
.led_current = 50,
|
||||||
|
.max_current = 100,
|
||||||
}, {
|
}, {
|
||||||
.name = "lp5523:g",
|
.name = "lp5523:g",
|
||||||
.chan_nr = 5,
|
.chan_nr = 5,
|
||||||
.led_current = 50,
|
.led_current = 50,
|
||||||
|
.max_current = 100,
|
||||||
}, {
|
}, {
|
||||||
.name = "lp5523:r",
|
.name = "lp5523:r",
|
||||||
.chan_nr = 6,
|
.chan_nr = 6,
|
||||||
.led_current = 50,
|
.led_current = 50,
|
||||||
|
.max_current = 100,
|
||||||
}, {
|
}, {
|
||||||
.name = "lp5523:kb5",
|
.name = "lp5523:kb5",
|
||||||
.chan_nr = 7,
|
.chan_nr = 7,
|
||||||
.led_current = 50,
|
.led_current = 50,
|
||||||
|
.max_current = 100,
|
||||||
}, {
|
}, {
|
||||||
.name = "lp5523:kb6",
|
.name = "lp5523:kb6",
|
||||||
.chan_nr = 8,
|
.chan_nr = 8,
|
||||||
.led_current = 50,
|
.led_current = 50,
|
||||||
|
.max_current = 100,
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -272,9 +272,19 @@ static int omap2_onenand_setup_async(void __iomem *onenand_base)
|
||||||
struct gpmc_timings t;
|
struct gpmc_timings t;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if (gpmc_onenand_data->of_node)
|
if (gpmc_onenand_data->of_node) {
|
||||||
gpmc_read_settings_dt(gpmc_onenand_data->of_node,
|
gpmc_read_settings_dt(gpmc_onenand_data->of_node,
|
||||||
&onenand_async);
|
&onenand_async);
|
||||||
|
if (onenand_async.sync_read || onenand_async.sync_write) {
|
||||||
|
if (onenand_async.sync_write)
|
||||||
|
gpmc_onenand_data->flags |=
|
||||||
|
ONENAND_SYNC_READWRITE;
|
||||||
|
else
|
||||||
|
gpmc_onenand_data->flags |= ONENAND_SYNC_READ;
|
||||||
|
onenand_async.sync_read = false;
|
||||||
|
onenand_async.sync_write = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
omap2_onenand_set_async_mode(onenand_base);
|
omap2_onenand_set_async_mode(onenand_base);
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
#define OMAP_PULL_UP (1 << 4)
|
#define OMAP_PULL_UP (1 << 4)
|
||||||
#define OMAP_ALTELECTRICALSEL (1 << 5)
|
#define OMAP_ALTELECTRICALSEL (1 << 5)
|
||||||
|
|
||||||
/* 34xx specific mux bit defines */
|
/* omap3/4/5 specific mux bit defines */
|
||||||
#define OMAP_INPUT_EN (1 << 8)
|
#define OMAP_INPUT_EN (1 << 8)
|
||||||
#define OMAP_OFF_EN (1 << 9)
|
#define OMAP_OFF_EN (1 << 9)
|
||||||
#define OMAP_OFFOUT_EN (1 << 10)
|
#define OMAP_OFFOUT_EN (1 << 10)
|
||||||
|
@ -36,8 +36,6 @@
|
||||||
#define OMAP_OFF_PULL_EN (1 << 12)
|
#define OMAP_OFF_PULL_EN (1 << 12)
|
||||||
#define OMAP_OFF_PULL_UP (1 << 13)
|
#define OMAP_OFF_PULL_UP (1 << 13)
|
||||||
#define OMAP_WAKEUP_EN (1 << 14)
|
#define OMAP_WAKEUP_EN (1 << 14)
|
||||||
|
|
||||||
/* 44xx specific mux bit defines */
|
|
||||||
#define OMAP_WAKEUP_EVENT (1 << 15)
|
#define OMAP_WAKEUP_EVENT (1 << 15)
|
||||||
|
|
||||||
/* Active pin states */
|
/* Active pin states */
|
||||||
|
|
|
@ -628,7 +628,7 @@ void __init omap4_local_timer_init(void)
|
||||||
#endif /* CONFIG_HAVE_ARM_TWD */
|
#endif /* CONFIG_HAVE_ARM_TWD */
|
||||||
#endif /* CONFIG_ARCH_OMAP4 */
|
#endif /* CONFIG_ARCH_OMAP4 */
|
||||||
|
|
||||||
#ifdef CONFIG_SOC_OMAP5
|
#if defined(CONFIG_SOC_OMAP5) || defined(CONFIG_SOC_DRA7XX)
|
||||||
void __init omap5_realtime_timer_init(void)
|
void __init omap5_realtime_timer_init(void)
|
||||||
{
|
{
|
||||||
omap4_sync32k_timer_init();
|
omap4_sync32k_timer_init();
|
||||||
|
@ -636,7 +636,7 @@ void __init omap5_realtime_timer_init(void)
|
||||||
|
|
||||||
clocksource_of_init();
|
clocksource_of_init();
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_SOC_OMAP5 */
|
#endif /* CONFIG_SOC_OMAP5 || CONFIG_SOC_DRA7XX */
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* omap_timer_init - build and register timer device with an
|
* omap_timer_init - build and register timer device with an
|
||||||
|
|
|
@ -1108,9 +1108,9 @@ static const struct pinctrl_map eva_pinctrl_map[] = {
|
||||||
PIN_MAP_MUX_GROUP_DEFAULT("asoc-simple-card.1", "pfc-r8a7740",
|
PIN_MAP_MUX_GROUP_DEFAULT("asoc-simple-card.1", "pfc-r8a7740",
|
||||||
"fsib_mclk_in", "fsib"),
|
"fsib_mclk_in", "fsib"),
|
||||||
/* GETHER */
|
/* GETHER */
|
||||||
PIN_MAP_MUX_GROUP_DEFAULT("sh-eth", "pfc-r8a7740",
|
PIN_MAP_MUX_GROUP_DEFAULT("r8a7740-gether", "pfc-r8a7740",
|
||||||
"gether_mii", "gether"),
|
"gether_mii", "gether"),
|
||||||
PIN_MAP_MUX_GROUP_DEFAULT("sh-eth", "pfc-r8a7740",
|
PIN_MAP_MUX_GROUP_DEFAULT("r8a7740-gether", "pfc-r8a7740",
|
||||||
"gether_int", "gether"),
|
"gether_int", "gether"),
|
||||||
/* HDMI */
|
/* HDMI */
|
||||||
PIN_MAP_MUX_GROUP_DEFAULT("sh-mobile-hdmi", "pfc-r8a7740",
|
PIN_MAP_MUX_GROUP_DEFAULT("sh-mobile-hdmi", "pfc-r8a7740",
|
||||||
|
|
|
@ -29,6 +29,7 @@
|
||||||
#include <linux/pinctrl/machine.h>
|
#include <linux/pinctrl/machine.h>
|
||||||
#include <linux/platform_data/gpio-rcar.h>
|
#include <linux/platform_data/gpio-rcar.h>
|
||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
|
#include <linux/phy.h>
|
||||||
#include <linux/regulator/fixed.h>
|
#include <linux/regulator/fixed.h>
|
||||||
#include <linux/regulator/machine.h>
|
#include <linux/regulator/machine.h>
|
||||||
#include <linux/sh_eth.h>
|
#include <linux/sh_eth.h>
|
||||||
|
@ -155,6 +156,30 @@ static void __init lager_add_standard_devices(void)
|
||||||
ðer_pdata, sizeof(ether_pdata));
|
ðer_pdata, sizeof(ether_pdata));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Ether LEDs on the Lager board are named LINK and ACTIVE which corresponds
|
||||||
|
* to non-default 01 setting of the Micrel KSZ8041 PHY control register 1 bits
|
||||||
|
* 14-15. We have to set them back to 01 from the default 00 value each time
|
||||||
|
* the PHY is reset. It's also important because the PHY's LED0 signal is
|
||||||
|
* connected to SoC's ETH_LINK signal and in the PHY's default mode it will
|
||||||
|
* bounce on and off after each packet, which we apparently want to avoid.
|
||||||
|
*/
|
||||||
|
static int lager_ksz8041_fixup(struct phy_device *phydev)
|
||||||
|
{
|
||||||
|
u16 phyctrl1 = phy_read(phydev, 0x1e);
|
||||||
|
|
||||||
|
phyctrl1 &= ~0xc000;
|
||||||
|
phyctrl1 |= 0x4000;
|
||||||
|
return phy_write(phydev, 0x1e, phyctrl1);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void __init lager_init(void)
|
||||||
|
{
|
||||||
|
lager_add_standard_devices();
|
||||||
|
|
||||||
|
phy_register_fixup_for_id("r8a7790-ether-ff:01", lager_ksz8041_fixup);
|
||||||
|
}
|
||||||
|
|
||||||
static const char *lager_boards_compat_dt[] __initdata = {
|
static const char *lager_boards_compat_dt[] __initdata = {
|
||||||
"renesas,lager",
|
"renesas,lager",
|
||||||
NULL,
|
NULL,
|
||||||
|
@ -163,6 +188,6 @@ static const char *lager_boards_compat_dt[] __initdata = {
|
||||||
DT_MACHINE_START(LAGER_DT, "lager")
|
DT_MACHINE_START(LAGER_DT, "lager")
|
||||||
.init_early = r8a7790_init_delay,
|
.init_early = r8a7790_init_delay,
|
||||||
.init_time = r8a7790_timer_init,
|
.init_time = r8a7790_timer_init,
|
||||||
.init_machine = lager_add_standard_devices,
|
.init_machine = lager_init,
|
||||||
.dt_compat = lager_boards_compat_dt,
|
.dt_compat = lager_boards_compat_dt,
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
|
@ -131,6 +131,16 @@ static void tc2_pm_down(u64 residency)
|
||||||
} else
|
} else
|
||||||
BUG();
|
BUG();
|
||||||
|
|
||||||
|
/*
|
||||||
|
* If the CPU is committed to power down, make sure
|
||||||
|
* the power controller will be in charge of waking it
|
||||||
|
* up upon IRQ, ie IRQ lines are cut from GIC CPU IF
|
||||||
|
* to the CPU by disabling the GIC CPU IF to prevent wfi
|
||||||
|
* from completing execution behind power controller back
|
||||||
|
*/
|
||||||
|
if (!skip_wfi)
|
||||||
|
gic_cpu_if_down();
|
||||||
|
|
||||||
if (last_man && __mcpm_outbound_enter_critical(cpu, cluster)) {
|
if (last_man && __mcpm_outbound_enter_critical(cpu, cluster)) {
|
||||||
arch_spin_unlock(&tc2_pm_lock);
|
arch_spin_unlock(&tc2_pm_lock);
|
||||||
|
|
||||||
|
@ -231,7 +241,6 @@ static void tc2_pm_suspend(u64 residency)
|
||||||
cpu = MPIDR_AFFINITY_LEVEL(mpidr, 0);
|
cpu = MPIDR_AFFINITY_LEVEL(mpidr, 0);
|
||||||
cluster = MPIDR_AFFINITY_LEVEL(mpidr, 1);
|
cluster = MPIDR_AFFINITY_LEVEL(mpidr, 1);
|
||||||
ve_spc_set_resume_addr(cluster, cpu, virt_to_phys(mcpm_entry_point));
|
ve_spc_set_resume_addr(cluster, cpu, virt_to_phys(mcpm_entry_point));
|
||||||
gic_cpu_if_down();
|
|
||||||
tc2_pm_down(residency);
|
tc2_pm_down(residency);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -6,13 +6,6 @@ config FRAME_POINTER
|
||||||
bool
|
bool
|
||||||
default y
|
default y
|
||||||
|
|
||||||
config DEBUG_STACK_USAGE
|
|
||||||
bool "Enable stack utilization instrumentation"
|
|
||||||
depends on DEBUG_KERNEL
|
|
||||||
help
|
|
||||||
Enables the display of the minimum amount of free stack which each
|
|
||||||
task has ever had available in the sysrq-T output.
|
|
||||||
|
|
||||||
config EARLY_PRINTK
|
config EARLY_PRINTK
|
||||||
bool "Early printk support"
|
bool "Early printk support"
|
||||||
default y
|
default y
|
||||||
|
|
|
@ -42,7 +42,7 @@ CONFIG_IP_PNP_BOOTP=y
|
||||||
# CONFIG_WIRELESS is not set
|
# CONFIG_WIRELESS is not set
|
||||||
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
|
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
|
||||||
CONFIG_DEVTMPFS=y
|
CONFIG_DEVTMPFS=y
|
||||||
# CONFIG_BLK_DEV is not set
|
CONFIG_BLK_DEV=y
|
||||||
CONFIG_SCSI=y
|
CONFIG_SCSI=y
|
||||||
# CONFIG_SCSI_PROC_FS is not set
|
# CONFIG_SCSI_PROC_FS is not set
|
||||||
CONFIG_BLK_DEV_SD=y
|
CONFIG_BLK_DEV_SD=y
|
||||||
|
@ -72,6 +72,7 @@ CONFIG_LOGO=y
|
||||||
# CONFIG_IOMMU_SUPPORT is not set
|
# CONFIG_IOMMU_SUPPORT is not set
|
||||||
CONFIG_EXT2_FS=y
|
CONFIG_EXT2_FS=y
|
||||||
CONFIG_EXT3_FS=y
|
CONFIG_EXT3_FS=y
|
||||||
|
CONFIG_EXT4_FS=y
|
||||||
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
|
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
|
||||||
# CONFIG_EXT3_FS_XATTR is not set
|
# CONFIG_EXT3_FS_XATTR is not set
|
||||||
CONFIG_FUSE_FS=y
|
CONFIG_FUSE_FS=y
|
||||||
|
@ -90,3 +91,5 @@ CONFIG_DEBUG_KERNEL=y
|
||||||
CONFIG_DEBUG_INFO=y
|
CONFIG_DEBUG_INFO=y
|
||||||
# CONFIG_FTRACE is not set
|
# CONFIG_FTRACE is not set
|
||||||
CONFIG_ATOMIC64_SELFTEST=y
|
CONFIG_ATOMIC64_SELFTEST=y
|
||||||
|
CONFIG_VIRTIO_MMIO=y
|
||||||
|
CONFIG_VIRTIO_BLK=y
|
||||||
|
|
|
@ -166,9 +166,10 @@ do { \
|
||||||
|
|
||||||
#define get_user(x, ptr) \
|
#define get_user(x, ptr) \
|
||||||
({ \
|
({ \
|
||||||
|
__typeof__(*(ptr)) __user *__p = (ptr); \
|
||||||
might_fault(); \
|
might_fault(); \
|
||||||
access_ok(VERIFY_READ, (ptr), sizeof(*(ptr))) ? \
|
access_ok(VERIFY_READ, __p, sizeof(*__p)) ? \
|
||||||
__get_user((x), (ptr)) : \
|
__get_user((x), __p) : \
|
||||||
((x) = 0, -EFAULT); \
|
((x) = 0, -EFAULT); \
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -227,9 +228,10 @@ do { \
|
||||||
|
|
||||||
#define put_user(x, ptr) \
|
#define put_user(x, ptr) \
|
||||||
({ \
|
({ \
|
||||||
|
__typeof__(*(ptr)) __user *__p = (ptr); \
|
||||||
might_fault(); \
|
might_fault(); \
|
||||||
access_ok(VERIFY_WRITE, (ptr), sizeof(*(ptr))) ? \
|
access_ok(VERIFY_WRITE, __p, sizeof(*__p)) ? \
|
||||||
__put_user((x), (ptr)) : \
|
__put_user((x), __p) : \
|
||||||
-EFAULT; \
|
-EFAULT; \
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
|
@ -80,8 +80,10 @@ void fpsimd_thread_switch(struct task_struct *next)
|
||||||
|
|
||||||
void fpsimd_flush_thread(void)
|
void fpsimd_flush_thread(void)
|
||||||
{
|
{
|
||||||
|
preempt_disable();
|
||||||
memset(¤t->thread.fpsimd_state, 0, sizeof(struct fpsimd_state));
|
memset(¤t->thread.fpsimd_state, 0, sizeof(struct fpsimd_state));
|
||||||
fpsimd_load_state(¤t->thread.fpsimd_state);
|
fpsimd_load_state(¤t->thread.fpsimd_state);
|
||||||
|
preempt_enable();
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_KERNEL_MODE_NEON
|
#ifdef CONFIG_KERNEL_MODE_NEON
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
*/
|
*/
|
||||||
ENTRY(__cpu_flush_user_tlb_range)
|
ENTRY(__cpu_flush_user_tlb_range)
|
||||||
vma_vm_mm x3, x2 // get vma->vm_mm
|
vma_vm_mm x3, x2 // get vma->vm_mm
|
||||||
mmid x3, x3 // get vm_mm->context.id
|
mmid w3, x3 // get vm_mm->context.id
|
||||||
dsb sy
|
dsb sy
|
||||||
lsr x0, x0, #12 // align address
|
lsr x0, x0, #12 // align address
|
||||||
lsr x1, x1, #12
|
lsr x1, x1, #12
|
||||||
|
|
|
@ -1,5 +1,19 @@
|
||||||
|
|
||||||
generic-y += clkdev.h
|
generic-y += clkdev.h
|
||||||
|
generic-y += cputime.h
|
||||||
|
generic-y += delay.h
|
||||||
|
generic-y += device.h
|
||||||
|
generic-y += div64.h
|
||||||
|
generic-y += emergency-restart.h
|
||||||
generic-y += exec.h
|
generic-y += exec.h
|
||||||
generic-y += trace_clock.h
|
generic-y += futex.h
|
||||||
|
generic-y += irq_regs.h
|
||||||
generic-y += param.h
|
generic-y += param.h
|
||||||
|
generic-y += local.h
|
||||||
|
generic-y += local64.h
|
||||||
|
generic-y += percpu.h
|
||||||
|
generic-y += scatterlist.h
|
||||||
|
generic-y += sections.h
|
||||||
|
generic-y += topology.h
|
||||||
|
generic-y += trace_clock.h
|
||||||
|
generic-y += xor.h
|
||||||
|
|
|
@ -1,6 +0,0 @@
|
||||||
#ifndef __ASM_AVR32_CPUTIME_H
|
|
||||||
#define __ASM_AVR32_CPUTIME_H
|
|
||||||
|
|
||||||
#include <asm-generic/cputime.h>
|
|
||||||
|
|
||||||
#endif /* __ASM_AVR32_CPUTIME_H */
|
|
|
@ -1 +0,0 @@
|
||||||
#include <asm-generic/delay.h>
|
|
|
@ -1,7 +0,0 @@
|
||||||
/*
|
|
||||||
* Arch specific extensions to struct device
|
|
||||||
*
|
|
||||||
* This file is released under the GPLv2
|
|
||||||
*/
|
|
||||||
#include <asm-generic/device.h>
|
|
||||||
|
|
|
@ -1,6 +0,0 @@
|
||||||
#ifndef __ASM_AVR32_DIV64_H
|
|
||||||
#define __ASM_AVR32_DIV64_H
|
|
||||||
|
|
||||||
#include <asm-generic/div64.h>
|
|
||||||
|
|
||||||
#endif /* __ASM_AVR32_DIV64_H */
|
|
|
@ -1,6 +0,0 @@
|
||||||
#ifndef __ASM_AVR32_EMERGENCY_RESTART_H
|
|
||||||
#define __ASM_AVR32_EMERGENCY_RESTART_H
|
|
||||||
|
|
||||||
#include <asm-generic/emergency-restart.h>
|
|
||||||
|
|
||||||
#endif /* __ASM_AVR32_EMERGENCY_RESTART_H */
|
|
|
@ -1,6 +0,0 @@
|
||||||
#ifndef __ASM_AVR32_FUTEX_H
|
|
||||||
#define __ASM_AVR32_FUTEX_H
|
|
||||||
|
|
||||||
#include <asm-generic/futex.h>
|
|
||||||
|
|
||||||
#endif /* __ASM_AVR32_FUTEX_H */
|
|
|
@ -1 +0,0 @@
|
||||||
#include <asm-generic/irq_regs.h>
|
|
|
@ -1,6 +0,0 @@
|
||||||
#ifndef __ASM_AVR32_LOCAL_H
|
|
||||||
#define __ASM_AVR32_LOCAL_H
|
|
||||||
|
|
||||||
#include <asm-generic/local.h>
|
|
||||||
|
|
||||||
#endif /* __ASM_AVR32_LOCAL_H */
|
|
|
@ -1 +0,0 @@
|
||||||
#include <asm-generic/local64.h>
|
|
|
@ -1,6 +0,0 @@
|
||||||
#ifndef __ASM_AVR32_PERCPU_H
|
|
||||||
#define __ASM_AVR32_PERCPU_H
|
|
||||||
|
|
||||||
#include <asm-generic/percpu.h>
|
|
||||||
|
|
||||||
#endif /* __ASM_AVR32_PERCPU_H */
|
|
|
@ -1,6 +0,0 @@
|
||||||
#ifndef __ASM_AVR32_SCATTERLIST_H
|
|
||||||
#define __ASM_AVR32_SCATTERLIST_H
|
|
||||||
|
|
||||||
#include <asm-generic/scatterlist.h>
|
|
||||||
|
|
||||||
#endif /* __ASM_AVR32_SCATTERLIST_H */
|
|
|
@ -1,6 +0,0 @@
|
||||||
#ifndef __ASM_AVR32_SECTIONS_H
|
|
||||||
#define __ASM_AVR32_SECTIONS_H
|
|
||||||
|
|
||||||
#include <asm-generic/sections.h>
|
|
||||||
|
|
||||||
#endif /* __ASM_AVR32_SECTIONS_H */
|
|
|
@ -1,6 +0,0 @@
|
||||||
#ifndef __ASM_AVR32_TOPOLOGY_H
|
|
||||||
#define __ASM_AVR32_TOPOLOGY_H
|
|
||||||
|
|
||||||
#include <asm-generic/topology.h>
|
|
||||||
|
|
||||||
#endif /* __ASM_AVR32_TOPOLOGY_H */
|
|
|
@ -1,6 +0,0 @@
|
||||||
#ifndef _ASM_XOR_H
|
|
||||||
#define _ASM_XOR_H
|
|
||||||
|
|
||||||
#include <asm-generic/xor.h>
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -289,7 +289,7 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
|
||||||
memset(childregs, 0, sizeof(struct pt_regs));
|
memset(childregs, 0, sizeof(struct pt_regs));
|
||||||
p->thread.cpu_context.r0 = arg;
|
p->thread.cpu_context.r0 = arg;
|
||||||
p->thread.cpu_context.r1 = usp; /* fn */
|
p->thread.cpu_context.r1 = usp; /* fn */
|
||||||
p->thread.cpu_context.r2 = syscall_return;
|
p->thread.cpu_context.r2 = (unsigned long)syscall_return;
|
||||||
p->thread.cpu_context.pc = (unsigned long)ret_from_kernel_thread;
|
p->thread.cpu_context.pc = (unsigned long)ret_from_kernel_thread;
|
||||||
childregs->sr = MODE_SUPERVISOR;
|
childregs->sr = MODE_SUPERVISOR;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -98,7 +98,14 @@ static void comparator_mode(enum clock_event_mode mode,
|
||||||
case CLOCK_EVT_MODE_SHUTDOWN:
|
case CLOCK_EVT_MODE_SHUTDOWN:
|
||||||
sysreg_write(COMPARE, 0);
|
sysreg_write(COMPARE, 0);
|
||||||
pr_debug("%s: stop\n", evdev->name);
|
pr_debug("%s: stop\n", evdev->name);
|
||||||
cpu_idle_poll_ctrl(false);
|
if (evdev->mode == CLOCK_EVT_MODE_ONESHOT ||
|
||||||
|
evdev->mode == CLOCK_EVT_MODE_RESUME) {
|
||||||
|
/*
|
||||||
|
* Only disable idle poll if we have forced that
|
||||||
|
* in a previous call.
|
||||||
|
*/
|
||||||
|
cpu_idle_poll_ctrl(false);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
BUG();
|
BUG();
|
||||||
|
|
|
@ -276,7 +276,7 @@ static struct platform_device mtx1_pci_host = {
|
||||||
.resource = alchemy_pci_host_res,
|
.resource = alchemy_pci_host_res,
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct __initdata platform_device * mtx1_devs[] = {
|
static struct platform_device *mtx1_devs[] __initdata = {
|
||||||
&mtx1_pci_host,
|
&mtx1_pci_host,
|
||||||
&mtx1_gpio_leds,
|
&mtx1_gpio_leds,
|
||||||
&mtx1_wdt,
|
&mtx1_wdt,
|
||||||
|
|
|
@ -187,7 +187,7 @@
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* MIPS32, MIPS64, VR5500, IDT32332, IDT32334 and maybe a few other
|
* MIPS32, MIPS64, VR5500, IDT32332, IDT32334 and maybe a few other
|
||||||
* pre-MIPS32/MIPS53 processors have CLO, CLZ. The IDT RC64574 is 64-bit and
|
* pre-MIPS32/MIPS64 processors have CLO, CLZ. The IDT RC64574 is 64-bit and
|
||||||
* has CLO and CLZ but not DCLO nor DCLZ. For 64-bit kernels
|
* has CLO and CLZ but not DCLO nor DCLZ. For 64-bit kernels
|
||||||
* cpu_has_clo_clz also indicates the availability of DCLO and DCLZ.
|
* cpu_has_clo_clz also indicates the availability of DCLO and DCLZ.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
static __always_inline bool arch_static_branch(struct static_key *key)
|
static __always_inline bool arch_static_branch(struct static_key *key)
|
||||||
{
|
{
|
||||||
asm goto("1:\tnop\n\t"
|
asm_volatile_goto("1:\tnop\n\t"
|
||||||
"nop\n\t"
|
"nop\n\t"
|
||||||
".pushsection __jump_table, \"aw\"\n\t"
|
".pushsection __jump_table, \"aw\"\n\t"
|
||||||
WORD_INSN " 1b, %l[l_yes], %0\n\t"
|
WORD_INSN " 1b, %l[l_yes], %0\n\t"
|
||||||
|
|
|
@ -73,7 +73,7 @@
|
||||||
3:
|
3:
|
||||||
|
|
||||||
#if defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_SMP)
|
#if defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_SMP)
|
||||||
PTR_L t8, __stack_chk_guard
|
PTR_LA t8, __stack_chk_guard
|
||||||
LONG_L t9, TASK_STACK_CANARY(a1)
|
LONG_L t9, TASK_STACK_CANARY(a1)
|
||||||
LONG_S t9, 0(t8)
|
LONG_S t9, 0(t8)
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -67,7 +67,7 @@ LEAF(resume)
|
||||||
1:
|
1:
|
||||||
|
|
||||||
#if defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_SMP)
|
#if defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_SMP)
|
||||||
PTR_L t8, __stack_chk_guard
|
PTR_LA t8, __stack_chk_guard
|
||||||
LONG_L t9, TASK_STACK_CANARY(a1)
|
LONG_L t9, TASK_STACK_CANARY(a1)
|
||||||
LONG_S t9, 0(t8)
|
LONG_S t9, 0(t8)
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -69,7 +69,7 @@
|
||||||
1:
|
1:
|
||||||
|
|
||||||
#if defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_SMP)
|
#if defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_SMP)
|
||||||
PTR_L t8, __stack_chk_guard
|
PTR_LA t8, __stack_chk_guard
|
||||||
LONG_L t9, TASK_STACK_CANARY(a1)
|
LONG_L t9, TASK_STACK_CANARY(a1)
|
||||||
LONG_S t9, 0(t8)
|
LONG_S t9, 0(t8)
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -609,6 +609,7 @@ static void r4k_dma_cache_wback_inv(unsigned long addr, unsigned long size)
|
||||||
r4k_blast_scache();
|
r4k_blast_scache();
|
||||||
else
|
else
|
||||||
blast_scache_range(addr, addr + size);
|
blast_scache_range(addr, addr + size);
|
||||||
|
preempt_enable();
|
||||||
__sync();
|
__sync();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -650,6 +651,7 @@ static void r4k_dma_cache_inv(unsigned long addr, unsigned long size)
|
||||||
*/
|
*/
|
||||||
blast_inv_scache_range(addr, addr + size);
|
blast_inv_scache_range(addr, addr + size);
|
||||||
}
|
}
|
||||||
|
preempt_enable();
|
||||||
__sync();
|
__sync();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -308,12 +308,10 @@ static void mips_dma_sync_sg_for_cpu(struct device *dev,
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
/* Make sure that gcc doesn't leave the empty loop body. */
|
if (cpu_needs_post_dma_flush(dev))
|
||||||
for (i = 0; i < nelems; i++, sg++) {
|
for (i = 0; i < nelems; i++, sg++)
|
||||||
if (cpu_needs_post_dma_flush(dev))
|
|
||||||
__dma_sync(sg_page(sg), sg->offset, sg->length,
|
__dma_sync(sg_page(sg), sg->offset, sg->length,
|
||||||
direction);
|
direction);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void mips_dma_sync_sg_for_device(struct device *dev,
|
static void mips_dma_sync_sg_for_device(struct device *dev,
|
||||||
|
@ -321,12 +319,10 @@ static void mips_dma_sync_sg_for_device(struct device *dev,
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
/* Make sure that gcc doesn't leave the empty loop body. */
|
if (!plat_device_is_coherent(dev))
|
||||||
for (i = 0; i < nelems; i++, sg++) {
|
for (i = 0; i < nelems; i++, sg++)
|
||||||
if (!plat_device_is_coherent(dev))
|
|
||||||
__dma_sync(sg_page(sg), sg->offset, sg->length,
|
__dma_sync(sg_page(sg), sg->offset, sg->length,
|
||||||
direction);
|
direction);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int mips_dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
|
int mips_dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
|
||||||
|
|
|
@ -14,53 +14,9 @@
|
||||||
* the Free Software Foundation; either version 2 of the License, or
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
* (at your option) any later version.
|
* (at your option) any later version.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <linux/of.h> /* linux/of.h gets to determine #include ordering */
|
|
||||||
|
|
||||||
#ifndef _ASM_OPENRISC_PROM_H
|
#ifndef _ASM_OPENRISC_PROM_H
|
||||||
#define _ASM_OPENRISC_PROM_H
|
#define _ASM_OPENRISC_PROM_H
|
||||||
#ifdef __KERNEL__
|
|
||||||
#ifndef __ASSEMBLY__
|
|
||||||
|
|
||||||
#include <linux/types.h>
|
|
||||||
#include <asm/irq.h>
|
|
||||||
#include <linux/irqdomain.h>
|
|
||||||
#include <linux/atomic.h>
|
|
||||||
#include <linux/of_irq.h>
|
|
||||||
#include <linux/of_fdt.h>
|
|
||||||
#include <linux/of_address.h>
|
|
||||||
#include <linux/proc_fs.h>
|
|
||||||
#include <linux/platform_device.h>
|
|
||||||
#define HAVE_ARCH_DEVTREE_FIXUPS
|
#define HAVE_ARCH_DEVTREE_FIXUPS
|
||||||
|
|
||||||
/* Other Prototypes */
|
|
||||||
extern int early_uartlite_console(void);
|
|
||||||
|
|
||||||
/* Parse the ibm,dma-window property of an OF node into the busno, phys and
|
|
||||||
* size parameters.
|
|
||||||
*/
|
|
||||||
void of_parse_dma_window(struct device_node *dn, const void *dma_window_prop,
|
|
||||||
unsigned long *busno, unsigned long *phys, unsigned long *size);
|
|
||||||
|
|
||||||
extern void kdump_move_device_tree(void);
|
|
||||||
|
|
||||||
/* Get the MAC address */
|
|
||||||
extern const void *of_get_mac_address(struct device_node *np);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* of_irq_map_pci - Resolve the interrupt for a PCI device
|
|
||||||
* @pdev: the device whose interrupt is to be resolved
|
|
||||||
* @out_irq: structure of_irq filled by this function
|
|
||||||
*
|
|
||||||
* This function resolves the PCI interrupt for a given PCI device. If a
|
|
||||||
* device-node exists for a given pci_dev, it will use normal OF tree
|
|
||||||
* walking. If not, it will implement standard swizzling and walk up the
|
|
||||||
* PCI tree until an device-node is found, at which point it will finish
|
|
||||||
* resolving using the OF tree walking.
|
|
||||||
*/
|
|
||||||
struct pci_dev;
|
|
||||||
extern int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq);
|
|
||||||
|
|
||||||
#endif /* __ASSEMBLY__ */
|
|
||||||
#endif /* __KERNEL__ */
|
|
||||||
#endif /* _ASM_OPENRISC_PROM_H */
|
#endif /* _ASM_OPENRISC_PROM_H */
|
||||||
|
|
|
@ -6,7 +6,7 @@ struct pt_regs;
|
||||||
|
|
||||||
/* traps.c */
|
/* traps.c */
|
||||||
void parisc_terminate(char *msg, struct pt_regs *regs,
|
void parisc_terminate(char *msg, struct pt_regs *regs,
|
||||||
int code, unsigned long offset);
|
int code, unsigned long offset) __noreturn __cold;
|
||||||
|
|
||||||
/* mm/fault.c */
|
/* mm/fault.c */
|
||||||
void do_page_fault(struct pt_regs *regs, unsigned long code,
|
void do_page_fault(struct pt_regs *regs, unsigned long code,
|
||||||
|
|
|
@ -602,6 +602,7 @@ flush_cache_page(struct vm_area_struct *vma, unsigned long vmaddr, unsigned long
|
||||||
__flush_cache_page(vma, vmaddr, PFN_PHYS(pfn));
|
__flush_cache_page(vma, vmaddr, PFN_PHYS(pfn));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
EXPORT_SYMBOL_GPL(flush_cache_page);
|
||||||
|
|
||||||
#ifdef CONFIG_PARISC_TMPALIAS
|
#ifdef CONFIG_PARISC_TMPALIAS
|
||||||
|
|
||||||
|
|
|
@ -72,7 +72,6 @@ enum ipi_message_type {
|
||||||
IPI_NOP=0,
|
IPI_NOP=0,
|
||||||
IPI_RESCHEDULE=1,
|
IPI_RESCHEDULE=1,
|
||||||
IPI_CALL_FUNC,
|
IPI_CALL_FUNC,
|
||||||
IPI_CALL_FUNC_SINGLE,
|
|
||||||
IPI_CPU_START,
|
IPI_CPU_START,
|
||||||
IPI_CPU_STOP,
|
IPI_CPU_STOP,
|
||||||
IPI_CPU_TEST
|
IPI_CPU_TEST
|
||||||
|
@ -164,11 +163,6 @@ ipi_interrupt(int irq, void *dev_id)
|
||||||
generic_smp_call_function_interrupt();
|
generic_smp_call_function_interrupt();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case IPI_CALL_FUNC_SINGLE:
|
|
||||||
smp_debug(100, KERN_DEBUG "CPU%d IPI_CALL_FUNC_SINGLE\n", this_cpu);
|
|
||||||
generic_smp_call_function_single_interrupt();
|
|
||||||
break;
|
|
||||||
|
|
||||||
case IPI_CPU_START:
|
case IPI_CPU_START:
|
||||||
smp_debug(100, KERN_DEBUG "CPU%d IPI_CPU_START\n", this_cpu);
|
smp_debug(100, KERN_DEBUG "CPU%d IPI_CPU_START\n", this_cpu);
|
||||||
break;
|
break;
|
||||||
|
@ -260,7 +254,7 @@ void arch_send_call_function_ipi_mask(const struct cpumask *mask)
|
||||||
|
|
||||||
void arch_send_call_function_single_ipi(int cpu)
|
void arch_send_call_function_single_ipi(int cpu)
|
||||||
{
|
{
|
||||||
send_IPI_single(cpu, IPI_CALL_FUNC_SINGLE);
|
send_IPI_single(cpu, IPI_CALL_FUNC);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -291,11 +291,6 @@ void die_if_kernel(char *str, struct pt_regs *regs, long err)
|
||||||
do_exit(SIGSEGV);
|
do_exit(SIGSEGV);
|
||||||
}
|
}
|
||||||
|
|
||||||
int syscall_ipi(int (*syscall) (struct pt_regs *), struct pt_regs *regs)
|
|
||||||
{
|
|
||||||
return syscall(regs);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* gdb uses break 4,8 */
|
/* gdb uses break 4,8 */
|
||||||
#define GDB_BREAK_INSN 0x10004
|
#define GDB_BREAK_INSN 0x10004
|
||||||
static void handle_gdb_break(struct pt_regs *regs, int wot)
|
static void handle_gdb_break(struct pt_regs *regs, int wot)
|
||||||
|
@ -805,14 +800,14 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
|
||||||
else {
|
else {
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The kernel should never fault on its own address space.
|
* The kernel should never fault on its own address space,
|
||||||
|
* unless pagefault_disable() was called before.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if (fault_space == 0)
|
if (fault_space == 0 && !in_atomic())
|
||||||
{
|
{
|
||||||
pdc_chassis_send_status(PDC_CHASSIS_DIRECT_PANIC);
|
pdc_chassis_send_status(PDC_CHASSIS_DIRECT_PANIC);
|
||||||
parisc_terminate("Kernel Fault", regs, code, fault_address);
|
parisc_terminate("Kernel Fault", regs, code, fault_address);
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue