korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-23 04:04:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

ARM: soc updates for 6.13

Browse Source 
The SoC specific code updates for 6.13 are fairly minimal. One Broadcom
 SoC model gains automatic configuration for the debug uarg as we have
 on many other machines, the remaining changes are trivial cleanups.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmc+D8IACgkQYKtH/8kJ
 UicuyhAAqR3ps9ukDj4jIVrQthV76rMb6HfEF4gQ4qxIjS3uLp5wfqjxzeTI7bKY
 ntrzU9rAxgMdTuRDVqONCxjgBvtg7pG9kXlbndVhl11RdryEeO/fat99V2mPN6yS
 0t9tR6lxVcz3VRI5qcyCRYLRicDXyeNklsMwEhfSolS1hWbTG0b/qtn8oa+vQ7bs
 U33rnvudrC36Wpy4HU6XIissq1RgleUrGqC6L2M3OLSEOlS8tM4RBA215VaDiWs9
 fP8dYhdMVWmlif9pXi1L1M3uqEE3ahVDwzqg1bSc0LmX7nn4rXGGgu/YGiALuW4t
 KmsoTdcwaPxiQR+WVp3G6EEVxumFpMfX1dGiJ8ZagaI+pbXpjHej6B+xhWCRgjfp
 eTK0YeGjDduEOaaozGys5NdqoGFKPpl+npLD1rQGBtizCJO1x6zINAyuRgNHhyYa
 640Bn77O7Rs+41qao2Nnr4mfbur73d3q+K1qOy4Tx3BL5fQGyz4PwUkT/wG4C++j
 esCBO2lA9opw9ZJzBSFWx6ez0GtEW+kVUf3dNDSXxYawVNBrIoV61xnG7Xcfqz0x
 RFSWTATWKLI34Px6fuorVxVw8xcGdQGgvbvIDbj2aiC8yXIbzeeSs8P9pEsakYD9
 eej8H6eRy/EnOwBC8yJXCHoAA31PqaO+aLI5Vf0p0m0Ibtv/1zQ=
 =lQ3B
 -----END PGP SIGNATURE-----

Merge tag 'soc-arm-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

Pull ARM SoC updates from Arnd Bergmann:
 "The SoC specific code updates for 6.13 are fairly minimal.

  One Broadcom SoC model gains automatic configuration for the debug
  uarg as we have on many other machines, the remaining changes are
  trivial cleanups"

* tag 'soc-arm-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  ARM: imx: Switch to new sys-off handler API
  ARM: bcm: brcmstb: Drop custom init_irq callback
  ARM: bcm: Support BCMBCA debug UART
  ARM: zynq: Remove unused zynq_slcr_init() declaration
  ASoC: samsung: Remove obsoleted declaration for s3c64xx_ac97_setup_gpio
  ARM: samsung: Remove obsoleted declaration for s3c_hwmon_set_platdata
This commit is contained in:
Linus Torvalds 2024-11-20 15:47:22 -08:00
commit 43fb83c17b
8 changed files with 43 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/Kconfig.debug
View File

@ -242,6 +242,10 @@ choice
depends on ARCH_BCM_5301X || ARCH_BCM_NSP
select DEBUG_UART_8250
config DEBUG_BCMBCA
bool "Kernel low-level debugging on BCMBCA UART0"
depends on ARCH_BCMBCA
config DEBUG_BCM_HR2
bool "Kernel low-level debugging on Hurricane 2 UART2"
depends on ARCH_BCM_HR2
@ -1526,7 +1530,7 @@ config DEBUG_LL_INCLUDE
default "debug/vf.S" if DEBUG_VF_UART
default "debug/vt8500.S" if DEBUG_VT8500_UART0
default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1
default "debug/bcm63xx.S" if DEBUG_BCM63XX_UART
default "debug/bcm63xx.S" if DEBUG_BCM63XX_UART || DEBUG_BCMBCA
default "debug/digicolor.S" if DEBUG_DIGICOLOR_UA0
default "debug/brcmstb.S" if DEBUG_BRCMSTB_UART
default "mach/debug-macro.S"
@ -1640,6 +1644,7 @@ config DEBUG_UART_PHYS
default 0xfe531000 if DEBUG_STIH41X_SBC_ASC1
default 0xfed32000 if DEBUG_STIH41X_ASC2
default 0xff690000 if DEBUG_RK32_UART2
default 0xff800640 if DEBUG_BCMBCA
default 0xffc02000 if DEBUG_SOCFPGA_UART0
default 0xffc02100 if DEBUG_SOCFPGA_ARRIA10_UART1
default 0xffc03000 if DEBUG_SOCFPGA_CYCLONE5_UART1
@ -1664,7 +1669,7 @@ config DEBUG_UART_PHYS
DEBUG_RMOBILE_SCIFA0 || DEBUG_RMOBILE_SCIFA1 || \
DEBUG_RMOBILE_SCIFA4 || \
DEBUG_S3C64XX_UART || \
DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \
DEBUG_BCM63XX_UART || DEBUG_BCMBCA || DEBUG_ASM9260_UART || \
DEBUG_DIGICOLOR_UA0 || \
DEBUG_AT91_UART || DEBUG_STM32_UART || \
DEBUG_STIH41X_ASC2 || DEBUG_STIH41X_SBC_ASC1 || \
@ -1734,6 +1739,7 @@ config DEBUG_UART_VIRT
default 0xfe018000 if DEBUG_MMP_UART3
default 0xfe100000 if DEBUG_IMX23_UART || DEBUG_IMX28_UART
default 0xfe300000 if DEBUG_BCM_KONA_UART
default 0xfe300640 if DEBUG_BCMBCA
default 0xfeb00000 if DEBUG_HI3620_UART || DEBUG_HIX5HD2_UART
default 0xfeb24000 if DEBUG_RK3X_UART0
default 0xfeb26000 if DEBUG_RK3X_UART1
@ -1765,7 +1771,7 @@ config DEBUG_UART_VIRT
DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_MESON_UARTAO || \
DEBUG_QCOM_UARTDM || \
DEBUG_S3C64XX_UART || \
DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \
DEBUG_BCM63XX_UART || DEBUG_BCMBCA || DEBUG_ASM9260_UART || \
DEBUG_DIGICOLOR_UA0 || \
DEBUG_AT91_UART || DEBUG_STM32_UART || \
DEBUG_STIH41X_ASC2 || DEBUG_STIH41X_SBC_ASC1 || \

1
arch/arm/mach-bcm/Makefile
View File

@ -58,5 +58,6 @@ endif
# BCMBCA
ifeq ($(CONFIG_ARCH_BCMBCA),y)
obj-$(CONFIG_DEBUG_BCMBCA) += board_bcmbca.o
obj-$(CONFIG_SMP) += bcm63xx_smp.o bcm63xx_pmb.o
endif

31
arch/arm/mach-bcm/board_bcmbca.c Normal file
View File

@ -0,0 +1,31 @@
// SPDX-License-Identifier: GPL-2.0-only
// Copyright (C) 2024 Linus Walleij <linus.walleij@linaro.org>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
/* This is needed for LL-debug/earlyprintk/debug-macro.S */
static struct map_desc bcmbca_io_desc[] __initdata = {
{
.virtual = CONFIG_DEBUG_UART_VIRT,
.pfn = __phys_to_pfn(CONFIG_DEBUG_UART_PHYS),
.length = SZ_4K,
.type = MT_DEVICE,
},
};
static void __init bcmbca_map_io(void)
{
iotable_init(bcmbca_io_desc, ARRAY_SIZE(bcmbca_io_desc));
}
static const char * const bcmbca_dt_compat[] = {
/* TODO: Add other BCMBCA SoCs here to get debug UART support */
"brcm,bcm6846",
NULL,
};
DT_MACHINE_START(BCMBCA_DT, "BCMBCA Broadband Access Processors")
.map_io = bcmbca_map_io,
.dt_compat = bcmbca_dt_compat,
MACHINE_END

6
arch/arm/mach-bcm/brcmstb.c
View File

@ -23,11 +23,6 @@ u32 brcmstb_uart_config[3] = {
0,
};
static void __init brcmstb_init_irq(void)
{
irqchip_init();
}
static const char *const brcmstb_match[] __initconst = {
"brcm,bcm7445",
"brcm,brcmstb",
@ -36,5 +31,4 @@ static const char *const brcmstb_match[] __initconst = {
DT_MACHINE_START(BRCMSTB, "Broadcom STB (Flattened Device Tree)")
.dt_compat = brcmstb_match,
.init_irq = brcmstb_init_irq,
MACHINE_END

6
arch/arm/mach-imx/pm-imx6.c
View File

@ -634,13 +634,11 @@ static void imx6_pm_stby_poweroff(void)
static int imx6_pm_stby_poweroff_probe(void)
{
if (pm_power_off) {
pr_warn("%s: pm_power_off already claimed %p %ps!\n",
__func__, pm_power_off, pm_power_off);
if (register_platform_power_off(imx6_pm_stby_poweroff)) {
pr_warn("%s: platform power off already claimed!\n", __func__);
return -EBUSY;
}
pm_power_off = imx6_pm_stby_poweroff;
return 0;
}

1
arch/arm/mach-zynq/common.h
View File

@ -9,7 +9,6 @@
#ifndef __MACH_ZYNQ_COMMON_H__
#define __MACH_ZYNQ_COMMON_H__
extern int zynq_slcr_init(void);
extern int zynq_early_slcr_init(void);
extern void zynq_slcr_cpu_stop(int cpu);
extern void zynq_slcr_cpu_start(int cpu);

2
include/linux/platform_data/asoc-s3c.h
View File

@ -13,8 +13,6 @@
#include <linux/dmaengine.h>
extern void s3c64xx_ac97_setup_gpio(int);
struct samsung_i2s_type {
/* If the Primary DAI has 5.1 Channels */
#define QUIRK_PRI_6CHAN (1 << 0)

10
include/linux/platform_data/hwmon-s3c.h
View File

@ -33,14 +33,4 @@ struct s3c_hwmon_pdata {
struct s3c_hwmon_chcfg *in[8];
};
/**
* s3c_hwmon_set_platdata - Set platform data for S3C HWMON device
* @pd: Platform data to register to device.
*
* Register the given platform data for use with the S3C HWMON device.
* The call will copy the platform data, so the board definitions can
* make the structure itself __initdata.
*/
extern void __init s3c_hwmon_set_platdata(struct s3c_hwmon_pdata *pd);
#endif /* __HWMON_S3C_H__ */