Commit a36c9ff6 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'dt-for-v5.12' of... 

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

* 'dt-for-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/iwamatsu/linux-visconti:
  arm: dts: visconti: Add DT support for Toshiba Visconti5 GPIO driver

Link: https://lore.kernel.org/r/20210210173210.nnytfyrkkj6ylrtb@toshiba.co.jp


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 52ded9ea 0109a175

arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts

+4 −0
Original line number Diff line number Diff line
@@ -46,3 +46,7 @@ &wdt { 
	status = "okay";

	clocks = <&wdt_clk>;

};



&gpio {

	status = "okay";

};

arch/arm64/boot/dts/toshiba/tmpv7708.dtsi

+11 −0
Original line number Diff line number Diff line
@@ -163,6 +163,17 @@ pmux: pmux@24190000 { 
			reg = <0 0x24190000 0 0x10000>;

		};



		gpio: gpio@28020000 {

			compatible = "toshiba,gpio-tmpv7708";

			reg = <0 0x28020000 0 0x1000>;

			#gpio-cells = <0x2>;

			gpio-ranges = <&pmux 0 0 32>;

			gpio-controller;

			interrupt-controller;

			#interrupt-cells = <2>;

			interrupt-parent = <&gic>;

		};



		uart0: serial@28200000 {

			compatible = "arm,pl011", "arm,primecell";

			reg = <0 0x28200000 0 0x1000>;