Skip to contentSkip to conversation

ARM: dts: Convert DuoVero Parlor to use IOPAD macro

PATCH In review Joachim Eastwood 2 participants 4 messages May 17, 2014 – May 19, 2014 Device tree bindings

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 ARM: dts: Convert DuoVero Parlor to use IOPAD macro

Conversion done by following awk script.

/0x[0-9a-f]{1,3} \(PIN/ {
	offset = sprintf("OMAP4_IOPAD(0x%03x, ", strtonum($1) + 64)
	sub(/0x[0-9a-f]{1,3} \(/, offset, $0)
	print $0
	next
}

{ print $0 }

---

Hi,

Checked md5sum before and after patch and the resulting dtb is the same. So this should be safe.

 arch/arm/boot/dts/omap4-duovero-parlor.dts | 18 +++----
 arch/arm/boot/dts/omap4-duovero.dtsi       | 84 +++++++++++++++---------------
 2 files changed, 51 insertions(+), 51 deletions(-)
arch/arm/boot/dts/omap4-duovero-parlor.dts +9 -9
index 96f51d870812..cd53a64d8f2e 100644
@@ -46,35 +46,35 @@
 
 	led_pins: pinmux_led_pins {
 		pinctrl-single,pins = <
-			0xd6 (PIN_OUTPUT | MUX_MODE3)		/* abe_dmic_din3.gpio_122 */
+			OMAP4_IOPAD(0x116, PIN_OUTPUT | MUX_MODE3)		/* abe_dmic_din3.gpio_122 */
 		>;
 	};
 
 	button_pins: pinmux_button_pins {
 		pinctrl-single,pins = <
-			0xd4 (PIN_INPUT_PULLUP | MUX_MODE3)	/* abe_dmic_din2.gpio_121 */
+			OMAP4_IOPAD(0x114, PIN_INPUT_PULLUP | MUX_MODE3)	/* abe_dmic_din2.gpio_121 */
 		>;
 	};
 
 	i2c2_pins: pinmux_i2c2_pins {
 		pinctrl-single,pins = <
-			0xe6 (PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c2_scl */
-			0xe8 (PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c2_sda */
+			OMAP4_IOPAD(0x126, PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c2_scl */
+			OMAP4_IOPAD(0x128, PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c2_sda */
 		>;
 	};
 
 	i2c3_pins: pinmux_i2c3_pins {
 		pinctrl-single,pins = <
-			0xea (PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c3_scl */
-			0xec (PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c3_sda */
+			OMAP4_IOPAD(0x12a, PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c3_scl */
+			OMAP4_IOPAD(0x12c, PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c3_sda */
 		>;
 	};
 
 	smsc_pins: pinmux_smsc_pins {
 		pinctrl-single,pins = <
-			0x28 (PIN_INPUT | MUX_MODE3)		/* gpmc_a20.gpio_44: IRQ */
-			0x2a (PIN_INPUT_PULLUP | MUX_MODE3)	/* gpmc_a21.gpio_45: nReset */
-			0x30 (PIN_INPUT_PULLUP | MUX_MODE3)	/* gpmc_a24.gpio_48: amdix enabled */
+			OMAP4_IOPAD(0x068, PIN_INPUT | MUX_MODE3)		/* gpmc_a20.gpio_44: IRQ */
+			OMAP4_IOPAD(0x06a, PIN_INPUT_PULLUP | MUX_MODE3)	/* gpmc_a21.gpio_45: nReset */
+			OMAP4_IOPAD(0x070, PIN_INPUT_PULLUP | MUX_MODE3)	/* gpmc_a24.gpio_48: amdix enabled */
 		>;
 	};
 };
arch/arm/boot/dts/omap4-duovero.dtsi +42 -42

135 lines not on this page · raw message

Signature · 1 line
1.8.0
#1 lore raw

PATCH 2/2 ARM: dts: Enable mcpdm and mcbsp1 on DuoVero

Since commit 7adb0933b18debef3 (ARM: dts: omap4: Set all audio related IP's status to disabled as default) all audio related device are disabled by default. Most boards were updated to enable devices explicitly, but DuoVero was missed.

mcpdm is used for twl6040 and mcbsp1 is used for BlueTooth audio.

---

Hi,

Only compile tested.

 arch/arm/boot/dts/omap4-duovero.dtsi | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)
arch/arm/boot/dts/omap4-duovero.dtsi +12 -2
index cc68a3b58648..e860ccd9d09c 100644
@@ -67,8 +67,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <
 			&twl6040_pins
-			&mcpdm_pins
-			&mcbsp1_pins
 			&hsusbb1_pins
 	>;
 
@@ -202,6 +200,18 @@
 	clock-frequency = <400000>;
 };
 
+&mcbsp1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&mcbsp1_pins>;
+	status = "okay";
+};
+
+&mcpdm {
+	pinctrl-names = "default";
+	pinctrl-0 = <&mcpdm_pins>;
+	status = "okay";
+};
+
 &mmc1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&mmc1_pins>;
Signature · 1 line
1.8.0
#2 lore raw

Re: [PATCH 2/2] ARM: dts: Enable mcpdm and mcbsp1 on DuoVero

Quoted 4 lines · Joachim Eastwood

Since commit 7adb0933b18debef3 (ARM: dts: omap4: Set all audio related IP's status to disabled as default) all audio related device are disabled by default. Most boards were updated to enable devices explicitly, but DuoVero was missed.

OK

Quoted 1 line

mcpdm is used for twl6040 and mcbsp1 is used for BlueTooth audio.

OK, applying into omap-for-v3.16/dt.

Tony

#3 lore raw
In reply to Joachim Eastwood
Quoted 9 lines · Joachim Eastwood

Conversion done by following awk script.

/0x[0-9a-f]{1,3} \(PIN/ {
	offset = sprintf("OMAP4_IOPAD(0x%03x, ", strtonum($1) + 64)
	sub(/0x[0-9a-f]{1,3} \(/, offset, $0)
	print $0
	next
}

{ print $0 }

Quoted 8 lines

---

Hi,

Checked md5sum before and after patch and the resulting dtb is the same. So this should be safe.

OK thanks applying into omap-for-v3.16/dt.

Regards,

Tony