Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1541293

[PATCH 4.8 28/33] ARM: dts: imx7d: fix LCDIF clock assignment

Show all headers | View raw

4.8-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Stefan Agner <stefan@agner.ch>

commit 4b707fa00a80b19b80bc8df6f1cbf4bdd9c91402 upstream.

The eLCDIF IP of the i.MX 7 SoC knows multiple clocks and lists them
separately:

Clock      Clock Root              Description
apb_clk    MAIN_AXI_CLK_ROOT       AXI clock
pix_clk    LCDIF_PIXEL_CLK_ROOT    Pixel clock
ipg_clk_s  MAIN_AXI_CLK_ROOT       Peripheral access clock

All of them are switched by a single gate, which is part of the
IMX7D_LCDIF_PIXEL_ROOT_CLK clock. Hence using that clock also for
the AXI bus clock (clock-name "axi") makes sure the gate gets
enabled when accessing registers.

There seem to be no separate AXI display clock, and the clock is
optional. Hence remove the dummy clock.

This fixes kernel freezes when starting the X-Server (which
disables/re-enables the display controller).

Fixes: e8ed73f691bd ("ARM: dts: imx7d: add lcdif support")
Signed-off-by: Stefan Agner <stefan@agner.ch>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Acked-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 arch/arm/boot/dts/imx7s.dtsi |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -640,9 +640,8 @@
 				reg = <0x30730000 0x10000>;
 				interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&clks IMX7D_LCDIF_PIXEL_ROOT_CLK>,
-					<&clks IMX7D_CLK_DUMMY>,
-					<&clks IMX7D_CLK_DUMMY>;
-				clock-names = "pix", "axi", "disp_axi";
+					<&clks IMX7D_LCDIF_PIXEL_ROOT_CLK>;
+				clock-names = "pix", "axi";
 				status = "disabled";
 			};
 		};

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 4.8 00/33] 4.8.15-stable review Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:20 +0100
  [PATCH 4.8 20/33] crypto: marvell - Dont copy hash operation twice into the SRAM Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:20 +0100
  [PATCH 4.8 33/33] crypto: rsa - Add Makefile dependencies to fix parallel builds Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:20 +0100
  [PATCH 4.8 32/33] hotplug: Make register and unregister notifier API symmetric Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:20 +0100
  [PATCH 4.8 02/33] powerpc/mm: Fix lazy icache flush on pre-POWER5 Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:20 +0100
  [PATCH 4.8 17/33] acpi, nfit, libnvdimm: fix / harden ars_status output length handling Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:20 +0100
  [PATCH 4.8 28/33] ARM: dts: imx7d: fix LCDIF clock assignment Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:20 +0100
  [PATCH 4.8 30/33] m68k: Fix ndelay() macro Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:20 +0100
  [PATCH 4.8 31/33] batman-adv: Check for alloc errors when preparing TT local data Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:20 +0100
  [PATCH 4.8 05/33] parisc: Purge TLB before setting PTE Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 10/33] locking/rtmutex: Use READ_ONCE() in rt_mutex_owner() Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 22/33] crypto: mcryptd - Check mcryptd algorithm compatibility Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 06/33] parisc: Remove unnecessary TLB purges from flush_dcache_page_asm and flush_icache_page_asm Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 16/33] acpi, nfit: fix extended status translations for ACPI DSMs Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 14/33] vhost-vsock: fix orphan connection reset Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 04/33] fuse: fix clearing suid, sgid for chown() Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 23/33] crypto: marvell - Dont corrupt state of an STD req for re-stepped ahash Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 08/33] zram: restrict add/remove attributes to root only Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 07/33] parisc: Fix TLB related boot crash on SMP machines Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 15/33] perf/x86: Fix full width counter, counter overflow Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 11/33] device-dax: fix private mapping restriction, permit read-only Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 09/33] locking/rtmutex: Prevent dequeue vs. unlock race Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 18/33] acpi, nfit: validate ars_status output buffer size Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 13/33] sched/autogroup: Fix 64-bit kernel nice level adjustment Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 26/33] Revert "ACPI: Execute _PTS before system reboot" Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 03/33] powerpc/boot: Fix build failure in 32-bit boot wrapper Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 12/33] scsi: lpfc: fix oops/BUG in lpfc_sli_ringtxcmpl_put() Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  [PATCH 4.8 24/33] can: raw: raw_setsockopt: limit number of can_filter that can be set Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 18:30 +0100
  Re: [PATCH 4.8 00/33] 4.8.15-stable review Shuah Khan <shuah.kh@samsung.com> - 2016-12-13 20:40 +0100
    Re: [PATCH 4.8 00/33] 4.8.15-stable review Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-13 21:10 +0100
  Re: [PATCH 4.8 00/33] 4.8.15-stable review Guenter Roeck <linux@roeck-us.net> - 2016-12-14 05:20 +0100
    Re: [PATCH 4.8 00/33] 4.8.15-stable review Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-14 13:50 +0100

csiph-web