From: Lothar Waßmann <LW@KARO-electronics.de>
Date: Mon, 30 Jun 2014 13:22:41 +0000 (+0200)
Subject: board: karo: make vbus-supply property name depend on board type
X-Git-Tag: KARO-TX-2014-07-10~6
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=cadf1af108a2d4bd9ada6bd26457578c16c0c607

board: karo: make vbus-supply property name depend on board type
---

diff --git a/board/karo/common/fdt.c b/board/karo/common/fdt.c
index 3e2477baf2..0e90398c14 100644
--- a/board/karo/common/fdt.c
+++ b/board/karo/common/fdt.c
@@ -223,7 +223,8 @@ static int karo_fdt_disable_node_phandle(void *blob, const char *parent,
 	return fdt_set_node_status(blob, off, FDT_STATUS_DISABLED, 0);
 }
 
-void karo_fdt_fixup_usb_otg(void *blob, const char *node, const char *phy)
+void karo_fdt_fixup_usb_otg(void *blob, const char *node, const char *phy,
+			const char *phy_supply)
 {
 	const char *otg_mode = getenv("otg_mode");
 	int off;
@@ -262,7 +263,7 @@ void karo_fdt_fixup_usb_otg(void *blob, const char *node, const char *phy)
 	if ((!disable_phy_pins && !disable_otg) || ret)
 		goto out;
 
-	ret = karo_fdt_disable_node_phandle(blob, node, "vbus-supply");
+	ret = karo_fdt_disable_node_phandle(blob, node, phy_supply);
 	if (ret)
 		goto out;
 
@@ -275,7 +276,7 @@ void karo_fdt_fixup_usb_otg(void *blob, const char *node, const char *phy)
 		ret = karo_fdt_disable_node_phandle(blob, node, phy);
 	} else if (disable_phy_pins) {
 		debug("Removing 'vbus-supply' from usbotg node\n");
-		fdt_delprop(blob, off, "vbus-supply");
+		fdt_delprop(blob, off, phy_supply);
 	}
 
 out:
diff --git a/board/karo/common/karo.h b/board/karo/common/karo.h
index 4aee30257d..fac2ecb2ce 100644
--- a/board/karo/common/karo.h
+++ b/board/karo/common/karo.h
@@ -27,7 +27,8 @@ void karo_fdt_remove_node(void *blob, const char *node);
 void karo_fdt_move_fdt(void);
 void karo_fdt_fixup_touchpanel(void *blob, const char *panels[],
 			size_t num_panels);
-void karo_fdt_fixup_usb_otg(void *blob, const char *node, const char *phy);
+void karo_fdt_fixup_usb_otg(void *blob, const char *node, const char *phy,
+			const char *phy_supply);
 void karo_fdt_fixup_flexcan(void *blob, int xcvr_present);
 void karo_fdt_del_prop(void *blob, const char *compat, phys_addr_t offs,
 		const char *prop);
@@ -50,7 +51,8 @@ static inline void karo_fdt_fixup_touchpanel(void *blob, const char *panels[],
 {
 }
 static inline void karo_fdt_fixup_usb_otg(void *blob, const char *node,
-					const char *phy)
+					const char *phy,
+					const char *phy_supply)
 {
 }
 static inline void karo_fdt_fixup_flexcan(void *blob, int xcvr_present)
diff --git a/board/karo/tx28/tx28.c b/board/karo/tx28/tx28.c
index 8e681eb065..5b68dc2db0 100644
--- a/board/karo/tx28/tx28.c
+++ b/board/karo/tx28/tx28.c
@@ -993,7 +993,7 @@ void ft_board_setup(void *blob, bd_t *bd)
 
 	karo_fdt_fixup_touchpanel(blob, tx28_touchpanels,
 				ARRAY_SIZE(tx28_touchpanels));
-	karo_fdt_fixup_usb_otg(blob, "usbotg", "fsl,usbphy");
+	karo_fdt_fixup_usb_otg(blob, "usbotg", "fsl,usbphy", "vbus-supply");
 	karo_fdt_fixup_flexcan(blob, stk5_v5);
 	karo_fdt_update_fb_mode(blob, video_mode);
 }
diff --git a/board/karo/tx48/tx48.c b/board/karo/tx48/tx48.c
index 48cb0c83da..d1853b70f4 100644
--- a/board/karo/tx48/tx48.c
+++ b/board/karo/tx48/tx48.c
@@ -1101,7 +1101,7 @@ void ft_board_setup(void *blob, bd_t *bd)
 
 	karo_fdt_fixup_touchpanel(blob, tx48_touchpanels,
 				ARRAY_SIZE(tx48_touchpanels));
-	karo_fdt_fixup_usb_otg(blob, "usb0", "phys");
+	karo_fdt_fixup_usb_otg(blob, "usb0", "phys", "vcc-supply");
 	karo_fdt_fixup_flexcan(blob, stk5_v5);
 
 	karo_fdt_update_fb_mode(blob, video_mode);
diff --git a/board/karo/tx51/tx51.c b/board/karo/tx51/tx51.c
index 7de1406797..3117bf9f5e 100644
--- a/board/karo/tx51/tx51.c
+++ b/board/karo/tx51/tx51.c
@@ -1119,7 +1119,7 @@ void ft_board_setup(void *blob, bd_t *bd)
 
 	karo_fdt_fixup_touchpanel(blob, tx51_touchpanels,
 				ARRAY_SIZE(tx51_touchpanels));
-	karo_fdt_fixup_usb_otg(blob, "usbotg", "fsl,usbphy");
+	karo_fdt_fixup_usb_otg(blob, "usbotg", "fsl,usbphy", "vbus-supply");
 	karo_fdt_update_fb_mode(blob, video_mode);
 }
 #endif /* CONFIG_OF_BOARD_SETUP */
diff --git a/board/karo/tx53/tx53.c b/board/karo/tx53/tx53.c
index 8254b08317..9ba77eb3bd 100644
--- a/board/karo/tx53/tx53.c
+++ b/board/karo/tx53/tx53.c
@@ -1369,7 +1369,7 @@ void ft_board_setup(void *blob, bd_t *bd)
 
 	karo_fdt_fixup_touchpanel(blob, tx53_touchpanels,
 				ARRAY_SIZE(tx53_touchpanels));
-	karo_fdt_fixup_usb_otg(blob, "usbotg", "fsl,usbphy");
+	karo_fdt_fixup_usb_otg(blob, "usbotg", "fsl,usbphy", "vbus-supply");
 	karo_fdt_fixup_flexcan(blob, stk5_v5);
 	tx53_fixup_rtc(blob);
 	karo_fdt_update_fb_mode(blob, video_mode);
diff --git a/board/karo/tx6/tx6-1020.c b/board/karo/tx6/tx6-1020.c
index 88712badd5..befe2269c2 100644
--- a/board/karo/tx6/tx6-1020.c
+++ b/board/karo/tx6/tx6-1020.c
@@ -1311,7 +1311,7 @@ void ft_board_setup(void *blob, bd_t *bd)
 
 	karo_fdt_fixup_touchpanel(blob, tx6_touchpanels,
 				ARRAY_SIZE(tx6_touchpanels));
-	karo_fdt_fixup_usb_otg(blob, "usbotg", "fsl,usbphy");
+	karo_fdt_fixup_usb_otg(blob, "usbotg", "fsl,usbphy", "vbus-supply");
 	karo_fdt_fixup_flexcan(blob, stk5_v5);
 
 	karo_fdt_update_fb_mode(blob, video_mode);
diff --git a/board/karo/tx6/tx6qdl.c b/board/karo/tx6/tx6qdl.c
index af052faa28..b3a655cef0 100644
--- a/board/karo/tx6/tx6qdl.c
+++ b/board/karo/tx6/tx6qdl.c
@@ -1343,7 +1343,7 @@ void ft_board_setup(void *blob, bd_t *bd)
 
 	karo_fdt_fixup_touchpanel(blob, tx6_touchpanels,
 				ARRAY_SIZE(tx6_touchpanels));
-	karo_fdt_fixup_usb_otg(blob, "usbotg", "fsl,usbphy");
+	karo_fdt_fixup_usb_otg(blob, "usbotg", "fsl,usbphy", "vbus-supply");
 	karo_fdt_fixup_flexcan(blob, stk5_v5);
 
 	karo_fdt_update_fb_mode(blob, video_mode);