mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-28 05:24:47 +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 ...
220 lines
4.9 KiB
Plaintext
220 lines
4.9 KiB
Plaintext
/*
|
|
* sama5d3xmb.dts - Device Tree file for SAMA5D3x mother board
|
|
*
|
|
* Copyright (C) 2013 Atmel,
|
|
* 2013 Ludovic Desroches <ludovic.desroches@atmel.com>
|
|
*
|
|
* Licensed under GPLv2 or later.
|
|
*/
|
|
#include "sama5d3xcm.dtsi"
|
|
|
|
/ {
|
|
compatible = "atmel,sama5d3xmb", "atmel,sama5d3xcm", "atmel,sama5d3", "atmel,sama5";
|
|
|
|
ahb {
|
|
apb {
|
|
mmc0: mmc@f0000000 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&pinctrl_mmc0_clk_cmd_dat0 &pinctrl_mmc0_dat1_3 &pinctrl_mmc0_cd>;
|
|
status = "okay";
|
|
slot@0 {
|
|
reg = <0>;
|
|
bus-width = <4>;
|
|
cd-gpios = <&pioD 17 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
};
|
|
|
|
spi0: spi@f0004000 {
|
|
dmas = <0>, <0>; /* Do not use DMA for spi0 */
|
|
|
|
m25p80@0 {
|
|
compatible = "atmel,at25df321a";
|
|
spi-max-frequency = <50000000>;
|
|
reg = <0>;
|
|
};
|
|
};
|
|
|
|
ssc0: ssc@f0008000 {
|
|
atmel,clk-from-rk-pin;
|
|
};
|
|
|
|
/*
|
|
* i2c0 conflicts with ISI:
|
|
* disable it to allow the use of ISI
|
|
* can not enable audio when i2c0 disabled
|
|
*/
|
|
i2c0: i2c@f0014000 {
|
|
wm8904: wm8904@1a {
|
|
compatible = "wlf,wm8904";
|
|
reg = <0x1a>;
|
|
clocks = <&pck0>;
|
|
clock-names = "mclk";
|
|
};
|
|
};
|
|
|
|
i2c1: i2c@f0018000 {
|
|
ov2640: camera@0x30 {
|
|
compatible = "ovti,ov2640";
|
|
reg = <0x30>;
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&pinctrl_pck1_as_isi_mck &pinctrl_sensor_power &pinctrl_sensor_reset>;
|
|
resetb-gpios = <&pioE 24 GPIO_ACTIVE_LOW>;
|
|
pwdn-gpios = <&pioE 29 GPIO_ACTIVE_HIGH>;
|
|
/* use pck1 for the master clock of ov2640 */
|
|
clocks = <&pck1>;
|
|
clock-names = "xvclk";
|
|
assigned-clocks = <&pck1>;
|
|
assigned-clock-rates = <25000000>;
|
|
|
|
port {
|
|
ov2640_0: endpoint {
|
|
remote-endpoint = <&isi_0>;
|
|
bus-width = <8>;
|
|
};
|
|
};
|
|
};
|
|
};
|
|
|
|
usart1: serial@f0020000 {
|
|
dmas = <0>, <0>; /* Do not use DMA for usart1 */
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&pinctrl_usart1 &pinctrl_usart1_rts_cts>;
|
|
status = "okay";
|
|
};
|
|
|
|
isi: isi@f0034000 {
|
|
port {
|
|
isi_0: endpoint {
|
|
remote-endpoint = <&ov2640_0>;
|
|
bus-width = <8>;
|
|
};
|
|
};
|
|
};
|
|
|
|
mmc1: mmc@f8000000 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&pinctrl_mmc1_clk_cmd_dat0 &pinctrl_mmc1_dat1_3 &pinctrl_mmc1_cd>;
|
|
status = "okay";
|
|
slot@0 {
|
|
reg = <0>;
|
|
bus-width = <4>;
|
|
cd-gpios = <&pioD 18 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
};
|
|
|
|
adc0: adc@f8018000 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <
|
|
&pinctrl_adc0_adtrg
|
|
&pinctrl_adc0_ad0
|
|
&pinctrl_adc0_ad1
|
|
&pinctrl_adc0_ad2
|
|
&pinctrl_adc0_ad3
|
|
&pinctrl_adc0_ad4
|
|
>;
|
|
status = "okay";
|
|
};
|
|
|
|
macb1: ethernet@f802c000 {
|
|
phy-mode = "rmii";
|
|
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
phy0: ethernet-phy@1 {
|
|
interrupt-parent = <&pioE>;
|
|
interrupts = <30 IRQ_TYPE_EDGE_FALLING>;
|
|
reg = <1>;
|
|
};
|
|
};
|
|
|
|
pinctrl@fffff200 {
|
|
board {
|
|
pinctrl_mmc0_cd: mmc0_cd {
|
|
atmel,pins =
|
|
<AT91_PIOD 17 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PD17 GPIO with pullup deglitch */
|
|
};
|
|
|
|
pinctrl_mmc1_cd: mmc1_cd {
|
|
atmel,pins =
|
|
<AT91_PIOD 18 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PD18 GPIO with pullup deglitch */
|
|
};
|
|
|
|
pinctrl_pck0_as_audio_mck: pck0_as_audio_mck {
|
|
atmel,pins =
|
|
<AT91_PIOD 30 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PD30 periph B */
|
|
};
|
|
|
|
pinctrl_pck1_as_isi_mck: pck1_as_isi_mck-0 {
|
|
atmel,pins =
|
|
<AT91_PIOD 31 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PD31 periph B ISI_MCK */
|
|
};
|
|
|
|
pinctrl_sensor_reset: sensor_reset-0 {
|
|
atmel,pins =
|
|
<AT91_PIOE 24 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>; /* PE24 gpio */
|
|
};
|
|
|
|
pinctrl_sensor_power: sensor_power-0 {
|
|
atmel,pins =
|
|
<AT91_PIOE 29 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>; /* PE29 gpio */
|
|
};
|
|
|
|
pinctrl_usba_vbus: usba_vbus {
|
|
atmel,pins =
|
|
<AT91_PIOD 29 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>; /* PD29 GPIO with deglitch */
|
|
};
|
|
};
|
|
};
|
|
|
|
dbgu: serial@ffffee00 {
|
|
dmas = <0>, <0>; /* Do not use DMA for dbgu */
|
|
status = "okay";
|
|
};
|
|
|
|
watchdog@fffffe40 {
|
|
status = "okay";
|
|
};
|
|
};
|
|
|
|
usb0: gadget@00500000 {
|
|
atmel,vbus-gpio = <&pioD 29 GPIO_ACTIVE_HIGH>;
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&pinctrl_usba_vbus>;
|
|
status = "okay";
|
|
};
|
|
|
|
usb1: ohci@00600000 {
|
|
num-ports = <3>;
|
|
atmel,vbus-gpio = <&pioD 25 GPIO_ACTIVE_HIGH
|
|
&pioD 26 GPIO_ACTIVE_LOW
|
|
&pioD 27 GPIO_ACTIVE_LOW
|
|
>;
|
|
status = "okay";
|
|
};
|
|
|
|
usb2: ehci@00700000 {
|
|
status = "okay";
|
|
};
|
|
};
|
|
|
|
sound {
|
|
compatible = "atmel,asoc-wm8904";
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&pinctrl_pck0_as_audio_mck>;
|
|
|
|
atmel,model = "wm8904 @ SAMA5D3EK";
|
|
atmel,audio-routing =
|
|
"Headphone Jack", "HPOUTL",
|
|
"Headphone Jack", "HPOUTR",
|
|
"IN2L", "Line In Jack",
|
|
"IN2R", "Line In Jack",
|
|
"Mic", "MICBIAS",
|
|
"IN1L", "Mic";
|
|
|
|
atmel,ssc-controller = <&ssc0>;
|
|
atmel,audio-codec = <&wm8904>;
|
|
|
|
status = "disabled";
|
|
};
|
|
};
|