Skip to content

Commit 5bb575b

Browse files
torvaldstorvalds
committed
Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC fixes from Olof Johansson: "Here's the first batch of fixes for this release cycle. Main diffstat here is the re-deletion of netx. I messed up and most likely didn't remove the files from the index when I test-merged this and saw conflicts, and from there on out 'git rerere' remembered the mistake and I missed checking it. Here it's done again as expected. Besides that: - A defconfig refresh + enabling of new drivers for u8500 - i.MX fixlets for i2c/SAI/pinmux - sleep.S build fix for Davinci - Broadcom devicetree build/warning fix" * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: ARM: defconfig: u8500: Add new drivers ARM: defconfig: u8500: Refresh defconfig ARM: dts: bcm: bcm47094: add missing #cells for mdio-bus-mux ARM: davinci: fix sleep.S build error on ARMv4 arm64: dts: imx8mq: fix SAI compatible arm64: dts: imx8mm: Correct SAI3 RXC/TXFS pin's mux option #1 ARM: dts: imx6ul: fix clock frequency property name of I2C buses ARM: Delete netx a second time ARM: dts: imx7ulp: Fix usb-phy unit address format
2 parents a9815a4 + 7bd9d46 commit 5bb575b

31 files changed

+33
-1886
lines changed

‎arch/arm/Kconfig.debug

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1535,7 +1535,6 @@ config DEBUG_LL_INCLUDE
15351535
DEBUG_IMX7D_UART
15361536
default "debug/ks8695.S" if DEBUG_KS8695_UART
15371537
default "debug/msm.S" if DEBUG_QCOM_UARTDM
1538-
default "debug/netx.S" if DEBUG_NETX_UART
15391538
default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART
15401539
default "debug/renesas-scif.S" if DEBUG_R7S72100_SCIF2
15411540
default "debug/renesas-scif.S" if DEBUG_RCAR_GEN1_SCIF0
@@ -1575,7 +1574,6 @@ config DEBUG_UART_8250
15751574

15761575
config DEBUG_UART_PHYS
15771576
hex "Physical base address of debug UART"
1578-
default 0x00100a00 if DEBUG_NETX_UART
15791577
default 0x01c20000 if DEBUG_DAVINCI_DMx_UART0
15801578
default 0x01c28000 if DEBUG_SUNXI_UART0
15811579
default 0x01c28400 if DEBUG_SUNXI_UART1
@@ -1700,7 +1698,6 @@ config DEBUG_UART_PHYS
17001698
DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
17011699
DEBUG_LL_UART_EFM32 || \
17021700
DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_MESON_UARTAO || \
1703-
DEBUG_NETX_UART || \
17041701
DEBUG_QCOM_UARTDM || DEBUG_R7S72100_SCIF2 || \
17051702
DEBUG_RCAR_GEN1_SCIF0 || DEBUG_RCAR_GEN1_SCIF2 || \
17061703
DEBUG_RCAR_GEN2_SCIF0 || DEBUG_RCAR_GEN2_SCIF1 || \
@@ -1717,7 +1714,6 @@ config DEBUG_UART_VIRT
17171714
default 0xc881f000 if DEBUG_RV1108_UART2
17181715
default 0xc8821000 if DEBUG_RV1108_UART1
17191716
default 0xc8912000 if DEBUG_RV1108_UART0
1720-
default 0xe0000a00 if DEBUG_NETX_UART
17211717
default 0xe0010fe0 if ARCH_RPC
17221718
default 0xf0000be0 if ARCH_EBSA110
17231719
default 0xf0010000 if DEBUG_ASM9260_UART
@@ -1822,7 +1818,6 @@ config DEBUG_UART_VIRT
18221818
default DEBUG_UART_PHYS if !MMU
18231819
depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
18241820
DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_MESON_UARTAO || \
1825-
DEBUG_NETX_UART || \
18261821
DEBUG_QCOM_UARTDM || DEBUG_S3C24XX_UART || \
18271822
DEBUG_S3C64XX_UART || \
18281823
DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \

‎arch/arm/boot/dts/bcm47094-linksys-panamera.dts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,9 @@
124124
};
125125

126126
mdio-bus-mux {
127+
#address-cells = <1>;
128+
#size-cells = <0>;
129+
127130
/* BIT(9) = 1 => external mdio */
128131
mdio_ext: mdio@200 {
129132
reg = <0x200>;

‎arch/arm/boot/dts/imx6ul-14x14-evk.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
};
113113

114114
&i2c2 {
115-
clock_frequency = <100000>;
115+
clock-frequency = <100000>;
116116
pinctrl-names = "default";
117117
pinctrl-0 = <&pinctrl_i2c2>;
118118
status = "okay";

‎arch/arm/boot/dts/imx6ul-geam.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
};
157157

158158
&i2c2 {
159-
clock_frequency = <100000>;
159+
clock-frequency = <100000>;
160160
pinctrl-names = "default";
161161
pinctrl-0 = <&pinctrl_i2c2>;
162162
status = "okay";

‎arch/arm/boot/dts/imx6ul-isiot.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
};
149149

150150
&i2c2 {
151-
clock_frequency = <100000>;
151+
clock-frequency = <100000>;
152152
pinctrl-names = "default";
153153
pinctrl-0 = <&pinctrl_i2c2>;
154154
status = "okay";

‎arch/arm/boot/dts/imx6ul-pico-hobbit.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
};
4444

4545
&i2c2 {
46-
clock_frequency = <100000>;
46+
clock-frequency = <100000>;
4747
pinctrl-names = "default";
4848
pinctrl-0 = <&pinctrl_i2c2>;
4949
status = "okay";

‎arch/arm/boot/dts/imx6ul-pico-pi.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
};
4444

4545
&i2c2 {
46-
clock_frequency = <100000>;
46+
clock-frequency = <100000>;
4747
pinctrl-names = "default";
4848
pinctrl-0 = <&pinctrl_i2c2>;
4949
status = "okay";
@@ -58,7 +58,7 @@
5858
};
5959

6060
&i2c3 {
61-
clock_frequency = <100000>;
61+
clock-frequency = <100000>;
6262
pinctrl-names = "default";
6363
pinctrl-0 = <&pinctrl_i2c3>;
6464
status = "okay";

‎arch/arm/boot/dts/imx7ulp.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
reg = <0x40330200 0x200>;
187187
};
188188

189-
usbphy1: usb-phy@0x40350000 {
189+
usbphy1: usb-phy@40350000 {
190190
compatible = "fsl,imx7ulp-usbphy", "fsl,imx6ul-usbphy";
191191
reg = <0x40350000 0x1000>;
192192
interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;

‎arch/arm/configs/u8500_defconfig

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,9 @@ CONFIG_NO_HZ_IDLE=y
44
CONFIG_HIGH_RES_TIMERS=y
55
CONFIG_BLK_DEV_INITRD=y
66
CONFIG_KALLSYMS_ALL=y
7-
CONFIG_MODULES=y
8-
CONFIG_MODULE_UNLOAD=y
9-
# CONFIG_BLK_DEV_BSG is not set
10-
CONFIG_PARTITION_ADVANCED=y
117
CONFIG_ARCH_U8500=y
12-
CONFIG_MACH_HREFV60=y
13-
CONFIG_MACH_SNOWBALL=y
148
CONFIG_SMP=y
159
CONFIG_NR_CPUS=2
16-
CONFIG_PREEMPT=y
17-
CONFIG_AEABI=y
1810
CONFIG_HIGHMEM=y
1911
CONFIG_ARM_APPENDED_DTB=y
2012
CONFIG_ARM_ATAG_DTB_COMPAT=y
@@ -25,6 +17,11 @@ CONFIG_CPU_IDLE=y
2517
CONFIG_ARM_U8500_CPUIDLE=y
2618
CONFIG_VFP=y
2719
CONFIG_NEON=y
20+
CONFIG_MODULES=y
21+
CONFIG_MODULE_UNLOAD=y
22+
# CONFIG_BLK_DEV_BSG is not set
23+
CONFIG_PARTITION_ADVANCED=y
24+
CONFIG_CMA=y
2825
CONFIG_NET=y
2926
CONFIG_PACKET=y
3027
CONFIG_UNIX=y
@@ -47,7 +44,6 @@ CONFIG_SMSC911X=y
4744
CONFIG_SMSC_PHY=y
4845
CONFIG_CW1200=y
4946
CONFIG_CW1200_WLAN_SDIO=y
50-
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
5147
CONFIG_INPUT_EVDEV=y
5248
# CONFIG_KEYBOARD_ATKBD is not set
5349
CONFIG_KEYBOARD_GPIO=y
@@ -63,7 +59,6 @@ CONFIG_RMI4_CORE=y
6359
CONFIG_RMI4_I2C=y
6460
CONFIG_RMI4_F11=y
6561
# CONFIG_SERIO is not set
66-
CONFIG_VT_HW_CONSOLE_BINDING=y
6762
# CONFIG_LEGACY_PTYS is not set
6863
CONFIG_SERIAL_AMBA_PL011=y
6964
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
@@ -72,13 +67,21 @@ CONFIG_SPI=y
7267
CONFIG_SPI_PL022=y
7368
CONFIG_GPIO_STMPE=y
7469
CONFIG_GPIO_TC3589X=y
70+
CONFIG_SENSORS_IIO_HWMON=y
7571
CONFIG_THERMAL=y
7672
CONFIG_CPU_THERMAL=y
7773
CONFIG_WATCHDOG=y
7874
CONFIG_MFD_STMPE=y
7975
CONFIG_MFD_TC3589X=y
8076
CONFIG_REGULATOR_AB8500=y
8177
CONFIG_REGULATOR_GPIO=y
78+
CONFIG_DRM=y
79+
CONFIG_DRM_PANEL_SAMSUNG_S6D16D0=y
80+
CONFIG_DRM_LIMA=y
81+
CONFIG_DRM_MCDE=y
82+
CONFIG_BACKLIGHT_CLASS_DEVICE=y
83+
CONFIG_BACKLIGHT_GENERIC=m
84+
CONFIG_LOGO=y
8285
CONFIG_SOUND=y
8386
CONFIG_SND=y
8487
CONFIG_SND_SOC=y
@@ -87,6 +90,7 @@ CONFIG_SND_SOC_UX500_MACH_MOP500=y
8790
CONFIG_USB=y
8891
CONFIG_USB_MUSB_HDRC=y
8992
CONFIG_USB_MUSB_UX500=y
93+
CONFIG_MUSB_PIO_ONLY=y
9094
CONFIG_AB8500_USB=y
9195
CONFIG_USB_GADGET=y
9296
CONFIG_USB_ETH=m
@@ -103,6 +107,7 @@ CONFIG_RTC_DRV_AB8500=y
103107
CONFIG_RTC_DRV_PL031=y
104108
CONFIG_DMADEVICES=y
105109
CONFIG_STE_DMA40=y
110+
CONFIG_HWSPINLOCK=y
106111
CONFIG_HSEM_U8500=y
107112
CONFIG_IIO=y
108113
CONFIG_IIO_SW_TRIGGER=y
@@ -126,20 +131,19 @@ CONFIG_NFS_FS=y
126131
CONFIG_ROOT_NFS=y
127132
CONFIG_NLS_CODEPAGE_437=y
128133
CONFIG_NLS_ISO8859_1=y
134+
CONFIG_CRYPTO_DEV_UX500=y
135+
CONFIG_CRYPTO_DEV_UX500_CRYP=y
136+
CONFIG_CRYPTO_DEV_UX500_HASH=y
137+
CONFIG_CRYPTO_DEV_UX500_DEBUG=y
129138
CONFIG_PRINTK_TIME=y
130139
CONFIG_DEBUG_INFO=y
131140
CONFIG_DEBUG_FS=y
132141
CONFIG_MAGIC_SYSRQ=y
133142
CONFIG_DEBUG_KERNEL=y
134143
# CONFIG_SCHED_DEBUG is not set
135-
# CONFIG_DEBUG_PREEMPT is not set
136144
# CONFIG_FTRACE is not set
137145
CONFIG_DEBUG_USER=y
138146
CONFIG_CORESIGHT=y
139147
CONFIG_CORESIGHT_SINK_TPIU=y
140148
CONFIG_CORESIGHT_SINK_ETBV10=y
141149
CONFIG_CORESIGHT_SOURCE_ETM3X=y
142-
CONFIG_CRYPTO_DEV_UX500=y
143-
CONFIG_CRYPTO_DEV_UX500_CRYP=y
144-
CONFIG_CRYPTO_DEV_UX500_HASH=y
145-
CONFIG_CRYPTO_DEV_UX500_DEBUG=y

‎arch/arm/mach-davinci/sleep.S

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#define DEEPSLEEP_SLEEPENABLE_BIT BIT(31)
2525

2626
.text
27+
.arch armv5te
2728
/*
2829
* Move DaVinci into deep sleep state
2930
*

0 commit comments

Comments
 (0)