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

Commit ef8932b9 authored Aug 23, 2013 by Kevin Hilman Committed by Olof Johansson Sep 03, 2013

Merge tag 'mxs-dt-3.12' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt

From Shawn Guo:
It contains mxs device tree changes for 3.12.

- New board addition and hogpins cleanup for Crystalfontz
- New pinctrl entry addition for lcd, ssp2 and saif0
- Add alias and labels for various nodes
- Enable devices like LRADC and USB for a couple of imx23 boards,
  and backlight for M28EVK

* tag 'mxs-dt-3.12' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: dts: mxs: add pin config for LCD sync and clock pins
  ARM: dts: mxs: add pin config for SSP3 interface
  ARM: dts: mxs: add another set of saif0_pins (without MCLK)
  ARM: dts: mxs: add labels to most nodes for easier reference
  ARM: dts: mxs: whitespace cleanup
  ARM: dts: mxs: Add spi alias
  ARM: dts: imx23-olinuxino: enable Low Resolution ADC
  ARM: dts: imx23-evk: enable Low Resolution ADC
  ARM: dts: imx23-evk: enable USB PHY and controller
  ARM: dts: mxs: remove old DMA binding data from client nodes
  ARM: mxs: Add backlight support for M28EVK
  ARM: mxs: dt: cfa10036: make hogpins grabbed by respective drivers
  ARM: mxs: dt: cfa10057: remove hogpins
  ARM: mxs: dt: cfa10055: make hogpins grabbed by respective drivers
  ARM: mxs: dt: cfa10049: make hogpins grabbed by respective drivers
  ARM: mxs: dt: cfa10037: make hogpins grabbed by respective drivers
  ARM: mxs: dt: Add Crystalfontz CFA-10058 device tree
  ARM: mxs: dt: Add Crystalfontz CFA-10056 device tree

parents a52552b5 23ad6f65

arch/arm/boot/dts/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -144,7 +144,9 @@ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \
		imx28-cfa10037.dtb \
		imx28-cfa10049.dtb \
		imx28-cfa10055.dtb \
		imx28-cfa10056.dtb \
		imx28-cfa10057.dtb \
		imx28-cfa10058.dtb \
		imx28-evk.dtb \
		imx28-m28evk.dtb \
		imx28-sps1.dtb \

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

+15 −0

Original line number	Diff line number	Diff line
		@@ -90,6 +90,11 @@
		};

		apbx@80040000 {
		lradc@80050000 {
		status = "okay";
		fsl,lradc-touchscreen-wires = <4>;
		};

		pwm: pwm@80064000 {
		pinctrl-names = "default";
		pinctrl-0 = <&pwm2_pins_a>;
		@@ -107,6 +112,16 @@
		pinctrl-0 = <&duart_pins_a>;
		status = "okay";
		};

		usbphy0: usbphy@8007c000 {
		status = "okay";
		};
		};
		};

		ahb@80080000 {
		usb0: usb@80080000 {
		status = "okay";
		};
		};

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -69,6 +69,10 @@
		};

		apbx@80040000 {
		lradc@80050000 {
		status = "okay";
		};

		duart: serial@80070000 {
		pinctrl-names = "default";
		pinctrl-0 = <&duart_pins_a>;

arch/arm/boot/dts/imx23.dtsi

+8 −9

Original line number	Diff line number	Diff line
		@@ -20,6 +20,8 @@
		gpio2 = &gpio2;
		serial0 = &auart0;
		serial1 = &auart1;
		spi0 = &ssp0;
		spi1 = &ssp1;
		};

		cpus {
		@@ -76,23 +78,21 @@
		#size-cells = <1>;
		reg = <0x8000c000 0x2000>, <0x8000a000 0x2000>;
		reg-names = "gpmi-nand", "bch";
		interrupts = <13>, <56>;
		interrupt-names = "gpmi-dma", "bch";
		interrupts = <56>;
		interrupt-names = "bch";
		clocks = <&clks 34>;
		clock-names = "gpmi_io";
		dmas = <&dma_apbh 4>;
		dma-names = "rx-tx";
		fsl,gpmi-dma-channel = <4>;
		status = "disabled";
		};

		ssp0: ssp@80010000 {
		reg = <0x80010000 0x2000>;
		interrupts = <15 14>;
		interrupts = <15>;
		clocks = <&clks 33>;
		dmas = <&dma_apbh 1>;
		dma-names = "rx-tx";
		fsl,ssp-dma-channel = <1>;
		status = "disabled";
		};

		@@ -366,11 +366,10 @@

		ssp1: ssp@80034000 {
		reg = <0x80034000 0x2000>;
		interrupts = <2 20>;
		interrupts = <2>;
		clocks = <&clks 33>;
		dmas = <&dma_apbh 2>;
		dma-names = "rx-tx";
		fsl,ssp-dma-channel = <2>;
		status = "disabled";
		};

		@@ -472,7 +471,7 @@
		auart0: serial@8006c000 {
		compatible = "fsl,imx23-auart";
		reg = <0x8006c000 0x2000>;
		interrupts = <24 25 23>;
		interrupts = <24>;
		clocks = <&clks 32>;
		dmas = <&dma_apbx 6>, <&dma_apbx 7>;
		dma-names = "rx", "tx";
		@@ -482,7 +481,7 @@
		auart1: serial@8006e000 {
		compatible = "fsl,imx23-auart";
		reg = <0x8006e000 0x2000>;
		interrupts = <59 60 58>;
		interrupts = <59>;
		clocks = <&clks 32>;
		dmas = <&dma_apbx 8>, <&dma_apbx 9>;
		dma-names = "rx", "tx";

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

+3 −4

Original line number	Diff line number	Diff line
		@@ -23,10 +23,7 @@
		apb@80000000 {
		apbh@80000000 {
		pinctrl@80018000 {
		pinctrl-names = "default";
		pinctrl-0 = <&hog_pins_cfa10036>;

		hog_pins_cfa10036: hog-10036@0 {
		ssd1306_cfa10036: ssd1306-10036@0 {
		reg = <0>;
		fsl,pinmux-ids = <
		0x2073 /* MX28_PAD_SSP0_D7__GPIO_2_7 */
		@@ -83,6 +80,8 @@

		ssd1306: oled@3c {
		compatible = "solomon,ssd1306fb-i2c";
		pinctrl-names = "default";
		pinctrl-0 = <&ssd1306_cfa10036>;
		reg = <0x3c>;
		reset-gpios = <&gpio2 7 0>;
		solomon,height = <32>;