From e96f8d445b9e8ec7c8618a68c57180ace93a9ea8 Mon Sep 17 00:00:00 2001 From: Bo Yang Date: Wed, 5 Apr 2017 14:47:36 +0800 Subject: [PATCH] dts: add led, watchdog, and jtag device node PD#138714: dts: add led, watchdog, and jtag device node Change-Id: Ie367c0e7acd67be9d12d5d3b32ac43d8a4eee10f Signed-off-by: Bo Yang --- arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts | 8 ++++++++ arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts | 9 +++++++++ arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts | 9 +++++++++ arch/arm64/boot/dts/amlogic/mesongxl.dtsi | 22 +++++++++++++++++++++ arch/arm64/boot/dts/amlogic/mesongxm.dtsi | 22 +++++++++++++++++++++ drivers/amlogic/watchdog/meson_wdt.c | 2 +- 6 files changed, 71 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts index d7a68888a33e..634c1016be0f 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts @@ -622,6 +622,14 @@ /*and you can shoose it in file dt-bindings/pwm/meson.h*/ }; + sysled { + compatible = "amlogic, sysled"; + dev_name = "sysled"; + status = "okay"; + led_gpio = <&gpio GPIODV_24 GPIO_ACTIVE_HIGH>; + led_active_low = <1>; + }; + codec_io { compatible = "amlogic, codec_io"; #address-cells=<2>; diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts index 815b106c0b4b..f44f1951b680 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts @@ -696,6 +696,15 @@ /*all channels use the default clock source XTAL_CLK*/ /*and you can shoose it in file dt-bindings/pwm/meson.h*/ }; + + sysled { + compatible = "amlogic, sysled"; + dev_name = "sysled"; + status = "okay"; + led_gpio = <&gpio GPIODV_24 GPIO_ACTIVE_HIGH>; + led_active_low = <1>; + }; + meson-fb { compatible = "amlogic, meson-fb"; memory-region = <&fb_reserved>; diff --git a/arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts b/arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts index 9597f79cc099..03af58e0809c 100644 --- a/arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts @@ -718,6 +718,15 @@ /*all channels use the default clock source XTAL_CLK*/ /*and you can shoose it in file dt-bindings/pwm/meson.h*/ }; + + sysled { + compatible = "amlogic, sysled"; + dev_name = "sysled"; + status = "okay"; + led_gpio = <&gpio GPIODV_24 GPIO_ACTIVE_HIGH>; + led_active_low = <1>; + }; + meson-fb { compatible = "amlogic, meson-fb"; memory-region = <&fb_reserved>; diff --git a/arch/arm64/boot/dts/amlogic/mesongxl.dtsi b/arch/arm64/boot/dts/amlogic/mesongxl.dtsi index 93ae8f420976..ff53849a5b19 100644 --- a/arch/arm64/boot/dts/amlogic/mesongxl.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesongxl.dtsi @@ -208,6 +208,28 @@ status = "okay"; }; + watchdog { + compatible = "amlogic, meson-wdt"; + status = "disabled"; + default_timeout=<10>; + reset_watchdog_method=<1>; /* 0:sysfs,1:kernel */ + reset_watchdog_time=<2>; + shutdown_timeout=<10>; + firmware_timeout=<6>; + suspend_timeout=<6>; + reg = <0x0 0xc11098d0 0x0 0x10>; + clock-names = "xtal"; + clocks = <&xtal>; + }; + + jtag { + compatible = "amlogic, jtag"; + status = "disabled"; + pinctrl-names = "jtag_apao_pins", "jtag_apee_pins"; + pinctrl-0 = <&jtag_apao_pins>; + pinctrl-1 = <&jtag_apee_pins>; + }; + mailbox: mhu@c883c400 { compatible = "amlogic, meson_mhu"; reg = <0x0 0xc883c400 0x0 0x4c>, /* MHU registers */ diff --git a/arch/arm64/boot/dts/amlogic/mesongxm.dtsi b/arch/arm64/boot/dts/amlogic/mesongxm.dtsi index 64f5035b1a81..7c9700f31c2f 100644 --- a/arch/arm64/boot/dts/amlogic/mesongxm.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesongxm.dtsi @@ -239,6 +239,28 @@ interrupts = ; }; + watchdog { + compatible = "amlogic, meson-wdt"; + status = "disabled"; + default_timeout=<10>; + reset_watchdog_method=<1>; /* 0:sysfs,1:kernel */ + reset_watchdog_time=<2>; + shutdown_timeout=<10>; + firmware_timeout=<6>; + suspend_timeout=<6>; + reg = <0x0 0xc11098d0 0x0 0x10>; + clock-names = "xtal"; + clocks = <&xtal>; + }; + + jtag { + compatible = "amlogic, jtag"; + status = "disabled"; + pinctrl-names = "jtag_apao_pins", "jtag_apee_pins"; + pinctrl-0 = <&jtag_apao_pins>; + pinctrl-1 = <&jtag_apee_pins>; + }; + psci { compatible = "arm,psci-0.2"; method = "smc"; diff --git a/drivers/amlogic/watchdog/meson_wdt.c b/drivers/amlogic/watchdog/meson_wdt.c index ab143fbcfe83..c4f768baa0f6 100644 --- a/drivers/amlogic/watchdog/meson_wdt.c +++ b/drivers/amlogic/watchdog/meson_wdt.c @@ -368,7 +368,7 @@ static int aml_wdt_resume(struct platform_device *pdev) #endif static const struct of_device_id aml_wdt_of_match[] = { - { .compatible = "amlogic, gx-wdt", }, + { .compatible = "amlogic, meson-wdt", }, {}, }; MODULE_DEVICE_TABLE(of, aml_wdt_of_match);