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

Merge tag 'davinci-for-v3.11/dt' of... 

Merge tag 'davinci-for-v3.11/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/late

From Sekhar Nori:

Device Tree updates for DaVinci

This patch set updates da850 DTS files to enable use of
C pre-processor. Also updates pinctrl-single DT data
to go with changes done in that module to enable a
single register to service configuration of multiple
pins.

* tag 'davinci-for-v3.11/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci

:
  ARM: davinci: da850: adopt to pinctrl-single change for configuring multiple pins
  ARM: davinci: da850: Use #include for all device trees

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 31c72abb 055cb2a9

arch/arm/boot/dts/da850-enbw-cmc.dts

+1 −1
Original line number Original line Diff line number Diff line
@@ -10,7 +10,7 @@ 
 * option) any later version.

 * option) any later version.

 */

 */

/dts-v1/;

/dts-v1/;

/include/ "da850.dtsi"

#include "da850.dtsi"





/ {

/ {

	compatible = "enbw,cmc", "ti,da850";

	compatible = "enbw,cmc", "ti,da850";

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -8,7 +8,7 @@ 
 * Free Software Foundation, version 2.

 * Free Software Foundation, version 2.

 */

 */

/dts-v1/;

/dts-v1/;

/include/ "da850.dtsi"

#include "da850.dtsi"





/ {

/ {

	compatible = "ti,da850-evm", "ti,da850";

	compatible = "ti,da850-evm", "ti,da850";

arch/arm/boot/dts/da850.dtsi

+2 −2
Original line number Original line Diff line number Diff line
@@ -7,7 +7,7 @@ 
 * Free Software Foundation;  either version 2 of the  License, or (at your

 * Free Software Foundation;  either version 2 of the  License, or (at your

 * option) any later version.

 * option) any later version.

 */

 */

/include/ "skeleton.dtsi"

#include "skeleton.dtsi"





/ {

/ {

	arm {

	arm {
@@ -37,7 +37,7 @@ 
			#size-cells = <0>;

			#size-cells = <0>;

			pinctrl-single,bit-per-mux;

			pinctrl-single,bit-per-mux;

			pinctrl-single,register-width = <32>;

			pinctrl-single,register-width = <32>;

			pinctrl-single,function-mask = <0xffffffff>;

			pinctrl-single,function-mask = <0xf>;

			status = "disabled";

			status = "disabled";





			nand_cs3_pins: pinmux_nand_pins {

			nand_cs3_pins: pinmux_nand_pins {

CRA Git | Maintained and supported by SUSTech CRA and CCSE