Merge branch 'master' of https://github.com/armbian/build
This commit is contained in:
Igor Pecovnik
commit
a09e90dad8
@ -1,19 +1,35 @@
|
||||
xserver-xorg xserver-xorg-video-fbdev gvfs-backends xfonts-base xinit x11-xserver-utils budgie-desktop budgie-app-launcher-applet
|
||||
budgie-applications-menu-applet budgie-appmenu-applet budgie-brightness-controller-applet budgie-clockworks-applet budgie-countdown-applet
|
||||
budgie-desktop-doc budgie-desktop-environment budgie-dropby-applet budgie-extras-common budgie-extras-daemon budgie-fuzzyclock-applet
|
||||
budgie-hotcorners-applet budgie-indicator-applet budgie-kangaroo-applet budgie-keyboard-autoswitch-applet budgie-network-manager-applet
|
||||
budgie-previews budgie-previews-applet budgie-quickchar budgie-quicknote-applet budgie-recentlyused-applet budgie-rotation-lock-applet
|
||||
budgie-showtime-applet budgie-sntray-plugin budgie-takeabreak-applet budgie-trash-applet budgie-visualspace-applet budgie-wallpapers-focal
|
||||
budgie-wallstreet budgie-weathershow-applet budgie-welcome budgie-window-mover-applet budgie-window-shuffler budgie-workspace-overview-applet
|
||||
budgie-workspace-stopwatch-applet budgie-workspace-wallpaper-applet plank xinit xorg-docs-core x11-apps xorg-docs xscreensaver xfonts-100dpi
|
||||
xfonts-75dpi xfonts-scalable xcursor-themes xdg-user-dirs xdg-user-dirs-gtk keyutils redshift bluez-tools bluez-cups brltty orca
|
||||
policykit-desktop-privileges network-manager-pptp network-manager-l2tp network-manager-openconnect network-manager-openvpn
|
||||
network-manager-openvpn-gnome network-manager-vpnc cups cups-bsd cups-filters liblouisutdml-bin liblouis-bin blueman pamix pasystray pavucontrol
|
||||
pavumeter pavucontrol-qt gstreamer1.0-packagekit gstreamer1.0-plugins-base-apps libproxy1-plugin-gsettings libproxy1-plugin-networkmanager
|
||||
libu2f-udev libwmf0.2-7-gtk openprinting-ppds p7zip-full policykit-desktop-privileges anacron doc-base foomatic-db-compressed-ppds
|
||||
xserver-xorg xserver-xorg-video-fbdev xfonts-base xinit x11-xserver-utils xinit xorg-docs-core x11-apps xorg-docs xscreensaver xfonts-100dpi
|
||||
xfonts-75dpi xfonts-base xfonts-encodings xfonts-scalable xfonts-utils xcursor-themes xdg-user-dirs xdg-user-dirs-gtk keyutils redshift dbus-x11
|
||||
xwallpaper xterm xtermcontrol xtermset arandr libxcursor1 xcursor-themes mousetweaks xbacklight brltty brltty-x11
|
||||
lightdm lightdm-gtk-greeter lightdm-settings lightdm-gtk-greeter-settings numix-gtk-theme
|
||||
bluez bluez-tools bluez-cups blueman gnome-bluetooth libgnome-bluetooth13
|
||||
libgl1-mesa-dri mesa-utils policykit-1 profile-sync-daemon thunar
|
||||
budgie-desktop budgie-app-launcher-applet budgie-applications-menu-applet budgie-appmenu-applet budgie-brightness-controller-applet
|
||||
budgie-clockworks-applet budgie-countdown-applet budgie-desktop-doc budgie-desktop-environment budgie-dropby-applet budgie-extras-common
|
||||
budgie-extras-daemon budgie-fuzzyclock-applet budgie-hotcorners-applet budgie-indicator-applet budgie-kangaroo-applet
|
||||
budgie-keyboard-autoswitch-applet budgie-network-manager-applet budgie-previews budgie-previews-applet budgie-quickchar budgie-quicknote-applet
|
||||
budgie-recentlyused-applet budgie-rotation-lock-applet budgie-showtime-applet budgie-sntray-plugin budgie-takeabreak-applet budgie-trash-applet
|
||||
budgie-visualspace-applet budgie-wallpapers-focal budgie-wallstreet budgie-weathershow-applet budgie-welcome budgie-window-mover-applet
|
||||
budgie-window-shuffler budgie-workspace-overview-applet budgie-workspace-stopwatch-applet budgie-workspace-wallpaper-apple
|
||||
fonts-arphic-ukai fonts-arphic-uming fonts-dejavu-core fonts-freefont-ttf fonts-guru fonts-guru-extra fonts-kacst fonts-kacst-one fonts-khmeros-core
|
||||
fonts-liberation fonts-opensymbol fonts-nanum fonts-stix fonts-symbola
|
||||
libfont-afm-perl libfontconfig1 libfontembed1 libfontenc1 gnome-font-viewer fontconfig fontconfig-config
|
||||
policykit-desktop-privileges policykit-1-gnome
|
||||
network-manager-pptp network-manager-l2tp network-manager-openconnect network-manager-openvpn network-manager-openvpn-gnome network-manager-vpnc
|
||||
libproxy1-plugin-gsettings libproxy1-plugin-networkmanager libproxy1-plugin-gsettings
|
||||
pamix pasystray pavucontrol pavumeter pavucontrol-qt pulseaudio-module-bluetooth gstreamer1.0-pulseaudio gstreamer1.0-packagekit
|
||||
gstreamer1.0-plugins-base-apps
|
||||
libu2f-udev libwmf0.2-7-gtk openprinting-ppds hplip system-config-printer-gnome indicator-printers
|
||||
p7zip-full zip anacron doc-base foomatic-db-compressed-ppds
|
||||
ghostscript-x inputattach kerneloops language-pack-en libatk-adaptor libgail-common libnotify-bin software-properties-gtk speech-dispatcher
|
||||
spice-vdagent zip lightdm lightdm-gtk-greeter lightdm-settings lightdm-gtk-greeter-settings numix-gtk-theme terminator gnome-terminal bubblewrap
|
||||
dbus-x11 dictionaries-common hunspell-en-us nautilus nautilus-data tracker tracker-extract tracker-miner-fs update-manager update-manager-core
|
||||
update-notifier update-notifier-common libgl1-mesa-dri policykit-1 profile-sync-daemon system-config-printer system-config-printer-common
|
||||
printer-driver-all software-properties-common samba smbclient cifs-utils pulseaudio-module-bluetooth gdebi language-pack-gnome-sl
|
||||
language-pack-gnome-de language-pack-gnome-fr language-pack-gnome-it language-pack-gnome-es language-pack-gnome-pt language-pack-gnome-ru
|
||||
spice-vdagent dictionaries-common hunspell-en-us
|
||||
cups cups-bsd cups-client cups-filters system-config-printer system-config-printer-common printer-driver-all
|
||||
samba smbclient cifs-utils
|
||||
ubuntu-drivers-common ttf-ubuntu-font-family fonts-ubuntu-font-family-console
|
||||
tracker tracker-extract tracker-miner-fs update-inetd update-manager update-manager-core update-notifier update-notifier-common
|
||||
laptop-detect usb-creator-common usb-creator-gtk
|
||||
gnome-system-monitor gnome-system-tools gnome-power-manager gnome-orca evince evince-common caffeine lxappearance gdebi
|
||||
apport-gtk dmz-cursor-theme libgsettings-qt1 libappindicator3-1 gir1.2-appindicator3-0.1
|
||||
totem totem-common totem-plugins
|
||||
language-pack-gnome-sl language-pack-gnome-de language-pack-gnome-fr language-pack-gnome-it language-pack-gnome-es language-pack-gnome-pt
|
||||
language-pack-gnome-ru
|
||||
|
||||
@ -1,17 +1,33 @@
|
||||
xserver-xorg xserver-xorg-video-fbdev xfonts-base xinit x11-xserver-utils xorg-docs-core x11-apps xorg-docs xscreensaver xfonts-100dpi
|
||||
xfonts-75dpi xfonts-scalable xcursor-themes xdg-user-dirs xdg-user-dirs-gtk xterm terminator gvfs gvfs-backends gvfs-fuse gvfs-common
|
||||
gvfs-libs gvfs-daemons cinnamon cinnamon-common cinnamon-core cinnamon-control-center cinnamon-control-center-data cinnamon-desktop-data
|
||||
xserver-xorg xserver-xorg-video-fbdev xfonts-base xinit x11-xserver-utils xinit xorg-docs-core x11-apps xorg-docs xscreensaver xfonts-100dpi
|
||||
xfonts-75dpi xfonts-base xfonts-encodings xfonts-scalable xfonts-utils xcursor-themes xdg-user-dirs xdg-user-dirs-gtk keyutils redshift dbus-x11
|
||||
xwallpaper xterm xtermcontrol xtermset arandr libxcursor1 xcursor-themes mousetweaks xbacklight brltty brltty-x11
|
||||
lightdm lightdm-gtk-greeter lightdm-settings lightdm-gtk-greeter-settings numix-gtk-theme
|
||||
bluez bluez-tools bluez-cups blueman gnome-bluetooth libgnome-bluetooth13
|
||||
libgl1-mesa-dri mesa-utils policykit-1 profile-sync-daemon thunar
|
||||
gvfs gvfs-backends gvfs-fuse gvfs-common gvfs-libs gvfs-daemons
|
||||
cinnamon cinnamon-common cinnamon-core cinnamon-control-center cinnamon-control-center-data cinnamon-desktop-data
|
||||
cinnamon-screensaver cinnamon-session cinnamon-screensaver cinnamon-session-common cinnamon-settings-daemon cinnamon-control-center-goa
|
||||
nemo nemo-data gir1.2-cinnamondesktop-3.0 gir1.2-cmenu-3.0 gir1.2-cvc-1.0 libcinnamon-desktop4 libcinnamon-menu-3-0 libcscreensaver0 libcvc0
|
||||
gtk2-engines gtk2-engines-murrine gtk2-engines-pixbuf libgtk2.0-bin lightdm lightdm-gtk-greeter lightdm-gtk-greeter-settings numix-gtk-theme
|
||||
ubuntu-drivers-common ubuntu-minimal keyutils redshift bluez-tools bluez-cups brltty orca policykit-desktop-privileges network-manager-pptp
|
||||
network-manager-l2tp network-manager-openconnect network-manager-openvpn network-manager-openvpn-gnome network-manager-vpnc cups cups-bsd
|
||||
cups-filters liblouisutdml-bin liblouis-bin blueman pamix pasystray pavucontrol pavumeter pavucontrol-qt gstreamer1.0-packagekit
|
||||
gstreamer1.0-plugins-base-apps libproxy1-plugin-gsettings libproxy1-plugin-networkmanager libu2f-udev libwmf0.2-7-gtk openprinting-ppds
|
||||
p7zip-full policykit-desktop-privileges anacron doc-base foomatic-db-compressed-ppds ghostscript-x inputattach kerneloops language-pack-en
|
||||
libatk-adaptor libgail-common libnotify-bin software-properties-gtk speech-dispatcher spice-vdagent zip orca bubblewrap dbus-x11
|
||||
dictionaries-common hunspell-en-us tracker tracker-extract tracker-miner-fs update-manager update-manager-core update-notifier
|
||||
update-notifier-common libgl1-mesa-dri policykit-1 profile-sync-daemon system-config-printer system-config-printer-common printer-driver-all
|
||||
software-properties-common samba smbclient cifs-utils gnome-power-manager powermgmt-base libupower-glib3 ruby-power-assert plank
|
||||
libplank-common libplank1 gdebi language-pack-gnome-sl language-pack-gnome-de language-pack-gnome-fr language-pack-gnome-it language-pack-gnome-es
|
||||
language-pack-gnome-pt language-pack-gnome-ru
|
||||
gtk2-engines gtk2-engines-murrine gtk2-engines-pixbuf libgtk2.0-bin
|
||||
fonts-arphic-ukai fonts-arphic-uming fonts-dejavu-core fonts-freefont-ttf fonts-guru fonts-guru-extra fonts-kacst fonts-kacst-one
|
||||
fonts-khmeros-core fonts-liberation fonts-opensymbol fonts-nanum fonts-stix fonts-symbola
|
||||
libfont-afm-perl libfontconfig1 libfontembed1 libfontenc1 gnome-font-viewer fontconfig fontconfig-config
|
||||
policykit-desktop-privileges policykit-1-gnome
|
||||
network-manager-pptp network-manager-l2tp network-manager-openconnect network-manager-openvpn network-manager-openvpn-gnome network-manager-vpnc
|
||||
libproxy1-plugin-gsettings libproxy1-plugin-networkmanager libproxy1-plugin-gsettings
|
||||
pamix pasystray pavucontrol pavumeter pavucontrol-qt pulseaudio-module-bluetooth gstreamer1.0-pulseaudio gstreamer1.0-packagekit
|
||||
gstreamer1.0-plugins-base-apps
|
||||
libu2f-udev libwmf0.2-7-gtk openprinting-ppds hplip system-config-printer-gnome indicator-printers
|
||||
p7zip-full zip anacron doc-base foomatic-db-compressed-ppds
|
||||
ghostscript-x inputattach kerneloops language-pack-en libatk-adaptor libgail-common libnotify-bin software-properties-gtk speech-dispatcher
|
||||
spice-vdagent dictionaries-common hunspell-en-us
|
||||
cups cups-bsd cups-client cups-filters system-config-printer system-config-printer-common printer-driver-all
|
||||
samba smbclient cifs-utils
|
||||
ubuntu-drivers-common ttf-ubuntu-font-family fonts-ubuntu-font-family-console
|
||||
tracker tracker-extract tracker-miner-fs update-inetd update-manager update-manager-core update-notifier update-notifier-common
|
||||
laptop-detect usb-creator-common usb-creator-gtk
|
||||
gnome-system-monitor gnome-system-tools gnome-power-manager gnome-orca evince evince-common caffeine lxappearance gdebi
|
||||
apport-gtk dmz-cursor-theme libgsettings-qt1 libappindicator3-1 gir1.2-appindicator3-0.1
|
||||
totem totem-common totem-plugins
|
||||
language-pack-gnome-sl language-pack-gnome-de language-pack-gnome-fr language-pack-gnome-it language-pack-gnome-es language-pack-gnome-pt
|
||||
language-pack-gnome-ru
|
||||
|
||||
@ -1,20 +1,36 @@
|
||||
xserver-xorg xserver-xorg-video-fbdev gvfs gvfs-backends gvfs-fuse gvfs-bin gvfs-libs gvfs-daemons xfonts-base xinit x11-xserver-utils
|
||||
xorg-docs-core x11-apps xorg-docs xscreensaver xfonts-100dpi xfonts-75dpi xfonts-scalable xcursor-themes xdg-user-dirs xdg-user-dirs-gtk
|
||||
xserver-xorg xserver-xorg-video-fbdev xfonts-base xinit x11-xserver-utils xinit xorg-docs-core x11-apps xorg-docs xscreensaver xfonts-100dpi
|
||||
xfonts-75dpi xfonts-base xfonts-encodings xfonts-scalable xfonts-utils xcursor-themes xdg-user-dirs xdg-user-dirs-gtk keyutils redshift dbus-x11
|
||||
xwallpaper xterm xtermcontrol xtermset arandr libxcursor1 xcursor-themes mousetweaks xbacklight brltty brltty-x11
|
||||
lightdm lightdm-gtk-greeter lightdm-settings lightdm-gtk-greeter-settings numix-gtk-theme
|
||||
bluez bluez-tools bluez-cups blueman gnome-bluetooth libgnome-bluetooth13
|
||||
libgl1-mesa-dri mesa-utils policykit-1 profile-sync-daemon thunar
|
||||
gvfs gvfs-backends gvfs-fuse gvfs-common gvfs-libs gvfs-daemons
|
||||
deepin-desktop-base dde-desktop dde-api dde-dock dde-dock-onboard-plugin dde-launcher dde-control-center deepin-metacity deepin-wm
|
||||
startdde dde-session-ui dde-file-manager dde-qt5integration dde-disk-mount-plugin deepin-gtk-theme deepin-sound-theme deepin-icon-theme
|
||||
deepin-menu dde-daemon dde-account-faces deepin-desktop-schemas deepin-mutter dde-polkit-agent deepin-wm deepin-turbo deepin-turbo-booster
|
||||
ubuntudde-default-settings ubuntudde-icon-theme deepin-voice-recorder deepin-screenshot dde-calendar deepin-music deepin-picker
|
||||
deepin-gettext-tools deepin-image-viewer deepin-movie deepin-calculator deepin-shortcut-viewer deepin-system-monitor deepin-terminal
|
||||
deepin-topbar deepin-deb-installer deepin-screensaver eject fonts-noto fonts-noto-color-emoji libdtkgui-bin
|
||||
libdtkgui2 libdtkcore-bin gir1.2-deepin-mutter-3.0 lightdm lightdm-gtk-greeter lightdm-gtk-greeter-settings numix-gtk-theme
|
||||
ubuntu-drivers-common ubuntu-minimal keyutils redshift bluez-tools bluez-cups brltty orca policykit-desktop-privileges network-manager-pptp
|
||||
network-manager-l2tp network-manager-openconnect network-manager-openvpn network-manager-openvpn-gnome network-manager-vpnc cups cups-bsd
|
||||
cups-filters liblouisutdml-bin liblouis-bin blueman pamix pasystray pavucontrol pavumeter pavucontrol-qt gstreamer1.0-packagekit
|
||||
gstreamer1.0-plugins-base-apps libproxy1-plugin-gsettings libproxy1-plugin-networkmanager libu2f-udev libwmf0.2-7-gtk openprinting-ppds
|
||||
p7zip-full policykit-desktop-privileges anacron doc-base foomatic-db-compressed-ppds ghostscript-x inputattach kerneloops language-pack-en
|
||||
libatk-adaptor libgail-common libnotify-bin software-properties-gtk speech-dispatcher spice-vdagent zip orca bubblewrap dbus-x11
|
||||
dictionaries-common hunspell-en-us tracker tracker-extract tracker-miner-fs update-manager update-manager-core update-notifier
|
||||
update-notifier-common libgl1-mesa-dri policykit-1 profile-sync-daemon system-config-printer system-config-printer-common printer-driver-all
|
||||
software-properties-common samba smbclient cifs-utils gnome-power-manager powermgmt-base libupower-glib3 ruby-power-assert gdebi
|
||||
libdtkgui2 libdtkcore-bin gir1.2-deepin-mutter-3.0 keyutils
|
||||
fonts-arphic-ukai fonts-arphic-uming fonts-dejavu-core fonts-freefont-ttf fonts-guru fonts-guru-extra fonts-kacst fonts-kacst-one
|
||||
fonts-khmeros-core fonts-liberation fonts-opensymbol fonts-nanum fonts-stix fonts-symbola
|
||||
libfont-afm-perl libfontconfig1 libfontembed1 libfontenc1 gnome-font-viewer fontconfig fontconfig-config
|
||||
policykit-desktop-privileges policykit-1-gnome
|
||||
network-manager-pptp network-manager-l2tp network-manager-openconnect network-manager-openvpn network-manager-openvpn-gnome network-manager-vpnc
|
||||
libproxy1-plugin-gsettings libproxy1-plugin-networkmanager libproxy1-plugin-gsettings
|
||||
pamix pasystray pavucontrol pavumeter pavucontrol-qt pulseaudio-module-bluetooth gstreamer1.0-pulseaudio gstreamer1.0-packagekit
|
||||
gstreamer1.0-plugins-base-apps
|
||||
libu2f-udev libwmf0.2-7-gtk openprinting-ppds hplip system-config-printer-gnome indicator-printers
|
||||
p7zip-full zip anacron doc-base foomatic-db-compressed-ppds
|
||||
ghostscript-x inputattach kerneloops language-pack-en libatk-adaptor libgail-common libnotify-bin software-properties-gtk speech-dispatcher
|
||||
spice-vdagent dictionaries-common hunspell-en-us
|
||||
cups cups-bsd cups-client cups-filters system-config-printer system-config-printer-common printer-driver-all
|
||||
samba smbclient cifs-utils
|
||||
ubuntu-drivers-common ttf-ubuntu-font-family fonts-ubuntu-font-family-console
|
||||
tracker tracker-extract tracker-miner-fs update-inetd update-manager update-manager-core update-notifier update-notifier-common
|
||||
laptop-detect usb-creator-common usb-creator-gtk
|
||||
gnome-system-monitor gnome-system-tools gnome-power-manager gnome-orca evince evince-common caffeine lxappearance gdebi
|
||||
apport-gtk dmz-cursor-theme libgsettings-qt1 libappindicator3-1 gir1.2-appindicator3-0.1
|
||||
totem totem-common totem-plugins
|
||||
language-pack-gnome-sl language-pack-gnome-de language-pack-gnome-fr language-pack-gnome-it language-pack-gnome-es language-pack-gnome-pt
|
||||
language-pack-gnome-ru
|
||||
|
||||
@ -15,6 +15,7 @@
|
||||
|
||||
# Read in basic OS image information
|
||||
. /etc/armbian-release
|
||||
|
||||
# and script configuration
|
||||
. /usr/lib/armbian/armbian-common
|
||||
|
||||
@ -398,6 +399,19 @@ add_usb_storage_quirks() {
|
||||
|
||||
} # add_usb_storage_quirks
|
||||
|
||||
|
||||
branch_naming_workaround()
|
||||
# https://armbian.atlassian.net/browse/AR-748
|
||||
# Once we rework kernel packages, this can be done better
|
||||
{
|
||||
|
||||
if [[ -z $(cat /etc/armbian-release | grep BRANCH) ]]; then
|
||||
BRANCH=$(dpkg -l | egrep "linux-image" | egrep "current|legacy|edge" | awk '{print $2}' | cut -d"-" -f3 | head -1)
|
||||
[[ -n ${BRANCH} ]] && echo "BRANCH=$BRANCH" >> /etc/armbian-release
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
case $1 in
|
||||
*start*)
|
||||
# set optimal disk scheduler settings
|
||||
@ -408,5 +422,8 @@ case $1 in
|
||||
|
||||
# add usb quirks
|
||||
add_usb_storage_quirks &
|
||||
|
||||
# branch naming workaround
|
||||
branch_naming_workaround &
|
||||
;;
|
||||
esac
|
||||
|
||||
@ -0,0 +1,85 @@
|
||||
diff --git a/arch/arm/boot/dts/sun8i-s3-pinecube.dts b/arch/arm/boot/dts/sun8i-s3-pinecube.dts
|
||||
index 4aa0ee897a0a..9416aa6f1e96 100644
|
||||
--- a/arch/arm/boot/dts/sun8i-s3-pinecube.dts
|
||||
+++ b/arch/arm/boot/dts/sun8i-s3-pinecube.dts
|
||||
@@ -58,6 +58,15 @@ wifi_pwrseq: wifi_pwrseq {
|
||||
};
|
||||
};
|
||||
|
||||
+&codec {
|
||||
+ allwinner,audio-routing =
|
||||
+ "Speaker", "LINEOUT",
|
||||
+ "MIC1", "Mic",
|
||||
+ "Mic", "MBIAS";
|
||||
+ allwinner,pa-gpios = <&pio 6 6 GPIO_ACTIVE_HIGH>; /* PG6 */
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
&csi1 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&csi1_8bit_pins>;
|
||||
diff --git a/arch/arm/boot/dts/sun8i-v3s.dtsi b/arch/arm/boot/dts/sun8i-v3s.dtsi
|
||||
index 89abd4cc7e23..1b9278f75ae3 100644
|
||||
--- a/arch/arm/boot/dts/sun8i-v3s.dtsi
|
||||
+++ b/arch/arm/boot/dts/sun8i-v3s.dtsi
|
||||
@@ -163,6 +163,15 @@ syscon: system-control@1c00000 {
|
||||
ranges;
|
||||
};
|
||||
|
||||
+ dma: dma-controller@1c02000 {
|
||||
+ compatible = "allwinner,sun8i-v3s-dma";
|
||||
+ reg = <0x01c02000 0x1000>;
|
||||
+ interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ clocks = <&ccu CLK_BUS_DMA>;
|
||||
+ resets = <&ccu RST_BUS_DMA>;
|
||||
+ #dma-cells = <1>;
|
||||
+ };
|
||||
+
|
||||
tcon0: lcd-controller@1c0c000 {
|
||||
compatible = "allwinner,sun8i-v3s-tcon";
|
||||
reg = <0x01c0c000 0x1000>;
|
||||
@@ -408,6 +417,25 @@ lradc: lradc@1c22800 {
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
+ codec: codec@1c22c00 {
|
||||
+ #sound-dai-cells = <1>;
|
||||
+ compatible = "allwinner,sun8i-v3s-codec";
|
||||
+ reg = <0x01c22c00 0x400>;
|
||||
+ interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ clocks = <&ccu CLK_BUS_CODEC>, <&ccu CLK_AC_DIG>;
|
||||
+ clock-names = "apb", "codec";
|
||||
+ resets = <&ccu RST_BUS_CODEC>;
|
||||
+ dmas = <&dma 15>, <&dma 15>;
|
||||
+ dma-names = "rx", "tx";
|
||||
+ allwinner,codec-analog-controls = <&codec_analog>;
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
+ codec_analog: codec-analog@1c23000 {
|
||||
+ compatible = "allwinner,sun8i-v3s-codec-analog";
|
||||
+ reg = <0x01c23000 0x4>;
|
||||
+ };
|
||||
+
|
||||
uart0: serial@1c28000 {
|
||||
compatible = "snps,dw-apb-uart";
|
||||
reg = <0x01c28000 0x400>;
|
||||
diff --git a/sound/soc/sunxi/sun8i-codec-analog.c b/sound/soc/sunxi/sun8i-codec-analog.c
|
||||
index be872eefa61e..10387fa9f9c4 100644
|
||||
--- a/sound/soc/sunxi/sun8i-codec-analog.c
|
||||
+++ b/sound/soc/sunxi/sun8i-codec-analog.c
|
||||
@@ -729,8 +729,12 @@ static int sun8i_codec_analog_add_mixer(struct snd_soc_component *cmpnt,
|
||||
}
|
||||
|
||||
static const struct sun8i_codec_analog_quirks sun8i_v3s_quirks = {
|
||||
- .has_headphone = true,
|
||||
- .has_hmic = true,
|
||||
+ .has_headphone = true,
|
||||
+ .has_hmic = true,
|
||||
+ .has_linein = true,
|
||||
+ .has_lineout = true,
|
||||
+ .has_mbias = true,
|
||||
+ .has_mic2 = true,
|
||||
};
|
||||
|
||||
static int sun8i_codec_analog_cmpnt_probe(struct snd_soc_component *cmpnt)
|
||||
@ -1,66 +0,0 @@
|
||||
diff --git a/arch/arm/dts/sun8i-s3-pinecube.dts b/arch/arm/dts/sun8i-s3-pinecube.dts
|
||||
index 9bab6b7f40..e24d8314f4 100644
|
||||
--- a/arch/arm/dts/sun8i-s3-pinecube.dts
|
||||
+++ b/arch/arm/dts/sun8i-s3-pinecube.dts
|
||||
@@ -58,6 +58,15 @@
|
||||
};
|
||||
};
|
||||
|
||||
+&codec {
|
||||
+ allwinner,audio-routing =
|
||||
+ "Speaker", "LINEOUT",
|
||||
+ "MIC1", "Mic",
|
||||
+ "Mic", "HBIAS";
|
||||
+ allwinner,pa-gpios = <&pio 6 6 GPIO_ACTIVE_HIGH>; /* PG6 */
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
&csi1 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&csi1_8bit_pins>;
|
||||
diff --git a/arch/arm/dts/sun8i-v3s.dtsi b/arch/arm/dts/sun8i-v3s.dtsi
|
||||
index 0c73416769..d70ed8bc8c 100644
|
||||
--- a/arch/arm/dts/sun8i-v3s.dtsi
|
||||
+++ b/arch/arm/dts/sun8i-v3s.dtsi
|
||||
@@ -163,6 +163,15 @@
|
||||
ranges;
|
||||
};
|
||||
|
||||
+ dma: dma-controller@1c02000 {
|
||||
+ compatible = "allwinner,sun8i-v3s-dma";
|
||||
+ reg = <0x01c02000 0x1000>;
|
||||
+ interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ clocks = <&ccu CLK_BUS_DMA>;
|
||||
+ resets = <&ccu RST_BUS_DMA>;
|
||||
+ #dma-cells = <1>;
|
||||
+ };
|
||||
+
|
||||
tcon0: lcd-controller@1c0c000 {
|
||||
compatible = "allwinner,sun8i-v3s-tcon";
|
||||
reg = <0x01c0c000 0x1000>;
|
||||
@@ -408,6 +417,25 @@
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
+ codec: codec@1c22c00 {
|
||||
+ #sound-dai-cells = <0>;
|
||||
+ compatible = "allwinner,sun8i-h3-codec";
|
||||
+ reg = <0x01c22c00 0x400>;
|
||||
+ interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ clocks = <&ccu CLK_BUS_CODEC>, <&ccu CLK_AC_DIG>;
|
||||
+ clock-names = "apb", "codec";
|
||||
+ resets = <&ccu RST_BUS_CODEC>;
|
||||
+ dmas = <&dma 15>, <&dma 15>;
|
||||
+ dma-names = "rx", "tx";
|
||||
+ allwinner,codec-analog-controls = <&codec_analog>;
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
+ codec_analog: codec-analog@1c23000 {
|
||||
+ compatible = "allwinner,sun8i-h3-codec-analog";
|
||||
+ reg = <0x01c23000 0x4>;
|
||||
+ };
|
||||
+
|
||||
uart0: serial@1c28000 {
|
||||
compatible = "snps,dw-apb-uart";
|
||||
reg = <0x01c28000 0x400>;
|
||||
Loading…
Reference in New Issue
Block a user