aboutsummaryrefslogtreecommitdiff
path: root/arch
AgeCommit message (Collapse)AuthorFilesLines
2016-09-21dts: sun8i-h3: add pinmux definitions for UART2-3Jorik Jonker1-0/+14
These are the pinmux definitions for UART2-3 on H3. These UARTs can only be muxed to these pins, so _a and @0 do not really make sense. I have left out RTS/CTS, since these are rarely used. These can easily be enabled using an additional pinmux set. Signed-off-by: Jorik Jonker <[email protected]> Signed-off-by: Maxime Ripard <[email protected]>
2016-09-21ARM: dts: sun9i: a80-optimus: Disable EHCI1Chen-Yu Tsai1-2/+4
EHCI1 provides an HSIC interface. This interface is exposed on the board through two pins among the GPIO header. With the PHY now powered up and responding, enabling the interface when nothing is connected results in a lot of error messages: usb 2-1: device descriptor read/64, error -71 usb 2-1: device descriptor read/64, error -71 usb 2-1: new high-speed USB device number 3 using ehci-platform usb 2-1: device descriptor read/64, error -71 usb 2-1: device descriptor read/64, error -71 usb 2-1: new high-speed USB device number 4 using ehci-platform usb 2-1: device not accepting address 4, error -71 usb 2-1: new high-speed USB device number 5 using ehci-platform usb 2-1: device not accepting address 5, error -71 usb usb2-port1: unable to enumerate USB device Disable it by default, but leave the entries in the board DTS. Signed-off-by: Chen-Yu Tsai <[email protected]> Signed-off-by: Maxime Ripard <[email protected]>
2016-09-21ARM: dts: sun9i: cubieboard4: Add AXP806 PMIC device node and regulatorsChen-Yu Tsai1-0/+112
The AXP806 PMIC is the secondary PMIC. It provides various supply voltages for the SoC and other peripherals. The PMIC's interrupt line is connected to NMI pin of the SoC. Signed-off-by: Chen-Yu Tsai <[email protected]> Signed-off-by: Maxime Ripard <[email protected]>
2016-09-21ARM: dts: sun9i: a80-optimus: Add AXP806 PMIC device node and regulatorsChen-Yu Tsai1-0/+113
The AXP806 PMIC is the secondary PMIC. It provides various supply voltages for the SoC and other peripherals. The PMIC's interrupt line is connected to NMI pin of the SoC. Signed-off-by: Chen-Yu Tsai <[email protected]> Signed-off-by: Maxime Ripard <[email protected]>
2016-09-21ARM: dts: sun9i: cubieboard4: Declare AXP809 SW regulator as unusedChen-Yu Tsai1-0/+4
The AXP809's SW (switch) regulator is unused on the Cubieboard 4. Add an empty node for it so that the OS can generate constraints. Signed-off-by: Chen-Yu Tsai <[email protected]> Signed-off-by: Maxime Ripard <[email protected]>
2016-09-21ARM: dts: sun9i: a80-optimus: Declare AXP809 SW regulator as unusedChen-Yu Tsai1-0/+4
The AXP809's SW (switch) regulator is unused on the A80 Optimus. Add an empty node for it so that the OS can generate constraints. Signed-off-by: Chen-Yu Tsai <[email protected]> Signed-off-by: Maxime Ripard <[email protected]>
2016-09-21ARM: dts: sun8i: Add touchscreen node for sun8i-a33-ga10hHans de Goede1-0/+10
The ga10h tablet has a gsl3675 touchscreen, add a dt node describing it. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Maxime Ripard <[email protected]> Acked-by: Chen-Yu Tsai <[email protected]>
2016-09-21ARM: dts: sun8i: Add touchscreen node for sun8i-a23-polaroid-mid2809pxe04Hans de Goede1-0/+9
Add a node enabling the gsl3670 touchscreen controller found on sun8i-a23-polaroid-mid2809pxe04 tablets. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Maxime Ripard <[email protected]> Acked-by: Chen-Yu Tsai <[email protected]>
2016-09-21ARM: dts: sun8i: Add touchscreen node for sun8i-a23-polaroid-mid2407pxe03Hans de Goede1-0/+19
Add a node enabling the gsl1680 touchscreen controller found on sun8i-a23-polaroid-mid2407pxe03 tablets. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Maxime Ripard <[email protected]> Acked-by: Chen-Yu Tsai <[email protected]>
2016-09-21ARM: dts: sun8i: Add touchscreen node for sun8i-a23-inet86dzHans de Goede1-0/+9
The inet86dz tablet has a gsl1680 touchscreen, add a dt node describing it. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Maxime Ripard <[email protected]> Acked-by: Chen-Yu Tsai <[email protected]>
2016-09-21ARM: dts: sun8i: Add touchscreen node for sun8i-a23-gt90hHans de Goede1-0/+9
The gt90h tablet has a gsl3675 touchscreen, add a dt node describing it. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Maxime Ripard <[email protected]> Acked-by: Chen-Yu Tsai <[email protected]>
2016-09-11ARM: dts: gr8: Add support for the GR8 evaluation boardMylène Josserand2-0/+343
The GR8-EVB is a small board with an NextThing GR8, an Hynix MLC NAND, an AXP209 PMIC, USB host and OTG, an SPDIF output and a connectors for CSI, I2S and LCD. Signed-off-by: Mylène Josserand <[email protected]> Signed-off-by: Maxime Ripard <[email protected]> Acked-by: Chen-Yu Tsai <[email protected]>
2016-09-11ARM: dts: Add NextThing GR8 dtsiMylène Josserand1-0/+1087
The GR8 is an SoC made by Nextthing loosely based on the sun5i family. Since it's not clear yet what we can factor out and merge with the A10s and A13 support, let's keep it out of the sun5i.dtsi include tree. We will figure out what can be shared when things settle down. Signed-off-by: Mylène Josserand <[email protected]> Signed-off-by: Maxime Ripard <[email protected]> Acked-by: Chen-Yu Tsai <[email protected]>
2016-09-10ARM: dts: sun8i: Move A23/A33 usbphy and usb_otg nodes to common dtsiChen-Yu Tsai3-64/+50
The usbphy and usb_otg nodes in the A23 and A33 dts files only differ by compatible, and for the usbphy, the size of one of its register regions. Move all the common bits to the A23/A33 common dtsi file. Signed-off-by: Chen-Yu Tsai <[email protected]> Signed-off-by: Maxime Ripard <[email protected]>
2016-09-10ARM: sun8i: a23/a33: Add RGB666 pinsMaxime Ripard1-0/+10
The LCD output needs to be muxed. Add the proper pinctrl node. Signed-off-by: Maxime Ripard <[email protected]> Acked-by: Chen-Yu Tsai <[email protected]>
2016-09-10ARM: sun8i: a33: Add display pipelineMaxime Ripard1-0/+152
Add all the needed blocks to the A33 DTSI. Signed-off-by: Maxime Ripard <[email protected]> Acked-by: Chen-Yu Tsai <[email protected]>
2016-09-10ARM: sun8i: Convert the A23 and A33 to the CCUMaxime Ripard3-306/+75
Now that we have support for the CCU driver in sunxi-ng, convert the A23 and A33 DTs to that driver. Signed-off-by: Maxime Ripard <[email protected]> Acked-by: Chen-Yu Tsai <[email protected]>
2016-09-10ARM: dts: sun6i: switch A31/A31s to new CCU clock bindingsChen-Yu Tsai1-327/+97
Now that we have a different clock representation, switch to it. Signed-off-by: Chen-Yu Tsai <[email protected]> Signed-off-by: Maxime Ripard <[email protected]>
2016-09-06ARM: dts: sun8i: Add dts file for the NanoPi NEO SBCJames Pettigrew2-0/+126
The NanoPi NEO is a minimal H3 based SBC. It comes with 256/512M RAM, a micro SD slot, 10/100Mbit ethernet and a single USB-A port. Signed-off-by: James Pettigrew <[email protected]> Reviewed-by: Rask Ingemann Lambertsen <[email protected]> Signed-off-by: Maxime Ripard <[email protected]>
2016-09-05ARM: dts: sun8i-q8-common: Add support for SDIO wifi controllersHans de Goede1-0/+49
Most of the sun8i q8 boards have an SDIO wifi controller, on the variants which use an USB wifi controller, this will result in a couple of error msg-s in dmesg when proving the sdio bus and an used mmc controller. The best way to deal with wifi on this boards really is to simply let the kernel auto-detect usb or sdio wifi controllers, so we will just have to live with the few errors in dmesg. This has been tested on a23 based q8 tablets with ESP8089, RTL8703AS and RTL8189FTV wifi controllers. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Maxime Ripard <[email protected]>
2016-09-05ARM: dts: sun8i: Add dts file for the Orange Pi Plus2E SBCHans de Goede2-0/+54
The Orange Pi Plus2E is an extended version of the Orange Pi Pc Plus, with 2G RAM and an external gbit ethernet phy. Note currently the dts is pretty much empty (except for including the pc-plus dts), I've a local patch which enables the emac actually making this dts different from the pc-plus one, but that needs the h3 emac driver to get merged first. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Maxime Ripard <[email protected]>
2016-09-05ARM: dts: sun8i: Orange Pi Plus dts is for the Plus and Plus 2Hans de Goede1-1/+1
Update the sun8i-h3-orangepi-plus.dts model string to reflect that it is valid for both the Orange Pi Plus and the Orange Pi Plus 2. This is also meant to help users realize that it is not valid for the new Orange Pi Plus 2E, which will get its own dts. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Maxime Ripard <[email protected]>
2016-08-31ARM: dts: sun8i: Add PWM controller node in H3Milo Kim1-0/+8
Acked-by: Chen-Yu Tsai <[email protected]> Signed-off-by: Milo Kim <[email protected]> Signed-off-by: Maxime Ripard <[email protected]>
2016-08-27ARM: dts: sun8i: Add dts file for inet-d978_rev2 tabletsIcenowy Zheng2-0/+89
The inet-d978_rev2 is a pcb used in generic A33 based tablets. It features volume buttons, micro-usb otg, headphone connector and a power button. On the board a Realtek RTL8723BS SDIO Wi-Fi module are soldered, and there is also a accompanied board which has a Goodix GT9271 soldered. As this board is desired to create tablets with a Home key dealed by GT9271, a LED is present at the front panel at the position of the Home key. Signed-off-by: Icenowy Zheng <[email protected]> Signed-off-by: Maxime Ripard <[email protected]>
2016-08-27ARM: dts: sun9i: Add missing #interrupt-cells to R_PIO pinctrl device nodeChen-Yu Tsai1-2/+1
The R_PIO device node is missing #interrupt-cells, which causes interrupt parsing to fail to match it as a valid interrupt controller. Add #interrupt-cells to it. Also remove the unnecesary #address-cells and #size-cells. Fixes: 1ac56a6da9e1 ("ARM: dts: sun9i: Add A80 R_PIO pin controller device node") Signed-off-by: Chen-Yu Tsai <[email protected]> Signed-off-by: Maxime Ripard <[email protected]>
2016-08-27ARM: dts: sun8i: Rename reference-design-tablet touchscreen nodeHans de Goede1-4/+2
Rename the reference-design-tablet touchscreen node from gsl1680 to touchscreen, all? tablets seem to use the same power and interrupt gpio-s, but not all tablets use a gsl1680 controller making the gsl1680 name somewhat misleading. Also move the reg and compatible property to the actual tablet dts as they may differ per tablet. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Maxime Ripard <[email protected]>
2016-08-27ARM: dts: sun5i: Add dts file for the Empire Electronix M712 tabletHans de Goede2-0/+52
Add a dts file for the Empire Electronix M712 tablet, this is a 7" A13 tablet, with micro-usb (otg), headphone and micro-sd slots on the outside. It uses a Goodix gt811 touchscreen controller, a RTL8188CTV wifi chip and a DMART06 (1238a4) accelerometer. Note currently the dts for this is somewhat empty. This will change once we add support for the touchscreen and accelerometer. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Maxime Ripard <[email protected]>
2016-08-27ARM: dts: sun5i: Convert inet-98v-rev2 dts to use reference-design-tablet.dtsiHans de Goede1-163/+1
This results in a nice cleanup :) Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Maxime Ripard <[email protected]>
2016-08-27ARM: dts: sun4i: Disable ohci1 on ba10-tv-boxHans de Goede1-4/+0
The ehci1/ohci1 pair on the ba10-tv-box is connected to an USB-2 wifi module soldered on the PCB, so there enabling ohci1 is not necessary. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Maxime Ripard <[email protected]>
2016-08-26ARM: dts: sun8i: Add dt node for esp8089 wifi chip on polaroid-mid2809Hans de Goede1-0/+42
The polaroid-mid2809 tablet has an esp8089 wifi chip, add a dt node describing it. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Maxime Ripard <[email protected]>
2016-08-26ARM: dts: sun8i: Add dt node for esp8089 wifi chip on polaroid-mid2407Hans de Goede1-0/+42
The polaroid-mid2407 tablet has an esp8089 wifi chip, add a dt node describing it. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Maxime Ripard <[email protected]>
2016-08-25ARM: dts: sun8i: add NAND controller node for A23/A33Icenowy Zheng1-0/+21
A23/A33 has a NAND controller which can now be used properly. Add a device node for it. The DMA function cannot work because of changed DMA IP block, so it's temporarily removed in the device node. However, with PIO mode it can still work. Tested on an Aoson M751s tablet with Boris Brezillon's "mtd: nand: allow vendor specific detection/initialization" patchset, which is needed for the large-block MLC chip to be recognized correctly. ( http://lists.infradead.org/pipermail/linux-mtd/2016-June/068198.html ) Signed-off-by: Icenowy Zheng <[email protected]> Signed-off-by: Maxime Ripard <[email protected]>
2016-08-22ARM: dts: sun6i: Add new dts file for tablets using the inet-q972 PCBHans de Goede2-0/+101
Add a dts file for tablets using the generic inet-q972 PCB. Tablets with this PCB feature a mini-hdmi output, micro-usb usb-host, micro-usb usb-otg, 3.5mm headphone jack, a micro sd slot, (mini) power-barrel and an usb wifi module. This has been tested on a 9.7" 1024x768 qware qw tb9718-qhd tablet. Signed-off-by: Hans de Goede <[email protected]> Acked-by: Chen-Yu Tsai <[email protected]> Signed-off-by: Maxime Ripard <[email protected]>
2016-08-22ARM: dts: sun6i: Add sun6i-reference-design-tablet.dtsiHans de Goede2-146/+194
Just like with a13/a23/a33 most a31 tablets are derived from the same reference design. Add a .dtsi file with all the common bits to avoid endless copy and pasting of these. The sun6i-reference-design-tablet.dtsi this commit adds is a copy of sun6i-a31s-colorfly-e708-q1.dts with a few tablet specific bits removed / left in sun6i-a31s-colorfly-e708-q1.dts. Signed-off-by: Hans de Goede <[email protected]> Acked-by: Chen-Yu Tsai <[email protected]> Signed-off-by: Maxime Ripard <[email protected]>
2016-08-22ARM: dts: sun6i: colorfly-e708-q1: Remove unused mma8452_int_e708_q1 nodeHans de Goede1-7/+0
The presence of the mma8452_int_e708_q1 node is a copy and paste error, remove it. Signed-off-by: Hans de Goede <[email protected]> Acked-by: Chen-Yu Tsai <[email protected]> Signed-off-by: Maxime Ripard <[email protected]>
2016-08-22ARM: dts: sun9i: Switch to the AC100 RTC clock outputs for osc32kChen-Yu Tsai3-6/+15
The 32.768 kHz clock inside the A80 SoC is fed from an external source, typically the AC100 RTC module. Make the osc32k placeholder a fixed-factor clock so board dts files can specify its source. Signed-off-by: Chen-Yu Tsai <[email protected]> Signed-off-by: Maxime Ripard <[email protected]>
2016-08-22ARM: dts: sun9i: cubieboard4: Add device node for AC100Chen-Yu Tsai1-0/+24
Signed-off-by: Chen-Yu Tsai <[email protected]> Signed-off-by: Maxime Ripard <[email protected]>
2016-08-22ARM: dts: sun9i: a80-optimus: Add device node for AC100Chen-Yu Tsai1-0/+24
Signed-off-by: Chen-Yu Tsai <[email protected]> Signed-off-by: Maxime Ripard <[email protected]>
2016-08-22ARM: dts: sun8i: reference-design-tablet: Add gsl1680 touchscreen nodeHans de Goede1-0/+28
Almost all sun8i tablets use a gsl1680 touchscreen controller, so add a node describing it to reference-design-tablet.dtsi. Almost all, but not all, so mark it as disabled by default (dts files will also need to supply a firmware-name and resolution info). Signed-off-by: Hans de Goede <[email protected]> Acked-by: Chen-Yu Tsai <[email protected]> Signed-off-by: Maxime Ripard <[email protected]>
2016-08-22ARM: dts: sun8i: Add dt node for rtl8703as wifi chip on ga10hHans de Goede1-0/+18
The ga10h tablet has a rtl8703as wifi chip, add a dt node describing it. This enables usage of wifi on this tablet (together with the out of tree rtl8732bs driver). Signed-off-by: Hans de Goede <[email protected]> Acked-by: Chen-Yu Tsai <[email protected]> Signed-off-by: Maxime Ripard <[email protected]>
2016-08-22ARM: dts: sun8i: Use sun8i-reference-design-tablet for gt90h dtsHans de Goede1-191/+1
This results in quite a nice cleanup for this dts file. As an added bonus this also enables full otg support. I've tested that this works as advertised. Signed-off-by: Hans de Goede <[email protected]> Acked-by: Chen-Yu Tsai <[email protected]> Signed-off-by: Maxime Ripard <[email protected]>
2016-08-22ARM: dts: sun8i: Add dts file for the Orange Pi Lite SBCHans de Goede2-0/+179
The Orange Pi Lite SBC is a small H3 based SBC, with 512MB RAM, micro-sd slot, HDMI out, 2 USB-A connectors, 1 micro-USB connector, sdio attached rtl8189ftv wifi and an ir receiver. Signed-off-by: Hans de Goede <[email protected]> Acked-by: Chen-Yu Tsai <[email protected]> Signed-off-by: Maxime Ripard <[email protected]>
2016-08-22ARM: dts: sun8i: Add dts file for Olimex A33-OLinuXinoStefan Mavrodiev2-0/+227
A33-OLinuXino is A33 development board designed by Olimex LTD. It has AXP223 PMU, 1GB DRAM, a micro SD card, one USB-OTG connector, headphone and mic jacks, connector for LiPo battery and optional 4GB NAND Flash. It has two 40-pin headers. One for LCD panel, and one for additional modules. Also there is CSI/DSI connector. Signed-off-by: Stefan Mavrodiev <[email protected]> Signed-off-by: Maxime Ripard <[email protected]>
2016-08-22ARM: sun5i: chip: Add status LEDMaxime Ripard1-0/+10
The CHIP has a status LED connected to one of the AXP GPIOs. Add the gpio-leds node to be able to use the proper LED framework to control it. Signed-off-by: Maxime Ripard <[email protected]>
2016-08-22ARM: dt: axp209: Add AXP209 GPIO driverMaxime Ripard1-0/+6
Add the AXP209 GPIO node to our AXP209 DTSI so that boards can use it. Signed-off-by: Maxime Ripard <[email protected]> Acked-by: Linus Walleij <[email protected]>
2016-08-08ARM: dts: sun8i: Add ethernet1 alias to Orange Pi 2 dtsHans de Goede1-0/+10
This will allow u-boot to fill in a mac-address for Orange Pi 2 variants which use an sdio wifi without an eeprom for the mac. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Maxime Ripard <[email protected]>
2016-08-08ARM: dts: sun8i: Add dts file for the Orange Pi PC Plus SBCHans de Goede2-0/+89
There is a new Orange Pi PC *Plus* version available now, this is an extended version of the regular Orange Pi PC with sdio wifi and an eMMC. Signed-off-by: Hans de Goede <[email protected]> [Maxime: Fix model and compatible] Signed-off-by: Maxime Ripard <[email protected]>
2016-08-08ARM: dts: sun6i-a31s-colorfly-e708-q1: Add full otg supportHans de Goede1-8/+24
Now that we've all the necessary bits in place we can enable full otg support on these tablets. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Maxime Ripard <[email protected]>
2016-08-06Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvmLinus Torvalds13-62/+96
Pull more KVM updates from Paolo Bonzini: - ARM bugfix and MSI injection support - x86 nested virt tweak and OOPS fix - Simplify pvclock code (vdso bits acked by Andy Lutomirski). * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: nvmx: mark ept single context invalidation as supported nvmx: remove comment about missing nested vpid support KVM: lapic: fix access preemption timer stuff even if kernel_irqchip=off KVM: documentation: fix KVM_CAP_X2APIC_API information x86: vdso: use __pvclock_read_cycles pvclock: introduce seqcount-like API arm64: KVM: Set cpsr before spsr on fault injection KVM: arm: vgic-irqfd: Workaround changing kvm_set_routing_entry prototype KVM: arm/arm64: Enable MSI routing KVM: arm/arm64: Enable irqchip routing KVM: Move kvm_setup_default/empty_irq_routing declaration in arch specific header KVM: irqchip: Convey devid to kvm_set_msi KVM: Add devid in kvm_kernel_irq_routing_entry KVM: api: Pass the devid in the msi routing entry
2016-08-06Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds67-795/+1397
Pull MIPS updates from Ralf Baechle: "This is the main pull request for MIPS for 4.8. Also includes is a minor SSB cleanup as SSB code traditionally is merged through the MIPS tree: ATH25: - MIPS: Add default configuration for ath25 Boot: - For zboot, copy appended dtb to the end of the kernel - store the appended dtb address in a variable BPF: - Fix off by one error in offset allocation Cobalt code: - Fix typos Core code: - debugfs_create_file returns NULL on error, so don't use IS_ERR for testing for errors. - Fix double locking issue in RM7000 S-cache code. This would only affect RM7000 ARC systems on reboot. - Fix page table corruption on THP permission changes. - Use compat_sys_keyctl for 32 bit userspace on 64 bit kernels. David says, there are no compatibility issues raised by this fix. - Move some signal code around. - Rewrite r4k count/compare clockevent device registration such that min_delta_ticks/max_delta_ticks files are guaranteed to be initialized. - Only register r4k count/compare as clockevent device if we can assume the clock to be constant. - Fix MSA asm warnings in control reg accessors - uasm and tlbex fixes and tweaking. - Print segment physical address when EU=1. - Define AT_VECTOR_SIZE_ARCH for ARCH_DLINFO. - CP: Allow booting by VP other than VP 0 - Cache handling fixes and optimizations for r4k class caches - Add hotplug support for R6 processors - Cleanup hotplug bits in kconfig - traps: return correct si code for accessing nonmapped addresses - Remove cpu_has_safe_index_cacheops Lantiq: - Register IRQ handler for virtual IRQ number - Fix EIU interrupt loading code - Use the real EXIN count - Fix build error. Loongson 3: - Increase HPET_MIN_PROG_DELTA and decrease HPET_MIN_CYCLES Octeon: - Delete built-in DTB pruning code for D-Link DSR-1000N. - Clean up GPIO definitions in dlink_dsr-1000n.dts. - Add more LEDs to the DSR-100n DTS - Fix off by one in octeon_irq_gpio_map() - Typo fixes - Enable SATA by default in cavium_octeon_defconfig - Support readq/writeq() - Remove forced mappings of USB interrupts. - Ensure DMA descriptors are always in the low 4GB - Improve USB reset code for OCTEON II. Pistachio: - Add maintainers entry for pistachio SoC Support - Remove plat_setup_iocoherency Ralink: - Fix pwm UART in spis group pinmux. SSB: - Change bare unsigned to unsigned int to suit coding style Tools: - Fix reloc tool compiler warnings. Other: - Delete use of ARCH_WANT_OPTIONAL_GPIOLIB" * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (61 commits) MIPS: mm: Fix definition of R6 cache instruction MIPS: tools: Fix relocs tool compiler warnings MIPS: Cobalt: Fix typo MIPS: Octeon: Fix typo MIPS: Lantiq: Fix build failure MIPS: Use CPHYSADDR to implement mips32 __pa MIPS: Octeon: Dlink_dsr-1000n.dts: add more leds. MIPS: Octeon: Clean up GPIO definitions in dlink_dsr-1000n.dts. MIPS: Octeon: Delete built-in DTB pruning code for D-Link DSR-1000N. MIPS: store the appended dtb address in a variable MIPS: ZBOOT: copy appended dtb to the end of the kernel MIPS: ralink: fix spis group pinmux MIPS: Factor o32 specific code into signal_o32.c MIPS: non-exec stack & heap when non-exec PT_GNU_STACK is present MIPS: Use per-mm page to execute branch delay slot instructions MIPS: Modify error handling MIPS: c-r4k: Use SMP calls for CM indexed cache ops MIPS: c-r4k: Avoid small flush_icache_range SMP calls MIPS: c-r4k: Local flush_icache_range cache op override MIPS: c-r4k: Split r4k_flush_kernel_vmap_range() ...