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

Commit f4ae176c authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'sunxi-fixes-for-3.10' of git://github.com/mripard/linux into fixes 

From Maxime Ripard:
Small set of fixes for 3.10:
  - Fix build breakage in pinctrl driver when no other architecture is selected
  - Fix Mini X-plus device tree build

* tag 'sunxi-fixes-for-3.10' of git://github.com/mripard/linux

:
  ARM: sunxi: select ARCH_REQUIRE_GPIOLIB
  ARM: sunxi: Fix Mini X-plus device tree build

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 4a0cce79 19a280a6

arch/arm/boot/dts/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -177,7 +177,9 @@ dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-evb.dtb \ 
	spear320-evb.dtb \

	spear320-hmi.dtb

dtb-$(CONFIG_ARCH_SPEAR6XX)+= spear600-evb.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun4i-a10-cubieboard.dtb \

dtb-$(CONFIG_ARCH_SUNXI) += \

	sun4i-a10-cubieboard.dtb \

	sun4i-a10-mini-xplus.dtb \

	sun4i-a10-hackberry.dtb \

	sun5i-a13-olinuxino.dtb

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

arch/arm/boot/dts/sun4i-a10-mini-xplus.dts

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 
		bootargs = "earlyprintk console=ttyS0,115200";

	};



	soc {

		uart0: uart@01c28000 {

	soc@01c20000 {

		uart0: serial@01c28000 {

			pinctrl-names = "default";

			pinctrl-0 = <&uart0_pins_a>;

			status = "okay";

arch/arm/mach-sunxi/Kconfig

+1 −0
Original line number Diff line number Diff line 
config ARCH_SUNXI

	bool "Allwinner A1X SOCs" if ARCH_MULTI_V7

	select ARCH_REQUIRE_GPIOLIB

	select CLKSRC_MMIO

	select CLKSRC_OF

	select COMMON_CLK