Commit cfd7eed9 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'visconti-arm-dt-for-v5.11-tag2' of...

Merge tag 'visconti-arm-dt-for-v5.11-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/iwamatsu/linux-visconti into arm/dt

Visconti device tree updates for 5.11

- Add watchdog support for TMPV7708 SoC
- Add entries for Toshiba Visconti5 watchdog driver

* tag 'visconti-arm-dt-for-v5.11-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/iwamatsu/linux-visconti:
  arm64: dts: visconti: Add watchdog support for TMPV7708 SoC
  MAINTAINERS: Add entries for Toshiba Visconti5 watchdog driver

Link: https://lore.kernel.org/r/20210125003357.yd72y4f5vcdnvhnr@toshiba.co.jpSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents f5e4bf90 4fd18fc3
......@@ -2643,8 +2643,10 @@ S: Supported
T: git git://git.kernel.org/pub/scm/linux/kernel/git/iwamatsu/linux-visconti.git
F: Documentation/devicetree/bindings/arm/toshiba.yaml
F: Documentation/devicetree/bindings/pinctrl/toshiba,tmpv7700-pinctrl.yaml
F: Documentation/devicetree/bindings/watchdog/toshiba,visconti-wdt.yaml
F: arch/arm64/boot/dts/toshiba/
F: drivers/pinctrl/visconti/
F: drivers/watchdog/visconti_wdt.c
N: visconti
ARM/UNIPHIER ARCHITECTURE
......
......@@ -41,3 +41,8 @@ &uart1 {
clocks = <&uart_clk>;
clock-names = "apb_pclk";
};
&wdt {
status = "okay";
clocks = <&wdt_clk>;
};
......@@ -134,6 +134,12 @@ uart_clk: uart-clk {
#clock-cells = <0>;
};
wdt_clk: wdt-clk {
compatible = "fixed-clock";
clock-frequency = <150000000>;
#clock-cells = <0>;
};
soc {
#address-cells = <2>;
#size-cells = <2>;
......@@ -384,6 +390,12 @@ spi6: spi@28146000 {
#size-cells = <0>;
status = "disabled";
};
wdt: wdt@28330000 {
compatible = "toshiba,visconti-wdt";
reg = <0 0x28330000 0 0x1000>;
status = "disabled";
};
};
};
......
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