moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
310,704 Commits 7 Branches 0 Tags
1a076689cda8a1d623dcda170b2dc2b476cc6f1a
Commit Graph

310704 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tushar Behera
635a472675 ARM: S3C24XX: Use common macro to define resources on mach-h1940.c 
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
 2012-05-12 16:12:24 +09:00
Tushar Behera
1c2bf1d326 ARM: S3C24XX: Use common macro to define resources on mach-gta02.c 
Cc: Nelson Castillo <arhuaco@freaks-unidos.net>
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
 2012-05-12 16:12:23 +09:00
Tushar Behera
52df44d172 ARM: S3C24XX: Use common macro to define resources on mach-bast.c 
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
 2012-05-12 16:12:21 +09:00
Tushar Behera
d990e3986d ARM: S3C24XX: Use common macro to define resources on mach-at2440evb.c 
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
 2012-05-12 16:12:21 +09:00
Tushar Behera
d1c14938b7 ARM: S3C24XX: Use common macro to define resources on mach-anubis.c 
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
 2012-05-12 16:12:21 +09:00
Tushar Behera
7d4aa909c8 ARM: S3C24XX: Use common macro to define resources on mach-amlm5900.c 
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
 2012-05-12 16:12:20 +09:00
Tushar Behera
16b742f59c ARM: S3C24XX: Use common macro to define resources on bast-ide.c 
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
 2012-05-12 16:12:20 +09:00
Tushar Behera
f7f145e7db ARM: EXYNOS: Use common macro to define resources on mach-smdkv310.c 
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
 2012-05-12 16:12:20 +09:00
Tushar Behera
f9b08c6d37 ARM: EXYNOS: Use common macro to define resources on mach-armlex4210.c 
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
 2012-05-12 16:12:20 +09:00
Tushar Behera
d1e819e57b ARM: EXYNOS: Use common macro to define resources on dev-audio.c 
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
 2012-05-12 16:12:20 +09:00
Tushar Behera
7f9851fea7 ARM: EXYNOS: Use common macro to define resources on dev-ahci.c 
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
 2012-05-12 16:12:19 +09:00
Tushar Behera
24eec601bd ARM: SAMSUNG: Use common macro to define resources on devs.c 
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
 2012-05-12 16:12:19 +09:00
Olof Johansson
7e6ecebd2c Merge tag 'ep93xx-fixes-for-3.5' of git://github.com/RyanMallon/linux-ep93xx into next/drivers 
Branch has one driver feature and one board bug fix. Merging it as a driver branch.

DMA driver change was later:
Acked-by: Vinod Koul <vinod.koul@linux.intel.com>

* tag 'ep93xx-fixes-for-3.5' of git://github.com/RyanMallon/linux-ep93xx:
  dmaengine/ep93xx_dma: Implement double buffering for M2M DMA channels
  arm: ep93xx: Don't try to release not acquired GPIO lines
 2012-05-12 00:00:57 -07:00
Sylwester Nawrocki
06050e5580 ARM: EXYNOS: Add platform resource definitions for FIMC-LITE 
Add the gate clocks and register region address definition
for FIMC-LITE devices available in EXYNOS4X12 SoCs.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
 2012-05-12 15:32:00 +09:00
Kukjin Kim
ad28536a89 Merge branch 'next/devel-samsung-iommu' into next/devel-samsung 
Conflicts:
	arch/arm/mach-exynos/Makefile
 2012-05-12 15:31:37 +09:00
Olof Johansson
4a0dfe69fe Merge branch 'imx/pinctrl/for-3.5' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/pinctrl 
* 'imx/pinctrl/for-3.5' of git://git.linaro.org/people/shawnguo/linux-2.6: (290 commits)
  ARM: mxs: enable pinctrl support
  video: mxsfb: adopt pinctrl support
  ASoC: mxs-saif: adopt pinctrl support
  i2c: mxs: adopt pinctrl support
  mtd: nand: gpmi: adopt pinctrl support
  mmc: mxs-mmc: adopt pinctrl support
  serial: mxs-auart: adopt pinctrl support
  serial: amba-pl011: adopt pinctrl support
  spi/imx: adopt pinctrl support
  i2c: imx: adopt pinctrl support
  can: flexcan: adopt pinctrl support
  net: fec: adopt pinctrl support
  tty: serial: imx: adopt pinctrl support
  mmc: sdhci-imx-esdhc: adopt pinctrl support
  ARM: imx6q: switch to use pinctrl subsystem
  ARM: mxs: enable pinctrl dummy states
  ARM: imx: enable pinctrl dummy states
  +3.4-rc5 update
 2012-05-11 22:59:11 -07:00
Shawn Guo
ce4c6f9b59 ARM: mxs: add gpio support for device tree boot 
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>
 2012-05-12 13:32:19 +08:00
Shawn Guo
4052d45e80 gpio/mxs: add device tree probe 
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>
 2012-05-12 13:32:19 +08:00
Shawn Guo
164387d2b4 gpio/mxs: get rid of the use of cpu_is_xxx 
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>
 2012-05-12 13:32:18 +08:00
Shawn Guo
940a4f7b51 gpio/mxs: use devm_* helpers to make error handling simple 
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>
 2012-05-12 13:32:18 +08:00
Dong Aisheng
84f3570a96 ARM: mxs: add mxs-dma dt support 
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>
 2012-05-12 13:32:18 +08:00
Dong Aisheng
cb1be3c73d ARM: mxs: do not add dma device by default 
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>
 2012-05-12 13:32:18 +08:00
Dong Aisheng
90c9abc5b7 dma: mxs-dma: add device tree probe support 
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>
 2012-05-12 13:32:18 +08:00
Shawn Guo
8c92013643 dma: mxs-dma: make platform_device_id more generic 
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>
 2012-05-12 13:32:17 +08:00
Shawn Guo
bb11fb63fc dma: mxs-dma: let dma_is_apbh and apbh_is_old take parameter 
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>
 2012-05-12 13:32:17 +08:00
Dong Aisheng
f5b7efccdb dma: mxs-dma: use global stmp_device functionality 
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>
 2012-05-12 13:32:17 +08:00
Shawn Guo
6c4d4efb9d ARM: mxs: always build in device tree support 
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>
 2012-05-12 13:32:17 +08:00
Shawn Guo
2954ff395b ARM: mxs: add initial device tree support for imx23-evk board 
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>
 2012-05-12 13:32:17 +08:00
Dong Aisheng
bc3a59c1b7 ARM: mxs: add initial device tree support for imx28-evk board 
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>
 2012-05-12 13:32:16 +08:00
Shawn Guo
844d0b5a0b Merge branches 'clk/mxs' and 'imx/pinctrl/for-3.5' into mxs/dt/for-3.5 2012-05-12 13:32:09 +08:00
Olof Johansson
243e095446 Merge branch 'msm-core' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into next/cleanup 
* 'msm-core' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm:
  ARM: msm: fix compilation flags for MSM_SCM (part 2)
  arch/arm/mach-msm: linux/gpio.h included twice
  ARM: msm: Drop useless teq from DEBUG_LL support
 2012-05-11 22:31:02 -07:00
Olof Johansson
eb9eef616b Merge branch 'fixes-for-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup 
* 'fixes-for-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP: OTG integration: fix compiler warning
  ARM: OMAP1: USB: fix ocpi_enable compile problem on non-1610 builds
 2012-05-11 22:21:51 -07:00
David S. Miller
fd2b79b7bf sparc32: Kill unused defines from asm/head_32.h 
Signed-off-by: David S. Miller <davem@davemloft.net>
 2012-05-11 21:43:11 -07:00
David S. Miller
0301a6cbcc sparc32: Remove some more sun4c code from floppy glue. 
Signed-off-by: David S. Miller <davem@davemloft.net>
 2012-05-11 21:39:48 -07:00
David S. Miller
4c84d26c9a sparc32: Remove sun4c tlb/vac insn patching from entry.S 
No longer used.

Signed-off-by: David S. Miller <davem@davemloft.net>
 2012-05-11 21:35:36 -07:00
David S. Miller
db41cf2df6 sparc32: Remove ldXa and stXa defines, unused. 
These were for sharing some MMU code between sun4 and sun4c.

Signed-off-by: David S. Miller <davem@davemloft.net>
 2012-05-11 21:31:49 -07:00
David S. Miller
2a4b69c482 sparc32: Remove sun4{,c} control reg definitions from contregs.h. 
No longer used.

Signed-off-by: David S. Miller <davem@davemloft.net>
 2012-05-11 21:29:17 -07:00
David S. Miller
c1e3cb54f2 sparc32: Remove sparc_lvl15_nmi(). 
No longer used.

Signed-off-by: David S. Miller <davem@davemloft.net>
 2012-05-11 21:27:04 -07:00
David S. Miller
96061a91a1 sparc32: Restore SMP build and rectify sun4m NMI when non-SMP. 
The non-SMP sun4m NMI handler was still accessing SUN4C registers.

Fix that and share the sun4m NMI trap code between SMP and non-SMP
cases.

Signed-off-by: David S. Miller <davem@davemloft.net>
 2012-05-11 21:23:05 -07:00
David S. Miller
716a5d73a7 sparc32: Kill asm/vac-ops.h 
All sun4/sun4c stuff and unused.

Signed-off-by: David S. Miller <davem@davemloft.net>
 2012-05-11 21:07:50 -07:00
David S. Miller
6b7679dd65 sparc32: Stop warning about sun4/sun4c in SMP Kconfig option. 
Signed-off-by: David S. Miller <davem@davemloft.net>
 2012-05-11 21:01:47 -07:00
David S. Miller
288e58cd03 sparc32: Remove sun4c floppy assembler. 
There were two blocks of code for the two ways to twiddle
the terminal count pin in the AUXIO register, one for
sun4c and one for sun4m.  Kill the former.

Signed-off-by: David S. Miller <davem@davemloft.net>
 2012-05-11 20:59:57 -07:00
David S. Miller
59a0c3d91e sparc32: Put back SPARC_BRANCH. 
It's needed for the floppy interrupt trap table patching.

Signed-off-by: David S. Miller <davem@davemloft.net>
 2012-05-11 20:57:29 -07:00
David S. Miller
4419f11b45 sparc32: Kill SUN4C_LOCK_{VADDR,END} and associated comment. 
No longer used.

Signed-off-by: David S. Miller <davem@davemloft.net>
 2012-05-11 20:51:51 -07:00
David S. Miller
58fa4dcbc4 sparc: Clear out unused asm/machines.h values. 
Remove sun4 and sun4c machine ID values from asm/machines.h

Also kill NUM_SUN_MACHINES, use ARRAY_SIZE instead.

Kill asm/machines.h include and sun4c checks from asm/floppy_32.h

Remove asm/machines.h include from setup_32.c and time_32.c, unused.

Signed-off-by: David S. Miller <davem@davemloft.net>
 2012-05-11 20:45:18 -07:00
David S. Miller
8695c37d06 sparc: Convert some assembler over to linakge.h's ENTRY/ENDPROC 
Use those, instead of doing it all by hand.

Signed-off-by: David S. Miller <davem@davemloft.net>
 2012-05-11 20:33:22 -07:00
David S. Miller
b55e81b9f8 sparc32: Remove inline strncmp "optimization" for constant counts. 
Let the compiler do stuff like this.

Signed-off-by: David S. Miller <davem@davemloft.net>
 2012-05-11 19:53:29 -07:00
Sam Ravnborg
afaedde7c9 sparc32: use inline versions of pgprot_noncached, pte_to_pgoff and pgoff_to_pte 
We no longer have different versions of these so use a few simple
static inline functions.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
 2012-05-11 19:29:10 -07:00
Sam Ravnborg
e7b7e0c356 sparc32: drop btfixup for alloc_thread_info_node/free_thread_info 
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
 2012-05-11 19:29:09 -07:00
Sam Ravnborg
323206a1d5 sparc32: drop sun4c bits from head_32.S 
As we no longer support sun4c we can remove all the code to
support remapping the kernel in head_32.S.
We also try to tell the user that the machine is not support,
in case someone try to boot the kernel on a sun4c one day

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
 2012-05-11 19:29:00 -07:00