Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee7141c9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Arnd Bergmann:
 "This round of fixes has two larger changes that came in last week:

   - a couple of patches all intended to finally turn on USB support on
     various Amlogic SoC based boards. The respective driver were not
     finalized until very late before the merge window and the DT
     portion is the last bit now.

   - a defconfig update for gemini that had repeatedly missed the cut
     but that is required to actually boot any real machines with the
     default build.

  The rest are the usual small changes:

   - a fix for a nasty build regression on the OMAP memory drivers

   - a fix for a boot problem on Intel/Altera SocFPGA

   - a MAINTAINER file update

   - a couple of fixes for issues found by automated testing (kernelci,
     coverity, sparse, ...)

   - a few incorrect DT entries are updated to match the hardware"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: defconfig: Update Gemini defconfig
  ARM: s3c24xx: jive: Fix some GPIO names
  HISI LPC: Add Kconfig MFD_CORE dependency
  ARM: dts: Fix NAS4220B pin config
  MAINTAINERS: Remove myself as maintainer
  arm64: dts: correct SATA addresses for Stingray
  ARM64: dts: meson-gxm-khadas-vim2: enable the USB controller
  ARM64: dts: meson-gxl-nexbox-a95x: enable the USB controller
  ARM64: dts: meson-gxl-s905x-libretech-cc: enable the USB controller
  ARM64: dts: meson-gx-p23x-q20x: enable the USB controller
  ARM64: dts: meson-gxl-s905x-p212: enable the USB controller
  ARM64: dts: meson-gxm: add GXM specific USB host configuration
  ARM64: dts: meson-gxl: add USB host support
  ARM: OMAP2+: Fix build when using split object directories
  soc: bcm2835: Make !RASPBERRYPI_FIRMWARE dummies return failure
  soc: bcm: raspberrypi-power: Fix use of __packed
  ARM: dts: Fix cm2 and prm sizes for omap4
  ARM: socfpga_defconfig: Remove QSPI Sector 4K size force
  firmware: arm_scmi: remove redundant null check on array
  arm64: dts: juno: drop unnecessary address-cells and size-cells properties
parents 245131e2 4ea3f056

MAINTAINERS

+0 −2
Original line number Diff line number Diff line
@@ -1208,7 +1208,6 @@ F: drivers/*/*alpine* 
ARM/ARTPEC MACHINE SUPPORT

M:	Jesper Nilsson <jesper.nilsson@axis.com>

M:	Lars Persson <lars.persson@axis.com>

M:	Niklas Cassel <niklas.cassel@axis.com>

S:	Maintained

L:	linux-arm-kernel@axis.com

F:	arch/arm/mach-artpec
@@ -10909,7 +10908,6 @@ F: drivers/pci/host/ 
F:	drivers/pci/dwc/



PCIE DRIVER FOR AXIS ARTPEC

M:	Niklas Cassel <niklas.cassel@axis.com>

M:	Jesper Nilsson <jesper.nilsson@axis.com>

L:	linux-arm-kernel@axis.com

L:	linux-pci@vger.kernel.org

arch/arm/boot/dts/gemini-nas4220b.dts

+14 −14
Original line number Diff line number Diff line
@@ -134,37 +134,37 @@ 
						function = "gmii";

						groups = "gmii_gmac0_grp";

					};

					/* Settings come from OpenWRT */

					/* Settings come from OpenWRT, pins on SL3516 */

					conf0 {

						pins = "R8 GMAC0 RXDV", "U11 GMAC1 RXDV";

						pins = "V8 GMAC0 RXDV", "T10 GMAC1 RXDV";

						skew-delay = <0>;

					};

					conf1 {

						pins = "T8 GMAC0 RXC", "T11 GMAC1 RXC";

						pins = "Y7 GMAC0 RXC", "Y11 GMAC1 RXC";

						skew-delay = <15>;

					};

					conf2 {

						pins = "P8 GMAC0 TXEN", "V11 GMAC1 TXEN";

						pins = "T8 GMAC0 TXEN", "W11 GMAC1 TXEN";

						skew-delay = <7>;

					};

					conf3 {

						pins = "V7 GMAC0 TXC";

						pins = "U8 GMAC0 TXC";

						skew-delay = <11>;

					};

					conf4 {

						pins = "P10 GMAC1 TXC";

						pins = "V11 GMAC1 TXC";

						skew-delay = <10>;

					};

					conf5 {

						/* The data lines all have default skew */

						pins = "U8 GMAC0 RXD0", "V8 GMAC0 RXD1",

						       "P9 GMAC0 RXD2", "R9 GMAC0 RXD3",

						       "U7 GMAC0 TXD0", "T7 GMAC0 TXD1",

						       "R7 GMAC0 TXD2", "P7 GMAC0 TXD3",

						       "R11 GMAC1 RXD0", "P11 GMAC1 RXD1",

						       "V12 GMAC1 RXD2", "U12 GMAC1 RXD3",

						       "R10 GMAC1 TXD0", "T10 GMAC1 TXD1",

						       "U10 GMAC1 TXD2", "V10 GMAC1 TXD3";

						pins = "W8 GMAC0 RXD0", "V9 GMAC0 RXD1",

						       "Y8 GMAC0 RXD2", "U9 GMAC0 RXD3",

						       "T7 GMAC0 TXD0", "U6 GMAC0 TXD1",

						       "V7 GMAC0 TXD2", "U7 GMAC0 TXD3",

						       "Y12 GMAC1 RXD0", "V12 GMAC1 RXD1",

						       "T11 GMAC1 RXD2", "W12 GMAC1 RXD3",

						       "U10 GMAC1 TXD0", "Y10 GMAC1 TXD1",

						       "W10 GMAC1 TXD2", "T9 GMAC1 TXD3";

						skew-delay = <7>;

					};

					/* Set up drive strength on GMAC0 to 16 mA */

arch/arm/boot/dts/omap4.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -163,10 +163,10 @@ 


			cm2: cm2@8000 {

				compatible = "ti,omap4-cm2", "simple-bus";

				reg = <0x8000 0x3000>;

				reg = <0x8000 0x2000>;

				#address-cells = <1>;

				#size-cells = <1>;

				ranges = <0 0x8000 0x3000>;

				ranges = <0 0x8000 0x2000>;



				cm2_clocks: clocks {

					#address-cells = <1>;
@@ -250,11 +250,11 @@ 


				prm: prm@6000 {

					compatible = "ti,omap4-prm";

					reg = <0x6000 0x3000>;

					reg = <0x6000 0x2000>;

					interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;

					#address-cells = <1>;

					#size-cells = <1>;

					ranges = <0 0x6000 0x3000>;

					ranges = <0 0x6000 0x2000>;



					prm_clocks: clocks {

						#address-cells = <1>;

arch/arm/configs/gemini_defconfig

+25 −2
Original line number Diff line number Diff line 
# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_SYSVIPC=y

CONFIG_NO_HZ_IDLE=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_USER_NS=y

CONFIG_RELAY=y
@@ -12,15 +13,21 @@ CONFIG_ARCH_GEMINI=y 
CONFIG_PCI=y

CONFIG_PREEMPT=y

CONFIG_AEABI=y

CONFIG_HIGHMEM=y

CONFIG_CMA=y

CONFIG_CMDLINE="console=ttyS0,115200n8"

CONFIG_KEXEC=y

CONFIG_BINFMT_MISC=y

CONFIG_PM=y

CONFIG_NET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_MTD=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_JEDECPROBE=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_CFI_STAA=y
@@ -33,6 +40,11 @@ CONFIG_BLK_DEV_SD=y 
# CONFIG_SCSI_LOWLEVEL is not set

CONFIG_ATA=y

CONFIG_PATA_FTIDE010=y

CONFIG_NETDEVICES=y

CONFIG_GEMINI_ETHERNET=y

CONFIG_MDIO_BITBANG=y

CONFIG_MDIO_GPIO=y

CONFIG_REALTEK_PHY=y

CONFIG_INPUT_EVDEV=y

CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set
@@ -43,9 +55,19 @@ CONFIG_SERIAL_8250_NR_UARTS=1 
CONFIG_SERIAL_8250_RUNTIME_UARTS=1

CONFIG_SERIAL_OF_PLATFORM=y

# CONFIG_HW_RANDOM is not set

# CONFIG_HWMON is not set

CONFIG_I2C_GPIO=y

CONFIG_SPI=y

CONFIG_SPI_GPIO=y

CONFIG_SENSORS_GPIO_FAN=y

CONFIG_SENSORS_LM75=y

CONFIG_THERMAL=y

CONFIG_WATCHDOG=y

CONFIG_GEMINI_WATCHDOG=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_DRM=y

CONFIG_DRM_PANEL_ILITEK_IL9322=y

CONFIG_DRM_TVE200=y

CONFIG_LOGO=y

CONFIG_USB=y

CONFIG_USB_MON=y

CONFIG_USB_FOTG210_HCD=y
@@ -54,6 +76,7 @@ CONFIG_NEW_LEDS=y 
CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_DISK=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_RTC_CLASS=y

CONFIG_DMADEVICES=y

arch/arm/configs/socfpga_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ CONFIG_MTD_M25P80=y 
CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_DENALI_DT=y

CONFIG_MTD_SPI_NOR=y

# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set

CONFIG_SPI_CADENCE_QUADSPI=y

CONFIG_OF_OVERLAY=y

CONFIG_OF_CONFIGFS=y