aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKukjin Kim <kgene@kernel.org>2015-10-07 18:16:31 -0400
committerKukjin Kim <kgene@kernel.org>2015-10-07 18:16:31 -0400
commit6252eb0a17132b87d42a1c8f15a967bc9143ae60 (patch)
tree26865d9184a923fc1e1403c1d01a6160a8704605
parent6c6000c2ccfe69e5d17a2fba91954ce1e6f7df01 (diff)
parentc21dbcfefc9dc9abc42971dc1f2681b6a8677c3c (diff)
Merge tag 'samsung-dt-4.4-2' of http://github.com/krzk/linux into v4.4-next/dt-samsung
Device Tree improvements for Exynos based boards (updated pull request): 1. Enable DMA on Exynos4 serial ports. This old patch uncovered a number of other issues in dmaengine and samsung serial driver. All of known issues are resolved so finally enable the DMA for UART. 2. Fix incorrect location of display-timings node (FIMD->DP node) on Arndale, SMDK5250 and SMDK5240 boards. 3. Minor cleanups.
Diffstat
-rw-r--r--arch/arm/boot/dts/exynos4.dtsi8
-rw-r--r--arch/arm/boot/dts/exynos4412-odroid-common.dtsi12
-rw-r--r--arch/arm/boot/dts/exynos4412-trats2.dts105
-rw-r--r--arch/arm/boot/dts/exynos5250-arndale.dts8
-rw-r--r--arch/arm/boot/dts/exynos5250-smdk5250.dts16
-rw-r--r--arch/arm/boot/dts/exynos5420-smdk5420.dts7
-rw-r--r--arch/arm/boot/dts/s3c2416.dtsi2
7 files changed, 62 insertions, 96 deletions
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index 98c0a368b777..3184e10f260a 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -431,6 +431,8 @@
431 interrupts = <0 52 0>; 431 interrupts = <0 52 0>;
432 clocks = <&clock CLK_UART0>, <&clock CLK_SCLK_UART0>; 432 clocks = <&clock CLK_UART0>, <&clock CLK_SCLK_UART0>;
433 clock-names = "uart", "clk_uart_baud0"; 433 clock-names = "uart", "clk_uart_baud0";
434 dmas = <&pdma0 15>, <&pdma0 16>;
435 dma-names = "rx", "tx";
434 status = "disabled"; 436 status = "disabled";
435 }; 437 };
436 438
@@ -440,6 +442,8 @@
440 interrupts = <0 53 0>; 442 interrupts = <0 53 0>;
441 clocks = <&clock CLK_UART1>, <&clock CLK_SCLK_UART1>; 443 clocks = <&clock CLK_UART1>, <&clock CLK_SCLK_UART1>;
442 clock-names = "uart", "clk_uart_baud0"; 444 clock-names = "uart", "clk_uart_baud0";
445 dmas = <&pdma1 15>, <&pdma1 16>;
446 dma-names = "rx", "tx";
443 status = "disabled"; 447 status = "disabled";
444 }; 448 };
445 449
@@ -449,6 +453,8 @@
449 interrupts = <0 54 0>; 453 interrupts = <0 54 0>;
450 clocks = <&clock CLK_UART2>, <&clock CLK_SCLK_UART2>; 454 clocks = <&clock CLK_UART2>, <&clock CLK_SCLK_UART2>;
451 clock-names = "uart", "clk_uart_baud0"; 455 clock-names = "uart", "clk_uart_baud0";
456 dmas = <&pdma0 17>, <&pdma0 18>;
457 dma-names = "rx", "tx";
452 status = "disabled"; 458 status = "disabled";
453 }; 459 };
454 460
@@ -458,6 +464,8 @@
458 interrupts = <0 55 0>; 464 interrupts = <0 55 0>;
459 clocks = <&clock CLK_UART3>, <&clock CLK_SCLK_UART3>; 465 clocks = <&clock CLK_UART3>, <&clock CLK_SCLK_UART3>;
460 clock-names = "uart", "clk_uart_baud0"; 466 clock-names = "uart", "clk_uart_baud0";
467 dmas = <&pdma1 17>, <&pdma1 18>;
468 dma-names = "rx", "tx";
461 status = "disabled"; 469 status = "disabled";
462 }; 470 };
463 471
diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
index db52841297a5..c3e978d77367 100644
--- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
+++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
@@ -199,8 +199,6 @@
199}; 199};
200 200
201&i2c_0 { 201&i2c_0 {
202 pinctrl-0 = <&i2c0_bus>;
203 pinctrl-names = "default";
204 samsung,i2c-sda-delay = <100>; 202 samsung,i2c-sda-delay = <100>;
205 samsung,i2c-max-bus-freq = <400000>; 203 samsung,i2c-max-bus-freq = <400000>;
206 status = "okay"; 204 status = "okay";
@@ -276,15 +274,13 @@
276 regulator-always-on; 274 regulator-always-on;
277 }; 275 };
278 276
279 ldo8_reg: ldo@8 { 277 ldo8_reg: LDO8 {
280 regulator-compatible = "LDO8";
281 regulator-name = "VDD10_HDMI_1.0V"; 278 regulator-name = "VDD10_HDMI_1.0V";
282 regulator-min-microvolt = <1000000>; 279 regulator-min-microvolt = <1000000>;
283 regulator-max-microvolt = <1000000>; 280 regulator-max-microvolt = <1000000>;
284 }; 281 };
285 282
286 ldo10_reg: ldo@10 { 283 ldo10_reg: LDO10 {
287 regulator-compatible = "LDO10";
288 regulator-name = "VDDQ_MIPIHSI_1.8V"; 284 regulator-name = "VDDQ_MIPIHSI_1.8V";
289 regulator-min-microvolt = <1800000>; 285 regulator-min-microvolt = <1800000>;
290 regulator-max-microvolt = <1800000>; 286 regulator-max-microvolt = <1800000>;
@@ -424,8 +420,6 @@
424}; 420};
425 421
426&i2c_1 { 422&i2c_1 {
427 pinctrl-names = "default";
428 pinctrl-0 = <&i2c1_bus>;
429 status = "okay"; 423 status = "okay";
430 max98090: max98090@10 { 424 max98090: max98090@10 {
431 compatible = "maxim,max98090"; 425 compatible = "maxim,max98090";
@@ -440,8 +434,6 @@
440 434
441&i2c_2 { 435&i2c_2 {
442 status = "okay"; 436 status = "okay";
443 pinctrl-names = "default";
444 pinctrl-0 = <&i2c2_bus>;
445}; 437};
446 438
447&i2c_8 { 439&i2c_8 {
diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
index 2a1ebb76ebe0..93e3bbd4bd49 100644
--- a/arch/arm/boot/dts/exynos4412-trats2.dts
+++ b/arch/arm/boot/dts/exynos4412-trats2.dts
@@ -564,16 +564,14 @@
564 #clock-cells = <1>; 564 #clock-cells = <1>;
565 565
566 voltage-regulators { 566 voltage-regulators {
567 ldo1_reg: ldo1 { 567 ldo1_reg: LDO1 {
568 regulator-compatible = "LDO1";
569 regulator-name = "VALIVE_1.0V_AP"; 568 regulator-name = "VALIVE_1.0V_AP";
570 regulator-min-microvolt = <1000000>; 569 regulator-min-microvolt = <1000000>;
571 regulator-max-microvolt = <1000000>; 570 regulator-max-microvolt = <1000000>;
572 regulator-always-on; 571 regulator-always-on;
573 }; 572 };
574 573
575 ldo2_reg: ldo2 { 574 ldo2_reg: LDO2 {
576 regulator-compatible = "LDO2";
577 regulator-name = "VM1M2_1.2V_AP"; 575 regulator-name = "VM1M2_1.2V_AP";
578 regulator-min-microvolt = <1200000>; 576 regulator-min-microvolt = <1200000>;
579 regulator-max-microvolt = <1200000>; 577 regulator-max-microvolt = <1200000>;
@@ -583,32 +581,28 @@
583 }; 581 };
584 }; 582 };
585 583
586 ldo3_reg: ldo3 { 584 ldo3_reg: LDO3 {
587 regulator-compatible = "LDO3";
588 regulator-name = "VCC_1.8V_AP"; 585 regulator-name = "VCC_1.8V_AP";
589 regulator-min-microvolt = <1800000>; 586 regulator-min-microvolt = <1800000>;
590 regulator-max-microvolt = <1800000>; 587 regulator-max-microvolt = <1800000>;
591 regulator-always-on; 588 regulator-always-on;
592 }; 589 };
593 590
594 ldo4_reg: ldo4 { 591 ldo4_reg: LDO4 {
595 regulator-compatible = "LDO4";
596 regulator-name = "VCC_2.8V_AP"; 592 regulator-name = "VCC_2.8V_AP";
597 regulator-min-microvolt = <2800000>; 593 regulator-min-microvolt = <2800000>;
598 regulator-max-microvolt = <2800000>; 594 regulator-max-microvolt = <2800000>;
599 regulator-always-on; 595 regulator-always-on;
600 }; 596 };
601 597
602 ldo5_reg: ldo5 { 598 ldo5_reg: LDO5 {
603 regulator-compatible = "LDO5";
604 regulator-name = "VCC_1.8V_IO"; 599 regulator-name = "VCC_1.8V_IO";
605 regulator-min-microvolt = <1800000>; 600 regulator-min-microvolt = <1800000>;
606 regulator-max-microvolt = <1800000>; 601 regulator-max-microvolt = <1800000>;
607 regulator-always-on; 602 regulator-always-on;
608 }; 603 };
609 604
610 ldo6_reg: ldo6 { 605 ldo6_reg: LDO6 {
611 regulator-compatible = "LDO6";
612 regulator-name = "VMPLL_1.0V_AP"; 606 regulator-name = "VMPLL_1.0V_AP";
613 regulator-min-microvolt = <1000000>; 607 regulator-min-microvolt = <1000000>;
614 regulator-max-microvolt = <1000000>; 608 regulator-max-microvolt = <1000000>;
@@ -618,8 +612,7 @@
618 }; 612 };
619 }; 613 };
620 614
621 ldo7_reg: ldo7 { 615 ldo7_reg: LDO7 {
622 regulator-compatible = "LDO7";
623 regulator-name = "VPLL_1.0V_AP"; 616 regulator-name = "VPLL_1.0V_AP";
624 regulator-min-microvolt = <1000000>; 617 regulator-min-microvolt = <1000000>;
625 regulator-max-microvolt = <1000000>; 618 regulator-max-microvolt = <1000000>;
@@ -629,8 +622,7 @@
629 }; 622 };
630 }; 623 };
631 624
632 ldo8_reg: ldo8 { 625 ldo8_reg: LDO8 {
633 regulator-compatible = "LDO8";
634 regulator-name = "VMIPI_1.0V"; 626 regulator-name = "VMIPI_1.0V";
635 regulator-min-microvolt = <1000000>; 627 regulator-min-microvolt = <1000000>;
636 regulator-max-microvolt = <1000000>; 628 regulator-max-microvolt = <1000000>;
@@ -639,15 +631,13 @@
639 }; 631 };
640 }; 632 };
641 633
642 ldo9_reg: ldo9 { 634 ldo9_reg: LDO9 {
643 regulator-compatible = "LDO9";
644 regulator-name = "CAM_ISP_MIPI_1.2V"; 635 regulator-name = "CAM_ISP_MIPI_1.2V";
645 regulator-min-microvolt = <1200000>; 636 regulator-min-microvolt = <1200000>;
646 regulator-max-microvolt = <1200000>; 637 regulator-max-microvolt = <1200000>;
647 }; 638 };
648 639
649 ldo10_reg: ldo10 { 640 ldo10_reg: LDO10 {
650 regulator-compatible = "LDO10";
651 regulator-name = "VMIPI_1.8V"; 641 regulator-name = "VMIPI_1.8V";
652 regulator-min-microvolt = <1800000>; 642 regulator-min-microvolt = <1800000>;
653 regulator-max-microvolt = <1800000>; 643 regulator-max-microvolt = <1800000>;
@@ -656,8 +646,7 @@
656 }; 646 };
657 }; 647 };
658 648
659 ldo11_reg: ldo11 { 649 ldo11_reg: LDO11 {
660 regulator-compatible = "LDO11";
661 regulator-name = "VABB1_1.95V"; 650 regulator-name = "VABB1_1.95V";
662 regulator-min-microvolt = <1950000>; 651 regulator-min-microvolt = <1950000>;
663 regulator-max-microvolt = <1950000>; 652 regulator-max-microvolt = <1950000>;
@@ -667,8 +656,7 @@
667 }; 656 };
668 }; 657 };
669 658
670 ldo12_reg: ldo12 { 659 ldo12_reg: LDO12 {
671 regulator-compatible = "LDO12";
672 regulator-name = "VUOTG_3.0V"; 660 regulator-name = "VUOTG_3.0V";
673 regulator-min-microvolt = <3000000>; 661 regulator-min-microvolt = <3000000>;
674 regulator-max-microvolt = <3000000>; 662 regulator-max-microvolt = <3000000>;
@@ -677,15 +665,13 @@
677 }; 665 };
678 }; 666 };
679 667
680 ldo13_reg: ldo13 { 668 ldo13_reg: LDO13 {
681 regulator-compatible = "LDO13";
682 regulator-name = "NFC_AVDD_1.8V"; 669 regulator-name = "NFC_AVDD_1.8V";
683 regulator-min-microvolt = <1800000>; 670 regulator-min-microvolt = <1800000>;
684 regulator-max-microvolt = <1800000>; 671 regulator-max-microvolt = <1800000>;
685 }; 672 };
686 673
687 ldo14_reg: ldo14 { 674 ldo14_reg: LDO14 {
688 regulator-compatible = "LDO14";
689 regulator-name = "VABB2_1.95V"; 675 regulator-name = "VABB2_1.95V";
690 regulator-min-microvolt = <1950000>; 676 regulator-min-microvolt = <1950000>;
691 regulator-max-microvolt = <1950000>; 677 regulator-max-microvolt = <1950000>;
@@ -695,8 +681,7 @@
695 }; 681 };
696 }; 682 };
697 683
698 ldo15_reg: ldo15 { 684 ldo15_reg: LDO15 {
699 regulator-compatible = "LDO15";
700 regulator-name = "VHSIC_1.0V"; 685 regulator-name = "VHSIC_1.0V";
701 regulator-min-microvolt = <1000000>; 686 regulator-min-microvolt = <1000000>;
702 regulator-max-microvolt = <1000000>; 687 regulator-max-microvolt = <1000000>;
@@ -705,8 +690,7 @@
705 }; 690 };
706 }; 691 };
707 692
708 ldo16_reg: ldo16 { 693 ldo16_reg: LDO16 {
709 regulator-compatible = "LDO16";
710 regulator-name = "VHSIC_1.8V"; 694 regulator-name = "VHSIC_1.8V";
711 regulator-min-microvolt = <1800000>; 695 regulator-min-microvolt = <1800000>;
712 regulator-max-microvolt = <1800000>; 696 regulator-max-microvolt = <1800000>;
@@ -715,80 +699,69 @@
715 }; 699 };
716 }; 700 };
717 701
718 ldo17_reg: ldo17 { 702 ldo17_reg: LDO17 {
719 regulator-compatible = "LDO17";
720 regulator-name = "CAM_SENSOR_CORE_1.2V"; 703 regulator-name = "CAM_SENSOR_CORE_1.2V";
721 regulator-min-microvolt = <1200000>; 704 regulator-min-microvolt = <1200000>;
722 regulator-max-microvolt = <1200000>; 705 regulator-max-microvolt = <1200000>;
723 }; 706 };
724 707
725 ldo18_reg: ldo18 { 708 ldo18_reg: LDO18 {
726 regulator-compatible = "LDO18";
727 regulator-name = "CAM_ISP_SEN_IO_1.8V"; 709 regulator-name = "CAM_ISP_SEN_IO_1.8V";
728 regulator-min-microvolt = <1800000>; 710 regulator-min-microvolt = <1800000>;
729 regulator-max-microvolt = <1800000>; 711 regulator-max-microvolt = <1800000>;
730 }; 712 };
731 713
732 ldo19_reg: ldo19 { 714 ldo19_reg: LDO19 {
733 regulator-compatible = "LDO19";
734 regulator-name = "VT_CAM_1.8V"; 715 regulator-name = "VT_CAM_1.8V";
735 regulator-min-microvolt = <1800000>; 716 regulator-min-microvolt = <1800000>;
736 regulator-max-microvolt = <1800000>; 717 regulator-max-microvolt = <1800000>;
737 }; 718 };
738 719
739 ldo20_reg: ldo20 { 720 ldo20_reg: LDO20 {
740 regulator-compatible = "LDO20";
741 regulator-name = "VDDQ_PRE_1.8V"; 721 regulator-name = "VDDQ_PRE_1.8V";
742 regulator-min-microvolt = <1800000>; 722 regulator-min-microvolt = <1800000>;
743 regulator-max-microvolt = <1800000>; 723 regulator-max-microvolt = <1800000>;
744 }; 724 };
745 725
746 ldo21_reg: ldo21 { 726 ldo21_reg: LDO21 {
747 regulator-compatible = "LDO21";
748 regulator-name = "VTF_2.8V"; 727 regulator-name = "VTF_2.8V";
749 regulator-min-microvolt = <2800000>; 728 regulator-min-microvolt = <2800000>;
750 regulator-max-microvolt = <2800000>; 729 regulator-max-microvolt = <2800000>;
751 maxim,ena-gpios = <&gpy2 0 GPIO_ACTIVE_HIGH>; 730 maxim,ena-gpios = <&gpy2 0 GPIO_ACTIVE_HIGH>;
752 }; 731 };
753 732
754 ldo22_reg: ldo22 { 733 ldo22_reg: LDO22 {
755 regulator-compatible = "LDO22";
756 regulator-name = "VMEM_VDD_2.8V"; 734 regulator-name = "VMEM_VDD_2.8V";
757 regulator-min-microvolt = <2800000>; 735 regulator-min-microvolt = <2800000>;
758 regulator-max-microvolt = <2800000>; 736 regulator-max-microvolt = <2800000>;
759 maxim,ena-gpios = <&gpk0 2 GPIO_ACTIVE_HIGH>; 737 maxim,ena-gpios = <&gpk0 2 GPIO_ACTIVE_HIGH>;
760 }; 738 };
761 739
762 ldo23_reg: ldo23 { 740 ldo23_reg: LDO23 {
763 regulator-compatible = "LDO23";
764 regulator-name = "TSP_AVDD_3.3V"; 741 regulator-name = "TSP_AVDD_3.3V";
765 regulator-min-microvolt = <3300000>; 742 regulator-min-microvolt = <3300000>;
766 regulator-max-microvolt = <3300000>; 743 regulator-max-microvolt = <3300000>;
767 }; 744 };
768 745
769 ldo24_reg: ldo24 { 746 ldo24_reg: LDO24 {
770 regulator-compatible = "LDO24";
771 regulator-name = "TSP_VDD_1.8V"; 747 regulator-name = "TSP_VDD_1.8V";
772 regulator-min-microvolt = <1800000>; 748 regulator-min-microvolt = <1800000>;
773 regulator-max-microvolt = <1800000>; 749 regulator-max-microvolt = <1800000>;
774 }; 750 };
775 751
776 ldo25_reg: ldo25 { 752 ldo25_reg: LDO25 {
777 regulator-compatible = "LDO25";
778 regulator-name = "LCD_VCC_3.3V"; 753 regulator-name = "LCD_VCC_3.3V";
779 regulator-min-microvolt = <2800000>; 754 regulator-min-microvolt = <2800000>;
780 regulator-max-microvolt = <2800000>; 755 regulator-max-microvolt = <2800000>;
781 }; 756 };
782 757
783 ldo26_reg: ldo26 { 758 ldo26_reg: LDO26 {
784 regulator-compatible = "LDO26";
785 regulator-name = "MOTOR_VCC_3.0V"; 759 regulator-name = "MOTOR_VCC_3.0V";
786 regulator-min-microvolt = <3000000>; 760 regulator-min-microvolt = <3000000>;
787 regulator-max-microvolt = <3000000>; 761 regulator-max-microvolt = <3000000>;
788 }; 762 };
789 763
790 buck1_reg: buck1 { 764 buck1_reg: BUCK1 {
791 regulator-compatible = "BUCK1";
792 regulator-name = "vdd_mif"; 765 regulator-name = "vdd_mif";
793 regulator-min-microvolt = <850000>; 766 regulator-min-microvolt = <850000>;
794 regulator-max-microvolt = <1100000>; 767 regulator-max-microvolt = <1100000>;
@@ -799,8 +772,7 @@
799 }; 772 };
800 }; 773 };
801 774
802 buck2_reg: buck2 { 775 buck2_reg: BUCK2 {
803 regulator-compatible = "BUCK2";
804 regulator-name = "vdd_arm"; 776 regulator-name = "vdd_arm";
805 regulator-min-microvolt = <850000>; 777 regulator-min-microvolt = <850000>;
806 regulator-max-microvolt = <1500000>; 778 regulator-max-microvolt = <1500000>;
@@ -811,8 +783,7 @@
811 }; 783 };
812 }; 784 };
813 785
814 buck3_reg: buck3 { 786 buck3_reg: BUCK3 {
815 regulator-compatible = "BUCK3";
816 regulator-name = "vdd_int"; 787 regulator-name = "vdd_int";
817 regulator-min-microvolt = <850000>; 788 regulator-min-microvolt = <850000>;
818 regulator-max-microvolt = <1150000>; 789 regulator-max-microvolt = <1150000>;
@@ -823,8 +794,7 @@
823 }; 794 };
824 }; 795 };
825 796
826 buck4_reg: buck4 { 797 buck4_reg: BUCK4 {
827 regulator-compatible = "BUCK4";
828 regulator-name = "vdd_g3d"; 798 regulator-name = "vdd_g3d";
829 regulator-min-microvolt = <850000>; 799 regulator-min-microvolt = <850000>;
830 regulator-max-microvolt = <1150000>; 800 regulator-max-microvolt = <1150000>;
@@ -834,40 +804,35 @@
834 }; 804 };
835 }; 805 };
836 806
837 buck5_reg: buck5 { 807 buck5_reg: BUCK5 {
838 regulator-compatible = "BUCK5";
839 regulator-name = "VMEM_1.2V_AP"; 808 regulator-name = "VMEM_1.2V_AP";
840 regulator-min-microvolt = <1200000>; 809 regulator-min-microvolt = <1200000>;
841 regulator-max-microvolt = <1200000>; 810 regulator-max-microvolt = <1200000>;
842 regulator-always-on; 811 regulator-always-on;
843 }; 812 };
844 813
845 buck6_reg: buck6 { 814 buck6_reg: BUCK6 {
846 regulator-compatible = "BUCK6";
847 regulator-name = "VCC_SUB_1.35V"; 815 regulator-name = "VCC_SUB_1.35V";
848 regulator-min-microvolt = <1350000>; 816 regulator-min-microvolt = <1350000>;
849 regulator-max-microvolt = <1350000>; 817 regulator-max-microvolt = <1350000>;
850 regulator-always-on; 818 regulator-always-on;
851 }; 819 };
852 820
853 buck7_reg: buck7 { 821 buck7_reg: BUCK7 {
854 regulator-compatible = "BUCK7";
855 regulator-name = "VCC_SUB_2.0V"; 822 regulator-name = "VCC_SUB_2.0V";
856 regulator-min-microvolt = <2000000>; 823 regulator-min-microvolt = <2000000>;
857 regulator-max-microvolt = <2000000>; 824 regulator-max-microvolt = <2000000>;
858 regulator-always-on; 825 regulator-always-on;
859 }; 826 };
860 827
861 buck8_reg: buck8 { 828 buck8_reg: BUCK8 {
862 regulator-compatible = "BUCK8";
863 regulator-name = "VMEM_VDDF_3.0V"; 829 regulator-name = "VMEM_VDDF_3.0V";
864 regulator-min-microvolt = <2850000>; 830 regulator-min-microvolt = <2850000>;
865 regulator-max-microvolt = <2850000>; 831 regulator-max-microvolt = <2850000>;
866 maxim,ena-gpios = <&gpk0 2 GPIO_ACTIVE_HIGH>; 832 maxim,ena-gpios = <&gpk0 2 GPIO_ACTIVE_HIGH>;
867 }; 833 };
868 834
869 buck9_reg: buck9 { 835 buck9_reg: BUCK9 {
870 regulator-compatible = "BUCK9";
871 regulator-name = "CAM_ISP_CORE_1.2V"; 836 regulator-name = "CAM_ISP_CORE_1.2V";
872 regulator-min-microvolt = <1000000>; 837 regulator-min-microvolt = <1000000>;
873 regulator-max-microvolt = <1200000>; 838 regulator-max-microvolt = <1200000>;
diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts
index db3f65f3eb45..c000532c1444 100644
--- a/arch/arm/boot/dts/exynos5250-arndale.dts
+++ b/arch/arm/boot/dts/exynos5250-arndale.dts
@@ -129,10 +129,6 @@
129 samsung,color-depth = <1>; 129 samsung,color-depth = <1>;
130 samsung,link-rate = <0x0a>; 130 samsung,link-rate = <0x0a>;
131 samsung,lane-count = <4>; 131 samsung,lane-count = <4>;
132};
133
134&fimd {
135 status = "okay";
136 132
137 display-timings { 133 display-timings {
138 native-mode = <&timing0>; 134 native-mode = <&timing0>;
@@ -152,6 +148,10 @@
152 }; 148 };
153}; 149};
154 150
151&fimd {
152 status = "okay";
153};
154
155&hdmi { 155&hdmi {
156 hpd-gpio = <&gpx3 7 GPIO_ACTIVE_LOW>; 156 hpd-gpio = <&gpx3 7 GPIO_ACTIVE_LOW>;
157 vdd_osc-supply = <&ldo10_reg>; 157 vdd_osc-supply = <&ldo10_reg>;
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index 15aea760c1da..66da0d1d9d8a 100644
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -89,14 +89,6 @@
89 pinctrl-names = "default"; 89 pinctrl-names = "default";
90 pinctrl-0 = <&dp_hpd>; 90 pinctrl-0 = <&dp_hpd>;
91 status = "okay"; 91 status = "okay";
92};
93
94&ehci {
95 samsung,vbus-gpio = <&gpx2 6 GPIO_ACTIVE_HIGH>;
96};
97
98&fimd {
99 status = "okay";
100 92
101 display-timings { 93 display-timings {
102 native-mode = <&timing0>; 94 native-mode = <&timing0>;
@@ -116,6 +108,14 @@
116 }; 108 };
117}; 109};
118 110
111&ehci {
112 samsung,vbus-gpio = <&gpx2 6 GPIO_ACTIVE_HIGH>;
113};
114
115&fimd {
116 status = "okay";
117};
118
119&hdmi { 119&hdmi {
120 hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>; 120 hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
121}; 121};
diff --git a/arch/arm/boot/dts/exynos5420-smdk5420.dts b/arch/arm/boot/dts/exynos5420-smdk5420.dts
index 98871f972c8a..7520d52f4e22 100644
--- a/arch/arm/boot/dts/exynos5420-smdk5420.dts
+++ b/arch/arm/boot/dts/exynos5420-smdk5420.dts
@@ -98,10 +98,7 @@
98 samsung,link-rate = <0x0a>; 98 samsung,link-rate = <0x0a>;
99 samsung,lane-count = <4>; 99 samsung,lane-count = <4>;
100 status = "okay"; 100 status = "okay";
101};
102 101
103&fimd {
104 status = "okay";
105 display-timings { 102 display-timings {
106 native-mode = <&timing0>; 103 native-mode = <&timing0>;
107 timing0: timing@0 { 104 timing0: timing@0 {
@@ -118,6 +115,10 @@
118 }; 115 };
119}; 116};
120 117
118&fimd {
119 status = "okay";
120};
121
121&hdmi { 122&hdmi {
122 status = "okay"; 123 status = "okay";
123 hpd-gpio = <&gpx3 7 0>; 124 hpd-gpio = <&gpx3 7 0>;
diff --git a/arch/arm/boot/dts/s3c2416.dtsi b/arch/arm/boot/dts/s3c2416.dtsi
index a5184ff56933..80f007550324 100644
--- a/arch/arm/boot/dts/s3c2416.dtsi
+++ b/arch/arm/boot/dts/s3c2416.dtsi
@@ -25,7 +25,7 @@
25 #size-cells = <0>; 25 #size-cells = <0>;
26 26
27 cpu { 27 cpu {
28 compatible = "arm,arm926ejs"; 28 compatible = "arm,arm926ej-s";
29 }; 29 };
30 }; 30 };
31 31
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-22 12:46:03 -0400