redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

zero-sugar dts: fix OTG regulator config, adjust digitizer and wifi pinmux 

OTG power is only enabled on OTG1 (POGO), and is enabled by setting a bit in
a register in the charger, not by toggling GPIO. The GPIO control config in
the OTG regulator blocks are thus removed.

Move digitizer pin muxing from standard pinux block to the lpsr pinmux block.
GPIO1.0..GPIO1.7 requires mux config in separate mux control register, which
then requires the pin muxing to be defined in a new lpsr pinmux block.

Move wifi pinmux to be configured at boot and not when the brcmfmac driver
is loaded (attempt to resolve device init issues).
pull/10/head
Steinar Bakkemo 2019-06-26 00:12:07 +02:00
parent 0642607ae4
commit 2bf80590c2
1 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
arch/arm/boot/dts/zero-sugar.dts
View File

@ -61,8 +61,8 @@
regulator-name = "usb_otg1_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>;
enable-active-high;
/*gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>;
enable-active-high;*/
};
reg_usb_otg2_vbus: regulator-usb-otg2-vbus {
@ -70,8 +70,8 @@
regulator-name = "usb_otg2_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio1 7 GPIO_ACTIVE_HIGH>;
enable-active-high;
/*gpio = <&gpio1 7 GPIO_ACTIVE_HIGH>;
enable-active-high;*/
};
reg_vref_1v8: regulator-vref-1v8 {
@ -450,9 +450,13 @@
pinctrl-names = "default";
imx7d-sdb {
pinctrl_usbotg2_pwr_2: usbotg2-2 {
pinctrl_wacom: wacomgrp {
fsl,pins = <
MX7D_PAD_LPSR_GPIO1_IO07__GPIO1_IO7 0x14
/*MX7D_PAD_LPSR_GPIO1_IO00__GPIO1_IO0 0x00000074 /* WACOM RESET */
MX7D_PAD_LPSR_GPIO1_IO01__GPIO1_IO1 0x00000034 /* WACOM INT */
MX7D_PAD_LPSR_GPIO1_IO04__GPIO1_IO4 0x00000074 /* PDCTB */
/*MX7D_PAD_LPSR_GPIO1_IO05__GPIO1_IO5 0x00000014 /* FWE */
/*MX7D_PAD_LPSR_GPIO1_IO06__GPIO1_IO6 0x00000014 /* WACOM PWR ENABLE */
>;
};
};
@ -492,8 +496,8 @@
#address-cells = <1>;
#size-cells = <0>;
pinctrl-names = "default", "state_100mhz";/*, "state_200mhz";*/
pinctrl-0 = <&pinctrl_usdhc2 &pinctrl_wifi>;
pinctrl-1 = <&pinctrl_usdhc2_100mhz &pinctrl_wifi>;
pinctrl-0 = <&pinctrl_usdhc2>;
pinctrl-1 = <&pinctrl_usdhc2_100mhz>;
/*pinctrl-2 = <&pinctrl_usdhc2_200mhz &pinctrl_wifi>;*/
mmc-pwrseq = <&wifi_pwrseq>;
@ -512,8 +516,8 @@
interrupt-parent = <&gpio1>;
interrupts = <8 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "host-wake";
/*clocks = <&clks IMX7D_CLKO2_ROOT_DIV>;
clock-names = "32K_ext_wifi_clk";*/
/*clocks = <&clks IMX7D_CLKO2_ROOT_DIV>;*/
/*clock-names = "32K_ext_wifi_clk";*/
/*resets = <&wifi_reset>;*/
};
};
@ -540,6 +544,7 @@
&iomuxc {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_wifi>;
imx7d-sdb {
@ -552,16 +557,6 @@
>;
};
pinctrl_wacom: wacomgrp {
fsl,pins = <
MX7D_PAD_LPSR_GPIO1_IO00__GPIO1_IO0 0x00000074 /* WACOM RESET */
MX7D_PAD_LPSR_GPIO1_IO01__GPIO1_IO1 0x00000034 /* WACOM INT */
MX7D_PAD_LPSR_GPIO1_IO04__GPIO1_IO4 0x00000074 /* PDCTB */
MX7D_PAD_LPSR_GPIO1_IO05__GPIO1_IO5 0x00000014 /* FWE */
MX7D_PAD_LPSR_GPIO1_IO06__GPIO1_IO6 0x00000014 /* WACOM PWR ENABLE */
>;
};
pinctrl_i2c1: i2c1grp {
fsl,pins = <
MX7D_PAD_I2C1_SDA__I2C1_SDA 0x4000007f
@ -731,4 +726,3 @@
};
};
};