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

Merge tag 'omap-for-v4.5/dt-pt2' of... 

Merge tag 'omap-for-v4.5/dt-pt2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Second set of omap device tree changes for v4.5 merge window. This series
updates the EDMA bindings based on the various fixes to split EDMA into
separate independent devices. It also adds support for more devices on the
CompuLab cm-t335 and LogicPD Torpedo boards, and enables the new bindings
for qspi for am437x and dra7. There are also few dra7 regulator fixes, and
change of gpoi-key,wakeup to wakeup-source.

These depend on commit ae0add74 ("dmaengine: edma: DT: Change reserved
slot array from 16bit to 32bit type") already merged into mainline.

* tag 'omap-for-v4.5/dt-pt2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: OMAP2+: LogicPD Torpedo: Add Touchscreen Support
  ARM: dts: DRA7-EVM: Add regulator-allow-bypass property for ldo9
  ARM: dts: DRA72-EVM: Add regulator-allow-bypass property for ldo1 and ldo2
  ARM: dts: AM4372: add entry for qspi mmap region
  ARM: dts: DRA7: add entry for qspi mmap region
  ARM: OMAP2+: LogicPD Torpedo: Revert Duplicative Entries
  ARM: OMAP2+: LogicPD Torpedo + Wireless: Add Bluetooth
  ARM: OMAP2+: LogicPD Torpedo: Add LCD Type 15 Support
  ARM: dts: cm-t335: add support for bluetooth
  ARM: dts: cm-t335: add support for DVI/LCD
  ARM: dts: cm-t335: add support for I2C GPIO expander
  ARM: dts: cm-t335: add support for SBC-T335
  ARM: dts: cm-t335: add support for USB0
  ARM: dts: omap: replace legacy *,wakeup property with wakeup-source
  ARM: dts: am335x: replace gpio-key,wakeup with wakeup-source property
  ARM: DTS: am437x: Use the new DT bindings for the eDMA3
  ARM: DTS: am33xx: Use the new DT bindings for the eDMA3
  dmaengine: edma: DT: Change reserved slot array from 16bit to 32bit type
  dmaengine: edma: DT: Change memcpy channel array from 16bit to 32bit type

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents ab7f0bbb 6c95771f

Documentation/devicetree/bindings/arm/omap/omap.txt

+3 −0
Original line number Diff line number Diff line
@@ -141,6 +141,9 @@ Boards: 
- AM335X CM-T335 : System On Module, built around the Sitara AM3352/4

  compatible = "compulab,cm-t335", "ti,am33xx"



- AM335X SBC-T335 : single board computer, built around the Sitara AM3352/4

  compatible = "compulab,sbc-t335", "compulab,cm-t335", "ti,am33xx"



- OMAP5 EVM : Evaluation Module

  compatible = "ti,omap5-evm", "ti,omap5"

Documentation/devicetree/bindings/dma/ti-edma.txt

+4 −6
Original line number Diff line number Diff line
@@ -22,8 +22,7 @@ Required properties: 
Optional properties:

- ti,hwmods:	Name of the hwmods associated to the eDMA CC

- ti,edma-memcpy-channels: List of channels allocated to be used for memcpy, iow

		these channels will be SW triggered channels. The list must

		contain 16 bits numbers, see example.

		these channels will be SW triggered channels. See example.

- ti,edma-reserved-slot-ranges: PaRAM slot ranges which should not be used by

		the driver, they are allocated to be used by for example the

		DSP. See example.
@@ -56,10 +55,9 @@ edma: edma@49000000 { 
	ti,tptcs = <&edma_tptc0 7>, <&edma_tptc1 7>, <&edma_tptc2 0>;



	/* Channel 20 and 21 is allocated for memcpy */

	ti,edma-memcpy-channels = /bits/ 16 <20 21>;

	/* The following PaRAM slots are reserved: 35-45 and 100-110 */

	ti,edma-reserved-slot-ranges = /bits/ 16 <35 10>,

				       /bits/ 16 <100 10>;

	ti,edma-memcpy-channels = <20 21>;

	/* The following PaRAM slots are reserved: 35-44 and 100-109 */

	ti,edma-reserved-slot-ranges = <35 10>, <100 10>;

};



edma_tptc0: tptc@49800000 {

Documentation/devicetree/bindings/spi/ti_qspi.txt

+20 −2
Original line number Diff line number Diff line
@@ -15,14 +15,32 @@ Recommended properties: 
- spi-max-frequency: Definition as per

                     Documentation/devicetree/bindings/spi/spi-bus.txt



Optional properties:

- syscon-chipselects: Handle to system control region contains QSPI

		      chipselect register and offset of that register.



Example:



For am4372:

qspi: qspi@4b300000 {

	compatible = "ti,dra7xxx-qspi";

	reg = <0x47900000 0x100>, <0x30000000 0x3ffffff>;

	compatible = "ti,am4372-qspi";

	reg = <0x47900000 0x100>, <0x30000000 0x4000000>;

	reg-names = "qspi_base", "qspi_mmap";

	#address-cells = <1>;

	#size-cells = <0>;

	spi-max-frequency = <25000000>;

	ti,hwmods = "qspi";

};



For dra7xx:

qspi: qspi@4b300000 {

	compatible = "ti,dra7xxx-qspi";

	reg = <0x4b300000 0x100>,

	      <0x5c000000 0x4000000>,

	reg-names = "qspi_base", "qspi_mmap";

	syscon-chipselects = <&scm_conf 0x558>;

	#address-cells = <1>;

	#size-cells = <0>;

	spi-max-frequency = <48000000>;

	ti,hwmods = "qspi";

};

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -473,6 +473,7 @@ dtb-$(CONFIG_SOC_AM33XX) += \ 
	am335x-nano.dtb \

	am335x-pepper.dtb \

	am335x-shc.dtb \

	am335x-sbc-t335.dtb \

	am335x-sl50.dtb \

	am335x-wega-rdk.dtb

dtb-$(CONFIG_ARCH_OMAP4) += \

arch/arm/boot/dts/am335x-cm-t335.dts

+50 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 


&am33xx_pinmux {

	pinctrl-names = "default";

	pinctrl-0 = <>;

	pinctrl-0 = <&bluetooth_pins>;



	i2c0_pins: pinmux_i2c0_pins {

		pinctrl-single,pins = <
@@ -121,6 +121,19 @@ 
		>;

	};



	uart1_pins: pinmux_uart1_pins {

		pinctrl-single,pins = <

			/* uart1_ctsn.uart1_ctsn */

			AM33XX_IOPAD(0x978, PIN_INPUT | MUX_MODE0)

			/* uart1_rtsn.uart1_rtsn */

			AM33XX_IOPAD(0x97C, PIN_OUTPUT_PULLDOWN | MUX_MODE0)

			/* uart1_rxd.uart1_rxd */

			AM33XX_IOPAD(0x980, PIN_INPUT_PULLUP | MUX_MODE0)

			/* uart1_txd.uart1_txd */

			AM33XX_IOPAD(0x984, PIN_OUTPUT_PULLDOWN | MUX_MODE0)

		>;

	};



	ecap0_pins: pinmux_ecap0_pins {

		pinctrl-single,pins = <

			/* eCAP0_in_PWM0_out.eCAP0_in_PWM0_out MODE0 */
@@ -209,6 +222,14 @@ 
			AM33XX_IOPAD(0x904, PIN_INPUT_PULLUP | MUX_MODE0)

		>;

	};



	/* wl1271 bluetooth */

	bluetooth_pins: pinmux_bluetooth_pins {

		pinctrl-single,pins = <

			/* XDMA_EVENT_INTR0.gpio0_19 - bluetooth enable */

			AM33XX_IOPAD(0x9b0, PIN_OUTPUT_PULLUP | MUX_MODE7)

		>;

	};

};



&uart0 {
@@ -218,6 +239,14 @@ 
	status = "okay";

};



/* WLS1271 bluetooth */

&uart1 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart1_pins>;



status = "okay";

};



&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins>;
@@ -237,6 +266,26 @@ 
	};

};



&usb {

	status = "okay";

};



&usb_ctrl_mod {

	status = "okay";

};



&usb0_phy {

	status = "okay";

};



&usb0 {

	status = "okay";

};



&cppi41dma  {

	status = "okay";

};



&epwmss0 {

	status = "okay";

CRA Git | Maintained and supported by SUSTech CRA and CCSE