Commit 91345210 authored by Angus Ainslie (Purism)'s avatar Angus Ainslie (Purism)

Merge branch 'f/4.18/fixes' into imx8-4.18-wip

parents 0446e8d8 bcf76ada
...@@ -77,22 +77,13 @@ ...@@ -77,22 +77,13 @@
enable-active-high; enable-active-high;
regulator-always-on; regulator-always-on;
}; };
bt_pwr_en: bt_en {
compatible = "regulator-fixed";
regulator-name = "BT_EN";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
gpio = <&gpio3 11 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
}; };
modem_reset: modem_reset { modem_reset: modem_reset {
compatible = "gpio-reset"; compatible = "gpio-reset";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_modem_reset>; pinctrl-0 = <&pinctrl_modem_reset>;
reset-gpios = <&gpio3 6 GPIO_ACTIVE_LOW>; reset-gpios = <&gpio3 9 GPIO_ACTIVE_LOW>;
reset-delay-us = <2000>; reset-delay-us = <2000>;
reset-post-delay-ms = <40>; reset-post-delay-ms = <40>;
#reset-cells = <0>; #reset-cells = <0>;
...@@ -167,7 +158,7 @@ ...@@ -167,7 +158,7 @@
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpio_leds>, <&pinctrl_mute>, <&pinctrl_micsel>; pinctrl-0 = <&pinctrl_gpio_leds>, <&pinctrl_mute>, <&pinctrl_micsel>, <&pinctrl_pwr_en>;
status = "okay"; status = "okay";
led1 { led1 {
...@@ -277,6 +268,12 @@ ...@@ -277,6 +268,12 @@
>; >;
}; };
pinctrl_pwr_en: pwr_engrp {
fsl,pins = <
MX8MQ_IOMUXC_GPIO1_IO08_GPIO1_IO8 0x06
>;
};
pinctrl_wwan: wwan_grp { pinctrl_wwan: wwan_grp {
fsl,pins = < fsl,pins = <
MX8MQ_IOMUXC_NAND_CE3_B_GPIO3_IO4 0x49 /* nWWAN_DISABLE */ MX8MQ_IOMUXC_NAND_CE3_B_GPIO3_IO4 0x49 /* nWWAN_DISABLE */
...@@ -396,10 +393,17 @@ ...@@ -396,10 +393,17 @@
>; >;
}; };
pinctrl_modem_reset: modem_resetgrp { pinctrl_bt: btgrp {
fsl,pins = < fsl,pins = <
/* BT_REG_ON */ /* BT_REG_ON */
MX8MQ_IOMUXC_NAND_DATA00_GPIO3_IO6 0x19 MX8MQ_IOMUXC_NAND_DATA05_GPIO3_IO11 0x16 /* nBT_DISABLE */
MX8MQ_IOMUXC_NAND_DATA01_GPIO3_IO7 0x10 /* BT_HOST_WAKE */
>;
};
pinctrl_modem_reset: modem_reset {
fsl,pins = <
MX8MQ_IOMUXC_NAND_DATA03_GPIO3_IO9 0x19 /* WWAN_RESET */
>; >;
}; };
...@@ -657,6 +661,7 @@ ...@@ -657,6 +661,7 @@
phy-handle = <&ethphy0>; phy-handle = <&ethphy0>;
fsl,magic-packet; fsl,magic-packet;
status = "okay"; status = "okay";
phy-supply = <&reg_pwr_en>;
mdio { mdio {
#address-cells = <1>; #address-cells = <1>;
...@@ -673,7 +678,7 @@ ...@@ -673,7 +678,7 @@
}; };
&i2c1 { &i2c1 {
clock-frequency = <100000>; clock-frequency = <400000>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c1>; pinctrl-0 = <&pinctrl_i2c1>;
status = "okay"; status = "okay";
...@@ -989,7 +994,7 @@ ...@@ -989,7 +994,7 @@
&uart4 { /* BT */ &uart4 { /* BT */
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart4>; pinctrl-0 = <&pinctrl_uart4>, <&pinctrl_bt>;
assigned-clocks = <&clk IMX8MQ_CLK_UART4_SRC>; assigned-clocks = <&clk IMX8MQ_CLK_UART4_SRC>;
assigned-clock-parents = <&clk IMX8MQ_CLK_25M>; assigned-clock-parents = <&clk IMX8MQ_CLK_25M>;
fsl,uart-has-rtscts; fsl,uart-has-rtscts;
......
...@@ -1104,7 +1104,7 @@ CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y ...@@ -1104,7 +1104,7 @@ CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
CONFIG_WANT_DEV_COREDUMP=y CONFIG_WANT_DEV_COREDUMP=y
CONFIG_ALLOW_DEV_COREDUMP=y CONFIG_ALLOW_DEV_COREDUMP=y
CONFIG_DEV_COREDUMP=y CONFIG_DEV_COREDUMP=y
CONFIG_DEBUG_DRIVER=y # CONFIG_DEBUG_DRIVER is not set
CONFIG_DEBUG_DEVRES=y CONFIG_DEBUG_DEVRES=y
# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
...@@ -1256,7 +1256,9 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 ...@@ -1256,7 +1256,9 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
# CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_NBD is not set
# CONFIG_BLK_DEV_SKD is not set # CONFIG_BLK_DEV_SKD is not set
# CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_SX8 is not set
# CONFIG_BLK_DEV_RAM is not set CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=4096
# CONFIG_CDROM_PKTCDVD is not set # CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set # CONFIG_ATA_OVER_ETH is not set
# CONFIG_VIRTIO_BLK is not set # CONFIG_VIRTIO_BLK is not set
...@@ -1748,7 +1750,7 @@ CONFIG_RSI_91X=m ...@@ -1748,7 +1750,7 @@ CONFIG_RSI_91X=m
CONFIG_RSI_DEBUGFS=y CONFIG_RSI_DEBUGFS=y
CONFIG_RSI_SDIO=m CONFIG_RSI_SDIO=m
# CONFIG_RSI_USB is not set # CONFIG_RSI_USB is not set
# CONFIG_RSI_BT_ALONE is not set CONFIG_RSI_BT_ALONE=y
CONFIG_RSI_COEX_MODE=y CONFIG_RSI_COEX_MODE=y
CONFIG_RSI_WOW=y CONFIG_RSI_WOW=y
# CONFIG_RSI_P2P is not set # CONFIG_RSI_P2P is not set
...@@ -3163,6 +3165,7 @@ CONFIG_SND=y ...@@ -3163,6 +3165,7 @@ CONFIG_SND=y
CONFIG_SND_TIMER=y CONFIG_SND_TIMER=y
CONFIG_SND_PCM=y CONFIG_SND_PCM=y
CONFIG_SND_DMAENGINE_PCM=y CONFIG_SND_DMAENGINE_PCM=y
CONFIG_SND_RAWMIDI=m
CONFIG_SND_JACK=y CONFIG_SND_JACK=y
CONFIG_SND_JACK_INPUT_DEV=y CONFIG_SND_JACK_INPUT_DEV=y
# CONFIG_SND_OSSEMUL is not set # CONFIG_SND_OSSEMUL is not set
...@@ -3753,6 +3756,7 @@ CONFIG_USB_GADGET=m ...@@ -3753,6 +3756,7 @@ CONFIG_USB_GADGET=m
# CONFIG_USB_GADGET_DEBUG_FS is not set # CONFIG_USB_GADGET_DEBUG_FS is not set
CONFIG_USB_GADGET_VBUS_DRAW=2 CONFIG_USB_GADGET_VBUS_DRAW=2
CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
CONFIG_U_SERIAL_CONSOLE=y
# #
# USB Peripheral Controller # USB Peripheral Controller
...@@ -3774,7 +3778,68 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 ...@@ -3774,7 +3778,68 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
# CONFIG_USB_EG20T is not set # CONFIG_USB_EG20T is not set
# CONFIG_USB_GADGET_XILINX is not set # CONFIG_USB_GADGET_XILINX is not set
# CONFIG_USB_DUMMY_HCD is not set # CONFIG_USB_DUMMY_HCD is not set
# CONFIG_USB_CONFIGFS is not set CONFIG_USB_LIBCOMPOSITE=m
CONFIG_USB_F_ACM=m
CONFIG_USB_F_SS_LB=m
CONFIG_USB_U_SERIAL=m
CONFIG_USB_U_ETHER=m
CONFIG_USB_U_AUDIO=m
CONFIG_USB_F_SERIAL=m
CONFIG_USB_F_OBEX=m
CONFIG_USB_F_NCM=m
CONFIG_USB_F_ECM=m
CONFIG_USB_F_EEM=m
CONFIG_USB_F_SUBSET=m
CONFIG_USB_F_RNDIS=m
CONFIG_USB_F_MASS_STORAGE=m
CONFIG_USB_F_FS=m
CONFIG_USB_F_UAC1=m
CONFIG_USB_F_UAC1_LEGACY=m
CONFIG_USB_F_UAC2=m
CONFIG_USB_F_UVC=m
CONFIG_USB_F_MIDI=m
CONFIG_USB_F_HID=m
CONFIG_USB_F_PRINTER=m
CONFIG_USB_CONFIGFS=m
CONFIG_USB_CONFIGFS_SERIAL=y
CONFIG_USB_CONFIGFS_ACM=y
CONFIG_USB_CONFIGFS_OBEX=y
CONFIG_USB_CONFIGFS_NCM=y
CONFIG_USB_CONFIGFS_ECM=y
CONFIG_USB_CONFIGFS_ECM_SUBSET=y
CONFIG_USB_CONFIGFS_RNDIS=y
CONFIG_USB_CONFIGFS_EEM=y
CONFIG_USB_CONFIGFS_MASS_STORAGE=y
CONFIG_USB_CONFIGFS_F_LB_SS=y
CONFIG_USB_CONFIGFS_F_FS=y
CONFIG_USB_CONFIGFS_F_UAC1=y
CONFIG_USB_CONFIGFS_F_UAC1_LEGACY=y
CONFIG_USB_CONFIGFS_F_UAC2=y
CONFIG_USB_CONFIGFS_F_MIDI=y
CONFIG_USB_CONFIGFS_F_HID=y
CONFIG_USB_CONFIGFS_F_UVC=y
CONFIG_USB_CONFIGFS_F_PRINTER=y
# CONFIG_USB_ZERO is not set
CONFIG_USB_AUDIO=m
# CONFIG_GADGET_UAC1 is not set
CONFIG_USB_ETH=m
CONFIG_USB_ETH_RNDIS=y
# CONFIG_USB_ETH_EEM is not set
CONFIG_USB_G_NCM=m
CONFIG_USB_GADGETFS=m
# CONFIG_USB_FUNCTIONFS is not set
CONFIG_USB_MASS_STORAGE=m
CONFIG_USB_G_SERIAL=m
# CONFIG_USB_MIDI_GADGET is not set
# CONFIG_USB_G_PRINTER is not set
CONFIG_USB_CDC_COMPOSITE=m
CONFIG_USB_G_ACM_MS=m
CONFIG_USB_G_MULTI=m
CONFIG_USB_G_MULTI_RNDIS=y
# CONFIG_USB_G_MULTI_CDC is not set
# CONFIG_USB_G_HID is not set
# CONFIG_USB_G_DBGP is not set
# CONFIG_USB_G_WEBCAM is not set
CONFIG_TYPEC=m CONFIG_TYPEC=m
CONFIG_TYPEC_TCPM=m CONFIG_TYPEC_TCPM=m
CONFIG_TYPEC_TCPCI=m CONFIG_TYPEC_TCPCI=m
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment