Merge tag 'soc-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC updates from Arnd Bergmann: "These are all minor bug fixes and cleanups to code in arch/arm and arch/arm64 that is specific to one SoC, updating Kconfig symbols, the MAINTAINERS file, and removing some dead code" * tag 'soc-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: arm64: exynos: Enable Exynos Multi-Core Timer driver ARM: ixp4xx: remove unused header file pata_ixp4xx_cf.h ARM: ixp4xx: remove dead configs CPU_IXP43X and CPU_IXP46X MAINTAINERS: Add Florian as BCM5301X and BCM53573 maintainer ARM: samsung: Remove HAVE_S3C2410_I2C and use direct dependencies ARM: imx: rename DEBUG_IMX21_IMX27_UART to DEBUG_IMX27_UART ARM: imx: remove dead left-over from i.MX{27,31,35} removal ARM: s3c: add one more "fallthrough" statement in Jive ARM: s3c: include header for prototype of s3c2410_modify_misccr ARM: shmobile: rcar-gen2: Add missing of_node_put()
This commit is contained in:
@ -3636,6 +3636,7 @@ F: drivers/net/ethernet/broadcom/bcm4908_enet.*
|
|||||||
F: drivers/net/ethernet/broadcom/unimac.h
|
F: drivers/net/ethernet/broadcom/unimac.h
|
||||||
|
|
||||||
BROADCOM BCM5301X ARM ARCHITECTURE
|
BROADCOM BCM5301X ARM ARCHITECTURE
|
||||||
|
M: Florian Fainelli <f.fainelli@gmail.com>
|
||||||
M: Hauke Mehrtens <hauke@hauke-m.de>
|
M: Hauke Mehrtens <hauke@hauke-m.de>
|
||||||
M: Rafał Miłecki <zajec5@gmail.com>
|
M: Rafał Miłecki <zajec5@gmail.com>
|
||||||
M: bcm-kernel-feedback-list@broadcom.com
|
M: bcm-kernel-feedback-list@broadcom.com
|
||||||
@ -3647,6 +3648,7 @@ F: arch/arm/boot/dts/bcm953012*
|
|||||||
F: arch/arm/mach-bcm/bcm_5301x.c
|
F: arch/arm/mach-bcm/bcm_5301x.c
|
||||||
|
|
||||||
BROADCOM BCM53573 ARM ARCHITECTURE
|
BROADCOM BCM53573 ARM ARCHITECTURE
|
||||||
|
M: Florian Fainelli <f.fainelli@gmail.com>
|
||||||
M: Rafał Miłecki <rafal@milecki.pl>
|
M: Rafał Miłecki <rafal@milecki.pl>
|
||||||
L: bcm-kernel-feedback-list@broadcom.com
|
L: bcm-kernel-feedback-list@broadcom.com
|
||||||
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
||||||
|
@ -479,7 +479,6 @@ config ARCH_S3C24XX
|
|||||||
select GPIO_SAMSUNG
|
select GPIO_SAMSUNG
|
||||||
select GPIOLIB
|
select GPIOLIB
|
||||||
select GENERIC_IRQ_MULTI_HANDLER
|
select GENERIC_IRQ_MULTI_HANDLER
|
||||||
select HAVE_S3C2410_I2C if I2C
|
|
||||||
select NEED_MACH_IO_H
|
select NEED_MACH_IO_H
|
||||||
select S3C2410_WATCHDOG
|
select S3C2410_WATCHDOG
|
||||||
select SAMSUNG_ATAGS
|
select SAMSUNG_ATAGS
|
||||||
|
@ -410,12 +410,12 @@ choice
|
|||||||
Say Y here if you want kernel low-level debugging support
|
Say Y here if you want kernel low-level debugging support
|
||||||
on i.MX25.
|
on i.MX25.
|
||||||
|
|
||||||
config DEBUG_IMX21_IMX27_UART
|
config DEBUG_IMX27_UART
|
||||||
bool "i.MX21 and i.MX27 Debug UART"
|
bool "i.MX27 Debug UART"
|
||||||
depends on SOC_IMX21 || SOC_IMX27
|
depends on SOC_IMX27
|
||||||
help
|
help
|
||||||
Say Y here if you want kernel low-level debugging support
|
Say Y here if you want kernel low-level debugging support
|
||||||
on i.MX21 or i.MX27.
|
on i.MX27.
|
||||||
|
|
||||||
config DEBUG_IMX28_UART
|
config DEBUG_IMX28_UART
|
||||||
bool "i.MX28 Debug UART"
|
bool "i.MX28 Debug UART"
|
||||||
@ -1481,7 +1481,7 @@ config DEBUG_IMX_UART_PORT
|
|||||||
int "i.MX Debug UART Port Selection"
|
int "i.MX Debug UART Port Selection"
|
||||||
depends on DEBUG_IMX1_UART || \
|
depends on DEBUG_IMX1_UART || \
|
||||||
DEBUG_IMX25_UART || \
|
DEBUG_IMX25_UART || \
|
||||||
DEBUG_IMX21_IMX27_UART || \
|
DEBUG_IMX27_UART || \
|
||||||
DEBUG_IMX31_UART || \
|
DEBUG_IMX31_UART || \
|
||||||
DEBUG_IMX35_UART || \
|
DEBUG_IMX35_UART || \
|
||||||
DEBUG_IMX50_UART || \
|
DEBUG_IMX50_UART || \
|
||||||
@ -1540,12 +1540,12 @@ config DEBUG_LL_INCLUDE
|
|||||||
default "debug/icedcc.S" if DEBUG_ICEDCC
|
default "debug/icedcc.S" if DEBUG_ICEDCC
|
||||||
default "debug/imx.S" if DEBUG_IMX1_UART || \
|
default "debug/imx.S" if DEBUG_IMX1_UART || \
|
||||||
DEBUG_IMX25_UART || \
|
DEBUG_IMX25_UART || \
|
||||||
DEBUG_IMX21_IMX27_UART || \
|
DEBUG_IMX27_UART || \
|
||||||
DEBUG_IMX31_UART || \
|
DEBUG_IMX31_UART || \
|
||||||
DEBUG_IMX35_UART || \
|
DEBUG_IMX35_UART || \
|
||||||
DEBUG_IMX50_UART || \
|
DEBUG_IMX50_UART || \
|
||||||
DEBUG_IMX51_UART || \
|
DEBUG_IMX51_UART || \
|
||||||
DEBUG_IMX53_UART ||\
|
DEBUG_IMX53_UART || \
|
||||||
DEBUG_IMX6Q_UART || \
|
DEBUG_IMX6Q_UART || \
|
||||||
DEBUG_IMX6SL_UART || \
|
DEBUG_IMX6SL_UART || \
|
||||||
DEBUG_IMX6SX_UART || \
|
DEBUG_IMX6SX_UART || \
|
||||||
|
@ -11,13 +11,6 @@
|
|||||||
#define IMX1_UART_BASE_ADDR(n) IMX1_UART##n##_BASE_ADDR
|
#define IMX1_UART_BASE_ADDR(n) IMX1_UART##n##_BASE_ADDR
|
||||||
#define IMX1_UART_BASE(n) IMX1_UART_BASE_ADDR(n)
|
#define IMX1_UART_BASE(n) IMX1_UART_BASE_ADDR(n)
|
||||||
|
|
||||||
#define IMX21_UART1_BASE_ADDR 0x1000a000
|
|
||||||
#define IMX21_UART2_BASE_ADDR 0x1000b000
|
|
||||||
#define IMX21_UART3_BASE_ADDR 0x1000c000
|
|
||||||
#define IMX21_UART4_BASE_ADDR 0x1000d000
|
|
||||||
#define IMX21_UART_BASE_ADDR(n) IMX21_UART##n##_BASE_ADDR
|
|
||||||
#define IMX21_UART_BASE(n) IMX21_UART_BASE_ADDR(n)
|
|
||||||
|
|
||||||
#define IMX25_UART1_BASE_ADDR 0x43f90000
|
#define IMX25_UART1_BASE_ADDR 0x43f90000
|
||||||
#define IMX25_UART2_BASE_ADDR 0x43f94000
|
#define IMX25_UART2_BASE_ADDR 0x43f94000
|
||||||
#define IMX25_UART3_BASE_ADDR 0x5000c000
|
#define IMX25_UART3_BASE_ADDR 0x5000c000
|
||||||
@ -26,6 +19,13 @@
|
|||||||
#define IMX25_UART_BASE_ADDR(n) IMX25_UART##n##_BASE_ADDR
|
#define IMX25_UART_BASE_ADDR(n) IMX25_UART##n##_BASE_ADDR
|
||||||
#define IMX25_UART_BASE(n) IMX25_UART_BASE_ADDR(n)
|
#define IMX25_UART_BASE(n) IMX25_UART_BASE_ADDR(n)
|
||||||
|
|
||||||
|
#define IMX27_UART1_BASE_ADDR 0x1000a000
|
||||||
|
#define IMX27_UART2_BASE_ADDR 0x1000b000
|
||||||
|
#define IMX27_UART3_BASE_ADDR 0x1000c000
|
||||||
|
#define IMX27_UART4_BASE_ADDR 0x1000d000
|
||||||
|
#define IMX27_UART_BASE_ADDR(n) IMX27_UART##n##_BASE_ADDR
|
||||||
|
#define IMX27_UART_BASE(n) IMX27_UART_BASE_ADDR(n)
|
||||||
|
|
||||||
#define IMX31_UART1_BASE_ADDR 0x43f90000
|
#define IMX31_UART1_BASE_ADDR 0x43f90000
|
||||||
#define IMX31_UART2_BASE_ADDR 0x43f94000
|
#define IMX31_UART2_BASE_ADDR 0x43f94000
|
||||||
#define IMX31_UART3_BASE_ADDR 0x5000c000
|
#define IMX31_UART3_BASE_ADDR 0x5000c000
|
||||||
@ -112,10 +112,10 @@
|
|||||||
|
|
||||||
#ifdef CONFIG_DEBUG_IMX1_UART
|
#ifdef CONFIG_DEBUG_IMX1_UART
|
||||||
#define UART_PADDR IMX_DEBUG_UART_BASE(IMX1)
|
#define UART_PADDR IMX_DEBUG_UART_BASE(IMX1)
|
||||||
#elif defined(CONFIG_DEBUG_IMX21_IMX27_UART)
|
|
||||||
#define UART_PADDR IMX_DEBUG_UART_BASE(IMX21)
|
|
||||||
#elif defined(CONFIG_DEBUG_IMX25_UART)
|
#elif defined(CONFIG_DEBUG_IMX25_UART)
|
||||||
#define UART_PADDR IMX_DEBUG_UART_BASE(IMX25)
|
#define UART_PADDR IMX_DEBUG_UART_BASE(IMX25)
|
||||||
|
#elif defined(CONFIG_DEBUG_IMX27_UART)
|
||||||
|
#define UART_PADDR IMX_DEBUG_UART_BASE(IMX27)
|
||||||
#elif defined(CONFIG_DEBUG_IMX31_UART)
|
#elif defined(CONFIG_DEBUG_IMX31_UART)
|
||||||
#define UART_PADDR IMX_DEBUG_UART_BASE(IMX31)
|
#define UART_PADDR IMX_DEBUG_UART_BASE(IMX31)
|
||||||
#elif defined(CONFIG_DEBUG_IMX35_UART)
|
#elif defined(CONFIG_DEBUG_IMX35_UART)
|
||||||
|
@ -20,7 +20,6 @@ menuconfig ARCH_EXYNOS
|
|||||||
select GPIOLIB
|
select GPIOLIB
|
||||||
select HAVE_ARM_ARCH_TIMER if ARCH_EXYNOS5
|
select HAVE_ARM_ARCH_TIMER if ARCH_EXYNOS5
|
||||||
select HAVE_ARM_SCU if SMP
|
select HAVE_ARM_SCU if SMP
|
||||||
select HAVE_S3C2410_I2C if I2C
|
|
||||||
select PINCTRL
|
select PINCTRL
|
||||||
select PINCTRL_EXYNOS
|
select PINCTRL_EXYNOS
|
||||||
select PM_GENERIC_DOMAINS if PM
|
select PM_GENERIC_DOMAINS if PM
|
||||||
|
@ -21,18 +21,6 @@ config MXC_TZIC
|
|||||||
config MXC_AVIC
|
config MXC_AVIC
|
||||||
bool
|
bool
|
||||||
|
|
||||||
config MXC_DEBUG_BOARD
|
|
||||||
bool "Enable MXC debug board(for 3-stack)"
|
|
||||||
depends on MACH_MX27_3DS || MACH_MX31_3DS || MACH_MX35_3DS
|
|
||||||
help
|
|
||||||
The debug board is an integral part of the MXC 3-stack(PDK)
|
|
||||||
platforms, it can be attached or removed from the peripheral
|
|
||||||
board. On debug board, several debug devices(ethernet, UART,
|
|
||||||
buttons, LEDs and JTAG) are implemented. Between the MCU and
|
|
||||||
these devices, a CPLD is added as a bridge which performs
|
|
||||||
data/address de-multiplexing and decode, signal level shift,
|
|
||||||
interrupt control and various board functions.
|
|
||||||
|
|
||||||
config HAVE_IMX_ANATOP
|
config HAVE_IMX_ANATOP
|
||||||
bool
|
bool
|
||||||
|
|
||||||
|
@ -14,8 +14,6 @@ obj-$(CONFIG_SOC_IMX5) += cpu-imx5.o $(imx5-pm-y)
|
|||||||
obj-$(CONFIG_MXC_TZIC) += tzic.o
|
obj-$(CONFIG_MXC_TZIC) += tzic.o
|
||||||
obj-$(CONFIG_MXC_AVIC) += avic.o
|
obj-$(CONFIG_MXC_AVIC) += avic.o
|
||||||
|
|
||||||
obj-$(CONFIG_MXC_DEBUG_BOARD) += 3ds_debugboard.o
|
|
||||||
|
|
||||||
ifeq ($(CONFIG_CPU_IDLE),y)
|
ifeq ($(CONFIG_CPU_IDLE),y)
|
||||||
obj-$(CONFIG_SOC_IMX5) += cpuidle-imx5.o
|
obj-$(CONFIG_SOC_IMX5) += cpuidle-imx5.o
|
||||||
obj-$(CONFIG_SOC_IMX6Q) += cpuidle-imx6q.o
|
obj-$(CONFIG_SOC_IMX6Q) += cpuidle-imx6q.o
|
||||||
|
@ -39,19 +39,6 @@ config ARCH_PRPMC1100
|
|||||||
PrPCM1100 Processor Mezanine Module. For more information on
|
PrPCM1100 Processor Mezanine Module. For more information on
|
||||||
this platform, see <file:Documentation/arm/ixp4xx.rst>.
|
this platform, see <file:Documentation/arm/ixp4xx.rst>.
|
||||||
|
|
||||||
#
|
|
||||||
# Certain registers and IRQs are only enabled if supporting IXP465 CPUs
|
|
||||||
#
|
|
||||||
config CPU_IXP46X
|
|
||||||
bool
|
|
||||||
depends on MACH_IXDP465
|
|
||||||
default y
|
|
||||||
|
|
||||||
config CPU_IXP43X
|
|
||||||
bool
|
|
||||||
depends on MACH_KIXRP435
|
|
||||||
default y
|
|
||||||
|
|
||||||
comment "IXP4xx Options"
|
comment "IXP4xx Options"
|
||||||
|
|
||||||
config IXP4XX_PCI_LEGACY
|
config IXP4XX_PCI_LEGACY
|
||||||
|
@ -12,7 +12,6 @@ menuconfig ARCH_S3C64XX
|
|||||||
select COMMON_CLK_SAMSUNG
|
select COMMON_CLK_SAMSUNG
|
||||||
select GPIO_SAMSUNG if ATAGS
|
select GPIO_SAMSUNG if ATAGS
|
||||||
select GPIOLIB
|
select GPIOLIB
|
||||||
select HAVE_S3C2410_I2C if I2C
|
|
||||||
select HAVE_TCM
|
select HAVE_TCM
|
||||||
select PLAT_SAMSUNG
|
select PLAT_SAMSUNG
|
||||||
select PM_GENERIC_DOMAINS if PM
|
select PM_GENERIC_DOMAINS if PM
|
||||||
|
@ -35,6 +35,7 @@
|
|||||||
#include "gpio-core.h"
|
#include "gpio-core.h"
|
||||||
#include "gpio-cfg.h"
|
#include "gpio-cfg.h"
|
||||||
#include "gpio-cfg-helpers.h"
|
#include "gpio-cfg-helpers.h"
|
||||||
|
#include "hardware-s3c24xx.h"
|
||||||
#include "pm.h"
|
#include "pm.h"
|
||||||
|
|
||||||
int samsung_gpio_setpull_updown(struct samsung_gpio_chip *chip,
|
int samsung_gpio_setpull_updown(struct samsung_gpio_chip *chip,
|
||||||
|
@ -247,6 +247,7 @@ static int __init jive_mtdset(char *options)
|
|||||||
case 1:
|
case 1:
|
||||||
nand->nr_partitions = ARRAY_SIZE(jive_imageB_nand_part);
|
nand->nr_partitions = ARRAY_SIZE(jive_imageB_nand_part);
|
||||||
nand->partitions = jive_imageB_nand_part;
|
nand->partitions = jive_imageB_nand_part;
|
||||||
|
break;
|
||||||
case 0:
|
case 0:
|
||||||
/* this is already setup in the nand info */
|
/* this is already setup in the nand info */
|
||||||
break;
|
break;
|
||||||
|
@ -12,7 +12,6 @@ config ARCH_S5PV210
|
|||||||
select CLKSRC_SAMSUNG_PWM
|
select CLKSRC_SAMSUNG_PWM
|
||||||
select COMMON_CLK_SAMSUNG
|
select COMMON_CLK_SAMSUNG
|
||||||
select GPIOLIB
|
select GPIOLIB
|
||||||
select HAVE_S3C2410_I2C if I2C
|
|
||||||
select PINCTRL
|
select PINCTRL
|
||||||
select PINCTRL_EXYNOS
|
select PINCTRL_EXYNOS
|
||||||
select SOC_SAMSUNG
|
select SOC_SAMSUNG
|
||||||
|
@ -154,8 +154,10 @@ static int __init rcar_gen2_regulator_quirk(void)
|
|||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
for_each_matching_node_and_match(np, rcar_gen2_quirk_match, &id) {
|
for_each_matching_node_and_match(np, rcar_gen2_quirk_match, &id) {
|
||||||
if (!of_device_is_available(np))
|
if (!of_device_is_available(np)) {
|
||||||
|
of_node_put(np);
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
ret = of_property_read_u32(np, "reg", &addr);
|
ret = of_property_read_u32(np, "reg", &addr);
|
||||||
if (ret) /* Skip invalid entry and continue */
|
if (ret) /* Skip invalid entry and continue */
|
||||||
@ -164,6 +166,7 @@ static int __init rcar_gen2_regulator_quirk(void)
|
|||||||
quirk = kzalloc(sizeof(*quirk), GFP_KERNEL);
|
quirk = kzalloc(sizeof(*quirk), GFP_KERNEL);
|
||||||
if (!quirk) {
|
if (!quirk) {
|
||||||
ret = -ENOMEM;
|
ret = -ENOMEM;
|
||||||
|
of_node_put(np);
|
||||||
goto err_mem;
|
goto err_mem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -89,6 +89,7 @@ config ARCH_BRCMSTB
|
|||||||
config ARCH_EXYNOS
|
config ARCH_EXYNOS
|
||||||
bool "ARMv8 based Samsung Exynos SoC family"
|
bool "ARMv8 based Samsung Exynos SoC family"
|
||||||
select COMMON_CLK_SAMSUNG
|
select COMMON_CLK_SAMSUNG
|
||||||
|
select CLKSRC_EXYNOS_MCT
|
||||||
select EXYNOS_PM_DOMAINS if PM_GENERIC_DOMAINS
|
select EXYNOS_PM_DOMAINS if PM_GENERIC_DOMAINS
|
||||||
select EXYNOS_PMU
|
select EXYNOS_PMU
|
||||||
select PINCTRL
|
select PINCTRL
|
||||||
|
@ -963,16 +963,10 @@ config I2C_RK3X
|
|||||||
This driver can also be built as a module. If so, the module will
|
This driver can also be built as a module. If so, the module will
|
||||||
be called i2c-rk3x.
|
be called i2c-rk3x.
|
||||||
|
|
||||||
config HAVE_S3C2410_I2C
|
|
||||||
bool
|
|
||||||
help
|
|
||||||
This will include I2C support for Samsung SoCs. If you want to
|
|
||||||
include I2C support for any machine, kindly select this in the
|
|
||||||
respective Kconfig file.
|
|
||||||
|
|
||||||
config I2C_S3C2410
|
config I2C_S3C2410
|
||||||
tristate "S3C/Exynos I2C Driver"
|
tristate "S3C/Exynos I2C Driver"
|
||||||
depends on HAVE_S3C2410_I2C || COMPILE_TEST
|
depends on ARCH_EXYNOS || ARCH_S3C24XX || ARCH_S3C64XX || \
|
||||||
|
ARCH_S5PV210 || COMPILE_TEST
|
||||||
help
|
help
|
||||||
Say Y here to include support for I2C controller in the
|
Say Y here to include support for I2C controller in the
|
||||||
Samsung SoCs (S3C, S5Pv210, Exynos).
|
Samsung SoCs (S3C, S5Pv210, Exynos).
|
||||||
|
@ -1,21 +0,0 @@
|
|||||||
/* SPDX-License-Identifier: GPL-2.0 */
|
|
||||||
#ifndef __PLATFORM_DATA_PATA_IXP4XX_H
|
|
||||||
#define __PLATFORM_DATA_PATA_IXP4XX_H
|
|
||||||
|
|
||||||
#include <linux/types.h>
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This structure provide a means for the board setup code
|
|
||||||
* to give information to th pata_ixp4xx driver. It is
|
|
||||||
* passed as platform_data.
|
|
||||||
*/
|
|
||||||
struct ixp4xx_pata_data {
|
|
||||||
volatile u32 *cs0_cfg;
|
|
||||||
volatile u32 *cs1_cfg;
|
|
||||||
unsigned long cs0_bits;
|
|
||||||
unsigned long cs1_bits;
|
|
||||||
void __iomem *cmd;
|
|
||||||
void __iomem *ctl;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif
|
|
Reference in New Issue
Block a user