Commit 83692898 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC fixes from Olof Johansson:
 "Here's our last set of fixes for 3.17.  Most of these are for TI
  platforms, fixing some noisy Kconfig issues, runtime clock and power
  issues on several platforms and NAND timings on DRA7.

  There are also a couple of bug fixes for i.MX, one for QCOM and a
 small fix to avoid section mismatch noise on PXA.

  Diffstat looks large, partially due to some tables being updated and
  thus touching many lines.  The qcom gsbi change also restructures
  clock management a bit and thus touches a bunch of lines.

  All in all, a bit more changes than we'd like at this point, but
  nothing stands out as risky either so it seems like the right thing to
  send it up now instead of holding it to the merge window"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  drivers/soc: qcom: do not disable the iface clock in probe
  ARM: imx: fix .is_enabled() of shared gate clock
  ARM: OMAP3: Fix I/O chain clock line assertion timed out error
  ARM: keystone: dts: fix bindings for pcie and usb clock nodes
  bus: omap_l3_noc: Fix connID for OMAP4
  ARM: DT: imx53: fix lvds channel 1 port
  ARM: dts: cm-t54: fix serial console power supply.
  ARM: dts: dra7-evm: Fix NAND GPMC timings
  ARM: pxa: fix section mismatch warning for pxa_timer_nodt_init
  ARM: OMAP: Fix Kconfig warning for omap1
parents 74807afd fa9eb324

Documentation/devicetree/bindings/staging/imx-drm/ldb.txt

+13 −2
Original line number Diff line number Diff line
@@ -56,6 +56,9 @@ Required properties: 
 - fsl,data-width : should be <18> or <24>

 - port: A port node with endpoint definitions as defined in

   Documentation/devicetree/bindings/media/video-interfaces.txt.

   On i.MX5, the internal two-input-multiplexer is used.

   Due to hardware limitations, only one port (port@[0,1])

   can be used for each channel (lvds-channel@[0,1], respectively)

   On i.MX6, there should be four ports (port@[0-3]) that correspond

   to the four LVDS multiplexer inputs.
@@ -78,6 +81,8 @@ ldb: ldb@53fa8008 { 
		      "di0", "di1";



	lvds-channel@0 {

		#address-cells = <1>;

		#size-cells = <0>;

		reg = <0>;

		fsl,data-mapping = "spwg";

		fsl,data-width = <24>;
@@ -86,7 +91,9 @@ ldb: ldb@53fa8008 { 
			/* ... */

		};



		port {

		port@0 {

			reg = <0>;



			lvds0_in: endpoint {

				remote-endpoint = <&ipu_di0_lvds0>;

			};
@@ -94,6 +101,8 @@ ldb: ldb@53fa8008 { 
	};



	lvds-channel@1 {

		#address-cells = <1>;

		#size-cells = <0>;

		reg = <1>;

		fsl,data-mapping = "spwg";

		fsl,data-width = <24>;
@@ -102,7 +111,9 @@ ldb: ldb@53fa8008 { 
			/* ... */

		};



		port {

		port@1 {

			reg = <1>;



			lvds1_in: endpoint {

				remote-endpoint = <&ipu_di1_lvds1>;

			};

arch/arm/boot/dts/dra7-evm.dts

+12 −15
Original line number Diff line number Diff line
@@ -447,22 +447,19 @@ 
		gpmc,device-width = <2>;

		gpmc,sync-clk-ps = <0>;

		gpmc,cs-on-ns = <0>;

		gpmc,cs-rd-off-ns = <40>;

		gpmc,cs-wr-off-ns = <40>;

		gpmc,cs-rd-off-ns = <80>;

		gpmc,cs-wr-off-ns = <80>;

		gpmc,adv-on-ns = <0>;

		gpmc,adv-rd-off-ns = <30>;

		gpmc,adv-wr-off-ns = <30>;

		gpmc,we-on-ns = <5>;

		gpmc,we-off-ns = <25>;

		gpmc,oe-on-ns = <2>;

		gpmc,oe-off-ns = <20>;

		gpmc,access-ns = <20>;

		gpmc,wr-access-ns = <40>;

		gpmc,rd-cycle-ns = <40>;

		gpmc,wr-cycle-ns = <40>;

		gpmc,wait-pin = <0>;

		gpmc,wait-on-read;

		gpmc,wait-on-write;

		gpmc,adv-rd-off-ns = <60>;

		gpmc,adv-wr-off-ns = <60>;

		gpmc,we-on-ns = <10>;

		gpmc,we-off-ns = <50>;

		gpmc,oe-on-ns = <4>;

		gpmc,oe-off-ns = <40>;

		gpmc,access-ns = <40>;

		gpmc,wr-access-ns = <80>;

		gpmc,rd-cycle-ns = <80>;

		gpmc,wr-cycle-ns = <80>;

		gpmc,bus-turnaround-ns = <0>;

		gpmc,cycle2cycle-delay-ns = <0>;

		gpmc,clk-activation-ns = <0>;

arch/arm/boot/dts/imx53.dtsi

+10 −2
Original line number Diff line number Diff line
@@ -423,10 +423,14 @@ 
				status = "disabled";



				lvds-channel@0 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <0>;

					status = "disabled";



					port {

					port@0 {

						reg = <0>;



						lvds0_in: endpoint {

							remote-endpoint = <&ipu_di0_lvds0>;

						};
@@ -434,10 +438,14 @@ 
				};



				lvds-channel@1 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <1>;

					status = "disabled";



					port {

					port@1 {

						reg = <1>;



						lvds1_in: endpoint {

							remote-endpoint = <&ipu_di1_lvds1>;

						};

arch/arm/boot/dts/k2e-clocks.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ clocks { 
		#clock-cells = <0>;

		compatible = "ti,keystone,psc-clock";

		clocks = <&chipclk16>;

		clock-output-names = "usb";

		clock-output-names = "usb1";

		reg = <0x02350004 0xb00>, <0x02350000 0x400>;

		reg-names = "control", "domain";

		domain-id = <0>;
@@ -60,8 +60,8 @@ clocks { 
		#clock-cells = <0>;

		compatible = "ti,keystone,psc-clock";

		clocks = <&chipclk12>;

		clock-output-names = "pcie";

		reg = <0x0235006c 0xb00>, <0x02350000 0x400>;

		clock-output-names = "pcie1";

		reg = <0x0235006c 0xb00>, <0x02350048 0x400>;

		reg-names = "control", "domain";

		domain-id = <18>;

	};

arch/arm/boot/dts/omap5-cm-t54.dts

+2 −3
Original line number Diff line number Diff line
@@ -353,13 +353,12 @@ 
				};



				ldo8_reg: ldo8 {

					/* VDD_3v0: Does not go anywhere */

					/* VDD_3V_GP: act led/serial console */

					regulator-name = "ldo8";

					regulator-min-microvolt = <3000000>;

					regulator-max-microvolt = <3000000>;

					regulator-always-on;

					regulator-boot-on;

					/* Unused */

					status = "disabled";

				};



				ldo9_reg: ldo9 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE