Skip to contentSkip to conversation

ARM: i.MX6: UDOO: rename watchdog function

PATCH In review Raphaël Poggi 2 participants 4 messages Feb 20, 2014 – Feb 24, 2014

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/3 ARM: i.MX6: UDOO: rename watchdog function

Rename the watchdog function to fit others functions names.

---
 arch/arm/boards/udoo/board.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
arch/arm/boards/udoo/board.c +6 -7
index 9027eb1..0a056fb 100644
@@ -147,7 +147,7 @@ static iomux_v3_cfg_t const wdog_pads[] = {
 
 #define WDT_EN      IMX_GPIO_NR(5, 4)
 #define WDT_TRG     IMX_GPIO_NR(3, 19)
-static void setup_iomux_wdog(void)
+static void udoo_wdog_init(void)
 {
 	mxc_iomux_v3_setup_multiple_pads(wdog_pads, ARRAY_SIZE(wdog_pads));
 	gpio_direction_output(WDT_TRG, 0);
@@ -157,11 +157,10 @@ static void setup_iomux_wdog(void)
 
 static void udoo_epit_init(void)
 {
-
-	writel(0x0000000, 0x20D0000);
-	writel(0x142000F, 0x20D0000);
-	writel(0x10000, 0x20D0008);
-	writel(0x0, 0x20D000C);
+	writel(0x0000000, MX6_EPIT1_BASE_ADDR);
+	writel(0x142000F, MX6_EPIT1_BASE_ADDR);
+	writel(0x30000, MX6_EPIT1_BASE_ADDR + 0x8);
+	writel(0x0, MX6_EPIT1_BASE_ADDR + 0xC);
 }
 
 static int udoo_devices_init(void)
@@ -169,7 +168,7 @@ static int udoo_devices_init(void)
 	if (!of_machine_is_compatible("udoo,imx6qdl-udoo"))
 		return 0;
 
-	setup_iomux_wdog();
+	udoo_wdog_init();
 	udoo_ehci_init();
 	udoo_epit_init();
 
Signature · 7 lines
1.8.3.2


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#1 lore raw

PATCH 2/3 ARM: i.MX6: UDOO: Add support of ethernet

Add the support of ethernet in device tree
and board file.

---
 arch/arm/boards/udoo/board.c   | 41 ++++++++++++++++-------------------------
 arch/arm/dts/imx6qdl-udoo.dtsi | 11 +++++++++++
 2 files changed, 27 insertions(+), 25 deletions(-)
arch/arm/boards/udoo/board.c +16 -25
index 0a056fb..3846d4b 100644
@@ -40,28 +40,20 @@
 #include <mach/usb.h>
 
 static iomux_v3_cfg_t udoo_enet_gpio_pads_1[] = {
-	MX6Q_PAD_ENET_MDIO__ENET_MDIO				| MUX_PAD_CTRL(MX6Q_ENET_PAD_CTRL),
-	MX6Q_PAD_ENET_MDC__ENET_MDC					| MUX_PAD_CTRL(MX6Q_ENET_PAD_CTRL),
-	MX6Q_PAD_RGMII_TXC__ENET_RGMII_TXC			| MUX_PAD_CTRL(MX6Q_ENET_PAD_CTRL),
-	MX6Q_PAD_RGMII_TD0__ENET_RGMII_TD0			| MUX_PAD_CTRL(MX6Q_ENET_PAD_CTRL),
-	MX6Q_PAD_RGMII_TD1__ENET_RGMII_TD1			| MUX_PAD_CTRL(MX6Q_ENET_PAD_CTRL),
-	MX6Q_PAD_RGMII_TD2__ENET_RGMII_TD2			| MUX_PAD_CTRL(MX6Q_ENET_PAD_CTRL),
-	MX6Q_PAD_RGMII_TD3__ENET_RGMII_TD3			| MUX_PAD_CTRL(MX6Q_ENET_PAD_CTRL),
-	MX6Q_PAD_RGMII_TX_CTL__ENET_RGMII_TX_CTL	| MUX_PAD_CTRL(MX6Q_ENET_PAD_CTRL),
-	MX6Q_PAD_ENET_REF_CLK__ENET_TX_CLK			| MUX_PAD_CTRL(MX6Q_ENET_PAD_CTRL),
-	MX6Q_PAD_RGMII_RXC__ENET_RGMII_RXC			| MUX_PAD_CTRL(MX6Q_ENET_PAD_CTRL),
 	/* RGMII reset */
+	MX6Q_PAD_EIM_D23__GPIO_3_23			| MUX_PAD_CTRL(NO_PAD_CTRL),
 	/* alimentazione ethernet*/
-	MX6Q_PAD_EIM_EB3__GPIO_2_31     | MUX_PAD_CTRL(NO_PAD_CTRL),
+	MX6Q_PAD_EIM_EB3__GPIO_2_31			| MUX_PAD_CTRL(NO_PAD_CTRL),
 	/* pin 32 - 1 - (MODE0) all */
-	MX6Q_PAD_RGMII_RD0__GPIO_6_25   | MUX_PAD_CTRL(NO_PAD_CTRL),
+	MX6Q_PAD_RGMII_RD0__GPIO_6_25		| MUX_PAD_CTRL(NO_PAD_CTRL),
 	/* pin 31 - 1 - (MODE1) all */
-	MX6Q_PAD_RGMII_RD1__GPIO_6_27   | MUX_PAD_CTRL(NO_PAD_CTRL),
+	MX6Q_PAD_RGMII_RD1__GPIO_6_27		| MUX_PAD_CTRL(NO_PAD_CTRL),
 	/* pin 28 - 1 - (MODE2) all */
-	MX6Q_PAD_RGMII_RD2__GPIO_6_28   | MUX_PAD_CTRL(NO_PAD_CTRL),
+	MX6Q_PAD_RGMII_RD2__GPIO_6_28		| MUX_PAD_CTRL(NO_PAD_CTRL),
 	/* pin 27 - 1 - (MODE3) all */
-	MX6Q_PAD_RGMII_RD3__GPIO_6_29   | MUX_PAD_CTRL(NO_PAD_CTRL),
+	MX6Q_PAD_RGMII_RD3__GPIO_6_29		| MUX_PAD_CTRL(NO_PAD_CTRL),
 	/* pin 33 - 1 - (CLK125_EN) 125Mhz clockout enabled */
+	MX6Q_PAD_RGMII_RX_CTL__GPIO_6_24	| MUX_PAD_CTRL(NO_PAD_CTRL),
 };
 
 static iomux_v3_cfg_t udoo_enet_gpio_pads_2[] = {
@@ -71,7 +63,7 @@ static iomux_v3_cfg_t udoo_enet_gpio_pads_2[] = {
 	MX6Q_PAD_RGMII_RD1__GPIO_6_27,          /* MODE1 */
 	MX6Q_PAD_RGMII_RD2__GPIO_6_28,          /* MODE2 */
 	MX6Q_PAD_RGMII_RD3__GPIO_6_29,          /* MODE3 */
-	MX6Q_PAD_RGMII_RX_CTL__GPIO_6_24,
+	MX6Q_PAD_RGMII_RX_CTL__ENET_RGMII_RX_CTL,
 };
 
 static int ksz9021rn_phy_fixup(struct phy_device *dev)
@@ -98,21 +90,20 @@ static int ksz9021rn_phy_fixup(struct phy_device *dev)
 
 static int udoo_ksz9021rn_setup(void)
 {
+	if (!of_machine_is_compatible("udoo,imx6qdl-udoo"))
+		   return 0;
+
 	mxc_iomux_v3_setup_multiple_pads(udoo_enet_gpio_pads_1,
 				  ARRAY_SIZE(udoo_enet_gpio_pads_1));
 
 	gpio_direction_output(IMX_GPIO_NR(2, 31) , 1); /* Power on enet */
 
 	/* MODE strap-in pins: advertise all capabilities */
-	gpio_direction_output(185, 1); /* GPIO 6-25 */
-	gpio_direction_output(187, 1); /* GPIO 6-27 */
-	gpio_direction_output(188, 1); /* GPIO 6-28*/
-	gpio_direction_output(189, 1); /* GPIO 6-29 */
-
-	mdelay(10);
-
-	/* Enable 125 MHz clock output */
-	gpio_direction_output(184, 1); /* GPIO 6-24 */
+	gpio_direction_output(IMX_GPIO_NR(6, 24), 1);
+	gpio_direction_output(IMX_GPIO_NR(6, 25), 1);
+	gpio_direction_output(IMX_GPIO_NR(6, 27), 1);
+	gpio_direction_output(IMX_GPIO_NR(6, 28), 1);
+	gpio_direction_output(IMX_GPIO_NR(6, 29), 1);
 
 	mdelay(100);
 
arch/arm/dts/imx6qdl-udoo.dtsi +11 -0
index 80ab2f7..8080235 100644
@@ -61,6 +61,13 @@
 	};
 };
 
+&fec {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_enet>;
+	phy-reset-gpios = <&gpio3 23 GPIO_ACTIVE_LOW>;
+	status = "okay";
+};
+
 &i2c1 {
 	clock-frequency = <100000>;
 	pinctrl-names = "default";
@@ -80,6 +87,10 @@
 			>;
 		};
 
+        pinctrl_enet: enetgrp {
+            fsl,pins = <MX6QDL_ENET_PINGRP_RGMII_MD(0x1b0b0, 0x1b0b0)>;
+        };
+
 		pinctrl_i2c1: i2c1grp {
 			fsl,pins = <MX6QDL_I2C1_PINGRP1>;
 		};
Signature · 7 lines
1.8.3.2


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#2 lore raw

PATCH 3/3 ARM: i.MX6: UDOO: rename UDOO image file

In reply to Raphaël Poggi

Rename the image file generated by barebox.

---
 images/Makefile.imx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
images/Makefile.imx +2 -2
index 3303ca7..a04fd45 100644
@@ -136,5 +136,5 @@ image-$(CONFIG_MACH_NITROGEN6X) += barebox-boundarydevices-imx6dl-nitrogen6x-1g.
 
 pblx-$(CONFIG_MACH_UDOO) += start_imx6_udoo
 CFG_start_imx6_udoo.pblx.imximg = $(board)/udoo/flash-header-mx6-udoo.imxcfg
-FILE_barebox-freescale-imx6q-udoo.img = start_imx6_udoo.pblx.imximg
-image-$(CONFIG_MACH_UDOO) += barebox-freescale-imx6q-udoo.img
+FILE_barebox-udoo-imx6q.img = start_imx6_udoo.pblx.imximg
+image-$(CONFIG_MACH_UDOO) += barebox-udoo-imx6q.img
Signature · 7 lines
1.8.3.2


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
maintainer
#3 lore raw
In reply to Raphaël Poggi

Hi Raphaël,

Quoted 24 lines · Raphaël Poggi

Rename the watchdog function to fit others functions names.

---
 arch/arm/boards/udoo/board.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
arch/arm/boards/udoo/board.c +1 -1
index 9027eb1..0a056fb 100644
@@ -147,7 +147,7 @@ static iomux_v3_cfg_t const wdog_pads[] = {
 
 #define WDT_EN      IMX_GPIO_NR(5, 4)
 #define WDT_TRG     IMX_GPIO_NR(3, 19)
-static void setup_iomux_wdog(void)
+static void udoo_wdog_init(void)
 {
 	mxc_iomux_v3_setup_multiple_pads(wdog_pads, ARRAY_SIZE(wdog_pads));
 	gpio_direction_output(WDT_TRG, 0);
@@ -157,11 +157,10 @@ static void setup_iomux_wdog(void)
 
 static void udoo_epit_init(void)
 {

arch/arm/boards/udoo/board.c static void setup_iomux_wdog(void) · line 164

Quoted 10 lines
arch/arm/boards/udoo/board.c +4 -5
-
-	writel(0x0000000, 0x20D0000);
-	writel(0x142000F, 0x20D0000);
-	writel(0x10000, 0x20D0008);
-	writel(0x0, 0x20D000C);
+	writel(0x0000000, MX6_EPIT1_BASE_ADDR);
+	writel(0x142000F, MX6_EPIT1_BASE_ADDR);
+	writel(0x30000, MX6_EPIT1_BASE_ADDR + 0x8);
+	writel(0x0, MX6_EPIT1_BASE_ADDR + 0xC);
 }

This is an unrelated change which shouldn't be in this patch. I squashed this series in the original commit adding udoo support anyway. so it doesn't matter in this case.
BTW what does this EPIT initialization do and what do you need it for? It's quite unusual to initialize the EPIT since it's not used by barebox.

Sascha

Quoted 20 lines
arch/arm/boards/udoo/board.c +1 -1
 static int udoo_devices_init(void)
@@ -169,7 +168,7 @@ static int udoo_devices_init(void)
 	if (!of_machine_is_compatible("udoo,imx6qdl-udoo"))
 		return 0;
 
-	setup_iomux_wdog();
+	udoo_wdog_init();
 	udoo_ehci_init();
 	udoo_epit_init();
 
Signature · 7 lines
1.8.3.2


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
Signature · 9 lines
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox