[PATCH v5 4/5] ARM: Kirkwood: Fix qnap vendor prefix

Correct the vendor prefix for qnap, which should be the stock ticker
symbol qnapsz.

Signed-off-by: Ben Peddell <redacted>
Cc: Anton Vorontsov <redacted>
Cc: Dmitry Eremin-Solenikov <redacted>
Cc: David Woodhouse <redacted>
---
 Documentation/devicetree/bindings/power_supply/qnap-poweroff.txt | 2 +-
 arch/arm/boot/dts/kirkwood-ts219.dtsi                            | 4 ++--
 drivers/power/reset/qnap-poweroff.c                              | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation/devicetree/bindings/power_supply/qnap-poweroff.txt b/Documentation/devicetree/bindings/power_supply/qnap-poweroff.txt
index af25e77..aabda51 100644
--- a/Documentation/devicetree/bindings/power_supply/qnap-poweroff.txt
+++ b/Documentation/devicetree/bindings/power_supply/qnap-poweroff.txt

@@ -10,7 +10,7 @@ Synology NAS devices use a similar scheme, but a different baud rate,
 9600, and a different character, '1'.
 
 Required Properties:
-- compatible: Should be "qnap,power-off" or "synology,power-off"
+- compatible: Should be "qnapsz,power-off" or "synology,power-off"
 
 - reg: Address and length of the register set for UART1
 - clocks: tclk clock

diff --git a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi
index 911f3a8..0f0892a 100644
--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi

@@ -1,6 +1,6 @@
 / {
 	model = "QNAP TS219 family";
-	compatible = "qnap,ts219", "marvell,kirkwood";
+	compatible = "qnapsz,ts219", "marvell,kirkwood";
 
 	memory {
 		device_type = "memory";

@@ -46,7 +46,7 @@
 			pinctrl-names = "default";
 		};
 		poweroff@12100 {
-			compatible = "qnap,power-off";
+			compatible = "qnapsz,power-off";
 			reg = <0x12000 0x100>;
 			clocks = <&gate_clk 7>;
 		};

diff --git a/drivers/power/reset/qnap-poweroff.c b/drivers/power/reset/qnap-poweroff.c
index a75db7f..d350ece 100644
--- a/drivers/power/reset/qnap-poweroff.c
+++ b/drivers/power/reset/qnap-poweroff.c

@@ -41,7 +41,7 @@ static const struct power_off_cfg synology_power_off_cfg = {
 };
 
 static const struct of_device_id qnap_power_off_of_match_table[] = {
-	{ .compatible = "qnap,power-off",
+	{ .compatible = "qnapsz,power-off",
 	  .data = &qnap_power_off_cfg,
 	},
 	{ .compatible = "synology,power-off",

-- 
1.8.3.2

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

On Wed, 2014-02-19 at 22:49 +1000, klightspeed@killerwolves.net wrote:

Correct the vendor prefix for qnap, which should be the stock ticker
symbol qnapsz.

No. This is an ABI change which appears to be gratuitous.

Perhaps it's really necessary, and perhaps it's harmless because it
won't *really* break compatibility with existing firmware because these
boxes have *always* shipped with a DTB built into the kernel or
something.

In which case all I'm complaining about is the fact that you didn't
properly address that in the commit comment and *explain* why it was
OK...

-- 
David Woodhouse                            Open Source Technology Centre
David.Woodhouse@intel.com                              Intel Corporation