Commit 23aaaf8d authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'davinci-for-v4.13/dt' of... 

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

Miscellaneous DT support updates for DA850. Includes Lego mindstorms
EV3 battery support, DMA support for MUSB, and non-critical fixes to
GPIO nodes of DA850's GPIO controller and GPIO expander available on
DA850 EVM.

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

:
  ARM: dts: da850-evm: fix tca6416 for use with GPIO hogs
  ARM: dts: da850: Add interrupt-controller property to gpio node
  ARM: dts: da850: Add CPPI 4.1 DMA to USB OTG controller
  ARM: dts: da850-lego-ev3: Add node for LEGO MINDSTORMS EV3 Battery

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents fe6d7199 65878b12

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

+2 −0
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ 
			tca6416: gpio@20 {

				compatible = "ti,tca6416";

				reg = <0x20>;

				gpio-controller;

				#gpio-cells = <2>;

			};

		};

		wdt: wdt@21000 {

arch/arm/boot/dts/da850-lego-ev3.dts

+28 −0
Original line number Diff line number Diff line
@@ -172,6 +172,18 @@ 
		gpio = <&gpio 111 GPIO_ACTIVE_HIGH>;

		enable-active-high;

	};



	/*

	 * The EV3 can use 6-AA batteries or a rechargeable Li-ion battery pack.

	 */

	battery {

		pinctrl-names = "default";

		pintctrl-0 = <&battery_pins>;

		compatible = "lego,ev3-battery";

		io-channels = <&adc 4>, <&adc 3>;

		io-channel-names = "voltage", "current";

		rechargeable-gpios = <&gpio 136 GPIO_ACTIVE_LOW>;

	};

};



&pmx_core {
@@ -228,6 +240,15 @@ 
			0x34 0x00000008 0x0000000f

		>;

	};



	battery_pins: pinmux_battery_pins {

		pinctrl-single,bits = <

			/* GP0[6] */

			0x04 0x00000080 0x000000f0

			/* GP8[8] */

			0x4c 0x00000080 0x000000f0

		>;

	};

};



&pinconf {
@@ -342,6 +363,13 @@ 


&gpio {

	status = "okay";



	/* Don't pull down battery voltage adc io channel */

	batt_volt_en {

		gpio-hog;

		gpios = <6 GPIO_ACTIVE_HIGH>;

		output-low;

	};

};



&usb_phy {

arch/arm/boot/dts/da850.dtsi

+28 −1
Original line number Diff line number Diff line
@@ -446,13 +446,38 @@ 
		};

		usb0: usb@200000 {

			compatible = "ti,da830-musb";

			reg = <0x200000 0x10000>;

			reg = <0x200000 0x1000>;

			ranges;

			interrupts = <58>;

			interrupt-names = "mc";

			dr_mode = "otg";

			phys = <&usb_phy 0>;

			phy-names = "usb-phy";

			status = "disabled";



			#address-cells = <1>;

			#size-cells = <1>;



			dmas = <&cppi41dma 0 0 &cppi41dma 1 0

				&cppi41dma 2 0 &cppi41dma 3 0

				&cppi41dma 0 1 &cppi41dma 1 1

				&cppi41dma 2 1 &cppi41dma 3 1>;

			dma-names =

				"rx1", "rx2", "rx3", "rx4",

				"tx1", "tx2", "tx3", "tx4";



			cppi41dma: dma-controller@201000 {

				compatible = "ti,da830-cppi41";

				reg =  <0x201000 0x1000

					0x202000 0x1000

					0x204000 0x4000>;

				reg-names = "controller",

					    "scheduler", "queuemgr";

				interrupts = <58>;

				#dma-cells = <2>;

				#dma-channels = <4>;

				status = "okay";

			};

		};

		sata: sata@218000 {

			compatible = "ti,da850-ahci";
@@ -503,6 +528,8 @@ 
			ti,ngpio = <144>;

			ti,davinci-gpio-unbanked = <0>;

			status = "disabled";

			interrupt-controller;

			#interrupt-cells = <2>;

		};

		pinconf: pin-controller@22c00c {

			compatible = "ti,da850-pupd";

CRA Git | Maintained and supported by SUSTech CRA and CCSE