summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-11-17Merge branch 'sunxi/fixes-for-3.18' into HEADMaxime Ripard1-0/+4
2014-11-13ARM: dts: sun6i: Add support for the status ledHans de Goede1-0/+18
The Mele M9 / A1000G quad has a blue status led, add support for this. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-11-13ARM: dts: sun6i: Add EHCI support for the M9 boardHans de Goede1-0/+27
The Mele M9 / A1000G quad uses both usb-ports, one goes to an internal usb wifi card, the other to a build-in usb-hub, so neither need their OHCI companion controller to be enabled since the are always connected at USB-2 speeds. The controller which is attached to the wifi also does not need a vbus regulator. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-11-13ARM: dts: sunxi: Add regulator-boot-on property to ahci-5v regulatorHans de Goede1-0/+1
This avoids it getting briefly turned off between when the regulator getting registered and the ahci driver turning it back on, thus avoiding the disk going into emergency head park mode. Reported-by: Bruno Prémont <bonbons@linux-vserver.org> Tested-by: Bruno Prémont <bonbons@linux-vserver.org> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-11-12ARM: dts: sun7i: Cubietruck: add power supply regulator for USB OTG VBUSRoman Byshko1-0/+1
Signed-off-by: Roman Byshko <rbyshko@gmail.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-11-12ARM: dts: sun7i: Cubietruck: override regulator pinRoman Byshko1-0/+13
Cubietruck uses different pin for the USB OTG VBUS that is why we override the one defined in sunxi-common-regulators.dtsi Signed-off-by: Roman Byshko <rbyshko@gmail.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-11-12ARM: sun7i: dtsi: add support for usbphy0Roman Byshko1-2/+2
Signed-off-by: Roman Byshko <rbyshko@gmail.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-11-12ARM: dtsi: sunxi: add common VBUS regulatorRoman Byshko1-0/+19
Until now the regulator nodes for powering USB VBUS existed only for the two host controllers. Now the regulator is added for USB OTG too. Signed-off-by: Roman Byshko <rbyshko@gmail.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-11-12ARM: dts: sunxi: Banana Pi: increase startup-delay for the GMAC PHY regulatorKarsten Merker1-1/+1
On the LeMaker Banana Pi, probing the external ethernet PHY connected to the SoC's internal GMAC module sometimes fails. The PHY power supply is handled via a GPIO-controlled regulator, and the existing regulator startup-delay of 50000us is too short to make sure that the PHY is always fully powered up when it is queried by phylib. Tests have shown that to provide a reliable PHY detection, the startup-delay has to be increased to at least 60000us. To have a certain safety margin and to cater for manufacturing variations between different boards, the delay gets set to 100000us as discussed on the linux-arm-kernel mailinglist. Signed-off-by: Karsten Merker <merker@debian.org> Acked-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-11-11ARM: dts: sunxi: Use sun4i-a10-apb1-clk for sun6i/sun8i apb2 clocks.Chen-Yu Tsai2-20/+4
The apb2 clocks are actually the same as apb1 clocks on the other sunxi platforms, hence compatible with "allwinner,sun4i-a10-apb1-clk". Update the dtsi to use the new unified apb1 clk. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-11-11ARM: dts: sunxi: unify APB1 clockEmilio López4-40/+8
With the new factors infrastructure in place, we can unify apb1 and apb1_mux as a single clock now. Signed-off-by: Emilio López <emilio@elopez.com.ar> [wens@csie.org: Change apb1 node label to "apb1"; reword commit title] Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-11-08ARM: dts: sun6i: Re-parent ahb1_mux to pll6 as required by dma controllerChen-Yu Tsai1-0/+4
The dma controller requires that the ahb1 bus clock be driven by pll6 for peripheral access to work. Previously this was done in the dma controller driver, but was since removed as part of a series to unify the ahb1_mux and ahb1 clock drivers, in 14e0e28 dmaengine: sun6i: Remove obsolete clk muxing code Unfortunately the rest of that series did not make it, leaving us with broken dma on sun6i. This patch reparents ahb1_mux to pll6 using the DT assigned-clocks properties in the dma controller node. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-11-07ARM: sun5i: olinuxino: Relicense the device tree under GPLv2/X11Maxime Ripard1-5/+41
The current GPL only licensing on the DTSI makes it very impractical for other software components licensed under another license. In order to make it easier for them to reuse our device trees, relicense our device trees under a GPL/X11 dual-license. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Olof Johansson <olof@lixom.net> Acked-by: Roman Byshko <rbyshko@gmail.com>
2014-11-07ARM: sun4i: cubieboard: Relicense the device tree under GPLv2/X11Maxime Ripard1-5/+41
The current GPL only licensing on the DTSI makes it very impractical for other software components licensed under another license. In order to make it easier for them to reuse our device trees, relicense our device trees under a GPL/X11 dual-license. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Carlo Caione <carlo@caione.org> Acked-by: Emilio López <emilio@elopez.com.ar> Acked-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Olliver Schinagl <oliver@schinagl.nl> Acked-by: Olof Johansson <olof@lixom.net> Acked-by: Roman Byshko <rbyshko@gmail.com> Acked-by: Stefan Roese <sr@denx.de>
2014-11-05ARM: sun7i: pcduino3: Relicense the device tree under GPLv2/X11Maxime Ripard1-5/+41
The current GPL only licensing on the DTSI makes it very impractical for other software components licensed under another license. In order to make it easier for them to reuse our device trees, relicense our device trees under a GPL/X11 dual-license. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Zoltan HERPAI <wigyori@uid0.hu>
2014-11-05ARM: sun4i: pcduino: Relicense the device tree under GPLv2/X11Maxime Ripard1-5/+41
The current GPL only licensing on the DTSI makes it very impractical for other software components licensed under another license. In order to make it easier for them to reuse our device trees, relicense our device trees under a GPL/X11 dual-license. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Carlo Caione <carlo@caione.org> Acked-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Zoltan HERPAI <wigyori@uid0.hu>
2014-11-04ARM: sun7i: olinuxino lime: Relicense the device tree under GPLv2/X11Maxime Ripard1-5/+41
The current GPL only licensing on the DTSI makes it very impractical for other software components licensed under another license. In order to make it easier for them to reuse our device trees, relicense our device trees under a GPL/X11 dual-license. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: FUKAUMI Naoki <naobsd@gmail.com>
2014-10-31ARM: dts: sun9i: Enable uart4 for A80 Optimus boardChen-Yu Tsai1-0/+11
The A80 Optimus board exposes uart4 on the GPIO expansion header. Enable it so we can use it. Also enable the internal pull-ups, as there doesn't seem to be external pull-up resistors for pins on the expansion header. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-10-31ARM: dts: sun9i: Add uart4 pinmux setting for A80 SoCChen-Yu Tsai1-0/+7
uart4 only has one possible pinmux setting on the A80 SoC. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-10-31ARM: dts: sun9i: Add GPIO LEDs for A80 Optimus boardChen-Yu Tsai1-0/+27
The A80 Optimus board has 3 usable LEDs that are controlled via GPIO. This patch adds support for 2 of them which are driver by GPIOs in the main pin controller. The remaining one uses GPIO from the R_PIO controller, which we don't support yet. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-10-31ARM: dts: sun9i: Enable i2c3 on A80 Optimus boardChen-Yu Tsai1-0/+13
i2c3 is exposed on the GPIO extension header. Enable it so we can use it. Also enable internal pull-ups on the pins, as they don't seem to have external pull-up resistors. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-10-31ARM: dts: sun9i: Add i2c3 pinmux setting for A80 SoCChen-Yu Tsai1-0/+7
i2c3 has only one possible pinmux setting on the A80 SoC. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-10-31ARM: dts: sun9i: Add i2c controller nodes to a80 dtsiChen-Yu Tsai1-0/+55
The A80 has 5 i2c controllers in the main processor block. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-10-30ARM: sun9i: optimus: Set UART0 muxingMaxime Ripard2-0/+9
Enable the UART0 muxing, as set up by the bootloader. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Linus Walleij <linus.walleij@linaro.org>
2014-10-30ARM: sun9i: Enable the A80 pinctrl driverMaxime Ripard1-0/+16
The A80 pinctrl driver is just as usual our pinctrl/gpio/external interrupt controller. Nothing really out of the extraordinary here... Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Linus Walleij <linus.walleij@linaro.org>
2014-10-28ARM: sun4i: a1000: Relicense the device tree under GPLv2/X11Maxime Ripard1-5/+41
The current GPL only licensing on the DTSI makes it very impractical for other software components licensed under another license. In order to make it easier for them to reuse our device trees, relicense our device trees under a GPL/X11 dual-license. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Carlo Caione <carlo@caione.org> Acked-by: Emilio López <emilio@elopez.com.ar> Acked-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Olliver Schinagl <oliver@schinagl.nl> Acked-by: Roman Byshko <rbyshko@gmail.com>
2014-10-28ARM: sunxi: Fix GPLv2 wordingMaxime Ripard9-27/+27
During the GPL to GPL/X11 licensing migration, the GPL notice introduced mentionned the device trees as a library, which is not really accurate. It began to spread by copy and paste. Fix all these library mentions to reflect the file that it's actually just a file. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-10-28ARM: sun6i: app4: Relicense the device tree under GPLv2/X11Maxime Ripard1-5/+41
The current GPL only licensing on the DTSI makes it very impractical for other software components licensed under another license. In order to make it easier for them to reuse our device trees, relicense our device trees under a GPL/X11 dual-license. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
2014-10-21ARM: dts: sun9i: Add basic clocks and reset controlsChen-Yu Tsai1-6/+171
Now that we have driver support for the basic clocks, add them to the dtsi and update existing peripherals. Also add reset controls to match. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-10-21ARM: sun8i: q8h: Relicense the device tree under GPLv2/X11Maxime Ripard1-5/+41
The current GPL only licensing on the DTSI makes it very impractical for other software components licensed under another license. In order to make it easier for them to reuse our device trees, relicense our device trees under a GPL/X11 dual-license. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Chen-Yu Tsai <wens@csie.org>
2014-10-21ARM: sun7i: i12: Relicense the device tree under GPLv2/X11Maxime Ripard1-5/+41
The current GPL only licensing on the DTSI makes it very impractical for other software components licensed under another license. In order to make it easier for them to reuse our device trees, relicense our device trees under a GPL/X11 dual-license. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Carlo Caione <carlo@caione.org> Acked-by: Hans de Goede <hdegoede@redhat.com>
2014-10-21ARM: sun6i: m9: Relicense the device tree under GPLv2/X11Maxime Ripard1-5/+41
The current GPL only licensing on the DTSI makes it very impractical for other software components licensed under another license. In order to make it easier for them to reuse our device trees, relicense our device trees under a GPL/X11 dual-license. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Hans de Goede <hdegoede@redhat.com>
2014-10-21ARM: sun6i: hummingbird: Relicense the device tree under GPLv2/X11Maxime Ripard1-5/+41
The current GPL only licensing on the DTSI makes it very impractical for other software components licensed under another license. In order to make it easier for them to reuse our device trees, relicense our device trees under a GPL/X11 dual-license. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-10-21ARM: sun6i: colombus: Relicense the device tree under GPLv2/X11Maxime Ripard1-5/+41
The current GPL only licensing on the DTSI makes it very impractical for other software components licensed under another license. In order to make it easier for them to reuse our device trees, relicense our device trees under a GPL/X11 dual-license. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-10-21ARM: sun5i: olinuxino micro: Relicense the device tree under GPLv2/X11Maxime Ripard1-7/+41
The current GPL only licensing on the DTSI makes it very impractical for other software components licensed under another license. In order to make it easier for them to reuse our device trees, relicense our device trees under a GPL/X11 dual-license. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Hans de Goede <hdegoede@redhat.com>
2014-10-21ARM: sun5i: r7: Relicense the device tree under GPLv2/X11Maxime Ripard1-5/+41
The current GPL only licensing on the DTSI makes it very impractical for other software components licensed under another license. In order to make it easier for them to reuse our device trees, relicense our device trees under a GPL/X11 dual-license. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Hans de Goede <hdegoede@redhat.com>
2014-10-21ARM: sun5i: olinuxino micro: Relicense the device tree under GPLv2/X11Maxime Ripard1-5/+41
The current GPL only licensing on the DTSI makes it very impractical for other software components licensed under another license. In order to make it easier for them to reuse our device trees, relicense our device trees under a GPL/X11 dual-license. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Emilio López <emilio@elopez.com.ar> Acked-by: Hans de Goede <hdegoede@redhat.com>
2014-10-21ARM: sun4i: olinuxino lime: Relicense the device tree under GPLv2/X11Maxime Ripard1-5/+41
The current GPL only licensing on the DTSI makes it very impractical for other software components licensed under another license. In order to make it easier for them to reuse our device trees, relicense our device trees under a GPL/X11 dual-license. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Carlo Caione <carlo@caione.org> Acked-by: Hans de Goede <hdegoede@redhat.com>
2014-10-21ARM: sun4i: mini xplus: Relicense the device tree under GPLv2/X11Maxime Ripard1-5/+41
The current GPL only licensing on the DTSI makes it very impractical for other software components licensed under another license. In order to make it easier for them to reuse our device trees, relicense our device trees under a GPL/X11 dual-license. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Carlo Caione <carlo@caione.org> Acked-by: Hans de Goede <hdegoede@redhat.com>
2014-10-21ARM: sun4i: inet97fv2: Relicense the device tree under GPLv2/X11Maxime Ripard1-5/+41
The current GPL only licensing on the DTSI makes it very impractical for other software components licensed under another license. In order to make it easier for them to reuse our device trees, relicense our device trees under a GPL/X11 dual-license. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Carlo Caione <carlo@caione.org> Acked-by: David Lanzendörfer <david.lanzendoerfer@o2s.ch> Acked-by: Hans de Goede <hdegoede@redhat.com>
2014-10-21ARM: sun4i: hackberry: Relicense the device tree under GPLv2/X11Maxime Ripard1-5/+41
The current GPL only licensing on the DTSI makes it very impractical for other software components licensed under another license. In order to make it easier for them to reuse our device trees, relicense our device trees under a GPL/X11 dual-license. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Carlo Caione <carlo@caione.org> Acked-by: Hans de Goede <hdegoede@redhat.com>
2014-10-21ARM: sun4i: ba10: Relicense the device tree under GPLv2/X11Maxime Ripard1-5/+41
The current GPL only licensing on the DTSI makes it very impractical for other software components licensed under another license. In order to make it easier for them to reuse our device trees, relicense our device trees under a GPL/X11 dual-license. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Hans de Goede <hdegoede@redhat.com>
2014-10-21ARM: sunxi: regulators: Relicense the device tree under GPLv2/X11Maxime Ripard1-5/+41
The current GPL only licensing on the DTSI makes it very impractical for other software components licensed under another license. In order to make it easier for them to reuse our device trees, relicense our device trees under a GPL/X11 dual-license. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Chen-Yu Tsai <wens@csie.org> Acked-by: Hans de Goede <hdegoede@redhat.com>
2014-10-20ARM: dts: sun9i: Add A80 Optimus Board supportChen-Yu Tsai2-0/+68
The A80 Optimus Board is was launched with the Allwinner A80 SoC. It was jointly developed by Allwinner and Merrii. This board has a UART port, a JTAG connector, USB host ports, a USB 3.0 OTG connector, an HDMI output, a micro SD slot, 8G NAND flash, 4G DRAM, a camera sensor interface, a WiFi/BT combo chip, a headphone jack, IR receiver, and additional GPIO headers. This patch adds only basic support. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Tested-by: Andreas Färber <afaerber@suse.de>
2014-10-20ARM: dts: sunxi: Add Allwinner A80 dtsiChen-Yu Tsai1-0/+257
The Allwinner A80 is a new multi-purpose SoC with 4 Cortex-A7 and 4 Cortex-A15 cores in a big.LITTLE architecture, and a 64-core PowerVR G6230 GPU. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Tested-by: Andreas Färber <afaerber@suse.de>
2014-10-20ARM: sun7i: add support for A20-OLinuXino-Lime2Iain Paton2-0/+229
This adds support for the Olimex A20-OLinuXino-Lime2 https://www.olimex.com/Products/OLinuXino/A20/A20-OLinuXIno-LIME2 Differences to previous Lime boards are 1GB RAM and gigabit ethernet Signed-off-by: Iain Paton <ipaton0@gmail.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-10-20ARM: dts: sun7i: Add Mele M3 boardHans de Goede2-0/+169
The Mele M3 is yet another Allwinnner based Android top set box from Mele. It uses a housing similar to the A2000, but without the USM sata storage slot at the top. It features an A20 SoC, 1G RAM, 4G eMMC (unique for Allwinner devices), 100Mbit ethernet, HDMI out, 3 USB A receptacles, VGA, and A/V OUT connections. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-10-20ARM: dts: sun7i: Add mmc2_pins_a pinctrl definitionHans de Goede1-0/+7
Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-10-20ARM: dts: sun7i: Add Banana Pi boardHans de Goede2-0/+215
The Banana Pi is an A20 based development board using Raspberry Pi compatible IO headers. It comes with 1 GB RAM, 1 Gb ethernet, 2x USB host, sata, hdmi and stereo audio out + various expenansion headers: http://www.lemaker.org/ Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-10-20ARM: dts: sun7i: Add uart3_pins_b pinctrl settingHans de Goede1-0/+7
The uart3_pins_a multiplexes the uart3 pins to port G, add a pinctrl entry for mapping them to port H (as used on the Bananapi). Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>