.. | .. |
---|
53 | 53 | i2c11 = &i2cexio1; |
---|
54 | 54 | i2c12 = &i2chdmi; |
---|
55 | 55 | i2c13 = &i2cpwr; |
---|
| 56 | + mmc0 = &mmcif1; |
---|
| 57 | + mmc1 = &sdhi0; |
---|
| 58 | + mmc2 = &sdhi2; |
---|
56 | 59 | }; |
---|
57 | 60 | |
---|
58 | 61 | chosen { |
---|
59 | | - bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp"; |
---|
| 62 | + bootargs = "ignore_loglevel rw root=/dev/nfs ip=on"; |
---|
60 | 63 | stdout-path = "serial0:115200n8"; |
---|
61 | 64 | }; |
---|
62 | 65 | |
---|
.. | .. |
---|
150 | 153 | |
---|
151 | 154 | gpios = <&gpio5 29 GPIO_ACTIVE_HIGH>; |
---|
152 | 155 | gpios-states = <1>; |
---|
153 | | - states = <3300000 1 |
---|
154 | | - 1800000 0>; |
---|
| 156 | + states = <3300000 1>, <1800000 0>; |
---|
155 | 157 | }; |
---|
156 | 158 | |
---|
157 | 159 | vcc_sdhi2: regulator-vcc-sdhi2 { |
---|
.. | .. |
---|
174 | 176 | |
---|
175 | 177 | gpios = <&gpio5 30 GPIO_ACTIVE_HIGH>; |
---|
176 | 178 | gpios-states = <1>; |
---|
177 | | - states = <3300000 1 |
---|
178 | | - 1800000 0>; |
---|
| 179 | + states = <3300000 1>, <1800000 0>; |
---|
179 | 180 | }; |
---|
180 | 181 | |
---|
181 | 182 | audio_clock: audio_clock { |
---|
.. | .. |
---|
325 | 326 | #size-cells = <0>; |
---|
326 | 327 | }; |
---|
327 | 328 | |
---|
328 | | - /* |
---|
329 | | - * IIC2 and I2C2 may be switched using pinmux. |
---|
330 | | - * A fallback to GPIO is also provided. |
---|
331 | | - */ |
---|
| 329 | + /* |
---|
| 330 | + * IIC2 and I2C2 may be switched using pinmux. |
---|
| 331 | + * A fallback to GPIO is also provided. |
---|
| 332 | + */ |
---|
332 | 333 | i2chdmi: i2c-12 { |
---|
333 | 334 | compatible = "i2c-demux-pinctrl"; |
---|
334 | 335 | i2c-parent = <&iic2>, <&i2c2>, <&gpioi2c2>; |
---|
.. | .. |
---|
345 | 346 | composite-in@20 { |
---|
346 | 347 | compatible = "adi,adv7180"; |
---|
347 | 348 | reg = <0x20>; |
---|
348 | | - remote = <&vin1>; |
---|
349 | 349 | |
---|
350 | 350 | port { |
---|
351 | 351 | adv7180: endpoint { |
---|
.. | .. |
---|
366 | 366 | adi,input-depth = <8>; |
---|
367 | 367 | adi,input-colorspace = "rgb"; |
---|
368 | 368 | adi,input-clock = "1x"; |
---|
369 | | - adi,input-style = <1>; |
---|
370 | | - adi,input-justification = "evenly"; |
---|
371 | 369 | |
---|
372 | 370 | ports { |
---|
373 | 371 | #address-cells = <1>; |
---|
.. | .. |
---|
423 | 421 | */ |
---|
424 | 422 | i2cpwr: i2c-13 { |
---|
425 | 423 | compatible = "i2c-demux-pinctrl"; |
---|
| 424 | + pinctrl-names = "default"; |
---|
| 425 | + pinctrl-0 = <&pmic_irq_pins>; |
---|
426 | 426 | i2c-parent = <&iic3>, <&i2c3>; |
---|
427 | 427 | i2c-bus-name = "i2c-pwr"; |
---|
428 | 428 | #address-cells = <1>; |
---|
.. | .. |
---|
615 | 615 | function = "iic3"; |
---|
616 | 616 | }; |
---|
617 | 617 | |
---|
| 618 | + pmic_irq_pins: pmicirq { |
---|
| 619 | + groups = "intc_irq2"; |
---|
| 620 | + function = "intc"; |
---|
| 621 | + }; |
---|
| 622 | + |
---|
618 | 623 | hsusb_pins: hsusb { |
---|
619 | 624 | groups = "usb0_ovc_vbus"; |
---|
620 | 625 | function = "usb0"; |
---|
.. | .. |
---|
669 | 674 | interrupt-parent = <&irqc0>; |
---|
670 | 675 | interrupts = <0 IRQ_TYPE_LEVEL_LOW>; |
---|
671 | 676 | micrel,led-mode = <1>; |
---|
| 677 | + reset-gpios = <&gpio5 31 GPIO_ACTIVE_LOW>; |
---|
672 | 678 | }; |
---|
673 | 679 | }; |
---|
674 | 680 | |
---|