mirror of
https://github.com/home-assistant/operating-system.git
synced 2025-07-24 13:36:31 +00:00
Make odroid downstream (#642)
* Make odroid downstream * Fix patch * Fix config * audio support exynos * Cleanup scripts * Fix commit message * clean options * Extend options * Cleanup
This commit is contained in:
Pascal Vizeli
GitHub
parent
ada03f6736
commit
f8b24f4b70
@ -5,10 +5,14 @@ Default Kernel tree: 5.4
|
||||
|
||||
| Board | Version |
|
||||
|-------|---------|
|
||||
| Open Virtual Applicance | 5.4.24 |
|
||||
| Open Virtual Applicance | 5.4.35 |
|
||||
| Raspberry Pi | 5.4.32 |
|
||||
| Tinker Board | 4.19.88 |
|
||||
| Odroid-C2 | 5.4.24 |
|
||||
| Odroid-N2 | 5.4.24 |
|
||||
| Odroid-XU4 | 5.4.24 |
|
||||
| Intel NUC | 5.4.24 |
|
||||
| Raspberry Pi 0-W | 5.4.32 |
|
||||
| Raspberry Pi 2 | 5.4.32 |
|
||||
| Raspberry Pi 3 | 5.4.32 |
|
||||
| Raspberry Pi 4 | 5.4.32 |
|
||||
| Tinker Board | 5.4.35 |
|
||||
| Odroid-C2 | 5.4.32 |
|
||||
| Odroid-N2 | 5.4.32 |
|
||||
| Odroid-XU4 | 5.4.32 |
|
||||
| Intel NUC | 5.4.35 |
|
||||
|
||||
@ -1320,7 +1320,7 @@ CONFIG_PCIE_DW_HOST=y
|
||||
# CONFIG_PCIE_DW_PLAT_HOST is not set
|
||||
CONFIG_PCI_HISI=y
|
||||
CONFIG_PCIE_KIRIN=y
|
||||
# CONFIG_PCI_MESON is not set
|
||||
CONFIG_PCI_MESON=m
|
||||
# CONFIG_PCIE_AL is not set
|
||||
# end of DesignWare PCI Core Support
|
||||
# end of PCI controller drivers
|
||||
@ -2197,7 +2197,7 @@ CONFIG_FIXED_PHY=y
|
||||
# CONFIG_LXT_PHY is not set
|
||||
CONFIG_MARVELL_PHY=m
|
||||
CONFIG_MARVELL_10G_PHY=m
|
||||
# CONFIG_MESON_GXL_PHY is not set
|
||||
CONFIG_MESON_GXL_PHY=y
|
||||
CONFIG_MICREL_PHY=y
|
||||
CONFIG_MICROCHIP_PHY=m
|
||||
# CONFIG_MICROCHIP_T1_PHY is not set
|
||||
@ -3227,7 +3227,7 @@ CONFIG_ARM_SP805_WATCHDOG=y
|
||||
CONFIG_DW_WATCHDOG=y
|
||||
# CONFIG_MAX63XX_WATCHDOG is not set
|
||||
# CONFIG_MAX77620_WATCHDOG is not set
|
||||
# CONFIG_MESON_GXBB_WATCHDOG is not set
|
||||
CONFIG_MESON_GXBB_WATCHDOG=y
|
||||
CONFIG_MESON_WATCHDOG=y
|
||||
# CONFIG_ALIM7101_WDT is not set
|
||||
# CONFIG_I6300ESB_WDT is not set
|
||||
@ -3452,7 +3452,7 @@ CONFIG_IR_MESON=m
|
||||
# CONFIG_IR_SERIAL is not set
|
||||
# CONFIG_IR_SIR is not set
|
||||
# CONFIG_RC_XBOX_DVD is not set
|
||||
CONFIG_MEDIA_SUPPORT=m
|
||||
CONFIG_MEDIA_SUPPORT=y
|
||||
|
||||
#
|
||||
# Multimedia core support
|
||||
@ -4010,10 +4010,7 @@ CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
|
||||
# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
|
||||
# end of Console display driver support
|
||||
|
||||
CONFIG_LOGO=y
|
||||
# CONFIG_LOGO_LINUX_MONO is not set
|
||||
# CONFIG_LOGO_LINUX_VGA16 is not set
|
||||
CONFIG_LOGO_LINUX_CLUT224=y
|
||||
# CONFIG_LOGO is not set
|
||||
# end of Graphics support
|
||||
|
||||
CONFIG_SOUND=y
|
||||
@ -4143,18 +4140,22 @@ CONFIG_SND_SOC=y
|
||||
#
|
||||
# ASoC support for Amlogic platforms
|
||||
#
|
||||
CONFIG_SND_MESON_AXG_FIFO=y
|
||||
CONFIG_SND_MESON_AXG_FRDDR=y
|
||||
CONFIG_SND_MESON_AXG_TODDR=y
|
||||
CONFIG_SND_MESON_AXG_TDM_FORMATTER=y
|
||||
CONFIG_SND_MESON_AXG_TDM_INTERFACE=y
|
||||
CONFIG_SND_MESON_AXG_TDMIN=y
|
||||
CONFIG_SND_MESON_AXG_TDMOUT=y
|
||||
CONFIG_SND_MESON_AXG_SOUND_CARD=y
|
||||
CONFIG_SND_MESON_AXG_SPDIFOUT=y
|
||||
CONFIG_SND_MESON_AXG_SPDIFIN=y
|
||||
CONFIG_SND_MESON_AXG_PDM=y
|
||||
CONFIG_SND_MESON_G12A_TOHDMITX=y
|
||||
CONFIG_SND_MESON_AXG_FIFO=m
|
||||
CONFIG_SND_MESON_AXG_FRDDR=m
|
||||
CONFIG_SND_MESON_AXG_TODDR=m
|
||||
CONFIG_SND_MESON_AXG_TDM_FORMATTER=m
|
||||
CONFIG_SND_MESON_AXG_TDM_INTERFACE=m
|
||||
CONFIG_SND_MESON_AXG_TDMIN=m
|
||||
CONFIG_SND_MESON_AXG_TDMOUT=m
|
||||
CONFIG_SND_MESON_AXG_SOUND_CARD=m
|
||||
CONFIG_SND_MESON_AXG_SPDIFOUT=m
|
||||
CONFIG_SND_MESON_AXG_SPDIFIN=m
|
||||
CONFIG_SND_MESON_AXG_PDM=m
|
||||
CONFIG_SND_MESON_CARD_UTILS=m
|
||||
CONFIG_SND_MESON_CODEC_GLUE=m
|
||||
CONFIG_SND_MESON_G12A_TOACODEC=m
|
||||
CONFIG_SND_MESON_G12A_TOHDMITX=m
|
||||
CONFIG_SND_SOC_MESON_T9015=m
|
||||
# end of ASoC support for Amlogic platforms
|
||||
|
||||
# CONFIG_SND_SOC_SOF_TOPLEVEL is not set
|
||||
@ -4212,7 +4213,7 @@ CONFIG_SND_SOC_AK4613=m
|
||||
# CONFIG_SND_SOC_CS53L30 is not set
|
||||
# CONFIG_SND_SOC_CX2072X is not set
|
||||
CONFIG_SND_SOC_DMIC=m
|
||||
CONFIG_SND_SOC_HDMI_CODEC=y
|
||||
CONFIG_SND_SOC_HDMI_CODEC=m
|
||||
CONFIG_SND_SOC_ES7134=m
|
||||
CONFIG_SND_SOC_ES7241=m
|
||||
# CONFIG_SND_SOC_ES8316 is not set
|
||||
@ -4246,9 +4247,9 @@ CONFIG_SND_SOC_PCM3168A_I2C=m
|
||||
# CONFIG_SND_SOC_RT5616 is not set
|
||||
# CONFIG_SND_SOC_RT5631 is not set
|
||||
# CONFIG_SND_SOC_SGTL5000 is not set
|
||||
# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
|
||||
CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
|
||||
# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
|
||||
CONFIG_SND_SOC_SPDIF=y
|
||||
CONFIG_SND_SOC_SPDIF=m
|
||||
# CONFIG_SND_SOC_SSM2305 is not set
|
||||
# CONFIG_SND_SOC_SSM2602_SPI is not set
|
||||
# CONFIG_SND_SOC_SSM2602_I2C is not set
|
||||
@ -6245,6 +6246,7 @@ CONFIG_CRYPTO_DEV_BCM_SPU=m
|
||||
# CONFIG_CRYPTO_DEV_CCREE is not set
|
||||
# CONFIG_CRYPTO_DEV_HISI_SEC is not set
|
||||
# CONFIG_CRYPTO_DEV_HISI_ZIP is not set
|
||||
CONFIG_CRYPTO_DEV_AMLOGIC_GXL=y
|
||||
CONFIG_ASYMMETRIC_KEY_TYPE=y
|
||||
CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
|
||||
CONFIG_X509_CERTIFICATE_PARSER=y
|
||||
@ -2567,13 +2567,261 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
|
||||
# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
|
||||
# end of Console display driver support
|
||||
|
||||
CONFIG_LOGO=y
|
||||
CONFIG_LOGO_LINUX_MONO=y
|
||||
CONFIG_LOGO_LINUX_VGA16=y
|
||||
CONFIG_LOGO_LINUX_CLUT224=y
|
||||
# CONFIG_LOGO is not set
|
||||
# end of Graphics support
|
||||
|
||||
# CONFIG_SOUND is not set
|
||||
CONFIG_SOUND=y
|
||||
CONFIG_SND=y
|
||||
CONFIG_SND_TIMER=y
|
||||
CONFIG_SND_PCM=y
|
||||
CONFIG_SND_PCM_ELD=y
|
||||
CONFIG_SND_PCM_IEC958=y
|
||||
CONFIG_SND_DMAENGINE_PCM=y
|
||||
CONFIG_SND_HWDEP=m
|
||||
CONFIG_SND_SEQ_DEVICE=m
|
||||
CONFIG_SND_RAWMIDI=m
|
||||
CONFIG_SND_JACK=y
|
||||
CONFIG_SND_JACK_INPUT_DEV=y
|
||||
# CONFIG_SND_OSSEMUL is not set
|
||||
CONFIG_SND_PCM_TIMER=y
|
||||
# CONFIG_SND_HRTIMER is not set
|
||||
# CONFIG_SND_DYNAMIC_MINORS is not set
|
||||
CONFIG_SND_SUPPORT_OLD_API=y
|
||||
CONFIG_SND_PROC_FS=y
|
||||
CONFIG_SND_VERBOSE_PROCFS=y
|
||||
# CONFIG_SND_VERBOSE_PRINTK is not set
|
||||
# CONFIG_SND_DEBUG is not set
|
||||
CONFIG_SND_VMASTER=y
|
||||
CONFIG_SND_SEQUENCER=m
|
||||
CONFIG_SND_SEQ_DUMMY=m
|
||||
CONFIG_SND_SEQ_MIDI_EVENT=m
|
||||
CONFIG_SND_SEQ_MIDI=m
|
||||
CONFIG_SND_SEQ_VIRMIDI=m
|
||||
CONFIG_SND_DRIVERS=y
|
||||
# CONFIG_SND_DUMMY is not set
|
||||
# CONFIG_SND_ALOOP is not set
|
||||
CONFIG_SND_VIRMIDI=m
|
||||
# CONFIG_SND_MTPAV is not set
|
||||
# CONFIG_SND_MTS64 is not set
|
||||
# CONFIG_SND_SERIAL_U16550 is not set
|
||||
# CONFIG_SND_MPU401 is not set
|
||||
# CONFIG_SND_PORTMAN2X4 is not set
|
||||
|
||||
#
|
||||
# HD-Audio
|
||||
#
|
||||
# end of HD-Audio
|
||||
|
||||
CONFIG_SND_HDA_PREALLOC_SIZE=64
|
||||
CONFIG_SND_ARM=y
|
||||
# CONFIG_SND_ARMAACI is not set
|
||||
CONFIG_SND_SPI=y
|
||||
CONFIG_SND_USB=y
|
||||
CONFIG_SND_USB_AUDIO=m
|
||||
CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
|
||||
CONFIG_SND_USB_UA101=m
|
||||
CONFIG_SND_USB_CAIAQ=m
|
||||
CONFIG_SND_USB_CAIAQ_INPUT=y
|
||||
CONFIG_SND_USB_6FIRE=m
|
||||
CONFIG_SND_USB_HIFACE=m
|
||||
CONFIG_SND_BCD2000=m
|
||||
CONFIG_SND_USB_LINE6=m
|
||||
CONFIG_SND_USB_POD=m
|
||||
CONFIG_SND_USB_PODHD=m
|
||||
CONFIG_SND_USB_TONEPORT=m
|
||||
CONFIG_SND_USB_VARIAX=m
|
||||
CONFIG_SND_SOC=y
|
||||
CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
|
||||
# CONFIG_SND_SOC_AMD_ACP is not set
|
||||
# CONFIG_SND_ATMEL_SOC is not set
|
||||
# CONFIG_SND_DESIGNWARE_I2S is not set
|
||||
|
||||
#
|
||||
# SoC Audio for Freescale CPUs
|
||||
#
|
||||
|
||||
#
|
||||
# Common SoC Audio options for Freescale CPUs:
|
||||
#
|
||||
# CONFIG_SND_SOC_FSL_ASRC is not set
|
||||
# CONFIG_SND_SOC_FSL_SAI is not set
|
||||
CONFIG_SND_SOC_FSL_AUDMIX=m
|
||||
# CONFIG_SND_SOC_FSL_SSI is not set
|
||||
# CONFIG_SND_SOC_FSL_SPDIF is not set
|
||||
# CONFIG_SND_SOC_FSL_ESAI is not set
|
||||
CONFIG_SND_SOC_FSL_MICFIL=m
|
||||
# CONFIG_SND_SOC_IMX_AUDMUX is not set
|
||||
# end of SoC Audio for Freescale CPUs
|
||||
|
||||
# CONFIG_SND_I2S_HI6210_I2S is not set
|
||||
# CONFIG_SND_SOC_IMG is not set
|
||||
CONFIG_SND_SOC_MTK_BTCVSD=m
|
||||
CONFIG_SND_SOC_SAMSUNG=y
|
||||
CONFIG_SND_SAMSUNG_PCM=y
|
||||
CONFIG_SND_SAMSUNG_SPDIF=m
|
||||
CONFIG_SND_SAMSUNG_I2S=y
|
||||
CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=m
|
||||
CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF=m
|
||||
CONFIG_SND_SOC_SMDK_WM8994_PCM=m
|
||||
CONFIG_SND_SOC_SNOW=m
|
||||
CONFIG_SND_SOC_ODROID=y
|
||||
CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631=m
|
||||
# CONFIG_SND_SOC_SOF_TOPLEVEL is not set
|
||||
|
||||
#
|
||||
# STMicroelectronics STM32 SOC audio support
|
||||
#
|
||||
# end of STMicroelectronics STM32 SOC audio support
|
||||
|
||||
CONFIG_SND_SOC_XILINX_I2S=m
|
||||
CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER=m
|
||||
CONFIG_SND_SOC_XILINX_SPDIF=m
|
||||
# CONFIG_SND_SOC_XTFPGA_I2S is not set
|
||||
# CONFIG_ZX_TDM is not set
|
||||
CONFIG_SND_SOC_I2C_AND_SPI=y
|
||||
|
||||
#
|
||||
# CODEC drivers
|
||||
#
|
||||
CONFIG_SND_SOC_WM_HUBS=m
|
||||
# CONFIG_SND_SOC_AC97_CODEC is not set
|
||||
# CONFIG_SND_SOC_ADAU1701 is not set
|
||||
# CONFIG_SND_SOC_ADAU1761_I2C is not set
|
||||
# CONFIG_SND_SOC_ADAU1761_SPI is not set
|
||||
# CONFIG_SND_SOC_ADAU7002 is not set
|
||||
# CONFIG_SND_SOC_AK4104 is not set
|
||||
CONFIG_SND_SOC_AK4118=m
|
||||
# CONFIG_SND_SOC_AK4458 is not set
|
||||
# CONFIG_SND_SOC_AK4554 is not set
|
||||
# CONFIG_SND_SOC_AK4613 is not set
|
||||
# CONFIG_SND_SOC_AK4642 is not set
|
||||
# CONFIG_SND_SOC_AK5386 is not set
|
||||
# CONFIG_SND_SOC_AK5558 is not set
|
||||
# CONFIG_SND_SOC_ALC5623 is not set
|
||||
# CONFIG_SND_SOC_BD28623 is not set
|
||||
# CONFIG_SND_SOC_BT_SCO is not set
|
||||
CONFIG_SND_SOC_CROS_EC_CODEC=m
|
||||
# CONFIG_SND_SOC_CS35L32 is not set
|
||||
# CONFIG_SND_SOC_CS35L33 is not set
|
||||
# CONFIG_SND_SOC_CS35L34 is not set
|
||||
# CONFIG_SND_SOC_CS35L35 is not set
|
||||
CONFIG_SND_SOC_CS35L36=m
|
||||
# CONFIG_SND_SOC_CS42L42 is not set
|
||||
# CONFIG_SND_SOC_CS42L51_I2C is not set
|
||||
# CONFIG_SND_SOC_CS42L52 is not set
|
||||
# CONFIG_SND_SOC_CS42L56 is not set
|
||||
# CONFIG_SND_SOC_CS42L73 is not set
|
||||
# CONFIG_SND_SOC_CS4265 is not set
|
||||
# CONFIG_SND_SOC_CS4270 is not set
|
||||
# CONFIG_SND_SOC_CS4271_I2C is not set
|
||||
# CONFIG_SND_SOC_CS4271_SPI is not set
|
||||
# CONFIG_SND_SOC_CS42XX8_I2C is not set
|
||||
# CONFIG_SND_SOC_CS43130 is not set
|
||||
CONFIG_SND_SOC_CS4341=m
|
||||
# CONFIG_SND_SOC_CS4349 is not set
|
||||
# CONFIG_SND_SOC_CS53L30 is not set
|
||||
CONFIG_SND_SOC_CX2072X=m
|
||||
CONFIG_SND_SOC_DMIC=m
|
||||
CONFIG_SND_SOC_HDMI_CODEC=y
|
||||
# CONFIG_SND_SOC_ES7134 is not set
|
||||
CONFIG_SND_SOC_ES7241=m
|
||||
# CONFIG_SND_SOC_ES8316 is not set
|
||||
# CONFIG_SND_SOC_ES8328_I2C is not set
|
||||
# CONFIG_SND_SOC_ES8328_SPI is not set
|
||||
# CONFIG_SND_SOC_GTM601 is not set
|
||||
# CONFIG_SND_SOC_INNO_RK3036 is not set
|
||||
CONFIG_SND_SOC_MAX98088=m
|
||||
CONFIG_SND_SOC_MAX98090=y
|
||||
CONFIG_SND_SOC_MAX98095=m
|
||||
CONFIG_SND_SOC_MAX98357A=m
|
||||
# CONFIG_SND_SOC_MAX98504 is not set
|
||||
CONFIG_SND_SOC_MAX9867=m
|
||||
# CONFIG_SND_SOC_MAX98927 is not set
|
||||
CONFIG_SND_SOC_MAX98373=m
|
||||
# CONFIG_SND_SOC_MAX9860 is not set
|
||||
# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
|
||||
# CONFIG_SND_SOC_PCM1681 is not set
|
||||
# CONFIG_SND_SOC_PCM1789_I2C is not set
|
||||
# CONFIG_SND_SOC_PCM179X_I2C is not set
|
||||
# CONFIG_SND_SOC_PCM179X_SPI is not set
|
||||
# CONFIG_SND_SOC_PCM186X_I2C is not set
|
||||
# CONFIG_SND_SOC_PCM186X_SPI is not set
|
||||
CONFIG_SND_SOC_PCM3060=m
|
||||
CONFIG_SND_SOC_PCM3060_I2C=m
|
||||
CONFIG_SND_SOC_PCM3060_SPI=m
|
||||
# CONFIG_SND_SOC_PCM3168A_I2C is not set
|
||||
# CONFIG_SND_SOC_PCM3168A_SPI is not set
|
||||
# CONFIG_SND_SOC_PCM512x_I2C is not set
|
||||
# CONFIG_SND_SOC_PCM512x_SPI is not set
|
||||
CONFIG_SND_SOC_RK3328=m
|
||||
# CONFIG_SND_SOC_RT5616 is not set
|
||||
CONFIG_SND_SOC_RT5631=m
|
||||
# CONFIG_SND_SOC_SGTL5000 is not set
|
||||
CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
|
||||
# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
|
||||
CONFIG_SND_SOC_SPDIF=y
|
||||
# CONFIG_SND_SOC_SSM2305 is not set
|
||||
# CONFIG_SND_SOC_SSM2602_SPI is not set
|
||||
# CONFIG_SND_SOC_SSM2602_I2C is not set
|
||||
# CONFIG_SND_SOC_SSM4567 is not set
|
||||
# CONFIG_SND_SOC_STA32X is not set
|
||||
# CONFIG_SND_SOC_STA350 is not set
|
||||
# CONFIG_SND_SOC_STI_SAS is not set
|
||||
# CONFIG_SND_SOC_TAS2552 is not set
|
||||
# CONFIG_SND_SOC_TAS5086 is not set
|
||||
# CONFIG_SND_SOC_TAS571X is not set
|
||||
# CONFIG_SND_SOC_TAS5720 is not set
|
||||
# CONFIG_SND_SOC_TAS6424 is not set
|
||||
# CONFIG_SND_SOC_TDA7419 is not set
|
||||
# CONFIG_SND_SOC_TFA9879 is not set
|
||||
# CONFIG_SND_SOC_TLV320AIC23_I2C is not set
|
||||
# CONFIG_SND_SOC_TLV320AIC23_SPI is not set
|
||||
# CONFIG_SND_SOC_TLV320AIC31XX is not set
|
||||
# CONFIG_SND_SOC_TLV320AIC32X4_I2C is not set
|
||||
# CONFIG_SND_SOC_TLV320AIC32X4_SPI is not set
|
||||
# CONFIG_SND_SOC_TLV320AIC3X is not set
|
||||
# CONFIG_SND_SOC_TS3A227E is not set
|
||||
# CONFIG_SND_SOC_TSCS42XX is not set
|
||||
# CONFIG_SND_SOC_TSCS454 is not set
|
||||
CONFIG_SND_SOC_UDA1334=m
|
||||
# CONFIG_SND_SOC_WM8510 is not set
|
||||
# CONFIG_SND_SOC_WM8523 is not set
|
||||
# CONFIG_SND_SOC_WM8524 is not set
|
||||
# CONFIG_SND_SOC_WM8580 is not set
|
||||
# CONFIG_SND_SOC_WM8711 is not set
|
||||
# CONFIG_SND_SOC_WM8728 is not set
|
||||
# CONFIG_SND_SOC_WM8731 is not set
|
||||
# CONFIG_SND_SOC_WM8737 is not set
|
||||
# CONFIG_SND_SOC_WM8741 is not set
|
||||
# CONFIG_SND_SOC_WM8750 is not set
|
||||
# CONFIG_SND_SOC_WM8753 is not set
|
||||
# CONFIG_SND_SOC_WM8770 is not set
|
||||
# CONFIG_SND_SOC_WM8776 is not set
|
||||
# CONFIG_SND_SOC_WM8782 is not set
|
||||
# CONFIG_SND_SOC_WM8804_I2C is not set
|
||||
# CONFIG_SND_SOC_WM8804_SPI is not set
|
||||
# CONFIG_SND_SOC_WM8903 is not set
|
||||
CONFIG_SND_SOC_WM8904=m
|
||||
# CONFIG_SND_SOC_WM8960 is not set
|
||||
# CONFIG_SND_SOC_WM8962 is not set
|
||||
# CONFIG_SND_SOC_WM8974 is not set
|
||||
# CONFIG_SND_SOC_WM8978 is not set
|
||||
# CONFIG_SND_SOC_WM8985 is not set
|
||||
CONFIG_SND_SOC_WM8994=m
|
||||
# CONFIG_SND_SOC_ZX_AUD96P22 is not set
|
||||
# CONFIG_SND_SOC_MAX9759 is not set
|
||||
# CONFIG_SND_SOC_MT6351 is not set
|
||||
CONFIG_SND_SOC_MT6358=m
|
||||
# CONFIG_SND_SOC_NAU8540 is not set
|
||||
# CONFIG_SND_SOC_NAU8810 is not set
|
||||
CONFIG_SND_SOC_NAU8822=m
|
||||
# CONFIG_SND_SOC_NAU8824 is not set
|
||||
# CONFIG_SND_SOC_TPA6130A2 is not set
|
||||
# end of CODEC drivers
|
||||
|
||||
CONFIG_SND_SIMPLE_CARD_UTILS=y
|
||||
CONFIG_SND_SIMPLE_CARD=y
|
||||
# CONFIG_SND_AUDIO_GRAPH_CARD is not set
|
||||
|
||||
#
|
||||
# HID support
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,3 +0,0 @@
|
||||
# Kernel
|
||||
https://github.com/akuster/meta-odroid
|
||||
https://github.com/superna9999/linux
|
||||
@ -0,0 +1,26 @@
|
||||
From 122cb1d72a440bc6a84e50b1ed40af7ed7f737c6 Mon Sep 17 00:00:00 2001
|
||||
From: Pascal Vizeli <pvizeli@syshack.ch>
|
||||
Date: Mon, 27 Apr 2020 23:41:44 +0000
|
||||
Subject: [PATCH 1/1] Odroid-N2: arm64/dts: fix audio name
|
||||
|
||||
Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
|
||||
---
|
||||
arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
|
||||
index 1cf9af35e435..f0aac838bc46 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
|
||||
@@ -227,7 +227,7 @@
|
||||
|
||||
sound {
|
||||
compatible = "amlogic,axg-sound-card";
|
||||
- model = "G12A-ODROIDN2";
|
||||
+ model = "G12B-ODROID-N2";
|
||||
audio-aux-devs = <&tdmout_b>, <&tdmout_c>, <&dio2133>;
|
||||
audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",
|
||||
"TDMOUT_B IN 1", "FRDDR_B OUT 1",
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -1,72 +0,0 @@
|
||||
From 7041ca0d550d3a9caed54857365cf504eaeea756 Mon Sep 17 00:00:00 2001
|
||||
From: Armin Kuster <akuster@mvista.com>
|
||||
Date: Fri, 23 Mar 2018 09:02:44 -0700
|
||||
Subject: [PATCH] exynos5422-odroidhc1.dts: fix booting from mmc
|
||||
|
||||
Signed-off-by: Armin Kuster <akuster@mvista.com>
|
||||
---
|
||||
arch/arm/boot/dts/exynos5422-odroidhc1.dts | 37 ++++++++++++++++++++++++++++++
|
||||
1 file changed, 37 insertions(+)
|
||||
|
||||
diff --git a/arch/arm/boot/dts/exynos5422-odroidhc1.dts b/arch/arm/boot/dts/exynos5422-odroidhc1.dts
|
||||
index fb8e8ae..c7adecf 100644
|
||||
--- a/arch/arm/boot/dts/exynos5422-odroidhc1.dts
|
||||
+++ b/arch/arm/boot/dts/exynos5422-odroidhc1.dts
|
||||
@@ -11,6 +11,7 @@
|
||||
*/
|
||||
|
||||
/dts-v1/;
|
||||
+#include <dt-bindings/input/input.h>
|
||||
#include "exynos5422-odroid-core.dtsi"
|
||||
|
||||
/ {
|
||||
@@ -30,6 +31,14 @@
|
||||
};
|
||||
};
|
||||
|
||||
+ emmc_pwrseq: pwrseq {
|
||||
+ pinctrl-0 = <&emmc_nrst_pin>;
|
||||
+ pinctrl-names = "default";
|
||||
+ compatible = "mmc-pwrseq-emmc";
|
||||
+ reset-gpios = <&gpd1 0 GPIO_ACTIVE_LOW>;
|
||||
+ };
|
||||
+
|
||||
+
|
||||
thermal-zones {
|
||||
cpu0_thermal: cpu0-thermal {
|
||||
thermal-sensors = <&tmu_cpu0 0>;
|
||||
@@ -211,3 +220,31 @@
|
||||
&usbdrd_dwc3_1 {
|
||||
dr_mode = "host";
|
||||
};
|
||||
+
|
||||
+&mmc_0 {
|
||||
+ status = "okay";
|
||||
+ mmc-pwrseq = <&emmc_pwrseq>;
|
||||
+ card-detect-delay = <200>;
|
||||
+ samsung,dw-mshc-ciu-div = <3>;
|
||||
+ samsung,dw-mshc-sdr-timing = <0 4>;
|
||||
+ samsung,dw-mshc-ddr-timing = <0 2>;
|
||||
+ samsung,dw-mshc-hs400-timing = <0 2>;
|
||||
+ samsung,read-strobe-delay = <90>;
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus1 &sd0_bus4 &sd0_bus8 &sd0_cd &sd0_rclk>;
|
||||
+ bus-width = <8>;
|
||||
+ cap-mmc-highspeed;
|
||||
+ mmc-hs200-1_8v;
|
||||
+ mmc-hs400-1_8v;
|
||||
+ vmmc-supply = <&ldo18_reg>;
|
||||
+ vqmmc-supply = <&ldo3_reg>;
|
||||
+};
|
||||
+
|
||||
+&pinctrl_1 {
|
||||
+ emmc_nrst_pin: emmc-nrst {
|
||||
+ samsung,pins = "gpd1-0";
|
||||
+ samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;
|
||||
+ samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
|
||||
+ samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;
|
||||
+ };
|
||||
+};
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@ -1,106 +0,0 @@
|
||||
From c669757a7564c19d042bc5ac18199bb6f3f4e928 Mon Sep 17 00:00:00 2001
|
||||
From: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Date: Fri, 27 Sep 2019 15:16:38 +0200
|
||||
Subject: [PATCH 1/1] dwc3: add parkmode_disable_ss_quirk for G12A
|
||||
|
||||
Could you validate this fixes the following issue ?
|
||||
[ 221.141621] xhci-hcd xhci-hcd.0.auto: xHCI host not responding to stop endpoint command.
|
||||
[ 221.157631] xhci-hcd xhci-hcd.0.auto: Host halt failed, -110
|
||||
[ 221.157635] xhci-hcd xhci-hcd.0.auto: xHCI host controller not responding, assume dead
|
||||
[ 221.159901] xhci-hcd xhci-hcd.0.auto: xHCI host not responding to stop endpoint command.
|
||||
[ 221.159961] hub 2-1.1:1.0: hub_ext_port_status failed (err = -22)
|
||||
[ 221.160076] xhci-hcd xhci-hcd.0.auto: HC died; cleaning up
|
||||
[ 221.165946] usb 2-1.1-port1: cannot reset (err = -22)
|
||||
|
||||
Cc: Tim <elatllat@gmail.com>
|
||||
CC: Dongjin Kim <tobetter@gmail.com>
|
||||
Cc: Jianxin Pan <jianxin.pan@amlogic.com>
|
||||
CC: linux-amlogic@lists.infradead.org
|
||||
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
|
||||
---
|
||||
Documentation/devicetree/bindings/usb/dwc3.txt | 2 ++
|
||||
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 1 +
|
||||
drivers/usb/dwc3/core.c | 5 +++++
|
||||
drivers/usb/dwc3/core.h | 4 ++++
|
||||
4 files changed, 12 insertions(+)
|
||||
|
||||
diff --git a/Documentation/devicetree/bindings/usb/dwc3.txt b/Documentation/devicetree/bindings/usb/dwc3.txt
|
||||
index 66780a47ad85..c977a3ba2f35 100644
|
||||
--- a/Documentation/devicetree/bindings/usb/dwc3.txt
|
||||
+++ b/Documentation/devicetree/bindings/usb/dwc3.txt
|
||||
@@ -75,6 +75,8 @@ Optional properties:
|
||||
from P0 to P1/P2/P3 without delay.
|
||||
- snps,dis-tx-ipgap-linecheck-quirk: when set, disable u2mac linestate check
|
||||
during HS transmit.
|
||||
+ - snps,parkmode-disable-ss-quirk: when set, all SuperSpeed bus instances in
|
||||
+ park mode are disabled.
|
||||
- snps,dis_metastability_quirk: when set, disable metastability workaround.
|
||||
CAUTION: use only if you are absolutely sure of it.
|
||||
- snps,is-utmi-l1-suspend: true when DWC3 asserts output signal
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
||||
index 852cf9cf121b..139f24975c0e 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
||||
@@ -2401,6 +2401,7 @@
|
||||
dr_mode = "host";
|
||||
snps,dis_u2_susphy_quirk;
|
||||
snps,quirk-frame-length-adjustment;
|
||||
+ snps,parkmode-disable-ss-quirk;
|
||||
};
|
||||
};
|
||||
|
||||
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
|
||||
index c9bb93a2c81e..f64dba17a50d 100644
|
||||
--- a/drivers/usb/dwc3/core.c
|
||||
+++ b/drivers/usb/dwc3/core.c
|
||||
@@ -983,6 +983,9 @@ static int dwc3_core_init(struct dwc3 *dwc)
|
||||
if (dwc->dis_tx_ipgap_linecheck_quirk)
|
||||
reg |= DWC3_GUCTL1_TX_IPGAP_LINECHECK_DIS;
|
||||
|
||||
+ if (dwc->parkmode_disable_ss_quirk)
|
||||
+ reg |= DWC3_GUCTL1_PARKMODE_DISABLE_SS;
|
||||
+
|
||||
dwc3_writel(dwc->regs, DWC3_GUCTL1, reg);
|
||||
}
|
||||
|
||||
@@ -1294,6 +1297,8 @@ static void dwc3_get_properties(struct dwc3 *dwc)
|
||||
"snps,dis-del-phy-power-chg-quirk");
|
||||
dwc->dis_tx_ipgap_linecheck_quirk = device_property_read_bool(dev,
|
||||
"snps,dis-tx-ipgap-linecheck-quirk");
|
||||
+ dwc->parkmode_disable_ss_quirk = device_property_read_bool(dev,
|
||||
+ "snps,parkmode-disable-ss-quirk");
|
||||
|
||||
dwc->tx_de_emphasis_quirk = device_property_read_bool(dev,
|
||||
"snps,tx_de_emphasis_quirk");
|
||||
diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
|
||||
index 3dd783b889cb..ab071163b3b8 100644
|
||||
--- a/drivers/usb/dwc3/core.h
|
||||
+++ b/drivers/usb/dwc3/core.h
|
||||
@@ -249,6 +249,7 @@
|
||||
#define DWC3_GUCTL_HSTINAUTORETRY BIT(14)
|
||||
|
||||
/* Global User Control 1 Register */
|
||||
+#define DWC3_GUCTL1_PARKMODE_DISABLE_SS BIT(17)
|
||||
#define DWC3_GUCTL1_TX_IPGAP_LINECHECK_DIS BIT(28)
|
||||
#define DWC3_GUCTL1_DEV_L1_EXIT_BY_HW BIT(24)
|
||||
|
||||
@@ -1022,6 +1023,8 @@ struct dwc3_scratchpad_array {
|
||||
* change quirk.
|
||||
* @dis_tx_ipgap_linecheck_quirk: set if we disable u2mac linestate
|
||||
* check during HS transmit.
|
||||
+ * @parkmode_disable_ss_quirk: set if we need to disable all SuperSpeed
|
||||
+ * instances in park mode.
|
||||
* @tx_de_emphasis_quirk: set if we enable Tx de-emphasis quirk
|
||||
* @tx_de_emphasis: Tx de-emphasis value
|
||||
* 0 - -6dB de-emphasis
|
||||
@@ -1211,6 +1214,7 @@ struct dwc3 {
|
||||
unsigned dis_u2_freeclk_exists_quirk:1;
|
||||
unsigned dis_del_phy_power_chg_quirk:1;
|
||||
unsigned dis_tx_ipgap_linecheck_quirk:1;
|
||||
+ unsigned parkmode_disable_ss_quirk:1;
|
||||
|
||||
unsigned tx_de_emphasis_quirk:1;
|
||||
unsigned tx_de_emphasis:2;
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -1,92 +0,0 @@
|
||||
ARM: dts: exynos5420: add mali dt bindings and enable mali on Odroid XU3/4
|
||||
|
||||
Signed-off-by: memeka <mihailescu2m@gmail.com>
|
||||
|
||||
https://github.com/hardkernel/linux/commit/27f16b364e195daefdb8839344c02870ceaf48f2#diff-80dd4bb1cf404a3774bbe37bcfe945c2
|
||||
|
||||
Upstream-Status: Backport
|
||||
|
||||
Signed-off-by: Armin Kuster <akuster808@gmail.com>
|
||||
|
||||
Index: kernel-source/arch/arm/boot/dts/exynos5422-odroid-core.dtsi
|
||||
===================================================================
|
||||
--- kernel-source.orig/arch/arm/boot/dts/exynos5422-odroid-core.dtsi
|
||||
+++ kernel-source/arch/arm/boot/dts/exynos5422-odroid-core.dtsi
|
||||
@@ -417,6 +417,11 @@
|
||||
vtmu-supply = <&ldo7_reg>;
|
||||
};
|
||||
|
||||
+&mali {
|
||||
+ mali-supply = <&buck4_reg>;
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
&rtc {
|
||||
status = "okay";
|
||||
clocks = <&clock CLK_RTC>, <&s2mps11_osc S2MPS11_CLK_AP>;
|
||||
Index: kernel-source/arch/arm/boot/dts/exynos5420.dtsi
|
||||
===================================================================
|
||||
--- kernel-source.orig/arch/arm/boot/dts/exynos5420.dtsi
|
||||
+++ kernel-source/arch/arm/boot/dts/exynos5420.dtsi
|
||||
@@ -1317,6 +1317,61 @@
|
||||
};
|
||||
};
|
||||
|
||||
+ mali: mali@11800000 {
|
||||
+ compatible = "samsung,exynos5422-mali", "arm,malit6xx", "arm,mali-midgard";
|
||||
+ reg = <0x11800000 0x5000>;
|
||||
+ interrupts = <GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ interrupt-names = "JOB", "MMU", "GPU";
|
||||
+
|
||||
+ clocks = <&clock CLK_FOUT_VPLL>, <&clock CLK_DOUT_ACLK_G3D>, <&clock CLK_G3D>;
|
||||
+ clock-names = "fout_vpll", "dout_aclk_g3d", "clk_mali";
|
||||
+
|
||||
+ operating-points-v2 = <&gpu_opp_table>;
|
||||
+
|
||||
+ status = "disabled";
|
||||
+
|
||||
+ power_model@0 {
|
||||
+ compatible = "arm,mali-simple-power-model";
|
||||
+ static-coefficient = <2427750>;
|
||||
+ dynamic-coefficient = <4687>;
|
||||
+ ts = <20000 2000 (-20) 2>;
|
||||
+ thermal-zone = "gpu-thermal";
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ gpu_opp_table: opp_table0 {
|
||||
+ compatible = "operating-points-v2";
|
||||
+
|
||||
+ opp@600000000 {
|
||||
+ opp-hz = /bits/ 64 <600000000>;
|
||||
+ opp-microvolt = <1150000>;
|
||||
+ };
|
||||
+ opp@543000000 {
|
||||
+ opp-hz = /bits/ 64 <543000000>;
|
||||
+ opp-microvolt = <1037500>;
|
||||
+ };
|
||||
+ opp@480000000 {
|
||||
+ opp-hz = /bits/ 64 <480000000>;
|
||||
+ opp-microvolt = <1000000>;
|
||||
+ };
|
||||
+ opp@420000000 {
|
||||
+ opp-hz = /bits/ 64 <420000000>;
|
||||
+ opp-microvolt = <962500>;
|
||||
+ };
|
||||
+ opp@350000000 {
|
||||
+ opp-hz = /bits/ 64 <350000000>;
|
||||
+ opp-microvolt = <912500>;
|
||||
+ };
|
||||
+ opp@266000000 {
|
||||
+ opp-hz = /bits/ 64 <266000000>;
|
||||
+ opp-microvolt = <862500>;
|
||||
+ };
|
||||
+ opp@177000000 {
|
||||
+ opp-hz = /bits/ 64 <177000000>;
|
||||
+ opp-microvolt = <812500>;
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
thermal-zones {
|
||||
cpu0_thermal: cpu0-thermal {
|
||||
thermal-sensors = <&tmu_cpu0>;
|
||||
@ -1,29 +0,0 @@
|
||||
From 409a0daa72f6fc1652e17cfea7ea1055e9c483c9 Mon Sep 17 00:00:00 2001
|
||||
From: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Date: Mon, 21 Oct 2019 16:29:02 +0200
|
||||
Subject: [PATCH] arm64: dts: meson-g12b-odroid-n2: add missing amlogic, s922x
|
||||
compatible
|
||||
|
||||
This fixes the following DT schemas check errors:
|
||||
meson-g12b-odroid-n2.dt.yaml: /: compatible: ['hardkernel,odroid-n2', 'amlogic,g12b'] is not valid under any of the given schemas
|
||||
|
||||
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
||||
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
|
||||
---
|
||||
arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
|
||||
index 42f15405750cd..0e54c1dc2842b 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
|
||||
@@ -12,7 +12,7 @@
|
||||
#include <dt-bindings/sound/meson-g12a-tohdmitx.h>
|
||||
|
||||
/ {
|
||||
- compatible = "hardkernel,odroid-n2", "amlogic,g12b";
|
||||
+ compatible = "hardkernel,odroid-n2", "amlogic,s922x", "amlogic,g12b";
|
||||
model = "Hardkernel ODROID-N2";
|
||||
|
||||
aliases {
|
||||
@ -1,60 +0,0 @@
|
||||
From d80b817e975c0911f130d502292b209f34ea1e2c Mon Sep 17 00:00:00 2001
|
||||
From: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Date: Tue, 27 Aug 2019 12:03:07 +0200
|
||||
Subject: [PATCH 171/200] FROMLIST: arm64: dts: meson-g12b: specify suspend OPP
|
||||
|
||||
Tag the 1,2GHz OPPs as suspend OPP to be set before going in suspend mode.
|
||||
|
||||
It has been reported that using various OPPs can lead to error or
|
||||
resume with a different OPP from the ROM, thus use this safe OPP as
|
||||
it is the default OPP used by the BL2 boot firmware on the 2 clusters.
|
||||
|
||||
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
|
||||
---
|
||||
arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi | 2 ++
|
||||
arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi | 2 ++
|
||||
2 files changed, 4 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi
|
||||
index d61f43052a34..00ea181bc018 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi
|
||||
@@ -39,6 +39,7 @@
|
||||
opp-1200000000 {
|
||||
opp-hz = /bits/ 64 <1200000000>;
|
||||
opp-microvolt = <781000>;
|
||||
+ opp-suspend;
|
||||
};
|
||||
|
||||
opp-1398000000 {
|
||||
@@ -99,6 +100,7 @@
|
||||
opp-1200000000 {
|
||||
opp-hz = /bits/ 64 <1200000000>;
|
||||
opp-microvolt = <751000>;
|
||||
+ opp-suspend;
|
||||
};
|
||||
|
||||
opp-1398000000 {
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi
|
||||
index 046cc332d07f..d68323c6c780 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi
|
||||
@@ -39,6 +39,7 @@
|
||||
opp-1200000000 {
|
||||
opp-hz = /bits/ 64 <1200000000>;
|
||||
opp-microvolt = <731000>;
|
||||
+ opp-suspend;
|
||||
};
|
||||
|
||||
opp-1398000000 {
|
||||
@@ -99,6 +100,7 @@
|
||||
opp-1200000000 {
|
||||
opp-hz = /bits/ 64 <1200000000>;
|
||||
opp-microvolt = <771000>;
|
||||
+ opp-suspend;
|
||||
};
|
||||
|
||||
opp-1398000000 {
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -1,60 +0,0 @@
|
||||
From 9ed437d69b49bd9ad39db7b6d69b60dfc47cac69 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Brunet <jbrunet@baylibre.com>
|
||||
Date: Thu, 5 Sep 2019 14:59:54 +0200
|
||||
Subject: [PATCH] arm64: dts: meson: g12: add a g12 layer
|
||||
|
||||
While the sm1 is very close to the g12a/b family, somethings apply
|
||||
differently on the g12a/b and not the sm1. This introduce a new layer
|
||||
of dtsi for part which apply to the g12a and g12b but not the sm1.
|
||||
|
||||
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
|
||||
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
|
||||
---
|
||||
arch/arm64/boot/dts/amlogic/meson-g12.dtsi | 7 +++++++
|
||||
arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 2 +-
|
||||
arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 2 +-
|
||||
3 files changed, 9 insertions(+), 2 deletions(-)
|
||||
create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12.dtsi
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
|
||||
new file mode 100644
|
||||
index 000000000000..1e30061fb2a7
|
||||
--- /dev/null
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
|
||||
@@ -0,0 +1,7 @@
|
||||
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
||||
+/*
|
||||
+ * Copyright (c) 2019 BayLibre, SAS
|
||||
+ * Author: Jerome Brunet <jbrunet@baylibre.com>
|
||||
+ */
|
||||
+
|
||||
+#include "meson-g12-common.dtsi"
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
|
||||
index eb5d177d7a99..69339d69dfd4 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
|
||||
@@ -3,7 +3,7 @@
|
||||
* Copyright (c) 2018 Amlogic, Inc. All rights reserved.
|
||||
*/
|
||||
|
||||
-#include "meson-g12-common.dtsi"
|
||||
+#include "meson-g12.dtsi"
|
||||
#include <dt-bindings/power/meson-g12a-power.h>
|
||||
|
||||
/ {
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
|
||||
index 5628ccd54531..eefac0ef092b 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
|
||||
@@ -4,7 +4,7 @@
|
||||
* Author: Neil Armstrong <narmstrong@baylibre.com>
|
||||
*/
|
||||
|
||||
-#include "meson-g12-common.dtsi"
|
||||
+#include "meson-g12.dtsi"
|
||||
#include <dt-bindings/power/meson-g12a-power.h>
|
||||
|
||||
/ {
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -1,95 +0,0 @@
|
||||
From 2871626ba6e61e1ace43db491f766d39e6eacd5a Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Brunet <jbrunet@baylibre.com>
|
||||
Date: Thu, 5 Sep 2019 14:59:55 +0200
|
||||
Subject: [PATCH] arm64: dts: meson: g12: factor the power domain.
|
||||
|
||||
The power domain declared in the g12a and g12b dtsi are the same.
|
||||
Move the declaration of these power domains in the g12 common dtsi.
|
||||
|
||||
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
|
||||
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
|
||||
---
|
||||
arch/arm64/boot/dts/amlogic/meson-g12.dtsi | 13 +++++++++++++
|
||||
arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 13 -------------
|
||||
arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 12 ------------
|
||||
3 files changed, 13 insertions(+), 25 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
|
||||
index 1e30061fb2a7..ac5833781611 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
|
||||
@@ -5,3 +5,16 @@
|
||||
*/
|
||||
|
||||
#include "meson-g12-common.dtsi"
|
||||
+#include <dt-bindings/power/meson-g12a-power.h>
|
||||
+
|
||||
+ðmac {
|
||||
+ power-domains = <&pwrc PWRC_G12A_ETH_ID>;
|
||||
+};
|
||||
+
|
||||
+&vpu {
|
||||
+ power-domains = <&pwrc PWRC_G12A_VPU_ID>;
|
||||
+};
|
||||
+
|
||||
+&sd_emmc_a {
|
||||
+ amlogic,dram-access-quirk;
|
||||
+};
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
|
||||
index 69339d69dfd4..07450c4babfc 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
|
||||
@@ -4,7 +4,6 @@
|
||||
*/
|
||||
|
||||
#include "meson-g12.dtsi"
|
||||
-#include <dt-bindings/power/meson-g12a-power.h>
|
||||
|
||||
/ {
|
||||
compatible = "amlogic,g12a";
|
||||
@@ -110,15 +109,3 @@
|
||||
};
|
||||
};
|
||||
};
|
||||
-
|
||||
-ðmac {
|
||||
- power-domains = <&pwrc PWRC_G12A_ETH_ID>;
|
||||
-};
|
||||
-
|
||||
-&vpu {
|
||||
- power-domains = <&pwrc PWRC_G12A_VPU_ID>;
|
||||
-};
|
||||
-
|
||||
-&sd_emmc_a {
|
||||
- amlogic,dram-access-quirk;
|
||||
-};
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
|
||||
index eefac0ef092b..a9e1db0f1158 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
|
||||
@@ -5,7 +5,6 @@
|
||||
*/
|
||||
|
||||
#include "meson-g12.dtsi"
|
||||
-#include <dt-bindings/power/meson-g12a-power.h>
|
||||
|
||||
/ {
|
||||
compatible = "amlogic,g12b";
|
||||
@@ -102,14 +101,3 @@
|
||||
compatible = "amlogic,g12b-clkc";
|
||||
};
|
||||
|
||||
-ðmac {
|
||||
- power-domains = <&pwrc PWRC_G12A_ETH_ID>;
|
||||
-};
|
||||
-
|
||||
-&vpu {
|
||||
- power-domains = <&pwrc PWRC_G12A_VPU_ID>;
|
||||
-};
|
||||
-
|
||||
-&sd_emmc_a {
|
||||
- amlogic,dram-access-quirk;
|
||||
-};
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -1,707 +0,0 @@
|
||||
From 0f674df0c260d363d2f25efea17f07b73d287565 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Brunet <jbrunet@baylibre.com>
|
||||
Date: Thu, 5 Sep 2019 14:59:56 +0200
|
||||
Subject: [PATCH] arm64: dts: meson: g12: move audio bus out of g12-common
|
||||
|
||||
The base address of the audio bus and pdm device are different
|
||||
between the g12 and sm1 SoC families. Overwriting the reg property
|
||||
only would leave with confusing node names on the sm1.
|
||||
|
||||
Move the audio related devices to the g12 dtsi. The appropriate nodes
|
||||
will be created for the sm1 later on.
|
||||
|
||||
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
|
||||
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
|
||||
---
|
||||
.../boot/dts/amlogic/meson-g12-common.dtsi | 320 -----------------
|
||||
arch/arm64/boot/dts/amlogic/meson-g12.dtsi | 324 ++++++++++++++++++
|
||||
2 files changed, 324 insertions(+), 320 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
||||
index 0ee8a369c547..95e9cf405fe9 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
||||
@@ -5,13 +5,10 @@
|
||||
|
||||
#include <dt-bindings/phy/phy.h>
|
||||
#include <dt-bindings/gpio/gpio.h>
|
||||
-#include <dt-bindings/clock/axg-audio-clkc.h>
|
||||
#include <dt-bindings/clock/g12a-clkc.h>
|
||||
#include <dt-bindings/clock/g12a-aoclkc.h>
|
||||
#include <dt-bindings/interrupt-controller/irq.h>
|
||||
#include <dt-bindings/interrupt-controller/arm-gic.h>
|
||||
-#include <dt-bindings/reset/amlogic,meson-axg-audio-arb.h>
|
||||
-#include <dt-bindings/reset/amlogic,meson-g12a-audio-reset.h>
|
||||
#include <dt-bindings/reset/amlogic,meson-g12a-reset.h>
|
||||
|
||||
/ {
|
||||
@@ -19,39 +16,6 @@
|
||||
#address-cells = <2>;
|
||||
#size-cells = <2>;
|
||||
|
||||
- tdmif_a: audio-controller-0 {
|
||||
- compatible = "amlogic,axg-tdm-iface";
|
||||
- #sound-dai-cells = <0>;
|
||||
- sound-name-prefix = "TDM_A";
|
||||
- clocks = <&clkc_audio AUD_CLKID_MST_A_MCLK>,
|
||||
- <&clkc_audio AUD_CLKID_MST_A_SCLK>,
|
||||
- <&clkc_audio AUD_CLKID_MST_A_LRCLK>;
|
||||
- clock-names = "mclk", "sclk", "lrclk";
|
||||
- status = "disabled";
|
||||
- };
|
||||
-
|
||||
- tdmif_b: audio-controller-1 {
|
||||
- compatible = "amlogic,axg-tdm-iface";
|
||||
- #sound-dai-cells = <0>;
|
||||
- sound-name-prefix = "TDM_B";
|
||||
- clocks = <&clkc_audio AUD_CLKID_MST_B_MCLK>,
|
||||
- <&clkc_audio AUD_CLKID_MST_B_SCLK>,
|
||||
- <&clkc_audio AUD_CLKID_MST_B_LRCLK>;
|
||||
- clock-names = "mclk", "sclk", "lrclk";
|
||||
- status = "disabled";
|
||||
- };
|
||||
-
|
||||
- tdmif_c: audio-controller-2 {
|
||||
- compatible = "amlogic,axg-tdm-iface";
|
||||
- #sound-dai-cells = <0>;
|
||||
- sound-name-prefix = "TDM_C";
|
||||
- clocks = <&clkc_audio AUD_CLKID_MST_C_MCLK>,
|
||||
- <&clkc_audio AUD_CLKID_MST_C_SCLK>,
|
||||
- <&clkc_audio AUD_CLKID_MST_C_LRCLK>;
|
||||
- clock-names = "mclk", "sclk", "lrclk";
|
||||
- status = "disabled";
|
||||
- };
|
||||
-
|
||||
efuse: efuse {
|
||||
compatible = "amlogic,meson-gxbb-efuse";
|
||||
clocks = <&clkc CLKID_EFUSE>;
|
||||
@@ -1457,290 +1421,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
- pdm: audio-controller@40000 {
|
||||
- compatible = "amlogic,g12a-pdm",
|
||||
- "amlogic,axg-pdm";
|
||||
- reg = <0x0 0x40000 0x0 0x34>;
|
||||
- #sound-dai-cells = <0>;
|
||||
- sound-name-prefix = "PDM";
|
||||
- clocks = <&clkc_audio AUD_CLKID_PDM>,
|
||||
- <&clkc_audio AUD_CLKID_PDM_DCLK>,
|
||||
- <&clkc_audio AUD_CLKID_PDM_SYSCLK>;
|
||||
- clock-names = "pclk", "dclk", "sysclk";
|
||||
- status = "disabled";
|
||||
- };
|
||||
-
|
||||
- audio: bus@42000 {
|
||||
- compatible = "simple-bus";
|
||||
- reg = <0x0 0x42000 0x0 0x2000>;
|
||||
- #address-cells = <2>;
|
||||
- #size-cells = <2>;
|
||||
- ranges = <0x0 0x0 0x0 0x42000 0x0 0x2000>;
|
||||
-
|
||||
- clkc_audio: clock-controller@0 {
|
||||
- status = "disabled";
|
||||
- compatible = "amlogic,g12a-audio-clkc";
|
||||
- reg = <0x0 0x0 0x0 0xb4>;
|
||||
- #clock-cells = <1>;
|
||||
- #reset-cells = <1>;
|
||||
-
|
||||
- clocks = <&clkc CLKID_AUDIO>,
|
||||
- <&clkc CLKID_MPLL0>,
|
||||
- <&clkc CLKID_MPLL1>,
|
||||
- <&clkc CLKID_MPLL2>,
|
||||
- <&clkc CLKID_MPLL3>,
|
||||
- <&clkc CLKID_HIFI_PLL>,
|
||||
- <&clkc CLKID_FCLK_DIV3>,
|
||||
- <&clkc CLKID_FCLK_DIV4>,
|
||||
- <&clkc CLKID_GP0_PLL>;
|
||||
- clock-names = "pclk",
|
||||
- "mst_in0",
|
||||
- "mst_in1",
|
||||
- "mst_in2",
|
||||
- "mst_in3",
|
||||
- "mst_in4",
|
||||
- "mst_in5",
|
||||
- "mst_in6",
|
||||
- "mst_in7";
|
||||
-
|
||||
- resets = <&reset RESET_AUDIO>;
|
||||
- };
|
||||
-
|
||||
- toddr_a: audio-controller@100 {
|
||||
- compatible = "amlogic,g12a-toddr",
|
||||
- "amlogic,axg-toddr";
|
||||
- reg = <0x0 0x100 0x0 0x2c>;
|
||||
- #sound-dai-cells = <0>;
|
||||
- sound-name-prefix = "TODDR_A";
|
||||
- interrupts = <GIC_SPI 148 IRQ_TYPE_EDGE_RISING>;
|
||||
- clocks = <&clkc_audio AUD_CLKID_TODDR_A>;
|
||||
- resets = <&arb AXG_ARB_TODDR_A>;
|
||||
- status = "disabled";
|
||||
- };
|
||||
-
|
||||
- toddr_b: audio-controller@140 {
|
||||
- compatible = "amlogic,g12a-toddr",
|
||||
- "amlogic,axg-toddr";
|
||||
- reg = <0x0 0x140 0x0 0x2c>;
|
||||
- #sound-dai-cells = <0>;
|
||||
- sound-name-prefix = "TODDR_B";
|
||||
- interrupts = <GIC_SPI 149 IRQ_TYPE_EDGE_RISING>;
|
||||
- clocks = <&clkc_audio AUD_CLKID_TODDR_B>;
|
||||
- resets = <&arb AXG_ARB_TODDR_B>;
|
||||
- status = "disabled";
|
||||
- };
|
||||
-
|
||||
- toddr_c: audio-controller@180 {
|
||||
- compatible = "amlogic,g12a-toddr",
|
||||
- "amlogic,axg-toddr";
|
||||
- reg = <0x0 0x180 0x0 0x2c>;
|
||||
- #sound-dai-cells = <0>;
|
||||
- sound-name-prefix = "TODDR_C";
|
||||
- interrupts = <GIC_SPI 150 IRQ_TYPE_EDGE_RISING>;
|
||||
- clocks = <&clkc_audio AUD_CLKID_TODDR_C>;
|
||||
- resets = <&arb AXG_ARB_TODDR_C>;
|
||||
- status = "disabled";
|
||||
- };
|
||||
-
|
||||
- frddr_a: audio-controller@1c0 {
|
||||
- compatible = "amlogic,g12a-frddr",
|
||||
- "amlogic,axg-frddr";
|
||||
- reg = <0x0 0x1c0 0x0 0x2c>;
|
||||
- #sound-dai-cells = <0>;
|
||||
- sound-name-prefix = "FRDDR_A";
|
||||
- interrupts = <GIC_SPI 152 IRQ_TYPE_EDGE_RISING>;
|
||||
- clocks = <&clkc_audio AUD_CLKID_FRDDR_A>;
|
||||
- resets = <&arb AXG_ARB_FRDDR_A>;
|
||||
- status = "disabled";
|
||||
- };
|
||||
-
|
||||
- frddr_b: audio-controller@200 {
|
||||
- compatible = "amlogic,g12a-frddr",
|
||||
- "amlogic,axg-frddr";
|
||||
- reg = <0x0 0x200 0x0 0x2c>;
|
||||
- #sound-dai-cells = <0>;
|
||||
- sound-name-prefix = "FRDDR_B";
|
||||
- interrupts = <GIC_SPI 153 IRQ_TYPE_EDGE_RISING>;
|
||||
- clocks = <&clkc_audio AUD_CLKID_FRDDR_B>;
|
||||
- resets = <&arb AXG_ARB_FRDDR_B>;
|
||||
- status = "disabled";
|
||||
- };
|
||||
-
|
||||
- frddr_c: audio-controller@240 {
|
||||
- compatible = "amlogic,g12a-frddr",
|
||||
- "amlogic,axg-frddr";
|
||||
- reg = <0x0 0x240 0x0 0x2c>;
|
||||
- #sound-dai-cells = <0>;
|
||||
- sound-name-prefix = "FRDDR_C";
|
||||
- interrupts = <GIC_SPI 154 IRQ_TYPE_EDGE_RISING>;
|
||||
- clocks = <&clkc_audio AUD_CLKID_FRDDR_C>;
|
||||
- resets = <&arb AXG_ARB_FRDDR_C>;
|
||||
- status = "disabled";
|
||||
- };
|
||||
-
|
||||
- arb: reset-controller@280 {
|
||||
- status = "disabled";
|
||||
- compatible = "amlogic,meson-axg-audio-arb";
|
||||
- reg = <0x0 0x280 0x0 0x4>;
|
||||
- #reset-cells = <1>;
|
||||
- clocks = <&clkc_audio AUD_CLKID_DDR_ARB>;
|
||||
- };
|
||||
-
|
||||
- tdmin_a: audio-controller@300 {
|
||||
- compatible = "amlogic,g12a-tdmin",
|
||||
- "amlogic,axg-tdmin";
|
||||
- reg = <0x0 0x300 0x0 0x40>;
|
||||
- sound-name-prefix = "TDMIN_A";
|
||||
- resets = <&clkc_audio AUD_RESET_TDMIN_A>;
|
||||
- clocks = <&clkc_audio AUD_CLKID_TDMIN_A>,
|
||||
- <&clkc_audio AUD_CLKID_TDMIN_A_SCLK>,
|
||||
- <&clkc_audio AUD_CLKID_TDMIN_A_SCLK_SEL>,
|
||||
- <&clkc_audio AUD_CLKID_TDMIN_A_LRCLK>,
|
||||
- <&clkc_audio AUD_CLKID_TDMIN_A_LRCLK>;
|
||||
- clock-names = "pclk", "sclk", "sclk_sel",
|
||||
- "lrclk", "lrclk_sel";
|
||||
- status = "disabled";
|
||||
- };
|
||||
-
|
||||
- tdmin_b: audio-controller@340 {
|
||||
- compatible = "amlogic,g12a-tdmin",
|
||||
- "amlogic,axg-tdmin";
|
||||
- reg = <0x0 0x340 0x0 0x40>;
|
||||
- sound-name-prefix = "TDMIN_B";
|
||||
- resets = <&clkc_audio AUD_RESET_TDMIN_B>;
|
||||
- clocks = <&clkc_audio AUD_CLKID_TDMIN_B>,
|
||||
- <&clkc_audio AUD_CLKID_TDMIN_B_SCLK>,
|
||||
- <&clkc_audio AUD_CLKID_TDMIN_B_SCLK_SEL>,
|
||||
- <&clkc_audio AUD_CLKID_TDMIN_B_LRCLK>,
|
||||
- <&clkc_audio AUD_CLKID_TDMIN_B_LRCLK>;
|
||||
- clock-names = "pclk", "sclk", "sclk_sel",
|
||||
- "lrclk", "lrclk_sel";
|
||||
- status = "disabled";
|
||||
- };
|
||||
-
|
||||
- tdmin_c: audio-controller@380 {
|
||||
- compatible = "amlogic,g12a-tdmin",
|
||||
- "amlogic,axg-tdmin";
|
||||
- reg = <0x0 0x380 0x0 0x40>;
|
||||
- sound-name-prefix = "TDMIN_C";
|
||||
- resets = <&clkc_audio AUD_RESET_TDMIN_C>;
|
||||
- clocks = <&clkc_audio AUD_CLKID_TDMIN_C>,
|
||||
- <&clkc_audio AUD_CLKID_TDMIN_C_SCLK>,
|
||||
- <&clkc_audio AUD_CLKID_TDMIN_C_SCLK_SEL>,
|
||||
- <&clkc_audio AUD_CLKID_TDMIN_C_LRCLK>,
|
||||
- <&clkc_audio AUD_CLKID_TDMIN_C_LRCLK>;
|
||||
- clock-names = "pclk", "sclk", "sclk_sel",
|
||||
- "lrclk", "lrclk_sel";
|
||||
- status = "disabled";
|
||||
- };
|
||||
-
|
||||
- tdmin_lb: audio-controller@3c0 {
|
||||
- compatible = "amlogic,g12a-tdmin",
|
||||
- "amlogic,axg-tdmin";
|
||||
- reg = <0x0 0x3c0 0x0 0x40>;
|
||||
- sound-name-prefix = "TDMIN_LB";
|
||||
- resets = <&clkc_audio AUD_RESET_TDMIN_LB>;
|
||||
- clocks = <&clkc_audio AUD_CLKID_TDMIN_LB>,
|
||||
- <&clkc_audio AUD_CLKID_TDMIN_LB_SCLK>,
|
||||
- <&clkc_audio AUD_CLKID_TDMIN_LB_SCLK_SEL>,
|
||||
- <&clkc_audio AUD_CLKID_TDMIN_LB_LRCLK>,
|
||||
- <&clkc_audio AUD_CLKID_TDMIN_LB_LRCLK>;
|
||||
- clock-names = "pclk", "sclk", "sclk_sel",
|
||||
- "lrclk", "lrclk_sel";
|
||||
- status = "disabled";
|
||||
- };
|
||||
-
|
||||
- spdifin: audio-controller@400 {
|
||||
- compatible = "amlogic,g12a-spdifin",
|
||||
- "amlogic,axg-spdifin";
|
||||
- reg = <0x0 0x400 0x0 0x30>;
|
||||
- #sound-dai-cells = <0>;
|
||||
- sound-name-prefix = "SPDIFIN";
|
||||
- interrupts = <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
|
||||
- clocks = <&clkc_audio AUD_CLKID_SPDIFIN>,
|
||||
- <&clkc_audio AUD_CLKID_SPDIFIN_CLK>;
|
||||
- clock-names = "pclk", "refclk";
|
||||
- status = "disabled";
|
||||
- };
|
||||
-
|
||||
- spdifout: audio-controller@480 {
|
||||
- compatible = "amlogic,g12a-spdifout",
|
||||
- "amlogic,axg-spdifout";
|
||||
- reg = <0x0 0x480 0x0 0x50>;
|
||||
- #sound-dai-cells = <0>;
|
||||
- sound-name-prefix = "SPDIFOUT";
|
||||
- clocks = <&clkc_audio AUD_CLKID_SPDIFOUT>,
|
||||
- <&clkc_audio AUD_CLKID_SPDIFOUT_CLK>;
|
||||
- clock-names = "pclk", "mclk";
|
||||
- status = "disabled";
|
||||
- };
|
||||
-
|
||||
- tdmout_a: audio-controller@500 {
|
||||
- compatible = "amlogic,g12a-tdmout";
|
||||
- reg = <0x0 0x500 0x0 0x40>;
|
||||
- sound-name-prefix = "TDMOUT_A";
|
||||
- resets = <&clkc_audio AUD_RESET_TDMOUT_A>;
|
||||
- clocks = <&clkc_audio AUD_CLKID_TDMOUT_A>,
|
||||
- <&clkc_audio AUD_CLKID_TDMOUT_A_SCLK>,
|
||||
- <&clkc_audio AUD_CLKID_TDMOUT_A_SCLK_SEL>,
|
||||
- <&clkc_audio AUD_CLKID_TDMOUT_A_LRCLK>,
|
||||
- <&clkc_audio AUD_CLKID_TDMOUT_A_LRCLK>;
|
||||
- clock-names = "pclk", "sclk", "sclk_sel",
|
||||
- "lrclk", "lrclk_sel";
|
||||
- status = "disabled";
|
||||
- };
|
||||
-
|
||||
- tdmout_b: audio-controller@540 {
|
||||
- compatible = "amlogic,g12a-tdmout";
|
||||
- reg = <0x0 0x540 0x0 0x40>;
|
||||
- sound-name-prefix = "TDMOUT_B";
|
||||
- resets = <&clkc_audio AUD_RESET_TDMOUT_B>;
|
||||
- clocks = <&clkc_audio AUD_CLKID_TDMOUT_B>,
|
||||
- <&clkc_audio AUD_CLKID_TDMOUT_B_SCLK>,
|
||||
- <&clkc_audio AUD_CLKID_TDMOUT_B_SCLK_SEL>,
|
||||
- <&clkc_audio AUD_CLKID_TDMOUT_B_LRCLK>,
|
||||
- <&clkc_audio AUD_CLKID_TDMOUT_B_LRCLK>;
|
||||
- clock-names = "pclk", "sclk", "sclk_sel",
|
||||
- "lrclk", "lrclk_sel";
|
||||
- status = "disabled";
|
||||
- };
|
||||
-
|
||||
- tdmout_c: audio-controller@580 {
|
||||
- compatible = "amlogic,g12a-tdmout";
|
||||
- reg = <0x0 0x580 0x0 0x40>;
|
||||
- sound-name-prefix = "TDMOUT_C";
|
||||
- resets = <&clkc_audio AUD_RESET_TDMOUT_C>;
|
||||
- clocks = <&clkc_audio AUD_CLKID_TDMOUT_C>,
|
||||
- <&clkc_audio AUD_CLKID_TDMOUT_C_SCLK>,
|
||||
- <&clkc_audio AUD_CLKID_TDMOUT_C_SCLK_SEL>,
|
||||
- <&clkc_audio AUD_CLKID_TDMOUT_C_LRCLK>,
|
||||
- <&clkc_audio AUD_CLKID_TDMOUT_C_LRCLK>;
|
||||
- clock-names = "pclk", "sclk", "sclk_sel",
|
||||
- "lrclk", "lrclk_sel";
|
||||
- status = "disabled";
|
||||
- };
|
||||
-
|
||||
- spdifout_b: audio-controller@680 {
|
||||
- compatible = "amlogic,g12a-spdifout",
|
||||
- "amlogic,axg-spdifout";
|
||||
- reg = <0x0 0x680 0x0 0x50>;
|
||||
- #sound-dai-cells = <0>;
|
||||
- sound-name-prefix = "SPDIFOUT_B";
|
||||
- clocks = <&clkc_audio AUD_CLKID_SPDIFOUT_B>,
|
||||
- <&clkc_audio AUD_CLKID_SPDIFOUT_B_CLK>;
|
||||
- clock-names = "pclk", "mclk";
|
||||
- status = "disabled";
|
||||
- };
|
||||
-
|
||||
- tohdmitx: audio-controller@744 {
|
||||
- compatible = "amlogic,g12a-tohdmitx";
|
||||
- reg = <0x0 0x744 0x0 0x4>;
|
||||
- #sound-dai-cells = <1>;
|
||||
- sound-name-prefix = "TOHDMITX";
|
||||
- status = "disabled";
|
||||
- };
|
||||
- };
|
||||
-
|
||||
usb3_pcie_phy: phy@46000 {
|
||||
compatible = "amlogic,g12a-usb3-pcie-phy";
|
||||
reg = <0x0 0x46000 0x0 0x2000>;
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
|
||||
index ac5833781611..0d9df29994f3 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
|
||||
@@ -5,7 +5,331 @@
|
||||
*/
|
||||
|
||||
#include "meson-g12-common.dtsi"
|
||||
+#include <dt-bindings/clock/axg-audio-clkc.h>
|
||||
#include <dt-bindings/power/meson-g12a-power.h>
|
||||
+#include <dt-bindings/reset/amlogic,meson-axg-audio-arb.h>
|
||||
+#include <dt-bindings/reset/amlogic,meson-g12a-audio-reset.h>
|
||||
+
|
||||
+/ {
|
||||
+ tdmif_a: audio-controller-0 {
|
||||
+ compatible = "amlogic,axg-tdm-iface";
|
||||
+ #sound-dai-cells = <0>;
|
||||
+ sound-name-prefix = "TDM_A";
|
||||
+ clocks = <&clkc_audio AUD_CLKID_MST_A_MCLK>,
|
||||
+ <&clkc_audio AUD_CLKID_MST_A_SCLK>,
|
||||
+ <&clkc_audio AUD_CLKID_MST_A_LRCLK>;
|
||||
+ clock-names = "mclk", "sclk", "lrclk";
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
+ tdmif_b: audio-controller-1 {
|
||||
+ compatible = "amlogic,axg-tdm-iface";
|
||||
+ #sound-dai-cells = <0>;
|
||||
+ sound-name-prefix = "TDM_B";
|
||||
+ clocks = <&clkc_audio AUD_CLKID_MST_B_MCLK>,
|
||||
+ <&clkc_audio AUD_CLKID_MST_B_SCLK>,
|
||||
+ <&clkc_audio AUD_CLKID_MST_B_LRCLK>;
|
||||
+ clock-names = "mclk", "sclk", "lrclk";
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
+ tdmif_c: audio-controller-2 {
|
||||
+ compatible = "amlogic,axg-tdm-iface";
|
||||
+ #sound-dai-cells = <0>;
|
||||
+ sound-name-prefix = "TDM_C";
|
||||
+ clocks = <&clkc_audio AUD_CLKID_MST_C_MCLK>,
|
||||
+ <&clkc_audio AUD_CLKID_MST_C_SCLK>,
|
||||
+ <&clkc_audio AUD_CLKID_MST_C_LRCLK>;
|
||||
+ clock-names = "mclk", "sclk", "lrclk";
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&apb {
|
||||
+ pdm: audio-controller@40000 {
|
||||
+ compatible = "amlogic,g12a-pdm",
|
||||
+ "amlogic,axg-pdm";
|
||||
+ reg = <0x0 0x40000 0x0 0x34>;
|
||||
+ #sound-dai-cells = <0>;
|
||||
+ sound-name-prefix = "PDM";
|
||||
+ clocks = <&clkc_audio AUD_CLKID_PDM>,
|
||||
+ <&clkc_audio AUD_CLKID_PDM_DCLK>,
|
||||
+ <&clkc_audio AUD_CLKID_PDM_SYSCLK>;
|
||||
+ clock-names = "pclk", "dclk", "sysclk";
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
+ audio: bus@42000 {
|
||||
+ compatible = "simple-bus";
|
||||
+ reg = <0x0 0x42000 0x0 0x2000>;
|
||||
+ #address-cells = <2>;
|
||||
+ #size-cells = <2>;
|
||||
+ ranges = <0x0 0x0 0x0 0x42000 0x0 0x2000>;
|
||||
+
|
||||
+ clkc_audio: clock-controller@0 {
|
||||
+ status = "disabled";
|
||||
+ compatible = "amlogic,g12a-audio-clkc";
|
||||
+ reg = <0x0 0x0 0x0 0xb4>;
|
||||
+ #clock-cells = <1>;
|
||||
+ #reset-cells = <1>;
|
||||
+
|
||||
+ clocks = <&clkc CLKID_AUDIO>,
|
||||
+ <&clkc CLKID_MPLL0>,
|
||||
+ <&clkc CLKID_MPLL1>,
|
||||
+ <&clkc CLKID_MPLL2>,
|
||||
+ <&clkc CLKID_MPLL3>,
|
||||
+ <&clkc CLKID_HIFI_PLL>,
|
||||
+ <&clkc CLKID_FCLK_DIV3>,
|
||||
+ <&clkc CLKID_FCLK_DIV4>,
|
||||
+ <&clkc CLKID_GP0_PLL>;
|
||||
+ clock-names = "pclk",
|
||||
+ "mst_in0",
|
||||
+ "mst_in1",
|
||||
+ "mst_in2",
|
||||
+ "mst_in3",
|
||||
+ "mst_in4",
|
||||
+ "mst_in5",
|
||||
+ "mst_in6",
|
||||
+ "mst_in7";
|
||||
+
|
||||
+ resets = <&reset RESET_AUDIO>;
|
||||
+ };
|
||||
+
|
||||
+ toddr_a: audio-controller@100 {
|
||||
+ compatible = "amlogic,g12a-toddr",
|
||||
+ "amlogic,axg-toddr";
|
||||
+ reg = <0x0 0x100 0x0 0x2c>;
|
||||
+ #sound-dai-cells = <0>;
|
||||
+ sound-name-prefix = "TODDR_A";
|
||||
+ interrupts = <GIC_SPI 148 IRQ_TYPE_EDGE_RISING>;
|
||||
+ clocks = <&clkc_audio AUD_CLKID_TODDR_A>;
|
||||
+ resets = <&arb AXG_ARB_TODDR_A>;
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
+ toddr_b: audio-controller@140 {
|
||||
+ compatible = "amlogic,g12a-toddr",
|
||||
+ "amlogic,axg-toddr";
|
||||
+ reg = <0x0 0x140 0x0 0x2c>;
|
||||
+ #sound-dai-cells = <0>;
|
||||
+ sound-name-prefix = "TODDR_B";
|
||||
+ interrupts = <GIC_SPI 149 IRQ_TYPE_EDGE_RISING>;
|
||||
+ clocks = <&clkc_audio AUD_CLKID_TODDR_B>;
|
||||
+ resets = <&arb AXG_ARB_TODDR_B>;
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
+ toddr_c: audio-controller@180 {
|
||||
+ compatible = "amlogic,g12a-toddr",
|
||||
+ "amlogic,axg-toddr";
|
||||
+ reg = <0x0 0x180 0x0 0x2c>;
|
||||
+ #sound-dai-cells = <0>;
|
||||
+ sound-name-prefix = "TODDR_C";
|
||||
+ interrupts = <GIC_SPI 150 IRQ_TYPE_EDGE_RISING>;
|
||||
+ clocks = <&clkc_audio AUD_CLKID_TODDR_C>;
|
||||
+ resets = <&arb AXG_ARB_TODDR_C>;
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
+ frddr_a: audio-controller@1c0 {
|
||||
+ compatible = "amlogic,g12a-frddr",
|
||||
+ "amlogic,axg-frddr";
|
||||
+ reg = <0x0 0x1c0 0x0 0x2c>;
|
||||
+ #sound-dai-cells = <0>;
|
||||
+ sound-name-prefix = "FRDDR_A";
|
||||
+ interrupts = <GIC_SPI 152 IRQ_TYPE_EDGE_RISING>;
|
||||
+ clocks = <&clkc_audio AUD_CLKID_FRDDR_A>;
|
||||
+ resets = <&arb AXG_ARB_FRDDR_A>;
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
+ frddr_b: audio-controller@200 {
|
||||
+ compatible = "amlogic,g12a-frddr",
|
||||
+ "amlogic,axg-frddr";
|
||||
+ reg = <0x0 0x200 0x0 0x2c>;
|
||||
+ #sound-dai-cells = <0>;
|
||||
+ sound-name-prefix = "FRDDR_B";
|
||||
+ interrupts = <GIC_SPI 153 IRQ_TYPE_EDGE_RISING>;
|
||||
+ clocks = <&clkc_audio AUD_CLKID_FRDDR_B>;
|
||||
+ resets = <&arb AXG_ARB_FRDDR_B>;
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
+ frddr_c: audio-controller@240 {
|
||||
+ compatible = "amlogic,g12a-frddr",
|
||||
+ "amlogic,axg-frddr";
|
||||
+ reg = <0x0 0x240 0x0 0x2c>;
|
||||
+ #sound-dai-cells = <0>;
|
||||
+ sound-name-prefix = "FRDDR_C";
|
||||
+ interrupts = <GIC_SPI 154 IRQ_TYPE_EDGE_RISING>;
|
||||
+ clocks = <&clkc_audio AUD_CLKID_FRDDR_C>;
|
||||
+ resets = <&arb AXG_ARB_FRDDR_C>;
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
+ arb: reset-controller@280 {
|
||||
+ status = "disabled";
|
||||
+ compatible = "amlogic,meson-axg-audio-arb";
|
||||
+ reg = <0x0 0x280 0x0 0x4>;
|
||||
+ #reset-cells = <1>;
|
||||
+ clocks = <&clkc_audio AUD_CLKID_DDR_ARB>;
|
||||
+ };
|
||||
+
|
||||
+ tdmin_a: audio-controller@300 {
|
||||
+ compatible = "amlogic,g12a-tdmin",
|
||||
+ "amlogic,axg-tdmin";
|
||||
+ reg = <0x0 0x300 0x0 0x40>;
|
||||
+ sound-name-prefix = "TDMIN_A";
|
||||
+ resets = <&clkc_audio AUD_RESET_TDMIN_A>;
|
||||
+ clocks = <&clkc_audio AUD_CLKID_TDMIN_A>,
|
||||
+ <&clkc_audio AUD_CLKID_TDMIN_A_SCLK>,
|
||||
+ <&clkc_audio AUD_CLKID_TDMIN_A_SCLK_SEL>,
|
||||
+ <&clkc_audio AUD_CLKID_TDMIN_A_LRCLK>,
|
||||
+ <&clkc_audio AUD_CLKID_TDMIN_A_LRCLK>;
|
||||
+ clock-names = "pclk", "sclk", "sclk_sel",
|
||||
+ "lrclk", "lrclk_sel";
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
+ tdmin_b: audio-controller@340 {
|
||||
+ compatible = "amlogic,g12a-tdmin",
|
||||
+ "amlogic,axg-tdmin";
|
||||
+ reg = <0x0 0x340 0x0 0x40>;
|
||||
+ sound-name-prefix = "TDMIN_B";
|
||||
+ resets = <&clkc_audio AUD_RESET_TDMIN_B>;
|
||||
+ clocks = <&clkc_audio AUD_CLKID_TDMIN_B>,
|
||||
+ <&clkc_audio AUD_CLKID_TDMIN_B_SCLK>,
|
||||
+ <&clkc_audio AUD_CLKID_TDMIN_B_SCLK_SEL>,
|
||||
+ <&clkc_audio AUD_CLKID_TDMIN_B_LRCLK>,
|
||||
+ <&clkc_audio AUD_CLKID_TDMIN_B_LRCLK>;
|
||||
+ clock-names = "pclk", "sclk", "sclk_sel",
|
||||
+ "lrclk", "lrclk_sel";
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
+ tdmin_c: audio-controller@380 {
|
||||
+ compatible = "amlogic,g12a-tdmin",
|
||||
+ "amlogic,axg-tdmin";
|
||||
+ reg = <0x0 0x380 0x0 0x40>;
|
||||
+ sound-name-prefix = "TDMIN_C";
|
||||
+ resets = <&clkc_audio AUD_RESET_TDMIN_C>;
|
||||
+ clocks = <&clkc_audio AUD_CLKID_TDMIN_C>,
|
||||
+ <&clkc_audio AUD_CLKID_TDMIN_C_SCLK>,
|
||||
+ <&clkc_audio AUD_CLKID_TDMIN_C_SCLK_SEL>,
|
||||
+ <&clkc_audio AUD_CLKID_TDMIN_C_LRCLK>,
|
||||
+ <&clkc_audio AUD_CLKID_TDMIN_C_LRCLK>;
|
||||
+ clock-names = "pclk", "sclk", "sclk_sel",
|
||||
+ "lrclk", "lrclk_sel";
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
+ tdmin_lb: audio-controller@3c0 {
|
||||
+ compatible = "amlogic,g12a-tdmin",
|
||||
+ "amlogic,axg-tdmin";
|
||||
+ reg = <0x0 0x3c0 0x0 0x40>;
|
||||
+ sound-name-prefix = "TDMIN_LB";
|
||||
+ resets = <&clkc_audio AUD_RESET_TDMIN_LB>;
|
||||
+ clocks = <&clkc_audio AUD_CLKID_TDMIN_LB>,
|
||||
+ <&clkc_audio AUD_CLKID_TDMIN_LB_SCLK>,
|
||||
+ <&clkc_audio AUD_CLKID_TDMIN_LB_SCLK_SEL>,
|
||||
+ <&clkc_audio AUD_CLKID_TDMIN_LB_LRCLK>,
|
||||
+ <&clkc_audio AUD_CLKID_TDMIN_LB_LRCLK>;
|
||||
+ clock-names = "pclk", "sclk", "sclk_sel",
|
||||
+ "lrclk", "lrclk_sel";
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
+ spdifin: audio-controller@400 {
|
||||
+ compatible = "amlogic,g12a-spdifin",
|
||||
+ "amlogic,axg-spdifin";
|
||||
+ reg = <0x0 0x400 0x0 0x30>;
|
||||
+ #sound-dai-cells = <0>;
|
||||
+ sound-name-prefix = "SPDIFIN";
|
||||
+ interrupts = <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
|
||||
+ clocks = <&clkc_audio AUD_CLKID_SPDIFIN>,
|
||||
+ <&clkc_audio AUD_CLKID_SPDIFIN_CLK>;
|
||||
+ clock-names = "pclk", "refclk";
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
+ spdifout: audio-controller@480 {
|
||||
+ compatible = "amlogic,g12a-spdifout",
|
||||
+ "amlogic,axg-spdifout";
|
||||
+ reg = <0x0 0x480 0x0 0x50>;
|
||||
+ #sound-dai-cells = <0>;
|
||||
+ sound-name-prefix = "SPDIFOUT";
|
||||
+ clocks = <&clkc_audio AUD_CLKID_SPDIFOUT>,
|
||||
+ <&clkc_audio AUD_CLKID_SPDIFOUT_CLK>;
|
||||
+ clock-names = "pclk", "mclk";
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
+ tdmout_a: audio-controller@500 {
|
||||
+ compatible = "amlogic,g12a-tdmout";
|
||||
+ reg = <0x0 0x500 0x0 0x40>;
|
||||
+ sound-name-prefix = "TDMOUT_A";
|
||||
+ resets = <&clkc_audio AUD_RESET_TDMOUT_A>;
|
||||
+ clocks = <&clkc_audio AUD_CLKID_TDMOUT_A>,
|
||||
+ <&clkc_audio AUD_CLKID_TDMOUT_A_SCLK>,
|
||||
+ <&clkc_audio AUD_CLKID_TDMOUT_A_SCLK_SEL>,
|
||||
+ <&clkc_audio AUD_CLKID_TDMOUT_A_LRCLK>,
|
||||
+ <&clkc_audio AUD_CLKID_TDMOUT_A_LRCLK>;
|
||||
+ clock-names = "pclk", "sclk", "sclk_sel",
|
||||
+ "lrclk", "lrclk_sel";
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
+ tdmout_b: audio-controller@540 {
|
||||
+ compatible = "amlogic,g12a-tdmout";
|
||||
+ reg = <0x0 0x540 0x0 0x40>;
|
||||
+ sound-name-prefix = "TDMOUT_B";
|
||||
+ resets = <&clkc_audio AUD_RESET_TDMOUT_B>;
|
||||
+ clocks = <&clkc_audio AUD_CLKID_TDMOUT_B>,
|
||||
+ <&clkc_audio AUD_CLKID_TDMOUT_B_SCLK>,
|
||||
+ <&clkc_audio AUD_CLKID_TDMOUT_B_SCLK_SEL>,
|
||||
+ <&clkc_audio AUD_CLKID_TDMOUT_B_LRCLK>,
|
||||
+ <&clkc_audio AUD_CLKID_TDMOUT_B_LRCLK>;
|
||||
+ clock-names = "pclk", "sclk", "sclk_sel",
|
||||
+ "lrclk", "lrclk_sel";
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
+ tdmout_c: audio-controller@580 {
|
||||
+ compatible = "amlogic,g12a-tdmout";
|
||||
+ reg = <0x0 0x580 0x0 0x40>;
|
||||
+ sound-name-prefix = "TDMOUT_C";
|
||||
+ resets = <&clkc_audio AUD_RESET_TDMOUT_C>;
|
||||
+ clocks = <&clkc_audio AUD_CLKID_TDMOUT_C>,
|
||||
+ <&clkc_audio AUD_CLKID_TDMOUT_C_SCLK>,
|
||||
+ <&clkc_audio AUD_CLKID_TDMOUT_C_SCLK_SEL>,
|
||||
+ <&clkc_audio AUD_CLKID_TDMOUT_C_LRCLK>,
|
||||
+ <&clkc_audio AUD_CLKID_TDMOUT_C_LRCLK>;
|
||||
+ clock-names = "pclk", "sclk", "sclk_sel",
|
||||
+ "lrclk", "lrclk_sel";
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
+ spdifout_b: audio-controller@680 {
|
||||
+ compatible = "amlogic,g12a-spdifout",
|
||||
+ "amlogic,axg-spdifout";
|
||||
+ reg = <0x0 0x680 0x0 0x50>;
|
||||
+ #sound-dai-cells = <0>;
|
||||
+ sound-name-prefix = "SPDIFOUT_B";
|
||||
+ clocks = <&clkc_audio AUD_CLKID_SPDIFOUT_B>,
|
||||
+ <&clkc_audio AUD_CLKID_SPDIFOUT_B_CLK>;
|
||||
+ clock-names = "pclk", "mclk";
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
+ tohdmitx: audio-controller@744 {
|
||||
+ compatible = "amlogic,g12a-tohdmitx";
|
||||
+ reg = <0x0 0x744 0x0 0x4>;
|
||||
+ #sound-dai-cells = <1>;
|
||||
+ sound-name-prefix = "TOHDMITX";
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+ };
|
||||
+};
|
||||
|
||||
ðmac {
|
||||
power-domains = <&pwrc PWRC_G12A_ETH_ID>;
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -1,121 +0,0 @@
|
||||
From c725fb00dfe3409720be24fad54b9acde26c5f11 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Brunet <jbrunet@baylibre.com>
|
||||
Date: Wed, 25 Sep 2019 11:33:58 +0200
|
||||
Subject: [PATCH] arm64: dts: meson: g12a: add audio devices resets
|
||||
|
||||
Provide the reset lines coming from the audio clock controller to
|
||||
the audio devices of the g12 family
|
||||
|
||||
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
|
||||
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Reviewed-by: Kevin Hilman <khilman@baylibre.com>
|
||||
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
|
||||
---
|
||||
arch/arm64/boot/dts/amlogic/meson-g12.dtsi | 28 +++++++++++++++++-----
|
||||
1 file changed, 22 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
|
||||
index 0d9df29994f3..3cf74fc96434 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
|
||||
@@ -103,7 +103,9 @@
|
||||
sound-name-prefix = "TODDR_A";
|
||||
interrupts = <GIC_SPI 148 IRQ_TYPE_EDGE_RISING>;
|
||||
clocks = <&clkc_audio AUD_CLKID_TODDR_A>;
|
||||
- resets = <&arb AXG_ARB_TODDR_A>;
|
||||
+ resets = <&arb AXG_ARB_TODDR_A>,
|
||||
+ <&clkc_audio AUD_RESET_TODDR_A>;
|
||||
+ reset-names = "arb", "rst";
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
@@ -115,7 +117,9 @@
|
||||
sound-name-prefix = "TODDR_B";
|
||||
interrupts = <GIC_SPI 149 IRQ_TYPE_EDGE_RISING>;
|
||||
clocks = <&clkc_audio AUD_CLKID_TODDR_B>;
|
||||
- resets = <&arb AXG_ARB_TODDR_B>;
|
||||
+ resets = <&arb AXG_ARB_TODDR_B>,
|
||||
+ <&clkc_audio AUD_RESET_TODDR_B>;
|
||||
+ reset-names = "arb", "rst";
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
@@ -127,7 +131,9 @@
|
||||
sound-name-prefix = "TODDR_C";
|
||||
interrupts = <GIC_SPI 150 IRQ_TYPE_EDGE_RISING>;
|
||||
clocks = <&clkc_audio AUD_CLKID_TODDR_C>;
|
||||
- resets = <&arb AXG_ARB_TODDR_C>;
|
||||
+ resets = <&arb AXG_ARB_TODDR_C>,
|
||||
+ <&clkc_audio AUD_RESET_TODDR_C>;
|
||||
+ reset-names = "arb", "rst";
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
@@ -139,7 +145,9 @@
|
||||
sound-name-prefix = "FRDDR_A";
|
||||
interrupts = <GIC_SPI 152 IRQ_TYPE_EDGE_RISING>;
|
||||
clocks = <&clkc_audio AUD_CLKID_FRDDR_A>;
|
||||
- resets = <&arb AXG_ARB_FRDDR_A>;
|
||||
+ resets = <&arb AXG_ARB_FRDDR_A>,
|
||||
+ <&clkc_audio AUD_RESET_FRDDR_A>;
|
||||
+ reset-names = "arb", "rst";
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
@@ -151,7 +159,9 @@
|
||||
sound-name-prefix = "FRDDR_B";
|
||||
interrupts = <GIC_SPI 153 IRQ_TYPE_EDGE_RISING>;
|
||||
clocks = <&clkc_audio AUD_CLKID_FRDDR_B>;
|
||||
- resets = <&arb AXG_ARB_FRDDR_B>;
|
||||
+ resets = <&arb AXG_ARB_FRDDR_B>,
|
||||
+ <&clkc_audio AUD_RESET_FRDDR_B>;
|
||||
+ reset-names = "arb", "rst";
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
@@ -163,7 +173,9 @@
|
||||
sound-name-prefix = "FRDDR_C";
|
||||
interrupts = <GIC_SPI 154 IRQ_TYPE_EDGE_RISING>;
|
||||
clocks = <&clkc_audio AUD_CLKID_FRDDR_C>;
|
||||
- resets = <&arb AXG_ARB_FRDDR_C>;
|
||||
+ resets = <&arb AXG_ARB_FRDDR_C>,
|
||||
+ <&clkc_audio AUD_RESET_FRDDR_C>;
|
||||
+ reset-names = "arb", "rst";
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
@@ -249,6 +261,7 @@
|
||||
clocks = <&clkc_audio AUD_CLKID_SPDIFIN>,
|
||||
<&clkc_audio AUD_CLKID_SPDIFIN_CLK>;
|
||||
clock-names = "pclk", "refclk";
|
||||
+ resets = <&clkc_audio AUD_RESET_SPDIFIN>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
@@ -261,6 +274,7 @@
|
||||
clocks = <&clkc_audio AUD_CLKID_SPDIFOUT>,
|
||||
<&clkc_audio AUD_CLKID_SPDIFOUT_CLK>;
|
||||
clock-names = "pclk", "mclk";
|
||||
+ resets = <&clkc_audio AUD_RESET_SPDIFOUT>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
@@ -318,6 +332,7 @@
|
||||
clocks = <&clkc_audio AUD_CLKID_SPDIFOUT_B>,
|
||||
<&clkc_audio AUD_CLKID_SPDIFOUT_B_CLK>;
|
||||
clock-names = "pclk", "mclk";
|
||||
+ resets = <&clkc_audio AUD_RESET_SPDIFOUT_B>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
@@ -326,6 +341,7 @@
|
||||
reg = <0x0 0x744 0x0 0x4>;
|
||||
#sound-dai-cells = <1>;
|
||||
sound-name-prefix = "TOHDMITX";
|
||||
+ resets = <&clkc_audio AUD_RESET_TOHDMITX>;
|
||||
status = "disabled";
|
||||
};
|
||||
};
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -1,54 +0,0 @@
|
||||
From de82e74a9f2631e6718ab6a90e0dfbbcd7d952b4 Mon Sep 17 00:00:00 2001
|
||||
From: Carlo Caione <ccaione@baylibre.com>
|
||||
Date: Wed, 31 Jul 2019 09:23:38 +0100
|
||||
Subject: [PATCH] arm64: dts: meson: Link nvmem and secure-monitor nodes
|
||||
|
||||
The former is going to use the latter to retrieve the efuses data.
|
||||
|
||||
Signed-off-by: Carlo Caione <ccaione@baylibre.com>
|
||||
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
|
||||
---
|
||||
arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 1 +
|
||||
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 1 +
|
||||
arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 1 +
|
||||
3 files changed, 3 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
|
||||
index bb4a2acb9970..04803c3bccfa 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
|
||||
@@ -117,6 +117,7 @@
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
read-only;
|
||||
+ secure-monitor = <&sm>;
|
||||
};
|
||||
|
||||
psci {
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
||||
index 95e9cf405fe9..0f6ec1704343 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
||||
@@ -22,6 +22,7 @@
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
read-only;
|
||||
+ secure-monitor = <&sm>;
|
||||
};
|
||||
|
||||
psci {
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
|
||||
index 6733050d735f..e5a601e75ef2 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
|
||||
@@ -161,6 +161,7 @@
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
read-only;
|
||||
+ secure-monitor = <&sm>;
|
||||
|
||||
sn: sn@14 {
|
||||
reg = <0x14 0x10>;
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -1,82 +0,0 @@
|
||||
From 1f8607d597635c283e397e87575b49184874d507 Mon Sep 17 00:00:00 2001
|
||||
From: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Date: Mon, 16 Sep 2019 14:50:21 +0200
|
||||
Subject: [PATCH] arm64: dts: meson-g12a: Add PCIe node
|
||||
|
||||
This adds the Amlogic G12A PCI Express controller node, also
|
||||
using the USB3+PCIe Combo PHY.
|
||||
|
||||
The PHY mode selection is static, thus the USB3+PCIe Combo PHY
|
||||
phandle would need to be removed from the USB control node if the
|
||||
shared differential lines are used for PCIe instead of USB3.
|
||||
|
||||
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Reviewed-by: Andrew Murray <andrew.murray@arm.com>
|
||||
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
|
||||
---
|
||||
.../boot/dts/amlogic/meson-g12-common.dtsi | 33 +++++++++++++++++++
|
||||
arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 4 +++
|
||||
2 files changed, 37 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
||||
index 0f6ec1704343..f76773cabdb1 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
||||
@@ -60,6 +60,39 @@
|
||||
#size-cells = <2>;
|
||||
ranges;
|
||||
|
||||
+ pcie: pcie@fc000000 {
|
||||
+ compatible = "amlogic,g12a-pcie", "snps,dw-pcie";
|
||||
+ reg = <0x0 0xfc000000 0x0 0x400000
|
||||
+ 0x0 0xff648000 0x0 0x2000
|
||||
+ 0x0 0xfc400000 0x0 0x200000>;
|
||||
+ reg-names = "elbi", "cfg", "config";
|
||||
+ interrupts = <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ #interrupt-cells = <1>;
|
||||
+ interrupt-map-mask = <0 0 0 0>;
|
||||
+ interrupt-map = <0 0 0 0 &gic GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ bus-range = <0x0 0xff>;
|
||||
+ #address-cells = <3>;
|
||||
+ #size-cells = <2>;
|
||||
+ device_type = "pci";
|
||||
+ ranges = <0x81000000 0 0 0x0 0xfc600000 0 0x00100000
|
||||
+ 0x82000000 0 0xfc700000 0x0 0xfc700000 0 0x1900000>;
|
||||
+
|
||||
+ clocks = <&clkc CLKID_PCIE_PHY
|
||||
+ &clkc CLKID_PCIE_COMB
|
||||
+ &clkc CLKID_PCIE_PLL>;
|
||||
+ clock-names = "general",
|
||||
+ "pclk",
|
||||
+ "port";
|
||||
+ resets = <&reset RESET_PCIE_CTRL_A>,
|
||||
+ <&reset RESET_PCIE_APB>;
|
||||
+ reset-names = "port",
|
||||
+ "apb";
|
||||
+ num-lanes = <1>;
|
||||
+ phys = <&usb3_pcie_phy PHY_TYPE_PCIE>;
|
||||
+ phy-names = "pcie";
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
ethmac: ethernet@ff3f0000 {
|
||||
compatible = "amlogic,meson-axg-dwmac",
|
||||
"snps,dwmac-3.70a",
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
|
||||
index 6152e928aef2..1fdc5af5ae23 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
|
||||
@@ -139,6 +139,10 @@
|
||||
"amlogic,meson-gpio-intc";
|
||||
};
|
||||
|
||||
+&pcie {
|
||||
+ power-domains = <&pwrc PWRC_SM1_PCIE_ID>;
|
||||
+};
|
||||
+
|
||||
&pwrc {
|
||||
compatible = "amlogic,meson-sm1-pwrc";
|
||||
};
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -1,99 +0,0 @@
|
||||
From 15767cfd81eb9ff2fb783d0c6f458b90efa7d4d3 Mon Sep 17 00:00:00 2001
|
||||
From: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Date: Thu, 3 Oct 2019 15:08:41 +0200
|
||||
Subject: [PATCH] arm64: dts: meson-g12: add support for simplefb
|
||||
|
||||
SimpleFB allows transferring a framebuffer from the firmware/bootloader
|
||||
to the kernel, while making sure the related clocks and power supplies
|
||||
stay enabled.
|
||||
|
||||
Add nodes for CVBS and HDMI Simple Framebuffers, based on the GXBB/GXL/GXM
|
||||
support at [1].
|
||||
|
||||
[1] 03b370357907 ("arm64: dts: meson-gx: add support for simplef")
|
||||
|
||||
Cc: Maxime Jourdan <mjourdan@baylibre.com>
|
||||
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Reviewed-by: Kevin Hilman <khilman@baylibre.com>
|
||||
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
|
||||
---
|
||||
.../boot/dts/amlogic/meson-g12-common.dtsi | 26 +++++++++++++++++++
|
||||
arch/arm64/boot/dts/amlogic/meson-g12.dtsi | 8 ++++++
|
||||
arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 8 ++++++
|
||||
3 files changed, 42 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
||||
index f76773cabdb1..21c155f4508c 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
||||
@@ -16,6 +16,32 @@
|
||||
#address-cells = <2>;
|
||||
#size-cells = <2>;
|
||||
|
||||
+ chosen {
|
||||
+ #address-cells = <2>;
|
||||
+ #size-cells = <2>;
|
||||
+ ranges;
|
||||
+
|
||||
+ simplefb_cvbs: framebuffer-cvbs {
|
||||
+ compatible = "amlogic,simple-framebuffer",
|
||||
+ "simple-framebuffer";
|
||||
+ amlogic,pipeline = "vpu-cvbs";
|
||||
+ clocks = <&clkc CLKID_HDMI>,
|
||||
+ <&clkc CLKID_HTX_PCLK>,
|
||||
+ <&clkc CLKID_VPU_INTR>;
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
+ simplefb_hdmi: framebuffer-hdmi {
|
||||
+ compatible = "amlogic,simple-framebuffer",
|
||||
+ "simple-framebuffer";
|
||||
+ amlogic,pipeline = "vpu-hdmi";
|
||||
+ clocks = <&clkc CLKID_HDMI>,
|
||||
+ <&clkc CLKID_HTX_PCLK>,
|
||||
+ <&clkc CLKID_VPU_INTR>;
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
efuse: efuse {
|
||||
compatible = "amlogic,meson-gxbb-efuse";
|
||||
clocks = <&clkc CLKID_EFUSE>;
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
|
||||
index 3cf74fc96434..1e0e056c3d62 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
|
||||
@@ -358,3 +358,11 @@
|
||||
&sd_emmc_a {
|
||||
amlogic,dram-access-quirk;
|
||||
};
|
||||
+
|
||||
+&simplefb_cvbs {
|
||||
+ power-domains = <&pwrc PWRC_G12A_VPU_ID>;
|
||||
+};
|
||||
+
|
||||
+&simplefb_hdmi {
|
||||
+ power-domains = <&pwrc PWRC_G12A_VPU_ID>;
|
||||
+};
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
|
||||
index 1fdc5af5ae23..f89d744c9648 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
|
||||
@@ -147,6 +147,14 @@
|
||||
compatible = "amlogic,meson-sm1-pwrc";
|
||||
};
|
||||
|
||||
+&simplefb_cvbs {
|
||||
+ power-domains = <&pwrc PWRC_SM1_VPU_ID>;
|
||||
+};
|
||||
+
|
||||
+&simplefb_hdmi {
|
||||
+ power-domains = <&pwrc PWRC_SM1_VPU_ID>;
|
||||
+};
|
||||
+
|
||||
&vpu {
|
||||
power-domains = <&pwrc PWRC_SM1_VPU_ID>;
|
||||
};
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -1,52 +0,0 @@
|
||||
From 8656783f07613ad2a4e511e417c88c544e220113 Mon Sep 17 00:00:00 2001
|
||||
From: Guillaume La Roque <glaroque@baylibre.com>
|
||||
Date: Fri, 4 Oct 2019 11:01:10 +0200
|
||||
Subject: [PATCH] arm64: dts: meson: g12: add temperature sensor
|
||||
|
||||
Add cpu and ddr temperature sensors for G12 Socs
|
||||
|
||||
Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
||||
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Reviewed-by: Amit Kucheria <amit.kucheria@linaro.org>
|
||||
Tested-by: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Tested-by: Kevin Hilman <khilman@baylibre.com>
|
||||
Signed-off-by: Guillaume La Roque <glaroque@baylibre.com>
|
||||
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
|
||||
---
|
||||
.../boot/dts/amlogic/meson-g12-common.dtsi | 20 +++++++++++++++++++
|
||||
1 file changed, 20 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
||||
index 21c155f4508c..f153194b9bf3 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
||||
@@ -1380,6 +1380,26 @@
|
||||
};
|
||||
};
|
||||
|
||||
+ cpu_temp: temperature-sensor@34800 {
|
||||
+ compatible = "amlogic,g12a-cpu-thermal",
|
||||
+ "amlogic,g12a-thermal";
|
||||
+ reg = <0x0 0x34800 0x0 0x50>;
|
||||
+ interrupts = <GIC_SPI 35 IRQ_TYPE_EDGE_RISING>;
|
||||
+ clocks = <&clkc CLKID_TS>;
|
||||
+ #thermal-sensor-cells = <0>;
|
||||
+ amlogic,ao-secure = <&sec_AO>;
|
||||
+ };
|
||||
+
|
||||
+ ddr_temp: temperature-sensor@34c00 {
|
||||
+ compatible = "amlogic,g12a-ddr-thermal",
|
||||
+ "amlogic,g12a-thermal";
|
||||
+ reg = <0x0 0x34c00 0x0 0x50>;
|
||||
+ interrupts = <GIC_SPI 36 IRQ_TYPE_EDGE_RISING>;
|
||||
+ clocks = <&clkc CLKID_TS>;
|
||||
+ #thermal-sensor-cells = <0>;
|
||||
+ amlogic,ao-secure = <&sec_AO>;
|
||||
+ };
|
||||
+
|
||||
usb2_phy0: phy@36000 {
|
||||
compatible = "amlogic,g12a-usb2-phy";
|
||||
reg = <0x0 0x36000 0x0 0x2000>;
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -1,105 +0,0 @@
|
||||
From e7251ed74ef79b80fc5e77636832be7baf1f40a6 Mon Sep 17 00:00:00 2001
|
||||
From: Guillaume La Roque <glaroque@baylibre.com>
|
||||
Date: Fri, 4 Oct 2019 11:01:11 +0200
|
||||
Subject: [PATCH] arm64: dts: meson: g12: Add minimal thermal zone
|
||||
|
||||
Add minimal thermal zone for two temperature sensor
|
||||
One is located close to the DDR and the other one is
|
||||
located close to the PLLs (between the CPU and GPU)
|
||||
|
||||
Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
||||
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Reviewed-by: Amit Kucheria <amit.kucheria@linaro.org>
|
||||
Tested-by: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Tested-by: Kevin Hilman <khilman@baylibre.com>
|
||||
Signed-off-by: Guillaume La Roque <glaroque@baylibre.com>
|
||||
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
|
||||
---
|
||||
.../boot/dts/amlogic/meson-g12-common.dtsi | 57 +++++++++++++++++++
|
||||
1 file changed, 57 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
||||
index f153194b9bf3..a063d49b9cb1 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
||||
@@ -10,6 +10,7 @@
|
||||
#include <dt-bindings/interrupt-controller/irq.h>
|
||||
#include <dt-bindings/interrupt-controller/arm-gic.h>
|
||||
#include <dt-bindings/reset/amlogic,meson-g12a-reset.h>
|
||||
+#include <dt-bindings/thermal/thermal.h>
|
||||
|
||||
/ {
|
||||
interrupt-parent = <&gic>;
|
||||
@@ -119,6 +120,61 @@
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
+ thermal-zones {
|
||||
+ cpu_thermal: cpu-thermal {
|
||||
+ polling-delay = <1000>;
|
||||
+ polling-delay-passive = <100>;
|
||||
+ thermal-sensors = <&cpu_temp>;
|
||||
+
|
||||
+ trips {
|
||||
+ cpu_passive: cpu-passive {
|
||||
+ temperature = <85000>; /* millicelsius */
|
||||
+ hysteresis = <2000>; /* millicelsius */
|
||||
+ type = "passive";
|
||||
+ };
|
||||
+
|
||||
+ cpu_hot: cpu-hot {
|
||||
+ temperature = <95000>; /* millicelsius */
|
||||
+ hysteresis = <2000>; /* millicelsius */
|
||||
+ type = "hot";
|
||||
+ };
|
||||
+
|
||||
+ cpu_critical: cpu-critical {
|
||||
+ temperature = <110000>; /* millicelsius */
|
||||
+ hysteresis = <2000>; /* millicelsius */
|
||||
+ type = "critical";
|
||||
+ };
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ ddr_thermal: ddr-thermal {
|
||||
+ polling-delay = <1000>;
|
||||
+ polling-delay-passive = <100>;
|
||||
+ thermal-sensors = <&ddr_temp>;
|
||||
+
|
||||
+ trips {
|
||||
+ ddr_passive: ddr-passive {
|
||||
+ temperature = <85000>; /* millicelsius */
|
||||
+ hysteresis = <2000>; /* millicelsius */
|
||||
+ type = "passive";
|
||||
+ };
|
||||
+
|
||||
+ ddr_critical: ddr-critical {
|
||||
+ temperature = <110000>; /* millicelsius */
|
||||
+ hysteresis = <2000>; /* millicelsius */
|
||||
+ type = "critical";
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ cooling-maps {
|
||||
+ map {
|
||||
+ trip = <&ddr_passive>;
|
||||
+ cooling-device = <&mali THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
|
||||
+ };
|
||||
+ };
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
ethmac: ethernet@ff3f0000 {
|
||||
compatible = "amlogic,meson-axg-dwmac",
|
||||
"snps,dwmac-3.70a",
|
||||
@@ -2169,6 +2225,7 @@
|
||||
assigned-clock-rates = <0>, /* Do Nothing */
|
||||
<800000000>,
|
||||
<0>; /* Do Nothing */
|
||||
+ #cooling-cells = <2>;
|
||||
};
|
||||
};
|
||||
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -1,83 +0,0 @@
|
||||
From 6eeaf4d2452ec8b1ece58776812140734fc2e088 Mon Sep 17 00:00:00 2001
|
||||
From: Frank Hartung <supervisedthinking@gmail.com>
|
||||
Date: Sat, 14 Sep 2019 06:49:40 +0400
|
||||
Subject: [PATCH] arm64: dts: meson: Add capacity-dmips-mhz attributes to G12B
|
||||
|
||||
Meson G12B SoCs (S922X and A311D) are a big-little design where not all CPUs
|
||||
are equal; the A53s cores are weaker than the A72s.
|
||||
|
||||
Include capacity-dmips-mhz properties to tell the OS there is a difference
|
||||
in processing capacity. The dmips values are based on similar submissions for
|
||||
other A53/A72 SoCs: HiSilicon 3660 [1] and Rockchip RK3399 [2].
|
||||
|
||||
This change is particularly beneficial for use-cases like retro gaming where
|
||||
emulators often run on a single core. The OS now chooses an A72 core instead
|
||||
of an A53 core.
|
||||
|
||||
[1] https://lore.kernel.org/patchwork/patch/862742/
|
||||
[2] https://patchwork.kernel.org/patch/10836577/
|
||||
|
||||
Signed-off-by: Frank Hartung <supervisedthinking@gmail.com>
|
||||
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Reviewed-by: Kevin Hilman <khilman@baylibre.com>
|
||||
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
|
||||
---
|
||||
arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
|
||||
index a9e1db0f1158..b3f9e3a02963 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
|
||||
@@ -48,6 +48,7 @@
|
||||
compatible = "arm,cortex-a53";
|
||||
reg = <0x0 0x0>;
|
||||
enable-method = "psci";
|
||||
+ capacity-dmips-mhz = <592>;
|
||||
next-level-cache = <&l2>;
|
||||
};
|
||||
|
||||
@@ -56,6 +57,7 @@
|
||||
compatible = "arm,cortex-a53";
|
||||
reg = <0x0 0x1>;
|
||||
enable-method = "psci";
|
||||
+ capacity-dmips-mhz = <592>;
|
||||
next-level-cache = <&l2>;
|
||||
};
|
||||
|
||||
@@ -64,6 +66,7 @@
|
||||
compatible = "arm,cortex-a73";
|
||||
reg = <0x0 0x100>;
|
||||
enable-method = "psci";
|
||||
+ capacity-dmips-mhz = <1024>;
|
||||
next-level-cache = <&l2>;
|
||||
};
|
||||
|
||||
@@ -72,6 +75,7 @@
|
||||
compatible = "arm,cortex-a73";
|
||||
reg = <0x0 0x101>;
|
||||
enable-method = "psci";
|
||||
+ capacity-dmips-mhz = <1024>;
|
||||
next-level-cache = <&l2>;
|
||||
};
|
||||
|
||||
@@ -80,6 +84,7 @@
|
||||
compatible = "arm,cortex-a73";
|
||||
reg = <0x0 0x102>;
|
||||
enable-method = "psci";
|
||||
+ capacity-dmips-mhz = <1024>;
|
||||
next-level-cache = <&l2>;
|
||||
};
|
||||
|
||||
@@ -88,6 +93,7 @@
|
||||
compatible = "arm,cortex-a73";
|
||||
reg = <0x0 0x103>;
|
||||
enable-method = "psci";
|
||||
+ capacity-dmips-mhz = <1024>;
|
||||
next-level-cache = <&l2>;
|
||||
};
|
||||
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
From 711f9cb1f13aff940cd0a469dcb1a041330af019 Mon Sep 17 00:00:00 2001
|
||||
From: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Date: Mon, 21 Oct 2019 16:29:00 +0200
|
||||
Subject: [PATCH] arm64: dts: meson-g12a: fix gpu irq order
|
||||
|
||||
This fixes the following DT schemas check errors:
|
||||
meson-g12b-s922x-khadas-vim3.dt.yaml: gpu@ffe40000: interrupt-names:0: 'job' was expected
|
||||
meson-g12b-s922x-khadas-vim3.dt.yaml: gpu@ffe40000: interrupt-names:2: 'gpu' was expected
|
||||
|
||||
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
||||
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
|
||||
---
|
||||
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
||||
index a063d49b9cb1..7fabc8d9654a 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
||||
@@ -2204,10 +2204,10 @@
|
||||
compatible = "amlogic,meson-g12a-mali", "arm,mali-bifrost";
|
||||
reg = <0x0 0xffe40000 0x0 0x40000>;
|
||||
interrupt-parent = <&gic>;
|
||||
- interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>,
|
||||
+ interrupts = <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>,
|
||||
- <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>;
|
||||
- interrupt-names = "gpu", "mmu", "job";
|
||||
+ <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ interrupt-names = "job", "mmu", "gpu";
|
||||
clocks = <&clkc CLKID_MALI>;
|
||||
resets = <&reset RESET_DVALIN_CAPB3>, <&reset RESET_DVALIN>;
|
||||
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -1,43 +0,0 @@
|
||||
From fcf19f29d79dfe4edce0376dd027ea7a5456ea32 Mon Sep 17 00:00:00 2001
|
||||
From: Anand Moon <linux.amoon@gmail.com>
|
||||
Date: Mon, 2 Sep 2019 05:49:33 +0000
|
||||
Subject: [PATCH] arm64: dts: meson: odroid-c2: p5v0 is the main 5V power input
|
||||
|
||||
As per the schematic Monolithic Power Systems MP2161GJ-C499
|
||||
supply a fixed output voltage of 5.0V. This supplies linked
|
||||
to VDD_EE, HDMI_P5V0, USB_POWER, VCCK, VDDIO_AO1V8, VDDIO_AO3V3,
|
||||
VDD3V3, DDR3_1V5 according to the schematics.
|
||||
|
||||
Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
||||
Cc: Jerome Brunet <jbrunet@baylibre.com>
|
||||
Cc: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
||||
Signed-off-by: Anand Moon <linux.amoon@gmail.com>
|
||||
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
|
||||
---
|
||||
arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 9 +++++++++
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
|
||||
index 6039adda12ee..0cb5831d9daf 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
|
||||
@@ -50,6 +50,15 @@
|
||||
};
|
||||
};
|
||||
|
||||
+ p5v0: regulator-p5v0 {
|
||||
+ compatible = "regulator-fixed";
|
||||
+
|
||||
+ regulator-name = "P5V0";
|
||||
+ regulator-min-microvolt = <5000000>;
|
||||
+ regulator-max-microvolt = <5000000>;
|
||||
+ regulator-always-on;
|
||||
+ };
|
||||
+
|
||||
tflash_vdd: regulator-tflash_vdd {
|
||||
/*
|
||||
* signal name from schematics: TFLASH_VDD_EN
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -1,42 +0,0 @@
|
||||
From 47a8bddb6df98cc4062661fe68ad5d4382337d0e Mon Sep 17 00:00:00 2001
|
||||
From: Anand Moon <linux.amoon@gmail.com>
|
||||
Date: Mon, 2 Sep 2019 05:49:34 +0000
|
||||
Subject: [PATCH] arm64: dts: meson: odroid-c2: Add missing linking regulator
|
||||
to usb bus
|
||||
|
||||
Add missing linking regulator node to usb bus for power usb devices.
|
||||
|
||||
Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
||||
Cc: Jerome Brunet <jbrunet@baylibre.com>
|
||||
Cc: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
||||
Signed-off-by: Anand Moon <linux.amoon@gmail.com>
|
||||
[ khilman: minor typo fixup ]
|
||||
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
|
||||
---
|
||||
arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
|
||||
index 0cb5831d9daf..e2ce767a4324 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
|
||||
@@ -36,8 +36,15 @@
|
||||
regulator-min-microvolt = <5000000>;
|
||||
regulator-max-microvolt = <5000000>;
|
||||
|
||||
+ /*
|
||||
+ * signal name from schematics: PWREN
|
||||
+ */
|
||||
gpio = <&gpio_ao GPIOAO_5 GPIO_ACTIVE_HIGH>;
|
||||
enable-active-high;
|
||||
+ /*
|
||||
+ * signal name from schematics: USB_POWER
|
||||
+ */
|
||||
+ vin-supply = <&p5v0>;
|
||||
};
|
||||
|
||||
leds {
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -1,64 +0,0 @@
|
||||
From 60c5abf6a8f54dee2ccb94a7ec58f73883e6c56d Mon Sep 17 00:00:00 2001
|
||||
From: Anand Moon <linux.amoon@gmail.com>
|
||||
Date: Tue, 1 Oct 2019 07:38:59 +0000
|
||||
Subject: [PATCH] arm64: dts: meson: odroid-c2: Add missing regulator linked to
|
||||
P5V0 regulator
|
||||
|
||||
As per schematics VDDIO_AO18, VDDIO_AO3V3/VDD3V3 DDR3_1V5/DDR_VDDC:
|
||||
fixed regulator output which is supplied by P5V0.
|
||||
|
||||
Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
||||
Cc: Jerome Brunet <jbrunet@baylibre.com>
|
||||
Cc: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
||||
Signed-off-by: Anand Moon <linux.amoon@gmail.com>
|
||||
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
|
||||
---
|
||||
.../boot/dts/amlogic/meson-gxbb-odroidc2.dts | 30 +++++++++++++++++++
|
||||
1 file changed, 30 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
|
||||
index e739f10f9442..5adecdf3b175 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
|
||||
@@ -111,6 +111,36 @@
|
||||
regulator-max-microvolt = <3300000>;
|
||||
};
|
||||
|
||||
+ vddio_ao1v8: regulator-vddio-ao1v8 {
|
||||
+ compatible = "regulator-fixed";
|
||||
+ regulator-name = "VDDIO_AO1V8";
|
||||
+ regulator-min-microvolt = <1800000>;
|
||||
+ regulator-max-microvolt = <1800000>;
|
||||
+ regulator-always-on;
|
||||
+ /* U17 RT9179GB */
|
||||
+ vin-supply = <&p5v0>;
|
||||
+ };
|
||||
+
|
||||
+ vddio_ao3v3: regulator-vddio-ao3v3 {
|
||||
+ compatible = "regulator-fixed";
|
||||
+ regulator-name = "VDDIO_AO3V3";
|
||||
+ regulator-min-microvolt = <3300000>;
|
||||
+ regulator-max-microvolt = <3300000>;
|
||||
+ regulator-always-on;
|
||||
+ /* U11 MP2161GJ-C499 */
|
||||
+ vin-supply = <&p5v0>;
|
||||
+ };
|
||||
+
|
||||
+ ddr3_1v5: regulator-ddr3_1v5 {
|
||||
+ compatible = "regulator-fixed";
|
||||
+ regulator-name = "DDR3_1V5";
|
||||
+ regulator-min-microvolt = <1500000>;
|
||||
+ regulator-max-microvolt = <1500000>;
|
||||
+ regulator-always-on;
|
||||
+ /* U15 MP2161GJ-C499 */
|
||||
+ vin-supply = <&p5v0>;
|
||||
+ };
|
||||
+
|
||||
emmc_pwrseq: emmc-pwrseq {
|
||||
compatible = "mmc-pwrseq-emmc";
|
||||
reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>;
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -1,73 +0,0 @@
|
||||
From df39b5239d696e1fc9a88103f69c2d3696bdb0bc Mon Sep 17 00:00:00 2001
|
||||
From: Anand Moon <linux.amoon@gmail.com>
|
||||
Date: Tue, 1 Oct 2019 07:39:00 +0000
|
||||
Subject: [PATCH] arm64: dts: meson: odroid-c2: Add missing regulator linked to
|
||||
VDDIO_AO3V3 regulator
|
||||
|
||||
As per schematics TFLASH_VDD, TF_IO, VCC3V3 fixed regulator output which
|
||||
is supplied by VDDIO_AO3V3.
|
||||
|
||||
While here, move the comment name with the signal name in the
|
||||
schematics above the gpio property to make it consistent with other
|
||||
regulators.
|
||||
|
||||
Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
||||
Cc: Jerome Brunet <jbrunet@baylibre.com>
|
||||
Cc: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
||||
Signed-off-by: Anand Moon <linux.amoon@gmail.com>
|
||||
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
|
||||
---
|
||||
arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 13 ++++++++++---
|
||||
1 file changed, 10 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
|
||||
index 5adecdf3b175..2fcd512373a3 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
|
||||
@@ -67,17 +67,19 @@
|
||||
};
|
||||
|
||||
tflash_vdd: regulator-tflash_vdd {
|
||||
- /*
|
||||
- * signal name from schematics: TFLASH_VDD_EN
|
||||
- */
|
||||
compatible = "regulator-fixed";
|
||||
|
||||
regulator-name = "TFLASH_VDD";
|
||||
regulator-min-microvolt = <3300000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
|
||||
+ /*
|
||||
+ * signal name from schematics: TFLASH_VDD_EN
|
||||
+ */
|
||||
gpio = <&gpio GPIOY_12 GPIO_ACTIVE_HIGH>;
|
||||
enable-active-high;
|
||||
+ /* U16 RT9179GB */
|
||||
+ vin-supply = <&vddio_ao3v3>;
|
||||
};
|
||||
|
||||
tf_io: gpio-regulator-tf_io {
|
||||
@@ -95,6 +97,8 @@
|
||||
|
||||
states = <3300000 0>,
|
||||
<1800000 1>;
|
||||
+ /* U12/U13 RT9179GB */
|
||||
+ vin-supply = <&vddio_ao3v3>;
|
||||
};
|
||||
|
||||
vcc1v8: regulator-vcc1v8 {
|
||||
@@ -102,6 +106,9 @@
|
||||
regulator-name = "VCC1V8";
|
||||
regulator-min-microvolt = <1800000>;
|
||||
regulator-max-microvolt = <1800000>;
|
||||
+ regulator-always-on;
|
||||
+ /* U18 RT9179GB */
|
||||
+ vin-supply = <&vddio_ao3v3>;
|
||||
};
|
||||
|
||||
vcc3v3: regulator-vcc3v3 {
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -1,50 +0,0 @@
|
||||
From 0ac0be655dbbedb50dd216a631213daab6e98d88 Mon Sep 17 00:00:00 2001
|
||||
From: Anand Moon <linux.amoon@gmail.com>
|
||||
Date: Tue, 1 Oct 2019 07:39:01 +0000
|
||||
Subject: [PATCH] arm64: dts: meson: odroid-c2: Add missing regulator linked to
|
||||
HDMI supply
|
||||
|
||||
As per schematics HDMI_P5V0 is supplied by P5V0 so add missing link.
|
||||
|
||||
Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
||||
Cc: Jerome Brunet <jbrunet@baylibre.com>
|
||||
Cc: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
||||
Signed-off-by: Anand Moon <linux.amoon@gmail.com>
|
||||
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
|
||||
---
|
||||
arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
|
||||
index 2fcd512373a3..6ded279c40c8 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
|
||||
@@ -66,6 +66,15 @@
|
||||
regulator-always-on;
|
||||
};
|
||||
|
||||
+ hdmi_p5v0: regulator-hdmi_p5v0 {
|
||||
+ compatible = "regulator-fixed";
|
||||
+ regulator-name = "HDMI_P5V0";
|
||||
+ regulator-min-microvolt = <5000000>;
|
||||
+ regulator-max-microvolt = <5000000>;
|
||||
+ /* AP2331SA-7 */
|
||||
+ vin-supply = <&p5v0>;
|
||||
+ };
|
||||
+
|
||||
tflash_vdd: regulator-tflash_vdd {
|
||||
compatible = "regulator-fixed";
|
||||
|
||||
@@ -220,6 +229,7 @@
|
||||
status = "okay";
|
||||
pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
|
||||
pinctrl-names = "default";
|
||||
+ hdmi-supply = <&hdmi_p5v0>;
|
||||
};
|
||||
|
||||
&hdmi_tx_tmds_port {
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -22,7 +22,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/intel/nuc $(BR2_EXTERNAL_HASSOS_PATH)/board/intel/nuc/hassos-hook.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.24"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.35"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="x86_64"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/intel/nuc/kernel.config"
|
||||
BR2_LINUX_KERNEL_LZ4=y
|
||||
|
||||
@ -21,10 +21,10 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/hassos-hook.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.24"
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/hardkernel/linux/archive/40b58dcff55ee1046f6d69953b241ff27b92f749.tar.gz"
|
||||
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/kernel.config"
|
||||
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
|
||||
BR2_LINUX_KERNEL_LZ4=y
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
|
||||
@ -21,10 +21,10 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/hassos-hook.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.24"
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/hardkernel/linux/archive/40b58dcff55ee1046f6d69953b241ff27b92f749.tar.gz"
|
||||
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/kernel.config"
|
||||
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
|
||||
BR2_LINUX_KERNEL_LZ4=y
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
|
||||
@ -22,14 +22,14 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/hassos-hook.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.24"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="exynos5422-odroidxu4"
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/hardkernel/linux/archive/40b58dcff55ee1046f6d69953b241ff27b92f749.tar.gz"
|
||||
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/kernel.config"
|
||||
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-exynos.config"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
|
||||
BR2_LINUX_KERNEL_LZ4=y
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="exynos5422-odroidxu4"
|
||||
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
|
||||
BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
|
||||
BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config"
|
||||
|
||||
@ -23,7 +23,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/intel/ova $(BR2_EXTERNAL_HASSOS_PATH)/board/intel/ova/hassos-hook.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.24"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.35"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="x86_64"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/intel/ova/kernel.config"
|
||||
BR2_LINUX_KERNEL_LZ4=y
|
||||
|
||||
@ -23,9 +23,8 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi0-w $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_GIT=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
|
||||
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="9daf4531948808f4a1913e6767fae6f421fb7896"
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/9daf4531948808f4a1913e6767fae6f421fb7896.tar.gz"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
|
||||
BR2_LINUX_KERNEL_LZ4=y
|
||||
|
||||
@ -23,9 +23,8 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi2 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_GIT=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
|
||||
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="9daf4531948808f4a1913e6767fae6f421fb7896"
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/9daf4531948808f4a1913e6767fae6f421fb7896.tar.gz"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
|
||||
BR2_LINUX_KERNEL_LZ4=y
|
||||
|
||||
@ -23,9 +23,8 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi3-64 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_GIT=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
|
||||
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="9daf4531948808f4a1913e6767fae6f421fb7896"
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/9daf4531948808f4a1913e6767fae6f421fb7896.tar.gz"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
|
||||
BR2_LINUX_KERNEL_LZ4=y
|
||||
|
||||
@ -23,9 +23,8 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi3 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_GIT=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
|
||||
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="9daf4531948808f4a1913e6767fae6f421fb7896"
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/9daf4531948808f4a1913e6767fae6f421fb7896.tar.gz"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
|
||||
BR2_LINUX_KERNEL_LZ4=y
|
||||
|
||||
@ -23,9 +23,8 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi4-64 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_GIT=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
|
||||
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="9daf4531948808f4a1913e6767fae6f421fb7896"
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/9daf4531948808f4a1913e6767fae6f421fb7896.tar.gz"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
|
||||
BR2_LINUX_KERNEL_LZ4=y
|
||||
|
||||
@ -23,9 +23,8 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi4 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_GIT=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
|
||||
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="9daf4531948808f4a1913e6767fae6f421fb7896"
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/9daf4531948808f4a1913e6767fae6f421fb7896.tar.gz"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
|
||||
BR2_LINUX_KERNEL_LZ4=y
|
||||
|
||||
@ -23,9 +23,8 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_GIT=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
|
||||
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="9daf4531948808f4a1913e6767fae6f421fb7896"
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/9daf4531948808f4a1913e6767fae6f421fb7896.tar.gz"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
|
||||
BR2_LINUX_KERNEL_LZ4=y
|
||||
|
||||
@ -24,7 +24,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker $(BR2_EXTERNAL_HASSOS_PATH)/board/asus/hassos-hook.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.32"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.35"
|
||||
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker/kernel.config"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
|
||||
|
||||
@ -28,7 +28,6 @@ CONFIG_EFI_PARTITION=y
|
||||
CONFIG_MSDOS_PARTITION=y
|
||||
|
||||
# CONFIG_LOGO is not set
|
||||
# CONFIG_VIRTUALIZATION is not set
|
||||
# CONFIG_DEBUG_STACK_USAGE is not set
|
||||
# CONFIG_BTRFS_FS is not set
|
||||
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
if [ -z "$1" ]; then
|
||||
echo "Need a version!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
sed -i "s/BAREBOX_CUSTOM_VERSION_VALUE=\".*\"/BAREBOX_CUSTOM_VERSION_VALUE=\"$1\"/g" buildroot-external/configs/*
|
||||
@ -1,10 +0,0 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
if [ -z "$1" ]; then
|
||||
echo "Need a version!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
sed -i "s/CLI_VERSION=\".*\"/CLI_VERSION=\"$1\"/g" buildroot-external/configs/*
|
||||
git commit -m "OS: Update CLI $1" buildroot-external/configs/*
|
||||
16
scripts/update-kernel-odroid.sh
Executable file
16
scripts/update-kernel-odroid.sh
Executable file
@ -0,0 +1,16 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
if [ -z "$1" ]; then
|
||||
echo "Need a commit ID!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -z "$2" ]; then
|
||||
echo "Need a kernel version!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
sed -i "s/BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION=\"https://github.com/hardkernel/linux/.*\"/BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION=\"https://github.com/hardkernel/linux/archive/$1.tar.gz\"/g" buildroot-external/configs/*
|
||||
sed -i "s/| Odroid\(.*\) | .* |/| Odroid\1 | $2 |/g" Documentation/kernel.md
|
||||
git commit -m "Odroid: Update kernel $2 - $1" buildroot-external/configs/* Documentation/kernel.md
|
||||
16
scripts/update-kernel-rpi.sh
Executable file
16
scripts/update-kernel-rpi.sh
Executable file
@ -0,0 +1,16 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
if [ -z "$1" ]; then
|
||||
echo "Need a commit ID!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -z "$2" ]; then
|
||||
echo "Need a kernel version!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
sed -i "s/BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION=\"https://github.com/raspberrypi/linux/.*\"/BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION=\"https://github.com/raspberrypi/linux/archive/$1.tar.gz\"/g" buildroot-external/configs/*
|
||||
sed -i "s/| Raspberry Pi\(.*\) | .* |/| Raspberry Pi\1 | $2 |/g" Documentation/kernel.md
|
||||
git commit -m "RaspberryPi: Update kernel $2 - $1" buildroot-external/configs/* Documentation/kernel.md
|
||||
11
scripts/update-kernel-upstream.sh
Executable file
11
scripts/update-kernel-upstream.sh
Executable file
@ -0,0 +1,11 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
if [ -z "$1" ]; then
|
||||
echo "Need a kernel version!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
sed -i "s/BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE=\".*\"/BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE=\"$1\"/g" buildroot-external/configs/*
|
||||
sed -i "s/| \(Open Virtual Applicance\|Intel NUC\|Tinker Board\) | .* |/| \1 | $1 |/g" Documentation/kernel.md
|
||||
git commit -m "Linux: Update kernel $1" buildroot-external/configs/* Documentation/kernel.md
|
||||
@ -1,10 +0,0 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
if [ -z "$1" ]; then
|
||||
echo "Need a version!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
sed -i "s/BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION=\".*\"/BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION=\"$1\"/g" buildroot-external/configs/rpi*
|
||||
git commit -m "RaspberryPi: Update kernel $1" buildroot-external/configs/*
|
||||
@ -1,11 +0,0 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
if [ -z "$1" ]; then
|
||||
echo "Need a version!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
sed -i "s/SUPERVISOR_VERSION=\".*\"/SUPERVISOR_VERSION=\"$1\"/g" buildroot-external/configs/*
|
||||
git commit -m "OS: Update supervisor $1" buildroot-external/configs/*
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user