Commit 28295a89 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Merge "Device tree changes for omaps for v4.5 merge window" from Tony Lindgren:

- Update all omaps to use pinctrl macros. This makes comparing the pinmux
  settings against the documentation much earlier. Javier compared the
  checksums of the generated dtb files to make sure nothing changed for
  the dtb files.

- Updates for dm816x

- Add GPMC DMA channels for am437x

- Updates for LogicPD Torpedo

- Basic support for CompuLab cm-t335

- Remove tps65217.dtsi file, we're better off adding SoC generic board
  dtsi files for the common features

- Add support for ELM on am33xx

- Add support for Bosch shc c3 board

- Add qspi aliases for am437x and dra7

- Wake-up support for dra7-evm uart1

- Basic support for CompuLab sbc-t43

- Basic support for CompuLab cl-som-am57x

- Use MMC pwrseq for libertas WLAN on igep0020 and igep0030

* tag 'omap-for-v4.5/dt-pt1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (97 commits)
  ARM: dts: omap3-igep0030: Use MMC pwrseq to init SDIO WiFi
  ARM: dts: omap3-igep0020: Use MMC pwrseq to init SDIO WiFi
  ARM: dts: am57xx: cl-som-am57x: skip resetting ETH PHYs
  ARM: dts: am57xx: sbc-am57x: add HDMI support
  ARM: dts: am57xx: compulab-sb-som: add HDMI connector
  ARM: dts: am57xx: sbc-am57x: add LCD support
  ARM: dts: am57xx: sbc-am57x: add GPIO expander support
  ARM: dts: am57xx: sbc-am57x: add EEPROM support
  ARM: dts: am57xx: sbc-am57x: add usb vbus pinmux
  ARM: dts: am57xx: cl-som-am57x: add MMC1 support
  ARM: dts: am57xx: sbc-am57x: add basic board support
  ARM: dts: am57xx: cl-som-am57x: add analog audio support
  ARM: dts: am57xx: cl-som-am57x: add touchscreen support
  ARM: dts: am57xx: cl-som-am57x: add USB support
  ARM: dts: am57xx: cl-som-am57x: add dual EMAC support
  ARM: dts: am57xx: cl-som-am57x: add spi-flash support
  ARM: dts: am57xx: cl-som-am57x: add eMMC support
  ARM: dts: am57xx: cl-som-am57x: add EEPROM support
  ARM: dts: am57xx: cl-som-am57x: add I2C3 support
  ARM: dts: am57xx: cl-som-am57x: dts: add RTC support
  ...
parents dd270f24 89c6f2e5

Documentation/devicetree/bindings/arm/compulab-boards.txt

0 → 100644
+5 −0
Original line number Diff line number Diff line 
CompuLab SB-SOM is a multi-module baseboard capable of carrying CM-T43, CM-T54,

and CM-QS600 modules with minor modifications to the SB-SOM assembly.



Required root node properties:

    - compatible = should be "compulab,sb-som"

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

+15 −0
Original line number Diff line number Diff line
@@ -138,9 +138,18 @@ Boards: 
- AM335X phyBOARD-WEGA: Single Board Computer dev kit

  compatible = "phytec,am335x-wega", "phytec,am335x-phycore-som", "ti,am33xx"



- AM335X CM-T335 : System On Module, built around the Sitara AM3352/4

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



- OMAP5 EVM : Evaluation Module

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



- AM437x CM-T43

  compatible = "compulab,am437x-cm-t43", "ti,am4372", "ti,am43"



- AM437x SBC-T43

  compatible = "compulab,am437x-sbc-t43", "compulab,am437x-cm-t43", "ti,am4372", "ti,am43"



- AM43x EPOS EVM

  compatible = "ti,am43x-epos-evm", "ti,am4372", "ti,am43"
@@ -150,6 +159,12 @@ Boards: 
- AM437x SK EVM: AM437x StarterKit Evaluation Module

  compatible = "ti,am437x-sk-evm", "ti,am4372", "ti,am43"



- AM57XX CL-SOM-AM57x

  compatible = "compulab,cl-som-am57x", "ti,am5728", "ti,dra742", "ti,dra74", "ti,dra7"



- AM57XX SBC-AM57x

  compatible = "compulab,sbc-am57x", "compulab,cl-som-am57x", "ti,am5728", "ti,dra742", "ti,dra74", "ti,dra7"



- DRA742 EVM:  Software Development Board for DRA742

  compatible = "ti,dra7-evm", "ti,dra742", "ti,dra74", "ti,dra7"

Documentation/devicetree/bindings/display/panel/startek,startek-kd050c.txt

0 → 100644
+4 −0
Original line number Diff line number Diff line 
Startek Electronic Technology Co. KD050C 5.0" WVGA TFT LCD panel



Required properties:

- compatible: should be "startek,startek-kd050c"

Documentation/devicetree/bindings/regulator/tps65217.txt

+10 −0
Original line number Diff line number Diff line
@@ -26,7 +26,11 @@ Example: 
		ti,pmic-shutdown-controller;



		regulators {

			#address-cells = <1>;

			#size-cells = <0>;



			dcdc1_reg: dcdc1 {

				reg = <0>;

				regulator-min-microvolt = <900000>;

				regulator-max-microvolt = <1800000>;

				regulator-boot-on;
@@ -34,6 +38,7 @@ Example: 
			};



			dcdc2_reg: dcdc2 {

				reg = <1>;

				regulator-min-microvolt = <900000>;

				regulator-max-microvolt = <3300000>;

				regulator-boot-on;
@@ -41,6 +46,7 @@ Example: 
			};



			dcdc3_reg: dcc3 {

				reg = <2>;

				regulator-min-microvolt = <900000>;

				regulator-max-microvolt = <1500000>;

				regulator-boot-on;
@@ -48,6 +54,7 @@ Example: 
			};



			ldo1_reg: ldo1 {

				reg = <3>;

				regulator-min-microvolt = <1000000>;

				regulator-max-microvolt = <3300000>;

				regulator-boot-on;
@@ -55,6 +62,7 @@ Example: 
			};



			ldo2_reg: ldo2 {

				reg = <4>;

				regulator-min-microvolt = <900000>;

				regulator-max-microvolt = <3300000>;

				regulator-boot-on;
@@ -62,6 +70,7 @@ Example: 
			};



			ldo3_reg: ldo3 {

				reg = <5>;

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <3300000>;

				regulator-boot-on;
@@ -69,6 +78,7 @@ Example: 
			};



			ldo4_reg: ldo4 {

				reg = <6>;

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <3300000>;

				regulator-boot-on;

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -218,6 +218,7 @@ sony Sony Corporation 
spansion	Spansion Inc.

sprd	Spreadtrum Communications Inc.

st	STMicroelectronics

startek	Startek

ste	ST-Ericsson

stericsson	ST-Ericsson

synology	Synology, Inc.

CRA Git | Maintained and supported by SUSTech CRA and CCSE