diff --git a/package/kernel/lantiq/ltq-adsl/Makefile b/package/kernel/lantiq/ltq-adsl/Makefile index b2e1ccb640..31874acaca 100644 --- a/package/kernel/lantiq/ltq-adsl/Makefile +++ b/package/kernel/lantiq/ltq-adsl/Makefile @@ -46,6 +46,9 @@ IFX_DSL_MAX_DEVICE=1 IFX_DSL_LINES_PER_DEVICE=1 IFX_DSL_CHANNELS_PER_LINE=1 +MAKE_FLAGS += \ + $(KERNEL_MAKE_FLAGS) + CONFIGURE_ARGS += --enable-kernel-include="$(LINUX_DIR)/include" \ --with-max-device="$(IFX_DSL_MAX_DEVICE)" \ --with-lines-per-device="$(IFX_DSL_LINES_PER_DEVICE)" \ diff --git a/package/kernel/lantiq/ltq-atm/Makefile b/package/kernel/lantiq/ltq-atm/Makefile index 89a3328cf8..f675269ca3 100644 --- a/package/kernel/lantiq/ltq-atm/Makefile +++ b/package/kernel/lantiq/ltq-atm/Makefile @@ -36,7 +36,7 @@ endef define Build/Compile cd $(LINUX_DIR); \ ARCH=mips CROSS_COMPILE="$(KERNEL_CROSS)" \ - $(MAKE) BUILD_VARIANT=$(BUILD_VARIANT) M=$(PKG_BUILD_DIR) V=1 modules + $(MAKE) $(KERNEL_MAKE_FLAGS) BUILD_VARIANT=$(BUILD_VARIANT) M=$(PKG_BUILD_DIR) V=1 modules endef $(eval $(call KernelPackage,ltq-atm-danube)) diff --git a/package/kernel/lantiq/ltq-ifxos/Makefile b/package/kernel/lantiq/ltq-ifxos/Makefile index 4a368309d3..e98cb21eff 100644 --- a/package/kernel/lantiq/ltq-ifxos/Makefile +++ b/package/kernel/lantiq/ltq-ifxos/Makefile @@ -16,6 +16,7 @@ PKG_HASH:=ed7fe39311d7a4a13d23ed0ae2445c0d825b472b5a98da9b72bcaabcf5ed2d5f PKG_MAINTAINER:=John Crispin PKG_LICENSE:=GPL-2.0 BSD-2-Clause PKG_LICENSE_FILES:=LICENSE +PKG_EXTMOD_SUBDIRS:=src PKG_FIXUP:=autoreconf diff --git a/package/kernel/lantiq/ltq-ptm/Makefile b/package/kernel/lantiq/ltq-ptm/Makefile index d7c2a7aa61..33a23d6853 100644 --- a/package/kernel/lantiq/ltq-ptm/Makefile +++ b/package/kernel/lantiq/ltq-ptm/Makefile @@ -45,7 +45,7 @@ endef define Build/Compile cd $(LINUX_DIR); \ ARCH=mips CROSS_COMPILE="$(KERNEL_CROSS)" \ - $(MAKE) BUILD_VARIANT=$(BUILD_VARIANT) M=$(PKG_BUILD_DIR) V=1 modules + $(MAKE) $(KERNEL_MAKE_FLAGS) BUILD_VARIANT=$(BUILD_VARIANT) M=$(PKG_BUILD_DIR) V=1 modules endef $(eval $(call KernelPackage,ltq-ptm-danube)) diff --git a/package/kernel/lantiq/ltq-tapi/Makefile b/package/kernel/lantiq/ltq-tapi/Makefile index a04f7d38e5..77728644f6 100644 --- a/package/kernel/lantiq/ltq-tapi/Makefile +++ b/package/kernel/lantiq/ltq-tapi/Makefile @@ -19,6 +19,7 @@ PKG_MAINTAINER:=John Crispin PKG_CHECK_FORMAT_SECURITY:=0 PKG_FIXUP:=autoreconf +PKG_EXTMOD_SUBDIRS:=src include $(INCLUDE_DIR)/package.mk @@ -39,6 +40,9 @@ define KernelPackage/ltq-tapi/config source "$(SOURCE)/Config.in" endef +MAKE_FLAGS += \ + $(KERNEL_MAKE_FLAGS) + CONFIGURE_ARGS += \ ARCH=$(LINUX_KARCH) \ --enable-linux-26 \ diff --git a/package/kernel/lantiq/ltq-vdsl-mei/Makefile b/package/kernel/lantiq/ltq-vdsl-mei/Makefile index 4a305d9c27..8e52d20a72 100644 --- a/package/kernel/lantiq/ltq-vdsl-mei/Makefile +++ b/package/kernel/lantiq/ltq-vdsl-mei/Makefile @@ -21,6 +21,7 @@ PKG_FLAGS:=nonshared PKG_MAINTAINER:=John Crispin PKG_LICENSE:=GPL-2.0 BSD-2-Clause PKG_LICENSE_FILES:=LICENSE +PKG_EXTMOD_SUBDIRS:=src include $(INCLUDE_DIR)/package.mk @@ -52,6 +53,7 @@ define Package/ltq-vdsl-mei-test/description endef MAKE_FLAGS += \ + $(KERNEL_MAKE_FLAGS) \ SHELL="$(BASH)" CONFIGURE_ARGS += \ diff --git a/package/kernel/lantiq/ltq-vdsl/Makefile b/package/kernel/lantiq/ltq-vdsl/Makefile index c09c88057f..047543496e 100644 --- a/package/kernel/lantiq/ltq-vdsl/Makefile +++ b/package/kernel/lantiq/ltq-vdsl/Makefile @@ -42,6 +42,7 @@ define Package/ltq-vdsl-vr9/description endef MAKE_FLAGS += \ + $(KERNEL_MAKE_FLAGS) \ SHELL="$(BASH)" CONFIGURE_ARGS += --enable-kernel-include="$(LINUX_DIR)/include" \ diff --git a/package/kernel/lantiq/ltq-vmmc/Makefile b/package/kernel/lantiq/ltq-vmmc/Makefile index c733345cfa..c96cee819b 100644 --- a/package/kernel/lantiq/ltq-vmmc/Makefile +++ b/package/kernel/lantiq/ltq-vmmc/Makefile @@ -39,6 +39,9 @@ define KernelPackage/ltq-vmmc/config source "$(SOURCE)/Config.in" endef +MAKE_FLAGS += \ + $(KERNEL_MAKE_FLAGS) + CONFIGURE_ARGS += \ ARCH=$(LINUX_KARCH) \ --enable-linux-26 \ diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts index 9fbac6fa12..5f38936577 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts @@ -69,6 +69,30 @@ gpios = <&gpio 45 GPIO_ACTIVE_LOW>; }; }; + + usb0_vbus: regulator-usb0-vbus { + compatible = "regulator-fixed"; + + regulator-name = "USB0_VBUS"; + + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + + gpio = <&gpio 50 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + + usb1_vbus: regulator-usb1-vbus { + compatible = "regulator-fixed"; + + regulator-name = "USB1_VBUS"; + + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + + gpio = <&gpio 51 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; }; &gsw { @@ -77,6 +101,26 @@ mtd-mac-address-increment = <(-2)>; }; +&gpio { + pinctrl-names = "default"; + pinctrl-0 = <&state_default>; + + state_default: pinmux { + usb0_vbus { + lantiq,pins = "io50"; + lantiq,pull = <0>; + lantiq,open-drain = <0>; + lantiq,output = <1>; + }; + usb1_vbus { + lantiq,pins = "io51"; + lantiq,pull = <0>; + lantiq,open-drain = <0>; + lantiq,output = <1>; + }; + }; +}; + &localbus { flash@0 { compatible = "lantiq,nor"; @@ -142,8 +186,10 @@ &usb0 { status = "okay"; + vbus-supply = <&usb0_vbus>; }; &usb1 { status = "okay"; + vbus-supply = <&usb1_vbus>; };