| | |
| | | diff -Nuar -x include-prefixes -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi linux-imx-imx6ull/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi |
| | | --- linux-imx/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi 2021-09-08 18:41:11.000000000 +0800 |
| | | +++ linux-imx-imx6ull/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi 2021-11-18 22:16:35.936126759 +0800 |
| | | +++ linux-imx-imx6ull/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi 2021-11-18 23:07:24.147581382 +0800 |
| | | @@ -31,7 +31,41 @@ |
| | | brightness-levels = <0 4 8 16 32 64 128 255>; |
| | | default-brightness-level = <6>; |
| | |
| | | }; |
| | | |
| | | &snvs_poweroff { |
| | | @@ -446,8 +497,8 @@ |
| | | @@ -439,6 +490,7 @@ |
| | | pinctrl-1 = <&pinctrl_usdhc1_100mhz>; |
| | | pinctrl-2 = <&pinctrl_usdhc1_200mhz>; |
| | | cd-gpios = <&gpio1 19 GPIO_ACTIVE_LOW>; |
| | | + no-1-8-v; |
| | | keep-power-in-suspend; |
| | | wakeup-source; |
| | | vmmc-supply = <®_sd1_vmmc>; |
| | | @@ -446,8 +498,8 @@ |
| | | }; |
| | | |
| | | &usdhc2 { |
| | |
| | | non-removable; |
| | | keep-power-in-suspend; |
| | | wakeup-source; |
| | | @@ -463,6 +514,18 @@ |
| | | @@ -463,6 +515,18 @@ |
| | | &iomuxc { |
| | | pinctrl-names = "default"; |
| | | |
| | |
| | | pinctrl_csi1: csi1grp { |
| | | fsl,pins = < |
| | | MX6UL_PAD_CSI_MCLK__CSI_MCLK 0x1b088 |
| | | @@ -490,6 +553,7 @@ |
| | | @@ -490,6 +554,7 @@ |
| | | MX6UL_PAD_ENET1_TX_DATA0__ENET1_TDATA00 0x1b0b0 |
| | | MX6UL_PAD_ENET1_TX_DATA1__ENET1_TDATA01 0x1b0b0 |
| | | MX6UL_PAD_ENET1_TX_CLK__ENET1_REF_CLK1 0x4001b031 |
| | |
| | | >; |
| | | }; |
| | | |
| | | @@ -505,6 +569,7 @@ |
| | | @@ -505,6 +570,7 @@ |
| | | MX6UL_PAD_ENET2_TX_DATA0__ENET2_TDATA00 0x1b0b0 |
| | | MX6UL_PAD_ENET2_TX_DATA1__ENET2_TDATA01 0x1b0b0 |
| | | MX6UL_PAD_ENET2_TX_CLK__ENET2_REF_CLK2 0x4001b031 |
| | |
| | | >; |
| | | }; |
| | | |
| | | @@ -594,7 +659,6 @@ |
| | | @@ -594,7 +660,6 @@ |
| | | MX6UL_PAD_JTAG_TRST_B__SAI2_TX_DATA 0x11088 |
| | | MX6UL_PAD_JTAG_TCK__SAI2_RX_DATA 0x11088 |
| | | MX6UL_PAD_JTAG_TMS__SAI2_MCLK 0x17088 |
| | |
| | | >; |
| | | }; |
| | | |
| | | @@ -610,6 +674,12 @@ |
| | | @@ -610,6 +675,12 @@ |
| | | >; |
| | | }; |
| | | |
| | |
| | | pinctrl_sim2: sim2grp { |
| | | fsl,pins = < |
| | | MX6UL_PAD_CSI_DATA03__SIM2_PORT1_PD 0xb808 |
| | | @@ -625,7 +695,6 @@ |
| | | @@ -625,7 +696,6 @@ |
| | | fsl,pins = < |
| | | MX6UL_PAD_BOOT_MODE0__GPIO5_IO10 0x70a1 |
| | | MX6UL_PAD_BOOT_MODE1__GPIO5_IO11 0x70a1 |
| | |
| | | MX6UL_PAD_SNVS_TAMPER8__GPIO5_IO08 0x80000000 |
| | | >; |
| | | }; |
| | | @@ -678,9 +747,7 @@ |
| | | @@ -678,9 +748,7 @@ |
| | | MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x17059 |
| | | MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x17059 |
| | | MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x17059 |
| | |
| | | |
| | | diff -Nuar -x include-prefixes -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/imx6ul.dtsi linux-imx-imx6ull/arch/arm/boot/dts/imx6ul.dtsi |
| | | --- linux-imx/arch/arm/boot/dts/imx6ul.dtsi 2021-09-08 18:41:11.000000000 +0800 |
| | | +++ linux-imx-imx6ull/arch/arm/boot/dts/imx6ul.dtsi 2021-11-17 20:39:10.582219267 +0800 |
| | | +++ linux-imx-imx6ull/arch/arm/boot/dts/imx6ul.dtsi 2021-11-18 22:45:15.290130981 +0800 |
| | | @@ -727,6 +727,7 @@ |
| | | offset = <0x34>; |
| | | interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>, |
| | |
| | | snvs_poweroff: snvs-poweroff { |
| | | diff -Nuar -x include-prefixes -x logo_linux_clut224.ppm linux-imx/.cfg-imx6ull linux-imx-imx6ull/.cfg-imx6ull |
| | | --- linux-imx/.cfg-imx6ull 1970-01-01 08:00:00.000000000 +0800 |
| | | +++ linux-imx-imx6ull/.cfg-imx6ull 2021-11-18 22:41:55.390760172 +0800 |
| | | +++ linux-imx-imx6ull/.cfg-imx6ull 2021-11-18 23:08:19.942958721 +0800 |
| | | @@ -0,0 +1,6895 @@ |
| | | +# |
| | | +# Automatically generated file; DO NOT EDIT. |
| | |
| | | +# end of Kernel hacking |
| | | diff -Nuar -x include-prefixes -x logo_linux_clut224.ppm linux-imx/Makefile linux-imx-imx6ull/Makefile |
| | | --- linux-imx/Makefile 2021-09-08 18:41:11.000000000 +0800 |
| | | +++ linux-imx-imx6ull/Makefile 2021-11-18 22:38:10.018502255 +0800 |
| | | +++ linux-imx-imx6ull/Makefile 2021-11-18 23:07:29.755517565 +0800 |
| | | @@ -367,7 +367,8 @@ |
| | | # Alternatively CROSS_COMPILE can be set in the environment. |
| | | # Default value for CROSS_COMPILE is not to prefix executables |