Linus Torvalds
b84da9fa47
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
...
Pull MIPS updates from Ralf Baechle:
"These are the highlists of the main MIPS pull request for 4.4:
- Add latencytop support
- Support appended DTBs
- VDSO support and initially use it for gettimeofday.
- Drop the .MIPS.abiflags and ELF NOTE sections from vmlinux
- Support for the 5KE, an internal test core.
- Switch all MIPS platfroms to libata drivers.
- Improved support, cleanups for ralink and Lantiq platforms.
- Support for the new xilfpga platform.
- A number of DTB improvments for BMIPS.
- Improved support for CM and CPS.
- Minor JZ4740 and BCM47xx enhancements"
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (120 commits)
MIPS: idle: add case for CPU_5KE
MIPS: Octeon: Support APPENDED_DTB
MIPS: vmlinux: create a section for appended DTB
MIPS: Clean up compat_siginfo_t
MIPS: Fix PAGE_MASK definition
MIPS: BMIPS: Enable GZIP ramdisk and timed printks
MIPS: Add xilfpga defconfig
MIPS: xilfpga: Add mipsfpga platform code
MIPS: xilfpga: Add xilfpga device tree files.
dt-bindings: MIPS: Document xilfpga bindings and boot style
MIPS: Make MIPS_CMDLINE_DTB default
MIPS: Make the kernel arguments from dtb available
MIPS: Use USE_OF as the guard for appended dtb
MIPS: BCM63XX: Use pr_* instead of printk
MIPS: Loongson: Cleanup CONFIG_LOONGSON_SUSPEND.
MIPS: lantiq: Disable xbar fpi burst mode
MIPS: lantiq: Force the crossbar to big endian
MIPS: lantiq: Initialize the USB core on boot
MIPS: lantiq: Return correct value for fpi clock on ar9
MIPS: ralink: Add missing clock on rt305x
...
2015-11-15 09:10:53 -08:00
Ralf Baechle
da34232641
Merge branch '4.3-fixes' into mips-for-linux-next
2015-11-12 11:36:03 +01:00
Aurelien Jarno
bf463f2f75
MIPS: idle: add case for CPU_5KE
...
While the 5KE processors have never been taped out, they exists though
a CP0.PRId and experimental RTLs or QEMU implementations. Add a case
entry in the idle code, as they can use the standard idle loop like the
5K processors.
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/11099/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2015-11-12 11:35:48 +01:00
Aaro Koskinen
651d19fb10
MIPS: Octeon: Support APPENDED_DTB
...
Use appended DTB when available.
Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/11115/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2015-11-12 11:35:48 +01:00
Aaro Koskinen
87db537da4
MIPS: vmlinux: create a section for appended DTB
...
For bootloaders that support booting only ELF kernels and load only ELF
segments to memory there is no easy way to supply DTB without kernel
recompilation. For that purpose, create a section called .appended_dtb
that can be later updated with board-specific DTB using binutils e.g. at
kernel installation time.
Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/11114/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2015-11-12 11:35:48 +01:00
Amanieu d'Antras
d00d920338
MIPS: Clean up compat_siginfo_t
...
While mips can't use the generic compat_siginfo_t directly because
its si_code and si_errno are inverted, we can still make it as
close to the generic version as possible. This makes it easier
to update when new members are added to siginfo_t.
The main changes are adding a missing _sigsys union member and
eliminating the unused _irix_sigchld one.
Signed-off-by: Amanieu d'Antras <amanieu@gmail.com >
Cc: linux-kernel@vger.kernel.org
Cc: Oleg Nesterov <oleg@redhat.com >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/11455/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2015-11-12 11:35:47 +01:00
Dan Williams
22b1452399
MIPS: Fix PAGE_MASK definition
...
Make PAGE_MASK an unsigned long, like it is on x86, to avoid:
In file included from arch/mips/kernel/asm-offsets.c:14:0:
include/linux/mm.h: In function '__pfn_to_pfn_t':
include/linux/mm.h:1050:2: warning: left shift count >= width of type
pfn_t pfn_t = { .val = pfn | (flags & PFN_FLAGS_MASK), };
...where PFN_FLAGS_MASK is:
#define PFN_FLAGS_MASK (~PAGE_MASK << (BITS_PER_LONG - PAGE_SHIFT))
Signed-off-by: Dan Williams <dan.j.williams@intel.com >
Cc: ross.zwisler@linux.intel.com
Cc: hch@lst.de
Cc: linux-mips@linux-mips.org
Cc: linux-nvdimm@lists.01.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-mm@kvack.org
Patchwork: https://patchwork.linux-mips.org/patch/11280/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2015-11-12 11:35:47 +01:00
Florian Fainelli
997effa0c1
MIPS: BMIPS: Enable GZIP ramdisk and timed printks
...
Update bmips_be_defconfig and bmips_stb_defconfig to have GZIP ramdisk
support enabled by default as well was timed printks.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com >
Reviewed-by: Kevin Cernekee <cernekee@gmail.com >
Reviewed-by: Dragan Stancevic <dragan.stancevic@gmail.com >
Cc: linux-mips@linux-mips.org
Cc: blogic@openwrt.org
Cc: jogo@openwrt.org
Patchwork: https://patchwork.linux-mips.org/patch/11307/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2015-11-11 09:46:52 +01:00
Zubair Lutfullah Kakakhel
834cc15b44
MIPS: Add xilfpga defconfig
...
Add defconfig for MIPSfpga
Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com >
Cc: robh+dt@kernel.org
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Cc: devicetree@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/11363/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2015-11-11 08:38:45 +01:00
Zubair Lutfullah Kakakhel
9937f5fff8
MIPS: xilfpga: Add mipsfpga platform code
...
The xilfpga platform will be DT only.
Add required platform code.
DT files have already been added separately.
Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com >
Cc: robh+dt@kernel.org
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Cc: devicetree@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/11364/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2015-11-11 08:38:44 +01:00
Zubair Lutfullah Kakakhel
552b8b363e
MIPS: xilfpga: Add xilfpga device tree files.
...
Add device tree files for the MIPSfpga platform.
See Documentation/devicetree/bindings/mips/img/xilfpga.txt
for details about MIPSfpga
Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com >
Cc: robh+dt@kernel.org
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Cc: devicetree@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/11362/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2015-11-11 08:38:42 +01:00
Jonas Gorski
2bcef9b457
MIPS: Make MIPS_CMDLINE_DTB default
...
Seval of-enabled machines (bmips, lantiq, xlp, pistachio, ralink) copied
the arguments from dtb to arcs_command_line to prevent the kernel from
overwriting them.
Since there is now an option to keep the dtb arguments, default to the
new option remove the "backup" to arcs_command_line in case of USE_OF is
enabled, except for those platforms that still take the bootloader
arguments or do not use any at all.
Signed-off-by: Jonas Gorski <jogo@openwrt.org >
Cc: linux-mips@linux-mips.org
Cc: Kevin Cernekee <cernekee@gmail.com >
Cc: Florian Fainelli <f.fainelli@gmail.com >
Cc: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com >
Cc: James Hogan <james.hogan@imgtec.com >
Cc: John Crispin <blogic@openwrt.org >
Cc: Ganesan Ramalingam <ganesanr@broadcom.com >
Cc: Jayachandran C <jchandra@broadcom.com >
Cc: Andrew Bresticker <abrestic@chromium.org >
Cc: James Hartley <james.hartley@imgtec.com >
Patchwork: https://patchwork.linux-mips.org/patch/11285/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2015-11-11 08:38:37 +01:00
Jonas Gorski
2024972ef5
MIPS: Make the kernel arguments from dtb available
...
Similar to how arm allows using selecting between bootloader arguments,
dtb arguments and both, allow to select them on mips. But since we have
less control over the place of the dtb do not modify it but instead use
the boot_command_line for merging them.
The default is "use bootloader arguments" to keep the current behaviour
as default.
Signed-off-by: Jonas Gorski <jogo@openwrt.org >
Cc: linux-mips@linux-mips.org
Cc: Kevin Cernekee <cernekee@gmail.com >
Cc: Florian Fainelli <f.fainelli@gmail.com >
Cc: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com >
Cc: James Hogan <james.hogan@imgtec.com >
Cc: John Crispin <blogic@openwrt.org >
Cc: Ganesan Ramalingam <ganesanr@broadcom.com >
Cc: Jayachandran C <jchandra@broadcom.com >
Cc: Andrew Bresticker <abrestic@chromium.org >
Cc: James Hartley <james.hartley@imgtec.com >
Patchwork: https://patchwork.linux-mips.org/patch/11284/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2015-11-11 08:38:34 +01:00
Jonas Gorski
5b24d52ce2
MIPS: Use USE_OF as the guard for appended dtb
...
Since OF is now a user selectable symbol, the choice for appended dtb
support should only be visible when USE_OF is selected, as this
indicates actual machine support for device tree in MIPS.
Signed-off-by: Jonas Gorski <jogo@openwrt.org >
Cc: linux-mips@linux-mips.org
Cc: Kevin Cernekee <cernekee@gmail.com >
Cc: Florian Fainelli <f.fainelli@gmail.com >
Cc: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com >
Cc: James Hogan <james.hogan@imgtec.com >
Cc: John Crispin <blogic@openwrt.org >
Cc: Ganesan Ramalingam <ganesanr@broadcom.com >
Cc: Jayachandran C <jchandra@broadcom.com >
Cc: Andrew Bresticker <abrestic@chromium.org >
Cc: James Hartley <james.hartley@imgtec.com >
Patchwork: https://patchwork.linux-mips.org/patch/11283/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2015-11-11 08:38:33 +01:00
Gregory Fong
63893ea530
MIPS: BCM63XX: Use pr_* instead of printk
...
Signed-off-by: Gregory Fong <gregory.0xf0@gmail.com >
Cc: Florian Fainelli <f.fainelli@gmail.com >
Cc: Jonas Gorski <jogo@openwrt.org >
Cc: Joe Perches <joe@perches.com >
Cc: Rusty Russell <rusty@rustcorp.com.au >
Cc: Nicolas Schichan <nschichan@freebox.fr >
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/11300/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2015-11-11 08:38:29 +01:00
Huacai Chen
5361832704
MIPS: Loongson: Cleanup CONFIG_LOONGSON_SUSPEND.
...
Now LOONGSON_CHIPCFG register definition doesn't depend on CPUFREQ any
more, so CPU_SUPPORTS_CPUFREQ is no longer needed for suspend/resume.
Remove CONFIG_LOONGSON_SUSPEND and use CONFIG_SUSPEND instead.
Signed-off-by: Huacai Chen <chenhc@lemote.com >
Cc: John Crispin <john@phrozen.org >
Cc: Steven J. Hill <Steven.Hill@imgtec.com >
Cc: Fuxin Zhang <zhangfx@lemote.com >
Cc: Zhangjin Wu <wuzhangjin@gmail.com >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/11274/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2015-11-11 08:38:28 +01:00
John Crispin
08b3c894e5
MIPS: lantiq: Disable xbar fpi burst mode
...
Signed-off-by: John Crispin <blogic@openwrt.org >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/11458/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2015-11-11 08:38:24 +01:00
John Crispin
9eb8c69e0b
MIPS: lantiq: Force the crossbar to big endian
...
Signed-off-by: John Crispin <blogic@openwrt.org >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/11450/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2015-11-11 08:38:23 +01:00
John Crispin
26cfdbe30d
MIPS: lantiq: Initialize the USB core on boot
...
There is a DWC2 USB core in these SoCs. To make USB work we need to first
reset and power the state machine. These are SoC specific registers and
not part of the actual USB core.
Signed-off-by: Antti Seppälä <a.seppala@gmail.com >
Signed-off-by: John Crispin <blogic@openwrt.org >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/11449/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2015-11-11 08:38:21 +01:00
John Crispin
1601078df2
MIPS: lantiq: Return correct value for fpi clock on ar9
...
Some configurations of AR9 reported the incorrect speed for the fpi bus.
Signed-off-by: Ben Mulvihill <ben.mulvihill@gmail.com >
Signed-off-by: John Crispin <blogic@openwrt.org >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/11448/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2015-11-11 08:38:18 +01:00
John Crispin
69ebed7dc9
MIPS: ralink: Add missing clock on rt305x
...
The rt305x support is missing a clock required by the ethernet driver.
Signed-off-by: John Crispin <blogic@openwrt.org >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/11447/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2015-11-11 08:38:15 +01:00
John Crispin
1a93520504
MIPS: ralink: Put the pci bus into reset state before rebooting the SoC
...
Some pcie cards have problems after a reboot without this.
Signed-off-by: John Crispin <blogic@openwrt.org >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/11446/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2015-11-11 08:38:14 +01:00
John Crispin
81ab9f6c5f
MIPS: ralink: Don't set pm_power_off
...
Setting pm_power_off is apprently wrong and makes drivers such as
gpio-poweroff not work.
Signed-off-by: John Crispin <blogic@openwrt.org >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/11445/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2015-11-11 08:38:11 +01:00
John Crispin
bc19f5d677
MIPS: ralink: Remove check for CONFIG_PCI on non-PCI SoCs
...
The code currently panics if PCI is enabled but the SoC has no PCI bus.
This check is superfluous as the driver only loads if enabled in the
devicetree.
Signed-off-by: John Crispin <blogic@openwrt.org >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/11444/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2015-11-11 08:38:10 +01:00
John Crispin
37bcc03f97
MIPS: ralink: Fix invalid tick count
...
The current code adds the delta twice, which is obviously wrong.
Signed-off-by: John Crispin <blogic@openwrt.org >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/11443/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2015-11-11 08:38:04 +01:00