Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

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

Merge "ARM: imx: device tree changes for 3.20" from Shawn Guo:

The i.MX device tree update for 3.20:
 - Update i.MX6 operating-points setting in device tree to match the
   latest i.MX6 data sheet
 - Add i.MX6SX sabreauto board support
 - Add imx6dl-udoo board support based off imx6q-udoo
 - Update sabrelite board to include I2C and HDMI support
 - Update the VPU compatible strings to also use cnm,coda<model>
 - Remove the ocram clock from the VPU node, as the clock is already
   provided inside the ocram node
 - Add system reset controller and syscon-reboot for VF610
 - Update VF610 device tree to use zero based naming for GPIO nodes,
   so that the number scheme matches hardware manual
 - A number of random device additions like watchdog for VF610, sahara
   for i.MX53, QSPI for imx6sx-sdb board, etc.

Note: the branch imx/soc was merged into imx/dt because the SNVS device
tree node needs to refer to the new clock ID added by the imx/soc patch.

* tag 'imx-dt-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux

: (28 commits)
  ARM: dts: imx28-evk: remove duplicate property
  ARM: vf610: use zero based naming for GPIO nodes
  ARM: dts: imx6q: enable dma for ecspi5
  ARM: dts: vfxxx: Add SNVS node
  ARM: imx: clk-vf610: Add clock for SNVS
  ARM: imx: clk-vf610: Add clock for UART4 and UART5
  ARM: imx: drop CPUIDLE_FLAG_TIME_VALID from cpuidle-imx6sx
  ARM: dts: imx6dl-udoo: Add board support based off imx6q-udoo
  ARM: imx: support arm power off in cpuidle for i.mx6sx
  ARM: imx: remove unnecessary setting for DSM
  ARM: dts: imx6sx: add i.mx6sx sabreauto board support
  ARM: dts: imx6sx-sdb: Add QSPI support
  ARM: dts: imx6qdl: Remove OCRAM clock from VPU node
  ARM: imx: apf51dev: add gpio-backlight support
  ARM: imx: correct the hardware clock gate setting for shared nodes
  ARM: imx: pllv3: add shift for frequency multiplier
  ARM vf610: add compatibilty strings of supported Vybrid SoC's
  ARM: i.MX53: dts: add sahara module
  ARM: dts: imx6dl: correct cpufreq volt/freq table
  ARM: dts: imx6q: update cpufreq volt/freq table
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents c6b49164 16baf8dd

Documentation/devicetree/bindings/arm/fsl.txt

+12 −0
Original line number Diff line number Diff line
@@ -75,6 +75,18 @@ i.MX6q generic board 
Required root node properties:

    - compatible = "fsl,imx6q";



Freescale Vybrid Platform Device Tree Bindings

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



For the Vybrid SoC familiy all variants with DDR controller are supported,

which is the VF5xx and VF6xx series. Out of historical reasons, in most

places the kernel uses vf610 to refer to the whole familiy.



Required root node compatible property (one of them):

    - compatible = "fsl,vf500";

    - compatible = "fsl,vf510";

    - compatible = "fsl,vf600";

    - compatible = "fsl,vf610";



Freescale LS1021A Platform Device Tree Bindings

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

arch/arm/boot/dts/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -273,6 +273,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6dl-tx6dl-comtft.dtb \

	imx6dl-tx6u-801x.dtb \

	imx6dl-tx6u-811x.dtb \

	imx6dl-udoo.dtb \

	imx6dl-wandboard.dtb \

	imx6dl-wandboard-revb1.dtb \

	imx6q-arm2.dtb \
@@ -307,6 +308,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
dtb-$(CONFIG_SOC_IMX6SL) += \

	imx6sl-evk.dtb

dtb-$(CONFIG_SOC_IMX6SX) += \

	imx6sx-sabreauto.dtb \

	imx6sx-sdb.dtb

dtb-$(CONFIG_SOC_LS1021A) += \

	ls1021a-qds.dtb \

arch/arm/boot/dts/imx27-apf27dev.dts

+21 −0
Original line number Diff line number Diff line
@@ -59,6 +59,21 @@ 
			linux,default-trigger = "heartbeat";

		};

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		reg_max5821: regulator@0 {

			compatible = "regulator-fixed";

			reg = <0>;

			regulator-name = "max5821-reg";

			regulator-min-microvolt = <2500000>;

			regulator-max-microvolt = <2500000>;

			regulator-always-on;

		};

	};

};



&cspi1 {
@@ -107,6 +122,12 @@ 
		compatible = "dallas,ds1374";

		reg = <0x68>;

	};



	max5821@38 {

		compatible = "maxim,max5821";

		reg = <0x38>;

		vref-supply = <&reg_max5821>;

	};

};



&i2c2 {

arch/arm/boot/dts/imx27.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ 
			};



			coda: coda@10023000 {

				compatible = "fsl,imx27-vpu";

				compatible = "fsl,imx27-vpu", "cnm,codadx6";

				reg = <0x10023000 0x0200>;

				interrupts = <53>;

				clocks = <&clks IMX27_CLK_VPU_BAUD_GATE>,

arch/arm/boot/dts/imx28-evk.dts

+0 −1
Original line number Diff line number Diff line
@@ -182,7 +182,6 @@ 
			};



			lradc@80050000 {

				fsl,lradc-touchscreen-wires = <4>;

				status = "okay";

				fsl,lradc-touchscreen-wires = <4>;

				fsl,ave-ctrl = <4>;