From d8a28fe691df451f99e1787f5bc075bade61e397 Mon Sep 17 00:00:00 2001
From: Jian Hu <jian.hu@amlogic.com>
Date: Wed, 21 Jun 2017 20:39:30 +0800
Subject: [PATCH] pwm: revert pwm e and f order

PD#146170: pwm: revert pwm e and f order

1.please ask me to get a patch when you are using pwm on axg.
2.new pwm driver is rebuilding.
3.add pwm e and f for axg,actually the hardware not support.

Change-Id: I3222380b700fbe9668c3d2da1dc8d878f22b30aa
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
---
 arch/arm64/boot/dts/amlogic/mesonaxg.dtsi |  8 +++---
 include/dt-bindings/pwm/meson.h           | 33 +++++++++++------------
 include/linux/amlogic/pwm_meson.h         | 11 ++++----
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/arch/arm64/boot/dts/amlogic/mesonaxg.dtsi b/arch/arm64/boot/dts/amlogic/mesonaxg.dtsi
index aa0b62def5c8..e18f2f30c709 100644
--- a/arch/arm64/boot/dts/amlogic/mesonaxg.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesonaxg.dtsi
@@ -352,8 +352,9 @@
 		status = "okay";
 		#pwm-cells = <2>;
 		pwm-outputs = <PWM_A>,<PWM_B>,<PWM_C>,<PWM_D>,
-		<PWM_AO_A>,<PWM_AO_B>,<PWM_AO_C>,<PWM_AO_D>,
-		<PWM_A2>,<PWM_B2>,<PWM_C2>,<PWM_D2>,<PWM_AO_A2>,
+		<PWM_E>,<PWM_F>,<PWM_AO_A>,<PWM_AO_B>,
+		<PWM_AO_C>,<PWM_AO_D>,<PWM_A2>,<PWM_B2>,
+		<PWM_C2>,<PWM_D2>,<PWM_E2>,<PWM_F2>,<PWM_AO_A2>,
 		<PWM_AO_B2>,<PWM_AO_C2>,<PWM_AO_D2>;
 		reg = <0x0 0xffd1b000  0x0 0x20>,
 				<0x0 0xffd1a000  0x0 0x20>,
@@ -368,7 +369,8 @@
 					"fclk_div4",
 					"fclk_div3";
 		clock-select = <XTAL>,<XTAL>,<XTAL>,<XTAL>,
-						<XTAL>,<XTAL>,<XTAL>,<XTAL>;
+						<XTAL>,<XTAL>,<XTAL>,<XTAL>,
+						<XTAL>,<XTAL>;
 		/*all channels use the default clock source XTAL_CLK*/
 		/*and you can shoose it in file dt-bindings/pwm/meson.h*/
 	};
diff --git a/include/dt-bindings/pwm/meson.h b/include/dt-bindings/pwm/meson.h
index d9a23391954f..a79d78e31268 100644
--- a/include/dt-bindings/pwm/meson.h
+++ b/include/dt-bindings/pwm/meson.h
@@ -23,29 +23,28 @@
 #define	PWM_B			1
 #define	PWM_C			2
 #define	PWM_D			3
-#define	PWM_AO_A		4
-#define	PWM_AO_B		5
-#define	PWM_AO_C		6
-#define	PWM_AO_D		7
+#define	PWM_E			4
+#define	PWM_F			5
+#define	PWM_AO_A		6
+#define	PWM_AO_B		7
+#define	PWM_AO_C		8
+#define	PWM_AO_D		9
 
 /*
  * Addtional 8 channels for gxtvbb , gxl ,gxm and txl
  */
-#define	PWM_A2			8
-#define	PWM_B2			9
-#define	PWM_C2			10
-#define	PWM_D2			11
-#define	PWM_AO_A2		12
-#define	PWM_AO_B2		13
-#define	PWM_AO_C2		14
-#define	PWM_AO_D2		15
+#define	PWM_A2			10
+#define	PWM_B2			11
+#define	PWM_C2			12
+#define	PWM_D2			13
+#define	PWM_E2			14
+#define	PWM_F2			15
+#define	PWM_AO_A2		16
+#define	PWM_AO_B2		17
+#define	PWM_AO_C2		18
+#define	PWM_AO_D2		19
 /*add another four channels for txlx*/
 
-#define	PWM_E			16
-#define	PWM_F			17
-#define	PWM_E2			18
-#define	PWM_F2			19
-
 
 
 
diff --git a/include/linux/amlogic/pwm_meson.h b/include/linux/amlogic/pwm_meson.h
index cea30cea1987..61417d389f23 100644
--- a/include/linux/amlogic/pwm_meson.h
+++ b/include/linux/amlogic/pwm_meson.h
@@ -40,7 +40,7 @@
 #define AML_PWM_GXBB_NUM		8
 #define AML_PWM_GXTVBB_NUM		16
 #define AML_PWM_TXLX_NUM		20
-#define AML_PWM_AXG_NUM			16
+#define AML_PWM_AXG_NUM			20
 
 
 
@@ -49,6 +49,8 @@ enum pwm_channel {
 	PWM_B,
 	PWM_C,
 	PWM_D,
+	PWM_E,
+	PWM_F,
 	PWM_AO_A,
 	PWM_AO_B,
 	PWM_AO_C,
@@ -58,16 +60,13 @@ enum pwm_channel {
 	PWM_B2,
 	PWM_C2,
 	PWM_D2,
+	PWM_E2,
+	PWM_F2,
 	PWM_AO_A2,
 	PWM_AO_B2,
 	PWM_AO_C2,
 	PWM_AO_D2,
 	/* add another four channels for txlx*/
-	PWM_E,
-	PWM_F,
-	PWM_E2,
-	PWM_F2,
-
 
 };