forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-01-31 f9004dbfff8a3fbbd7e2a88c8a4327c7f2f8e5b2
kernel/arch/arm/boot/dts/r8a7791-koelsch.dts
....@@ -53,10 +53,13 @@
5353 i2c12 = &i2cexio1;
5454 i2c13 = &i2chdmi;
5555 i2c14 = &i2cexio4;
56
+ mmc0 = &sdhi0;
57
+ mmc1 = &sdhi1;
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
....@@ -193,8 +196,7 @@
193196
194197 gpios = <&gpio2 12 GPIO_ACTIVE_HIGH>;
195198 gpios-states = <1>;
196
- states = <3300000 1
197
- 1800000 0>;
199
+ states = <3300000 1>, <1800000 0>;
198200 };
199201
200202 vcc_sdhi1: regulator-vcc-sdhi1 {
....@@ -217,8 +219,7 @@
217219
218220 gpios = <&gpio2 13 GPIO_ACTIVE_HIGH>;
219221 gpios-states = <1>;
220
- states = <3300000 1
221
- 1800000 0>;
222
+ states = <3300000 1>, <1800000 0>;
222223 };
223224
224225 vcc_sdhi2: regulator-vcc-sdhi2 {
....@@ -241,8 +242,7 @@
241242
242243 gpios = <&gpio2 26 GPIO_ACTIVE_HIGH>;
243244 gpios-states = <1>;
244
- states = <3300000 1
245
- 1800000 0>;
245
+ states = <3300000 1>, <1800000 0>;
246246 };
247247
248248 audio_clock: audio_clock {
....@@ -369,7 +369,6 @@
369369 composite-in@20 {
370370 compatible = "adi,adv7180";
371371 reg = <0x20>;
372
- remote = <&vin1>;
373372
374373 port {
375374 adv7180: endpoint {
....@@ -390,8 +389,6 @@
390389 adi,input-depth = <8>;
391390 adi,input-colorspace = "rgb";
392391 adi,input-clock = "1x";
393
- adi,input-style = <1>;
394
- adi,input-justification = "evenly";
395392
396393 ports {
397394 #address-cells = <1>;
....@@ -540,6 +537,11 @@
540537 function = "intc";
541538 };
542539
540
+ pmic_irq_pins: pmicirq {
541
+ groups = "intc_irq2";
542
+ function = "intc";
543
+ };
544
+
543545 sdhi0_pins: sd0 {
544546 groups = "sdhi0_data4", "sdhi0_ctrl";
545547 function = "sdhi0";
....@@ -631,6 +633,7 @@
631633 interrupt-parent = <&irqc0>;
632634 interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
633635 micrel,led-mode = <1>;
636
+ reset-gpios = <&gpio5 22 GPIO_ACTIVE_LOW>;
634637 };
635638 };
636639
....@@ -776,6 +779,8 @@
776779 };
777780
778781 &i2c6 {
782
+ pinctrl-names = "default";
783
+ pinctrl-0 = <&pmic_irq_pins>;
779784 status = "okay";
780785 clock-frequency = <100000>;
781786