Skip to content

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

Merge tag 'at91-5.7-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/dt 

AT91 DT for 5.7

 - Enable watchdog on sam9x60
 - Correct sama5d4/2 RTC compatibles
 - Add i2c gpio pinctrl to allow i2c recovery

* tag 'at91-5.7-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: dts: at91: sama5d27_wlsom1_ek: add USB device node
  ARM: dts: at91: sama5d2: add i2c gpio pinctrl
  ARM: dts: at91: sama5d4: add i2c gpio pinctrl
  ARM: dts: at91: sama5d3: add i2c gpio pinctrl
  ARM: dts: at91: sama5d4: use correct rtc compatible
  ARM: dts: at91: sama5d2: use correct rtc compatible
  ARM: dts: at91: sam9x60ek: enable watchdog node
  ARM: dts: at91: sam9x60: add watchdog node
  ARM: dts: at91: Kill off "simple-panel" compatibles

Link: https://lore.kernel.org/r/20200322085931.GA208770@piout.netSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents eec05449 b8c2c052
Hide whitespace changes
Inline Side-by-side
Showing with 151 additions and 18 deletions
arch/arm/boot/dts/at91-dvk_su60_somc_lcm.dtsi
View file @ 47a4e437
......@@ -17,7 +17,7 @@ backlight: backlight {
};
panel: panel {
compatible = "winstar,wf70gtiagdng0", "innolux,at070tn92", "simple-panel";
compatible = "winstar,wf70gtiagdng0", "innolux,at070tn92";
backlight = <&backlight>;
power-supply = <&vcc_lcd_reg>;
#address-cells = <1>;
......
arch/arm/boot/dts/at91-sam9x60ek.dts
View file @ 47a4e437
......@@ -645,3 +645,8 @@ &pioD 15 GPIO_ACTIVE_HIGH
&usb2 {
status = "okay";
};
&watchdog {
status = "okay";
};
arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts
View file @ 47a4e437
......@@ -186,6 +186,11 @@ pinctrl_usb_default: usb_default {
pinmux = <PIN_PA10__GPIO>;
bias-disable;
};
pinctrl_usba_vbus: usba_vbus {
pinmux = <PIN_PA16__GPIO>;
bias-disable;
};
};
&pwm0 {
......@@ -248,6 +253,13 @@ &uart3 {
status = "okay";
};
&usb0 {
atmel,vbus-gpio = <&pioA PIN_PA16 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usba_vbus>;
status = "okay";
};
&usb1 {
num-ports = <3>;
atmel,vbus-gpio = <0
......
arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts
View file @ 47a4e437
......@@ -180,8 +180,11 @@ uart2: serial@f8024000 {
i2c0: i2c@f8028000 {
dmas = <0>, <0>;
pinctrl-names = "default";
pinctrl-names = "default", "gpio";
pinctrl-0 = <&pinctrl_i2c0_default>;
pinctrl-1 = <&pinctrl_i2c0_gpio>;
sda-gpios = <&pioA PIN_PD21 GPIO_ACTIVE_HIGH>;
scl-gpios = <&pioA PIN_PD22 GPIO_ACTIVE_HIGH>;
status = "okay";
};
......@@ -198,8 +201,11 @@ i2c2: i2c@600 {
#address-cells = <1>;
#size-cells = <0>;
clocks = <&pmc PMC_TYPE_PERIPHERAL 19>;
pinctrl-names = "default";
pinctrl-names = "default", "gpio";
pinctrl-0 = <&pinctrl_flx0_default>;
pinctrl-1 = <&pinctrl_flx0_gpio>;
sda-gpios = <&pioA PIN_PB28 GPIO_ACTIVE_HIGH>;
scl-gpios = <&pioA PIN_PB29 GPIO_ACTIVE_HIGH>;
atmel,fifo-size = <16>;
status = "okay";
};
......@@ -226,8 +232,11 @@ spi1: spi@fc000000 {
i2c1: i2c@fc028000 {
dmas = <0>, <0>;
pinctrl-names = "default";
pinctrl-names = "default", "gpio";
pinctrl-0 = <&pinctrl_i2c1_default>;
pinctrl-1 = <&pinctrl_i2c1_gpio>;
sda-gpios = <&pioA PIN_PC6 GPIO_ACTIVE_HIGH>;
scl-gpios = <&pioA PIN_PC7 GPIO_ACTIVE_HIGH>;
status = "okay";
at24@50 {
......@@ -244,18 +253,36 @@ pinctrl_flx0_default: flx0_default {
bias-disable;
};
pinctrl_flx0_gpio: flx0_gpio {
pinmux = <PIN_PB28__GPIO>,
<PIN_PB29__GPIO>;
bias-disable;
};
pinctrl_i2c0_default: i2c0_default {
pinmux = <PIN_PD21__TWD0>,
<PIN_PD22__TWCK0>;
bias-disable;
};
pinctrl_i2c0_gpio: i2c0_gpio {
pinmux = <PIN_PD21__GPIO>,
<PIN_PD22__GPIO>;
bias-disable;
};
pinctrl_i2c1_default: i2c1_default {
pinmux = <PIN_PC6__TWD1>,
<PIN_PC7__TWCK1>;
bias-disable;
};
pinctrl_i2c1_gpio: i2c1_gpio {
pinmux = <PIN_PC6__GPIO>,
<PIN_PC7__GPIO>;
bias-disable;
};
pinctrl_key_gpio_default: key_gpio_default {
pinmux = <PIN_PA10__GPIO>;
bias-pull-up;
......
arch/arm/boot/dts/at91-sama5d2_xplained.dts
View file @ 47a4e437
......@@ -129,8 +129,11 @@ uart1: serial@f8020000 {
i2c0: i2c@f8028000 {
dmas = <0>, <0>;
pinctrl-names = "default";
pinctrl-names = "default", "gpio";
pinctrl-0 = <&pinctrl_i2c0_default>;
pinctrl-1 = <&pinctrl_i2c0_gpio>;
sda-gpios = <&pioA PIN_PD21 GPIO_ACTIVE_HIGH>;
scl-gpios = <&pioA PIN_PD22 GPIO_ACTIVE_HIGH>;
i2c-sda-hold-time-ns = <350>;
status = "okay";
......@@ -331,8 +334,11 @@ i2c2: i2c@600 {
#address-cells = <1>;
#size-cells = <0>;
clocks = <&pmc PMC_TYPE_PERIPHERAL 23>;
pinctrl-names = "default";
pinctrl-names = "default", "gpio";
pinctrl-0 = <&pinctrl_flx4_default>;
pinctrl-1 = <&pinctrl_flx4_gpio>;
sda-gpios = <&pioA PIN_PD12 GPIO_ACTIVE_HIGH>;
scl-gpios = <&pioA PIN_PD13 GPIO_ACTIVE_HIGH>;
atmel,fifo-size = <16>;
i2c-analog-filter;
i2c-digital-filter;
......@@ -343,11 +349,14 @@ i2c2: i2c@600 {
i2c1: i2c@fc028000 {
dmas = <0>, <0>;
pinctrl-names = "default";
pinctrl-names = "default", "gpio";
pinctrl-0 = <&pinctrl_i2c1_default>;
i2c-analog-filter;
i2c-digital-filter;
i2c-digital-filter-width-ns = <35>;
pinctrl-1 = <&pinctrl_i2c1_gpio>;
sda-gpios = <&pioA PIN_PD4 GPIO_ACTIVE_HIGH>;
scl-gpios = <&pioA PIN_PD5 GPIO_ACTIVE_HIGH>;
status = "okay";
at24@54 {
......@@ -441,18 +450,36 @@ pinctrl_flx4_default: flx4_default {
bias-disable;
};
pinctrl_flx4_gpio: flx4_gpio {
pinmux = <PIN_PD12__GPIO>,
<PIN_PD13__GPIO>;
bias-disable;
};
pinctrl_i2c0_default: i2c0_default {
pinmux = <PIN_PD21__TWD0>,
<PIN_PD22__TWCK0>;
bias-disable;
};
pinctrl_i2c0_gpio: i2c0_gpio {
pinmux = <PIN_PD21__GPIO>,
<PIN_PD22__GPIO>;
bias-disable;
};
pinctrl_i2c1_default: i2c1_default {
pinmux = <PIN_PD4__TWD1>,
<PIN_PD5__TWCK1>;
bias-disable;
};
pinctrl_i2c1_gpio: i2c1_gpio {
pinmux = <PIN_PD4__GPIO>,
<PIN_PD5__GPIO>;
bias-disable;
};
pinctrl_i2s0_default: i2s0_default {
pinmux = <PIN_PC1__I2SC0_CK>,
<PIN_PC2__I2SC0_MCK>,
......
arch/arm/boot/dts/at91-sama5d4_ma5d4evk.dts
View file @ 47a4e437
......@@ -136,7 +136,7 @@ user3 {
panel: panel {
/* Actually Ampire 800480R2 */
compatible = "foxlink,fl500wvr00-a0t", "simple-panel";
compatible = "foxlink,fl500wvr00-a0t";
backlight = <&backlight>;
#address-cells = <1>;
#size-cells = <0>;
......
arch/arm/boot/dts/at91sam9n12ek.dts
View file @ 47a4e437
......@@ -238,7 +238,7 @@ enter {
};
panel: panel {
compatible = "qiaodian,qd43003c0-40", "simple-panel";
compatible = "qiaodian,qd43003c0-40";
backlight = <&backlight>;
power-supply = <&panel_reg>;
#address-cells = <1>;
......
arch/arm/boot/dts/at91sam9x5dm.dtsi
View file @ 47a4e437
......@@ -27,7 +27,7 @@ bl_reg: backlight_regulator {
};
panel: panel {
compatible = "foxlink,fl500wvr00-a0t", "simple-panel";
compatible = "foxlink,fl500wvr00-a0t";
backlight = <&backlight>;
power-supply = <&panel_reg>;
#address-cells = <1>;
......
arch/arm/boot/dts/sam9x60.dtsi
View file @ 47a4e437
......@@ -686,6 +686,14 @@ rtc: rtc@fffffea8 {
interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
clocks = <&clk32k 0>;
};
watchdog: watchdog@ffffff80 {
compatible = "microchip,sam9x60-wdt";
reg = <0xffffff80 0x24>;
interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
clocks = <&clk32k 0>;
status = "disabled";
};
};
};
};
arch/arm/boot/dts/sama5d2.dtsi
View file @ 47a4e437
......@@ -695,7 +695,7 @@ clk32k: sckc@f8048050 {
};
rtc: rtc@f80480b0 {
compatible = "atmel,at91rm9200-rtc";
compatible = "atmel,sama5d2-rtc";
reg = <0xf80480b0 0x30>;
interrupts = <74 IRQ_TYPE_LEVEL_HIGH 7>;
clocks = <&clk32k>;
......
arch/arm/boot/dts/sama5d3.dtsi
View file @ 47a4e437
......@@ -159,8 +159,11 @@ i2c0: i2c@f0014000 {
dmas = <&dma0 2 AT91_DMA_CFG_PER_ID(7)>,
<&dma0 2 AT91_DMA_CFG_PER_ID(8)>;
dma-names = "tx", "rx";
pinctrl-names = "default";
pinctrl-names = "default", "gpio";
pinctrl-0 = <&pinctrl_i2c0>;
pinctrl-1 = <&pinctrl_i2c0_gpio>;
sda-gpios = <&pioA 30 GPIO_ACTIVE_HIGH>;
scl-gpios = <&pioA 31 GPIO_ACTIVE_HIGH>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&twi0_clk>;
......@@ -174,8 +177,11 @@ i2c1: i2c@f0018000 {
dmas = <&dma0 2 AT91_DMA_CFG_PER_ID(9)>,
<&dma0 2 AT91_DMA_CFG_PER_ID(10)>;
dma-names = "tx", "rx";
pinctrl-names = "default";
pinctrl-names = "default", "gpio";
pinctrl-0 = <&pinctrl_i2c1>;
pinctrl-1 = <&pinctrl_i2c1_gpio>;
sda-gpios = <&pioC 26 GPIO_ACTIVE_HIGH>;
scl-gpios = <&pioC 27 GPIO_ACTIVE_HIGH>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&twi1_clk>;
......@@ -357,8 +363,11 @@ i2c2: i2c@f801c000 {
dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(11)>,
<&dma1 2 AT91_DMA_CFG_PER_ID(12)>;
dma-names = "tx", "rx";
pinctrl-names = "default";
pinctrl-names = "default", "gpio";
pinctrl-0 = <&pinctrl_i2c2>;
pinctrl-1 = <&pinctrl_i2c2_gpio>;
sda-gpios = <&pioA 18 GPIO_ACTIVE_HIGH>;
scl-gpios = <&pioA 19 GPIO_ACTIVE_HIGH>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&twi2_clk>;
......@@ -639,6 +648,12 @@ pinctrl_i2c0: i2c0-0 {
<AT91_PIOA 30 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA30 periph A TWD0 pin, conflicts with URXD1, ISI_VSYNC */
AT91_PIOA 31 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA31 periph A TWCK0 pin, conflicts with UTXD1, ISI_HSYNC */
};
pinctrl_i2c0_gpio: i2c0-gpio {
atmel,pins =
<AT91_PIOA 30 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
AT91_PIOA 31 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
};
};
i2c1 {
......@@ -647,6 +662,12 @@ pinctrl_i2c1: i2c1-0 {
<AT91_PIOC 26 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC26 periph B TWD1 pin, conflicts with SPI1_NPCS1, ISI_D11 */
AT91_PIOC 27 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC27 periph B TWCK1 pin, conflicts with SPI1_NPCS2, ISI_D10 */
};
pinctrl_i2c1_gpio: i2c1-gpio {
atmel,pins =
<AT91_PIOC 26 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
AT91_PIOC 27 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
};
};
i2c2 {
......@@ -655,6 +676,12 @@ pinctrl_i2c2: i2c2-0 {
<AT91_PIOA 18 AT91_PERIPH_B AT91_PINCTRL_NONE /* TWD2 pin, conflicts with LCDDAT18, ISI_D2 */
AT91_PIOA 19 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* TWCK2 pin, conflicts with LCDDAT19, ISI_D3 */
};
pinctrl_i2c2_gpio: i2c2-gpio {
atmel,pins =
<AT91_PIOA 18 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
AT91_PIOA 19 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
};
};
isi {
......
arch/arm/boot/dts/sama5d4.dtsi
View file @ 47a4e437
......@@ -458,8 +458,11 @@ i2c0: i2c@f8014000 {
(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)
| AT91_XDMAC_DT_PERID(3))>;
dma-names = "tx", "rx";
pinctrl-names = "default";
pinctrl-names = "default", "gpio";
pinctrl-0 = <&pinctrl_i2c0>;
pinctrl-1 = <&pinctrl_i2c0_gpio>;
sda-gpios = <&pioA 30 GPIO_ACTIVE_HIGH>;
scl-gpios = <&pioA 31 GPIO_ACTIVE_HIGH>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&pmc PMC_TYPE_PERIPHERAL 32>;
......@@ -477,8 +480,11 @@ i2c1: i2c@f8018000 {
(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)
| AT91_XDMAC_DT_PERID(5))>;
dma-names = "tx", "rx";
pinctrl-names = "default";
pinctrl-names = "default", "gpio";
pinctrl-0 = <&pinctrl_i2c1>;
pinctrl-1 = <&pinctrl_i2c1_gpio>;
sda-gpios = <&pioE 29 GPIO_ACTIVE_HIGH>;
scl-gpios = <&pioE 30 GPIO_ACTIVE_HIGH>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&pmc PMC_TYPE_PERIPHERAL 33>;
......@@ -519,8 +525,11 @@ i2c2: i2c@f8024000 {
(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)
| AT91_XDMAC_DT_PERID(7))>;
dma-names = "tx", "rx";
pinctrl-names = "default";
pinctrl-names = "default", "gpio";
pinctrl-0 = <&pinctrl_i2c2>;
pinctrl-1 = <&pinctrl_i2c2_gpio>;
sda-gpios = <&pioB 29 GPIO_ACTIVE_HIGH>;
scl-gpios = <&pioB 30 GPIO_ACTIVE_HIGH>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&pmc PMC_TYPE_PERIPHERAL 34>;
......@@ -884,7 +893,7 @@ clk32k: sckc@fc068650 {
};
rtc@fc0686b0 {
compatible = "atmel,at91rm9200-rtc";
compatible = "atmel,sama5d4-rtc";
reg = <0xfc0686b0 0x30>;
interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
clocks = <&clk32k>;
......@@ -1122,6 +1131,12 @@ pinctrl_i2c0: i2c0-0 {
<AT91_PIOA 30 AT91_PERIPH_A AT91_PINCTRL_NONE
AT91_PIOA 31 AT91_PERIPH_A AT91_PINCTRL_NONE>;
};
pinctrl_i2c0_gpio: i2c0-gpio {
atmel,pins =
<AT91_PIOA 30 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
AT91_PIOA 31 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
};
};
i2c1 {
......@@ -1130,6 +1145,12 @@ pinctrl_i2c1: i2c1-0 {
<AT91_PIOE 29 AT91_PERIPH_C AT91_PINCTRL_NONE /* TWD1, conflicts with UART0 RX and DIBP */
AT91_PIOE 30 AT91_PERIPH_C AT91_PINCTRL_NONE>; /* TWCK1, conflicts with UART0 TX and DIBN */
};
pinctrl_i2c1_gpio: i2c1-gpio {
atmel,pins =
<AT91_PIOE 29 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
AT91_PIOE 30 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
};
};
i2c2 {
......@@ -1138,6 +1159,12 @@ pinctrl_i2c2: i2c2-0 {
<AT91_PIOB 29 AT91_PERIPH_A AT91_PINCTRL_NONE /* TWD2, conflicts with RD0 and PWML1 */
AT91_PIOB 30 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* TWCK2, conflicts with RF0 */
};
pinctrl_i2c2_gpio: i2c2-gpio {
atmel,pins =
<AT91_PIOB 29 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
AT91_PIOB 30 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
};
};
isi {
......
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