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

Commit d34c671d authored Apr 18, 2013 by Maxime Ripard

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



Commit b00adbe0 ("ARM: sunxi: Rename uart nodes to serial") changed the
node names in the DTSI, changes that were not accordingly made to the
Mini X-Plus device tree. This breakage slipped through because it was
not properly declared in the Makefile.

Fix both issues.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

parent f722406f

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";