summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ARM: dts: enable mmc for imx23-evkShawn Guo2012-05-132-0/+30
| | | | Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
* mmc: mxs-mmc: add device tree supportShawn Guo2012-05-132-5/+68
| | | | | | | It adds device tree probe support for mxs-mmc driver. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Chris Ball <cjb@laptop.org>
* mmc: mxs-mmc: copy wp_gpio in struct mxs_mmc_hostShawn Guo2012-05-131-7/+4
| | | | | | | | | | Copy wp_gpio from platform_data into struct mxs_mmc_host, so that the use of platform_data can be limited in probe function, which will ease the device tree probe. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Marek Vasut <marex@denx.de> Acked-by: Chris Ball <cjb@laptop.org>
* mmc: mxs-mmc: have dma_channel than dma_res in mxs_mmc_hostShawn Guo2012-05-131-3/+3
| | | | | | | | | | It replaces dma_res with dma_channel in struct mxs_mmc_host, so that the device tree support will be a little easier, since dma channel can not be retrieved from "struct resource *dma_res". Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Marek Vasut <marex@denx.de> Acked-by: Chris Ball <cjb@laptop.org>
* mmc: mxs-mmc: use devm_* helper to make cleanup simplerShawn Guo2012-05-131-31/+9
| | | | | | | | | Use devm_request_and_ioremap and devm_request_irq helpers to clean up the code a little bit. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Marek Vasut <marex@denx.de> Acked-by: Chris Ball <cjb@laptop.org>
* mmc: mxs-mmc: move header from mach into linux folderShawn Guo2012-05-133-6/+6
| | | | | | | | | | Rename arch/arm/mach-mxs/include/mach/mmc.h to include/linux/mmc/mxs-mmc.h, so that mxs-mmc driver becomes <mach/*> inclusion free. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Marek Vasut <marex@denx.de> Acked-by: Chris Ball <cjb@laptop.org>
* mmc: mxs-mmc: get rid of the use of cpu_is_xxxShawn Guo2012-05-135-26/+40
| | | | | | | | | | The register HW_SSP_VERSION is broken for ssp version detection, as the address of the register is different between imx23 and imx28. Let's use platform_device_id to detect the device, so that the use of cpu_is_xxx can be removed. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Chris Ball <cjb@laptop.org>
* mmc: mxs-mmc: let ssp_is_old take host as parameterShawn Guo2012-05-131-28/+29
| | | | | | | | Let macro ssp_is_old take host as parameter to make the code easy to read. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Chris Ball <cjb@laptop.org>
* mmc: mxs-mmc: use global stmp_device functionalityShawn Guo2012-05-131-7/+7
| | | | | | | | Use global stmp_device functionality to reduce mach-dependency. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Marek Vasut <marex@denx.de> Acked-by: Chris Ball <cjb@laptop.org>
* ARM: mxs: add gpio support for device tree bootShawn Guo2012-05-123-2/+100
| | | | | | | It adds gpio support for device tree boot. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Linus Walleij <linus.walleij@linaro.org>
* gpio/mxs: add device tree probeShawn Guo2012-05-122-4/+119
| | | | | | | It adds device tree probe for gpio-mxs driver. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Linus Walleij <linus.walleij@linaro.org>
* gpio/mxs: get rid of the use of cpu_is_xxxShawn Guo2012-05-124-46/+66
| | | | | | | | | | | It removes the use of cpu_is_xxx from gpio-mxs driver and instead use platform_device_id to identify the device. Accordingly, mxs platform code is changed to register gpio device with different names, and the registeration are done in soc specific initialization functions now, so postcore_initcall(mxs_add_mxs_gpio) gets removed. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Linus Walleij <linus.walleij@linaro.org>
* gpio/mxs: use devm_* helpers to make error handling simpleShawn Guo2012-05-121-39/+13
| | | | | | | | It uses devm_* helpers to make the error handling of probe clean and simple. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Linus Walleij <linus.walleij@linaro.org>
* ARM: mxs: add mxs-dma dt supportDong Aisheng2012-05-122-4/+4
| | | | | | | | | | | Cc: Grant Likely <grant.likely@secretlab.ca> Cc: Rob Herring <rob.herring@calxeda.com> Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Huang Shijie <b32955@freescale.com> Signed-off-by: Dong Aisheng <dong.aisheng@linaro.org> Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Marek Vasut <marex@denx.de> Acked-by: Vinod Koul <vinod.koul@intel.com>
* ARM: mxs: do not add dma device by defaultDong Aisheng2012-05-123-22/+10
| | | | | | | | | | | | This will cause conflict when dt is enabled. So let each platform add dma devices respectively. Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Huang Shijie <b32955@freescale.com> Signed-off-by: Dong Aisheng <dong.aisheng@linaro.org> Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Marek Vasut <marex@denx.de> Acked-by: Vinod Koul <vinod.koul@intel.com>
* dma: mxs-dma: add device tree probe supportDong Aisheng2012-05-122-5/+43
| | | | | | | | | | | | | Cc: Grant Likely <grant.likely@secretlab.ca> Cc: Rob Herring <rob.herring@calxeda.com> Cc: Rob Landley <rob@landley.net> Cc: Dan Williams <dan.j.williams@intel.com> Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Huang Shijie <b32955@freescale.com> Signed-off-by: Dong Aisheng <dong.aisheng@linaro.org> Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Marek Vasut <marex@denx.de> Acked-by: Vinod Koul <vinod.koul@intel.com>
* dma: mxs-dma: make platform_device_id more genericShawn Guo2012-05-125-56/+93
| | | | | | | | | | | | | | Rewrite mxs_dma_is_apbh and mxs_dma_is_apbx in order to support other SoCs like imx6q and reform the platform_device_id for the better further dt support. Cc: Dan Williams <dan.j.williams@intel.com> Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Huang Shijie <b32955@freescale.com> Signed-off-by: Dong Aisheng <dong.aisheng@linaro.org> Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Marek Vasut <marex@denx.de> Acked-by: Vinod Koul <vinod.koul@intel.com>
* dma: mxs-dma: let dma_is_apbh and apbh_is_old take parameterShawn Guo2012-05-121-12/+16
| | | | | | | Let macros dma_is_apbh and apbh_is_old take mxs_dma as parameter to make the code easy to read. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
* dma: mxs-dma: use global stmp_device functionalityDong Aisheng2012-05-122-13/+14
| | | | | | | | | | | | | This can get rid of the mach-dependency. Cc: Dan Williams <dan.j.williams@intel.com> Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Huang Shijie <b32955@freescale.com> Signed-off-by: Dong Aisheng <dong.aisheng@linaro.org> Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Wolfram Sang <w.sang@pengutronix.de> Acked-by: Marek Vasut <marex@denx.de> Acked-by: Vinod Koul <vinod.koul@intel.com>
* ARM: mxs: always build in device tree supportShawn Guo2012-05-123-1/+2
| | | | | | | | As the ultimate for mxs platform is to convert over to device tree, let's start always building in device tree support for the platform. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Marek Vasut <marex@denx.de>
* ARM: mxs: add initial device tree support for imx23-evk boardShawn Guo2012-05-126-0/+305
| | | | | | | | It adds initial device tree support for imx23-evk board, and only serial console is enabled. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Marek Vasut <marex@denx.de>
* ARM: mxs: add initial device tree support for imx28-evk boardDong Aisheng2012-05-128-1/+531
| | | | | | | | This patch includes basic dt support which can boot via nfs rootfs. Signed-off-by: Dong Aisheng <dong.aisheng@linaro.org> Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Marek Vasut <marex@denx.de>
* Merge branches 'clk/mxs' and 'imx/pinctrl/for-3.5' into mxs/dt/for-3.5Shawn Guo2012-05-1233-0/+159
|\
| * ARM: mxs: enable pinctrl supportShawn Guo2012-05-122-0/+3
| | | | | | | | Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| * video: mxsfb: adopt pinctrl supportShawn Guo2012-05-121-0/+9
| | | | | | | | | | | | Cc: linux-fbdev@vger.kernel.org Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| * ASoC: mxs-saif: adopt pinctrl supportShawn Guo2012-05-121-0/+8
| | | | | | | | | | | | Cc: alsa-devel@alsa-project.org Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * i2c: mxs: adopt pinctrl supportShawn Guo2012-05-121-0/+6
| | | | | | | | | | | | Cc: linux-i2c@vger.kernel.org Cc: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| * mtd: nand: gpmi: adopt pinctrl supportShawn Guo2012-05-121-0/+9
| | | | | | | | | | | | Cc: linux-mtd@lists.infradead.org Cc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| * mmc: mxs-mmc: adopt pinctrl supportShawn Guo2012-05-121-0/+8
| | | | | | | | | | | | Cc: linux-mmc@vger.kernel.org Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Chris Ball <cjb@laptop.org>
| * serial: mxs-auart: adopt pinctrl supportShawn Guo2012-05-121-0/+8
| | | | | | | | | | | | Cc: linux-serial@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| * serial: amba-pl011: adopt pinctrl supportShawn Guo2012-05-121-0/+8
| | | | | | | | | | | | | | Cc: linux-serial@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * spi/imx: adopt pinctrl supportShawn Guo2012-05-121-0/+8
| | | | | | | | | | | | | | Cc: spi-devel-general@lists.sourceforge.net Cc: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Dong Aisheng <dong.aisheng@linaro.org>
| * i2c: imx: adopt pinctrl supportShawn Guo2012-05-121-0/+8
| | | | | | | | | | | | | | Cc: linux-i2c@vger.kernel.org Cc: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Dong Aisheng <dong.aisheng@linaro.org>
| * can: flexcan: adopt pinctrl supportShawn Guo2012-05-121-0/+6
| | | | | | | | | | | | | | Cc: linux-can@vger.kernel.org Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Marc Kleine-Budde <mkl@pengutronix.de> Acked-by: Dong Aisheng <dong.aisheng@linaro.org>
| * net: fec: adopt pinctrl supportShawn Guo2012-05-121-0/+9
| | | | | | | | | | | | | | Cc: netdev@vger.kernel.org Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Dong Aisheng <dong.aisheng@linaro.org> Acked-by: David S. Miller <davem@davemloft.net>
| * tty: serial: imx: adopt pinctrl supportShawn Guo2012-05-111-0/+8
| | | | | | | | | | | | | | Cc: linux-serial@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Dong Aisheng <dong.aisheng@linaro.org>
| * mmc: sdhci-imx-esdhc: adopt pinctrl supportDong Aisheng2012-05-111-0/+9
| | | | | | | | | | | | | | | | Cc: linux-mmc@vger.kernel.org Cc: Chris Ball <cjb@laptop.org> Signed-off-by: Dong Aisheng <dong.aisheng@linaro.org> Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Stephen Warren <swarren@wwwdotorg.org>
| * ARM: imx6q: switch to use pinctrl subsystemDong Aisheng2012-05-081-0/+2
| | | | | | | | | | | | Acked-by: Stephen Warren <swarren@wwwdotorg.org> Signed-off-by: Dong Aisheng <dong.aisheng@linaro.org> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| * ARM: mxs: enable pinctrl dummy statesShawn Guo2012-05-088-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mxs pinctrl driver will only support DT probe. That said, the mxs device drivers can only get pinctrl state from pinctrl subsystem when the drivers get probed from device tree. Before converting the whole mxs platform support over to device tree, we need to enable pinctrl dummy states for those non-DT board files to ensure the pinctrl API adopted by mxs device drivers will work for both DT and non-DT probe. Instead of calling pinctrl_provide_dummies() directly in every board file, the patch introduces soc specific calls mx23_soc_init() and mx28_soc_init() for boards' .init_machine hook to invoke, so that any soc specific setup for non-DT boot only can be added there. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| * ARM: imx: enable pinctrl dummy statesDong Aisheng2012-05-089-0/+25
| | | | | | | | | | | | | | | | | | Enable pinctrl dummy states for imx platforms without pinctrl support. Acked-by: Stephen Warren <swarren@wwwdotorg.org> Signed-off-by: Dong Aisheng <dong.aisheng@linaro.org> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
* | ARM: mxs: remove now unused timer_clk argument from mxs_timer_initShawn Guo2012-05-084-12/+10
| | | | | | | | | | | | | | With old mxs clock support removed, the timer_clk argument of mxs_timer_init is unused now, so remove it. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
* | ARM: mxs: remove old clock supportShawn Guo2012-05-088-2447/+0
| | | | | | | | | | | | | | The mxs clock has been switched to common clock framework, so the old clock support can be removed now. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
* | ARM: mxs: switch to common clk frameworkShawn Guo2012-05-083-4/+4
| | | | | | | | | | | | It switches mxs clock support to common clk framework based drivers. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
* | ARM: mxs: change the lookup name for fec phy clockShawn Guo2012-05-082-2/+2
| | | | | | | | | | | | Change the fec phy clock lookup name to be more accurate. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
* | ARM: mxs: request clock for timerShawn Guo2012-05-081-0/+9
| | | | | | | | | | | | | | When mxs_timer_init() does not have a timer_clk passed in, it should try to request clock from clkdev system. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
* | clk: mxs: add clock support for imx28Shawn Guo2012-05-082-0/+338
| | | | | | | | | | | | Add imx28 clock support based on common clk framework. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
* | clk: mxs: add clock support for imx23Shawn Guo2012-05-082-0/+206
| | | | | | | | | | | | Add imx23 clock support based on common clk framework. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
* | clk: mxs: add mxs specific clocksShawn Guo2012-05-087-0/+618
| | | | | | | | | | | | | | Add mxs specific clocks, pll, reference clock (PFD), integer divider and fractional divider. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
* | Linux 3.4-rc6v3.4-rc6Linus Torvalds2012-05-071-1/+1
| |
* | Merge branch 'x86-urgent-for-linus' of ↵Linus Torvalds2012-05-065-5/+21
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull x86 fixes form Peter Anvin * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: intel_mid_powerbtn: mark irq as IRQF_NO_SUSPEND arch/x86/platform/geode/net5501.c: change active_low to 0 for LED driver x86, relocs: Remove an unused variable asm-generic: Use __BITS_PER_LONG in statfs.h x86/amd: Re-enable CPU topology extensions in case BIOS has disabled it
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 06:53:07 +0100