Skip to content

L
linux
Commit b3a87044 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files
Options

Merge tag 'at91-ab-4.15-dt' of... 

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
parents da7920e3 854106bc
Show whitespace changes
Inline Side-by-side
Showing with 66 additions and 37 deletions
arch/arm/boot/dts/at91-sama5d27_som1_ek.dts
View file @ b3a87044
...@@ -53,6 +53,14 @@ / { ...@@ -53,6 +53,14 @@ / {
model = "Atmel SAMA5D27 SOM1 EK"; model = "Atmel SAMA5D27 SOM1 EK";
compatible = "atmel,sama5d27-som1-ek", "atmel,sama5d27-som1", "atmel,sama5d27", "atmel,sama5d2", "atmel,sama5"; 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 { chosen {
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
...@@ -128,12 +136,14 @@ uart2: serial@f8024000 { ...@@ -128,12 +136,14 @@ uart2: serial@f8024000 {
}; };
pwm0: pwm@f802c000 { pwm0: pwm@f802c000 {
status = "okay"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_mikrobus1_pwm &pinctrl_mikrobus2_pwm>;
status = "disabled"; /* Conflict with leds. */
}; };
flx1: flexcom@f8038000 { flx1: flexcom@f8038000 {
atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_TWI>; atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_TWI>;
status = "disabled"; status = "okay";
i2c2: i2c@600 { i2c2: i2c@600 {
compatible = "atmel,sama5d2-i2c"; compatible = "atmel,sama5d2-i2c";
...@@ -147,7 +157,7 @@ i2c2: i2c@600 { ...@@ -147,7 +157,7 @@ i2c2: i2c@600 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_mikrobus_i2c>; pinctrl-0 = <&pinctrl_mikrobus_i2c>;
atmel,fifo-size = <16>; atmel,fifo-size = <16>;
status = "disabled"; status = "okay";
}; };
}; };
...@@ -165,17 +175,12 @@ watchdog@f8048040 { ...@@ -165,17 +175,12 @@ watchdog@f8048040 {
status = "okay"; status = "okay";
}; };
can0: can@f8054000 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_can0_default>;
};
uart3: serial@fc008000 { uart3: serial@fc008000 {
atmel,use-dma-rx; atmel,use-dma-rx;
atmel,use-dma-tx; atmel,use-dma-tx;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart3_default>; pinctrl-0 = <&pinctrl_uart3_default>;
status = "disabled"; status = "disabled"; /* Conflict with isc. */
}; };
uart4: serial@fc00c000 { uart4: serial@fc00c000 {
...@@ -199,7 +204,7 @@ uart7: serial@200 { ...@@ -199,7 +204,7 @@ uart7: serial@200 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_flx3_default>; pinctrl-0 = <&pinctrl_flx3_default>;
atmel,fifo-size = <32>; atmel,fifo-size = <32>;
status = "disabled"; status = "disabled"; /* Conflict with isc. */
}; };
spi2: spi@400 { spi2: spi@400 {
...@@ -211,7 +216,7 @@ spi2: spi@400 { ...@@ -211,7 +216,7 @@ spi2: spi@400 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_flx3_default>; pinctrl-0 = <&pinctrl_flx3_default>;
atmel,fifo-size = <16>; atmel,fifo-size = <16>;
status = "disabled"; status = "disabled"; /* Conflict with isc. */
}; };
}; };
...@@ -228,7 +233,7 @@ uart6: serial@200 { ...@@ -228,7 +233,7 @@ uart6: serial@200 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_flx4_default>; pinctrl-0 = <&pinctrl_flx4_default>;
atmel,fifo-size = <32>; atmel,fifo-size = <32>;
status = "disabled"; status = "disabled"; /* Conflict with spi3 and i2c3. */
}; };
spi3: spi@400 { spi3: spi@400 {
...@@ -240,7 +245,7 @@ spi3: spi@400 { ...@@ -240,7 +245,7 @@ spi3: spi@400 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_mikrobus_spi &pinctrl_mikrobus1_spi_cs &pinctrl_mikrobus2_spi_cs>; pinctrl-0 = <&pinctrl_mikrobus_spi &pinctrl_mikrobus1_spi_cs &pinctrl_mikrobus2_spi_cs>;
atmel,fifo-size = <16>; atmel,fifo-size = <16>;
status = "okay"; status = "okay"; /* Conflict with uart6 and i2c3. */
}; };
i2c3: i2c@600 { i2c3: i2c@600 {
...@@ -255,7 +260,7 @@ i2c3: i2c@600 { ...@@ -255,7 +260,7 @@ i2c3: i2c@600 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_flx4_default>; pinctrl-0 = <&pinctrl_flx4_default>;
atmel,fifo-size = <16>; atmel,fifo-size = <16>;
status = "disabled"; status = "disabled"; /* Conflict with uart6 and spi3. */
}; };
}; };
...@@ -268,12 +273,6 @@ i2c1: i2c@fc028000 { ...@@ -268,12 +273,6 @@ i2c1: i2c@fc028000 {
pinctrl@fc038000 { pinctrl@fc038000 {
pinctrl_can0_default: can0_default {
pinmux = <PIN_PC10__CANTX0>,
<PIN_PC11__CANRX0>;
bias-disable;
};
pinctrl_can1_default: can1_default { pinctrl_can1_default: can1_default {
pinmux = <PIN_PC26__CANTX1>, pinmux = <PIN_PC26__CANTX1>,
<PIN_PC27__CANRX1>; <PIN_PC27__CANRX1>;
...@@ -350,7 +349,7 @@ cmd_data { ...@@ -350,7 +349,7 @@ cmd_data {
<PIN_PA7__SDMMC0_DAT5>, <PIN_PA7__SDMMC0_DAT5>,
<PIN_PA8__SDMMC0_DAT6>, <PIN_PA8__SDMMC0_DAT6>,
<PIN_PA9__SDMMC0_DAT7>; <PIN_PA9__SDMMC0_DAT7>;
bias-pull-up; bias-disable;
}; };
ck_cd_vddsel { ck_cd_vddsel {
...@@ -368,7 +367,7 @@ cmd_data { ...@@ -368,7 +367,7 @@ cmd_data {
<PIN_PA19__SDMMC1_DAT1>, <PIN_PA19__SDMMC1_DAT1>,
<PIN_PA20__SDMMC1_DAT2>, <PIN_PA20__SDMMC1_DAT2>,
<PIN_PA21__SDMMC1_DAT3>; <PIN_PA21__SDMMC1_DAT3>;
bias-pull-up; bias-disable;
}; };
conf-ck_cd { conf-ck_cd {
...@@ -512,6 +511,7 @@ pb4 { ...@@ -512,6 +511,7 @@ pb4 {
label = "USER"; label = "USER";
gpios = <&pioA PIN_PA29 GPIO_ACTIVE_LOW>; gpios = <&pioA PIN_PA29 GPIO_ACTIVE_LOW>;
linux,code = <0x104>; linux,code = <0x104>;
wakeup-source;
}; };
}; };
...@@ -519,7 +519,7 @@ leds { ...@@ -519,7 +519,7 @@ leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_led_gpio_default>; pinctrl-0 = <&pinctrl_led_gpio_default>;
status = "okay"; status = "okay"; /* Conflict with pwm0. */
red { red {
label = "red"; label = "red";
......
arch/arm/boot/dts/at91-sama5d2_xplained.dts
View file @ b3a87044
...@@ -103,6 +103,8 @@ sdmmc1: sdio-host@b0000000 { ...@@ -103,6 +103,8 @@ sdmmc1: sdio-host@b0000000 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_sdmmc1_default>; pinctrl-0 = <&pinctrl_sdmmc1_default>;
status = "okay"; /* conflict with qspi0 */ status = "okay"; /* conflict with qspi0 */
vqmmc-supply = <&vdd_3v3_reg>;
vmmc-supply = <&vdd_3v3_reg>;
}; };
apb { apb {
...@@ -160,14 +162,6 @@ pmic@5b { ...@@ -160,14 +162,6 @@ pmic@5b {
compatible = "active-semi,act8945a"; compatible = "active-semi,act8945a";
reg = <0x5b>; reg = <0x5b>;
active-semi,vsel-high; active-semi,vsel-high;
active-semi,chglev-gpios = <&pioA PIN_PA12 GPIO_ACTIVE_HIGH>;
active-semi,lbo-gpios = <&pioA PIN_PC8 GPIO_ACTIVE_LOW>;
active-semi,irq_gpios = <&pioA PIN_PB13 GPIO_ACTIVE_LOW>;
active-semi,input-voltage-threshold-microvolt = <6600>;
active-semi,precondition-timeout = <40>;
active-semi,total-timeout = <3>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_charger_chglev &pinctrl_charger_lbo &pinctrl_charger_irq>;
status = "okay"; status = "okay";
regulators { regulators {
...@@ -220,11 +214,28 @@ vdd_sdhc_1v8_reg: REG_LDO4 { ...@@ -220,11 +214,28 @@ vdd_sdhc_1v8_reg: REG_LDO4 {
regulator-always-on; regulator-always-on;
}; };
}; };
charger {
compatible = "active-semi,act8945a-charger";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_charger_chglev &pinctrl_charger_lbo &pinctrl_charger_irq>;
interrupt-parent = <&pioA>;
interrupts = <PIN_PB13 GPIO_ACTIVE_LOW>;
active-semi,chglev-gpios = <&pioA PIN_PA12 GPIO_ACTIVE_HIGH>;
active-semi,lbo-gpios = <&pioA PIN_PC8 GPIO_ACTIVE_LOW>;
active-semi,input-voltage-threshold-microvolt = <6600>;
active-semi,precondition-timeout = <40>;
active-semi,total-timeout = <3>;
status = "okay";
};
}; };
}; };
pwm0: pwm@f802c000 { pwm0: pwm@f802c000 {
status = "okay"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pwm0_pwm2_default>;
status = "disabled"; /* conflict with leds */
}; };
flx0: flexcom@f8034000 { flx0: flexcom@f8034000 {
...@@ -435,7 +446,7 @@ cmd_data { ...@@ -435,7 +446,7 @@ cmd_data {
<PIN_PA7__SDMMC0_DAT5>, <PIN_PA7__SDMMC0_DAT5>,
<PIN_PA8__SDMMC0_DAT6>, <PIN_PA8__SDMMC0_DAT6>,
<PIN_PA9__SDMMC0_DAT7>; <PIN_PA9__SDMMC0_DAT7>;
bias-pull-up; bias-disable;
}; };
ck_cd_rstn_vddsel { ck_cd_rstn_vddsel {
...@@ -454,7 +465,7 @@ cmd_data { ...@@ -454,7 +465,7 @@ cmd_data {
<PIN_PA19__SDMMC1_DAT1>, <PIN_PA19__SDMMC1_DAT1>,
<PIN_PA20__SDMMC1_DAT2>, <PIN_PA20__SDMMC1_DAT2>,
<PIN_PA21__SDMMC1_DAT3>; <PIN_PA21__SDMMC1_DAT3>;
bias-pull-up; bias-disable;
}; };
conf-ck_cd { conf-ck_cd {
...@@ -494,6 +505,11 @@ pinctrl_usba_vbus: usba_vbus { ...@@ -494,6 +505,11 @@ pinctrl_usba_vbus: usba_vbus {
bias-disable; bias-disable;
}; };
pinctrl_pwm0_pwm2_default: pwm0_pwm2_default {
pinmux = <PIN_PB5__PWMH2>,
<PIN_PB6__PWML2>;
bias-pull-up;
};
}; };
classd: classd@fc048000 { classd: classd@fc048000 {
...@@ -522,6 +538,7 @@ bp1 { ...@@ -522,6 +538,7 @@ bp1 {
label = "PB_USER"; label = "PB_USER";
gpios = <&pioA PIN_PB9 GPIO_ACTIVE_LOW>; gpios = <&pioA PIN_PB9 GPIO_ACTIVE_LOW>;
linux,code = <0x104>; linux,code = <0x104>;
wakeup-source;
}; };
}; };
...@@ -529,7 +546,7 @@ leds { ...@@ -529,7 +546,7 @@ leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_led_gpio_default>; pinctrl-0 = <&pinctrl_led_gpio_default>;
status = "okay"; status = "okay"; /* conflict with pwm0 */
red { red {
label = "red"; label = "red";
......
arch/arm/boot/dts/at91sam9x25ek.dts
View file @ b3a87044
...@@ -16,6 +16,10 @@ / { ...@@ -16,6 +16,10 @@ / {
ahb { ahb {
apb { apb {
can1: can@f8004000 {
status = "okay";
};
macb0: ethernet@f802c000 { macb0: ethernet@f802c000 {
phy-mode = "rmii"; phy-mode = "rmii";
status = "okay"; status = "okay";
...@@ -25,6 +29,12 @@ macb1: ethernet@f8030000 { ...@@ -25,6 +29,12 @@ macb1: ethernet@f8030000 {
phy-mode = "rmii"; phy-mode = "rmii";
status = "okay"; status = "okay";
}; };
pwm0: pwm@f8034000 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pwm0_pwm0_1>;
status = "okay";
};
}; };
}; };
}; };
arch/arm/boot/dts/at91sam9x5ek.dtsi
View file @ b3a87044
...@@ -50,6 +50,8 @@ dbgu: serial@fffff200 { ...@@ -50,6 +50,8 @@ dbgu: serial@fffff200 {
}; };
usart0: serial@f801c000 { usart0: serial@f801c000 {
atmel,use-dma-rx;
atmel,use-dma-tx;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/usb_a9g20_common.dtsi
View file @ b3a87044
...@@ -20,8 +20,8 @@ memory { ...@@ -20,8 +20,8 @@ memory {
}; };
i2c-gpio-0 { i2c-gpio-0 {
rv3029c2@56 { rtc@56 {
compatible = "rv3029c2"; compatible = "microcrystal,rv3029";
reg = <0x56>; reg = <0x56>;
}; };
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7