Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af947cbf authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'sunxi-dt-for-3.19' of... 

Merge tag 'sunxi-dt-for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/dt

Pull "Allwinner Device Tree Changes for 3.19" from Maxime Ripard:

A lot of things happened during that merge window, but mostly:
  - Preliminary Support for the A80
  - New Boards Support
    + Mele M3
    + Banana Pi
    + Optimus
    + OLinuXino Lime2
  - Device Tree Relicensing to GPLv2/X11 dual license

* tag 'sunxi-dt-for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux

: (52 commits)
  ARM: dts: sun6i: Add ethernet support to M9 board
  ARM: sun6i: DT: Add PLL6 multiple outputs
  ARM: dts: sun6i: Add support for the status led
  ARM: dts: sun6i: Add EHCI support for the M9 board
  ARM: dts: sunxi: Add regulator-boot-on property to ahci-5v regulator
  ARM: dts: sun7i: Cubietruck: add power supply regulator for USB OTG VBUS
  ARM: dts: sun7i: Cubietruck: override regulator pin
  ARM: sun7i: dtsi: add support for usbphy0
  ARM: dtsi: sunxi: add common VBUS regulator
  ARM: dts: sunxi: Banana Pi: increase startup-delay for the GMAC PHY regulator
  ARM: dts: sunxi: Use sun4i-a10-apb1-clk for sun6i/sun8i apb2 clocks.
  ARM: dts: sunxi: unify APB1 clock
  ARM: dts: sun6i: Re-parent ahb1_mux to pll6 as required by dma controller
  ARM: sun5i: olinuxino: Relicense the device tree under GPLv2/X11
  ARM: sun4i: cubieboard: Relicense the device tree under GPLv2/X11
  ARM: sun7i: pcduino3: Relicense the device tree under GPLv2/X11
  ARM: sun4i: pcduino: Relicense the device tree under GPLv2/X11
  ARM: sun7i: olinuxino lime: Relicense the device tree under GPLv2/X11
  ARM: dts: sun9i: Enable uart4 for A80 Optimus board
  ARM: dts: sun9i: Add uart4 pinmux setting for A80 SoC
  ...

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 1eb953d0 2f28e337

arch/arm/boot/dts/Makefile

+5 −0
Original line number Original line Diff line number Diff line
@@ -447,15 +447,20 @@ dtb-$(CONFIG_MACH_SUN6I) += \ 
	sun6i-a31-hummingbird.dtb \

	sun6i-a31-hummingbird.dtb \

	sun6i-a31-m9.dtb

	sun6i-a31-m9.dtb

dtb-$(CONFIG_MACH_SUN7I) += \

dtb-$(CONFIG_MACH_SUN7I) += \

	sun7i-a20-bananapi.dtb \

	sun7i-a20-cubieboard2.dtb \

	sun7i-a20-cubieboard2.dtb \

	sun7i-a20-cubietruck.dtb \

	sun7i-a20-cubietruck.dtb \

	sun7i-a20-hummingbird.dtb \

	sun7i-a20-hummingbird.dtb \

	sun7i-a20-i12-tvbox.dtb \

	sun7i-a20-i12-tvbox.dtb \

	sun7i-a20-m3.dtb \

	sun7i-a20-olinuxino-lime.dtb \

	sun7i-a20-olinuxino-lime.dtb \

	sun7i-a20-olinuxino-lime2.dtb \

	sun7i-a20-olinuxino-micro.dtb \

	sun7i-a20-olinuxino-micro.dtb \

	sun7i-a20-pcduino3.dtb

	sun7i-a20-pcduino3.dtb

dtb-$(CONFIG_MACH_SUN8I) += \

dtb-$(CONFIG_MACH_SUN8I) += \

	sun8i-a23-ippo-q8h-v5.dtb

	sun8i-a23-ippo-q8h-v5.dtb

dtb-$(CONFIG_MACH_SUN9I) += \

	sun9i-a80-optimus.dtb

dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \

dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \

	tegra20-iris-512.dtb \

	tegra20-iris-512.dtb \

	tegra20-medcom-wide.dtb \

	tegra20-medcom-wide.dtb \

arch/arm/boot/dts/sun4i-a10-a1000.dts

+41 −5
Original line number Original line Diff line number Diff line
@@ -3,12 +3,48 @@ 
 *

 *

 * Emilio López <emilio@elopez.com.ar>

 * Emilio López <emilio@elopez.com.ar>

 *

 *

 * The code contained herein is licensed under the GNU General Public

 * This file is dual-licensed: you can use it either under the terms

 * License. You may obtain a copy of the GNU General Public License

 * of the GPL or the X11 license, at your option. Note that this dual

 * Version 2 or later at the following locations:

 * licensing only applies to this file, and not this project as a

 * whole.

 *

 *

 * http://www.opensource.org/licenses/gpl-license.html

 *  a) This file is free software; you can redistribute it and/or

 * http://www.gnu.org/copyleft/gpl.html

 *     modify it under the terms of the GNU General Public License as

 *     published by the Free Software Foundation; either version 2 of the

 *     License, or (at your option) any later version.

 *

 *     This file is distributed in the hope that it will be useful,

 *     but WITHOUT ANY WARRANTY; without even the implied warranty of

 *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *     GNU General Public License for more details.

 *

 *     You should have received a copy of the GNU General Public

 *     License along with this file; if not, write to the Free

 *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,

 *     MA 02110-1301 USA

 *

 * Or, alternatively,

 *

 *  b) Permission is hereby granted, free of charge, to any person

 *     obtaining a copy of this software and associated documentation

 *     files (the "Software"), to deal in the Software without

 *     restriction, including without limitation the rights to use,

 *     copy, modify, merge, publish, distribute, sublicense, and/or

 *     sell copies of the Software, and to permit persons to whom the

 *     Software is furnished to do so, subject to the following

 *     conditions:

 *

 *     The above copyright notice and this permission notice shall be

 *     included in all copies or substantial portions of the Software.

 *

 *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES

 *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

 *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

 *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

 *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 *     OTHER DEALINGS IN THE SOFTWARE.

 */

 */





/dts-v1/;

/dts-v1/;

arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts

+41 −5
Original line number Original line Diff line number Diff line 
/*

/*

 * Copyright 2014 Hans de Goede <hdegoede@redhat.com>

 * Copyright 2014 Hans de Goede <hdegoede@redhat.com>

 *

 *

 * The code contained herein is licensed under the GNU General Public

 * This file is dual-licensed: you can use it either under the terms

 * License. You may obtain a copy of the GNU General Public License

 * of the GPL or the X11 license, at your option. Note that this dual

 * Version 2 or later at the following locations:

 * licensing only applies to this file, and not this project as a

 * whole.

 *

 *

 * http://www.opensource.org/licenses/gpl-license.html

 *  a) This file is free software; you can redistribute it and/or

 * http://www.gnu.org/copyleft/gpl.html

 *     modify it under the terms of the GNU General Public License as

 *     published by the Free Software Foundation; either version 2 of the

 *     License, or (at your option) any later version.

 *

 *     This file is distributed in the hope that it will be useful,

 *     but WITHOUT ANY WARRANTY; without even the implied warranty of

 *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *     GNU General Public License for more details.

 *

 *     You should have received a copy of the GNU General Public

 *     License along with this file; if not, write to the Free

 *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,

 *     MA 02110-1301 USA

 *

 * Or, alternatively,

 *

 *  b) Permission is hereby granted, free of charge, to any person

 *     obtaining a copy of this software and associated documentation

 *     files (the "Software"), to deal in the Software without

 *     restriction, including without limitation the rights to use,

 *     copy, modify, merge, publish, distribute, sublicense, and/or

 *     sell copies of the Software, and to permit persons to whom the

 *     Software is furnished to do so, subject to the following

 *     conditions:

 *

 *     The above copyright notice and this permission notice shall be

 *     included in all copies or substantial portions of the Software.

 *

 *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES

 *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

 *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

 *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

 *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 *     OTHER DEALINGS IN THE SOFTWARE.

 */

 */





/dts-v1/;

/dts-v1/;

arch/arm/boot/dts/sun4i-a10-cubieboard.dts

+41 −5
Original line number Original line Diff line number Diff line
@@ -2,12 +2,48 @@ 
 * Copyright 2012 Stefan Roese

 * Copyright 2012 Stefan Roese

 * Stefan Roese <sr@denx.de>

 * Stefan Roese <sr@denx.de>

 *

 *

 * The code contained herein is licensed under the GNU General Public

 * This file is dual-licensed: you can use it either under the terms

 * License. You may obtain a copy of the GNU General Public License

 * of the GPL or the X11 license, at your option. Note that this dual

 * Version 2 or later at the following locations:

 * licensing only applies to this file, and not this project as a

 * whole.

 *

 *

 * http://www.opensource.org/licenses/gpl-license.html

 *  a) This file is free software; you can redistribute it and/or

 * http://www.gnu.org/copyleft/gpl.html

 *     modify it under the terms of the GNU General Public License as

 *     published by the Free Software Foundation; either version 2 of the

 *     License, or (at your option) any later version.

 *

 *     This file is distributed in the hope that it will be useful,

 *     but WITHOUT ANY WARRANTY; without even the implied warranty of

 *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *     GNU General Public License for more details.

 *

 *     You should have received a copy of the GNU General Public

 *     License along with this file; if not, write to the Free

 *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,

 *     MA 02110-1301 USA

 *

 * Or, alternatively,

 *

 *  b) Permission is hereby granted, free of charge, to any person

 *     obtaining a copy of this software and associated documentation

 *     files (the "Software"), to deal in the Software without

 *     restriction, including without limitation the rights to use,

 *     copy, modify, merge, publish, distribute, sublicense, and/or

 *     sell copies of the Software, and to permit persons to whom the

 *     Software is furnished to do so, subject to the following

 *     conditions:

 *

 *     The above copyright notice and this permission notice shall be

 *     included in all copies or substantial portions of the Software.

 *

 *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES

 *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

 *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

 *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

 *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 *     OTHER DEALINGS IN THE SOFTWARE.

 */

 */





/dts-v1/;

/dts-v1/;

arch/arm/boot/dts/sun4i-a10-hackberry.dts

+41 −5
Original line number Original line Diff line number Diff line
@@ -3,12 +3,48 @@ 
 *

 *

 * Maxime Ripard <maxime.ripard@free-electrons.com>

 * Maxime Ripard <maxime.ripard@free-electrons.com>

 *

 *

 * The code contained herein is licensed under the GNU General Public

 * This file is dual-licensed: you can use it either under the terms

 * License. You may obtain a copy of the GNU General Public License

 * of the GPL or the X11 license, at your option. Note that this dual

 * Version 2 or later at the following locations:

 * licensing only applies to this file, and not this project as a

 * whole.

 *

 *

 * http://www.opensource.org/licenses/gpl-license.html

 *  a) This file is free software; you can redistribute it and/or

 * http://www.gnu.org/copyleft/gpl.html

 *     modify it under the terms of the GNU General Public License as

 *     published by the Free Software Foundation; either version 2 of the

 *     License, or (at your option) any later version.

 *

 *     This file is distributed in the hope that it will be useful,

 *     but WITHOUT ANY WARRANTY; without even the implied warranty of

 *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *     GNU General Public License for more details.

 *

 *     You should have received a copy of the GNU General Public

 *     License along with this file; if not, write to the Free

 *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,

 *     MA 02110-1301 USA

 *

 * Or, alternatively,

 *

 *  b) Permission is hereby granted, free of charge, to any person

 *     obtaining a copy of this software and associated documentation

 *     files (the "Software"), to deal in the Software without

 *     restriction, including without limitation the rights to use,

 *     copy, modify, merge, publish, distribute, sublicense, and/or

 *     sell copies of the Software, and to permit persons to whom the

 *     Software is furnished to do so, subject to the following

 *     conditions:

 *

 *     The above copyright notice and this permission notice shall be

 *     included in all copies or substantial portions of the Software.

 *

 *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES

 *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

 *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

 *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

 *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 *     OTHER DEALINGS IN THE SOFTWARE.

 */

 */





/dts-v1/;

/dts-v1/;