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

Commit 57f0b201 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'randconfig/mach' into fixes 



Small platform specific bug fixes for problems found in randconfig builds.

* randconfig/mach:
  ARM: ux500: don't select LEDS_GPIO for snowball
  ARM: imx: build i.MX6 functions only when needed
  ARM: imx: select CPU_FREQ_TABLE when needed
  ARM: imx: fix ksz9021rn_phy_fixup
  ARM: imx: build pm-imx5 code only when PM is enabled
  ARM: omap: allow building omap44xx without SMP

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 5f870baa db43b184

arch/arm/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -2150,6 +2150,7 @@ source "drivers/cpufreq/Kconfig" 
config CPU_FREQ_IMX

config CPU_FREQ_IMX

	tristate "CPUfreq driver for i.MX CPUs"

	tristate "CPUfreq driver for i.MX CPUs"

	depends on ARCH_MXC && CPU_FREQ

	depends on ARCH_MXC && CPU_FREQ

	select CPU_FREQ_TABLE

	help

	help

	  This enables the CPUfreq driver for i.MX CPUs.

	  This enables the CPUfreq driver for i.MX CPUs.

arch/arm/configs/u8500_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -86,6 +86,7 @@ CONFIG_NEW_LEDS=y 
CONFIG_LEDS_CLASS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_LM3530=y

CONFIG_LEDS_LM3530=y

CONFIG_LEDS_LP5521=y

CONFIG_LEDS_LP5521=y

CONFIG_LEDS_GPIO=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_AB8500=y

CONFIG_RTC_DRV_AB8500=y

CONFIG_RTC_DRV_PL031=y

CONFIG_RTC_DRV_PL031=y

arch/arm/mach-imx/Makefile

+5 −5
Original line number Original line Diff line number Diff line
@@ -9,7 +9,8 @@ obj-$(CONFIG_SOC_IMX27) += clk-imx27.o mm-imx27.o ehci-imx27.o 
obj-$(CONFIG_SOC_IMX31) += mm-imx3.o cpu-imx31.o clk-imx31.o iomux-imx31.o ehci-imx31.o pm-imx3.o

obj-$(CONFIG_SOC_IMX31) += mm-imx3.o cpu-imx31.o clk-imx31.o iomux-imx31.o ehci-imx31.o pm-imx3.o

obj-$(CONFIG_SOC_IMX35) += mm-imx3.o cpu-imx35.o clk-imx35.o ehci-imx35.o pm-imx3.o

obj-$(CONFIG_SOC_IMX35) += mm-imx3.o cpu-imx35.o clk-imx35.o ehci-imx35.o pm-imx3.o





obj-$(CONFIG_SOC_IMX5) += cpu-imx5.o mm-imx5.o clk-imx51-imx53.o ehci-imx5.o pm-imx5.o cpu_op-mx51.o

imx5-pm-$(CONFIG_PM) += pm-imx5.o

obj-$(CONFIG_SOC_IMX5) += cpu-imx5.o mm-imx5.o clk-imx51-imx53.o ehci-imx5.o $(imx5-pm-y) cpu_op-mx51.o





obj-$(CONFIG_COMMON_CLK) += clk-pllv1.o clk-pllv2.o clk-pllv3.o clk-gate2.o \

obj-$(CONFIG_COMMON_CLK) += clk-pllv1.o clk-pllv2.o clk-pllv3.o clk-gate2.o \

			    clk-pfd.o clk-busy.o

			    clk-pfd.o clk-busy.o
@@ -70,14 +71,13 @@ obj-$(CONFIG_DEBUG_LL) += lluart.o 
obj-$(CONFIG_HAVE_IMX_GPC) += gpc.o

obj-$(CONFIG_HAVE_IMX_GPC) += gpc.o

obj-$(CONFIG_HAVE_IMX_MMDC) += mmdc.o

obj-$(CONFIG_HAVE_IMX_MMDC) += mmdc.o

obj-$(CONFIG_HAVE_IMX_SRC) += src.o

obj-$(CONFIG_HAVE_IMX_SRC) += src.o

obj-$(CONFIG_CPU_V7) += head-v7.o

AFLAGS_headsmp.o :=-Wa,-march=armv7-a

AFLAGS_head-v7.o :=-Wa,-march=armv7-a

obj-$(CONFIG_SMP) += headsmp.o platsmp.o

obj-$(CONFIG_SMP) += platsmp.o

obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o

obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o

obj-$(CONFIG_SOC_IMX6Q) += clk-imx6q.o mach-imx6q.o

obj-$(CONFIG_SOC_IMX6Q) += clk-imx6q.o mach-imx6q.o





ifeq ($(CONFIG_PM),y)

ifeq ($(CONFIG_PM),y)

obj-$(CONFIG_SOC_IMX6Q) += pm-imx6q.o

obj-$(CONFIG_SOC_IMX6Q) += pm-imx6q.o headsmp.o

endif

endif





# i.MX5 based machines

# i.MX5 based machines

arch/arm/mach-imx/head-v7.S→arch/arm/mach-imx/headsmp.S

+0 −0

File moved.

View file

arch/arm/mach-imx/mach-imx6q.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -71,7 +71,7 @@ void imx6q_restart(char mode, const char *cmd) 
/* For imx6q sabrelite board: set KSZ9021RN RGMII pad skew */

/* For imx6q sabrelite board: set KSZ9021RN RGMII pad skew */

static int ksz9021rn_phy_fixup(struct phy_device *phydev)

static int ksz9021rn_phy_fixup(struct phy_device *phydev)

{

{

	if (IS_ENABLED(CONFIG_PHYLIB)) {

	if (IS_BUILTIN(CONFIG_PHYLIB)) {

		/* min rx data delay */

		/* min rx data delay */

		phy_write(phydev, 0x0b, 0x8105);

		phy_write(phydev, 0x0b, 0x8105);

		phy_write(phydev, 0x0c, 0x0000);

		phy_write(phydev, 0x0c, 0x0000);
@@ -112,7 +112,7 @@ static void __init imx6q_sabrelite_cko1_setup(void) 




static void __init imx6q_sabrelite_init(void)

static void __init imx6q_sabrelite_init(void)

{

{

	if (IS_ENABLED(CONFIG_PHYLIB))

	if (IS_BUILTIN(CONFIG_PHYLIB))

		phy_register_fixup_for_uid(PHY_ID_KSZ9021, MICREL_PHY_ID_MASK,

		phy_register_fixup_for_uid(PHY_ID_KSZ9021, MICREL_PHY_ID_MASK,

				ksz9021rn_phy_fixup);

				ksz9021rn_phy_fixup);

	imx6q_sabrelite_cko1_setup();

	imx6q_sabrelite_cko1_setup();