Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: imx28-duckbill: update to match vendor distributed DT

This patch updates the Duckbill device tree and synchronize it with
the vendor distributed file. The changes in mostly pin-muxing stuff,
but also some minor fixes. In detail:
- enable SPI pins
- enable I2C pins
- enable UART pins
- enable LRADC pin
- adjust USB DR mode
- add default triggers for LEDs
- get rid of regulators simple-bus container
- adjust phy reset duration
According to phy datasheet, 25ms are sufficient. This also reduces
the time to boot the system.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
Cc: Stefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

authored by

Michael Heimpold and committed by
Shawn Guo
768716f4 620885e8

+56 -25
+56 -25
arch/arm/boot/dts/imx28-duckbill.dts
··· 1 1 /* 2 - * Copyright (C) 2013 Michael Heimpold <mhei@heimpold.de> 2 + * Copyright (C) 2013-2014,2016 Michael Heimpold <mhei@heimpold.de> 3 + * Copyright (C) 2015-2017 I2SE GmbH <info@i2se.com> 3 4 * 4 5 * The code contained herein is licensed under the GNU General Public 5 6 * License. You may obtain a copy of the GNU General Public License ··· 11 10 */ 12 11 13 12 /dts-v1/; 13 + #include <dt-bindings/gpio/gpio.h> 14 14 #include "imx28.dtsi" 15 15 16 16 / { ··· 34 32 status = "okay"; 35 33 }; 36 34 35 + ssp2: ssp@80014000 { 36 + compatible = "fsl,imx28-spi"; 37 + pinctrl-names = "default"; 38 + pinctrl-0 = <&spi2_pins_a>; 39 + status = "okay"; 40 + }; 41 + 37 42 pinctrl@80018000 { 38 43 pinctrl-names = "default"; 39 44 pinctrl-0 = <&hog_pins_a>; ··· 48 39 hog_pins_a: hog@0 { 49 40 reg = <0>; 50 41 fsl,pinmux-ids = < 51 - MX28_PAD_SSP0_DATA7__GPIO_2_7 /* PHY Reset */ 42 + MX28_PAD_LCD_D17__GPIO_1_17 /* Revision detection */ 52 43 >; 53 44 fsl,drive-strength = <MXS_DRIVE_4mA>; 54 45 fsl,voltage = <MXS_VOLTAGE_HIGH>; 55 46 fsl,pull-up = <MXS_PULL_DISABLE>; 56 47 }; 57 48 58 - led_pins_a: led_gpio@0 { 49 + mac0_phy_reset_pin: mac0-phy-reset@0 { 50 + reg = <0>; 51 + fsl,pinmux-ids = < 52 + MX28_PAD_SSP0_DATA7__GPIO_2_7 /* PHY Reset */ 53 + >; 54 + fsl,drive-strength = <MXS_DRIVE_4mA>; 55 + fsl,voltage = <MXS_VOLTAGE_HIGH>; 56 + fsl,pull-up = <MXS_PULL_DISABLE>; 57 + }; 58 + 59 + led_pins: leds@0 { 59 60 reg = <0>; 60 61 fsl,pinmux-ids = < 61 62 MX28_PAD_AUART1_RX__GPIO_3_4 ··· 79 60 }; 80 61 81 62 apbx@80040000 { 63 + lradc@80050000 { 64 + status = "okay"; 65 + }; 66 + 67 + i2c0: i2c@80058000 { 68 + pinctrl-names = "default"; 69 + pinctrl-0 = <&i2c0_pins_a>; 70 + status = "okay"; 71 + }; 72 + 73 + auart0: serial@8006a000 { 74 + pinctrl-names = "default"; 75 + pinctrl-0 = <&auart0_2pins_a>; 76 + status = "okay"; 77 + }; 78 + 82 79 duart: serial@80074000 { 83 80 pinctrl-names = "default"; 84 81 pinctrl-0 = <&duart_pins_a>; ··· 110 75 ahb@80080000 { 111 76 usb0: usb@80080000 { 112 77 status = "okay"; 78 + dr_mode = "peripheral"; 113 79 }; 114 80 115 81 mac0: ethernet@800f0000 { 116 82 phy-mode = "rmii"; 117 83 pinctrl-names = "default"; 118 - pinctrl-0 = <&mac0_pins_a>; 84 + pinctrl-0 = <&mac0_pins_a>, <&mac0_phy_reset_pin>; 119 85 phy-supply = <&reg_3p3v>; 120 86 phy-reset-gpios = <&gpio2 7 GPIO_ACTIVE_LOW>; 121 - phy-reset-duration = <100>; 87 + phy-reset-duration = <25>; 122 88 status = "okay"; 123 89 }; 124 90 }; 125 91 126 - regulators { 127 - compatible = "simple-bus"; 128 - #address-cells = <1>; 129 - #size-cells = <0>; 130 - 131 - reg_3p3v: regulator@0 { 132 - compatible = "regulator-fixed"; 133 - reg = <0>; 134 - regulator-name = "3P3V"; 135 - regulator-min-microvolt = <3300000>; 136 - regulator-max-microvolt = <3300000>; 137 - regulator-always-on; 138 - }; 92 + reg_3p3v: regulator-3p3v { 93 + compatible = "regulator-fixed"; 94 + regulator-name = "3P3V"; 95 + regulator-min-microvolt = <3300000>; 96 + regulator-max-microvolt = <3300000>; 97 + regulator-always-on; 139 98 }; 140 99 141 100 leds { 142 101 compatible = "gpio-leds"; 143 102 pinctrl-names = "default"; 144 - pinctrl-0 = <&led_pins_a>; 103 + pinctrl-0 = <&led_pins>; 145 104 146 - status { 147 - label = "duckbill:green:status"; 148 - gpios = <&gpio3 5 GPIO_ACTIVE_HIGH>; 149 - }; 150 - 151 - failure { 105 + status-red { 152 106 label = "duckbill:red:status"; 153 107 gpios = <&gpio3 4 GPIO_ACTIVE_HIGH>; 108 + linux,default-trigger = "default-on"; 109 + }; 110 + 111 + status-green { 112 + label = "duckbill:green:status"; 113 + gpios = <&gpio3 5 GPIO_ACTIVE_HIGH>; 114 + linux,default-trigger = "heartbeat"; 154 115 }; 155 116 }; 156 117 };