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

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

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

The i.MX device tree updates for 4.3:
 - Add audio and eTSEC device support and update dspi node for LS1021A.
 - Add initial i.MX6UL and imx6ul-14x14-evk board support, and enable
   a bunch of device support for i.MX6UL, including RTC, power key, USB,
   QSPI, and dual FEC.
 - Enable HDMI and LVDS dual display support for a few imx6qdl boards.
 - Support of imx6sl-warp board rev1.12, the version which will be
   publicly available for the customers.
 - A few i.MX7D device additions, watchdog, cortex-a7 coresight
   components, RTC, power key, power off.
 - Some Vybrid updates: add device support for I2C, QSPI, eSDHC etc.,
   update ADC node, and define stdout-path property.
 - A few random updates for i.MX27 and i.MX53 devices.

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

: (44 commits)
  ARM: dts: imx6ul: add snvs power key support
  ARM: dts: imx6ul: add RTC support
  ARM: dts: imx6ul: enable GPC as extended interrupt controller
  ARM: dts: imx6sx: correct property name for wakeup source
  ARM: dts: add property for maximum ADC clock frequencies
  ARM: dts: imx7d: enable snvs rtc, onoffkey and power off
  ARM: dts: imx6ul-14x14-evk: add fec1 and fec2 support
  ARM: dts: imx: add fec1 and fec2 nodes for SOC i.MX6UL
  ARM: dts: imx27: add support of internal rtc
  ARM: dts: vf-colibri: define stdout-path property
  ARM: dts: ls1021a: Enable the eTSEC ports on QDS and TWR
  ARM: dts: ls1021a: Add the eTSEC controller nodes
  ARM: dts: imx6ul: add qspi support
  ARM: dts: imx6ul: fix low case define in imx6ul-pinfunc.h
  ARM: dts: imx6ul: add usb host and function support
  ARM: dts: vfxxx: Add io-channel-cells property for ADC node
  ARM: dts: ls1021a: Add dts nodes for audio on LS1021A
  ARM: imx6qdl-sabreauto.dtsi: enable USB support
  ARM: dts: imx: update snvs to use syscon access register
  ARM: dts: imx: add imx6ul and imx6ul evk board support
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents e7895461 36032575

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

0 → 100644
+13 −0
Original line number Diff line number Diff line 
* Clock bindings for Freescale i.MX6 UltraLite



Required properties:

- compatible: Should be "fsl,imx6ul-ccm"

- reg: Address and length of the register set

- #clock-cells: Should be <1>

- clocks: list of clock specifiers, must contain an entry for each required

  entry in clock-names

- clock-names: should include entries "ckil", "osc", "ipp_di0" and "ipp_di1"



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

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

for the full list of i.MX6 UltraLite clock IDs.

Documentation/devicetree/bindings/pinctrl/fsl,imx6ul-pinctrl.txt

0 → 100644
+36 −0
Original line number Diff line number Diff line 
* Freescale i.MX6 UltraLite IOMUX Controller



Please refer to fsl,imx-pinctrl.txt in this directory for common binding part

and usage.



Required properties:

- compatible: "fsl,imx6ul-iomuxc"

- fsl,pins: each entry consists of 6 integers and represents the mux and config

  setting for one pin.  The first 5 integers <mux_reg conf_reg input_reg mux_val

  input_val> are specified using a PIN_FUNC_ID macro, which can be found in

  imx6ul-pinfunc.h under device tree source folder.  The last integer CONFIG is

  the pad setting value like pull-up on this pin.  Please refer to i.MX6 UltraLite

  Reference Manual for detailed CONFIG settings.



CONFIG bits definition:

PAD_CTL_HYS                     (1 << 16)

PAD_CTL_PUS_100K_DOWN           (0 << 14)

PAD_CTL_PUS_47K_UP              (1 << 14)

PAD_CTL_PUS_100K_UP             (2 << 14)

PAD_CTL_PUS_22K_UP              (3 << 14)

PAD_CTL_PUE                     (1 << 13)

PAD_CTL_PKE                     (1 << 12)

PAD_CTL_ODE                     (1 << 11)

PAD_CTL_SPEED_LOW               (0 << 6)

PAD_CTL_SPEED_MED               (1 << 6)

PAD_CTL_SPEED_HIGH              (3 << 6)

PAD_CTL_DSE_DISABLE             (0 << 3)

PAD_CTL_DSE_260ohm              (1 << 3)

PAD_CTL_DSE_130ohm              (2 << 3)

PAD_CTL_DSE_87ohm               (3 << 3)

PAD_CTL_DSE_65ohm               (4 << 3)

PAD_CTL_DSE_52ohm               (5 << 3)

PAD_CTL_DSE_43ohm               (6 << 3)

PAD_CTL_DSE_37ohm               (7 << 3)

PAD_CTL_SRE_FAST                (1 << 0)

PAD_CTL_SRE_SLOW                (0 << 0)

arch/arm/boot/dts/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -335,6 +335,8 @@ dtb-$(CONFIG_SOC_IMX6SX) += \ 
	imx6sx-sabreauto.dtb \

	imx6sx-sdb-reva.dtb \

	imx6sx-sdb.dtb

dtb-$(CONFIG_SOC_IMX6UL) += \

	imx6ul-14x14-evk.dtb

dtb-$(CONFIG_SOC_IMX7D) += \

	imx7d-sdb.dtb

dtb-$(CONFIG_SOC_LS1021A) += \

arch/arm/boot/dts/imx27.dtsi

+9 −0
Original line number Diff line number Diff line
@@ -144,6 +144,15 @@ 
				clock-names = "ipg", "per";

			};



			rtc: rtc@10007000 {

				compatible = "fsl,imx21-rtc";

				reg = <0x10007000 0x1000>;

				interrupts = <22>;

				clocks = <&clks IMX27_CLK_CKIL>,

					 <&clks IMX27_CLK_RTC_IPG_GATE>;

				clock-names = "ref", "ipg";

			};



			kpp: kpp@10008000 {

				compatible = "fsl,imx27-kpp", "fsl,imx21-kpp";

				reg = <0x10008000 0x1000>;

arch/arm/boot/dts/imx53-qsb-common.dtsi

+3 −2
Original line number Diff line number Diff line
@@ -228,10 +228,11 @@ 
			>;

		};



		/* open drain */

		pinctrl_i2c1: i2c1grp {

			fsl,pins = <

				MX53_PAD_CSI0_DAT8__I2C1_SDA		0xc0000000

				MX53_PAD_CSI0_DAT9__I2C1_SCL		0xc0000000

				MX53_PAD_CSI0_DAT8__I2C1_SDA		0x400001ec

				MX53_PAD_CSI0_DAT9__I2C1_SCL		0x400001ec

			>;

		};