diff options
author | Arnd Bergmann <arnd@arndb.de> | 2017-10-30 14:10:39 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2017-10-30 14:10:39 +0100 |
commit | b3a87044464d2c6ecdca07c24b844a3b522ad8a1 (patch) | |
tree | 3821a9ac064557fc07fbd8f756f8e975e529db70 /arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | |
parent | da7920e31de98a149ab4048d7f05913429b84c2f (diff) | |
parent | 854106bc625a73b251ef7de2d5b49847d53041c2 (diff) |
Merge tag 'at91-ab-4.15-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/dt
Pull" ARM: at91: DT for 4.15" from Alexandre Belloni:
- sama5d2 xplained: add charger and SD card power supply
- sama5d27_som1_ek: many adjustments
- at91sam9x25ek: add pwm0 and can1
* tag 'at91-ab-4.15-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
ARM: dts: at91: at91sam9x5ek: use DMA for USART0
ARM: dts: at91: at91sam9x25ek: add pwm0
ARM: dts: at91: at91sam9x25ek: add CAN1 interface
ARM: dts: at91: sama5d2_xplained: remove pull-up on SD/MMC lines
ARM: dts: at91: sama5d2_xplained: add pinmuxing for pwm0
ARM: dts: at91: sama5d2_xplained: set PB_USER as wakeup source
ARM: dts: at91: sama5d27_som1_ek: remove pull-up on SD/MMC lines
ARM: dts: at91: sama5d27_som1_ek: remove not connected CAN0
ARM: dts: at91: sama5d27_som1_ek: add pinmuxing for pwm0
ARM: dts: at91: sama5d27_som1_ek: add aliases for i2c
ARM: dts: at91: sama5d27_som1_ek: set USER button as a wakeup source
ARM: dts: at91: sama5d27_som1_ek: update serial aliases
ARM: dts: at91: sama5d27_som1_ek: enable i2c2
ARM: dts: at91: sama5d27_som1_ek: add disabled status
ARM: dts: at91: usb_a9g20: fix rtc node
ARM: dts: at91: sama5d2 Xplained: Describe the SD card power supply
ARM: dts: at91: sama5d2_xplained: Add charger node
Diffstat (limited to 'arch/arm/boot/dts/at91-sama5d27_som1_ek.dts')
-rw-r--r-- | arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts b/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts index cfb1b6a23824..6d87b4eb6c41 100644 --- a/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts +++ b/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts @@ -53,6 +53,14 @@ model = "Atmel SAMA5D27 SOM1 EK"; compatible = "atmel,sama5d27-som1-ek", "atmel,sama5d27-som1", "atmel,sama5d27", "atmel,sama5d2", "atmel,sama5"; + aliases { + serial0 = &uart1; /* DBGU */ + serial1 = &uart4; /* mikro BUS 1 */ + serial2 = &uart2; /* mikro BUS 2 */ + i2c1 = &i2c1; + i2c2 = &i2c2; + }; + chosen { stdout-path = "serial0:115200n8"; }; @@ -128,12 +136,14 @@ }; pwm0: pwm@f802c000 { - status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_mikrobus1_pwm &pinctrl_mikrobus2_pwm>; + status = "disabled"; /* Conflict with leds. */ }; flx1: flexcom@f8038000 { atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_TWI>; - status = "disabled"; + status = "okay"; i2c2: i2c@600 { compatible = "atmel,sama5d2-i2c"; @@ -147,7 +157,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_mikrobus_i2c>; atmel,fifo-size = <16>; - status = "disabled"; + status = "okay"; }; }; @@ -165,17 +175,12 @@ status = "okay"; }; - can0: can@f8054000 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_can0_default>; - }; - uart3: serial@fc008000 { atmel,use-dma-rx; atmel,use-dma-tx; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart3_default>; - status = "disabled"; + status = "disabled"; /* Conflict with isc. */ }; uart4: serial@fc00c000 { @@ -199,7 +204,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_flx3_default>; atmel,fifo-size = <32>; - status = "disabled"; + status = "disabled"; /* Conflict with isc. */ }; spi2: spi@400 { @@ -211,7 +216,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_flx3_default>; atmel,fifo-size = <16>; - status = "disabled"; + status = "disabled"; /* Conflict with isc. */ }; }; @@ -228,7 +233,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_flx4_default>; atmel,fifo-size = <32>; - status = "disabled"; + status = "disabled"; /* Conflict with spi3 and i2c3. */ }; spi3: spi@400 { @@ -240,7 +245,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_mikrobus_spi &pinctrl_mikrobus1_spi_cs &pinctrl_mikrobus2_spi_cs>; atmel,fifo-size = <16>; - status = "okay"; + status = "okay"; /* Conflict with uart6 and i2c3. */ }; i2c3: i2c@600 { @@ -255,7 +260,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_flx4_default>; atmel,fifo-size = <16>; - status = "disabled"; + status = "disabled"; /* Conflict with uart6 and spi3. */ }; }; @@ -268,12 +273,6 @@ pinctrl@fc038000 { - pinctrl_can0_default: can0_default { - pinmux = <PIN_PC10__CANTX0>, - <PIN_PC11__CANRX0>; - bias-disable; - }; - pinctrl_can1_default: can1_default { pinmux = <PIN_PC26__CANTX1>, <PIN_PC27__CANRX1>; @@ -350,7 +349,7 @@ <PIN_PA7__SDMMC0_DAT5>, <PIN_PA8__SDMMC0_DAT6>, <PIN_PA9__SDMMC0_DAT7>; - bias-pull-up; + bias-disable; }; ck_cd_vddsel { @@ -368,7 +367,7 @@ <PIN_PA19__SDMMC1_DAT1>, <PIN_PA20__SDMMC1_DAT2>, <PIN_PA21__SDMMC1_DAT3>; - bias-pull-up; + bias-disable; }; conf-ck_cd { @@ -512,6 +511,7 @@ label = "USER"; gpios = <&pioA PIN_PA29 GPIO_ACTIVE_LOW>; linux,code = <0x104>; + wakeup-source; }; }; @@ -519,7 +519,7 @@ compatible = "gpio-leds"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_led_gpio_default>; - status = "okay"; + status = "okay"; /* Conflict with pwm0. */ red { label = "red"; |