Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-13 07:31:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allwinner fixes for 4.10

Browse Source 
A few fixes here and there to enable the build of some DT leftover, prevent
 display issues or setup a proper muxing.
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJYdR6RAAoJEBx+YmzsjxAgFyYP/iaPKm/rOModJv6lkLjovipj
 SXFkEXzvumc3aV8z4gQLFe5ZUz9/pn+/szI1GIHyf7D7N8B2BED82Sbt2+IGyyTN
 w6DRgHpYrqpG2JdfpIIGVoDiWgQDLXdhM7zMYXv9Jttku/6nvZCd/9jK0an0RDxB
 PxUi+htHhyEb+NS8XHS/lXzM4EpcM87eLaIZ67PN6jZGFILJtVV/LL9kHE3kMECW
 dDZE6QiuPcje5c4a4ry2NNBceYnnf6MTCtxaSySAvz7u+lqyy9T/MSKIApG7LVq4
 lQuXjPkuwzJN+bEA8PyHB1xTxjXW6PozrivqBBLITc70Keyn+gx9QRcev7fGa1cg
 mPI0ecC4DtlSR69IS1HMD2r9ZPChHA7kKAOW15Y/3YX2JOwtnMM7muvvNM/XsqRE
 qXl61LNY+5Qc7RFVnn21/jcOUA9GNqXlYzhWA47WEjDIXQ0IPwoWAzOF4T112RUD
 +m0Of0Xb8jMEMLdkbhSyskavZ8lwvkyIeTQ+TNhTJVxiarxb1RFec57NcGj9wApf
 9zym7V/OyEcUw8/c/hXoGeAjhcUkKu2V07CSRzhKEhZ5FvzwVSc8XWoaZ129stgh
 JV56tmgLGp3uSYd8dZgQJx96S1gCxY+fk4Cv252wP/NYzoKmDH/lDC0TcJ3/U6Vi
 5YmxYsmroCc/bJYgShjn
 =6kp8
 -----END PGP SIGNATURE-----

Merge tag 'sunxi-fixes-for-4.10' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into fixes

Allwinner fixes for 4.10

A few fixes here and there to enable the build of some DT leftover, prevent
display issues or setup a proper muxing.

* tag 'sunxi-fixes-for-4.10' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  ARM: dts: sunxi: Change node name for pwrseq pin on Olinuxino-lime2-emmc
  ARM: dts: sun8i: Support DTB build for NanoPi M1
  ARM: dts: sun6i: hummingbird: Enable display engine again
  ARM: dts: sun6i: Disable display pipeline by default

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2017-01-16 21:45:54 -08:00
commit 927867a4b7
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/boot/dts/Makefile
View File

@ -846,6 +846,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \
sun8i-a83t-allwinner-h8homlet-v2.dtb \
sun8i-a83t-cubietruck-plus.dtb \
sun8i-h3-bananapi-m2-plus.dtb \
sun8i-h3-nanopi-m1.dtb \
sun8i-h3-nanopi-neo.dtb \
sun8i-h3-orangepi-2.dtb \
sun8i-h3-orangepi-lite.dtb \

4
arch/arm/boot/dts/sun6i-a31-hummingbird.dts
View File

@ -140,6 +140,10 @@
cpu-supply = <&reg_dcdc3>;
};
&de {
status = "okay";
};
&ehci0 {
status = "okay";
};

1
arch/arm/boot/dts/sun6i-a31.dtsi
View File

@ -234,6 +234,7 @@
de: display-engine {
compatible = "allwinner,sun6i-a31-display-engine";
allwinner,pipelines = <&fe0>;
status = "disabled";
};
soc@01c00000 {

2
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
View File

@ -56,7 +56,7 @@
};
&pio {
mmc2_pins_nrst: mmc2@0 {
mmc2_pins_nrst: mmc2-rst-pin {
allwinner,pins = "PC16";
allwinner,function = "gpio_out";
allwinner,drive = <SUN4I_PINCTRL_10_MA>;