summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'for-next/mci'Sascha Hauer2014-02-031-0/+2
|\ | | | | | | | | Conflicts: arch/arm/boards/tqma53/board.c
| * boards: tqma53: add DSR support for eMMCMarkus Niebel2014-01-151-0/+4
| | | | | | | | | | | | | | | | | | all eMMC cards with DSR support used on different revisions of TQMa53 needs the same DSR value. just apply it. Signed-off-by: Markus Niebel <Markus.Niebel@tqs.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * mci: imx-esdhc: add DSR supportMarkus Niebel2014-01-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | having DSR support in mci-core we need a way to forward the DSR value to the driver. Add it to platform data for imx-esdhc TODO: implement the same for other host controller drivers Signed-off-by: Markus Niebel <Markus.Niebel@tqs.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/iomem'Sascha Hauer2014-02-035-16/+16
|\ \ | | | | | | | | | | | | Conflicts: arch/arm/mach-imx/external-nand-boot.c
| * | ARM: i.MX: esdctl-v4: Use __iomem specifier for memory pointerAlexander Shiyan2014-01-291-12/+12
| | | | | | | | | | | | | | | Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: i.MX: esdctl: Use __iomem specifier for memory pointerAlexander Shiyan2014-01-291-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: i.MX: external_nand_boot: Use __iomem specifier for memory pointerAlexander Shiyan2014-01-291-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: at91: irq_fixup: Use __iomem specifier for memory pointerAlexander Shiyan2014-01-291-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: animeo_ip: Use __iomem specifier for memory pointerAlexander Shiyan2014-01-291-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/imx'Sascha Hauer2014-02-03108-2600/+7681
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: arch/arm/boards/dmo-mx6-realq7/lowlevel.c
| * | | ARM: i.MX: Add lowlevel gpio functionsSascha Hauer2014-02-011-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some boards need gpio functions very early and also sometimes is useful to toggle gpios during early code debug. This adds a header file for setting i.MX gpios early. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: i.MX: Karo TX25: Switch to multiboard supportSascha Hauer2014-02-014-25/+25
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: i.MX: cleanup bootmode selectionSascha Hauer2014-01-3113-88/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Which bootmode is selected has no longer to be chosen by Kconfig. The boards can decide themselves which bootmode they want to support. This makes it unnecesary to ask the user which bootmode shall be supported, so the "Select boot mode" becomes invisible and both support will be compiled in as needed by the boards. NAND_IMX_BOOT goes away and the already existing ARCH_IMX_EXTERNAL_BOOT_NAND can now be used for the boards to depend on external nand boot. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: i.MX25: Karo TX25: Switch to devicetree supportSascha Hauer2014-01-314-104/+55
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: dts: Karo TX25: add barebox specificsSascha Hauer2014-01-311-0/+35
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: dts: Karo TX25: add phy supply for fecSascha Hauer2014-01-311-0/+16
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: dts: Karo TX25: add missing nfc propertiesSascha Hauer2014-01-311-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: dts: Karo TX25: Add phy-reset-gpioSascha Hauer2014-01-311-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: dts: Karo TX25: Add pinctrl nodesSascha Hauer2014-01-311-0/+53
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: dts: i.MX25: Add iram to devicetreeSascha Hauer2014-01-311-0/+5
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: dts: Add i.MX25 Karo TX25 dtsSascha Hauer2014-01-312-0/+37
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: i.MX25: Add missing GPT clock lookupsSascha Hauer2014-01-312-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only one GPT will be used, but with devicetree support we can't predict which one it is, so we need the clock lookup for all GPTs to ensure that the timer gets its clock. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: dts: i.MX25: remove disabled status of usbmisc unitSascha Hauer2014-01-311-1/+0
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: dts: i.MX25: Add mmc aliasesSascha Hauer2014-01-311-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: dts: Add i.MX25 devicetree filesSascha Hauer2014-01-312-0/+1046
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: i.MX: external NAND boot: make dtb boarddata workSascha Hauer2014-01-311-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we are running from NFC SRAM and we are passed boarddata containing a devicetree pointer then it point to an address relative to the NFC SRAM start. First thing we do is to copy the initial binary to SDRAM and jump there. The devicetree pointer has to be adjusted by this offset. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: i.MX: external NAND boot: use image size from image headerSascha Hauer2014-01-311-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When compiling with multiimage support ld_var(_barebox_image_size) only contains the length of the PBL image, but not including the appended compressed data. With this patch the image size is read from the barebox header instead which contains the correct size, either from the linker or from the fix_size tool. This makes the external_nand_boot compatible with multiimage support. Tested on Phytec phyCARD-i.MX27 with and without PBL. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | scripts: fix_size: check magicSascha Hauer2014-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of passing the offset to the fix_size tool check the image to fixup for a valid header so that only recognized files are fixed up. This makes the usage of this tool safer. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: i.MX53: tqma53: Switch to devicetree and multiboard supportSascha Hauer2014-01-2910-368/+159
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: dts: i.MX53: tqma53: Add barebox specificsSascha Hauer2014-01-292-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add chosen node with - environment - linux,stdout-path - add dsr value to eMMC - add provide-mac-address property to iim node - set memory size in memory node to 0 since we have two different memory sizes which have to be handled. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: dts: Add TQ tqma53/mba53 dts filesSascha Hauer2014-01-293-1/+421
| | | | | | | | | | | | | | | | | | | | | | | | Directly taken from Linux-3.13. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: imx_v7_defconfig: Enable new boardsSascha Hauer2014-01-292-2/+6
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: phyCARD-i.MX27: Switch to devicetree probe supportSascha Hauer2014-01-293-181/+10
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: dts: phycard-i.MX27: Add sdhc2 pinctrlSascha Hauer2014-01-291-0/+6
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: dts: phycard-i.MX27: Add environment and NAND partitioningSascha Hauer2014-01-291-0/+25
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: phycard-i.MX27: Add stdout-path propertySascha Hauer2014-01-291-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: phycard-i.MX27: Add NAND support to dtsSascha Hauer2014-01-291-0/+13
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: i.MX clocksource: return successful for multiple instancesSascha Hauer2014-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With multiple instances we returned -EBUSY which will provoke a log message. Return successful instead since the i.MX27 has multiple GPTs in the devicetree. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: i.MX: external NAND boot: pass boarddataSascha Hauer2014-01-2914-20/+25
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: dts: Add Phytec phyCARD-i.MX27 devicetree filesSascha Hauer2014-01-293-0/+201
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: dts: Add i.MX27 devicetree filesSascha Hauer2014-01-293-0/+1182
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: i.MX: external NAND boot: do not depend on cpu_is_*Sascha Hauer2014-01-291-14/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | With multiboard support the cpu_is_* macros are no longer compile time generated and do not work in early code, so pass a v1 variable around. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: i.MX: external NAND boot: make it work with relocatable PBLSascha Hauer2014-01-291-57/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to copy the initial binary portion from NFC SRAM to TEXT_BASE and jumped there. With relocatable PBL TEXT_BASE becomes 0, so this doesn't work. This is changed to copy the initial binary portion to the beginning of SDRAM instead. Tested on Phytec phyCARD-i.MX27 and Karo TX25 with and without relocatable pbl. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: i.MX: external NAND boot: create function macro for different SoCsSascha Hauer2014-01-231-89/+23
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: i.MX: external NAND boot: factor out a 2k pagesize detection functionSascha Hauer2014-01-231-20/+45
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: Fix image size calculation for CONFIG_PBL_RELOCATABLESascha Hauer2014-01-231-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | TEXT_BASE - SZ_2M is only used for non relocable pbl images. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: phyCARD-i.MX27: Update defconfigSascha Hauer2014-01-231-14/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables a lot of new features in the defconfig: - Image compression - FAT support - Ext4 support - UBIFS support - more commands Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: i.MX27: Add missing MPLL clock sourcesSascha Hauer2014-01-231-5/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MPLL can be driven from the low frequency reference clock. This is the reset default. Currently the clock code assumes this has been changed from the lowlevel code. If that didn't happen we get wrong clock rates. This adds the missing clocks so that we get correct clock rates. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: phyCARD-i.MX27: convert lowlevel init to c codeSascha Hauer2014-01-233-120/+108
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: phyCARD-i.MX27: switch to new environmentSascha Hauer2014-01-233-48/+12
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>