Commit 5bb575bc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a9815a4f 7bd9d465

arch/arm/Kconfig.debug

+0 −5
Original line number Diff line number Diff line
@@ -1535,7 +1535,6 @@ config DEBUG_LL_INCLUDE 
				 DEBUG_IMX7D_UART

	default "debug/ks8695.S" if DEBUG_KS8695_UART

	default "debug/msm.S" if DEBUG_QCOM_UARTDM

	default "debug/netx.S" if DEBUG_NETX_UART

	default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART

	default "debug/renesas-scif.S" if DEBUG_R7S72100_SCIF2

	default "debug/renesas-scif.S" if DEBUG_RCAR_GEN1_SCIF0
@@ -1575,7 +1574,6 @@ config DEBUG_UART_8250 


config DEBUG_UART_PHYS

	hex "Physical base address of debug UART"

	default 0x00100a00 if DEBUG_NETX_UART

	default 0x01c20000 if DEBUG_DAVINCI_DMx_UART0

	default 0x01c28000 if DEBUG_SUNXI_UART0

	default 0x01c28400 if DEBUG_SUNXI_UART1
@@ -1700,7 +1698,6 @@ config DEBUG_UART_PHYS 
	        DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \

		DEBUG_LL_UART_EFM32 || \

		DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_MESON_UARTAO || \

		DEBUG_NETX_UART || \

		DEBUG_QCOM_UARTDM || DEBUG_R7S72100_SCIF2 || \

		DEBUG_RCAR_GEN1_SCIF0 || DEBUG_RCAR_GEN1_SCIF2 || \

		DEBUG_RCAR_GEN2_SCIF0 || DEBUG_RCAR_GEN2_SCIF1 || \
@@ -1717,7 +1714,6 @@ config DEBUG_UART_VIRT 
	default 0xc881f000 if DEBUG_RV1108_UART2

	default 0xc8821000 if DEBUG_RV1108_UART1

	default 0xc8912000 if DEBUG_RV1108_UART0

	default 0xe0000a00 if DEBUG_NETX_UART

	default 0xe0010fe0 if ARCH_RPC

	default 0xf0000be0 if ARCH_EBSA110

	default 0xf0010000 if DEBUG_ASM9260_UART
@@ -1822,7 +1818,6 @@ config DEBUG_UART_VIRT 
	default DEBUG_UART_PHYS if !MMU

	depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \

		DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_MESON_UARTAO || \

		DEBUG_NETX_UART || \

		DEBUG_QCOM_UARTDM || DEBUG_S3C24XX_UART || \

		DEBUG_S3C64XX_UART || \

		DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \

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

+3 −0
Original line number Diff line number Diff line
@@ -124,6 +124,9 @@ 
	};



	mdio-bus-mux {

		#address-cells = <1>;

		#size-cells = <0>;



		/* BIT(9) = 1 => external mdio */

		mdio_ext: mdio@200 {

			reg = <0x200>;

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

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ 
};



&i2c2 {

	clock_frequency = <100000>;

	clock-frequency = <100000>;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_i2c2>;

	status = "okay";

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

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ 
};



&i2c2 {

	clock_frequency = <100000>;

	clock-frequency = <100000>;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_i2c2>;

	status = "okay";

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

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ 
};



&i2c2 {

	clock_frequency = <100000>;

	clock-frequency = <100000>;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_i2c2>;

	status = "okay";

CRA Git | Maintained and supported by SUSTech CRA and CCSE