Skip to content

a #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Shaked-Flytrex wants to merge 1 commit into
base: mc-linux-sky2
Choose a base branch
from
Open

a #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 38 additions & 3 deletions arch/arm64/boot/dts/freescale/imx8mm-var-som-symphony.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
regulator-name = "usb_otg2_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio5 1 GPIO_ACTIVE_HIGH>;
gpio = <&gpio5 0 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
};
Expand Down Expand Up @@ -310,7 +310,7 @@
assigned-clock-rates = <10000000>, <250000000>;
assigned-clock-parents = <&clk IMX8MM_SYS_PLL2_50M>,
<&clk IMX8MM_SYS_PLL2_250M>;
status = "okay";
status = "disabled";
};

&pwm1 {
Expand All @@ -319,6 +319,24 @@
status = "okay";
};

&pwm2 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pwm2>;
};

&pwm3 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pwm3>;
};

&pwm4 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pwm4>;
};

/* Header */
&uart1 {
pinctrl-names = "default";
Expand Down Expand Up @@ -373,7 +391,7 @@
pinctrl-0 = <&pinctrl_usdhc2>, <&pinctrl_usdhc2_gpio>;
pinctrl-1 = <&pinctrl_usdhc2_100mhz>, <&pinctrl_usdhc2_gpio>;
pinctrl-2 = <&pinctrl_usdhc2_200mhz>, <&pinctrl_usdhc2_gpio>;
cd-gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
cd-gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
bus-width = <4>;
vmmc-supply = <&reg_usdhc2_vmmc>;
status = "okay";
Expand Down Expand Up @@ -543,4 +561,21 @@
MX8MM_IOMUXC_SAI2_RXFS_GPIO4_IO21 0x41
>;
};
pinctrl_pwm2: pwm2grp {
fsl,pins = <
MX8MM_IOMUXC_SPDIF_RX_PWM2_OUT 0x06
>;
};

pinctrl_pwm3: pwm3grp {
fsl,pins = <
MX8MM_IOMUXC_SPDIF_TX_PWM3_OUT 0x06
>;
};

pinctrl_pwm4: pwm4grp {
fsl,pins = <
MX8MM_IOMUXC_SAI3_MCLK_PWM4_OUT 0x06
>;
};
};
31 changes: 2 additions & 29 deletions arch/arm64/boot/dts/freescale/imx8mm-var-som.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,36 +453,10 @@
&ecspi1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi1>;
cs-gpios = <&gpio1 14 GPIO_ACTIVE_LOW>,
<&gpio1 0 GPIO_ACTIVE_LOW>,
<&gpio2 19 GPIO_ACTIVE_LOW>;
cs-gpios = <&gpio1 3 GPIO_ACTIVE_LOW>,
<&gpio1 0 GPIO_ACTIVE_LOW>;
status = "okay";

/* Resistive touch controller */
ads7846@0 {
reg = <0>;
compatible = "ti,ads7846";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_restouch>;
interrupt-parent = <&gpio1>;
interrupts = <3 IRQ_TYPE_EDGE_FALLING>;
spi-max-frequency = <1500000>;
pendown-gpio = <&gpio1 3 GPIO_ACTIVE_LOW>;
ti,x-min = /bits/ 16 <125>;
ti,x-max = /bits/ 16 <4008>;
ti,y-min = /bits/ 16 <282>;
ti,y-max = /bits/ 16 <3864>;
ti,x-plate-ohms = /bits/ 16 <180>;
ti,pressure-max = /bits/ 16 <255>;
ti,debounce-max = /bits/ 16 <10>;
ti,debounce-tol = /bits/ 16 <3>;
ti,debounce-rep = /bits/ 16 <1>;
ti,settle-delay-usec = /bits/ 16 <150>;
ti,keep-vref-on;
wakeup-source;
status = "okay";
};

/* CAN controller */
can0: can@1 {
reg = <1>;
Expand Down Expand Up @@ -758,7 +732,6 @@
MX8MM_IOMUXC_ECSPI1_MISO_ECSPI1_MISO 0x13
MX8MM_IOMUXC_GPIO1_IO14_GPIO1_IO14 0x13
MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x13
MX8MM_IOMUXC_SD2_RESET_B_GPIO2_IO19 0x13
>;
};

Expand Down
5 changes: 3 additions & 2 deletions arch/arm64/configs/imx8_var_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,6 @@ CONFIG_PCI_HOST_GENERIC=y
CONFIG_PCI_XGENE=y
CONFIG_PCI_NXP_RPMSG=y
CONFIG_PCI_MESON=m
CONFIG_PCI_IMX6_HOST=y
CONFIG_PCI_IMX6_EP=y
CONFIG_PCI_LAYERSCAPE=y
CONFIG_PCI_HISI=y
CONFIG_PCIE_KIRIN=y
Expand Down Expand Up @@ -811,6 +809,8 @@ CONFIG_USB_SERIAL_GENERIC=y
CONFIG_USB_SERIAL_SIMPLE=y
CONFIG_USB_SERIAL_CP210X=m
CONFIG_USB_SERIAL_FTDI_SIO=y
CONFIG_USB_SERIAL_QCAUX=m
CONFIG_USB_SERIAL_QUALCOMM=m
CONFIG_USB_SERIAL_OPTION=m
CONFIG_USB_TEST=m
CONFIG_USB_EHSET_TEST_FIXTURE=y
Expand Down Expand Up @@ -1049,6 +1049,7 @@ CONFIG_PWM_ADP5585=y
CONFIG_PWM_CROS_EC=m
CONFIG_PWM_FSL_FTM=m
CONFIG_PWM_IMX27=y
CONFIG_PWM_PCA9685=y
CONFIG_PWM_IMX_TPM=y
CONFIG_PWM_RPCHIP=y
CONFIG_PWM_SL28CPLD=m
Expand Down