Commit Graph

9 Commits

Author SHA1 Message Date
Maxime Ripard
fe45174b72 arm: dts: sunxi: Revert EMAC changes
Since the discussion is not settled yet for the EMAC, and that the release
in getting really close, let's revert the changes for now, and we'll
reintroduce them later.

Acked-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2017-08-28 11:11:24 +02:00
Olof Johansson
4daea49941 Allwinner H3 changes for 4.13
This tag is about bringing the EMAC support to the H3 boards.
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABAgAGBQJZQZqLAAoJEBx+YmzsjxAgyn0P/3ZYfm7/aNwEBs7OjDv9mFb+
 0b7nuSd2meiGcJKZXeimrYeFEUUEgFBNB++yHXSkVOpIdgf1RGO5KrCFhqfQcpq4
 uluwtpNoWHeDp5vg1Oa93gJSg31r/a/m0r+Tp+xfDShZUrJr30YSn+7XVammTJov
 KW9SfX2z3re1dB1zsxojPA6CZxuUCzMBGfx/bJ8p9UqKAYdAHcKsLNSlc8ykTG3/
 2FooaMn8pPfeeSq6O8HFJLSFEYc48Hkcyy6ZFDqWoUeG0gLyB8jl/5xfsEEfLllW
 ljvRDT499uoRLpOS4LUMyavSZAiBvyqv2tz+8bMiHqEzTieVWS9UEKDJvsAe+7Js
 jWo5EHvLay3/jRMCdIYmR2xcomiyUxEWwqiCQaNnVOiKB8b+SmznuJZhcPJeTDdD
 SBjn1iTFnl60UAOJ0IKsIta9jdiJ05bmQawpEqVpMvjvDvakLqBXUVH8EDm/wBEH
 T6qY33Yv7dORKEws06duB4+fpQ+T6Gmeihwuyi4t5ogDhXOMrb662uztEaUHb78Q
 7DOL7hunzyhLJYFmPRo6Ot01j1K2mhuD27NbP1WiN2zSf3t0c9m0GZCS2rGfD9vV
 Aw6tccyQed4w3gPxA7AZz91336tIGvMwEVkn0AR6bO0fGrceQ9V80Ff8xaZjtF14
 Pjx3BTBE/9dW1pPqHJlm
 =1g1O
 -----END PGP SIGNATURE-----

Merge tag 'sunxi-dt-h3-for-4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dt

Allwinner H3 changes for 4.13

This tag is about bringing the EMAC support to the H3 boards.

* tag 'sunxi-dt-h3-for-4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  ARM: sun8i: h3: Enable EMAC with external PHY on Orange Pi Plus 2E
  arm: sun8i: orangepi-zero: Enable dwmac-sun8i
  ARM: sun8i: bananapi-m2-plus: Enable dwmac-sun8i
  ARM: sun8i: orangepi-plus: Enable dwmac-sun8i
  arm: sun8i: nanopi-neo: Enable dwmac-sun8i
  arm: sun8i: orangepi-pc-plus: Set EMAC activity LEDs to active high
  arm: sun8i: orangepi-2: Enable dwmac-sun8i
  arm: sun8i: orangepi-one: Enable dwmac-sun8i
  arm: sun8i: orangepi-pc: Enable dwmac-sun8i
  arm: sun8i: sunxi-h3-h5: add dwmac-sun8i ethernet driver
  arm: sun8i: sunxi-h3-h5: Add dt node for the syscon control module
  ARM: sunxi: h3-h5: Convert R_CCU raw numbers to macros

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18 20:43:28 -07:00
Corentin Labbe
252006cf0d arm: sun8i: orangepi-zero: Enable dwmac-sun8i
The dwmac-sun8i hardware is present on the Orange PI Zero.
It uses the internal PHY.

This patch create the needed emac node.

Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2017-06-06 20:09:29 +02:00
Sergey Matyukevich
45857ae954 ARM: dts: orange-pi-zero: add node for SPI NOR
Add node for SPI NOR flash on orange-pi-zero board. Disable this node
by default and leave it to users to enable it if their board has
SPI NOR flash chip populated.

SPI NOR flash was optional in the first production batch in Dec 2016.
In later batches flash chip was pre-populated. However there should
be quite a few boards around which do not have flash chip.

Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2017-05-29 10:30:04 +02:00
Olof Johansson
a9465b581d Allwinner H3 DT changes for 4.12
H3 patches for 4.12, which are mostly related to reworking the H3 DTSI to
 be usable on the arm64 H5 DTSI, that shares almost everything with the H3
 but the CPU cores.
 
 We also have some new device addition (USB, mostly) that would conflict
 otherwise.
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJY5gm5AAoJEBx+YmzsjxAg3R0QAISn8cFytu1xYAdVRsIz+xsU
 4B1X9XFpGj0W9gWCco+6+LHwRyKSAsnGZ1djGNvvbsPiHIUCOHh7BArPBncRcV+B
 Whiuzbt0zhAjFdHGK9LiiouxpsvfSC5oa2o4erN19+PSbDUCL+zdz8KHs8Zi/Cn5
 sJWY6TZocRprSf4oxrsXFbG6Wt0gtO9/tyrqFs5prY5ZEGxcEAC/0XiMBem7UBx/
 dqGkM7kPzd9qNq9YjTikjoeDQh+kJn0aNj8IKmb6ubS+XLcRCNQL2vuPaygr6+RA
 JBn2QXiBCwwqADmhwboBBuBqDtAQAKOVKxXW6qsb4sw6BQMTCqsRrbvYIOnw0L4v
 wWfikT8E5zEO0g1163Mo2Tt2OtmfUp5mF1T+xktiz8RWm9XV3bHMXpk2v337ZaBY
 5m5gUoHj2GJdl6uinsOBLB0RNM5b0Ijp4OEPKIEALOflBWQgbZSRqpKr8dx9Ik5x
 FAyP9xle8VMP2cVXwAqVC3IfnnbI25fuW+nOuSmt5a1f49vWVC2X0VAPivGHxgYH
 hJ+kZnzQJliAP1/xeHfIndvQ86fYykJ3uZMPxJsb5AbZalxNMhqUe1h2OeTwaChU
 CnNzgfAZA0Yha3le6IdPqjZJsfBOaLflha3Ie6sftymgYyhDXLm/QrUU2Fu4W1yj
 dfslnt3VEfTHZGSb6F0L
 =zcf9
 -----END PGP SIGNATURE-----

Merge tag 'sunxi-dt-h3-for-4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dt

Allwinner H3 DT changes for 4.12

H3 patches for 4.12, which are mostly related to reworking the H3 DTSI to
be usable on the arm64 H5 DTSI, that shares almost everything with the H3
but the CPU cores.

We also have some new device addition (USB, mostly) that would conflict
otherwise.

* tag 'sunxi-dt-h3-for-4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  ARM: sun8i: h2+: enable USB OTG for Orange Pi Zero board
  ARM: sun8i: h3: enable USB OTG on Orange Pi One
  ARM: sunxi: h3/h5: add usb_otg and OHCI/EHCI for usbc0 on H3/H5
  arm: sun8i: h3: split Allwinner H3 .dtsi
  arm: sun8i: h3: correct the GIC compatible in H3 to gic-400
  arm: sun8i: h3: drop pinctrl-a10.h inclusion for H3 DTSI
  arm: sun8i: h3: drop skeleton.dtsi inclusion in H3 DTSI

Signed-off-by: Olof Johansson <olof@lixom.net>
2017-04-19 05:39:05 -07:00
Icenowy Zheng
72897fa31f ARM: sun8i: h2+: enable USB OTG for Orange Pi Zero board
Orange Pi Zero board features a USB OTG port, which has a ID pin, and
can be used to power up the board. However, even if the board is powered
via +5V pin in GPIO/expansion headers, the VBUS in the OTG port cannot
be powered up, thus it's impossible to use it in host mode with simple
OTG cables.

Add support for it in peripheral mode.

If someone really want to use it in host mode, the mode of PHY can be
switch via sysfs, then use a powered USB OTG cable or powered USB HUB to
power up external USB devices.

Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>
Acked-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2017-03-27 13:45:32 +02:00
Chen-Yu Tsai
85d2913614 ARM: dts: sunxi: Remove no longer used pinctrl/sun4i-a10.h header
All dts files for the sunxi platform have been switched to the generic
pinconf bindings. As a result, the sunxi specific pinctrl macros are
no longer used.

Remove the #include entry with the following command:

    sed --follow-symlinks -i -e '/pinctrl\/sun4i-a10.h/D' \
	arch/arm/boot/dts/sun?i*.*

arch/arm/boot/dts/sun9i-a80.dtsi was then edited to remove the extra
empty line.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2017-03-27 13:39:58 +02:00
Icenowy Zheng
b5fa16b620 ARM: dts: sun8i: add a delay after reset xr819 on Orange Pi Zero
XR819 seems to need a delay after its reset line to be deasserted,
otherwise it may not respond MMC commands correctly, and fail to
initialize.

Add a 200ms delay in the mmc-pwrseq.

Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2017-01-10 18:52:44 +01:00
Icenowy Zheng
054e52fb60 ARM: dts: sunxi: add support for Orange Pi Zero board
Orange Pi Zero is a board that came with the new Allwinner H2+ SoC and a
SDIO Wi-Fi chip by Allwinner (XR819).

Add a device tree file for it.

Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2017-01-10 18:52:42 +01:00