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

Commit 579673ee authored by Kevin Hilman's avatar Kevin Hilman
Browse files

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

From Shawn Guo:

It contains a bunch of imx soc updates for 3.12.

- Add more ethernet phy fixups for imx6 boards
- Add some missing imx6q clocks into clock driver
- Add new clock types fixup mux and div to work around some ugly
  hardware defect
- Consolidate L2 cache initialization function, so that it can be used
  on more i.MX SoCs
- Replace magic numbers in mach-imx6q.c with well defined macros
- Small fixes for imx6q and pllv3 clock drivers
- Some random updates on imx defconfig files

* tag 'imx-soc-3.12' of git://git.linaro.org/people/shawnguo/linux-2.6: (33 commits)
  phy: micrel: Add definitions for common Micrel PHY registers
  ARM: imx: Re-select CONFIG_SND_SOC_IMX_MC13783 option
  ARM: imx: Move anatop related from board file to anatop driver
  ARM: imx_v6_v7_defconfig: Enable wireless support
  ARM: imx_v4_v5_defconfig: Cleanup imx_v4_v5_defconfig
  ARM: imx_v6_v7_defconfig: Add SATA support
  ARM: imx_v6_v7_defconfig: Cleanup imx_v6_v7_defconfig
  ARM: mx53: Allow suspend/resume
  ARM: mach-imx: Select ARM_CPU_SUSPEND at ARCH_MXC level
  ARM: imx_v6_v7_defconfig: Select CONFIG_TOUCHSCREEN_EGALAX
  ARM: imx6q: add vdoa gate clock
  ARM: imx6q: add the missing cko output selection
  ARM: imx6q: add cko2 clocks
  ARM: imx6q: add spdif gate clock
  ARM: imx: clk-pllv3: improve the timeout waiting method
  ARM: imx6: change some clocks to fixup clocks
  ARM: imx: add common clock support for fixup mux
  ARM: imx: add common clock support for fixup div
  ARM: imx: Select MIGHT_HAVE_CACHE_L2X0
  ARM: imx: fix imx_init_l2cache storage class
  ...
parents 8bd6f53a dc76a1ad

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

+6 −0
Original line number Diff line number Diff line
@@ -209,6 +209,12 @@ clocks and IDs. 
	pll5_post_div		194

	pll5_video_div		195

	eim_slow      		196

	spdif      		197

	cko2_sel      		198

	cko2_podf      		199

	cko2      		200

	cko      		201

	vdoa      		202



Examples:

arch/arm/configs/imx_v4_v5_defconfig

+7 −12
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y
@@ -17,16 +16,18 @@ CONFIG_MODULE_UNLOAD=y 
# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_MXC=y

CONFIG_ARCH_MULTI_V4T=y

CONFIG_ARCH_MULTI_V5=y

# CONFIG_ARCH_MULTI_V7 is not set

CONFIG_ARCH_MXC=y

CONFIG_MXC_IRQ_PRIOR=y

CONFIG_ARCH_MX1ADS=y

CONFIG_MACH_SCB9328=y

CONFIG_MACH_APF9328=y

CONFIG_MACH_MX21ADS=y

CONFIG_MACH_MX25_3DS=y

CONFIG_MACH_EUKREA_CPUIMX25SD=y

CONFIG_MACH_IMX25_DT=y

CONFIG_MACH_MX27ADS=y

CONFIG_MACH_PCM038=y

CONFIG_MACH_CPUIMX27=y
@@ -39,8 +40,6 @@ CONFIG_MACH_PCA100=y 
CONFIG_MACH_MXT_TD60=y

CONFIG_MACH_IMX27IPCAM=y

CONFIG_MACH_IMX27_DT=y

CONFIG_MXC_IRQ_PRIOR=y

CONFIG_MXC_PWM=y

CONFIG_PREEMPT=y

CONFIG_AEABI=y

CONFIG_ZBOOT_ROM_TEXT=0x0
@@ -67,7 +66,6 @@ CONFIG_DEVTMPFS=y 
CONFIG_DEVTMPFS_MOUNT=y

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_ADV_OPTIONS=y
@@ -123,24 +121,20 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y 
CONFIG_REGULATOR_MC13783=y

CONFIG_REGULATOR_MC13892=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_VIDEO_DEV=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_SOC_CAMERA=y

CONFIG_SOC_CAMERA_OV2640=y

CONFIG_VIDEO_MX2=y

CONFIG_V4L_MEM2MEM_DRIVERS=y

CONFIG_VIDEO_CODA=y

CONFIG_SOC_CAMERA_OV2640=y

CONFIG_FB=y

CONFIG_FB_IMX=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

CONFIG_LCD_CLASS_DEVICE=y

CONFIG_LCD_L4F00242T03=y

CONFIG_BACKLIGHT_CLASS_DEVICE=y

CONFIG_BACKLIGHT_PWM=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FONTS=y

CONFIG_FONT_8x8=y

CONFIG_LOGO=y

CONFIG_SOUND=y

CONFIG_SND=y
@@ -157,7 +151,6 @@ CONFIG_USB_HID=m 
CONFIG_USB=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_MXC=y

CONFIG_USB_ULPI=y

CONFIG_MMC=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y
@@ -198,3 +191,5 @@ CONFIG_NLS_CODEPAGE_850=m 
CONFIG_NLS_ISO8859_1=y

CONFIG_NLS_ISO8859_15=m

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_FONTS=y

CONFIG_FONT_8x8=y

arch/arm/configs/imx_v6_v7_defconfig

+28 −23
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_KERNEL_LZO=y

CONFIG_SYSVIPC=y
@@ -17,10 +16,8 @@ CONFIG_MODULE_UNLOAD=y 
CONFIG_MODVERSIONS=y

CONFIG_MODULE_SRCVERSION_ALL=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_ARCH_MXC=y

CONFIG_ARCH_MULTI_V6=y

CONFIG_ARCH_MULTI_V7=y

CONFIG_MACH_IMX31_DT=y

CONFIG_ARCH_MXC=y

CONFIG_MACH_MX31LILLY=y

CONFIG_MACH_MX31LITE=y

CONFIG_MACH_PCM037=y
@@ -30,6 +27,7 @@ CONFIG_MACH_MX31MOBOARD=y 
CONFIG_MACH_QONG=y

CONFIG_MACH_ARMADILLO5X0=y

CONFIG_MACH_KZM_ARM11_01=y

CONFIG_MACH_IMX31_DT=y

CONFIG_MACH_PCM043=y

CONFIG_MACH_MX35_3DS=y

CONFIG_MACH_VPR200=y
@@ -39,7 +37,6 @@ CONFIG_SOC_IMX53=y 
CONFIG_SOC_IMX6Q=y

CONFIG_SOC_IMX6SL=y

CONFIG_SOC_VF610=y

CONFIG_MXC_PWM=y

CONFIG_SMP=y

CONFIG_VMSPLIT_2G=y

CONFIG_PREEMPT_VOLUNTARY=y
@@ -64,20 +61,24 @@ CONFIG_IP_PNP_DHCP=y 
# CONFIG_INET_LRO is not set

CONFIG_IPV6=y

CONFIG_NETFILTER=y

# CONFIG_WIRELESS is not set

CONFIG_CFG80211=y

CONFIG_MAC80211=y

CONFIG_RFKILL=y

CONFIG_RFKILL_INPUT=y

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_STANDALONE is not set

CONFIG_IMX_WEIM=y

CONFIG_CONNECTOR=y

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_JEDECPROBE=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_CFI_STAA=y

CONFIG_MTD_PHYSMAP_OF=y

CONFIG_MTD_DATAFLASH=y

CONFIG_MTD_M25P80=y

CONFIG_MTD_SST25L=y
@@ -88,6 +89,7 @@ CONFIG_MTD_UBI=y 
CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=65536

CONFIG_SRAM=y

CONFIG_EEPROM_AT24=y

CONFIG_EEPROM_AT25=y

# CONFIG_SCSI_PROC_FS is not set
@@ -98,10 +100,11 @@ CONFIG_SCSI_LOGGING=y 
CONFIG_SCSI_SCAN_ASYNC=y

# CONFIG_SCSI_LOWLEVEL is not set

CONFIG_ATA=y

CONFIG_SATA_AHCI_PLATFORM=y

CONFIG_AHCI_IMX=y

CONFIG_PATA_IMX=y

CONFIG_NETDEVICES=y

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_CHELSIO is not set

CONFIG_CS89x0=y

CONFIG_CS89x0_PLATFORM=y

# CONFIG_NET_VENDOR_FARADAY is not set
@@ -115,7 +118,7 @@ CONFIG_SMC91X=y 
CONFIG_SMC911X=y

CONFIG_SMSC911X=y

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_WLAN is not set

CONFIG_BRCMFMAC=m

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

CONFIG_INPUT_EVDEV=y

CONFIG_INPUT_EVBUG=m
@@ -124,6 +127,7 @@ CONFIG_KEYBOARD_IMX=y 
CONFIG_MOUSE_PS2=m

CONFIG_MOUSE_PS2_ELANTECH=y

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_EGALAX=y

CONFIG_TOUCHSCREEN_MC13783=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_MMA8450=y
@@ -133,13 +137,13 @@ CONFIG_VT_HW_CONSOLE_BINDING=y 
# CONFIG_DEVKMEM is not set

CONFIG_SERIAL_IMX=y

CONFIG_SERIAL_IMX_CONSOLE=y

CONFIG_SERIAL_FSL_LPUART=y

CONFIG_SERIAL_FSL_LPUART_CONSOLE=y

CONFIG_HW_RANDOM=y

CONFIG_HW_RANDOM_MXC_RNGA=y

CONFIG_I2C=y

# CONFIG_I2C_COMPAT is not set

CONFIG_I2C_CHARDEV=y

# CONFIG_I2C_HELPER_AUTO is not set

CONFIG_I2C_ALGOBIT=m

CONFIG_I2C_ALGOPCF=m

CONFIG_I2C_ALGOPCA=m

CONFIG_I2C_IMX=y
@@ -155,30 +159,26 @@ CONFIG_MFD_MC13XXX_SPI=y 
CONFIG_MFD_MC13XXX_I2C=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_DA9052=y

CONFIG_REGULATOR_ANATOP=y

CONFIG_REGULATOR_DA9052=y

CONFIG_REGULATOR_MC13783=y

CONFIG_REGULATOR_MC13892=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_VIDEO_DEV=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_SOC_CAMERA=y

CONFIG_VIDEO_MX3=y

CONFIG_V4L_MEM2MEM_DRIVERS=y

CONFIG_VIDEO_CODA=y

CONFIG_SOC_CAMERA_OV2640=y

CONFIG_DRM=y

CONFIG_VIDEO_MX3=y

CONFIG_FB=y

CONFIG_LCD_PLATFORM=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

CONFIG_LCD_CLASS_DEVICE=y

CONFIG_LCD_L4F00242T03=y

CONFIG_LCD_PLATFORM=y

CONFIG_BACKLIGHT_CLASS_DEVICE=y

CONFIG_BACKLIGHT_PWM=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y

CONFIG_FONTS=y

CONFIG_FONT_8x8=y

CONFIG_FONT_8x16=y

CONFIG_LOGO=y

CONFIG_SOUND=y

CONFIG_SND=y
@@ -192,11 +192,12 @@ CONFIG_SND_SOC_IMX_MC13783=y 
CONFIG_USB=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_MXC=y

CONFIG_USB_STORAGE=y

CONFIG_USB_CHIPIDEA=y

CONFIG_USB_CHIPIDEA_HOST=y

CONFIG_USB_PHY=y

CONFIG_NOP_USB_XCEIV=y

CONFIG_USB_MXS_PHY=y

CONFIG_USB_STORAGE=y

CONFIG_MMC=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y
@@ -213,9 +214,10 @@ CONFIG_IMX_SDMA=y 
CONFIG_MXS_DMA=y

CONFIG_STAGING=y

CONFIG_DRM_IMX=y

CONFIG_DRM_IMX_TVE=y

CONFIG_DRM_IMX_FB_HELPER=y

CONFIG_DRM_IMX_PARALLEL_DISPLAY=y

CONFIG_DRM_IMX_TVE=y

CONFIG_DRM_IMX_LDB=y

CONFIG_DRM_IMX_IPUV3_CORE=y

CONFIG_DRM_IMX_IPUV3=y

CONFIG_COMMON_CLK_DEBUG=y
@@ -269,3 +271,6 @@ CONFIG_CRC_CCITT=m 
CONFIG_CRC_T10DIF=y

CONFIG_CRC7=m

CONFIG_LIBCRC32C=m

CONFIG_FONTS=y

CONFIG_FONT_8x8=y

CONFIG_FONT_8x16=y

arch/arm/mach-at91/board-dt-sama5.c

+6 −11
Original line number Diff line number Diff line
@@ -42,20 +42,15 @@ static int ksz9021rn_phy_fixup(struct phy_device *phy) 
{

	int value;



#define GMII_RCCPSR	260

#define GMII_RRDPSR	261

#define GMII_ERCR	11

#define GMII_ERDWR	12



	/* Set delay values */

	value = GMII_RCCPSR | 0x8000;

	phy_write(phy, GMII_ERCR, value);

	value = MICREL_KSZ9021_RGMII_CLK_CTRL_PAD_SCEW | 0x8000;

	phy_write(phy, MICREL_KSZ9021_EXTREG_CTRL, value);

	value = 0xF2F4;

	phy_write(phy, GMII_ERDWR, value);

	value = GMII_RRDPSR | 0x8000;

	phy_write(phy, GMII_ERCR, value);

	phy_write(phy, MICREL_KSZ9021_EXTREG_DATA_WRITE, value);

	value = MICREL_KSZ9021_RGMII_RX_DATA_PAD_SCEW | 0x8000;

	phy_write(phy, MICREL_KSZ9021_EXTREG_CTRL, value);

	value = 0x2222;

	phy_write(phy, GMII_ERDWR, value);

	phy_write(phy, MICREL_KSZ9021_EXTREG_DATA_WRITE, value);



	return 0;

}

arch/arm/mach-imx/Kconfig

+2 −1
Original line number Diff line number Diff line 
config ARCH_MXC

	bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7

	select ARCH_REQUIRE_GPIOLIB

	select ARM_CPU_SUSPEND if PM

	select ARM_PATCH_PHYS_VIRT

	select AUTO_ZRELADDR if !ZBOOT_ROM

	select CLKDEV_LOOKUP
@@ -8,6 +9,7 @@ config ARCH_MXC 
	select GENERIC_ALLOCATOR

	select GENERIC_CLOCKEVENTS

	select GENERIC_IRQ_CHIP

	select MIGHT_HAVE_CACHE_L2X0 if ARCH_MULTI_V6_V7

	select MULTI_IRQ_HANDLER

	select SPARSE_IRQ

	select USE_OF
@@ -785,7 +787,6 @@ config SOC_IMX6Q 
	bool "i.MX6 Quad/DualLite support"

	select ARCH_HAS_CPUFREQ

	select ARCH_HAS_OPP

	select ARM_CPU_SUSPEND if PM

	select ARM_ERRATA_754322

	select ARM_ERRATA_764369 if SMP

	select ARM_ERRATA_775420