diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-03-26 00:29:22 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-03-26 00:29:23 +0300 |
| commit | 47a4e4377990ae994deb72eb76b0ca08aa87a457 (patch) | |
| tree | 80e8f24d18bcef7fff3ff8725214754f0b3f3271 /arch/arm/boot/dts/at91sam9n12ek.dts | |
| parent | eec05449eb0b19bf23d0f60e56d42db52de72603 (diff) | |
| parent | b8c2c052de210d23d83eb178fa030b541ca51842 (diff) | |
| download | linux-47a4e4377990ae994deb72eb76b0ca08aa87a457.tar.xz | |
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.net
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/at91sam9n12ek.dts')
| -rw-r--r-- | arch/arm/boot/dts/at91sam9n12ek.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/at91sam9n12ek.dts b/arch/arm/boot/dts/at91sam9n12ek.dts index ea5cef0b0974..d36e162a8817 100644 --- a/arch/arm/boot/dts/at91sam9n12ek.dts +++ b/arch/arm/boot/dts/at91sam9n12ek.dts @@ -238,7 +238,7 @@ }; panel: panel { - compatible = "qiaodian,qd43003c0-40", "simple-panel"; + compatible = "qiaodian,qd43003c0-40"; backlight = <&backlight>; power-supply = <&panel_reg>; #address-cells = <1>; |