diff --git a/FunKey/board/funkey/linux.config b/FunKey/board/funkey/linux.config index 5819db4..40c9839 100644 --- a/FunKey/board/funkey/linux.config +++ b/FunKey/board/funkey/linux.config @@ -66,7 +66,6 @@ CONFIG_I2C_CHARDEV=y CONFIG_I2C_MV64XXX=y CONFIG_SPI=y CONFIG_SPI_SUN6I=y -CONFIG_PTP_1588_CLOCK=y CONFIG_GPIO_SYSFS=y CONFIG_POWER_SUPPLY=y CONFIG_THERMAL=y @@ -90,26 +89,18 @@ CONFIG_BACKLIGHT_PWM=y CONFIG_LOGO=y CONFIG_SOUND=y CONFIG_SND=y -# CONFIG_SND_DRIVERS is not set -# CONFIG_SND_ARM is not set -# CONFIG_SND_SPI is not set CONFIG_SND_SOC=y CONFIG_SND_SUN4I_CODEC=y CONFIG_SND_SUN8I_CODEC=y CONFIG_SND_SUN8I_CODEC_ANALOG=y -# CONFIG_HID_GENERIC is not set -# CONFIG_HID_A4TECH is not set -# CONFIG_HID_APPLE is not set -# CONFIG_HID_BELKIN is not set -# CONFIG_HID_CHERRY is not set -# CONFIG_HID_CHICONY is not set -# CONFIG_HID_CYPRESS is not set -# CONFIG_HID_EZKEY is not set -# CONFIG_HID_ITE is not set -# CONFIG_HID_KENSINGTON is not set -# CONFIG_HID_LOGITECH is not set -# CONFIG_HID_MICROSOFT is not set -# CONFIG_HID_MONTEREY is not set +CONFIG_USB=y +CONFIG_USB_OTG=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_HCD_PLATFORM=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_HCD_PLATFORM=y +CONFIG_USB_MUSB_HDRC=y +CONFIG_USB_MUSB_SUNXI=y CONFIG_NOP_USB_XCEIV=y CONFIG_USB_GADGET=y CONFIG_USB_ETH=m diff --git a/FunKey/board/funkey/patches/linux/a/arch/arm/boot/dts/sun8i-v3s-funkey.dts b/FunKey/board/funkey/patches/linux/a/arch/arm/boot/dts/sun8i-v3s-funkey.dts index bbc32f5..a564318 100644 --- a/FunKey/board/funkey/patches/linux/a/arch/arm/boot/dts/sun8i-v3s-funkey.dts +++ b/FunKey/board/funkey/patches/linux/a/arch/arm/boot/dts/sun8i-v3s-funkey.dts @@ -103,6 +103,12 @@ status = "okay"; }; +&pwm { + pinctrl-names = "default"; + pinctrl-0 = <&pwm0_pins>; + status = "okay"; +}; + #include "axp209.dtsi" ®_dcdc2 { @@ -156,8 +162,11 @@ status = "okay"; }; -&pwm { - pinctrl-names = "default"; - pinctrl-0 = <&pwm0_pins>; - status = "okay"; +&usb_otg { + dr_mode = "peripheral"; + status = "okay"; +}; + +&usbphy { + status = "okay"; }; diff --git a/buildroot b/buildroot index 4fa5241..67ab484 160000 --- a/buildroot +++ b/buildroot @@ -1 +1 @@ -Subproject commit 4fa524144bd2019f98159f21802de08be7b5bea0 +Subproject commit 67ab484206c991174a59601fa978a620d35a9d9a