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

Commit b3182ff6 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

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

The i.MX device tree changes for 4.2:
 - Add device tree for i.MX7D SoC and imx7d-sdb board
 - New i.MX6 board support: Armadeus Systems APF6, Gateworks GW5510,
   and aristainetos2 boards
 - Change LVDS to use simple-panel for nitrogen6x and sabrelite boards
 - Add Wifi/Bluetooth devices support for cubox-i board
 - Remove unused regulators and correct OTG roles setting for
   imx6sl-warp board
 - Add I2C support for imx23-olinuxino board
 - Move imx6qdl HDMI device to a better place
 - Add power-domain for imx6qdl CODA device

* tag 'imx-dt-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (24 commits)
  ARM: dts: imx6dl: add imx6dl gpt specific compatible string
  ARM: dts: imx6: add DT for aristainetos2 board
  ARM: dts: cubox-i/hummingboard: Fix the license text
  ARM: dts: sabrelite: use simple-panel instead of display-timings for LVDS0
  ARM: dts: nitrogen6x: use simple-panel instead of display-timings for LVDS0
  ARM: dts: add imx7d-sdb support
  ARM: dts: add imx7d soc dtsi file
  ARM: dts: Armadeus Systems APF6 family support (i.MX6)
  ARM: dts: vf610: Nomenclature fixup for PTC12 pin used in RMII mode.
  ARM: dts: cubox-i: add support for Broadcom Wifi/Bluetooth devices
  Document: dt: binding: imx: update document for imx7d support
  ARM: dts: imx6qdl: Add power-domain phandle to CODA device node
  ARM: dts: Gateworks GW5510 support (i.MX6)
  ARM: dts: imx6sl-warp: Fix OTG roles
  ARM: dts: imx6sl-warp: Remove USB regulators
  ARM: dts: imx6sl-warp: Remove unused regulator
  ARM: dts: add pinfunc include file to support imx7d
  ARM: mxs: fix in tree users of ssd1306
  ARM: dts: imx6qdl-hummingboard: Add PCIe support
  ARM: dts: imx23-olinuxino: Add i2c support
  ...
parents db05f7fc 4e415ed8

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

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



Required properties:

- compatible: Should be "fsl,imx7d-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"



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

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

for the full list of i.MX7 Dual clock IDs.

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

0 → 100644
+27 −0
Original line number Diff line number Diff line 
* Freescale i.MX7 Dual IOMUX Controller



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

and usage.



Required properties:

- compatible: "fsl,imx7d-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

  imx7d-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.MX7 Dual

  Reference Manual for detailed CONFIG settings.



CONFIG bits definition:

PAD_CTL_PUS_100K_DOWN           (0 << 5)

PAD_CTL_PUS_5K_UP               (1 << 5)

PAD_CTL_PUS_47K_UP              (2 << 5)

PAD_CTL_PUS_100K_UP             (3 << 5)

PAD_CTL_PUE                     (1 << 4)

PAD_CTL_HYS                     (1 << 3)

PAD_CTL_SRE_SLOW                (1 << 2)

PAD_CTL_SRE_FAST                (0 << 2)

PAD_CTL_DSE_X1                  (0 << 0)

PAD_CTL_DSE_X2                  (1 << 0)

PAD_CTL_DSE_X3                  (2 << 0)

PAD_CTL_DSE_X4                  (3 << 0)

arch/arm/boot/dts/Makefile

+8 −0
Original line number Diff line number Diff line
@@ -264,14 +264,18 @@ dtb-$(CONFIG_SOC_IMX53) += \ 
	imx53-tx53-x13x.dtb \

	imx53-voipac-bsb.dtb

dtb-$(CONFIG_SOC_IMX6Q) += \

	imx6dl-apf6dev.dtb \

	imx6dl-aristainetos_4.dtb \

	imx6dl-aristainetos_7.dtb \

	imx6dl-aristainetos2_4.dtb \

	imx6dl-aristainetos2_7.dtb \

	imx6dl-cubox-i.dtb \

	imx6dl-dfi-fs700-m60.dtb \

	imx6dl-gw51xx.dtb \

	imx6dl-gw52xx.dtb \

	imx6dl-gw53xx.dtb \

	imx6dl-gw54xx.dtb \

	imx6dl-gw551x.dtb \

	imx6dl-gw552x.dtb \

	imx6dl-hummingboard.dtb \

	imx6dl-nitrogen6x.dtb \
@@ -287,6 +291,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6dl-udoo.dtb \

	imx6dl-wandboard.dtb \

	imx6dl-wandboard-revb1.dtb \

	imx6q-apf6dev.dtb \

	imx6q-arm2.dtb \

	imx6q-cm-fx6.dtb \

	imx6q-cubox-i.dtb \
@@ -298,6 +303,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6q-gw53xx.dtb \

	imx6q-gw5400-a.dtb \

	imx6q-gw54xx.dtb \

	imx6q-gw551x.dtb \

	imx6q-gw552x.dtb \

	imx6q-hummingboard.dtb \

	imx6q-nitrogen6x.dtb \
@@ -323,6 +329,8 @@ dtb-$(CONFIG_SOC_IMX6SX) += \ 
	imx6sx-sabreauto.dtb \

	imx6sx-sdb-reva.dtb \

	imx6sx-sdb.dtb

dtb-$(CONFIG_SOC_IMX7D) += \

	imx7d-sdb.dtb

dtb-$(CONFIG_SOC_LS1021A) += \

	ls1021a-qds.dtb \

	ls1021a-twr.dtb

arch/arm/boot/dts/imx23-olinuxino.dts

+6 −0
Original line number Diff line number Diff line
@@ -74,6 +74,12 @@ 
				status = "okay";

			};



			i2c: i2c@80058000 {

				pinctrl-names = "default";

				pinctrl-0 = <&i2c_pins_b>;

				status = "okay";

			};



			duart: serial@80070000 {

				pinctrl-names = "default";

				pinctrl-0 = <&duart_pins_a>;

arch/arm/boot/dts/imx23.dtsi

+39 −1
Original line number Diff line number Diff line
@@ -308,6 +308,39 @@ 
					fsl,voltage = <MXS_VOLTAGE_HIGH>;

					fsl,pull-up = <MXS_PULL_ENABLE>;

				};



				i2c_pins_a: i2c@0 {

					reg = <0>;

					fsl,pinmux-ids = <

						MX23_PAD_I2C_SCL__I2C_SCL

						MX23_PAD_I2C_SDA__I2C_SDA

					>;

					fsl,drive-strength = <MXS_DRIVE_8mA>;

					fsl,voltage = <MXS_VOLTAGE_HIGH>;

					fsl,pull-up = <MXS_PULL_ENABLE>;

				};



				i2c_pins_b: i2c@1 {

					reg = <1>;

					fsl,pinmux-ids = <

						MX23_PAD_LCD_ENABLE__I2C_SCL

						MX23_PAD_LCD_HSYNC__I2C_SDA

					>;

					fsl,drive-strength = <MXS_DRIVE_8mA>;

					fsl,voltage = <MXS_VOLTAGE_HIGH>;

					fsl,pull-up = <MXS_PULL_ENABLE>;

				};



				i2c_pins_c: i2c@2 {

					reg = <2>;

					fsl,pinmux-ids = <

						MX23_PAD_SSP1_DATA1__I2C_SCL

						MX23_PAD_SSP1_DATA2__I2C_SDA

					>;

					fsl,drive-strength = <MXS_DRIVE_8mA>;

					fsl,voltage = <MXS_VOLTAGE_HIGH>;

					fsl,pull-up = <MXS_PULL_ENABLE>;

				};

			};



			digctl@8001c000 {
@@ -444,8 +477,13 @@ 
				status = "disabled";

			};



			i2c@80058000 {

			i2c: i2c@80058000 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "fsl,imx23-i2c";

				reg = <0x80058000 0x2000>;

				interrupts = <27>;

				clock-frequency = <100000>;

				dmas = <&dma_apbx 3>;

				dma-names = "rx-tx";

				status = "disabled";