diff options
| -rw-r--r-- | arch/arc/boot/dts/nsimosci.dts | 14 | ||||
| -rw-r--r-- | arch/arc/boot/dts/nsimosci_hs.dts | 14 | ||||
| -rw-r--r-- | arch/arc/boot/dts/nsimosci_hs_idu.dts | 14 | ||||
| -rw-r--r-- | arch/arc/configs/nsimosci_defconfig | 3 | ||||
| -rw-r--r-- | arch/arc/configs/nsimosci_hs_defconfig | 3 | ||||
| -rw-r--r-- | arch/arc/configs/nsimosci_hs_smp_defconfig | 3 |
6 files changed, 39 insertions, 12 deletions
diff --git a/arch/arc/boot/dts/nsimosci.dts b/arch/arc/boot/dts/nsimosci.dts index b5b060adce8a..37c416defe90 100644 --- a/arch/arc/boot/dts/nsimosci.dts +++ b/arch/arc/boot/dts/nsimosci.dts | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | /* this is for console on PGU */ | 20 | /* this is for console on PGU */ |
| 21 | /* bootargs = "console=tty0 consoleblank=0"; */ | 21 | /* bootargs = "console=tty0 consoleblank=0"; */ |
| 22 | /* this is for console on serial */ | 22 | /* this is for console on serial */ |
| 23 | bootargs = "earlycon=uart8250,mmio32,0xf0000000,115200n8 console=tty0 console=ttyS0,115200n8 consoleblank=0 debug"; | 23 | bootargs = "earlycon=uart8250,mmio32,0xf0000000,115200n8 console=tty0 console=ttyS0,115200n8 consoleblank=0 debug video=640x480-24"; |
| 24 | }; | 24 | }; |
| 25 | 25 | ||
| 26 | aliases { | 26 | aliases { |
| @@ -58,9 +58,17 @@ | |||
| 58 | no-loopback-test = <1>; | 58 | no-loopback-test = <1>; |
| 59 | }; | 59 | }; |
| 60 | 60 | ||
| 61 | pgu0: pgu@f9000000 { | 61 | pguclk: pguclk { |
| 62 | compatible = "snps,arcpgufb"; | 62 | #clock-cells = <0>; |
| 63 | compatible = "fixed-clock"; | ||
| 64 | clock-frequency = <25175000>; | ||
| 65 | }; | ||
| 66 | |||
| 67 | pgu@f9000000 { | ||
| 68 | compatible = "snps,arcpgu"; | ||
| 63 | reg = <0xf9000000 0x400>; | 69 | reg = <0xf9000000 0x400>; |
| 70 | clocks = <&pguclk>; | ||
| 71 | clock-names = "pxlclk"; | ||
| 64 | }; | 72 | }; |
| 65 | 73 | ||
| 66 | ps2: ps2@f9001000 { | 74 | ps2: ps2@f9001000 { |
diff --git a/arch/arc/boot/dts/nsimosci_hs.dts b/arch/arc/boot/dts/nsimosci_hs.dts index 325e73090a18..f2a22c49541d 100644 --- a/arch/arc/boot/dts/nsimosci_hs.dts +++ b/arch/arc/boot/dts/nsimosci_hs.dts | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | /* this is for console on PGU */ | 20 | /* this is for console on PGU */ |
| 21 | /* bootargs = "console=tty0 consoleblank=0"; */ | 21 | /* bootargs = "console=tty0 consoleblank=0"; */ |
| 22 | /* this is for console on serial */ | 22 | /* this is for console on serial */ |
| 23 | bootargs = "earlycon=uart8250,mmio32,0xf0000000,115200n8 console=tty0 console=ttyS0,115200n8 consoleblank=0 debug"; | 23 | bootargs = "earlycon=uart8250,mmio32,0xf0000000,115200n8 console=tty0 console=ttyS0,115200n8 consoleblank=0 debug video=640x480-24"; |
| 24 | }; | 24 | }; |
| 25 | 25 | ||
| 26 | aliases { | 26 | aliases { |
| @@ -58,9 +58,17 @@ | |||
| 58 | no-loopback-test = <1>; | 58 | no-loopback-test = <1>; |
| 59 | }; | 59 | }; |
| 60 | 60 | ||
| 61 | pgu0: pgu@f9000000 { | 61 | pguclk: pguclk { |
| 62 | compatible = "snps,arcpgufb"; | 62 | #clock-cells = <0>; |
| 63 | compatible = "fixed-clock"; | ||
| 64 | clock-frequency = <25175000>; | ||
| 65 | }; | ||
| 66 | |||
| 67 | pgu@f9000000 { | ||
| 68 | compatible = "snps,arcpgu"; | ||
| 63 | reg = <0xf9000000 0x400>; | 69 | reg = <0xf9000000 0x400>; |
| 70 | clocks = <&pguclk>; | ||
| 71 | clock-names = "pxlclk"; | ||
| 64 | }; | 72 | }; |
| 65 | 73 | ||
| 66 | ps2: ps2@f9001000 { | 74 | ps2: ps2@f9001000 { |
diff --git a/arch/arc/boot/dts/nsimosci_hs_idu.dts b/arch/arc/boot/dts/nsimosci_hs_idu.dts index ee03d7126581..34457a5e7706 100644 --- a/arch/arc/boot/dts/nsimosci_hs_idu.dts +++ b/arch/arc/boot/dts/nsimosci_hs_idu.dts | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | 18 | ||
| 19 | chosen { | 19 | chosen { |
| 20 | /* this is for console on serial */ | 20 | /* this is for console on serial */ |
| 21 | bootargs = "earlycon=uart8250,mmio32,0xf0000000,115200n8 console=tty0 console=ttyS0,115200n8 consoleblan=0 debug"; | 21 | bootargs = "earlycon=uart8250,mmio32,0xf0000000,115200n8 console=tty0 console=ttyS0,115200n8 consoleblan=0 debug video=640x480-24"; |
| 22 | }; | 22 | }; |
| 23 | 23 | ||
| 24 | aliases { | 24 | aliases { |
| @@ -77,9 +77,17 @@ | |||
| 77 | no-loopback-test = <1>; | 77 | no-loopback-test = <1>; |
| 78 | }; | 78 | }; |
| 79 | 79 | ||
| 80 | pgu0: pgu@f9000000 { | 80 | pguclk: pguclk { |
| 81 | compatible = "snps,arcpgufb"; | 81 | #clock-cells = <0>; |
| 82 | compatible = "fixed-clock"; | ||
| 83 | clock-frequency = <25175000>; | ||
| 84 | }; | ||
| 85 | |||
| 86 | pgu@f9000000 { | ||
| 87 | compatible = "snps,arcpgu"; | ||
| 82 | reg = <0xf9000000 0x400>; | 88 | reg = <0xf9000000 0x400>; |
| 89 | clocks = <&pguclk>; | ||
| 90 | clock-names = "pxlclk"; | ||
| 83 | }; | 91 | }; |
| 84 | 92 | ||
| 85 | ps2: ps2@f9001000 { | 93 | ps2: ps2@f9001000 { |
diff --git a/arch/arc/configs/nsimosci_defconfig b/arch/arc/configs/nsimosci_defconfig index 42bafa552498..98cf20933bbb 100644 --- a/arch/arc/configs/nsimosci_defconfig +++ b/arch/arc/configs/nsimosci_defconfig | |||
| @@ -58,7 +58,8 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=1 | |||
| 58 | CONFIG_SERIAL_OF_PLATFORM=y | 58 | CONFIG_SERIAL_OF_PLATFORM=y |
| 59 | # CONFIG_HW_RANDOM is not set | 59 | # CONFIG_HW_RANDOM is not set |
| 60 | # CONFIG_HWMON is not set | 60 | # CONFIG_HWMON is not set |
| 61 | CONFIG_FB=y | 61 | CONFIG_DRM=y |
| 62 | CONFIG_DRM_ARCPGU=y | ||
| 62 | CONFIG_FRAMEBUFFER_CONSOLE=y | 63 | CONFIG_FRAMEBUFFER_CONSOLE=y |
| 63 | CONFIG_LOGO=y | 64 | CONFIG_LOGO=y |
| 64 | # CONFIG_HID is not set | 65 | # CONFIG_HID is not set |
diff --git a/arch/arc/configs/nsimosci_hs_defconfig b/arch/arc/configs/nsimosci_hs_defconfig index 4bb60c1cd4a2..ddf8b96d494e 100644 --- a/arch/arc/configs/nsimosci_hs_defconfig +++ b/arch/arc/configs/nsimosci_hs_defconfig | |||
| @@ -57,7 +57,8 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=1 | |||
| 57 | CONFIG_SERIAL_OF_PLATFORM=y | 57 | CONFIG_SERIAL_OF_PLATFORM=y |
| 58 | # CONFIG_HW_RANDOM is not set | 58 | # CONFIG_HW_RANDOM is not set |
| 59 | # CONFIG_HWMON is not set | 59 | # CONFIG_HWMON is not set |
| 60 | CONFIG_FB=y | 60 | CONFIG_DRM=y |
| 61 | CONFIG_DRM_ARCPGU=y | ||
| 61 | CONFIG_FRAMEBUFFER_CONSOLE=y | 62 | CONFIG_FRAMEBUFFER_CONSOLE=y |
| 62 | CONFIG_LOGO=y | 63 | CONFIG_LOGO=y |
| 63 | # CONFIG_HID is not set | 64 | # CONFIG_HID is not set |
diff --git a/arch/arc/configs/nsimosci_hs_smp_defconfig b/arch/arc/configs/nsimosci_hs_smp_defconfig index 7e88f4c720f8..ceb90745326e 100644 --- a/arch/arc/configs/nsimosci_hs_smp_defconfig +++ b/arch/arc/configs/nsimosci_hs_smp_defconfig | |||
| @@ -70,7 +70,8 @@ CONFIG_SERIAL_8250_DW=y | |||
| 70 | CONFIG_SERIAL_OF_PLATFORM=y | 70 | CONFIG_SERIAL_OF_PLATFORM=y |
| 71 | # CONFIG_HW_RANDOM is not set | 71 | # CONFIG_HW_RANDOM is not set |
| 72 | # CONFIG_HWMON is not set | 72 | # CONFIG_HWMON is not set |
| 73 | CONFIG_FB=y | 73 | CONFIG_DRM=y |
| 74 | CONFIG_DRM_ARCPGU=y | ||
| 74 | CONFIG_FRAMEBUFFER_CONSOLE=y | 75 | CONFIG_FRAMEBUFFER_CONSOLE=y |
| 75 | CONFIG_LOGO=y | 76 | CONFIG_LOGO=y |
| 76 | # CONFIG_HID is not set | 77 | # CONFIG_HID is not set |
