Skip to contentSkip to conversation

ARM: dts: omap3-pandora: miscellaneous corrections

PATCH New Grazvydas Ignotas 2 participants 5 messages Jul 21, 2015

Subsystems (4)
Device tree bindings Arm (32-bit) Arm sub-architectures OMAP2+ support
lore
Share & tools
lore

Grazvydas Ignotas

author
#0 lore raw

PATCH 1/4 ARM: dts: omap3-pandora: miscellaneous corrections

- add pandora specific compatible name
- fix mmc2 card detect polarity
- fix mmc1 and mmc2 write protect polarity
- disable write protect pins because of production issue and add an explanation why they are disabled
- fix NAND partition name to reflect the correct address

Signed-off-by Grazvydas Ignotas <[email protected]>
---
 arch/arm/boot/dts/omap3-pandora-1ghz.dts    |  2 +-
 arch/arm/boot/dts/omap3-pandora-600mhz.dts  |  2 +-
 arch/arm/boot/dts/omap3-pandora-common.dtsi | 13 +++++++++----
 3 files changed, 11 insertions(+), 6 deletions(-)
arch/arm/boot/dts/omap3-pandora-1ghz.dts +1 -1
index 9619a28..25498f7 100644
@@ -19,7 +19,7 @@
 / {
 	model = "Pandora Handheld Console 1GHz";
 
-	compatible = "ti,omap36xx", "ti,omap3";
+	compatible = "openpandora,omap3-pandora-1ghz", "ti,omap36xx", "ti,omap3";
 };
 
 &omap3_pmx_core2 {
arch/arm/boot/dts/omap3-pandora-600mhz.dts +1 -1
index fb803a7..8775897 100644
@@ -19,7 +19,7 @@
 / {
 	model = "Pandora Handheld Console";
 
-	compatible = "ti,omap3";
+	compatible = "openpandora,omap3-pandora-600mhz", "ti,omap3430", "ti,omap3";
 };
 
 &omap3_pmx_core2 {
arch/arm/boot/dts/omap3-pandora-common.dtsi +9 -4
index 782ab1f..f6363bc 100644
@@ -459,13 +459,18 @@
 	power = <50>;
 };
 
+/*
+ * Many pandora boards have been produced with defective write-protect switches
+ * on either slot, so it was decided not to use this feature. If you know
+ * your board has good switches, feel free to uncomment wp-gpios below.
+ */
 &mmc1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&mmc1_pins>;
 	vmmc-supply = <&vmmc1>;
 	bus-width = <4>;
 	cd-gpios = <&twl_gpio 0 GPIO_ACTIVE_LOW>;
-	wp-gpios = <&gpio4 30 GPIO_ACTIVE_LOW>;	/* GPIO_126 */
+	/*wp-gpios = <&gpio4 30 GPIO_ACTIVE_HIGH>;*/	/* GPIO_126 */
 };
 
 &mmc2 {

@@ -473,8 +478,8 @@
 	pinctrl-0 = <&mmc2_pins>;
 	vmmc-supply = <&vmmc2>;
 	bus-width = <4>;
-	cd-gpios = <&twl_gpio 1 GPIO_ACTIVE_HIGH>;
-	wp-gpios = <&gpio4 31 GPIO_ACTIVE_LOW>;	/* GPIO_127 */
+	cd-gpios = <&twl_gpio 1 GPIO_ACTIVE_LOW>;
+	/*wp-gpios = <&gpio4 31 GPIO_ACTIVE_HIGH>;*/	/* GPIO_127 */
 };
 
 /* bluetooth*/

@@ -545,7 +550,7 @@
 			reg = <0x280000 0xa00000>;
 		};
 
-		filesystem at 680000 {
+		filesystem at c80000 {
 			label = "rootfs";
 			reg = <0xc80000 0>;	/* 0 = MTDPART_SIZ_FULL */
 		};
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 2/4 ARM: dts: omap3-pandora: add support for usb host and 32k buffer

This adds missing bits for EHCI HS USB host support and 32k clock buffer control for the wg7210 bt+wifi module.

Signed-off-by Grazvydas Ignotas <[email protected]>
---
 arch/arm/boot/dts/omap3-pandora-common.dtsi | 36 +++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
arch/arm/boot/dts/omap3-pandora-common.dtsi +36 -0
index f6363bc..6e82c4a 100644
@@ -199,6 +199,38 @@
 			gpios = <&gpio4 12 GPIO_ACTIVE_HIGH>;   /* GPIO_108 */
 		};
 	};
+
+	/* HS USB Host PHY on PORT 2 */
+	hsusb2_phy: hsusb2_phy {
+		compatible = "usb-nop-xceiv";
+		reset-gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; /* GPIO_16 */
+		vcc-supply = <&vaux2>;
+	};
+
+	/* HS USB Host VBUS supply
+	 * disabling this regulator causes current leakage, and LCD flicker
+	 * on earlier (CC) board revisions, so keep it always on */
+	usb_host_5v: fixed-regulator-usb_host_5v {
+		compatible = "regulator-fixed";
+		regulator-name = "usb_host_5v";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		regulator-always-on;
+		regulator-boot-on;
+		enable-active-high;
+		gpio = <&gpio6 4 0>;	/* GPIO_164 */
+	};
+
+	/* wg7210 (wifi+bt module) 32k clock buffer */
+	wg7210_32k: fixed-regulator-wg7210_32k {
+		compatible = "regulator-fixed";
+		regulator-name = "wg7210_32k";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		regulator-always-on;
+		enable-active-high;
+		gpio = <&twl_gpio 13 GPIO_ACTIVE_HIGH>;
+	};
 };
 
 &omap3_pmx_core {

@@ -501,6 +533,10 @@
 	port2-mode = "ehci-phy";
 };
 
+&usbhsehci {
+	phys = <0 &hsusb2_phy>;
+};
+
 &gpmc {
 	ranges = <0 0 0x30000000 0x1000000>; /* CS0: 16MB for NAND */
Signature · 1 line
1.9.1
author
#2 lore raw

PATCH 3/4 ARM: OMAP2+: omap3-pandora: add backlight support

In reply to Grazvydas Ignotas

Add backlight support via pdata-quirks as it's driver lacks DT support.

Signed-off-by Grazvydas Ignotas <[email protected]>
---
 arch/arm/mach-omap2/pdata-quirks.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
arch/arm/mach-omap2/pdata-quirks.c +12 -0
index 821171c..3c97aa49 100644
@@ -268,6 +268,16 @@ static void __init omap3_tao3530_legacy_init(void)
 {
 	hsmmc2_internal_input_clk();
 }
+
+static struct platform_device pandora_backlight = {
+	.name	= "pandora-backlight",
+	.id	= -1,
+};
+
+static void __init omap3_pandora_legacy_init(void)
+{
+	platform_device_register(&pandora_backlight);
+}
 #endif /* CONFIG_ARCH_OMAP3 */
 
 #if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5)

@@ -381,6 +391,8 @@ static struct pdata_init pdata_quirks[] __initdata = {
 	{ "ti,omap3-evm-37xx", omap3_evm_legacy_init, },
 	{ "ti,am3517-evm", am3517_evm_legacy_init, },
 	{ "technexion,omap3-tao3530", omap3_tao3530_legacy_init, },
+	{ "openpandora,omap3-pandora-600mhz", omap3_pandora_legacy_init, },
+	{ "openpandora,omap3-pandora-1ghz", omap3_pandora_legacy_init, },
 #endif
 #ifdef CONFIG_SOC_OMAP5
 	{ "ti,omap5-uevm", omap5_uevm_legacy_init, },
Signature · 1 line
1.9.1
author
#3 lore raw

PATCH 4/4 ARM: OMAP2+: omap3-pandora: add wifi support

In reply to Grazvydas Ignotas

Add wl1251 support via pdata-quirks as it's driver lacks DT support. MMC3 is marked disabled in DT so that MMC3 instance of hsmmc driver is probed using platform data with special card init callback.

Signed-off-by Grazvydas Ignotas <[email protected]>
---
 arch/arm/boot/dts/omap3-pandora-common.dtsi |   5 ++
 arch/arm/mach-omap2/pdata-quirks.c          | 101 ++++++++++++++++++++++++++++
 2 files changed, 106 insertions(+)
arch/arm/boot/dts/omap3-pandora-common.dtsi +5 -0
index 6e82c4a..f2084e6 100644
@@ -514,6 +514,11 @@
 	/*wp-gpios = <&gpio4 31 GPIO_ACTIVE_HIGH>;*/	/* GPIO_127 */
 };
 
+/* mmc3 is probed using pdata-quirks to pass wl1251 card data */
+&mmc3 {
+	status = "disabled";
+};
+
 /* bluetooth*/
 &uart1 {
 };
arch/arm/mach-omap2/pdata-quirks.c +101 -0

127 lines not on this page · raw message

Signature · 1 line
1.9.1
maintainer
#4 lore raw

PATCH 1/4 ARM: dts: omap3-pandora: miscellaneous corrections

In reply to Grazvydas Ignotas
Quoted 6 lines · Grazvydas Ignotas

- add pandora specific compatible name
- fix mmc2 card detect polarity
- fix mmc1 and mmc2 write protect polarity
- disable write protect pins because of production issue and add an explanation why they are disabled
- fix NAND partition name to reflect the correct address

Thanks applying all four into omap-for-v4.3/dt and also now adding the dropping of the legacy board file into Linux next.

Regards,

Tony