summaryrefslogtreecommitdiffstats
path: root/arch/arm
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'mxs-dt-3.7' of git://git.linaro.org/people/shawnguo/linux-2.6 ↵Olof Johansson2012-09-1247-4096/+485
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into next/dt - Remove all board files and make mach-mxs a DT-only platform - Some dts file formatting and style fixing - DTS update for additional boards and devices * tag 'mxs-dt-3.7' of git://git.linaro.org/people/shawnguo/linux-2.6: (28 commits) ARM: dts: cfa10049: Add the 74HC595 gpio expanders ARM: dts: m28evk: Fix MMC WP pin being inverted ARM: dts: cfa10049: Add SSP3 to the 10049 board ARM: dts: mxs: Add missing address and size cells in SSP nodes ARM: mx28evk: Add I2C EEPROM support ARM: dts: mxs: Enable USB1 Host on the CFA-10049 expansion board ARM: dts: mxs: Add the second I2C adapter to the CFA10049 expansion board ARM: dts: mxs: Add I2C1 muxing options for imx28 ARM: mx28evk: Add LRADC support ARM: mx28evk: Add SPI flash support ARM: mxs: Update DENX M28 machine and dts file ARM: mx28: Add USB PHY overcurrent pinmux ARM: mx28: Add SPI 2 pinmux into imx28.dtsi ARM: dts: mxs: Add pwm4 muxing options for imx28 ARM: dts: mxs: Add alternative I2C muxing options for imx28 ARM: olinuxino: Add gpio-led support ARM: mxs: Let mmc0 pin detect be generic ARM: mxs: Rename 'hog-gpios' ARM: mxs: remove iomux driver ARM: mxs: remove platform device codes ...
| * ARM: dts: cfa10049: Add the 74HC595 gpio expandersMaxime Ripard2012-09-111-0/+21
| | | | | | | | | | | | | | | | Add the two daisy-chains of 74hc595s shift registers available on the CFA-10049. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| * ARM: dts: m28evk: Fix MMC WP pin being invertedMarek Vasut2012-09-051-1/+1
| | | | | | | | | | | | | | | | The MMC WP is active high on the m28evk, fix this. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| * ARM: dts: cfa10049: Add SSP3 to the 10049 boardMaxime Ripard2012-09-051-0/+22
| | | | | | | | | | Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| * ARM: dts: mxs: Add missing address and size cells in SSP nodesMaxime Ripard2012-09-051-0/+8
| | | | | | | | | | Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| * ARM: mx28evk: Add I2C EEPROM supportFabio Estevam2012-09-051-0/+6
| | | | | | | | | | | | | | | | | | mx28evk has a free slot U50 that can be used to populate an I2C EEPROM. Add support for it. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| * ARM: dts: mxs: Enable USB1 Host on the CFA-10049 expansion boardMaxime Ripard2012-09-031-0/+25
| | | | | | | | | | Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| * ARM: dts: mxs: Add the second I2C adapter to the CFA10049 expansion boardMaxime Ripard2012-09-032-0/+32
| | | | | | | | | | Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| * ARM: dts: mxs: Add I2C1 muxing options for imx28Maxime Ripard2012-09-031-0/+11
| | | | | | | | | | Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| * ARM: mx28evk: Add LRADC supportFabio Estevam2012-08-281-0/+4
| | | | | | | | | | | | | | Add LRADC support. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| * ARM: mx28evk: Add SPI flash supportFabio Estevam2012-08-281-0/+17
| | | | | | | | | | | | | | | | | | mx28evk has a free slot (J89) which can be used to populate an SPI NOR Flash. Add support for it. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| * ARM: mxs: Update DENX M28 machine and dts fileMarek Vasut2012-08-282-7/+73
| | | | | | | | | | | | | | | | | | | | | | Update the mach-mxs machine by removing the enet_clkout(). The new revision of the board doesn't need that. Also, update the DTS file with all the new drivers pulled in the mainline recently, that is, SPI, LRADC, USB. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| * ARM: mx28: Add USB PHY overcurrent pinmuxMarek Vasut2012-08-251-0/+30
| | | | | | | | | | | | | | | | | | | | Add the pinmux settings for USB PHY overcurrent pins. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Chris Ball <cjb@laptop.org> Cc: Fabio Estevam <fabio.estevam@freescale.com> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| * ARM: mx28: Add SPI 2 pinmux into imx28.dtsiMarek Vasut2012-08-251-0/+13
| | | | | | | | | | | | | | | | | | | | Add this SSP port 2 pin multiplexing configuration into the imx28.dtsi file. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Chris Ball <cjb@laptop.org> Cc: Fabio Estevam <fabio.estevam@freescale.com> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| * ARM: dts: mxs: Add pwm4 muxing options for imx28Maxime Ripard2012-08-251-0/+10
| | | | | | | | | | | | Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Cc: Brian Lilly <brian@crystalfontz.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| * ARM: dts: mxs: Add alternative I2C muxing options for imx28Maxime Ripard2012-08-251-0/+11
| | | | | | | | | | | | Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Cc: Brian Lilly <brian@crystalfontz.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| * ARM: olinuxino: Add gpio-led supportFabio Estevam2012-08-231-0/+25
| | | | | | | | | | | | | | | | | | Olinuxino has a LED connected to MX23_PAD_SSP1_DETECT__GPIO_2_1 pin. Add support for it. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| * ARM: mxs: Let mmc0 pin detect be genericFabio Estevam2012-08-232-1/+1
| | | | | | | | | | | | | | | | | | | | Instead of assigning SSP1_DETECT inside mmc0_4bit_pins_a, let the board dts handle this setup. Not every board will use MX23_PAD_SSP1_DETECT as SSP1 functionality. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| * ARM: mxs: Rename 'hog-gpios'Fabio Estevam2012-08-236-6/+6
| | | | | | | | | | | | | | | | hog_pins is used to setup the pin functions, and it is not neccesarily used only for GPIO pins, so use only 'hog' to describe a more generic term. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| * ARM: mxs: remove iomux driverShawn Guo2012-08-175-1162/+1
| | | | | | | | | | | | | | With all board files removed, there is no user of iomux driver. Remove it. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| * ARM: mxs: remove platform device codesShawn Guo2012-08-1720-979/+1
| | | | | | | | | | | | | | With all the board files removed, there is no user for those platform device code. Remove them. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| * ARM: mxs: remove non-DT core functionsShawn Guo2012-08-172-48/+0
| | | | | | | | | | | | | | With all board files removed, those core functions used for non-DT boot only can be removed now. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| * ARM: mxs: remove board filesShawn Guo2012-08-1711-1883/+0
| | | | | | | | | | | | | | | | | | | | Since DT kernel provides the equivalent support with those board files, we can remove them now. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Cc: Lothar Waßmann <LW@KARO-electronics.de> Cc: Marek Vasut <marex@denx.de> Cc: Lauri Hintsala <lauri.hintsala@bluegiga.com>
| * ARM: mxs: use auxdata to pass flexcan_switch function hookShawn Guo2012-08-171-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There are some efforts going on to have flexcan_switch function implemented in flexcan driver, so that this platform function hook can be saved for device tree boot. But due to the mx28evk board design oddness that two flexcan transceivers share one switch gpio, we have to come up a separate and generic gpio-switch driver to handle all these gpio switch use cases. Before that happens, we choose to use auxdata to pass flexcan_switch function hook, so that the DT conversion is not blocked there. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| * ARM: mxs: tx28: reset fec phy for device tree bootShawn Guo2012-08-172-2/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For non-DT boot, function tx28_add_fec0 configures all ENET0 pins into gpio mode for resetting fec phy, and then reconfigures those pins into ENET function after that. For DT boot, all the pin configuration is done by pinctrl subsystem. Ideally, when gpio_request gets called, GPIO subsystem should call pinctrl to configure pins into gpio mode automatically, and have pins freed up from pinctrl subsystem when gpio_free is called. But right now, this cooperation between gpio and pinctrl hasn't been available. As the result, we have to explicitly call pinctrl_get_select and pinctrl_put for device tree boot. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Lothar Waßmann <LW@KARO-electronics.de>
| * ARM: dts: imx28: Add compatible and interrupt for LRADCMarek Vasut2012-08-171-0/+3
| | | | | | | | | | | | | | | | | | Signed-off-by: Marek Vasut <marex@denx.de> Cc: Jonathan Cameron <jic23@kernel.org> Cc: Juergen Beisert <jbe@pengutronix.de> Cc: Lars-Peter Clausen <lars@metafoo.de> Cc: Wolfgang Denk <wd@denx.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| * ARM: mach-mxs: Remove board entries in dt_board_compatFabio Estevam2012-08-171-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | There is no need for adding board related entries into dt_board_compat. Leave only the SoC entry. This way we do not need to patch a C file when adding dt support for a new board. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| * ARM: mx28evk: add missed clkmux select for saifDong Aisheng2012-08-171-0/+3
| | | | | | | | | | | | | | | | | | | | Added missed clkmux setting for mx28evk. Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: Liam Girdwood <lrg@ti.com> Cc: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Dong Aisheng <dong.aisheng@linaro.org> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| * ARM: imx23-olinuxino.dts: Add AUART0 supportFabio Estevam2012-08-172-0/+17
| | | | | | | | | | | | | | Add AUART0 support. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
* | Merge branch 'lpc32xx/dts' of git://git.antcom.de/linux-2.6 into next/dtOlof Johansson2012-09-072-4/+109
|\ \ | | | | | | | | | | | | | | | * 'lpc32xx/dts' of git://git.antcom.de/linux-2.6: ARM: LPC32xx: Extend dts for EA3250 board ARM: LPC32xx: Adjust device tree node to new standard num-cs
| * | ARM: LPC32xx: Extend dts for EA3250 boardRoland Stigge2012-09-061-1/+108
| | | | | | | | | | | | | | | | | | This patch adds keys and leds to the EA3250 board's dts device tree file. Signed-off-by: Roland Stigge <stigge@antcom.de>
| * | ARM: LPC32xx: Adjust device tree node to new standard num-csRoland Stigge2012-09-061-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In spi-pl022.c, the new device tree binding is now "num-cs" for the number of chip selects. Further, pl022,hierarchy and pl022,slave-tx-disable isn't supported in favour of reasonable defaults in the driver. Adjusting phy3250.dts to it. Signed-off-by: Roland Stigge <stigge@antcom.de>
* | | Merge branch 'pinmux-dt' of ↵Olof Johansson2012-09-0549-520/+840
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel into next/dt This branch enables device tree bindings for the CSR Prima pin control subsystem. All patches acked by Linus W (pinctrl maintainer). * 'pinmux-dt' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel: pinctrl: sirf: add DT-binding pinmux mapping support ARM: PRIMA2: rename prima2-cb.dts to prima2.dtsi as it only has SoC features ARM: PRIMA2: add missing interrupts property for pinctrl node + sync to Linux 3.6-rc4
| * | | pinctrl: sirf: add DT-binding pinmux mapping supportBarry Song2012-09-053-2/+258
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes us possible to define pinmux mapping in board-specific DTS. prima2.dtsi provides all possible (groups,functions) configuration, and device in .dts select configurations from dtsi files. Signed-off-by: Barry Song <Baohua.Song@csr.com> Acked-by: Linus Walleij <linus.walleij@linaro.org>
| * | | ARM: PRIMA2: rename prima2-cb.dts to prima2.dtsi as it only has SoC featuresBarry Song2012-09-051-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current prima2-cb.dts only includes prima2 SoC feature without board- specific descriptions. This patches rename it to dtsi and clean some useless content. Signed-off-by: Barry Song <Baohua.Song@csr.com> Acked-by: Linus Walleij <linus.walleij@linaro.org>
| * | | ARM: PRIMA2: add missing interrupts property for pinctrl nodeBarry Song2012-09-051-0/+1
| |/ / | | | | | | | | | | | | | | | | | | commit 5130216265f6f924a4 missed the interrupts property Signed-off-by: Barry Song <Baohua.Song@csr.com> Acked-by: Linus Walleij <linus.walleij@linaro.org>
| * | Merge tag 'fixes-3.6-rc3' of ↵Linus Torvalds2012-08-2545-96/+161
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull arm-soc fixes from Arnd Bergmann: "Bug fixes for various ARM platforms. About half of these are for OMAP and submitted before but did not make it into v3.6-rc2." * tag 'fixes-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (39 commits) 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 ARM: dts: imx51-babbage: fix esdhc cd/wp properties ARM: imx6: spin the cpu until hardware takes it down ARM: ux500: Ensure probing of Audio devices when Device Tree is enabled ARM: ux500: Fix merge error, no matching driver name for 'snd_soc_u8500' ARM i.MX6q: Add virtual 1/3.5 dividers in the LDB clock path ARM: Kirkwood: fix Makefile.boot ARM: Kirkwood: Fix iconnect leds ARM: Orion: Set eth packet size csum offload limit ARM: mv78xx0: fix win_cfg_base prototype ARM: OMAP: dmtimers: Fix locking issue in omap_dm_timer_request*() ARM: mmp: fix potential NULL dereference ARM: OMAP4: Register the OPP table only for 4430 device cpufreq: OMAP: Handle missing frequency table on SMP systems ARM: OMAP4: sleep: Save the complete used register stack frame ...
| | * \ Merge branch 'randconfig/mach' into fixesArnd Bergmann2012-08-238-10/+12
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Arnd Bergmann <arnd@arndb.de>
| | | * | ARM: ux500: don't select LEDS_GPIO for snowballArnd Bergmann2012-08-232-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using 'select' in Kconfig is hard, a platform cannot just enable a driver without also making sure that its subsystem is there. Also, there is no actual code dependency between the platform and the gpio leds driver. Without this patch, building without LEDS_CLASS esults in: drivers/built-in.o: In function `create_gpio_led.part.2': governor_userspace.c:(.devinit.text+0x5a58): undefined reference to `led_classdev_register' drivers/built-in.o: In function `gpio_led_remove': governor_userspace.c:(.devexit.text+0x6b8): undefined reference to `led_classdev_unregister' This reverts 8733f53c6 "ARM: ux500: Kconfig: Compile in leds-gpio support for Snowball" that introduced the regression and did not provide a helpful explanation. In order to leave the GPIO LED code still present in normal builds, this also enables the symbol in u8500_defconfig, in addition to the other LED drivers that are already selected there. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Lee Jones <lee.jones@linaro.org>
| | | * | ARM: imx: build i.MX6 functions only when neededArnd Bergmann2012-08-232-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The head-v7.S contains a call to the generic cpu_suspend function, which is only available when selected by the i.MX6 code. As pointed out by Shawn Guo, i.MX5 does not actually use any functions defined in head-v7.S. It is also needed only for the i.MX6 power management code and for the SMP code, so we can restrict building this file to situations in which at least one of those two is present. Finally, other platforms with a similar file call it headsmp.S, so we can rename it to the same for consistency. Without this patch, building imx5 standalone results in: arch/arm/mach-imx/built-in.o: In function `v7_cpu_resume': arch/arm/mach-imx/head-v7.S:104: undefined reference to `cpu_resume' Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Shawn Guo <shawn.guo@linaro.org> Cc: Eric Miao <eric.miao@linaro.org> Cc: stable@vger.kernel.org
| | | * | ARM: imx: select CPU_FREQ_TABLE when neededArnd Bergmann2012-08-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The i.MX cpufreq implementation uses the CPU_FREQ_TABLE helpers, so it needs to select that code to be built. This problem has apparently existed since the i.MX cpufreq code was first merged in v2.6.37. Building IMX without CPU_FREQ_TABLE results in: arch/arm/plat-mxc/built-in.o: In function `mxc_cpufreq_exit': arch/arm/plat-mxc/cpufreq.c:173: undefined reference to `cpufreq_frequency_table_put_attr' arch/arm/plat-mxc/built-in.o: In function `mxc_set_target': arch/arm/plat-mxc/cpufreq.c:84: undefined reference to `cpufreq_frequency_table_target' arch/arm/plat-mxc/built-in.o: In function `mxc_verify_speed': arch/arm/plat-mxc/cpufreq.c:65: undefined reference to `cpufreq_frequency_table_verify' arch/arm/plat-mxc/built-in.o: In function `mxc_cpufreq_init': arch/arm/plat-mxc/cpufreq.c:154: undefined reference to `cpufreq_frequency_table_cpuinfo' arch/arm/plat-mxc/cpufreq.c:162: undefined reference to `cpufreq_frequency_table_get_attr' Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Shawn Guo <shawn.guo@linaro.org> Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Yong Shen <yong.shen@linaro.org> Cc: stable@vger.kernel.org
| | | * | ARM: imx: fix ksz9021rn_phy_fixupArnd Bergmann2012-08-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ksz9021rn_phy_fixup and mx6q_sabrelite functions try to set up an ethernet phy if they can. They do check whether phylib is enabled, but unfortunately the functions can only be called from platform code if phylib is builtin, not if it is a module Without this patch, building with a modular phylib results in: arch/arm/mach-imx/mach-imx6q.c: In function 'imx6q_sabrelite_init': arch/arm/mach-imx/mach-imx6q.c:120:5: error: 'ksz9021rn_phy_fixup' undeclared (first use in this function) arch/arm/mach-imx/mach-imx6q.c:120:5: note: each undeclared identifier is reported only once for each function it appears in The bug was originally reported by Artem Bityutskiy but only partially fixed in ef441806 "ARM: imx6q: register phy fixup only when CONFIG_PHYLIB is enabled". Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Shawn Guo <shawn.guo@linaro.org> Cc: Artem Bityutskiy <dedekind1@gmail.com> Cc: Sascha Hauer <s.hauer@pengutronix.de>
| | | * | ARM: imx: build pm-imx5 code only when PM is enabledArnd Bergmann2012-08-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves the imx5 pm code out of the list of unconditionally compiled files for imx5, mirroring what we already do for imx6 and how it was done before the code was move from mach-mx5 to mach-imx in v3.3. Without this patch, building with CONFIG_PM disabled results in: arch/arm/mach-imx/pm-imx5.c:202:116: error: redefinition of 'imx51_pm_init' arch/arm/mach-imx/include/mach-imx/common.h:154:91: note: previous definition of 'imx51_pm_init' was here arch/arm/mach-imx/pm-imx5.c:209:116: error: redefinition of 'imx53_pm_init' arch/arm/mach-imx/include/mach-imx/common.h:155:91: note: previous definition of 'imx53_pm_init' was here Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Shawn Guo <shawn.guo@linaro.org> Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: stable@vger.kernel.org
| | | * | ARM: omap: allow building omap44xx without SMPArnd Bergmann2012-08-232-2/+3
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new omap4 cpuidle implementation currently requires ARCH_NEEDS_CPU_IDLE_COUPLED, which only works on SMP. This patch makes it possible to build a non-SMP kernel for that platform. This is not normally desired for end-users but can be useful for testing. Without this patch, building rand-0y2jSKT results in: drivers/cpuidle/coupled.c: In function 'cpuidle_coupled_poke': drivers/cpuidle/coupled.c:317:3: error: implicit declaration of function '__smp_call_function_single' [-Werror=implicit-function-declaration] It's not clear if this patch is the best solution for the problem at hand. I have made sure that we can now build the kernel in all configurations, but that does not mean it will actually work on an OMAP44xx. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Tested-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Cc: Kevin Hilman <khilman@ti.com> Cc: Tony Lindgren <tony@atomide.com>
| | * | Merge tag 'ux500-fixes-v3.6-rc2' of ↵Arnd Bergmann2012-08-232-5/+9
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into fixes From Linus Walleij <linus.walleij@linaro.org>: Here are two audio fixes for the ux500 found by Lee Jones. * tag 'ux500-fixes-v3.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: ARM: ux500: Ensure probing of Audio devices when Device Tree is enabled ARM: ux500: Fix merge error, no matching driver name for 'snd_soc_u8500' Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | | * | ARM: ux500: Ensure probing of Audio devices when Device Tree is enabledLee Jones2012-08-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous attempts to add platform probing of the Audio related devices only call from non-DT initialisation functions. This patch extends that functionality to the Device Tree related ones too. Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
| | | * | ARM: ux500: Fix merge error, no matching driver name for 'snd_soc_u8500'Lee Jones2012-08-171-5/+5
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The platform attempts to register platform device 'snd_soc_u8500' which doesn't actually exist. Here we change the reference to the correct one 'snd_soc_mop500'. Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
| | * | Merge branch 'v3.6-samsung-fixes-1' of ↵Arnd Bergmann2012-08-237-4/+62
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes From Kukjin Kim <kgene.kim@samsung.com>: For HDMI, already HDMI support for EXYNOS in mainline kernel is broken because its configuration moved to platform data but regarding platform data didn't support yet. And others are for fix warnings. * 'v3.6-samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: EXYNOS: Set HDMI platform data in Origen board ARM: EXYNOS: Set HDMI platform data in SMDKV310 ARM: SAMSUNG: Add API to set platform data for s5p-tv driver ARM: SAMSUNG: Set HDMI platform data for Exynos4x12 SoCs ARM: Samsung: Make uart_save static in pm.c file ARM: S3C24XX: Fix s3c2410_dma_enqueue parameters ARM: S3C24XX: Add missing DMACH_DT_PROP Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | | * | ARM: EXYNOS: Set HDMI platform data in Origen boardTushar Behera2012-08-081-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Tushar Behera <tushar.behera@linaro.org> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| | | * | ARM: EXYNOS: Set HDMI platform data in SMDKV310Sachin Kamat2012-08-081-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sets HDMI platform data in SMDKV310 board. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
OpenPOWER on IntegriCloud