hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/arch/arm/boot/dts/r8a7790-lager.dts
....@@ -53,10 +53,13 @@
5353 i2c11 = &i2cexio1;
5454 i2c12 = &i2chdmi;
5555 i2c13 = &i2cpwr;
56
+ mmc0 = &mmcif1;
57
+ mmc1 = &sdhi0;
58
+ mmc2 = &sdhi2;
5659 };
5760
5861 chosen {
59
- bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp";
62
+ bootargs = "ignore_loglevel rw root=/dev/nfs ip=on";
6063 stdout-path = "serial0:115200n8";
6164 };
6265
....@@ -150,8 +153,7 @@
150153
151154 gpios = <&gpio5 29 GPIO_ACTIVE_HIGH>;
152155 gpios-states = <1>;
153
- states = <3300000 1
154
- 1800000 0>;
156
+ states = <3300000 1>, <1800000 0>;
155157 };
156158
157159 vcc_sdhi2: regulator-vcc-sdhi2 {
....@@ -174,8 +176,7 @@
174176
175177 gpios = <&gpio5 30 GPIO_ACTIVE_HIGH>;
176178 gpios-states = <1>;
177
- states = <3300000 1
178
- 1800000 0>;
179
+ states = <3300000 1>, <1800000 0>;
179180 };
180181
181182 audio_clock: audio_clock {
....@@ -325,10 +326,10 @@
325326 #size-cells = <0>;
326327 };
327328
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
+ */
332333 i2chdmi: i2c-12 {
333334 compatible = "i2c-demux-pinctrl";
334335 i2c-parent = <&iic2>, <&i2c2>, <&gpioi2c2>;
....@@ -345,7 +346,6 @@
345346 composite-in@20 {
346347 compatible = "adi,adv7180";
347348 reg = <0x20>;
348
- remote = <&vin1>;
349349
350350 port {
351351 adv7180: endpoint {
....@@ -366,8 +366,6 @@
366366 adi,input-depth = <8>;
367367 adi,input-colorspace = "rgb";
368368 adi,input-clock = "1x";
369
- adi,input-style = <1>;
370
- adi,input-justification = "evenly";
371369
372370 ports {
373371 #address-cells = <1>;
....@@ -423,6 +421,8 @@
423421 */
424422 i2cpwr: i2c-13 {
425423 compatible = "i2c-demux-pinctrl";
424
+ pinctrl-names = "default";
425
+ pinctrl-0 = <&pmic_irq_pins>;
426426 i2c-parent = <&iic3>, <&i2c3>;
427427 i2c-bus-name = "i2c-pwr";
428428 #address-cells = <1>;
....@@ -615,6 +615,11 @@
615615 function = "iic3";
616616 };
617617
618
+ pmic_irq_pins: pmicirq {
619
+ groups = "intc_irq2";
620
+ function = "intc";
621
+ };
622
+
618623 hsusb_pins: hsusb {
619624 groups = "usb0_ovc_vbus";
620625 function = "usb0";
....@@ -669,6 +674,7 @@
669674 interrupt-parent = <&irqc0>;
670675 interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
671676 micrel,led-mode = <1>;
677
+ reset-gpios = <&gpio5 31 GPIO_ACTIVE_LOW>;
672678 };
673679 };
674680