From 26fe46381c45bc3c8b7782cb18b23f4efdf397b6 Mon Sep 17 00:00:00 2001
From: Jian Hu <jian.hu@amlogic.com>
Date: Tue, 25 Jul 2017 10:25:38 +0800
Subject: [PATCH] wifi: appending wifi dts

PD#146172: wifi: appending wifi dts

Change-Id: I0d208bda96192d6198e7cf959abb0dce6fe96a5f
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
---
 .../dts/amlogic/gxl_p212_1g_buildroot.dts     | 21 ++++++++++++++-----
 .../dts/amlogic/gxl_p212_2g_buildroot.dts     | 21 ++++++++++++++-----
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_1g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_1g_buildroot.dts
index 3fa0dc2a2956..338508b56916 100644
--- a/arch/arm64/boot/dts/amlogic/gxl_p212_1g_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p212_1g_buildroot.dts
@@ -146,16 +146,22 @@
 		interrupts = <	0 68 4>;
 		irq_trigger_type = "GPIO_IRQ_LOW";
 		power_on_pin = <&gpio       GPIOX_6       GPIO_ACTIVE_HIGH>;
-		pinctrl-names = "wifi_32k_pins";
+		pinctrl-names = "default";
 		pinctrl-0 = <&wifi_32k_pins>;
 		pwm_config = <&wifi_pwm_conf>;
 	};
 
 	wifi_pwm_conf:wifi_pwm_conf{
-		pwm_channel1 = <PWM_E>;
-		pwm_channel2 = <PWM_E2>;
-		pwm_channel1_conf = <30541 15270 6>;
-		pwm_channel2_conf = <30518 15259 9>;
+		pwm_channel1_conf {
+			pwms = <&pwm_ef MESON_PWM_0 30040 0>;
+			duty-cycle = <15020>;
+			times = <8>;
+		};
+		pwm_channel2_conf {
+			pwms = <&pwm_ef MESON_PWM_2 30030 0>;
+			duty-cycle = <15015>;
+			times = <12>;
+		};
 	};
 
 	sd_emmc_c: emmc@d0074000 {
@@ -1181,6 +1187,11 @@
 &efuse {
 	status = "ok";
 };
+
+&pwm_ef {
+	status = "okay";
+};
+
 &audio_data{
 	status = "okay";
 };
diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_2g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_2g_buildroot.dts
index cede69557d6e..f6c740ee1577 100644
--- a/arch/arm64/boot/dts/amlogic/gxl_p212_2g_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p212_2g_buildroot.dts
@@ -147,16 +147,22 @@
 		interrupts = <	0 68 4>;
 		irq_trigger_type = "GPIO_IRQ_LOW";
 		power_on_pin = <&gpio       GPIOX_6       GPIO_ACTIVE_HIGH>;
-		pinctrl-names = "wifi_32k_pins";
+		pinctrl-names = "default";
 		pinctrl-0 = <&wifi_32k_pins>;
 		pwm_config = <&wifi_pwm_conf>;
 	};
 
 	wifi_pwm_conf:wifi_pwm_conf{
-		pwm_channel1 = <PWM_E>;
-		pwm_channel2 = <PWM_E2>;
-		pwm_channel1_conf = <30541 15270 6>;
-		pwm_channel2_conf = <30518 15259 9>;
+		pwm_channel1_conf {
+			pwms = <&pwm_ef MESON_PWM_0 30040 0>;
+			duty-cycle = <15020>;
+			times = <8>;
+		};
+		pwm_channel2_conf {
+			pwms = <&pwm_ef MESON_PWM_2 30030 0>;
+			duty-cycle = <15015>;
+			times = <12>;
+		};
 	};
 
 	sd_emmc_c: emmc@d0074000 {
@@ -1181,6 +1187,11 @@
 &efuse {
 	status = "ok";
 };
+
+&pwm_ef {
+	status = "okay";
+};
+
 &audio_data{
 	status = "okay";
 };