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

Commit 0b3534be authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'imx-soc-3.16' of... 

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

Merge "ARM: imx: soc changes for 3.16" from Shawn Guo:

i.MX SoC changes for 3.16:
 - A few cleanups on mx21ads board file, which should make the later
   conversion to DT a little bit easier.
 - Add some missing clocks and drop unused clk lookups for i.MX1 and
   i.MX27 clock drivers
 - Add initial i.MX SoloX (imx6sx) SoC support
 - Remove mx51_babbage and mach-cpuimx51sd board files, as the
   equivalent DT support is ready for the boards
 - Clean up device tree timer initialization a little bit
 - Add missing i2c4 clock for i.MX6 DualLite/Solo
 - Add missing CKO clock i.MX25
 - Add shared gate clock support for i.MX specific clk_gate2
 - Add low-level debug support for SoC VF610
 - Some random code cleanups and defconfig updates

* tag 'imx-soc-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux

: (33 commits)
  ARM: mx25: Add CLKO support
  ARM: i.MX1 clk: Remove clk_register_clkdev() for unused clocks
  ARM: i.MX1 clk: Add missing clocks
  ARM: imx: add basic imx6sx SoC support
  ARM: imx: add clock driver for imx6sx
  ARM: imx: add low-level debug support for imx6sx
  ARM: mx51: Remove mach-cpuimx51sd board file
  ARM: i.MX: Setup IRQ handler from IRQ driver
  ARM: i.MX27 pca100: remove deprecated IRQF_DISABLED
  ARM: imx/mxs defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
  ARM: i.MX: Fix eMMa PrP resource size
  ARM: imx_v4_v5_defconfig: drop CONFIG_COMMON_CLK_DEBUG option
  ARM: i.MX27 clk: Remove clk_register_clkdev() for unused clocks
  ARM: i.MX27 clk: Add missing clocks for MSHC and RTIC
  ARM: imx6q: add the missing esai_ahb clock
  ARM: imx: add shared gate clock support
  ARM: imx: lock is always valid for clk_gate2
  ARM: imx: define struct clk_gate2 on our own
  ARM: i.MX: Remove #ifdef CONFIG_OF
  ARM: imx_v6_v7_defconfig: enable option CONFIG_LOCALVERSION_AUTO
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 16ae66cc 46ae4249

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

+3 −0
Original line number Diff line number Diff line
@@ -139,6 +139,9 @@ clocks and IDs. 
	uart5_ipg		124

	reserved		125

	wdt_ipg			126

	cko_div			127

	cko_sel			128

	cko			129



Examples:

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

+6 −1
Original line number Diff line number Diff line
@@ -99,6 +99,11 @@ clocks and IDs. 
	mpll_osc_sel         84

	mpll_sel             85

	spll_gate            86

	mshc_div             87

	rtic_ipg_gate        88

	mshc_ipg_gate        89

	rtic_ahb_gate        90

	mshc_baud_gate       91



Examples:

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

+1 −0
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@ clocks and IDs. 
	lvds2_sel		205

	lvds1_gate		206

	lvds2_gate		207

	esai_ahb		208



Examples:

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

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



Required properties:

- compatible: Should be "fsl,imx6sx-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", "ipp_di0" and "ipp_di1"



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

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

for the full list of i.MX6 SoloX clock IDs.

arch/arm/Kconfig.debug

+20 −2
Original line number Diff line number Diff line
@@ -317,6 +317,13 @@ choice 
		  Say Y here if you want kernel low-level debugging support

		  on i.MX6SL.



	config DEBUG_IMX6SX_UART

		bool "i.MX6SX Debug UART"

		depends on SOC_IMX6SX

		help

		  Say Y here if you want kernel low-level debugging support

		  on i.MX6SX.



	config DEBUG_KEYSTONE_UART0

		bool "Kernel low-level debugging on KEYSTONE2 using UART0"

		depends on ARCH_KEYSTONE
@@ -935,13 +942,23 @@ config DEBUG_IMX_UART_PORT 
						DEBUG_IMX51_UART || \

						DEBUG_IMX53_UART || \

						DEBUG_IMX6Q_UART || \

						DEBUG_IMX6SL_UART

						DEBUG_IMX6SL_UART || \

						DEBUG_IMX6SX_UART

	default 1

	depends on ARCH_MXC

	help

	  Choose UART port on which kernel low-level debug messages

	  should be output.



config DEBUG_VF_UART_PORT

	int "Vybrid Debug UART Port Selection" if DEBUG_VF_UART

	default 1

	range 0 3

	depends on SOC_VF610

	help

	  Choose UART port on which kernel low-level debug messages

	  should be output.



config DEBUG_TEGRA_UART

	bool

	depends on ARCH_TEGRA
@@ -970,7 +987,8 @@ config DEBUG_LL_INCLUDE 
				 DEBUG_IMX51_UART || \

				 DEBUG_IMX53_UART ||\

				 DEBUG_IMX6Q_UART || \

				 DEBUG_IMX6SL_UART

				 DEBUG_IMX6SL_UART || \

				 DEBUG_IMX6SX_UART

	default "debug/msm.S" if DEBUG_MSM_UART

	default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART

	default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || DEBUG_SIRFMARCO_UART1