Commit 6b7f0570 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-dt-3.19' of... 

Merge tag 'imx-dt-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt

Pull "The i.MX device tree changes for 3.19" from Shawn Guo:

 - Device additions for board vf610-colibri, pwm, backlight, I2C, RTC,
   ADC etc.
 - Update i.MX6 phyFLEX board to include PCIe, CAN and audio support
 - Improve SSI clocks description for i.MX5 platforms
 - Add ENET2 support for imx6sx-sdb board
 - Add device tree source for LS1021A SoC, board QDS and TWR
 - Enable cpufreq support for i.MX53
 - Enable VPU device support for i.MX6QDL
 - Enable poweroff support for i.MX6 SoCs
 - Add support for TBS2910 Matrix ARM mini PC which is built on i.MX6Q
 - Create generic base device trees for Vybrid and add support for
   Colibri VF50

Note: the change set is built on top of imx-soc-3.19 to resolve the
dependency that  "ARM: dts: imx53: add cpufreq-dt support" uses the
clock define IMX5_CLK_ARM that is added by "ARM: imx53: clk: add ARM
clock".

* tag 'imx-dt-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (51 commits)
  ARM: dts: imx6q-tbs2910: Enable snvs-poweroff
  ARM: dts: imx6: add pm_power_off support for i.mx6 chips
  ARM: dts: vf-colibri: add USB regulators
  ARM: dts: imx6: phyFLEX: Add CAN support
  ARM: dts: imx6: phyFLEX: Add PCIe
  ARM: dts: imx6: phyFLEX: Set correct interrupt for pmic
  ARM: dts: imx6: phyFLEX: Enable gpmi in module file
  ARM: dts: imx6: phyFLEX: set nodes in alphabetical order
  ARM: dts: vf-colibri-eval-v3.dts: Enable ST-M41T0M6 RTC
  ARM: dts: vf-colibri: Add I2C support
  ARM: dts: imx6qdl: Enable CODA960 VPU
  ARM: dts: imx6q-tbs2910: Remove unneeded 'fsl,mode' property
  ARM: dts: vf610: enable USB misc/phy nodes where necessary
  ARM: dts: vf610: use new GPIO support
  ARM: dts: pbab01: enable I2S audio on phyFLEX-i.MX6 boards
  ARM: dts: pbab01: move i2c pins and frequency configuration into pfla02
  ARM: dts: vf500-colibri: add Colibri VF50 support
  ARM: dts: vf610: create generic base device trees
  ARM: dts: vf610: assign oscillator to clock module
  dt-bindings: arm: add Freescale LS1021A SoC device tree binding
  ...

Signed-off-by; Arnd Bergmann <arnd@arndb.de>
parents ea4409cc 96acf9df

Documentation/devicetree/bindings/arm/fsl.txt

+38 −0
Original line number Diff line number Diff line
@@ -74,3 +74,41 @@ Required root node properties: 
i.MX6q generic board

Required root node properties:

    - compatible = "fsl,imx6q";





Freescale LS1021A Platform Device Tree Bindings

------------------------------------------------



Required root node compatible properties:

  - compatible = "fsl,ls1021a";



Freescale LS1021A SoC-specific Device Tree Bindings

-------------------------------------------



Freescale SCFG

  SCFG is the supplemental configuration unit, that provides SoC specific

configuration and status registers for the chip. Such as getting PEX port

status.

  Required properties:

  - compatible: should be "fsl,ls1021a-scfg"

  - reg: should contain base address and length of SCFG memory-mapped registers



Example:

	scfg: scfg@1570000 {

		compatible = "fsl,ls1021a-scfg";

		reg = <0x0 0x1570000 0x0 0x10000>;

	};



Freescale DCFG

  DCFG is the device configuration unit, that provides general purpose

configuration and status for the device. Such as setting the secondary

core start address and release the secondary core from holdoff and startup.

  Required properties:

  - compatible: should be "fsl,ls1021a-dcfg"

  - reg : should contain base address and length of DCFG memory-mapped registers



Example:

	dcfg: dcfg@1ee0000 {

		compatible = "fsl,ls1021a-dcfg";

		reg = <0x0 0x1ee0000 0x0 0x10000>;

	};

Documentation/devicetree/bindings/clock/vf610-clock.txt

+15 −0
Original line number Diff line number Diff line
@@ -5,6 +5,19 @@ Required properties: 
- reg: Address and length of the register set

- #clock-cells: Should be <1>



Optional properties:

- clocks: list of clock identifiers which are external input clocks to the

	given clock controller. Please refer the next section to find

	the input clocks for a given controller.

- clock-names: list of names of clocks which are exteral input clocks to the

	given clock controller.



Input clocks for top clock controller:

	- sxosc (external crystal oscillator 32KHz, recommended)

	- fxosc (external crystal oscillator 24MHz, recommended)

	- audio_ext

	- enet_ext



The clock consumer should specify the desired clock by having the clock

ID in its "clocks" phandle cell. See include/dt-bindings/clock/vf610-clock.h

for the full list of VF610 clock IDs.
@@ -15,6 +28,8 @@ clks: ccm@4006b000 { 
	compatible = "fsl,vf610-ccm";

	reg = <0x4006b000 0x1000>;

	#clock-cells = <1>;

	clocks = <&sxosc>, <&fxosc>;

	clock-names = "sxosc", "fxosc";

};



uart1: serial@40028000 {

Documentation/devicetree/bindings/power_supply/imx-snvs-poweroff.txt

0 → 100644
+23 −0
Original line number Diff line number Diff line 
i.mx6 Poweroff Driver



SNVS_LPCR in SNVS module can power off the whole system by pull

PMIC_ON_REQ low if PMIC_ON_REQ is connected with external PMIC.

If you don't want to use PMIC_ON_REQ as power on/off control,

please set status='disabled' to disable this driver.



Required Properties:

-compatible: "fsl,sec-v4.0-poweroff"

-reg: Specifies the physical address of the SNVS_LPCR register



Example:

	snvs@020cc000 {

		compatible = "fsl,sec-v4.0-mon", "simple-bus";

		#address-cells = <1>;

		#size-cells = <1>;

		ranges = <0 0x020cc000 0x4000>;

		.....

		snvs_poweroff: snvs-poweroff@38 {

			compatible = "fsl,sec-v4.0-poweroff";

			reg = <0x38 0x4>;

		};

	}

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ st STMicroelectronics 
ste	ST-Ericsson

stericsson	ST-Ericsson

synology	Synology, Inc.

tbs	TBS Technologies

thine	THine Electronics, Inc.

ti	Texas Instruments

tlm	Trusted Logic Mobility

arch/arm/boot/dts/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -248,6 +248,7 @@ dtb-$(CONFIG_ARCH_MXC) += \ 
	imx6q-sabrelite.dtb \

	imx6q-sabresd.dtb \

	imx6q-sbc6x.dtb \

	imx6q-tbs2910.dtb \

	imx6q-udoo.dtb \

	imx6q-wandboard.dtb \

	imx6q-wandboard-revb1.dtb \
@@ -258,6 +259,9 @@ dtb-$(CONFIG_ARCH_MXC) += \ 
	imx6q-tx6q-1110.dtb \

	imx6sl-evk.dtb \

	imx6sx-sdb.dtb \

	ls1021a-qds.dtb \

	ls1021a-twr.dtb \

	vf500-colibri-eval-v3.dtb \

	vf610-colibri-eval-v3.dtb \

	vf610-cosmic.dtb \

	vf610-twr.dtb

CRA Git | Maintained and supported by SUSTech CRA and CCSE