mirror of
https://github.com/torvalds/linux.git
synced 2024-11-26 22:21:42 +00:00
First batch of DT changes for 4.5:
- addition of nodes for sama5d2 & sama5d4 - some fixes for i2c hold time, compatible stings - addition of a new patform by DENX: the MA5D4 SoM and EVK -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQEcBAABAgAGBQJWcThWAAoJEAf03oE53VmQuRgIAJG4qqeh62GE5naX6wCiaPmi bWay4W1iMImiX+DHIKgFpBdHmjbHUlajUqifk4+CQ08FuFBiSl23pOP9U0j4b0Hr jglidWJRpm2vlqN+25R/lJgwA3jleFtDn/l5EW8P5kL8WkXfXOWU7Jop+Pqxae0a aAmKZKi9MU6mwUyZnDEYpNf29pILbBve+vPqRRVaFXiOzDYXzl3LnTE2zQvSeY0U dpkrrH2jbjfJ8gWmAvfMqTuJLwbgv00H5MvcaP3Q8MR+7F6ATZUtqjSiMF+aRYCM sUYCJTG4WglZvWBFTn4LcSTXZgwfVjM4r59hd18Ep2TGnXk3fRS17xTxtoAQczE= =+zlN -----END PGP SIGNATURE----- Merge tag 'at91-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/dt First batch of DT changes for 4.5: - addition of nodes for sama5d2 & sama5d4 - some fixes for i2c hold time, compatible stings - addition of a new patform by DENX: the MA5D4 SoM and EVK * tag 'at91-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91: ARM: at91/dt: sama5d2 Xplained: pmic needs a specific sda hold time ARM: at91/dt: sama5d4: update i2c compatible string ARM: at91/dt: sama5d4 master clock can run at 200MHz now ARM: at91/dt: sama5d2: add watchdog node ARM: at91/dt: sama5d4: Add support for DENX MA5D4 SoM and EVK ARM: at91/dt: sama5d4: Add pinmux for 8-bit MMC0 bus ARM: at91/dt: sama5d4: Fix mmc0 pinmux comments Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
commit
960ac2dbee
@ -48,6 +48,7 @@ dtb-$(CONFIG_SOC_SAM_V7) += \
|
||||
sama5d34ek.dtb \
|
||||
sama5d35ek.dtb \
|
||||
sama5d36ek.dtb \
|
||||
at91-sama5d4_ma5d4evk.dtb \
|
||||
at91-sama5d4_xplained.dtb \
|
||||
at91-sama5d4ek.dtb
|
||||
dtb-$(CONFIG_ARCH_ATLAS6) += \
|
||||
|
||||
@ -129,6 +129,7 @@
|
||||
dmas = <0>, <0>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_i2c0_default>;
|
||||
i2c-sda-hold-time-ns = <350>;
|
||||
status = "okay";
|
||||
|
||||
pmic: act8865@5b {
|
||||
@ -206,6 +207,10 @@
|
||||
};
|
||||
};
|
||||
|
||||
watchdog@f8048040 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
uart3: serial@fc008000 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_uart3_default>;
|
||||
|
||||
127
arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi
Normal file
127
arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi
Normal file
@ -0,0 +1,127 @@
|
||||
/*
|
||||
* Copyright (C) 2015 Marek Vasut <marex@denx.de>
|
||||
*
|
||||
* 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
|
||||
*/
|
||||
|
||||
#include "sama5d4.dtsi"
|
||||
|
||||
/ {
|
||||
model = "DENX MA5D4";
|
||||
compatible = "denx,ma5d4", "atmel,sama5d4", "atmel,sama5";
|
||||
|
||||
memory {
|
||||
reg = <0x20000000 0x10000000>;
|
||||
};
|
||||
|
||||
clocks {
|
||||
main_clock: main_clock {
|
||||
compatible = "atmel,osc", "fixed-clock";
|
||||
clock-frequency = <12000000>;
|
||||
};
|
||||
|
||||
clk20m: clk20m {
|
||||
compatible = "fixed-clock";
|
||||
#clock-cells = <0>;
|
||||
clock-frequency = <20000000>;
|
||||
clock-output-names = "clk20m";
|
||||
};
|
||||
};
|
||||
|
||||
ahb {
|
||||
apb {
|
||||
mmc0: mmc@f8000000 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_mmc0_clk_cmd_dat0 &pinctrl_mmc0_dat1_3 &pinctrl_mmc0_dat4_7>;
|
||||
vmmc-supply = <&vcc_mmc0_reg>;
|
||||
vqmmc-supply = <&vcc_3v3_reg>;
|
||||
status = "okay";
|
||||
slot@0 {
|
||||
reg = <0>;
|
||||
bus-width = <8>;
|
||||
broken-cd;
|
||||
};
|
||||
};
|
||||
|
||||
spi0: spi@f8010000 {
|
||||
cs-gpios = <&pioC 3 0>, <0>, <0>, <0>;
|
||||
status = "okay";
|
||||
|
||||
m25p80@0 {
|
||||
compatible = "atmel,at25df321a";
|
||||
spi-max-frequency = <50000000>;
|
||||
reg = <0>;
|
||||
};
|
||||
};
|
||||
|
||||
i2c0: i2c@f8014000 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
spi1: spi@fc018000 {
|
||||
cs-gpios = <&pioB 22 0>, <&pioB 23 0>, <0>, <0>;
|
||||
status = "okay";
|
||||
|
||||
can0: can@0 {
|
||||
compatible = "microchip,mcp2515";
|
||||
reg = <0>;
|
||||
clocks = <&clk20m>;
|
||||
interrupt-parent = <&pioE>;
|
||||
interrupts = <6 GPIO_ACTIVE_LOW>;
|
||||
spi-max-frequency = <10000000>;
|
||||
};
|
||||
|
||||
can1: can@1 {
|
||||
compatible = "microchip,mcp2515";
|
||||
reg = <1>;
|
||||
clocks = <&clk20m>;
|
||||
interrupt-parent = <&pioE>;
|
||||
interrupts = <7 GPIO_ACTIVE_LOW>;
|
||||
spi-max-frequency = <10000000>;
|
||||
};
|
||||
};
|
||||
|
||||
adc0: adc@fc034000 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <
|
||||
/* external trigger conflicts with USBA_VBUS */
|
||||
&pinctrl_adc0_ad0
|
||||
&pinctrl_adc0_ad1
|
||||
&pinctrl_adc0_ad2
|
||||
&pinctrl_adc0_ad3
|
||||
&pinctrl_adc0_ad4
|
||||
>;
|
||||
atmel,adc-vref = <3300>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
watchdog@fc068640 {
|
||||
status = "okay";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
vcc_3v3_reg: fixedregulator@0 {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "VCC 3V3";
|
||||
regulator-min-microvolt = <3300000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
regulator-boot-on;
|
||||
regulator-always-on;
|
||||
};
|
||||
|
||||
vcc_mmc0_reg: fixedregulator@1 {
|
||||
compatible = "regulator-fixed";
|
||||
gpio = <&pioE 15 GPIO_ACTIVE_HIGH>;
|
||||
regulator-name = "RST_n MCI0";
|
||||
regulator-min-microvolt = <3300000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
vin-supply = <&vcc_3v3_reg>;
|
||||
regulator-boot-on;
|
||||
};
|
||||
};
|
||||
170
arch/arm/boot/dts/at91-sama5d4_ma5d4evk.dts
Normal file
170
arch/arm/boot/dts/at91-sama5d4_ma5d4evk.dts
Normal file
@ -0,0 +1,170 @@
|
||||
/*
|
||||
* Copyright (C) 2015 Marek Vasut <marex@denx.de>
|
||||
*
|
||||
* 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 "at91-sama5d4_ma5d4.dtsi"
|
||||
|
||||
/ {
|
||||
model = "DENX MA5D4EVK";
|
||||
compatible = "denx,ma5d4evk", "atmel,sama5d4", "atmel,sama5";
|
||||
|
||||
chosen {
|
||||
stdout-path = "serial3:115200n8";
|
||||
};
|
||||
|
||||
ahb {
|
||||
usb0: gadget@00400000 {
|
||||
atmel,vbus-gpio = <&pioE 31 GPIO_ACTIVE_HIGH>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_usba_vbus>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
usb1: ohci@00500000 {
|
||||
num-ports = <3>;
|
||||
atmel,vbus-gpio = <0
|
||||
&pioE 11 GPIO_ACTIVE_LOW
|
||||
&pioE 14 GPIO_ACTIVE_LOW
|
||||
>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
usb2: ehci@00600000 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
apb {
|
||||
hlcdc: hlcdc@f0000000 {
|
||||
status = "okay";
|
||||
|
||||
hlcdc-display-controller {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_lcd_base &pinctrl_lcd_rgb888>;
|
||||
|
||||
port@0 {
|
||||
hlcdc_panel_output: endpoint@0 {
|
||||
reg = <0>;
|
||||
remote-endpoint = <&panel_input>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
macb0: ethernet@f8020000 {
|
||||
phy-mode = "rmii";
|
||||
status = "okay";
|
||||
|
||||
phy0: ethernet-phy@0 {
|
||||
reg = <0>;
|
||||
};
|
||||
};
|
||||
|
||||
usart0: serial@f802c000 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
usart1: serial@f8030000 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
mmc1: mmc@fc000000 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_mmc1_clk_cmd_dat0 &pinctrl_mmc1_dat1_3 &pinctrl_mmc1_cd>;
|
||||
vmmc-supply = <&vcc_mmc1_reg>;
|
||||
vqmmc-supply = <&vcc_3v3_reg>;
|
||||
status = "okay";
|
||||
slot@0 {
|
||||
reg = <0>;
|
||||
bus-width = <4>;
|
||||
cd-gpios = <&pioE 5 0>;
|
||||
};
|
||||
};
|
||||
|
||||
adc0: adc@fc034000 {
|
||||
atmel,adc-ts-wires = <4>;
|
||||
atmel,adc-ts-pressure-threshold = <10000>;
|
||||
};
|
||||
|
||||
|
||||
pinctrl@fc06a000 {
|
||||
board {
|
||||
pinctrl_mmc1_cd: mmc1_cd {
|
||||
atmel,pins = <AT91_PIOE 5 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;
|
||||
};
|
||||
pinctrl_usba_vbus: usba_vbus {
|
||||
atmel,pins =
|
||||
<AT91_PIOE 31 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
backlight: backlight {
|
||||
compatible = "pwm-backlight";
|
||||
pwms = <&hlcdc_pwm 0 50000 0>;
|
||||
brightness-levels = <0 4 8 16 32 64 128 255>;
|
||||
default-brightness-level = <6>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
leds {
|
||||
compatible = "gpio-leds";
|
||||
status = "okay";
|
||||
|
||||
user1 {
|
||||
label = "user1";
|
||||
gpios = <&pioD 28 GPIO_ACTIVE_HIGH>;
|
||||
linux,default-trigger = "heartbeat";
|
||||
};
|
||||
|
||||
user2 {
|
||||
label = "user2";
|
||||
gpios = <&pioD 29 GPIO_ACTIVE_HIGH>;
|
||||
linux,default-trigger = "heartbeat";
|
||||
};
|
||||
|
||||
user3 {
|
||||
label = "user3";
|
||||
gpios = <&pioD 30 GPIO_ACTIVE_HIGH>;
|
||||
linux,default-trigger = "heartbeat";
|
||||
};
|
||||
};
|
||||
|
||||
panel: panel {
|
||||
/* Actually Ampire 800480R2 */
|
||||
compatible = "foxlink,fl500wvr00-a0t", "simple-panel";
|
||||
backlight = <&backlight>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
status = "okay";
|
||||
|
||||
port@0 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
panel_input: endpoint@0 {
|
||||
reg = <0>;
|
||||
remote-endpoint = <&hlcdc_panel_output>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
vcc_mmc1_reg: fixedregulator@2 {
|
||||
compatible = "regulator-fixed";
|
||||
gpio = <&pioE 17 GPIO_ACTIVE_LOW>;
|
||||
regulator-name = "VDD MCI1";
|
||||
regulator-min-microvolt = <3300000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
vin-supply = <&vcc_3v3_reg>;
|
||||
};
|
||||
};
|
||||
@ -929,6 +929,13 @@
|
||||
clocks = <&h32ck>;
|
||||
};
|
||||
|
||||
watchdog@f8048040 {
|
||||
compatible = "atmel,sama5d4-wdt";
|
||||
reg = <0xf8048040 0x10>;
|
||||
interrupts = <4 IRQ_TYPE_LEVEL_HIGH 7>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
sckc@f8048050 {
|
||||
compatible = "atmel,at91sam9x5-sckc";
|
||||
reg = <0xf8048050 0x4>;
|
||||
|
||||
@ -451,7 +451,7 @@
|
||||
interrupt-parent = <&pmc>;
|
||||
interrupts = <AT91_PMC_MCKRDY>;
|
||||
clocks = <&clk32k>, <&main>, <&plladiv>, <&utmi>;
|
||||
atmel,clk-output-range = <125000000 177000000>;
|
||||
atmel,clk-output-range = <125000000 200000000>;
|
||||
atmel,clk-divisors = <1 2 4 3>;
|
||||
};
|
||||
|
||||
@ -916,7 +916,7 @@
|
||||
};
|
||||
|
||||
i2c0: i2c@f8014000 {
|
||||
compatible = "atmel,at91sam9x5-i2c";
|
||||
compatible = "atmel,sama5d4-i2c";
|
||||
reg = <0xf8014000 0x4000>;
|
||||
interrupts = <32 IRQ_TYPE_LEVEL_HIGH 6>;
|
||||
dmas = <&dma1
|
||||
@ -935,7 +935,7 @@
|
||||
};
|
||||
|
||||
i2c1: i2c@f8018000 {
|
||||
compatible = "atmel,at91sam9x5-i2c";
|
||||
compatible = "atmel,sama5d4-i2c";
|
||||
reg = <0xf8018000 0x4000>;
|
||||
interrupts = <33 IRQ_TYPE_LEVEL_HIGH 6>;
|
||||
dmas = <&dma1
|
||||
@ -975,7 +975,7 @@
|
||||
};
|
||||
|
||||
i2c2: i2c@f8024000 {
|
||||
compatible = "atmel,at91sam9x5-i2c";
|
||||
compatible = "atmel,sama5d4-i2c";
|
||||
reg = <0xf8024000 0x4000>;
|
||||
interrupts = <34 IRQ_TYPE_LEVEL_HIGH 6>;
|
||||
dmas = <&dma1
|
||||
@ -1669,15 +1669,23 @@
|
||||
pinctrl_mmc0_clk_cmd_dat0: mmc0_clk_cmd_dat0 {
|
||||
atmel,pins =
|
||||
<AT91_PIOC 4 AT91_PERIPH_B AT91_PINCTRL_NONE /* MCI0_CK, conflict with PCK1(ISI_MCK) */
|
||||
AT91_PIOC 5 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_CDB, conflict with NAND_D0 */
|
||||
AT91_PIOC 6 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DB0, conflict with NAND_D1 */
|
||||
AT91_PIOC 5 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_CDA, conflict with NAND_D0 */
|
||||
AT91_PIOC 6 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA0, conflict with NAND_D1 */
|
||||
>;
|
||||
};
|
||||
pinctrl_mmc0_dat1_3: mmc0_dat1_3 {
|
||||
atmel,pins =
|
||||
<AT91_PIOC 7 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DB1, conflict with NAND_D2 */
|
||||
AT91_PIOC 8 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DB2, conflict with NAND_D3 */
|
||||
AT91_PIOC 9 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DB3, conflict with NAND_D4 */
|
||||
<AT91_PIOC 7 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA1, conflict with NAND_D2 */
|
||||
AT91_PIOC 8 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA2, conflict with NAND_D3 */
|
||||
AT91_PIOC 9 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA3, conflict with NAND_D4 */
|
||||
>;
|
||||
};
|
||||
pinctrl_mmc0_dat4_7: mmc0_dat4_7 {
|
||||
atmel,pins =
|
||||
<AT91_PIOC 10 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA4, conflict with NAND_D5 */
|
||||
AT91_PIOC 11 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA5, conflict with NAND_D6 */
|
||||
AT91_PIOC 12 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA6, conflict with NAND_D7 */
|
||||
AT91_PIOC 13 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA7, conflict with NAND_OE */
|
||||
>;
|
||||
};
|
||||
};
|
||||
|
||||
Loading…
Reference in New Issue
Block a user