Skip to content

L
linux
Commit 07d0db46 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files
Options

Merge tag 'imx-dt-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/dt 

i.MX device tree change for 6.1

- A series from Alexander Stein to add missing properties for i.MX6 SRAM.
- Drop 'interrupts' property when 'interrupts-extended' is present. This
  fixes a dtbs_check warning with i.MX6 DT.
- Update device trees to use generic name 'dma-controller' for SDMA.
- A set of changes from Krzysztof Kozlowski to align SPI, LED and
  gpio-keys node name with dtschema.
- A series of indentation and white-space cleanups from Marcel Ziswiler
  to address various checkpatch warnings.
- Add DDR pinmux defines to VF610 DT header.
- A couple of changes from Peng Fan to update clock-names and add IPG
  clock for i.MX7ULP LPI2C devices.
- Improve device tree structure for Kontron i.MX6UL/ULL based boards.
- A series of changes from Tim Harvey to add CAN regulator for Gateworks
  i.MX6QDL boards.
- Various small and random board specific updates.

* tag 'imx-dt-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (40 commits)
  ARM: dts: imx6qdl-gw54xx: add CAN regulator
  ARM: dts: imx6qdl-gw53xx: add CAN regulator
  ARM: dts: imx6qdl-gw52xx: add CAN regulator
  ARM: dts: imx: update sdma node name format
  ARM: dts: imx6: skov: migrate to resistive-adc-touch
  ARM: dts: imx6sx-udoo-neo: don't use multiple blank lines
  ARM: dts: imx6sl: use tabs for code indent
  ARM: dts: imx6sx: add missing properties for sram
  ARM: dts: imx6sll: add missing properties for sram
  ARM: dts: imx6sl: add missing properties for sram
  ARM: dts: imx6qp: add missing properties for sram
  ARM: dts: imx6dl: add missing properties for sram
  ARM: dts: imx6q: add missing properties for sram
  ARM: dts: imx7ulp: Add IPG clock for lpi2c
  ARM: dts: imx7ulp: update the LPI2C clock-names
  ARM: dts: vf610: ddr pinmux
  ARM: dts: imx6qdl-dhcom: Move IPU iomux node from PDK2 to SoM file
  ARM: dts: imx6ul-kontron: Add imx6ull-kontron-bl to Makefile
  ARM: dts: imx6ul-kontron: Simplify devicetree structure
  ARM: dts: vf610: align SPI node name with dtschema
  ...

Link: https://lore.kernel.org/r/20220918092806.2152700-3-shawnguo@kernel.orgSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 2b14d7da b7fd68ac
Hide whitespace changes
Inline Side-by-side
Showing with 462 additions and 403 deletions
arch/arm/boot/dts/Makefile
View file @ 07d0db46
...@@ -707,8 +707,8 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ ...@@ -707,8 +707,8 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
imx6ul-geam.dtb \ imx6ul-geam.dtb \
imx6ul-isiot-emmc.dtb \ imx6ul-isiot-emmc.dtb \
imx6ul-isiot-nand.dtb \ imx6ul-isiot-nand.dtb \
imx6ul-kontron-n6310-s.dtb \ imx6ul-kontron-bl.dtb \
imx6ul-kontron-n6310-s-43.dtb \ imx6ul-kontron-bl-43.dtb \
imx6ul-liteboard.dtb \ imx6ul-liteboard.dtb \
imx6ul-tqma6ul1-mba6ulx.dtb \ imx6ul-tqma6ul1-mba6ulx.dtb \
imx6ul-tqma6ul2-mba6ulx.dtb \ imx6ul-tqma6ul2-mba6ulx.dtb \
...@@ -737,6 +737,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ ...@@ -737,6 +737,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
imx6ull-colibri-wifi-iris.dtb \ imx6ull-colibri-wifi-iris.dtb \
imx6ull-colibri-wifi-iris-v2.dtb \ imx6ull-colibri-wifi-iris-v2.dtb \
imx6ull-jozacp.dtb \ imx6ull-jozacp.dtb \
imx6ull-kontron-bl.dtb \
imx6ull-myir-mys-6ulx-eval.dtb \ imx6ull-myir-mys-6ulx-eval.dtb \
imx6ull-opos6uldev.dtb \ imx6ull-opos6uldev.dtb \
imx6ull-phytec-segin-ff-rdk-nand.dtb \ imx6ull-phytec-segin-ff-rdk-nand.dtb \
......
arch/arm/boot/dts/imx23-xfi3.dts
View file @ 07d0db46
...@@ -158,19 +158,19 @@ backlight { ...@@ -158,19 +158,19 @@ backlight {
default-brightness-level = <6>; default-brightness-level = <6>;
}; };
gpio_keys { gpio-keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&key_pins_a>; pinctrl-0 = <&key_pins_a>;
voldown { key-voldown {
label = "volume-down"; label = "volume-down";
linux,code = <114>; linux,code = <114>;
gpios = <&gpio2 7 0>; gpios = <&gpio2 7 0>;
debounce-interval = <20>; debounce-interval = <20>;
}; };
volup { key-volup {
label = "volume-up"; label = "volume-up";
linux,code = <115>; linux,code = <115>;
gpios = <&gpio2 8 0>; gpios = <&gpio2 8 0>;
......
arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts
View file @ 07d0db46
...@@ -13,12 +13,12 @@ / { ...@@ -13,12 +13,12 @@ / {
model = "Eukrea MBIMXSD25"; model = "Eukrea MBIMXSD25";
compatible = "eukrea,mbimxsd25-baseboard", "eukrea,cpuimx25", "fsl,imx25"; compatible = "eukrea,mbimxsd25-baseboard", "eukrea,cpuimx25", "fsl,imx25";
gpio_keys { gpio-keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpiokeys>; pinctrl-0 = <&pinctrl_gpiokeys>;
bp1 { button {
label = "BP1"; label = "BP1";
gpios = <&gpio3 18 GPIO_ACTIVE_LOW>; gpios = <&gpio3 18 GPIO_ACTIVE_LOW>;
linux,code = <BTN_MISC>; linux,code = <BTN_MISC>;
......
arch/arm/boot/dts/imx25.dtsi
View file @ 07d0db46
...@@ -515,7 +515,7 @@ gpio2: gpio@53fd0000 { ...@@ -515,7 +515,7 @@ gpio2: gpio@53fd0000 {
#interrupt-cells = <2>; #interrupt-cells = <2>;
}; };
sdma: sdma@53fd4000 { sdma: dma-controller@53fd4000 {
compatible = "fsl,imx25-sdma"; compatible = "fsl,imx25-sdma";
reg = <0x53fd4000 0x4000>; reg = <0x53fd4000 0x4000>;
clocks = <&clks 112>, <&clks 68>; clocks = <&clks 112>, <&clks 68>;
......
arch/arm/boot/dts/imx28-cfa10049.dts
View file @ 07d0db46
...@@ -327,7 +327,7 @@ mac0: ethernet@800f0000 { ...@@ -327,7 +327,7 @@ mac0: ethernet@800f0000 {
}; };
}; };
spi2 { spi-2 {
compatible = "spi-gpio"; compatible = "spi-gpio";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spi2_pins_cfa10049>; pinctrl-0 = <&spi2_pins_cfa10049>;
...@@ -351,7 +351,7 @@ hx8357: hx8357@0 { ...@@ -351,7 +351,7 @@ hx8357: hx8357@0 {
}; };
}; };
spi3 { spi-3 {
compatible = "spi-gpio"; compatible = "spi-gpio";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spi3_pins_cfa10049>; pinctrl-0 = <&spi3_pins_cfa10049>;
...@@ -388,12 +388,12 @@ dac0: dh2228@2 { ...@@ -388,12 +388,12 @@ dac0: dh2228@2 {
}; };
}; };
gpio_keys { gpio-keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&rotary_btn_pins_cfa10049>; pinctrl-0 = <&rotary_btn_pins_cfa10049>;
rotary_button { rotary-button {
label = "rotary_button"; label = "rotary_button";
gpios = <&gpio3 26 1>; gpios = <&gpio3 26 1>;
debounce-interval = <10>; debounce-interval = <10>;
......
arch/arm/boot/dts/imx28-cfa10055.dts
View file @ 07d0db46
...@@ -129,7 +129,7 @@ pwm: pwm@80064000 { ...@@ -129,7 +129,7 @@ pwm: pwm@80064000 {
}; };
}; };
spi2 { spi-2 {
compatible = "spi-gpio"; compatible = "spi-gpio";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spi2_pins_cfa10055>; pinctrl-0 = <&spi2_pins_cfa10055>;
......
arch/arm/boot/dts/imx28-cfa10056.dts
View file @ 07d0db46
...@@ -88,7 +88,7 @@ timing0: timing0 { ...@@ -88,7 +88,7 @@ timing0: timing0 {
}; };
}; };
spi2 { spi-2 {
compatible = "spi-gpio"; compatible = "spi-gpio";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spi2_pins_cfa10056>; pinctrl-0 = <&spi2_pins_cfa10056>;
......
arch/arm/boot/dts/imx28-duckbill-2-enocean.dts
View file @ 07d0db46
...@@ -204,7 +204,7 @@ gpio-keys { ...@@ -204,7 +204,7 @@ gpio-keys {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&enocean_button>; pinctrl-0 = <&enocean_button>;
enocean { key-enocean {
label = "EnOcean"; label = "EnOcean";
linux,code = <KEY_NEW>; linux,code = <KEY_NEW>;
gpios = <&gpio3 3 GPIO_ACTIVE_HIGH>; gpios = <&gpio3 3 GPIO_ACTIVE_HIGH>;
......
arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi
View file @ 07d0db46
...@@ -19,12 +19,12 @@ backlight { ...@@ -19,12 +19,12 @@ backlight {
default-brightness-level = <10>; default-brightness-level = <10>;
}; };
button-sw3 { gpio-keys-0 {
compatible = "gpio-keys"; compatible = "gpio-keys";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gpio_button_sw3_pins_mbmx28lc>; pinctrl-0 = <&gpio_button_sw3_pins_mbmx28lc>;
sw3 { switch-sw3 {
label = "SW3"; label = "SW3";
gpios = <&gpio1 21 GPIO_ACTIVE_LOW>; gpios = <&gpio1 21 GPIO_ACTIVE_LOW>;
linux,code = <BTN_MISC>; linux,code = <BTN_MISC>;
...@@ -32,12 +32,12 @@ sw3 { ...@@ -32,12 +32,12 @@ sw3 {
}; };
}; };
button-sw4 { gpio-keys-1 {
compatible = "gpio-keys"; compatible = "gpio-keys";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gpio_button_sw4_pins_mbmx28lc>; pinctrl-0 = <&gpio_button_sw4_pins_mbmx28lc>;
sw4 { switch-sw4 {
label = "SW4"; label = "SW4";
gpios = <&gpio1 20 GPIO_ACTIVE_LOW>; gpios = <&gpio1 20 GPIO_ACTIVE_LOW>;
linux,code = <BTN_MISC>; linux,code = <BTN_MISC>;
......
arch/arm/boot/dts/imx28-tx28.dts
View file @ 07d0db46
...@@ -221,7 +221,7 @@ &gpio5 7 GPIO_ACTIVE_HIGH ...@@ -221,7 +221,7 @@ &gpio5 7 GPIO_ACTIVE_HIGH
linux,no-autorepeat; linux,no-autorepeat;
}; };
spi_gpio: spi-gpio { spi_gpio: spi {
compatible = "spi-gpio"; compatible = "spi-gpio";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
......
arch/arm/boot/dts/imx31.dtsi
View file @ 07d0db46
...@@ -297,7 +297,7 @@ gpio2: gpio@53fd0000 { ...@@ -297,7 +297,7 @@ gpio2: gpio@53fd0000 {
#interrupt-cells = <2>; #interrupt-cells = <2>;
}; };
sdma: sdma@53fd4000 { sdma: dma-controller@53fd4000 {
compatible = "fsl,imx31-sdma"; compatible = "fsl,imx31-sdma";
reg = <0x53fd4000 0x4000>; reg = <0x53fd4000 0x4000>;
interrupts = <34>; interrupts = <34>;
......
arch/arm/boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts
View file @ 07d0db46
...@@ -13,12 +13,12 @@ / { ...@@ -13,12 +13,12 @@ / {
model = "Eukrea CPUIMX35"; model = "Eukrea CPUIMX35";
compatible = "eukrea,mbimxsd35-baseboard", "eukrea,cpuimx35", "fsl,imx35"; compatible = "eukrea,mbimxsd35-baseboard", "eukrea,cpuimx35", "fsl,imx35";
gpio_keys { gpio-keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_bp1>; pinctrl-0 = <&pinctrl_bp1>;
bp1 { button {
label = "BP1"; label = "BP1";
gpios = <&gpio3 25 GPIO_ACTIVE_LOW>; gpios = <&gpio3 25 GPIO_ACTIVE_LOW>;
linux,code = <BTN_MISC>; linux,code = <BTN_MISC>;
......
arch/arm/boot/dts/imx35.dtsi
View file @ 07d0db46
...@@ -284,7 +284,7 @@ gpio2: gpio@53fd0000 { ...@@ -284,7 +284,7 @@ gpio2: gpio@53fd0000 {
#interrupt-cells = <2>; #interrupt-cells = <2>;
}; };
sdma: sdma@53fd4000 { sdma: dma-controller@53fd4000 {
compatible = "fsl,imx35-sdma"; compatible = "fsl,imx35-sdma";
reg = <0x53fd4000 0x4000>; reg = <0x53fd4000 0x4000>;
clocks = <&clks 9>, <&clks 65>; clocks = <&clks 9>, <&clks 65>;
......
arch/arm/boot/dts/imx50-kobo-aura.dts
View file @ 07d0db46
...@@ -38,20 +38,20 @@ gpio-keys { ...@@ -38,20 +38,20 @@ gpio-keys {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpiokeys>; pinctrl-0 = <&pinctrl_gpiokeys>;
power { key-power {
label = "Power Button"; label = "Power Button";
gpios = <&gpio4 10 GPIO_ACTIVE_LOW>; gpios = <&gpio4 10 GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
}; };
hallsensor { event-hallsensor {
label = "Hallsensor"; label = "Hallsensor";
gpios = <&gpio5 15 GPIO_ACTIVE_LOW>; gpios = <&gpio5 15 GPIO_ACTIVE_LOW>;
linux,code = <KEY_RESERVED>; linux,code = <KEY_RESERVED>;
linux,input-type = <EV_SW>; linux,input-type = <EV_SW>;
}; };
frontlight { event-frontlight {
label = "Frontlight"; label = "Frontlight";
gpios = <&gpio4 1 GPIO_ACTIVE_LOW>; gpios = <&gpio4 1 GPIO_ACTIVE_LOW>;
linux,code = <KEY_DISPLAYTOGGLE>; linux,code = <KEY_DISPLAYTOGGLE>;
......
arch/arm/boot/dts/imx50.dtsi
View file @ 07d0db46
...@@ -421,7 +421,7 @@ ecspi2: spi@63fac000 { ...@@ -421,7 +421,7 @@ ecspi2: spi@63fac000 {
status = "disabled"; status = "disabled";
}; };
sdma: sdma@63fb0000 { sdma: dma-controller@63fb0000 {
compatible = "fsl,imx50-sdma", "fsl,imx35-sdma"; compatible = "fsl,imx50-sdma", "fsl,imx35-sdma";
reg = <0x63fb0000 0x4000>; reg = <0x63fb0000 0x4000>;
interrupts = <6>; interrupts = <6>;
......
arch/arm/boot/dts/imx51-apf51dev.dts
View file @ 07d0db46
...@@ -63,7 +63,7 @@ user-key { ...@@ -63,7 +63,7 @@ user-key {
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
user { led-user {
label = "Heartbeat"; label = "Heartbeat";
gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
......
arch/arm/boot/dts/imx51-babbage.dts
View file @ 07d0db46
...@@ -154,7 +154,7 @@ gpio-keys { ...@@ -154,7 +154,7 @@ gpio-keys {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpio_keys>; pinctrl-0 = <&pinctrl_gpio_keys>;
power { key-power {
label = "Power Button"; label = "Power Button";
gpios = <&gpio2 21 GPIO_ACTIVE_HIGH>; gpios = <&gpio2 21 GPIO_ACTIVE_HIGH>;
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
......
arch/arm/boot/dts/imx51-zii-rdu1.dts
View file @ 07d0db46
...@@ -137,7 +137,7 @@ sgtl5000: codec@a { ...@@ -137,7 +137,7 @@ sgtl5000: codec@a {
}; };
}; };
spi_gpio: spi-gpio { spi_gpio: spi {
compatible = "spi-gpio"; compatible = "spi-gpio";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
......
arch/arm/boot/dts/imx51.dtsi
View file @ 07d0db46
...@@ -504,7 +504,7 @@ ecspi2: spi@83fac000 { ...@@ -504,7 +504,7 @@ ecspi2: spi@83fac000 {
status = "disabled"; status = "disabled";
}; };
sdma: sdma@83fb0000 { sdma: dma-controller@83fb0000 {
compatible = "fsl,imx51-sdma", "fsl,imx35-sdma"; compatible = "fsl,imx51-sdma", "fsl,imx35-sdma";
reg = <0x83fb0000 0x4000>; reg = <0x83fb0000 0x4000>;
interrupts = <6>; interrupts = <6>;
......
arch/arm/boot/dts/imx53-ard.dts
View file @ 07d0db46
...@@ -61,34 +61,34 @@ reg_3p3v: regulator@0 { ...@@ -61,34 +61,34 @@ reg_3p3v: regulator@0 {
gpio-keys { gpio-keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
home { key-home {
label = "Home"; label = "Home";
gpios = <&gpio5 10 0>; gpios = <&gpio5 10 0>;
linux,code = <KEY_HOME>; linux,code = <KEY_HOME>;
wakeup-source; wakeup-source;
}; };
back { key-back {
label = "Back"; label = "Back";
gpios = <&gpio5 11 0>; gpios = <&gpio5 11 0>;
linux,code = <KEY_BACK>; linux,code = <KEY_BACK>;
wakeup-source; wakeup-source;
}; };
program { key-program {
label = "Program"; label = "Program";
gpios = <&gpio5 12 0>; gpios = <&gpio5 12 0>;
linux,code = <KEY_PROGRAM >; linux,code = <KEY_PROGRAM >;
wakeup-source; wakeup-source;
}; };
volume-up { key-volume-up {
label = "Volume Up"; label = "Volume Up";
gpios = <&gpio5 13 0>; gpios = <&gpio5 13 0>;
linux,code = <KEY_VOLUMEUP>; linux,code = <KEY_VOLUMEUP>;
}; };
volume-down { key-volume-down {
label = "Volume Down"; label = "Volume Down";
gpios = <&gpio4 0 0>; gpios = <&gpio4 0 0>;
linux,code = <KEY_VOLUMEDOWN>; linux,code = <KEY_VOLUMEDOWN>;
......
arch/arm/boot/dts/imx53-qsb-common.dtsi
View file @ 07d0db46
...@@ -45,20 +45,20 @@ display_out: endpoint { ...@@ -45,20 +45,20 @@ display_out: endpoint {
gpio-keys { gpio-keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
power { key-power {
label = "Power Button"; label = "Power Button";
gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
}; };
volume-up { key-volume-up {
label = "Volume Up"; label = "Volume Up";
gpios = <&gpio2 14 GPIO_ACTIVE_LOW>; gpios = <&gpio2 14 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>; linux,code = <KEY_VOLUMEUP>;
wakeup-source; wakeup-source;
}; };
volume-down { key-volume-down {
label = "Volume Down"; label = "Volume Down";
gpios = <&gpio2 15 GPIO_ACTIVE_LOW>; gpios = <&gpio2 15 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEDOWN>; linux,code = <KEY_VOLUMEDOWN>;
...@@ -71,7 +71,7 @@ leds { ...@@ -71,7 +71,7 @@ leds {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&led_pin_gpio7_7>; pinctrl-0 = <&led_pin_gpio7_7>;
user { led-user {
label = "Heartbeat"; label = "Heartbeat";
gpios = <&gpio7 7 0>; gpios = <&gpio7 7 0>;
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
......
arch/arm/boot/dts/imx53-smd.dts
View file @ 07d0db46
...@@ -19,13 +19,13 @@ memory@70000000 { ...@@ -19,13 +19,13 @@ memory@70000000 {
gpio-keys { gpio-keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
volume-up { key-volume-up {
label = "Volume Up"; label = "Volume Up";
gpios = <&gpio2 14 0>; gpios = <&gpio2 14 0>;
linux,code = <KEY_VOLUMEUP>; linux,code = <KEY_VOLUMEUP>;
}; };
volume-down { key-volume-down {
label = "Volume Down"; label = "Volume Down";
gpios = <&gpio2 15 0>; gpios = <&gpio2 15 0>;
linux,code = <KEY_VOLUMEDOWN>; linux,code = <KEY_VOLUMEDOWN>;
......
arch/arm/boot/dts/imx53-tx53.dtsi
View file @ 07d0db46
...@@ -81,7 +81,7 @@ gpio-keys { ...@@ -81,7 +81,7 @@ gpio-keys {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpio_key>; pinctrl-0 = <&pinctrl_gpio_key>;
power { key-power {
label = "Power Button"; label = "Power Button";
gpios = <&gpio5 2 GPIO_ACTIVE_HIGH>; gpios = <&gpio5 2 GPIO_ACTIVE_HIGH>;
linux,code = <116>; /* KEY_POWER */ linux,code = <116>; /* KEY_POWER */
......
arch/arm/boot/dts/imx53.dtsi
View file @ 07d0db46
...@@ -710,7 +710,7 @@ ecspi2: spi@63fac000 { ...@@ -710,7 +710,7 @@ ecspi2: spi@63fac000 {
status = "disabled"; status = "disabled";
}; };
sdma: sdma@63fb0000 { sdma: dma-controller@63fb0000 {
compatible = "fsl,imx53-sdma", "fsl,imx35-sdma"; compatible = "fsl,imx53-sdma", "fsl,imx35-sdma";
reg = <0x63fb0000 0x4000>; reg = <0x63fb0000 0x4000>;
interrupts = <6>; interrupts = <6>;
......
arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi
View file @ 07d0db46
...@@ -6,7 +6,7 @@ / { ...@@ -6,7 +6,7 @@ / {
keyboard { keyboard {
compatible = "gpio-keys"; compatible = "gpio-keys";
btn0 { button-0 {
gpios = <&pcf8575 0 GPIO_ACTIVE_LOW>; gpios = <&pcf8575 0 GPIO_ACTIVE_LOW>;
label = "btn0"; label = "btn0";
linux,code = <KEY_WAKEUP>; linux,code = <KEY_WAKEUP>;
...@@ -14,7 +14,7 @@ btn0 { ...@@ -14,7 +14,7 @@ btn0 {
wakeup-source; wakeup-source;
}; };
btn1 { button-1 {
gpios = <&pcf8575 1 GPIO_ACTIVE_LOW>; gpios = <&pcf8575 1 GPIO_ACTIVE_LOW>;
label = "btn1"; label = "btn1";
linux,code = <KEY_WAKEUP>; linux,code = <KEY_WAKEUP>;
...@@ -22,7 +22,7 @@ btn1 { ...@@ -22,7 +22,7 @@ btn1 {
wakeup-source; wakeup-source;
}; };
btn2 { button-2 {
gpios = <&pcf8575 2 GPIO_ACTIVE_LOW>; gpios = <&pcf8575 2 GPIO_ACTIVE_LOW>;
label = "btn2"; label = "btn2";
linux,code = <KEY_WAKEUP>; linux,code = <KEY_WAKEUP>;
...@@ -30,7 +30,7 @@ btn2 { ...@@ -30,7 +30,7 @@ btn2 {
wakeup-source; wakeup-source;
}; };
btn3 { button-3 {
gpios = <&pcf8575 3 GPIO_ACTIVE_LOW>; gpios = <&pcf8575 3 GPIO_ACTIVE_LOW>;
label = "btn3"; label = "btn3";
linux,code = <KEY_WAKEUP>; linux,code = <KEY_WAKEUP>;
......
arch/arm/boot/dts/imx6dl-b1x5pv2.dtsi
View file @ 07d0db46
...@@ -188,7 +188,7 @@ power-button { ...@@ -188,7 +188,7 @@ power-button {
rotary-encoder-key { rotary-encoder-key {
compatible = "gpio-keys"; compatible = "gpio-keys";
rotary-encoder-press { rotary-encoder-event {
label = "rotary-encoder press"; label = "rotary-encoder press";
gpios = <&tca6424a 0 GPIO_ACTIVE_HIGH>; gpios = <&tca6424a 0 GPIO_ACTIVE_HIGH>;
linux,code = <KEY_ENTER>; linux,code = <KEY_ENTER>;
......
arch/arm/boot/dts/imx6dl-prtmvt.dts
View file @ 07d0db46
...@@ -51,98 +51,98 @@ gpio-keys { ...@@ -51,98 +51,98 @@ gpio-keys {
pinctrl-0 = <&pinctrl_gpiokeys>; pinctrl-0 = <&pinctrl_gpiokeys>;
autorepeat; autorepeat;
power { key-power {
label = "Power Button"; label = "Power Button";
gpios = <&gpio2 23 GPIO_ACTIVE_LOW>; gpios = <&gpio2 23 GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
wakeup-source; wakeup-source;
}; };
f1 { key-f1 {
label = "GPIO Key F1"; label = "GPIO Key F1";
linux,code = <KEY_F1>; linux,code = <KEY_F1>;
gpios = <&gpio_pca 0 GPIO_ACTIVE_LOW>; gpios = <&gpio_pca 0 GPIO_ACTIVE_LOW>;
}; };
f2 { key-f2 {
label = "GPIO Key F2"; label = "GPIO Key F2";
linux,code = <KEY_F2>; linux,code = <KEY_F2>;
gpios = <&gpio_pca 1 GPIO_ACTIVE_LOW>; gpios = <&gpio_pca 1 GPIO_ACTIVE_LOW>;
}; };
f3 { key-f3 {
label = "GPIO Key F3"; label = "GPIO Key F3";
linux,code = <KEY_F3>; linux,code = <KEY_F3>;
gpios = <&gpio_pca 2 GPIO_ACTIVE_LOW>; gpios = <&gpio_pca 2 GPIO_ACTIVE_LOW>;
}; };
f4 { key-f4 {
label = "GPIO Key F4"; label = "GPIO Key F4";
linux,code = <KEY_F4>; linux,code = <KEY_F4>;
gpios = <&gpio_pca 3 GPIO_ACTIVE_LOW>; gpios = <&gpio_pca 3 GPIO_ACTIVE_LOW>;
}; };
f5 { key-f5 {
label = "GPIO Key F5"; label = "GPIO Key F5";
linux,code = <KEY_F5>; linux,code = <KEY_F5>;
gpios = <&gpio_pca 4 GPIO_ACTIVE_LOW>; gpios = <&gpio_pca 4 GPIO_ACTIVE_LOW>;
}; };
cycle { key-cycle {
label = "GPIO Key CYCLE"; label = "GPIO Key CYCLE";
linux,code = <KEY_CYCLEWINDOWS>; linux,code = <KEY_CYCLEWINDOWS>;
gpios = <&gpio_pca 5 GPIO_ACTIVE_LOW>; gpios = <&gpio_pca 5 GPIO_ACTIVE_LOW>;
}; };
esc { key-esc {
label = "GPIO Key ESC"; label = "GPIO Key ESC";
linux,code = <KEY_ESC>; linux,code = <KEY_ESC>;
gpios = <&gpio_pca 6 GPIO_ACTIVE_LOW>; gpios = <&gpio_pca 6 GPIO_ACTIVE_LOW>;
}; };
up { key-up {
label = "GPIO Key UP"; label = "GPIO Key UP";
linux,code = <KEY_UP>; linux,code = <KEY_UP>;
gpios = <&gpio_pca 7 GPIO_ACTIVE_LOW>; gpios = <&gpio_pca 7 GPIO_ACTIVE_LOW>;
}; };
down { key-down {
label = "GPIO Key DOWN"; label = "GPIO Key DOWN";
linux,code = <KEY_DOWN>; linux,code = <KEY_DOWN>;
gpios = <&gpio_pca 8 GPIO_ACTIVE_LOW>; gpios = <&gpio_pca 8 GPIO_ACTIVE_LOW>;
}; };
ok { key-ok {
label = "GPIO Key OK"; label = "GPIO Key OK";
linux,code = <KEY_OK>; linux,code = <KEY_OK>;
gpios = <&gpio_pca 9 GPIO_ACTIVE_LOW>; gpios = <&gpio_pca 9 GPIO_ACTIVE_LOW>;
}; };
f6 { key-f6 {
label = "GPIO Key F6"; label = "GPIO Key F6";
linux,code = <KEY_F6>; linux,code = <KEY_F6>;
gpios = <&gpio_pca 10 GPIO_ACTIVE_LOW>; gpios = <&gpio_pca 10 GPIO_ACTIVE_LOW>;
}; };
f7 { key-f7 {
label = "GPIO Key F7"; label = "GPIO Key F7";
linux,code = <KEY_F7>; linux,code = <KEY_F7>;
gpios = <&gpio_pca 11 GPIO_ACTIVE_LOW>; gpios = <&gpio_pca 11 GPIO_ACTIVE_LOW>;
}; };
f8 { key-f8 {
label = "GPIO Key F8"; label = "GPIO Key F8";
linux,code = <KEY_F8>; linux,code = <KEY_F8>;
gpios = <&gpio_pca 12 GPIO_ACTIVE_LOW>; gpios = <&gpio_pca 12 GPIO_ACTIVE_LOW>;
}; };
f9 { key-f9 {
label = "GPIO Key F9"; label = "GPIO Key F9";
linux,code = <KEY_F9>; linux,code = <KEY_F9>;
gpios = <&gpio_pca 13 GPIO_ACTIVE_LOW>; gpios = <&gpio_pca 13 GPIO_ACTIVE_LOW>;
}; };
f10 { key-f10 {
label = "GPIO Key F10"; label = "GPIO Key F10";
linux,code = <KEY_F10>; linux,code = <KEY_F10>;
gpios = <&gpio_pca 14 GPIO_ACTIVE_LOW>; gpios = <&gpio_pca 14 GPIO_ACTIVE_LOW>;
......
arch/arm/boot/dts/imx6dl-prtvt7.dts
View file @ 07d0db46
...@@ -62,91 +62,91 @@ keys { ...@@ -62,91 +62,91 @@ keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
autorepeat; autorepeat;
esc { key-esc {
label = "GPIO Key ESC"; label = "GPIO Key ESC";
linux,code = <KEY_ESC>; linux,code = <KEY_ESC>;
gpios = <&gpio_pca 0 GPIO_ACTIVE_LOW>; gpios = <&gpio_pca 0 GPIO_ACTIVE_LOW>;
}; };
up { key-up {
label = "GPIO Key UP"; label = "GPIO Key UP";
linux,code = <KEY_UP>; linux,code = <KEY_UP>;
gpios = <&gpio_pca 1 GPIO_ACTIVE_LOW>; gpios = <&gpio_pca 1 GPIO_ACTIVE_LOW>;
}; };
down { key-down {
label = "GPIO Key DOWN"; label = "GPIO Key DOWN";
linux,code = <KEY_DOWN>; linux,code = <KEY_DOWN>;
gpios = <&gpio_pca 4 GPIO_ACTIVE_LOW>; gpios = <&gpio_pca 4 GPIO_ACTIVE_LOW>;
}; };
enter { key-enter {
label = "GPIO Key Enter"; label = "GPIO Key Enter";
linux,code = <KEY_ENTER>; linux,code = <KEY_ENTER>;
gpios = <&gpio_pca 3 GPIO_ACTIVE_LOW>; gpios = <&gpio_pca 3 GPIO_ACTIVE_LOW>;
}; };
cycle { key-cycle {
label = "GPIO Key CYCLE"; label = "GPIO Key CYCLE";
linux,code = <KEY_CYCLEWINDOWS>; linux,code = <KEY_CYCLEWINDOWS>;
gpios = <&gpio_pca 2 GPIO_ACTIVE_LOW>; gpios = <&gpio_pca 2 GPIO_ACTIVE_LOW>;
}; };
f1 { key-f1 {
label = "GPIO Key F1"; label = "GPIO Key F1";
linux,code = <KEY_F1>; linux,code = <KEY_F1>;
gpios = <&gpio_pca 14 GPIO_ACTIVE_LOW>; gpios = <&gpio_pca 14 GPIO_ACTIVE_LOW>;
}; };
f2 { key-f2 {
label = "GPIO Key F2"; label = "GPIO Key F2";
linux,code = <KEY_F2>; linux,code = <KEY_F2>;
gpios = <&gpio_pca 13 GPIO_ACTIVE_LOW>; gpios = <&gpio_pca 13 GPIO_ACTIVE_LOW>;
}; };
f3 { key-f3 {
label = "GPIO Key F3"; label = "GPIO Key F3";
linux,code = <KEY_F3>; linux,code = <KEY_F3>;
gpios = <&gpio_pca 12 GPIO_ACTIVE_LOW>; gpios = <&gpio_pca 12 GPIO_ACTIVE_LOW>;
}; };
f4 { key-f4 {
label = "GPIO Key F4"; label = "GPIO Key F4";
linux,code = <KEY_F4>; linux,code = <KEY_F4>;
gpios = <&gpio_pca 11 GPIO_ACTIVE_LOW>; gpios = <&gpio_pca 11 GPIO_ACTIVE_LOW>;
}; };
f5 { key-f5 {
label = "GPIO Key F5"; label = "GPIO Key F5";
linux,code = <KEY_F5>; linux,code = <KEY_F5>;
gpios = <&gpio_pca 10 GPIO_ACTIVE_LOW>; gpios = <&gpio_pca 10 GPIO_ACTIVE_LOW>;
}; };
f6 { key-f6 {
label = "GPIO Key F6"; label = "GPIO Key F6";
linux,code = <KEY_F6>; linux,code = <KEY_F6>;
gpios = <&gpio_pca 5 GPIO_ACTIVE_LOW>; gpios = <&gpio_pca 5 GPIO_ACTIVE_LOW>;
}; };
f7 { key-f7 {
label = "GPIO Key F7"; label = "GPIO Key F7";
linux,code = <KEY_F7>; linux,code = <KEY_F7>;
gpios = <&gpio_pca 6 GPIO_ACTIVE_LOW>; gpios = <&gpio_pca 6 GPIO_ACTIVE_LOW>;
}; };
f8 { key-f8 {
label = "GPIO Key F8"; label = "GPIO Key F8";
linux,code = <KEY_F8>; linux,code = <KEY_F8>;
gpios = <&gpio_pca 7 GPIO_ACTIVE_LOW>; gpios = <&gpio_pca 7 GPIO_ACTIVE_LOW>;
}; };
f9 { key-f9 {
label = "GPIO Key F9"; label = "GPIO Key F9";
linux,code = <KEY_F9>; linux,code = <KEY_F9>;
gpios = <&gpio_pca 8 GPIO_ACTIVE_LOW>; gpios = <&gpio_pca 8 GPIO_ACTIVE_LOW>;
}; };
f10 { key-f10 {
label = "GPIO Key F10"; label = "GPIO Key F10";
linux,code = <KEY_F10>; linux,code = <KEY_F10>;
gpios = <&gpio_pca 9 GPIO_ACTIVE_LOW>; gpios = <&gpio_pca 9 GPIO_ACTIVE_LOW>;
......
arch/arm/boot/dts/imx6dl-riotboard.dts
View file @ 07d0db46
...@@ -90,6 +90,7 @@ &fec { ...@@ -90,6 +90,7 @@ &fec {
pinctrl-0 = <&pinctrl_enet>; pinctrl-0 = <&pinctrl_enet>;
phy-mode = "rgmii-id"; phy-mode = "rgmii-id";
phy-handle = <&rgmii_phy>; phy-handle = <&rgmii_phy>;
/delete-property/ interrupts;
interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>,
<&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
fsl,err006687-workaround-present; fsl,err006687-workaround-present;
......
arch/arm/boot/dts/imx6dl-victgo.dts
View file @ 07d0db46
...@@ -18,14 +18,14 @@ gpio-keys { ...@@ -18,14 +18,14 @@ gpio-keys {
pinctrl-0 = <&pinctrl_gpiokeys>; pinctrl-0 = <&pinctrl_gpiokeys>;
autorepeat; autorepeat;
power { key-power {
label = "Power Button"; label = "Power Button";
gpios = <&gpio2 23 GPIO_ACTIVE_LOW>; gpios = <&gpio2 23 GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
wakeup-source; wakeup-source;
}; };
enter { key-enter {
label = "Rotary Key"; label = "Rotary Key";
gpios = <&gpio2 05 GPIO_ACTIVE_LOW>; gpios = <&gpio2 05 GPIO_ACTIVE_LOW>;
linux,code = <KEY_ENTER>; linux,code = <KEY_ENTER>;
......
arch/arm/boot/dts/imx6dl-yapp4-common.dtsi
View file @ 07d0db46
...@@ -55,6 +55,7 @@ lcd_display_out: endpoint { ...@@ -55,6 +55,7 @@ lcd_display_out: endpoint {
panel: panel { panel: panel {
compatible = "dataimage,scf0700c48ggu18"; compatible = "dataimage,scf0700c48ggu18";
power-supply = <&sw2_reg>; power-supply = <&sw2_reg>;
backlight = <&backlight>;
status = "disabled"; status = "disabled";
port { port {
......
arch/arm/boot/dts/imx6dl.dtsi
View file @ 07d0db46
...@@ -84,6 +84,9 @@ soc: soc { ...@@ -84,6 +84,9 @@ soc: soc {
ocram: sram@900000 { ocram: sram@900000 {
compatible = "mmio-sram"; compatible = "mmio-sram";
reg = <0x00900000 0x20000>; reg = <0x00900000 0x20000>;
ranges = <0 0x00900000 0x20000>;
#address-cells = <1>;
#size-cells = <1>;
clocks = <&clks IMX6QDL_CLK_OCRAM>; clocks = <&clks IMX6QDL_CLK_OCRAM>;
}; };
......
arch/arm/boot/dts/imx6q-arm2.dts
View file @ 07d0db46
...@@ -178,6 +178,7 @@ &fec { ...@@ -178,6 +178,7 @@ &fec {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_enet>; pinctrl-0 = <&pinctrl_enet>;
phy-mode = "rgmii"; phy-mode = "rgmii";
/delete-property/ interrupts;
interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>,
<&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
fsl,err006687-workaround-present; fsl,err006687-workaround-present;
......
arch/arm/boot/dts/imx6q-evi.dts
View file @ 07d0db46
...@@ -146,6 +146,7 @@ &fec { ...@@ -146,6 +146,7 @@ &fec {
pinctrl-0 = <&pinctrl_enet>; pinctrl-0 = <&pinctrl_enet>;
phy-mode = "rgmii"; phy-mode = "rgmii";
phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>; phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;
/delete-property/ interrupts;
interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>,
<&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
fsl,err006687-workaround-present; fsl,err006687-workaround-present;
......
arch/arm/boot/dts/imx6q-mccmon6.dts
View file @ 07d0db46
...@@ -100,8 +100,10 @@ &fec { ...@@ -100,8 +100,10 @@ &fec {
pinctrl-0 = <&pinctrl_enet>; pinctrl-0 = <&pinctrl_enet>;
phy-mode = "rgmii"; phy-mode = "rgmii";
phy-reset-gpios = <&gpio1 27 GPIO_ACTIVE_LOW>; phy-reset-gpios = <&gpio1 27 GPIO_ACTIVE_LOW>;
/delete-property/ interrupts;
interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>,
<&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
fsl,err006687-workaround-present;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/imx6q-novena.dts
View file @ 07d0db46
...@@ -86,7 +86,7 @@ user-button { ...@@ -86,7 +86,7 @@ user-button {
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
}; };
lid { lid-event {
label = "Lid"; label = "Lid";
gpios = <&gpio4 12 GPIO_ACTIVE_LOW>; gpios = <&gpio4 12 GPIO_ACTIVE_LOW>;
linux,input-type = <5>; /* EV_SW */ linux,input-type = <5>; /* EV_SW */
...@@ -99,7 +99,7 @@ leds { ...@@ -99,7 +99,7 @@ leds {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_leds_novena>; pinctrl-0 = <&pinctrl_leds_novena>;
heartbeat { led-heartbeat {
label = "novena:white:panel"; label = "novena:white:panel";
gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "default-on"; linux,default-trigger = "default-on";
......
arch/arm/boot/dts/imx6q-pistachio.dts
View file @ 07d0db46
...@@ -100,7 +100,7 @@ gpio-keys { ...@@ -100,7 +100,7 @@ gpio-keys {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpio_keys>; pinctrl-0 = <&pinctrl_gpio_keys>;
power { key-power {
label = "Power Button"; label = "Power Button";
gpios = <&gpio2 12 GPIO_ACTIVE_LOW>; gpios = <&gpio2 12 GPIO_ACTIVE_LOW>;
wakeup-source; wakeup-source;
......
arch/arm/boot/dts/imx6q-sabrelite.dts
View file @ 07d0db46
// SPDX-License-Identifier: GPL-2.0 OR X11
/* /*
* Copyright 2011 Freescale Semiconductor, Inc. * Copyright 2011 Freescale Semiconductor, Inc.
* Copyright 2011 Linaro Ltd. * Copyright 2011 Linaro Ltd.
* *
* This file is dual-licensed: you can use it either under the terms
* of the GPL or the X11 license, at your option. Note that this dual
* licensing only applies to this file, and not this project as a
* whole.
*
* a) This file is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* version 2 as published by the Free Software Foundation.
*
* This file is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* Or, alternatively,
*
* b) Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
* files (the "Software"), to deal in the Software without
* restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following
* conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*/ */
/dts-v1/; /dts-v1/;
......
arch/arm/boot/dts/imx6q-utilite-pro.dts
View file @ 07d0db46
...@@ -89,7 +89,7 @@ gpio-keys { ...@@ -89,7 +89,7 @@ gpio-keys {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpio_keys>; pinctrl-0 = <&pinctrl_gpio_keys>;
power { key-power {
label = "Power Button"; label = "Power Button";
gpios = <&gpio1 29 GPIO_ACTIVE_LOW>; gpios = <&gpio1 29 GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
......
arch/arm/boot/dts/imx6q-var-dt6customboard.dts
View file @ 07d0db46
...@@ -28,7 +28,7 @@ gpio-keys { ...@@ -28,7 +28,7 @@ gpio-keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
autorepeat; autorepeat;
back { key-back {
gpios = <&gpio4 26 GPIO_ACTIVE_LOW>; gpios = <&gpio4 26 GPIO_ACTIVE_LOW>;
linux,code = <KEY_BACK>; linux,code = <KEY_BACK>;
label = "Key Back"; label = "Key Back";
...@@ -37,7 +37,7 @@ back { ...@@ -37,7 +37,7 @@ back {
wakeup-source; wakeup-source;
}; };
home { key-home {
gpios = <&gpio5 11 GPIO_ACTIVE_LOW>; gpios = <&gpio5 11 GPIO_ACTIVE_LOW>;
linux,code = <KEY_HOME>; linux,code = <KEY_HOME>;
label = "Key Home"; label = "Key Home";
...@@ -46,7 +46,7 @@ home { ...@@ -46,7 +46,7 @@ home {
wakeup-source; wakeup-source;
}; };
menu { key-menu {
gpios = <&gpio4 25 GPIO_ACTIVE_LOW>; gpios = <&gpio4 25 GPIO_ACTIVE_LOW>;
linux,code = <KEY_MENU>; linux,code = <KEY_MENU>;
label = "Key Menu"; label = "Key Menu";
......
arch/arm/boot/dts/imx6q.dtsi
View file @ 07d0db46
...@@ -163,6 +163,9 @@ soc: soc { ...@@ -163,6 +163,9 @@ soc: soc {
ocram: sram@900000 { ocram: sram@900000 {
compatible = "mmio-sram"; compatible = "mmio-sram";
reg = <0x00900000 0x40000>; reg = <0x00900000 0x40000>;
ranges = <0 0x00900000 0x40000>;
#address-cells = <1>;
#size-cells = <1>;
clocks = <&clks IMX6QDL_CLK_OCRAM>; clocks = <&clks IMX6QDL_CLK_OCRAM>;
}; };
......
arch/arm/boot/dts/imx6qdl-dhcom-pdk2.dtsi
View file @ 07d0db46
...@@ -332,37 +332,4 @@ MX6QDL_PAD_EIM_D29__GPIO3_IO29 0xb0 /* Reset */ ...@@ -332,37 +332,4 @@ MX6QDL_PAD_EIM_D29__GPIO3_IO29 0xb0 /* Reset */
MX6QDL_PAD_GPIO_0__GPIO1_IO00 0xb1 /* Int */ MX6QDL_PAD_GPIO_0__GPIO1_IO00 0xb1 /* Int */
>; >;
}; };
pinctrl_ipu1_lcdif: ipu1-lcdif-grp {
fsl,pins = <
MX6QDL_PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK 0x38
MX6QDL_PAD_DI0_PIN2__IPU1_DI0_PIN02 0x38
MX6QDL_PAD_DI0_PIN3__IPU1_DI0_PIN03 0x38
MX6QDL_PAD_DI0_PIN15__IPU1_DI0_PIN15 0x38
MX6QDL_PAD_DISP0_DAT0__IPU1_DISP0_DATA00 0x38
MX6QDL_PAD_DISP0_DAT1__IPU1_DISP0_DATA01 0x38
MX6QDL_PAD_DISP0_DAT2__IPU1_DISP0_DATA02 0x38
MX6QDL_PAD_DISP0_DAT3__IPU1_DISP0_DATA03 0x38
MX6QDL_PAD_DISP0_DAT4__IPU1_DISP0_DATA04 0x38
MX6QDL_PAD_DISP0_DAT5__IPU1_DISP0_DATA05 0x38
MX6QDL_PAD_DISP0_DAT6__IPU1_DISP0_DATA06 0x38
MX6QDL_PAD_DISP0_DAT7__IPU1_DISP0_DATA07 0x38
MX6QDL_PAD_DISP0_DAT8__IPU1_DISP0_DATA08 0x38
MX6QDL_PAD_DISP0_DAT9__IPU1_DISP0_DATA09 0x38
MX6QDL_PAD_DISP0_DAT10__IPU1_DISP0_DATA10 0x38
MX6QDL_PAD_DISP0_DAT11__IPU1_DISP0_DATA11 0x38
MX6QDL_PAD_DISP0_DAT12__IPU1_DISP0_DATA12 0x38
MX6QDL_PAD_DISP0_DAT13__IPU1_DISP0_DATA13 0x38
MX6QDL_PAD_DISP0_DAT14__IPU1_DISP0_DATA14 0x38
MX6QDL_PAD_DISP0_DAT15__IPU1_DISP0_DATA15 0x38
MX6QDL_PAD_DISP0_DAT16__IPU1_DISP0_DATA16 0x38
MX6QDL_PAD_DISP0_DAT17__IPU1_DISP0_DATA17 0x38
MX6QDL_PAD_DISP0_DAT18__IPU1_DISP0_DATA18 0x38
MX6QDL_PAD_DISP0_DAT19__IPU1_DISP0_DATA19 0x38
MX6QDL_PAD_DISP0_DAT20__IPU1_DISP0_DATA20 0x38
MX6QDL_PAD_DISP0_DAT21__IPU1_DISP0_DATA21 0x38
MX6QDL_PAD_DISP0_DAT22__IPU1_DISP0_DATA22 0x38
MX6QDL_PAD_DISP0_DAT23__IPU1_DISP0_DATA23 0x38
>;
};
}; };
arch/arm/boot/dts/imx6qdl-dhcom-som.dtsi
View file @ 07d0db46
...@@ -667,6 +667,39 @@ MX6QDL_PAD_GPIO_6__GPIO1_IO06 0x4001b8b1 ...@@ -667,6 +667,39 @@ MX6QDL_PAD_GPIO_6__GPIO1_IO06 0x4001b8b1
>; >;
}; };
pinctrl_ipu1_lcdif: ipu1-lcdif-grp {
fsl,pins = <
MX6QDL_PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK 0x38
MX6QDL_PAD_DI0_PIN2__IPU1_DI0_PIN02 0x38
MX6QDL_PAD_DI0_PIN3__IPU1_DI0_PIN03 0x38
MX6QDL_PAD_DI0_PIN15__IPU1_DI0_PIN15 0x38
MX6QDL_PAD_DISP0_DAT0__IPU1_DISP0_DATA00 0x38
MX6QDL_PAD_DISP0_DAT1__IPU1_DISP0_DATA01 0x38
MX6QDL_PAD_DISP0_DAT2__IPU1_DISP0_DATA02 0x38
MX6QDL_PAD_DISP0_DAT3__IPU1_DISP0_DATA03 0x38
MX6QDL_PAD_DISP0_DAT4__IPU1_DISP0_DATA04 0x38
MX6QDL_PAD_DISP0_DAT5__IPU1_DISP0_DATA05 0x38
MX6QDL_PAD_DISP0_DAT6__IPU1_DISP0_DATA06 0x38
MX6QDL_PAD_DISP0_DAT7__IPU1_DISP0_DATA07 0x38
MX6QDL_PAD_DISP0_DAT8__IPU1_DISP0_DATA08 0x38
MX6QDL_PAD_DISP0_DAT9__IPU1_DISP0_DATA09 0x38
MX6QDL_PAD_DISP0_DAT10__IPU1_DISP0_DATA10 0x38
MX6QDL_PAD_DISP0_DAT11__IPU1_DISP0_DATA11 0x38
MX6QDL_PAD_DISP0_DAT12__IPU1_DISP0_DATA12 0x38
MX6QDL_PAD_DISP0_DAT13__IPU1_DISP0_DATA13 0x38
MX6QDL_PAD_DISP0_DAT14__IPU1_DISP0_DATA14 0x38
MX6QDL_PAD_DISP0_DAT15__IPU1_DISP0_DATA15 0x38
MX6QDL_PAD_DISP0_DAT16__IPU1_DISP0_DATA16 0x38
MX6QDL_PAD_DISP0_DAT17__IPU1_DISP0_DATA17 0x38
MX6QDL_PAD_DISP0_DAT18__IPU1_DISP0_DATA18 0x38
MX6QDL_PAD_DISP0_DAT19__IPU1_DISP0_DATA19 0x38
MX6QDL_PAD_DISP0_DAT20__IPU1_DISP0_DATA20 0x38
MX6QDL_PAD_DISP0_DAT21__IPU1_DISP0_DATA21 0x38
MX6QDL_PAD_DISP0_DAT22__IPU1_DISP0_DATA22 0x38
MX6QDL_PAD_DISP0_DAT23__IPU1_DISP0_DATA23 0x38
>;
};
pinctrl_pcie: pcie-grp { pinctrl_pcie: pcie-grp {
fsl,pins = < fsl,pins = <
MX6QDL_PAD_CSI0_DATA_EN__GPIO5_IO20 0x1b0b1 /* Wake */ MX6QDL_PAD_CSI0_DATA_EN__GPIO5_IO20 0x1b0b1 /* Wake */
......
arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
View file @ 07d0db46
...@@ -137,6 +137,16 @@ reg_5p0v: regulator-5p0v { ...@@ -137,6 +137,16 @@ reg_5p0v: regulator-5p0v {
regulator-always-on; regulator-always-on;
}; };
reg_can1_stby: regulator-can1-stby {
compatible = "regulator-fixed";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_reg_can1>;
regulator-name = "can1_stby";
gpio = <&gpio1 9 GPIO_ACTIVE_LOW>;
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
reg_usb_otg_vbus: regulator-usb-otg-vbus { reg_usb_otg_vbus: regulator-usb-otg-vbus {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "usb_otg_vbus"; regulator-name = "usb_otg_vbus";
...@@ -170,6 +180,7 @@ &audmux { ...@@ -170,6 +180,7 @@ &audmux {
&can1 { &can1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_flexcan1>; pinctrl-0 = <&pinctrl_flexcan1>;
xceiver-supply = <&reg_can1_stby>;
status = "okay"; status = "okay";
}; };
...@@ -612,7 +623,6 @@ pinctrl_flexcan1: flexcan1grp { ...@@ -612,7 +623,6 @@ pinctrl_flexcan1: flexcan1grp {
fsl,pins = < fsl,pins = <
MX6QDL_PAD_KEY_ROW2__FLEXCAN1_RX 0x1b0b1 MX6QDL_PAD_KEY_ROW2__FLEXCAN1_RX 0x1b0b1
MX6QDL_PAD_KEY_COL2__FLEXCAN1_TX 0x1b0b1 MX6QDL_PAD_KEY_COL2__FLEXCAN1_TX 0x1b0b1
MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x4001b0b0 /* CAN_STBY */
>; >;
}; };
...@@ -702,6 +712,12 @@ MX6QDL_PAD_SD1_CMD__PWM4_OUT 0x1b0b1 ...@@ -702,6 +712,12 @@ MX6QDL_PAD_SD1_CMD__PWM4_OUT 0x1b0b1
>; >;
}; };
pinctrl_reg_can1: regcan1grp {
fsl,pins = <
MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x4001b0b0 /* CAN_STBY */
>;
};
pinctrl_uart1: uart1grp { pinctrl_uart1: uart1grp {
fsl,pins = < fsl,pins = <
MX6QDL_PAD_SD3_DAT7__UART1_TX_DATA 0x1b0b1 MX6QDL_PAD_SD3_DAT7__UART1_TX_DATA 0x1b0b1
......
arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
View file @ 07d0db46
...@@ -129,6 +129,16 @@ reg_3p3v: regulator-3p3v { ...@@ -129,6 +129,16 @@ reg_3p3v: regulator-3p3v {
regulator-always-on; regulator-always-on;
}; };
reg_can1_stby: regulator-can1-stby {
compatible = "regulator-fixed";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_reg_can1>;
regulator-name = "can1_stby";
gpio = <&gpio1 2 GPIO_ACTIVE_LOW>;
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
reg_usb_h1_vbus: regulator-usb-h1-vbus { reg_usb_h1_vbus: regulator-usb-h1-vbus {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "usb_h1_vbus"; regulator-name = "usb_h1_vbus";
...@@ -170,6 +180,7 @@ &audmux { ...@@ -170,6 +180,7 @@ &audmux {
&can1 { &can1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_flexcan1>; pinctrl-0 = <&pinctrl_flexcan1>;
xceiver-supply = <&reg_can1_stby>;
status = "okay"; status = "okay";
}; };
...@@ -600,7 +611,6 @@ pinctrl_flexcan1: flexcan1grp { ...@@ -600,7 +611,6 @@ pinctrl_flexcan1: flexcan1grp {
fsl,pins = < fsl,pins = <
MX6QDL_PAD_KEY_ROW2__FLEXCAN1_RX 0x1b0b1 MX6QDL_PAD_KEY_ROW2__FLEXCAN1_RX 0x1b0b1
MX6QDL_PAD_KEY_COL2__FLEXCAN1_TX 0x1b0b1 MX6QDL_PAD_KEY_COL2__FLEXCAN1_TX 0x1b0b1
MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x4001b0b0 /* CAN_STBY */
>; >;
}; };
...@@ -691,6 +701,12 @@ MX6QDL_PAD_SD1_CMD__PWM4_OUT 0x1b0b1 ...@@ -691,6 +701,12 @@ MX6QDL_PAD_SD1_CMD__PWM4_OUT 0x1b0b1
>; >;
}; };
pinctrl_reg_can1: regcan1grp {
fsl,pins = <
MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x4001b0b0 /* CAN_STBY */
>;
};
pinctrl_uart1: uart1grp { pinctrl_uart1: uart1grp {
fsl,pins = < fsl,pins = <
MX6QDL_PAD_SD3_DAT7__UART1_TX_DATA 0x1b0b1 MX6QDL_PAD_SD3_DAT7__UART1_TX_DATA 0x1b0b1
......
arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
View file @ 07d0db46
...@@ -137,6 +137,16 @@ reg_3p3v: regulator@1 { ...@@ -137,6 +137,16 @@ reg_3p3v: regulator@1 {
regulator-always-on; regulator-always-on;
}; };
reg_can1_stby: regulator-can1-stby {
compatible = "regulator-fixed";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_reg_can1>;
regulator-name = "can1_stby";
gpio = <&gpio1 2 GPIO_ACTIVE_LOW>;
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
reg_usb_h1_vbus: regulator@2 { reg_usb_h1_vbus: regulator@2 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <2>; reg = <2>;
...@@ -200,6 +210,7 @@ IMX_AUDMUX_V2_PTCR_SYN ...@@ -200,6 +210,7 @@ IMX_AUDMUX_V2_PTCR_SYN
&can1 { &can1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_flexcan1>; pinctrl-0 = <&pinctrl_flexcan1>;
xceiver-supply = <&reg_can1_stby>;
status = "okay"; status = "okay";
}; };
...@@ -687,7 +698,6 @@ pinctrl_flexcan1: flexcan1grp { ...@@ -687,7 +698,6 @@ pinctrl_flexcan1: flexcan1grp {
fsl,pins = < fsl,pins = <
MX6QDL_PAD_KEY_ROW2__FLEXCAN1_RX 0x1b0b1 MX6QDL_PAD_KEY_ROW2__FLEXCAN1_RX 0x1b0b1
MX6QDL_PAD_KEY_COL2__FLEXCAN1_TX 0x1b0b1 MX6QDL_PAD_KEY_COL2__FLEXCAN1_TX 0x1b0b1
MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x4001b0b0 /* CAN_STBY */
>; >;
}; };
...@@ -786,6 +796,12 @@ MX6QDL_PAD_SD4_DAT2__PWM4_OUT 0x1b0b1 ...@@ -786,6 +796,12 @@ MX6QDL_PAD_SD4_DAT2__PWM4_OUT 0x1b0b1
>; >;
}; };
pinctrl_reg_can1: regcan1grp {
fsl,pins = <
MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x4001b0b0 /* CAN_STBY */
>;
};
pinctrl_uart1: uart1grp { pinctrl_uart1: uart1grp {
fsl,pins = < fsl,pins = <
MX6QDL_PAD_SD3_DAT7__UART1_TX_DATA 0x1b0b1 MX6QDL_PAD_SD3_DAT7__UART1_TX_DATA 0x1b0b1
......
arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi
View file @ 07d0db46
...@@ -270,7 +270,23 @@ &fec { ...@@ -270,7 +270,23 @@ &fec {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_enet>; pinctrl-0 = <&pinctrl_enet>;
phy-mode = "rgmii"; phy-mode = "rgmii";
phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>; phy-handle = <&ethphy>;
mdio {
#address-cells = <1>;
#size-cells = <0>;
ethphy: ethernet-phy@1 {
compatible = "ethernet-phy-ieee802.3-c22";
reg = <1>;
reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;
reset-assert-us = <1000>;
};
};
};
&hdmi {
ddc-i2c-bus = <&i2c2>;
}; };
&i2c_intern { &i2c_intern {
...@@ -397,7 +413,7 @@ &i2c1 { ...@@ -397,7 +413,7 @@ &i2c1 {
/* HDMI_CTRL */ /* HDMI_CTRL */
&i2c2 { &i2c2 {
clock-frequency = <375000>; clock-frequency = <100000>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c2>; pinctrl-0 = <&pinctrl_i2c2>;
}; };
......
arch/arm/boot/dts/imx6qdl-mba6.dtsi
View file @ 07d0db46
...@@ -244,7 +244,6 @@ &uart2 { ...@@ -244,7 +244,6 @@ &uart2 {
status = "okay"; status = "okay";
}; };
&uart3 { &uart3 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart3>; pinctrl-0 = <&pinctrl_uart3>;
......
arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi
View file @ 07d0db46
...@@ -192,6 +192,7 @@ &fec { ...@@ -192,6 +192,7 @@ &fec {
phy-mode = "rgmii"; phy-mode = "rgmii";
phy-handle = <&ethphy>; phy-handle = <&ethphy>;
phy-reset-gpios = <&gpio1 27 GPIO_ACTIVE_LOW>; phy-reset-gpios = <&gpio1 27 GPIO_ACTIVE_LOW>;
/delete-property/ interrupts;
interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>,
<&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
fsl,err006687-workaround-present; fsl,err006687-workaround-present;
......
arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
View file @ 07d0db46
...@@ -334,6 +334,7 @@ &fec { ...@@ -334,6 +334,7 @@ &fec {
phy-mode = "rgmii"; phy-mode = "rgmii";
phy-handle = <&ethphy>; phy-handle = <&ethphy>;
phy-reset-gpios = <&gpio1 27 GPIO_ACTIVE_LOW>; phy-reset-gpios = <&gpio1 27 GPIO_ACTIVE_LOW>;
/delete-property/ interrupts;
interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>,
<&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
fsl,err006687-workaround-present; fsl,err006687-workaround-present;
......
arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi
View file @ 07d0db46
...@@ -263,6 +263,7 @@ &fec { ...@@ -263,6 +263,7 @@ &fec {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_enet>; pinctrl-0 = <&pinctrl_enet>;
phy-mode = "rgmii"; phy-mode = "rgmii";
/delete-property/ interrupts;
interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>,
<&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
fsl,err006687-workaround-present; fsl,err006687-workaround-present;
......
arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
View file @ 07d0db46
...@@ -267,6 +267,7 @@ &fec { ...@@ -267,6 +267,7 @@ &fec {
phy-mode = "rgmii"; phy-mode = "rgmii";
phy-handle = <&ethphy>; phy-handle = <&ethphy>;
phy-reset-gpios = <&gpio1 27 GPIO_ACTIVE_LOW>; phy-reset-gpios = <&gpio1 27 GPIO_ACTIVE_LOW>;
/delete-property/ interrupts;
interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>,
<&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
fsl,err006687-workaround-present; fsl,err006687-workaround-present;
......
arch/arm/boot/dts/imx6qdl-phytec-mira-peb-av-02.dtsi
View file @ 07d0db46
...@@ -64,7 +64,7 @@ edt_ft5x06: touchscreen@38 { ...@@ -64,7 +64,7 @@ edt_ft5x06: touchscreen@38 {
interrupt-parent = <&gpio3>; interrupt-parent = <&gpio3>;
interrupts = <2 IRQ_TYPE_NONE>; interrupts = <2 IRQ_TYPE_NONE>;
status = "disabled"; status = "disabled";
}; };
}; };
&ipu1_di0_disp0 { &ipu1_di0_disp0 {
......
arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
View file @ 07d0db46
...@@ -295,6 +295,7 @@ &fec { ...@@ -295,6 +295,7 @@ &fec {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_enet>; pinctrl-0 = <&pinctrl_enet>;
phy-mode = "rgmii-id"; phy-mode = "rgmii-id";
/delete-property/ interrupts;
interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>,
<&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
fsl,err006687-workaround-present; fsl,err006687-workaround-present;
......
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
View file @ 07d0db46
// SPDX-License-Identifier: GPL-2.0 OR X11
/* /*
* Copyright 2011 Freescale Semiconductor, Inc. * Copyright 2011 Freescale Semiconductor, Inc.
* Copyright 2011 Linaro Ltd. * Copyright 2011 Linaro Ltd.
* *
* This file is dual-licensed: you can use it either under the terms
* of the GPL or the X11 license, at your option. Note that this dual
* licensing only applies to this file, and not this project as a
* whole.
*
* a) This file is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* version 2 as published by the Free Software Foundation.
*
* This file is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* Or, alternatively,
*
* b) Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
* files (the "Software"), to deal in the Software without
* restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following
* conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*/ */
#include <dt-bindings/clock/imx6qdl-clock.h> #include <dt-bindings/clock/imx6qdl-clock.h>
......
arch/arm/boot/dts/imx6qdl-skov-cpu-revc.dtsi
View file @ 07d0db46
...@@ -2,35 +2,60 @@ ...@@ -2,35 +2,60 @@
// //
// Copyright (C) 2020 Pengutronix, Ulrich Oelmann <kernel@pengutronix.de> // Copyright (C) 2020 Pengutronix, Ulrich Oelmann <kernel@pengutronix.de>
/ {
touchscreen {
compatible = "resistive-adc-touch";
io-channels = <&adc_ts 1>, <&adc_ts 3>, <&adc_ts 4>, <&adc_ts 5>;
io-channel-names = "y", "z1", "z2", "x";
touchscreen-min-pressure = <65000>;
touchscreen-inverted-y;
touchscreen-swapped-x-y;
touchscreen-x-plate-ohms = <300>;
touchscreen-y-plate-ohms = <800>;
};
};
&ecspi4 { &ecspi4 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi4>; pinctrl-0 = <&pinctrl_ecspi4>;
cs-gpios = <&gpio3 20 GPIO_ACTIVE_LOW>; cs-gpios = <&gpio3 20 GPIO_ACTIVE_LOW>;
status = "okay"; status = "okay";
touchscreen@0 { adc_ts: adc@0 {
pinctrl-names = "default"; compatible = "ti,tsc2046e-adc";
pinctrl-0 = <&pinctrl_touch>;
compatible = "ti,tsc2046";
reg = <0>; reg = <0>;
pinctrl-0 = <&pinctrl_touch>;
pinctrl-names ="default";
spi-max-frequency = <1000000>; spi-max-frequency = <1000000>;
interrupts-extended = <&gpio3 19 IRQ_TYPE_LEVEL_LOW>; interrupts-extended = <&gpio3 19 IRQ_TYPE_LEVEL_LOW>;
vcc-supply = <&reg_3v3>; #io-channel-cells = <1>;
pendown-gpio = <&gpio3 19 GPIO_ACTIVE_LOW>;
ti,x-plate-ohms = /bits/ 16 <850>; #address-cells = <1>;
ti,y-plate-ohms = /bits/ 16 <295>; #size-cells = <0>;
ti,pressure-min = /bits/ 16 <2>;
ti,pressure-max = /bits/ 16 <1500>; channel@1 {
ti,vref-mv = /bits/ 16 <3300>; reg = <1>;
ti,settle-delay-usec = /bits/ 16 <15>; settling-time-us = <700>;
ti,vref-delay-usecs = /bits/ 16 <0>; oversampling-ratio = <5>;
ti,penirq-recheck-delay-usecs = /bits/ 16 <100>; };
ti,debounce-max = /bits/ 16 <100>;
ti,debounce-tol = /bits/ 16 <(~0)>; channel@3 {
ti,debounce-rep = /bits/ 16 <4>; reg = <3>;
touchscreen-swapped-x-y; settling-time-us = <700>;
touchscreen-inverted-y; oversampling-ratio = <5>;
wakeup-source; };
channel@4 {
reg = <4>;
settling-time-us = <700>;
oversampling-ratio = <5>;
};
channel@5 {
reg = <5>;
settling-time-us = <700>;
oversampling-ratio = <5>;
};
}; };
}; };
......
arch/arm/boot/dts/imx6qdl-tqma6a.dtsi
View file @ 07d0db46
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
&fec { &fec {
/delete-property/ interrupts;
interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>,
<&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
fsl,err006687-workaround-present; fsl,err006687-workaround-present;
...@@ -35,6 +36,7 @@ eeprom@50 { ...@@ -35,6 +36,7 @@ eeprom@50 {
compatible = "st,24c64", "atmel,24c64"; compatible = "st,24c64", "atmel,24c64";
reg = <0x50>; reg = <0x50>;
pagesize = <32>; pagesize = <32>;
vcc-supply = <&reg_3p3v>;
}; };
}; };
......
arch/arm/boot/dts/imx6qdl-tqma6b.dtsi
View file @ 07d0db46
...@@ -29,5 +29,6 @@ eeprom@50 { ...@@ -29,5 +29,6 @@ eeprom@50 {
compatible = "st,24c64", "atmel,24c64"; compatible = "st,24c64", "atmel,24c64";
reg = <0x50>; reg = <0x50>;
pagesize = <32>; pagesize = <32>;
vcc-supply = <&reg_3p3v>;
}; };
}; };
arch/arm/boot/dts/imx6qdl-ts7970.dtsi
View file @ 07d0db46
...@@ -192,6 +192,7 @@ &fec { ...@@ -192,6 +192,7 @@ &fec {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_enet>; pinctrl-0 = <&pinctrl_enet>;
phy-mode = "rgmii"; phy-mode = "rgmii";
/delete-property/ interrupts;
interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>,
<&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
fsl,err006687-workaround-present; fsl,err006687-workaround-present;
......
arch/arm/boot/dts/imx6qdl-vicut1.dtsi
View file @ 07d0db46
...@@ -37,6 +37,16 @@ backlight_led: backlight_led { ...@@ -37,6 +37,16 @@ backlight_led: backlight_led {
power-supply = <&reg_3v3>; power-supply = <&reg_3v3>;
}; };
/* only for backwards compatibility with old HW */
backlight_isb: backlight-isb {
compatible = "pwm-backlight";
pwms = <&pwm2 0 5000000 0>;
brightness-levels = <0 8 48 255>;
num-interpolated-steps = <5>;
default-brightness-level = <0>;
power-supply = <&reg_3v3>;
};
connector { connector {
compatible = "composite-video-connector"; compatible = "composite-video-connector";
label = "Composite0"; label = "Composite0";
...@@ -370,6 +380,12 @@ &pwm1 { ...@@ -370,6 +380,12 @@ &pwm1 {
status = "okay"; status = "okay";
}; };
&pwm2 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pwm2>;
status = "okay";
};
&pwm3 { &pwm3 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pwm3>; pinctrl-0 = <&pinctrl_pwm3>;
...@@ -601,6 +617,12 @@ MX6QDL_PAD_DISP0_DAT8__PWM1_OUT 0x1b0b0 ...@@ -601,6 +617,12 @@ MX6QDL_PAD_DISP0_DAT8__PWM1_OUT 0x1b0b0
>; >;
}; };
pinctrl_pwm2: pwm2grp {
fsl,pins = <
MX6QDL_PAD_DISP0_DAT9__PWM2_OUT 0x1b0b0
>;
};
pinctrl_pwm3: pwm3grp { pinctrl_pwm3: pwm3grp {
fsl,pins = < fsl,pins = <
MX6QDL_PAD_SD4_DAT1__PWM3_OUT 0x1b0b0 MX6QDL_PAD_SD4_DAT1__PWM3_OUT 0x1b0b0
......
arch/arm/boot/dts/imx6qdl.dtsi
View file @ 07d0db46
...@@ -929,7 +929,7 @@ dcic2: dcic@20e8000 { ...@@ -929,7 +929,7 @@ dcic2: dcic@20e8000 {
interrupts = <0 125 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 125 IRQ_TYPE_LEVEL_HIGH>;
}; };
sdma: sdma@20ec000 { sdma: dma-controller@20ec000 {
compatible = "fsl,imx6q-sdma", "fsl,imx35-sdma"; compatible = "fsl,imx6q-sdma", "fsl,imx35-sdma";
reg = <0x020ec000 0x4000>; reg = <0x020ec000 0x4000>;
interrupts = <0 2 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 2 IRQ_TYPE_LEVEL_HIGH>;
......
arch/arm/boot/dts/imx6qp.dtsi
View file @ 07d0db46
...@@ -9,12 +9,18 @@ soc { ...@@ -9,12 +9,18 @@ soc {
ocram2: sram@940000 { ocram2: sram@940000 {
compatible = "mmio-sram"; compatible = "mmio-sram";
reg = <0x00940000 0x20000>; reg = <0x00940000 0x20000>;
ranges = <0 0x00940000 0x20000>;
#address-cells = <1>;
#size-cells = <1>;
clocks = <&clks IMX6QDL_CLK_OCRAM>; clocks = <&clks IMX6QDL_CLK_OCRAM>;
}; };
ocram3: sram@960000 { ocram3: sram@960000 {
compatible = "mmio-sram"; compatible = "mmio-sram";
reg = <0x00960000 0x20000>; reg = <0x00960000 0x20000>;
ranges = <0 0x00960000 0x20000>;
#address-cells = <1>;
#size-cells = <1>;
clocks = <&clks IMX6QDL_CLK_OCRAM>; clocks = <&clks IMX6QDL_CLK_OCRAM>;
}; };
......
arch/arm/boot/dts/imx6sl.dtsi
View file @ 07d0db46
...@@ -61,10 +61,10 @@ cpu0: cpu@0 { ...@@ -61,10 +61,10 @@ cpu0: cpu@0 {
<792000 1175000>, <792000 1175000>,
<396000 975000>; <396000 975000>;
fsl,soc-operating-points = fsl,soc-operating-points =
/* ARM kHz SOC-PU uV */ /* ARM kHz SOC-PU uV */
<996000 1225000>, <996000 1225000>,
<792000 1175000>, <792000 1175000>,
<396000 1175000>; <396000 1175000>;
clock-latency = <61036>; /* two CLK32 periods */ clock-latency = <61036>; /* two CLK32 periods */
#cooling-cells = <2>; #cooling-cells = <2>;
clocks = <&clks IMX6SL_CLK_ARM>, <&clks IMX6SL_CLK_PLL2_PFD2>, clocks = <&clks IMX6SL_CLK_ARM>, <&clks IMX6SL_CLK_PLL2_PFD2>,
...@@ -115,6 +115,9 @@ soc { ...@@ -115,6 +115,9 @@ soc {
ocram: sram@900000 { ocram: sram@900000 {
compatible = "mmio-sram"; compatible = "mmio-sram";
reg = <0x00900000 0x20000>; reg = <0x00900000 0x20000>;
ranges = <0 0x00900000 0x20000>;
#address-cells = <1>;
#size-cells = <1>;
clocks = <&clks IMX6SL_CLK_OCRAM>; clocks = <&clks IMX6SL_CLK_OCRAM>;
}; };
...@@ -222,7 +225,7 @@ ecspi4: spi@2014000 { ...@@ -222,7 +225,7 @@ ecspi4: spi@2014000 {
uart5: serial@2018000 { uart5: serial@2018000 {
compatible = "fsl,imx6sl-uart", compatible = "fsl,imx6sl-uart",
"fsl,imx6q-uart", "fsl,imx21-uart"; "fsl,imx6q-uart", "fsl,imx21-uart";
reg = <0x02018000 0x4000>; reg = <0x02018000 0x4000>;
interrupts = <0 30 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 30 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6SL_CLK_UART>, clocks = <&clks IMX6SL_CLK_UART>,
...@@ -235,7 +238,7 @@ uart5: serial@2018000 { ...@@ -235,7 +238,7 @@ uart5: serial@2018000 {
uart1: serial@2020000 { uart1: serial@2020000 {
compatible = "fsl,imx6sl-uart", compatible = "fsl,imx6sl-uart",
"fsl,imx6q-uart", "fsl,imx21-uart"; "fsl,imx6q-uart", "fsl,imx21-uart";
reg = <0x02020000 0x4000>; reg = <0x02020000 0x4000>;
interrupts = <0 26 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 26 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6SL_CLK_UART>, clocks = <&clks IMX6SL_CLK_UART>,
...@@ -248,7 +251,7 @@ uart1: serial@2020000 { ...@@ -248,7 +251,7 @@ uart1: serial@2020000 {
uart2: serial@2024000 { uart2: serial@2024000 {
compatible = "fsl,imx6sl-uart", compatible = "fsl,imx6sl-uart",
"fsl,imx6q-uart", "fsl,imx21-uart"; "fsl,imx6q-uart", "fsl,imx21-uart";
reg = <0x02024000 0x4000>; reg = <0x02024000 0x4000>;
interrupts = <0 27 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 27 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6SL_CLK_UART>, clocks = <&clks IMX6SL_CLK_UART>,
...@@ -309,7 +312,7 @@ ssi3: ssi@2030000 { ...@@ -309,7 +312,7 @@ ssi3: ssi@2030000 {
uart3: serial@2034000 { uart3: serial@2034000 {
compatible = "fsl,imx6sl-uart", compatible = "fsl,imx6sl-uart",
"fsl,imx6q-uart", "fsl,imx21-uart"; "fsl,imx6q-uart", "fsl,imx21-uart";
reg = <0x02034000 0x4000>; reg = <0x02034000 0x4000>;
interrupts = <0 28 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 28 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6SL_CLK_UART>, clocks = <&clks IMX6SL_CLK_UART>,
...@@ -322,7 +325,7 @@ uart3: serial@2034000 { ...@@ -322,7 +325,7 @@ uart3: serial@2034000 {
uart4: serial@2038000 { uart4: serial@2038000 {
compatible = "fsl,imx6sl-uart", compatible = "fsl,imx6sl-uart",
"fsl,imx6q-uart", "fsl,imx21-uart"; "fsl,imx6q-uart", "fsl,imx21-uart";
reg = <0x02038000 0x4000>; reg = <0x02038000 0x4000>;
interrupts = <0 29 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 29 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6SL_CLK_UART>, clocks = <&clks IMX6SL_CLK_UART>,
...@@ -711,7 +714,7 @@ pd_pu: power-domain@1 { ...@@ -711,7 +714,7 @@ pd_pu: power-domain@1 {
#power-domain-cells = <0>; #power-domain-cells = <0>;
power-supply = <&reg_pu>; power-supply = <&reg_pu>;
clocks = <&clks IMX6SL_CLK_GPU2D_OVG>, clocks = <&clks IMX6SL_CLK_GPU2D_OVG>,
<&clks IMX6SL_CLK_GPU2D_PODF>; <&clks IMX6SL_CLK_GPU2D_PODF>;
}; };
pd_disp: power-domain@2 { pd_disp: power-domain@2 {
...@@ -747,7 +750,7 @@ spdc: spdc@20e8000 { ...@@ -747,7 +750,7 @@ spdc: spdc@20e8000 {
interrupts = <0 6 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 6 IRQ_TYPE_LEVEL_HIGH>;
}; };
sdma: sdma@20ec000 { sdma: dma-controller@20ec000 {
compatible = "fsl,imx6sl-sdma", "fsl,imx6q-sdma"; compatible = "fsl,imx6sl-sdma", "fsl,imx6q-sdma";
reg = <0x020ec000 0x4000>; reg = <0x020ec000 0x4000>;
interrupts = <0 2 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 2 IRQ_TYPE_LEVEL_HIGH>;
......
arch/arm/boot/dts/imx6sll.dtsi
View file @ 07d0db46
...@@ -115,6 +115,9 @@ soc { ...@@ -115,6 +115,9 @@ soc {
ocram: sram@900000 { ocram: sram@900000 {
compatible = "mmio-sram"; compatible = "mmio-sram";
reg = <0x00900000 0x20000>; reg = <0x00900000 0x20000>;
ranges = <0 0x00900000 0x20000>;
#address-cells = <1>;
#size-cells = <1>;
}; };
intc: interrupt-controller@a01000 { intc: interrupt-controller@a01000 {
......
arch/arm/boot/dts/imx6sx-udoo-neo.dtsi
View file @ 07d0db46
...@@ -226,7 +226,7 @@ lcdc: endpoint { ...@@ -226,7 +226,7 @@ lcdc: endpoint {
&iomuxc { &iomuxc {
pinctrl_bt_reg: btreggrp { pinctrl_bt_reg: btreggrp {
fsl,pins = fsl,pins =
<MX6SX_PAD_KEY_ROW2__GPIO2_IO_17 0x15059>; <MX6SX_PAD_KEY_ROW2__GPIO2_IO_17 0x15059>;
}; };
pinctrl_enet1: enet1grp { pinctrl_enet1: enet1grp {
...@@ -306,7 +306,6 @@ MX6SX_PAD_LCD1_RESET__GPIO3_IO_27 0x4001b0b0 ...@@ -306,7 +306,6 @@ MX6SX_PAD_LCD1_RESET__GPIO3_IO_27 0x4001b0b0
>; >;
}; };
pinctrl_uart1: uart1grp { pinctrl_uart1: uart1grp {
fsl,pins = fsl,pins =
<MX6SX_PAD_GPIO1_IO04__UART1_DCE_TX 0x1b0b1>, <MX6SX_PAD_GPIO1_IO04__UART1_DCE_TX 0x1b0b1>,
...@@ -347,24 +346,23 @@ pinctrl_uart6: uart6grp { ...@@ -347,24 +346,23 @@ pinctrl_uart6: uart6grp {
pinctrl_otg1_reg: otg1grp { pinctrl_otg1_reg: otg1grp {
fsl,pins = fsl,pins =
<MX6SX_PAD_GPIO1_IO09__GPIO1_IO_9 0x10b0>; <MX6SX_PAD_GPIO1_IO09__GPIO1_IO_9 0x10b0>;
}; };
pinctrl_otg2_reg: otg2grp { pinctrl_otg2_reg: otg2grp {
fsl,pins = fsl,pins =
<MX6SX_PAD_NAND_RE_B__GPIO4_IO_12 0x10b0>; <MX6SX_PAD_NAND_RE_B__GPIO4_IO_12 0x10b0>;
}; };
pinctrl_usb_otg1: usbotg1grp { pinctrl_usb_otg1: usbotg1grp {
fsl,pins = fsl,pins =
<MX6SX_PAD_GPIO1_IO10__ANATOP_OTG1_ID 0x17059>, <MX6SX_PAD_GPIO1_IO10__ANATOP_OTG1_ID 0x17059>,
<MX6SX_PAD_GPIO1_IO08__USB_OTG1_OC 0x10b0>; <MX6SX_PAD_GPIO1_IO08__USB_OTG1_OC 0x10b0>;
}; };
pinctrl_usb_otg2: usbot2ggrp { pinctrl_usb_otg2: usbot2ggrp {
fsl,pins = fsl,pins =
<MX6SX_PAD_QSPI1A_DATA0__USB_OTG2_OC 0x10b0>; <MX6SX_PAD_QSPI1A_DATA0__USB_OTG2_OC 0x10b0>;
}; };
pinctrl_usdhc2: usdhc2grp { pinctrl_usdhc2: usdhc2grp {
......
arch/arm/boot/dts/imx6sx.dtsi
View file @ 07d0db46
...@@ -164,12 +164,18 @@ soc: soc { ...@@ -164,12 +164,18 @@ soc: soc {
ocram_s: sram@8f8000 { ocram_s: sram@8f8000 {
compatible = "mmio-sram"; compatible = "mmio-sram";
reg = <0x008f8000 0x4000>; reg = <0x008f8000 0x4000>;
ranges = <0 0x008f8000 0x4000>;
#address-cells = <1>;
#size-cells = <1>;
clocks = <&clks IMX6SX_CLK_OCRAM_S>; clocks = <&clks IMX6SX_CLK_OCRAM_S>;
}; };
ocram: sram@900000 { ocram: sram@900000 {
compatible = "mmio-sram"; compatible = "mmio-sram";
reg = <0x00900000 0x20000>; reg = <0x00900000 0x20000>;
ranges = <0 0x00900000 0x20000>;
#address-cells = <1>;
#size-cells = <1>;
clocks = <&clks IMX6SX_CLK_OCRAM>; clocks = <&clks IMX6SX_CLK_OCRAM>;
}; };
...@@ -842,7 +848,7 @@ gpr: iomuxc-gpr@20e4000 { ...@@ -842,7 +848,7 @@ gpr: iomuxc-gpr@20e4000 {
reg = <0x020e4000 0x4000>; reg = <0x020e4000 0x4000>;
}; };
sdma: sdma@20ec000 { sdma: dma-controller@20ec000 {
compatible = "fsl,imx6sx-sdma", "fsl,imx6q-sdma"; compatible = "fsl,imx6sx-sdma", "fsl,imx6q-sdma";
reg = <0x020ec000 0x4000>; reg = <0x020ec000 0x4000>;
interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
......
arch/arm/boot/dts/imx6ul-14x14-evk.dtsi
View file @ 07d0db46
...@@ -82,7 +82,7 @@ sound-wm8960 { ...@@ -82,7 +82,7 @@ sound-wm8960 {
"AMIC", "MICB"; "AMIC", "MICB";
}; };
spi4 { spi-4 {
compatible = "spi-gpio"; compatible = "spi-gpio";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_spi4>; pinctrl-0 = <&pinctrl_spi4>;
......
arch/arm/boot/dts/imx6ul-kontron-n6310-s-43.dts → arch/arm/boot/dts/imx6ul-kontron-bl-43.dts
View file @ 07d0db46
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
* Copyright (c) 2019 Krzysztof Kozlowski <krzk@kernel.org> * Copyright (c) 2019 Krzysztof Kozlowski <krzk@kernel.org>
*/ */
#include "imx6ul-kontron-n6310-s.dts" #include "imx6ul-kontron-bl.dts"
/ { / {
model = "Kontron N6310 S 43"; model = "Kontron BL i.MX6UL 43 (N631X S 43)";
compatible = "kontron,imx6ul-n6310-s-43", "kontron,imx6ul-n6310-s", compatible = "kontron,bl-imx6ul-43", "kontron,bl-imx6ul",
"kontron,imx6ul-n6310-som", "fsl,imx6ul"; "kontron,sl-imx6ul", "fsl,imx6ul";
backlight { backlight {
compatible = "pwm-backlight"; compatible = "pwm-backlight";
......
arch/arm/boot/dts/imx6ul-kontron-n6310-s.dts → arch/arm/boot/dts/imx6ul-kontron-bl.dts
View file @ 07d0db46
...@@ -7,11 +7,10 @@ ...@@ -7,11 +7,10 @@
/dts-v1/; /dts-v1/;
#include "imx6ul-kontron-n6310-som.dtsi" #include "imx6ul-kontron-sl.dtsi"
#include "imx6ul-kontron-n6x1x-s.dtsi" #include "imx6ul-kontron-bl-common.dtsi"
/ { / {
model = "Kontron N6310 S"; model = "Kontron BL i.MX6UL (N631X S)";
compatible = "kontron,imx6ul-n6310-s", "kontron,imx6ul-n6310-som", compatible = "kontron,bl-imx6ul", "kontron,sl-imx6ul", "fsl,imx6ul";
"fsl,imx6ul";
}; };
arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi deleted 100644 → 0
View file @ 2b14d7da
// SPDX-License-Identifier: GPL-2.0
/*
* Copyright (C) 2017 exceet electronics GmbH
* Copyright (C) 2018 Kontron Electronics GmbH
* Copyright (c) 2019 Krzysztof Kozlowski <krzk@kernel.org>
*/
#include "imx6ul.dtsi"
#include "imx6ul-kontron-n6x1x-som-common.dtsi"
/ {
model = "Kontron N6310 SOM";
compatible = "kontron,imx6ul-n6310-som", "fsl,imx6ul";
memory@80000000 {
reg = <0x80000000 0x10000000>;
device_type = "memory";
};
};
&qspi {
flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-nand";
spi-max-frequency = <108000000>;
spi-tx-bus-width = <4>;
spi-rx-bus-width = <4>;
reg = <0>;
partition@0 {
label = "ubi1";
reg = <0x00000000 0x08000000>;
};
partition@8000000 {
label = "ubi2";
reg = <0x08000000 0x08000000>;
};
};
};
arch/arm/boot/dts/imx6ul-kontron-n6311-som.dtsi deleted 100644 → 0
View file @ 2b14d7da
// SPDX-License-Identifier: GPL-2.0
/*
* Copyright (C) 2017 exceet electronics GmbH
* Copyright (C) 2018 Kontron Electronics GmbH
*/
#include "imx6ul.dtsi"
#include "imx6ul-kontron-n6x1x-som-common.dtsi"
/ {
model = "Kontron N6311 SOM";
compatible = "kontron,imx6ul-n6311-som", "fsl,imx6ul";
memory@80000000 {
reg = <0x80000000 0x20000000>;
device_type = "memory";
};
};
&qspi {
flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-nand";
spi-max-frequency = <104000000>;
spi-tx-bus-width = <4>;
spi-rx-bus-width = <4>;
reg = <0>;
partition@0 {
label = "ubi1";
reg = <0x00000000 0x08000000>;
};
partition@8000000 {
label = "ubi2";
reg = <0x08000000 0x18000000>;
};
};
};
arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi → arch/arm/boot/dts/imx6ul-kontron-sl-common.dtsi
View file @ 07d0db46
...@@ -11,6 +11,11 @@ / { ...@@ -11,6 +11,11 @@ / {
chosen { chosen {
stdout-path = &uart4; stdout-path = &uart4;
}; };
memory@80000000 {
reg = <0x80000000 0x10000000>;
device_type = "memory";
};
}; };
&ecspi2 { &ecspi2 {
...@@ -55,6 +60,16 @@ &qspi { ...@@ -55,6 +60,16 @@ &qspi {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_qspi>; pinctrl-0 = <&pinctrl_qspi>;
status = "okay"; status = "okay";
spi-flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-nand";
spi-max-frequency = <104000000>;
spi-tx-bus-width = <4>;
spi-rx-bus-width = <4>;
reg = <0>;
};
}; };
&wdog1 { &wdog1 {
......
arch/arm/boot/dts/imx6ul-kontron-sl.dtsi 0 → 100644
View file @ 07d0db46
// SPDX-License-Identifier: GPL-2.0
/*
* Copyright (C) 2017 exceet electronics GmbH
* Copyright (C) 2018 Kontron Electronics GmbH
* Copyright (c) 2019 Krzysztof Kozlowski <krzk@kernel.org>
*/
#include "imx6ul.dtsi"
#include "imx6ul-kontron-sl-common.dtsi"
/ {
model = "Kontron SL i.MX6UL (N631X SOM)";
compatible = "kontron,sl-imx6ul", "fsl,imx6ul";
};
arch/arm/boot/dts/imx6ul-tx6ul.dtsi
View file @ 07d0db46
...@@ -212,7 +212,7 @@ reg_usbotg_vbus: regulator-usbotgvbus { ...@@ -212,7 +212,7 @@ reg_usbotg_vbus: regulator-usbotgvbus {
enable-active-high; enable-active-high;
}; };
spi_gpio: spi-gpio { spi_gpio: spi {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
compatible = "spi-gpio"; compatible = "spi-gpio";
......
arch/arm/boot/dts/imx6ul.dtsi
View file @ 07d0db46
...@@ -744,7 +744,7 @@ gpt2: timer@20e8000 { ...@@ -744,7 +744,7 @@ gpt2: timer@20e8000 {
status = "disabled"; status = "disabled";
}; };
sdma: sdma@20ec000 { sdma: dma-controller@20ec000 {
compatible = "fsl,imx6ul-sdma", "fsl,imx6q-sdma", compatible = "fsl,imx6ul-sdma", "fsl,imx6q-sdma",
"fsl,imx35-sdma"; "fsl,imx35-sdma";
reg = <0x020ec000 0x4000>; reg = <0x020ec000 0x4000>;
......
arch/arm/boot/dts/imx6ull-kontron-n6411-s.dts → arch/arm/boot/dts/imx6ull-kontron-bl.dts
View file @ 07d0db46
...@@ -6,11 +6,10 @@ ...@@ -6,11 +6,10 @@
/dts-v1/; /dts-v1/;
#include "imx6ull-kontron-n6411-som.dtsi" #include "imx6ull-kontron-sl.dtsi"
#include "imx6ul-kontron-n6x1x-s.dtsi" #include "imx6ul-kontron-bl-common.dtsi"
/ { / {
model = "Kontron N6411 S"; model = "Kontron BL i.MX6ULL (N641X S)";
compatible = "kontron,imx6ull-n6411-s", "kontron,imx6ull-n6411-som", compatible = "kontron,bl-imx6ull", "kontron,sl-imx6ull", "fsl,imx6ull";
"fsl,imx6ull";
}; };
arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi deleted 100644 → 0
View file @ 2b14d7da
// SPDX-License-Identifier: GPL-2.0
/*
* Copyright (C) 2017 exceet electronics GmbH
* Copyright (C) 2018 Kontron Electronics GmbH
*/
#include "imx6ull.dtsi"
#include "imx6ul-kontron-n6x1x-som-common.dtsi"
/ {
model = "Kontron N6411 SOM";
compatible = "kontron,imx6ull-n6311-som", "fsl,imx6ull";
memory@80000000 {
reg = <0x80000000 0x20000000>;
device_type = "memory";
};
};
&qspi {
flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-nand";
spi-max-frequency = <104000000>;
spi-tx-bus-width = <4>;
spi-rx-bus-width = <4>;
reg = <0>;
partition@0 {
label = "ubi1";
reg = <0x00000000 0x08000000>;
};
partition@8000000 {
label = "ubi2";
reg = <0x08000000 0x18000000>;
};
};
};
arch/arm/boot/dts/imx6ul-kontron-n6311-s.dts → arch/arm/boot/dts/imx6ull-kontron-sl.dtsi
View file @ 07d0db46
...@@ -4,13 +4,10 @@ ...@@ -4,13 +4,10 @@
* Copyright (C) 2018 Kontron Electronics GmbH * Copyright (C) 2018 Kontron Electronics GmbH
*/ */
/dts-v1/; #include "imx6ull.dtsi"
#include "imx6ul-kontron-sl-common.dtsi"
#include "imx6ul-kontron-n6311-som.dtsi"
#include "imx6ul-kontron-n6x1x-s.dtsi"
/ { / {
model = "Kontron N6311 S"; model = "Kontron SL i.MX6ULL (N641X SOM)";
compatible = "kontron,imx6ul-n6311-s", "kontron,imx6ul-n6311-som", compatible = "kontron,sl-imx6ull", "fsl,imx6ull";
"fsl,imx6ul";
}; };
arch/arm/boot/dts/imx7d-pico.dtsi
View file @ 07d0db46
...@@ -41,7 +41,7 @@ reg_lcd_3v3: regulator-lcd-3v3 { ...@@ -41,7 +41,7 @@ reg_lcd_3v3: regulator-lcd-3v3 {
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
gpio = <&gpio1 6 GPIO_ACTIVE_HIGH>; gpio = <&gpio1 6 GPIO_ACTIVE_HIGH>;
enable-active-high; enable-active-high;
}; };
reg_wlreg_on: regulator-wlreg_on { reg_wlreg_on: regulator-wlreg_on {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
...@@ -432,7 +432,7 @@ MX7D_PAD_ENET1_RGMII_RD1__ENET1_RGMII_RD1 0x1 ...@@ -432,7 +432,7 @@ MX7D_PAD_ENET1_RGMII_RD1__ENET1_RGMII_RD1 0x1
MX7D_PAD_ENET1_RGMII_RD2__ENET1_RGMII_RD2 0x1 MX7D_PAD_ENET1_RGMII_RD2__ENET1_RGMII_RD2 0x1
MX7D_PAD_ENET1_RGMII_RD3__ENET1_RGMII_RD3 0x1 MX7D_PAD_ENET1_RGMII_RD3__ENET1_RGMII_RD3 0x1
MX7D_PAD_ENET1_RGMII_RX_CTL__ENET1_RGMII_RX_CTL 0x1 MX7D_PAD_ENET1_RGMII_RX_CTL__ENET1_RGMII_RX_CTL 0x1
MX7D_PAD_SD3_RESET_B__GPIO6_IO11 0x1 /* Ethernet reset */ MX7D_PAD_SD3_RESET_B__GPIO6_IO11 0x1 /* Ethernet reset */
>; >;
}; };
...@@ -493,19 +493,19 @@ MX7D_PAD_LCD_RESET__GPIO3_IO4 0x14 ...@@ -493,19 +493,19 @@ MX7D_PAD_LCD_RESET__GPIO3_IO4 0x14
pinctrl_pwm1: pwm1 { pinctrl_pwm1: pwm1 {
fsl,pins = < fsl,pins = <
MX7D_PAD_GPIO1_IO08__PWM1_OUT 0x7f MX7D_PAD_GPIO1_IO08__PWM1_OUT 0x7f
>; >;
}; };
pinctrl_pwm2: pwm2 { pinctrl_pwm2: pwm2 {
fsl,pins = < fsl,pins = <
MX7D_PAD_GPIO1_IO09__PWM2_OUT 0x7f MX7D_PAD_GPIO1_IO09__PWM2_OUT 0x7f
>; >;
}; };
pinctrl_pwm3: pwm3 { pinctrl_pwm3: pwm3 {
fsl,pins = < fsl,pins = <
MX7D_PAD_GPIO1_IO10__PWM3_OUT 0x7f MX7D_PAD_GPIO1_IO10__PWM3_OUT 0x7f
>; >;
}; };
......
arch/arm/boot/dts/imx7d-sdb.dts
View file @ 07d0db46
...@@ -24,14 +24,14 @@ gpio-keys { ...@@ -24,14 +24,14 @@ gpio-keys {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpio_keys>; pinctrl-0 = <&pinctrl_gpio_keys>;
volume-up { key-volume-up {
label = "Volume Up"; label = "Volume Up";
gpios = <&gpio5 11 GPIO_ACTIVE_LOW>; gpios = <&gpio5 11 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>; linux,code = <KEY_VOLUMEUP>;
wakeup-source; wakeup-source;
}; };
volume-down { key-volume-down {
label = "Volume Down"; label = "Volume Down";
gpios = <&gpio5 10 GPIO_ACTIVE_LOW>; gpios = <&gpio5 10 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEDOWN>; linux,code = <KEY_VOLUMEDOWN>;
...@@ -39,7 +39,7 @@ volume-down { ...@@ -39,7 +39,7 @@ volume-down {
}; };
}; };
spi4 { spi-4 {
compatible = "spi-gpio"; compatible = "spi-gpio";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_spi4>; pinctrl-0 = <&pinctrl_spi4>;
...@@ -206,12 +206,7 @@ tsc2046@0 { ...@@ -206,12 +206,7 @@ tsc2046@0 {
interrupt-parent = <&gpio2>; interrupt-parent = <&gpio2>;
interrupts = <29 0>; interrupts = <29 0>;
pendown-gpio = <&gpio2 29 GPIO_ACTIVE_HIGH>; pendown-gpio = <&gpio2 29 GPIO_ACTIVE_HIGH>;
ti,x-min = /bits/ 16 <0>; touchscreen-max-pressure = <255>;
ti,x-max = /bits/ 16 <0>;
ti,y-min = /bits/ 16 <0>;
ti,y-max = /bits/ 16 <0>;
ti,pressure-max = /bits/ 16 <0>;
ti,x-plate-ohms = /bits/ 16 <400>;
wakeup-source; wakeup-source;
}; };
}; };
......
arch/arm/boot/dts/imx7d-zii-rmu2.dts
View file @ 07d0db46
...@@ -24,7 +24,7 @@ gpio-leds { ...@@ -24,7 +24,7 @@ gpio-leds {
pinctrl-0 = <&pinctrl_leds_debug>; pinctrl-0 = <&pinctrl_leds_debug>;
pinctrl-names = "default"; pinctrl-names = "default";
debug { led-debug {
label = "zii:green:debug1"; label = "zii:green:debug1";
gpios = <&gpio2 8 GPIO_ACTIVE_HIGH>; gpios = <&gpio2 8 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
......
arch/arm/boot/dts/imx7d-zii-rpu2.dts
View file @ 07d0db46
...@@ -36,7 +36,7 @@ gpio-leds { ...@@ -36,7 +36,7 @@ gpio-leds {
pinctrl-0 = <&pinctrl_leds_debug>; pinctrl-0 = <&pinctrl_leds_debug>;
pinctrl-names = "default"; pinctrl-names = "default";
debug { led-debug {
label = "zii:green:debug1"; label = "zii:green:debug1";
gpios = <&gpio2 8 GPIO_ACTIVE_HIGH>; gpios = <&gpio2 8 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
......
arch/arm/boot/dts/imx7s.dtsi
View file @ 07d0db46
...@@ -1224,7 +1224,7 @@ qspi: spi@30bb0000 { ...@@ -1224,7 +1224,7 @@ qspi: spi@30bb0000 {
status = "disabled"; status = "disabled";
}; };
sdma: sdma@30bd0000 { sdma: dma-controller@30bd0000 {
compatible = "fsl,imx7d-sdma", "fsl,imx35-sdma"; compatible = "fsl,imx7d-sdma", "fsl,imx35-sdma";
reg = <0x30bd0000 0x10000>; reg = <0x30bd0000 0x10000>;
interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
......
arch/arm/boot/dts/imx7ulp.dtsi
View file @ 07d0db46
...@@ -328,8 +328,9 @@ lpi2c6: i2c@40a40000 { ...@@ -328,8 +328,9 @@ lpi2c6: i2c@40a40000 {
compatible = "fsl,imx7ulp-lpi2c"; compatible = "fsl,imx7ulp-lpi2c";
reg = <0x40a40000 0x10000>; reg = <0x40a40000 0x10000>;
interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&pcc3 IMX7ULP_CLK_LPI2C6>; clocks = <&pcc3 IMX7ULP_CLK_LPI2C6>,
clock-names = "ipg"; <&scg1 IMX7ULP_CLK_NIC1_BUS_DIV>;
clock-names = "per", "ipg";
assigned-clocks = <&pcc3 IMX7ULP_CLK_LPI2C6>; assigned-clocks = <&pcc3 IMX7ULP_CLK_LPI2C6>;
assigned-clock-parents = <&scg1 IMX7ULP_CLK_FIRC>; assigned-clock-parents = <&scg1 IMX7ULP_CLK_FIRC>;
assigned-clock-rates = <48000000>; assigned-clock-rates = <48000000>;
...@@ -340,8 +341,9 @@ lpi2c7: i2c@40a50000 { ...@@ -340,8 +341,9 @@ lpi2c7: i2c@40a50000 {
compatible = "fsl,imx7ulp-lpi2c"; compatible = "fsl,imx7ulp-lpi2c";
reg = <0x40a50000 0x10000>; reg = <0x40a50000 0x10000>;
interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&pcc3 IMX7ULP_CLK_LPI2C7>; clocks = <&pcc3 IMX7ULP_CLK_LPI2C7>,
clock-names = "ipg"; <&scg1 IMX7ULP_CLK_NIC1_BUS_DIV>;
clock-names = "per", "ipg";
assigned-clocks = <&pcc3 IMX7ULP_CLK_LPI2C7>; assigned-clocks = <&pcc3 IMX7ULP_CLK_LPI2C7>;
assigned-clock-parents = <&scg1 IMX7ULP_CLK_FIRC>; assigned-clock-parents = <&scg1 IMX7ULP_CLK_FIRC>;
assigned-clock-rates = <48000000>; assigned-clock-rates = <48000000>;
......
arch/arm/boot/dts/ls1021a.dtsi
View file @ 07d0db46
...@@ -647,7 +647,7 @@ sai2: sai@2b60000 { ...@@ -647,7 +647,7 @@ sai2: sai@2b60000 {
status = "disabled"; status = "disabled";
}; };
edma0: edma@2c00000 { edma0: dma-controller@2c00000 {
#dma-cells = <2>; #dma-cells = <2>;
compatible = "fsl,vf610-edma"; compatible = "fsl,vf610-edma";
reg = <0x0 0x2c00000 0x0 0x10000>, reg = <0x0 0x2c00000 0x0 0x10000>,
......
arch/arm/boot/dts/vf610-bk4.dts
View file @ 07d0db46
...@@ -61,7 +61,7 @@ reg_vcc_3v3_mcu: regulator-vcc3v3mcu { ...@@ -61,7 +61,7 @@ reg_vcc_3v3_mcu: regulator-vcc3v3mcu {
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
}; };
spi-gpio { spi {
compatible = "spi-gpio"; compatible = "spi-gpio";
pinctrl-0 = <&pinctrl_gpio_spi>; pinctrl-0 = <&pinctrl_gpio_spi>;
pinctrl-names = "default"; pinctrl-names = "default";
......
arch/arm/boot/dts/vf610-pinfunc.h
View file @ 07d0db46
...@@ -420,7 +420,7 @@ ...@@ -420,7 +420,7 @@
#define VF610_PAD_PTD29__FTM3_CH2 0x104 0x000 ALT4 0x0 #define VF610_PAD_PTD29__FTM3_CH2 0x104 0x000 ALT4 0x0
#define VF610_PAD_PTD29__DSPI2_SIN 0x104 0x000 ALT5 0x0 #define VF610_PAD_PTD29__DSPI2_SIN 0x104 0x000 ALT5 0x0
#define VF610_PAD_PTD29__DEBUG_OUT11 0x104 0x000 ALT7 0x0 #define VF610_PAD_PTD29__DEBUG_OUT11 0x104 0x000 ALT7 0x0
#define VF610_PAD_PTD28__GPIO_66 0x108 0x000 ALT0 0x0 #define VF610_PAD_PTD28__GPIO_66 0x108 0x000 ALT0 0x0
#define VF610_PAD_PTD28__FB_AD28 0x108 0x000 ALT1 0x0 #define VF610_PAD_PTD28__FB_AD28 0x108 0x000 ALT1 0x0
#define VF610_PAD_PTD28__NF_IO12 0x108 0x000 ALT2 0x0 #define VF610_PAD_PTD28__NF_IO12 0x108 0x000 ALT2 0x0
#define VF610_PAD_PTD28__I2C2_SCL 0x108 0x34C ALT3 0x1 #define VF610_PAD_PTD28__I2C2_SCL 0x108 0x34C ALT3 0x1
...@@ -802,5 +802,55 @@ ...@@ -802,5 +802,55 @@
#define VF610_PAD_PTE28__EWM_OUT 0x214 0x000 ALT7 0x0 #define VF610_PAD_PTE28__EWM_OUT 0x214 0x000 ALT7 0x0
#define VF610_PAD_PTA7__GPIO_134 0x218 0x000 ALT0 0x0 #define VF610_PAD_PTA7__GPIO_134 0x218 0x000 ALT0 0x0
#define VF610_PAD_PTA7__VIU_PIX_CLK 0x218 0x3AC ALT1 0x1 #define VF610_PAD_PTA7__VIU_PIX_CLK 0x218 0x3AC ALT1 0x1
#define VF610_PAD_DDR_RESETB 0x21c 0x000 ALT0 0x0
#define VF610_PAD_DDR_A15__DDR_A_15 0x220 0x000 ALT0 0x0
#define VF610_PAD_DDR_A14__DDR_A_14 0x224 0x000 ALT0 0x0
#define VF610_PAD_DDR_A13__DDR_A_13 0x228 0x000 ALT0 0x0
#define VF610_PAD_DDR_A12__DDR_A_12 0x22c 0x000 ALT0 0x0
#define VF610_PAD_DDR_A11__DDR_A_11 0x230 0x000 ALT0 0x0
#define VF610_PAD_DDR_A10__DDR_A_10 0x234 0x000 ALT0 0x0
#define VF610_PAD_DDR_A9__DDR_A_9 0x238 0x000 ALT0 0x0
#define VF610_PAD_DDR_A8__DDR_A_8 0x23c 0x000 ALT0 0x0
#define VF610_PAD_DDR_A7__DDR_A_7 0x240 0x000 ALT0 0x0
#define VF610_PAD_DDR_A6__DDR_A_6 0x244 0x000 ALT0 0x0
#define VF610_PAD_DDR_A5__DDR_A_5 0x248 0x000 ALT0 0x0
#define VF610_PAD_DDR_A4__DDR_A_4 0x24c 0x000 ALT0 0x0
#define VF610_PAD_DDR_A3__DDR_A_3 0x250 0x000 ALT0 0x0
#define VF610_PAD_DDR_A2__DDR_A_2 0x254 0x000 ALT0 0x0
#define VF610_PAD_DDR_A1__DDR_A_1 0x258 0x000 ALT0 0x0
#define VF610_PAD_DDR_A0__DDR_A_0 0x25c 0x000 ALT0 0x0
#define VF610_PAD_DDR_BA2__DDR_BA_2 0x260 0x000 ALT0 0x0
#define VF610_PAD_DDR_BA1__DDR_BA_1 0x264 0x000 ALT0 0x0
#define VF610_PAD_DDR_BA0__DDR_BA_0 0x268 0x000 ALT0 0x0
#define VF610_PAD_DDR_CAS__DDR_CAS_B 0x26c 0x000 ALT0 0x0
#define VF610_PAD_DDR_CKE__DDR_CKE_0 0x270 0x000 ALT0 0x0
#define VF610_PAD_DDR_CLK__DDR_CLK_0 0x274 0x000 ALT0 0x0
#define VF610_PAD_DDR_CS__DDR_CS_B_0 0x278 0x000 ALT0 0x0
#define VF610_PAD_DDR_D15__DDR_D_15 0x27c 0x000 ALT0 0x0
#define VF610_PAD_DDR_D14__DDR_D_14 0x280 0x000 ALT0 0x0
#define VF610_PAD_DDR_D13__DDR_D_13 0x284 0x000 ALT0 0x0
#define VF610_PAD_DDR_D12__DDR_D_12 0x288 0x000 ALT0 0x0
#define VF610_PAD_DDR_D11__DDR_D_11 0x28c 0x000 ALT0 0x0
#define VF610_PAD_DDR_D10__DDR_D_10 0x290 0x000 ALT0 0x0
#define VF610_PAD_DDR_D9__DDR_D_9 0x294 0x000 ALT0 0x0
#define VF610_PAD_DDR_D8__DDR_D_8 0x298 0x000 ALT0 0x0
#define VF610_PAD_DDR_D7__DDR_D_7 0x29c 0x000 ALT0 0x0
#define VF610_PAD_DDR_D6__DDR_D_6 0x2a0 0x000 ALT0 0x0
#define VF610_PAD_DDR_D5__DDR_D_5 0x2a4 0x000 ALT0 0x0
#define VF610_PAD_DDR_D4__DDR_D_4 0x2a8 0x000 ALT0 0x0
#define VF610_PAD_DDR_D3__DDR_D_3 0x2ac 0x000 ALT0 0x0
#define VF610_PAD_DDR_D2__DDR_D_2 0x2b0 0x000 ALT0 0x0
#define VF610_PAD_DDR_D1__DDR_D_1 0x2b4 0x000 ALT0 0x0
#define VF610_PAD_DDR_D0__DDR_D_0 0x2b8 0x000 ALT0 0x0
#define VF610_PAD_DDR_DQM1__DDR_DQM_1 0x2bc 0x000 ALT0 0x0
#define VF610_PAD_DDR_DQM0__DDR_DQM_0 0x2c0 0x000 ALT0 0x0
#define VF610_PAD_DDR_DQS1__DDR_DQS_1 0x2c4 0x000 ALT0 0x0
#define VF610_PAD_DDR_DQS0__DDR_DQS_0 0x2c8 0x000 ALT0 0x0
#define VF610_PAD_DDR_RAS__DDR_RAS_B 0x2cc 0x000 ALT0 0x0
#define VF610_PAD_DDR_WE__DDR_WE_B 0x2d0 0x000 ALT0 0x0
#define VF610_PAD_DDR_ODT1__DDR_ODT_0 0x2d4 0x000 ALT0 0x0
#define VF610_PAD_DDR_ODT0__DDR_ODT_1 0x2d8 0x000 ALT0 0x0
#define VF610_PAD_DDR_DDRBYTE1__DDR_DDRBYTE1 0x2dc 0x000 ALT0 0x0
#define VF610_PAD_DDR_DDRBYTE2__DDR_DDRBYTE2 0x2e0 0x000 ALT0 0x0
#endif #endif
arch/arm/boot/dts/vf610-twr.dts
View file @ 07d0db46
...@@ -169,7 +169,7 @@ codec: sgtl5000@a { ...@@ -169,7 +169,7 @@ codec: sgtl5000@a {
VDDA-supply = <&reg_3p3v>; VDDA-supply = <&reg_3p3v>;
VDDIO-supply = <&reg_3p3v>; VDDIO-supply = <&reg_3p3v>;
clocks = <&clks VF610_CLK_SAI2>; clocks = <&clks VF610_CLK_SAI2>;
}; };
}; };
&iomuxc { &iomuxc {
......
arch/arm/boot/dts/vf610-zii-dev-rev-b.dts
View file @ 07d0db46
...@@ -288,7 +288,7 @@ mdio_mux_8: mdio@8 { ...@@ -288,7 +288,7 @@ mdio_mux_8: mdio@8 {
}; };
}; };
spi0 { spi-0 {
compatible = "spi-gpio"; compatible = "spi-gpio";
pinctrl-0 = <&pinctrl_gpio_spi0>; pinctrl-0 = <&pinctrl_gpio_spi0>;
pinctrl-names = "default"; pinctrl-names = "default";
......
arch/arm/boot/dts/vf610.dtsi
View file @ 07d0db46
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
// //
// Copyright 2013 Freescale Semiconductor, Inc. // Copyright 2013 Freescale Semiconductor, Inc.
#include "vf500.dtsi" #include "vf500.dtsi"
&a5_cpu { &a5_cpu {
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7