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

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

Merge tag 'imx-fixes-3.11' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes 

From Shawn Guo, imx fixes for 3.11:

- A few device tree source fixes regarding pinctrl, clock, and pwm
  backlight.
- Fixes imx28 and imx51 audio driver failure caused by sgtl5000 codec
  driver change by supplying the correct clock for codec.
- imx6q emi_sel clock muxing and imx6q-iomuxc-gpr macro fixes

* tag 'imx-fixes-3.11' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: dts: imx51-babbage: Pass a real clock to the codec
  ARM i.MX53: mba53: Fix PWM backlight DT node
  ARM: imx: fix vf610 enet module clock selection
  ARM: mxs: saif0 is the clock provider to sgtl5000
  ARM: i.MX6Q: correct emi_sel clock muxing
  ARM i.MX6Q: Fix IOMUXC GPR1 defines for ENET_CLK_SEL and IPU1/2_MUX
  ARM: i.MX27: Typo fix
  ARM: imx27: Fix documentation for SPLL clock
  ARM i.MX53: Fix UART pad configuration
parents 9d0b3750 84bb0847

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

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ clocks and IDs. 
	fpm                  83

	mpll_osc_sel         84

	mpll_sel             85

	spll_gate	     86



Examples:

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

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ 
					reg = <0x0a>;

					VDDA-supply = <&reg_3p3v>;

					VDDIO-supply = <&reg_3p3v>;



					clocks = <&saif0>;

				};



				pcf8563: rtc@51 {

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

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ 
					reg = <0x0a>;

					VDDA-supply = <&reg_3p3v>;

					VDDIO-supply = <&reg_3p3v>;



					clocks = <&saif0>;

				};



				at24@51 {

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

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ 
					reg = <0x0a>;

					VDDA-supply = <&reg_3p3v>;

					VDDIO-supply = <&reg_3p3v>;



					clocks = <&saif0>;

				};



				eeprom: eeprom@51 {

arch/arm/boot/dts/imx28.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -837,6 +837,7 @@ 
				compatible = "fsl,imx28-saif";

				reg = <0x80042000 0x2000>;

				interrupts = <59 80>;

				#clock-cells = <0>;

				clocks = <&clks 53>;

				dmas = <&dma_apbx 4>;

				dma-names = "rx-tx";