Merge branch 'next/soc2' into HEAD (5c008d70) · Commits · Clea OS / bsp / nxp / linux-seco-imx · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

linux-seco-imx
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Iterations
- Jira
- Terraform modules
- Model experiments

Snippets Groups Projects

5c008d70

Commit 5c008d70 authored 12 years ago by Olof Johansson

Downloads
- Plain Diff

Merge branch 'next/soc2' into HEAD

parents 5d3a0a95 36246a82

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

arch/arm/Kconfig 2 additions, 0 deletions

arch/arm/Kconfig
arch/arm/boot/dts/imx23.dtsi 3 additions, 2 deletions

arch/arm/boot/dts/imx23.dtsi
arch/arm/boot/dts/imx28.dtsi 3 additions, 2 deletions

arch/arm/boot/dts/imx28.dtsi
arch/arm/mach-mxs/icoll.c 54 additions, 9 deletions

arch/arm/mach-mxs/icoll.c
arch/arm/mach-mxs/include/mach/common.h 2 additions, 1 deletion

arch/arm/mach-mxs/include/mach/common.h
arch/arm/mach-mxs/include/mach/entry-macro.S 0 additions, 35 deletions

arch/arm/mach-mxs/include/mach/entry-macro.S
arch/arm/mach-mxs/include/mach/irqs.h 0 additions, 32 deletions

arch/arm/mach-mxs/include/mach/irqs.h
arch/arm/mach-mxs/mach-mxs.c 4 additions, 35 deletions

arch/arm/mach-mxs/mach-mxs.c
arch/arm/mach-mxs/timer.c 12 additions, 1 deletion

arch/arm/mach-mxs/timer.c
drivers/clk/mxs/clk-imx23.c 1 addition, 1 deletion

drivers/clk/mxs/clk-imx23.c
drivers/clk/mxs/clk-imx28.c 1 addition, 1 deletion

drivers/clk/mxs/clk-imx28.c
drivers/gpio/gpio-mxs.c 30 additions, 18 deletions

drivers/gpio/gpio-mxs.c

with 112 additions and 137 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment