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

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

Merge tag 'imx-soc-3.13' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc 

From Shawn Guo:
The imx/mxs soc changes for 3.13:

* Low-level debug support for Vybrid
* Support soc bus/device for imx6
* Suspend support for imx6dl and imx6sl
* The imx6q clock updates for PCIe and audio PLL support
* IOMUXC GPR update for fec support
* Some random cleanup
* A few defconfig updates

* tag 'imx-soc-3.13' of git://git.linaro.org/people/shawnguo/linux-2.6

: (31 commits)
  ARM: imx: enable suspend for imx6sl
  ARM: imx: ensure dsm_request signal is not asserted when setting LPM
  ARM: imx6q: call WB and RBC configuration from imx6q_pm_enter()
  ARM: imx6q: move low-power code out of clock driver
  ARM: imx: drop extern with function prototypes in common.h
  ARM: imx: reset core along with enable/disable operation
  ARM: imx: do not return from imx_cpu_die() call
  ARM: imx_v6_v7_defconfig: Select CONFIG_PROVE_LOCKING
  ARM: imx_v6_v7_defconfig: Enable LEDS_GPIO related options
  ARM: mxs_defconfig: Turn off CONFIG_DEBUG_GPIO
  ARM: imx: replace imx6q_restart() with mxc_restart()
  ARM: mach-imx: mm-imx5: Retrieve iomuxc base address from dt
  ARM: mach-imx: mm-imx5: Retrieve tzic base address from dt
  ARM: mach-imx: clk-imx51-imx53: Retrieve base address and irq from dt
  ARM: mxs_defconfig: Add CHIPIDEA_UDC support
  ARM: imx: Include linux/err.h
  ARM: imx_v6_v7_defconfig: Add CHIPIDEA_UDC support
  ARM: imx_v6_v7_defconfig: Add SPDIF support
  ARM: imx6q: clock and Kconfig update for PCIe support
  ARM: imx: Add LVDS general-purpose clocks to i.MX6Q
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 826f57b4 9ba64fe3

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

+5 −0
Original line number Original line Diff line number Diff line
@@ -215,6 +215,11 @@ clocks and IDs. 
	cko2      		200

	cko2      		200

	cko      		201

	cko      		201

	vdoa      		202

	vdoa      		202

	pll4_audio_div		203

	lvds1_sel		204

	lvds2_sel		205

	lvds1_gate		206

	lvds2_gate		207





Examples:

Examples:

arch/arm/Kconfig.debug

+8 −0
Original line number Original line Diff line number Diff line
@@ -386,6 +386,13 @@ choice 
		  when u-boot hands over to the kernel, the system

		  when u-boot hands over to the kernel, the system

		  silently crashes, with no serial output at all.

		  silently crashes, with no serial output at all.





	config DEBUG_VF_UART

		bool "Vybrid UART"

		depends on SOC_VF610

		help

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

		  on Vybrid based platforms.



	config DEBUG_NOMADIK_UART

	config DEBUG_NOMADIK_UART

		bool "Kernel low-level debugging messages via NOMADIK UART"

		bool "Kernel low-level debugging messages via NOMADIK UART"

		depends on ARCH_NOMADIK

		depends on ARCH_NOMADIK
@@ -906,6 +913,7 @@ config DEBUG_LL_INCLUDE 
	default "debug/tegra.S" if DEBUG_TEGRA_UART

	default "debug/tegra.S" if DEBUG_TEGRA_UART

	default "debug/ux500.S" if DEBUG_UX500_UART

	default "debug/ux500.S" if DEBUG_UX500_UART

	default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT

	default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT

	default "debug/vf.S" if DEBUG_VF_UART

	default "debug/vt8500.S" if DEBUG_VT8500_UART0

	default "debug/vt8500.S" if DEBUG_VT8500_UART0

	default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1

	default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1

	default "mach/debug-macro.S"

	default "mach/debug-macro.S"

arch/arm/boot/dts/imx6sl.dtsi

+3 −1
Original line number Original line Diff line number Diff line
@@ -380,7 +380,9 @@ 
			};

			};





			anatop: anatop@020c8000 {

			anatop: anatop@020c8000 {

				compatible = "fsl,imx6sl-anatop", "syscon", "simple-bus";

				compatible = "fsl,imx6sl-anatop",

					     "fsl,imx6q-anatop",

					     "syscon", "simple-bus";

				reg = <0x020c8000 0x1000>;

				reg = <0x020c8000 0x1000>;

				interrupts = <0 49 0x04 0 54 0x04 0 127 0x04>;

				interrupts = <0 49 0x04 0 54 0x04 0 127 0x04>;

arch/arm/configs/imx_v6_v7_defconfig

+13 −3
Original line number Original line Diff line number Diff line
@@ -132,7 +132,6 @@ CONFIG_TOUCHSCREEN_MC13783=y 
CONFIG_INPUT_MISC=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_MMA8450=y

CONFIG_INPUT_MMA8450=y

CONFIG_SERIO_SERPORT=m

CONFIG_SERIO_SERPORT=m

CONFIG_VT_HW_CONSOLE_BINDING=y

# CONFIG_LEGACY_PTYS is not set

# CONFIG_LEGACY_PTYS is not set

# CONFIG_DEVKMEM is not set

# CONFIG_DEVKMEM is not set

CONFIG_SERIAL_IMX=y

CONFIG_SERIAL_IMX=y
@@ -188,22 +187,33 @@ CONFIG_SND_SOC_PHYCORE_AC97=y 
CONFIG_SND_SOC_EUKREA_TLV320=y

CONFIG_SND_SOC_EUKREA_TLV320=y

CONFIG_SND_SOC_IMX_WM8962=y

CONFIG_SND_SOC_IMX_WM8962=y

CONFIG_SND_SOC_IMX_SGTL5000=y

CONFIG_SND_SOC_IMX_SGTL5000=y

CONFIG_SND_SOC_IMX_SPDIF=y

CONFIG_SND_SOC_IMX_MC13783=y

CONFIG_SND_SOC_IMX_MC13783=y

CONFIG_USB=y

CONFIG_USB=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_MXC=y

CONFIG_USB_EHCI_MXC=y

CONFIG_USB_STORAGE=y

CONFIG_USB_STORAGE=y

CONFIG_USB_CHIPIDEA=y

CONFIG_USB_CHIPIDEA=y

CONFIG_USB_CHIPIDEA_UDC=y

CONFIG_USB_CHIPIDEA_HOST=y

CONFIG_USB_CHIPIDEA_HOST=y

CONFIG_USB_PHY=y

CONFIG_NOP_USB_XCEIV=y

CONFIG_NOP_USB_XCEIV=y

CONFIG_USB_MXS_PHY=y

CONFIG_USB_MXS_PHY=y

CONFIG_USB_GADGET=y

CONFIG_USB_ETH=m

CONFIG_USB_MASS_STORAGE=m

CONFIG_MMC=y

CONFIG_MMC=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_ESDHC_IMX=y

CONFIG_MMC_SDHCI_ESDHC_IMX=y

CONFIG_NEW_LEDS=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_LEDS_TRIGGER_ONESHOT=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_LEDS_TRIGGER_BACKLIGHT=y

CONFIG_LEDS_TRIGGER_GPIO=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_INTF_DEV_UIE_EMUL=y

CONFIG_RTC_INTF_DEV_UIE_EMUL=y

CONFIG_RTC_DRV_MC13XXX=y

CONFIG_RTC_DRV_MC13XXX=y
@@ -246,7 +256,6 @@ CONFIG_UDF_FS=m 
CONFIG_MSDOS_FS=m

CONFIG_MSDOS_FS=m

CONFIG_VFAT_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_TMPFS=y

CONFIG_CONFIGFS_FS=m

CONFIG_JFFS2_FS=y

CONFIG_JFFS2_FS=y

CONFIG_UBIFS_FS=y

CONFIG_UBIFS_FS=y

CONFIG_NFS_FS=y

CONFIG_NFS_FS=y
@@ -261,6 +270,7 @@ CONFIG_NLS_ISO8859_15=m 
CONFIG_NLS_UTF8=y

CONFIG_NLS_UTF8=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_MAGIC_SYSRQ=y

# CONFIG_SCHED_DEBUG is not set

# CONFIG_SCHED_DEBUG is not set

CONFIG_PROVE_LOCKING=y

# CONFIG_DEBUG_BUGVERBOSE is not set

# CONFIG_DEBUG_BUGVERBOSE is not set

# CONFIG_FTRACE is not set

# CONFIG_FTRACE is not set

# CONFIG_ARM_UNWIND is not set

# CONFIG_ARM_UNWIND is not set

arch/arm/configs/mxs_defconfig

+4 −3
Original line number Original line Diff line number Diff line
@@ -76,7 +76,6 @@ CONFIG_INPUT_EVDEV=y 
CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_TSC2007=m

CONFIG_TOUCHSCREEN_TSC2007=m

# CONFIG_SERIO is not set

# CONFIG_SERIO is not set

CONFIG_VT_HW_CONSOLE_BINDING=y

CONFIG_DEVPTS_MULTIPLE_INSTANCES=y

CONFIG_DEVPTS_MULTIPLE_INSTANCES=y

# CONFIG_LEGACY_PTYS is not set

# CONFIG_LEGACY_PTYS is not set

# CONFIG_DEVKMEM is not set

# CONFIG_DEVKMEM is not set
@@ -91,7 +90,6 @@ CONFIG_I2C_MXS=y 
CONFIG_SPI=y

CONFIG_SPI=y

CONFIG_SPI_GPIO=m

CONFIG_SPI_GPIO=m

CONFIG_SPI_MXS=y

CONFIG_SPI_MXS=y

CONFIG_DEBUG_GPIO=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_SYSFS=y

# CONFIG_HWMON is not set

# CONFIG_HWMON is not set

CONFIG_WATCHDOG=y

CONFIG_WATCHDOG=y
@@ -115,9 +113,12 @@ CONFIG_USB=y 
CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_STORAGE=y

CONFIG_USB_STORAGE=y

CONFIG_USB_CHIPIDEA=y

CONFIG_USB_CHIPIDEA=y

CONFIG_USB_CHIPIDEA_UDC=y

CONFIG_USB_CHIPIDEA_HOST=y

CONFIG_USB_CHIPIDEA_HOST=y

CONFIG_USB_PHY=y

CONFIG_USB_MXS_PHY=y

CONFIG_USB_MXS_PHY=y

CONFIG_USB_GADGET=y

CONFIG_USB_ETH=m

CONFIG_USB_MASS_STORAGE=m

CONFIG_MMC=y

CONFIG_MMC=y

CONFIG_MMC_UNSAFE_RESUME=y

CONFIG_MMC_UNSAFE_RESUME=y

CONFIG_MMC_MXS=y

CONFIG_MMC_MXS=y