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

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

Merge tag 'davinci-for-v4.10/dt-3' of... 

Merge tag 'davinci-for-v4.10/dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/dt

Pull "DaVinci DT updates for v4.10 (part 3)" from Sekhar Nori:

Some fixes for device-tree patches already queued.
- Fix SD card detect polarity
- Prevent Ethernet from picking a random mac address
- Fix error messages on platforms which dont use
  bus master and emif priority settings.

* tag 'davinci-for-v4.10/dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: dts: da850: enable memctrl and mstpri nodes per board
  ARM: dts: da850-lcdk: Add ethernet0 alias to DT
  ARM: dts: da850-lcdk: fix mmc card detect polarity
parents aea09e58 878e908a

arch/arm/boot/dts/da850-lcdk.dts

+10 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


	aliases {

		serial2 = &serial2;

		ethernet0 = &eth0;

	};



	chosen {
@@ -122,7 +123,7 @@ 
	bus-width = <4>;

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	cd-gpios = <&gpio 64 GPIO_ACTIVE_HIGH>;

	cd-gpios = <&gpio 64 GPIO_ACTIVE_LOW>;

	status = "okay";

};
@@ -227,3 +228,11 @@ 
		};

	};

};



&prictrl {

	status = "okay";

};



&memctrl {

	status = "okay";

};

arch/arm/boot/dts/da850.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -213,6 +213,7 @@ 
		prictrl: priority-controller@14110 {

			compatible = "ti,da850-mstpri";

			reg = <0x14110 0x0c>;

			status = "disabled";

		};

		cfgchip: chip-controller@1417c {

			compatible = "ti,da830-cfgchip", "syscon", "simple-mfd";
@@ -468,5 +469,6 @@ 
	memctrl: memory-controller@b0000000 {

		compatible = "ti,da850-ddr-controller";

		reg = <0xb0000000 0xe8>;

		status = "disabled";

	};

};