mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-28 13:34:38 +08:00
a233bb742a
DT changes continue to be the bulk of our merge window contents. We continue to have a large set of changes across the board as new platforms and drivers are added. Some of the new platforms are: - Alphascale ASM9260 - Marvell Armada 388 - CSR Atlas7 - TI Davinci DM816x - Hisilicon HiP01 - ST STiH418 There have also been some sweeping changes, including relicensing of DTS contents from GPL to GPLv2+/X11 so that the same files can be reused in other non-GPL projects more easily. There's also been changes to the DT Makefile to make it a little less conflict-ridden and churny down the road. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJU4u0bAAoJEIwa5zzehBx3XFQP+wbVDp39ay3SRanFWeXqhfTe 6jRsYrOcq6BN/b1NugjD+yKIYp2MQhwlXbMmj/1vnmJ3XSY25ZMLlgs0/vsNk7W2 5e0xySwdhd1DjsajhZyN+5gUgqcTgOof/V+CbEUkijDDJ9v/WJbGZrpCHDz+UVTh dG9p1vrKoxDELAVbnp9muKZPlaQkAM60zJcHNJw9bJB5M0RCx4XFwPZc1cDLIsIZ lK/uYpKsgvgrGw5QuCtEK1/NkqLkBqgBfVg6xq0VB6OCYetqpxqs7kSZjnncIhQc PvxShsIJzb/dgfk7xBVb1+4Jfe5L/4poFwS69QuBlr/wiwc7wrhv37edgkyDlclS aj5xfOIhQdDaTkknFVs4QEkGAFg/lnTZnmiNiQdlsmDHqbWdTEELKShdVeMO7Zsg 6bPdDipA2jsQ86UWNwucis8QulzVTuyNuU+Mlrxp73b76+hKXLkbYcZ51FJ/xMD8 wLpCGqtc9Quirdb7Wy7XiVfesv3lKfDmzZB/6ZJ6zfadDvsqJPxAjNTA8VYZ9YeT EyW4K6CMOa5v+sLmIQUsAjKCYaul3PVDCi4voQjpS1ZtPLw+WN3zqX5XZZDT9Ll2 D1ycmInp/40KsQgjV36u1NlIKMM+oaUJaSzaSPGdgj3Zcw0YZi8O+h0m6iHrlzUB uGFufsLKmcOFY/sLwprt =XEw1 -----END PGP SIGNATURE----- Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC DT updates from Olof Johansson: "DT changes continue to be the bulk of our merge window contents. We continue to have a large set of changes across the board as new platforms and drivers are added. Some of the new platforms are: - Alphascale ASM9260 - Marvell Armada 388 - CSR Atlas7 - TI Davinci DM816x - Hisilicon HiP01 - ST STiH418 There have also been some sweeping changes, including relicensing of DTS contents from GPL to GPLv2+/X11 so that the same files can be reused in other non-GPL projects more easily. There's also been changes to the DT Makefile to make it a little less conflict-ridden and churny down the road" * tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (330 commits) ARM: dts: Add PPMU node for exynos4412-trats2 ARM: dts: Add PPMU node for exynos3250-monk and exynos3250-rinato ARM: dts: Add PPMU dt node for exynos4 and exynos4210 ARM: dts: Add PPMU dt node for exynos3250 ARM: dts: add mipi dsi device node for exynos4415 ARM: dts: add fimd device node for exynos4415 ARM: dts: Add syscon phandle to the video-phy node for Exynos4 ARM: dts: Add sound nodes for exynos4412-trats2 ARM: dts: Fix CLK_MOUT_CAMn parent clocks assignment for exynos4412-trats2 ARM: dts: Fix CLK_UART_ISP_SCLK clock assignment in exynos4x12.dtsi ARM: dts: Add max77693 charger node for exynos4412-trats2 ARM: dts: Switch max77686 regulators to GPIO control for exynos4412-trats2 ARM: dts: Add suspend configuration for max77686 regulators for exynos4412-trats2 ARM: dts: Add Maxim 77693 fuel gauge node for exynos4412-trats2 ARM: dts: am57xx-beagle-x15: Fix USB2 mode ARM: dts: am57xx-beagle-x15: Add extcon nodes for USB ARM: dts: dra72-evm: Add extcon nodes for USB ARM: dts: dra7-evm: Add extcon nodes for USB ARM: dts: rockchip: move the hdmi ddc-i2c-bus property to the actual boards ARM: dts: rockchip: enable vops and hdmi output on rk3288-firefly and -evb ...
248 lines
4.7 KiB
Plaintext
248 lines
4.7 KiB
Plaintext
/*
|
|
* Copyright 2013 Maxime Ripard
|
|
*
|
|
* Maxime Ripard <maxime.ripard@free-electrons.com>
|
|
*
|
|
* The code contained herein is licensed under the GNU General Public
|
|
* License. You may obtain a copy of the GNU General Public License
|
|
* Version 2 or later at the following locations:
|
|
*
|
|
* http://www.opensource.org/licenses/gpl-license.html
|
|
* http://www.gnu.org/copyleft/gpl.html
|
|
*/
|
|
|
|
/dts-v1/;
|
|
#include "sun7i-a20.dtsi"
|
|
#include "sunxi-common-regulators.dtsi"
|
|
|
|
#include <dt-bindings/gpio/gpio.h>
|
|
#include <dt-bindings/input/input.h>
|
|
#include <dt-bindings/interrupt-controller/irq.h>
|
|
#include <dt-bindings/pinctrl/sun4i-a10.h>
|
|
|
|
/ {
|
|
model = "Olimex A20-Olinuxino Micro";
|
|
compatible = "olimex,a20-olinuxino-micro", "allwinner,sun7i-a20";
|
|
|
|
aliases {
|
|
serial0 = &uart0;
|
|
serial1 = &uart6;
|
|
serial2 = &uart7;
|
|
spi0 = &spi1;
|
|
spi1 = &spi2;
|
|
};
|
|
|
|
soc@01c00000 {
|
|
spi1: spi@01c06000 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&spi1_pins_a>;
|
|
status = "okay";
|
|
};
|
|
|
|
mmc0: mmc@01c0f000 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;
|
|
vmmc-supply = <®_vcc3v3>;
|
|
bus-width = <4>;
|
|
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
|
|
cd-inverted;
|
|
status = "okay";
|
|
};
|
|
|
|
mmc3: mmc@01c12000 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&mmc3_pins_a>, <&mmc3_cd_pin_olinuxinom>;
|
|
vmmc-supply = <®_vcc3v3>;
|
|
bus-width = <4>;
|
|
cd-gpios = <&pio 7 11 GPIO_ACTIVE_HIGH>; /* PH11 */
|
|
cd-inverted;
|
|
status = "okay";
|
|
};
|
|
|
|
usbphy: phy@01c13400 {
|
|
usb1_vbus-supply = <®_usb1_vbus>;
|
|
usb2_vbus-supply = <®_usb2_vbus>;
|
|
status = "okay";
|
|
};
|
|
|
|
ehci0: usb@01c14000 {
|
|
status = "okay";
|
|
};
|
|
|
|
ohci0: usb@01c14400 {
|
|
status = "okay";
|
|
};
|
|
|
|
spi2: spi@01c17000 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&spi2_pins_a>;
|
|
status = "okay";
|
|
};
|
|
|
|
ahci: sata@01c18000 {
|
|
target-supply = <®_ahci_5v>;
|
|
status = "okay";
|
|
};
|
|
|
|
ehci1: usb@01c1c000 {
|
|
status = "okay";
|
|
};
|
|
|
|
ohci1: usb@01c1c400 {
|
|
status = "okay";
|
|
};
|
|
|
|
pinctrl@01c20800 {
|
|
mmc3_cd_pin_olinuxinom: mmc3_cd_pin@0 {
|
|
allwinner,pins = "PH11";
|
|
allwinner,function = "gpio_in";
|
|
allwinner,drive = <SUN4I_PINCTRL_10_MA>;
|
|
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
|
|
};
|
|
|
|
led_pins_olinuxino: led_pins@0 {
|
|
allwinner,pins = "PH2";
|
|
allwinner,function = "gpio_out";
|
|
allwinner,drive = <SUN4I_PINCTRL_20_MA>;
|
|
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
|
|
};
|
|
};
|
|
|
|
lradc: lradc@01c22800 {
|
|
vref-supply = <®_vcc3v0>;
|
|
status = "okay";
|
|
|
|
button@191 {
|
|
label = "Volume Up";
|
|
linux,code = <KEY_VOLUMEUP>;
|
|
channel = <0>;
|
|
voltage = <191274>;
|
|
};
|
|
|
|
button@392 {
|
|
label = "Volume Down";
|
|
linux,code = <KEY_VOLUMEDOWN>;
|
|
channel = <0>;
|
|
voltage = <392644>;
|
|
};
|
|
|
|
button@601 {
|
|
label = "Menu";
|
|
linux,code = <KEY_MENU>;
|
|
channel = <0>;
|
|
voltage = <601151>;
|
|
};
|
|
|
|
button@795 {
|
|
label = "Search";
|
|
linux,code = <KEY_SEARCH>;
|
|
channel = <0>;
|
|
voltage = <795090>;
|
|
};
|
|
|
|
button@987 {
|
|
label = "Home";
|
|
linux,code = <KEY_HOMEPAGE>;
|
|
channel = <0>;
|
|
voltage = <987387>;
|
|
};
|
|
|
|
button@1184 {
|
|
label = "Esc";
|
|
linux,code = <KEY_ESC>;
|
|
channel = <0>;
|
|
voltage = <1184678>;
|
|
};
|
|
|
|
button@1398 {
|
|
label = "Enter";
|
|
linux,code = <KEY_ENTER>;
|
|
channel = <0>;
|
|
voltage = <1398804>;
|
|
};
|
|
};
|
|
|
|
uart0: serial@01c28000 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&uart0_pins_a>;
|
|
status = "okay";
|
|
};
|
|
|
|
uart6: serial@01c29800 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&uart6_pins_a>;
|
|
status = "okay";
|
|
};
|
|
|
|
uart7: serial@01c29c00 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&uart7_pins_a>;
|
|
status = "okay";
|
|
};
|
|
|
|
i2c0: i2c@01c2ac00 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&i2c0_pins_a>;
|
|
status = "okay";
|
|
|
|
axp209: pmic@34 {
|
|
compatible = "x-powers,axp209";
|
|
reg = <0x34>;
|
|
interrupt-parent = <&nmi_intc>;
|
|
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
|
|
|
interrupt-controller;
|
|
#interrupt-cells = <1>;
|
|
};
|
|
};
|
|
|
|
i2c1: i2c@01c2b000 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&i2c1_pins_a>;
|
|
status = "okay";
|
|
};
|
|
|
|
i2c2: i2c@01c2b400 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&i2c2_pins_a>;
|
|
status = "okay";
|
|
};
|
|
|
|
gmac: ethernet@01c50000 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&gmac_pins_mii_a>;
|
|
phy = <&phy1>;
|
|
phy-mode = "mii";
|
|
status = "okay";
|
|
|
|
phy1: ethernet-phy@1 {
|
|
reg = <1>;
|
|
};
|
|
};
|
|
};
|
|
|
|
leds {
|
|
compatible = "gpio-leds";
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&led_pins_olinuxino>;
|
|
|
|
green {
|
|
label = "a20-olinuxino-micro:green:usr";
|
|
gpios = <&pio 7 2 GPIO_ACTIVE_HIGH>;
|
|
default-state = "on";
|
|
};
|
|
};
|
|
|
|
reg_ahci_5v: ahci-5v {
|
|
status = "okay";
|
|
};
|
|
|
|
reg_usb1_vbus: usb1-vbus {
|
|
status = "okay";
|
|
};
|
|
|
|
reg_usb2_vbus: usb2-vbus {
|
|
status = "okay";
|
|
};
|
|
};
|