forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-01-31 f9004dbfff8a3fbbd7e2a88c8a4327c7f2f8e5b2
kernel/arch/arm/boot/dts/s3c6410-mini6410.dts
....@@ -28,29 +28,21 @@
2828 bootargs = "console=ttySAC0,115200n8 earlyprintk rootwait root=/dev/mmcblk0p1";
2929 };
3030
31
- clocks {
32
- compatible = "simple-bus";
33
- #address-cells = <1>;
34
- #size-cells = <0>;
35
-
36
- fin_pll: oscillator@0 {
37
- compatible = "fixed-clock";
38
- reg = <0>;
39
- clock-frequency = <12000000>;
40
- clock-output-names = "fin_pll";
41
- #clock-cells = <0>;
42
- };
43
-
44
- xusbxti: oscillator@1 {
45
- compatible = "fixed-clock";
46
- reg = <1>;
47
- clock-output-names = "xusbxti";
48
- clock-frequency = <48000000>;
49
- #clock-cells = <0>;
50
- };
31
+ fin_pll: oscillator-0 {
32
+ compatible = "fixed-clock";
33
+ clock-frequency = <12000000>;
34
+ clock-output-names = "fin_pll";
35
+ #clock-cells = <0>;
5136 };
5237
53
- srom-cs1@18000000 {
38
+ xusbxti: oscillator-1 {
39
+ compatible = "fixed-clock";
40
+ clock-output-names = "xusbxti";
41
+ clock-frequency = <48000000>;
42
+ #clock-cells = <0>;
43
+ };
44
+
45
+ srom-cs1-bus@18000000 {
5446 compatible = "simple-bus";
5547 #address-cells = <1>;
5648 #size-cells = <1>;
....@@ -59,7 +51,7 @@
5951
6052 ethernet@18000000 {
6153 compatible = "davicom,dm9000";
62
- reg = <0x18000000 0x2 0x18000004 0x2>;
54
+ reg = <0x18000000 0x2>, <0x18000004 0x2>;
6355 interrupt-parent = <&gpn>;
6456 interrupts = <7 IRQ_TYPE_LEVEL_HIGH>;
6557 davicom,no-eeprom;
....@@ -201,12 +193,12 @@
201193 };
202194
203195 &pinctrl0 {
204
- gpio_leds: gpio-leds {
196
+ gpio_leds: gpio-leds-pins {
205197 samsung,pins = "gpk-4", "gpk-5", "gpk-6", "gpk-7";
206198 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
207199 };
208200
209
- gpio_keys: gpio-keys {
201
+ gpio_keys: gpio-keys-pins {
210202 samsung,pins = "gpn-0", "gpn-1", "gpn-2", "gpn-3",
211203 "gpn-4", "gpn-5", "gpl-11", "gpl-12";
212204 samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;