D21016.id60577.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D21016.id60577.diff
View Options

	Index: stand/efi/loader/copy.c
	===================================================================
	--- stand/efi/loader/copy.c
	+++ stand/efi/loader/copy.c
	@@ -178,6 +178,8 @@
	#ifndef EFI_STAGING_SIZE
	#if defined(__amd64__)
	#define EFI_STAGING_SIZE 100
	+#elif defined(__arm__)
	+#define EFI_STAGING_SIZE 32
	#else
	#define EFI_STAGING_SIZE 64
	#endif
	Index: sys/arm/allwinner/aw_usbphy.c
	===================================================================
	--- sys/arm/allwinner/aw_usbphy.c
	+++ sys/arm/allwinner/aw_usbphy.c
	@@ -182,18 +182,6 @@
	#define PMU_ULPI_BYPASS (1 << 0)
	#define PMU_UNK_H3 0x10
	#define PMU_UNK_H3_CLR 0x2
	-#define PHY_CSR 0x00
	-#define ID_PULLUP_EN (1 << 17)
	-#define DPDM_PULLUP_EN (1 << 16)
	-#define FORCE_ID (0x3 << 14)
	-#define FORCE_ID_SHIFT 14
	-#define FORCE_ID_LOW 2
	-#define FORCE_VBUS_VALID (0x3 << 12)
	-#define FORCE_VBUS_VALID_SHIFT 12
	-#define FORCE_VBUS_VALID_HIGH 3
	-#define VBUS_CHANGE_DET (1 << 6)
	-#define ID_CHANGE_DET (1 << 5)
	-#define DPDM_CHANGE_DET (1 << 4)

	static void
	awusbphy_configure(device_t dev, int phyno)
	@@ -417,6 +405,8 @@
	return (EINVAL);
	return (0);
	}
	+
	+ device_printf(dev, "phy mode %d\n", mode);

	switch (mode) {
	case PHY_USB_MODE_HOST:
	@@ -441,7 +431,14 @@
	}
	break;
	case PHY_USB_MODE_OTG:
	- /* TODO */
	+ /*
	+ * What do we need to do?
	+ * - configure otg
	+ * - route otg
	+ * - enable the vbus line (probably not)
	+ *
	+ */
	+ //SET4(sc->phy_ctrl, OTG_PHY_CFG, OTG_PHY_ROUTE_OTG);
	break;
	}