Merge branch 'next/dt2' into HEAD (7b27fa25) · 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

7b27fa25

Commit 7b27fa25 authored 12 years ago by Olof Johansson

Downloads
- Plain Diff

Merge branch 'next/dt2' into HEAD

Conflicts:
	arch/arm/mach-exynos/clock-exynos5.c

parents a8e1ceb7 6fd9b70e

No related branches found

No related tags found

Loading

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

arch/arm/boot/dts/exynos4.dtsi 248 additions, 0 deletions

arch/arm/boot/dts/exynos4.dtsi
arch/arm/boot/dts/exynos4210-origen.dts 7 additions, 56 deletions

arch/arm/boot/dts/exynos4210-origen.dts
arch/arm/boot/dts/exynos4210-smdkv310.dts 5 additions, 49 deletions

arch/arm/boot/dts/exynos4210-smdkv310.dts
arch/arm/boot/dts/exynos4210-trats.dts 237 additions, 0 deletions

arch/arm/boot/dts/exynos4210-trats.dts
arch/arm/boot/dts/exynos4210.dtsi 5 additions, 181 deletions

arch/arm/boot/dts/exynos4210.dtsi
arch/arm/boot/dts/exynos5250-smdk5250.dts 58 additions, 1 deletion

arch/arm/boot/dts/exynos5250-smdk5250.dts
arch/arm/boot/dts/exynos5250.dtsi 32 additions, 0 deletions

arch/arm/boot/dts/exynos5250.dtsi
arch/arm/mach-exynos/Makefile.boot 1 addition, 1 deletion

arch/arm/mach-exynos/Makefile.boot
arch/arm/mach-exynos/clock-exynos5.c 16 additions, 29 deletions

arch/arm/mach-exynos/clock-exynos5.c
arch/arm/mach-exynos/include/mach/map.h 4 additions, 0 deletions

arch/arm/mach-exynos/include/mach/map.h
arch/arm/mach-exynos/mach-exynos4-dt.c 23 additions, 9 deletions

arch/arm/mach-exynos/mach-exynos4-dt.c
arch/arm/mach-exynos/mach-exynos5-dt.c 8 additions, 0 deletions

arch/arm/mach-exynos/mach-exynos5-dt.c

with 644 additions and 326 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