forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/ke…
…rnel/git/arm/arm-soc
Pull ARM SoC board updates from Olof Johansson:
"This branch is reducing in size for every release since most
board-related changes have started happening in devicetrees now.
Still, we have some things going on here.
* Renesas platforms are still adding a bit more legacy device
support, something that should trail off shortly as they move to
full DT
* We group most defconfig updates into this branch out of old habits
* Removal of legacy OMAP2 platforms over to DT continues, and a
handful of old code is being removed here"
* tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (94 commits)
ARM: dts: OMAP2: fix interrupt number for rng
ARM: dts: Split omap3 pinmux core device
ARM: dts: Add omap specific pinctrl defines to use padconf addresses
ARM: bcm2835: bcm2835_defconfig updates
ARM: msm_defconfig: Enable restart driver
defconfig: msm_defconfig: Enable CONFIG_ARCH_MSM8974
ARM: msm: Add support for APQ8074 Dragonboard
ARM: exynos_defconfig: Enable S2MPS11 voltage regulator
ARM: tegra: Enable DRM panel support
ARM: shmobile: mackerel: Fix USBHS pinconf entry
ARM: shmobile: Let Koelsch multiplatform boot with Koelsch DTB
ARM: shmobile: Let Lager multiplatform boot with Lager DTB
ARM: shmobile: Remove non-multiplatform Koelsch reference support
ARM: shmobile: Remove non-multiplatform Lager reference support
ARM: shmobile: koelsch-reference: Instantiate clkdevs for SCIF and CMT
ARM: shmobile: lager-reference: Instantiate clkdevs for SCIF and CMT
ARM: shmobile: koelsch-reference: Remove duplicate CCF initialization
ARM: shmobile: lager-reference: Enable multiplaform kernel support
ARM: shmobile: armadillo: Set backlight enable GPIO
ARM: shmobile: Koelsch: add Ether support
...
Conflicts:
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c- Loading branch information
Showing
75 changed files
with
1,899 additions
and
3,868 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| /dts-v1/; | ||
|
|
||
| #include "omap2420-n8x0-common.dtsi" | ||
|
|
||
| / { | ||
| model = "Nokia N800"; | ||
| compatible = "nokia,n800", "nokia,n8x0", "ti,omap2420", "ti,omap2"; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| /dts-v1/; | ||
|
|
||
| #include "omap2420-n8x0-common.dtsi" | ||
|
|
||
| / { | ||
| model = "Nokia N810 WiMax"; | ||
| compatible = "nokia,n810-wimax", "nokia,n8x0", "ti,omap2420", "ti,omap2"; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| /dts-v1/; | ||
|
|
||
| #include "omap2420-n8x0-common.dtsi" | ||
|
|
||
| / { | ||
| model = "Nokia N810"; | ||
| compatible = "nokia,n810", "nokia,n8x0", "ti,omap2420", "ti,omap2"; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| #include "omap2420.dtsi" | ||
|
|
||
| / { | ||
| memory { | ||
| device_type = "memory"; | ||
| reg = <0x80000000 0x8000000>; /* 128 MB */ | ||
| }; | ||
|
|
||
| ocp { | ||
| i2c@0 { | ||
| compatible = "i2c-cbus-gpio"; | ||
| gpios = <&gpio3 2 0 /* gpio66 clk */ | ||
| &gpio3 1 0 /* gpio65 dat */ | ||
| &gpio3 0 0 /* gpio64 sel */ | ||
| >; | ||
| #address-cells = <1>; | ||
| #size-cells = <0>; | ||
| retu_mfd: retu@1 { | ||
| compatible = "retu-mfd"; | ||
| interrupt-parent = <&gpio4>; | ||
| interrupts = <12 IRQ_TYPE_EDGE_RISING>; | ||
| reg = <0x1>; | ||
| }; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| &i2c1 { | ||
| clock-frequency = <400000>; | ||
| }; | ||
|
|
||
| &i2c2 { | ||
| clock-frequency = <400000>; | ||
| }; | ||
|
|
||
| &gpmc { | ||
| ranges = <0 0 0x04000000 0x10000000>; | ||
|
|
||
| /* gpio-irq for dma: 26 */ | ||
|
|
||
| onenand@0,0 { | ||
| #address-cells = <1>; | ||
| #size-cells = <1>; | ||
| reg = <0 0 0x10000000>; | ||
|
|
||
| gpmc,sync-read; | ||
| gpmc,burst-length = <16>; | ||
| gpmc,burst-read; | ||
| gpmc,burst-wrap; | ||
| gpmc,device-width = <2>; | ||
| gpmc,mux-add-data = <2>; | ||
| gpmc,cs-on-ns = <0>; | ||
| gpmc,cs-rd-off-ns = <127>; | ||
| gpmc,cs-wr-off-ns = <109>; | ||
| gpmc,adv-on-ns = <0>; | ||
| gpmc,adv-rd-off-ns = <18>; | ||
| gpmc,adv-wr-off-ns = <18>; | ||
| gpmc,oe-on-ns = <27>; | ||
| gpmc,oe-off-ns = <127>; | ||
| gpmc,we-on-ns = <27>; | ||
| gpmc,we-off-ns = <72>; | ||
| gpmc,rd-cycle-ns = <145>; | ||
| gpmc,wr-cycle-ns = <136>; | ||
| gpmc,access-ns = <118>; | ||
| gpmc,page-burst-access-ns = <27>; | ||
| gpmc,bus-turnaround-ns = <0>; | ||
| gpmc,cycle2cycle-delay-ns = <0>; | ||
| gpmc,wait-monitoring-ns = <0>; | ||
| gpmc,clk-activation-ns = <9>; | ||
| gpmc,sync-clk-ps = <27000>; | ||
|
|
||
| /* MTD partition table corresponding to old board-n8x0 file. */ | ||
| partition@0 { | ||
| label = "bootloader"; | ||
| reg = <0x00000000 0x00020000>; | ||
| read-only; | ||
| }; | ||
| partition@1 { | ||
| label = "config"; | ||
| reg = <0x00020000 0x00060000>; | ||
| }; | ||
| partition@2 { | ||
| label = "kernel"; | ||
| reg = <0x00080000 0x00200000>; | ||
| }; | ||
| partition@3 { | ||
| label = "initfs"; | ||
| reg = <0x00280000 0x00400000>; | ||
| }; | ||
| partition@4 { | ||
| label = "rootfs"; | ||
| reg = <0x00680000 0x0f980000>; | ||
| }; | ||
| partition@5 { | ||
| label = "omap2-onenand"; | ||
| reg = <0x00000000 0x10000000>; | ||
| }; | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| /* | ||
| * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/ | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License version 2 as | ||
| * published by the Free Software Foundation. | ||
| */ | ||
| /dts-v1/; | ||
|
|
||
| #include "omap2430.dtsi" | ||
|
|
||
| / { | ||
| model = "TI OMAP2430 SDP"; | ||
| compatible = "ti,omap2430-sdp", "ti,omap2430", "ti,omap2"; | ||
|
|
||
| memory { | ||
| device_type = "memory"; | ||
| reg = <0x80000000 0x8000000>; /* 128 MB */ | ||
| }; | ||
| }; | ||
|
|
||
| &i2c2 { | ||
| clock-frequency = <100000>; | ||
|
|
||
| twl: twl@48 { | ||
| reg = <0x48>; | ||
| interrupts = <7>; /* SYS_NIRQ cascaded to intc */ | ||
| }; | ||
| }; | ||
|
|
||
| #include "twl4030.dtsi" | ||
|
|
||
| &mmc1 { | ||
| vmmc-supply = <&vmmc1>; | ||
| bus-width = <4>; | ||
| }; | ||
|
|
||
| &gpmc { | ||
| ranges = <5 0 0x08000000 0x01000000>; | ||
| ethernet@gpmc { | ||
| compatible = "smsc,lan91c94"; | ||
| interrupt-parent = <&gpio5>; | ||
| interrupts = <21 IRQ_TYPE_LEVEL_LOW>; /* gpio149 */ | ||
| reg = <5 0x300 0xf>; | ||
| bank-width = <2>; | ||
| gpmc,mux-add-data; | ||
| }; | ||
| }; | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.