-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'renesas-boards-for-v3.10' of git://git.kernel.org/pub/scm/…
…linux/kernel/git/horms/renesas into next/boards From Simon Horman <horms+renesas@verge.net.au>: Renesas ARM-based SoC board updates for v3.10 This is based on a merge of the following: git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-pinmux-for-v3.10 git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-soc-for-v3.10 * tag 'renesas-boards-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (218 commits) ARM: shmobile: kzm9g: correct smsc regulator registration ARM: shmobile: marzen: Use gic_iid macro for ICCIAR / interrupt ID ARM: shmobile: kzm9g: Trim reference DT_MACHINE_START ARM: shmobile: kzm9g: Remove warning about SMP ARM: shmobile: simplify kzm9g Kconfig dependencies ARM: shmobile: SDHI and MMCIF interfaces to kzm9g-reference ARM: shmobile: parse DT and configure pinmux early on kzm9g-reference ARM: shmobile: kzm9g: Reference DT implementation ARM: shmobile: marzen: Reference DT implementation ARM: shmobile: mark mackerel sh_mmcif_device __maybe_unused ARM: shmobile: streamline mackerel SD and MMC devices ARM: shmobile: switch SDHI0 to GPIO regulator on armadillo800eva ARM: shmobile: use GPIO SD-card detection on armadillo800eva Signed-off-by: Arnd Bergmann <arnd@arndb.de>
- Loading branch information
Showing
102 changed files
with
10,745 additions
and
6,083 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /* | ||
| * Reference Device Tree Source for the Marzen board | ||
| * | ||
| * Copyright (C) 2013 Renesas Solutions Corp. | ||
| * Copyright (C) 2013 Simon Horman | ||
| * | ||
| * This file is licensed under the terms of the GNU General Public License | ||
| * version 2. This program is licensed "as is" without any warranty of any | ||
| * kind, whether express or implied. | ||
| */ | ||
|
|
||
| /dts-v1/; | ||
| /include/ "r8a7779.dtsi" | ||
|
|
||
| / { | ||
| model = "marzen"; | ||
| compatible = "renesas,marzen-reference", "renesas,r8a7779"; | ||
|
|
||
| chosen { | ||
| bootargs = "console=ttySC2,115200 earlyprintk=sh-sci.2,115200 ignore_loglevel root=/dev/nfs ip=on"; | ||
| }; | ||
|
|
||
| memory { | ||
| device_type = "memory"; | ||
| reg = <0x60000000 0x40000000>; | ||
| }; | ||
|
|
||
| fixedregulator3v3: fixedregulator@0 { | ||
| compatible = "regulator-fixed"; | ||
| regulator-name = "fixed-3.3V"; | ||
| regulator-min-microvolt = <3300000>; | ||
| regulator-max-microvolt = <3300000>; | ||
| regulator-boot-on; | ||
| regulator-always-on; | ||
| }; | ||
|
|
||
| lan0@18000000 { | ||
| compatible = "smsc,lan9220", "smsc,lan9115"; | ||
| reg = <0x18000000 0x100>; | ||
| phy-mode = "mii"; | ||
| interrupt-parent = <&gic>; | ||
| interrupts = <0 28 0x4>; | ||
| reg-io-width = <4>; | ||
| vddvario-supply = <&fixedregulator3v3>; | ||
| vdd33a-supply = <&fixedregulator3v3>; | ||
| }; | ||
| }; |
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,98 @@ | ||
| /* | ||
| * Device Tree Source for Renesas r8a7779 | ||
| * | ||
| * Copyright (C) 2013 Renesas Solutions Corp. | ||
| * Copyright (C) 2013 Simon Horman | ||
| * | ||
| * This file is licensed under the terms of the GNU General Public License | ||
| * version 2. This program is licensed "as is" without any warranty of any | ||
| * kind, whether express or implied. | ||
| */ | ||
|
|
||
| /include/ "skeleton.dtsi" | ||
|
|
||
| / { | ||
| compatible = "renesas,r8a7779"; | ||
|
|
||
| cpus { | ||
| #address-cells = <1>; | ||
| #size-cells = <0>; | ||
|
|
||
| cpu@0 { | ||
| device_type = "cpu"; | ||
| compatible = "arm,cortex-a9"; | ||
| reg = <0>; | ||
| }; | ||
| cpu@1 { | ||
| device_type = "cpu"; | ||
| compatible = "arm,cortex-a9"; | ||
| reg = <1>; | ||
| }; | ||
| cpu@2 { | ||
| device_type = "cpu"; | ||
| compatible = "arm,cortex-a9"; | ||
| reg = <2>; | ||
| }; | ||
| cpu@3 { | ||
| device_type = "cpu"; | ||
| compatible = "arm,cortex-a9"; | ||
| reg = <3>; | ||
| }; | ||
| }; | ||
|
|
||
| gic: interrupt-controller@f0001000 { | ||
| compatible = "arm,cortex-a9-gic"; | ||
| #interrupt-cells = <3>; | ||
| interrupt-controller; | ||
| reg = <0xf0001000 0x1000>, | ||
| <0xf0000100 0x100>; | ||
| }; | ||
|
|
||
| i2c0: i2c@0xffc70000 { | ||
| #address-cells = <1>; | ||
| #size-cells = <0>; | ||
| compatible = "renesas,rmobile-iic"; | ||
| reg = <0xffc70000 0x1000>; | ||
| interrupt-parent = <&gic>; | ||
| interrupts = <0 79 0x4>; | ||
| }; | ||
|
|
||
| i2c1: i2c@0xffc71000 { | ||
| #address-cells = <1>; | ||
| #size-cells = <0>; | ||
| compatible = "renesas,rmobile-iic"; | ||
| reg = <0xffc71000 0x1000>; | ||
| interrupt-parent = <&gic>; | ||
| interrupts = <0 82 0x4>; | ||
| }; | ||
|
|
||
| i2c2: i2c@0xffc72000 { | ||
| #address-cells = <1>; | ||
| #size-cells = <0>; | ||
| compatible = "renesas,rmobile-iic"; | ||
| reg = <0xffc72000 0x1000>; | ||
| interrupt-parent = <&gic>; | ||
| interrupts = <0 80 0x4>; | ||
| }; | ||
|
|
||
| i2c3: i2c@0xffc73000 { | ||
| #address-cells = <1>; | ||
| #size-cells = <0>; | ||
| compatible = "renesas,rmobile-iic"; | ||
| reg = <0xffc73000 0x1000>; | ||
| interrupt-parent = <&gic>; | ||
| interrupts = <0 81 0x4>; | ||
| }; | ||
|
|
||
| thermal@ffc48000 { | ||
| compatible = "renesas,rcar-thermal"; | ||
| reg = <0xffc48000 0x38>; | ||
| }; | ||
|
|
||
| sata: sata@fc600000 { | ||
| compatible = "renesas,rcar-sata"; | ||
| reg = <0xfc600000 0x2000>; | ||
| interrupt-parent = <&gic>; | ||
| interrupts = <0 100 0x4>; | ||
| }; | ||
| }; |
Oops, something went wrong.