forked from Intel-BMC/linux
-
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 '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: "Board-related updates. This branch is getting smaller and smaller, which is the whole idea so that's reassuring. Right now by far most of the code is related to shmobile updates, and they are now switching over to removal of board code and migration to multiplatform, so we'll see their board code base shrink in the near future too, I hope. In addition to that is some defconfig updates, some display updates for OMAP and a bit of new board support for Rockchip boards" * tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (56 commits) ARM: rockchip: add support for rk3188 and Radxa Rock board ARM: rockchip: add dts for bqcurie2 tablet ARM: rockchip: enable arm-global-timer ARM: rockchip: move shared dt properties to common source file ARM: OMAP2+: display: Create omap_vout device inside omap_display_init ARM: OMAP2+: display: Create omapvrfb and omapfb devices inside omap_display_init ARM: OMAP2+: display: Create omapdrm device inside omap_display_init ARM: OMAP2+: drm: Don't build device for DMM ARM: tegra: defconfig updates RX-51: Add support for OMAP3 ROM Random Number Generator ARM: OMAP3: RX-51: ARM errata 430973 workaround ARM: OMAP3: Add secure function omap_smc3() which calling instruction smc openbmc#1 ARM: shmobile: marzen: enable INTC IRQ ARM: shmobile: bockw: add SMSC support on reference ARM: shmobile: Use SMP on Koelsch ARM: shmobile: Remove KZM9D reference DTS ARM: shmobile: Let KZM9D multiplatform boot with KZM9D DTB ARM: shmobile: Remove non-multiplatform KZM9D reference support ARM: shmobile: Use KZM9D without reference for multiplatform ARM: shmobile: Sync KZM9D DTS with KZM9D reference DTS ...
- Loading branch information
Showing
43 changed files
with
1,902 additions
and
235 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 was deleted.
Oops, something went wrong.
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,31 @@ | ||
| /* | ||
| * Device Tree Source for the Genmai board | ||
| * | ||
| * Copyright (C) 2013 Renesas Solutions Corp. | ||
| * | ||
| * 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/ "r7s72100.dtsi" | ||
|
|
||
| / { | ||
| model = "Genmai"; | ||
| compatible = "renesas,genmai", "renesas,r7s72100"; | ||
|
|
||
| chosen { | ||
| bootargs = "console=ttySC2,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp"; | ||
| }; | ||
|
|
||
| memory { | ||
| device_type = "memory"; | ||
| reg = <0x08000000 0x08000000>; | ||
| }; | ||
|
|
||
| lbsc { | ||
| #address-cells = <1>; | ||
| #size-cells = <1>; | ||
| }; | ||
| }; |
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,32 @@ | ||
| /* | ||
| * Device Tree Source for the Koelsch board | ||
| * | ||
| * Copyright (C) 2013 Renesas Electronics Corporation | ||
| * Copyright (C) 2013 Renesas Solutions Corp. | ||
| * | ||
| * 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/ "r8a7791.dtsi" | ||
|
|
||
| / { | ||
| model = "Koelsch"; | ||
| compatible = "renesas,koelsch", "renesas,r8a7791"; | ||
|
|
||
| chosen { | ||
| bootargs = "console=ttySC6,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp"; | ||
| }; | ||
|
|
||
| memory@40000000 { | ||
| device_type = "memory"; | ||
| reg = <0 0x40000000 0 0x80000000>; | ||
| }; | ||
|
|
||
| lbsc { | ||
| #address-cells = <1>; | ||
| #size-cells = <1>; | ||
| }; | ||
| }; |
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,109 @@ | ||
| /* | ||
| * Copyright (c) 2013 MundoReader S.L. | ||
| * Author: Heiko Stuebner <heiko@sntech.de> | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation; either version 2 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| */ | ||
|
|
||
| /dts-v1/; | ||
| #include "rk3066a.dtsi" | ||
|
|
||
| / { | ||
| model = "bq Curie 2"; | ||
|
|
||
| memory { | ||
| reg = <0x60000000 0x40000000>; | ||
| }; | ||
|
|
||
| soc { | ||
| uart0: serial@10124000 { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| uart1: serial@10126000 { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| uart2: serial@20064000 { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&uart2_xfer>; | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| uart3: serial@20068000 { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| vcc_sd0: fixed-regulator { | ||
| compatible = "regulator-fixed"; | ||
| regulator-name = "sdmmc-supply"; | ||
| regulator-min-microvolt = <3000000>; | ||
| regulator-max-microvolt = <3000000>; | ||
| gpio = <&gpio3 7 GPIO_ACTIVE_LOW>; | ||
| startup-delay-us = <100000>; | ||
| }; | ||
|
|
||
| dwmmc@10214000 { /* sdmmc */ | ||
| num-slots = <1>; | ||
| status = "okay"; | ||
|
|
||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_cd &sd0_bus4>; | ||
| vmmc-supply = <&vcc_sd0>; | ||
|
|
||
| slot@0 { | ||
| reg = <0>; | ||
| bus-width = <4>; | ||
| disable-wp; | ||
| }; | ||
| }; | ||
|
|
||
| dwmmc@10218000 { /* wifi */ | ||
| num-slots = <1>; | ||
| status = "okay"; | ||
| non-removable; | ||
|
|
||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_bus4>; | ||
|
|
||
| slot@0 { | ||
| reg = <0>; | ||
| bus-width = <4>; | ||
| disable-wp; | ||
| }; | ||
| }; | ||
|
|
||
| gpio-keys { | ||
| compatible = "gpio-keys"; | ||
| #address-cells = <1>; | ||
| #size-cells = <0>; | ||
| autorepeat; | ||
|
|
||
| button@0 { | ||
| gpios = <&gpio6 2 GPIO_ACTIVE_LOW>; /* GPIO6_A2 */ | ||
| linux,code = <116>; | ||
| label = "GPIO Key Power"; | ||
| linux,input-type = <1>; | ||
| gpio-key,wakeup = <1>; | ||
| debounce-interval = <100>; | ||
| }; | ||
| button@1 { | ||
| gpios = <&gpio4 21 GPIO_ACTIVE_LOW>; /* GPIO4_C5 */ | ||
| linux,code = <104>; | ||
| label = "GPIO Key Vol-"; | ||
| linux,input-type = <1>; | ||
| gpio-key,wakeup = <0>; | ||
| debounce-interval = <100>; | ||
| }; | ||
| /* VOL+ comes somehow thru the ADC */ | ||
| }; | ||
| }; | ||
| }; |
Oops, something went wrong.