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

Commit 6af714b0 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'fixes-v4.0-rc1' of... 

Merge tag 'fixes-v4.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Fixes for various omap devices. It's all dts and defconfig
changes for this set:

- Fix wrong DMA properties for dma to avoid them getting
  copied wrong again before we start actually using them

- USB fixes to revert the extcon changes as the driver did not
  get merged yet and cause issues

- Omap5 and dra7 fixes to boot from sata

- Fix few am437x issues for i2c and pinctrl

- Fix beaglebone for hardwared USB configuration

- Defconfig changes for NAND, SATA and TPS62362

- Fix n900 i2c numbering for legacy user space and smc91x
  register offset so it works also for qemu

- Fix incomplete USB configuration for dm816x

* tag 'fixes-v4.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: am335x-bone*: usb0 is hardwired for peripheral
  ARM: dts: dra7x-evm: beagle-x15: Fix USB Host
  ARM: omap2plus_defconfig: Fix SATA boot
  ARM: omap2plus_defconfig: Enable OMAP NAND BCH driver
  ARM: dts: dra7: Correct the dma controller's property names
  ARM: dts: omap5: Correct the dma controller's property names
  ARM: dts: omap4: Correct the dma controller's property names
  ARM: dts: omap3: Correct the dma controller's property names
  ARM: dts: omap2: Correct the dma controller's property names
  ARM: dts: am437x-idk: fix sleep pinctrl state
  ARM: omap2plus_defconfig: enable TPS62362 regulator
  ARM: dts: am437x-idk: fix TPS62362 i2c bus
  ARM: dts: n900: Fix offset for smc91x ethernet
  ARM: dts: n900: fix i2c bus numbering
  ARM: dts: Fix USB dts configuration for dm816x
  ARM: dts: OMAP5: Fix SATA PHY node
  ARM: dts: DRA7: Fix SATA PHY node
parents 7934d69a 67fd14b3

arch/arm/boot/dts/am335x-bone-common.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@ 


&usb0 {

	status = "okay";

	dr_mode = "peripheral";

};



&usb1 {

arch/arm/boot/dts/am437x-idk-evm.dts

+2 −23
Original line number Diff line number Diff line
@@ -133,20 +133,6 @@ 
		>;

	};



	i2c1_pins_default: i2c1_pins_default {

		pinctrl-single,pins = <

			0x15c (PIN_INPUT | SLEWCTRL_FAST | MUX_MODE2) /* spi0_cs0.i2c1_scl */

			0x158 (PIN_INPUT | SLEWCTRL_FAST | MUX_MODE2) /* spi0_d1.i2c1_sda */

		>;

	};



	i2c1_pins_sleep: i2c1_pins_sleep {

		pinctrl-single,pins = <

			0x15c (PIN_INPUT_PULLDOWN | MUX_MODE7) /* spi0_cs0.i2c1_scl */

			0x158 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* spi0_d1.i2c1_sda */

		>;

	};



	mmc1_pins_default: pinmux_mmc1_pins_default {

		pinctrl-single,pins = <

			0x100 (PIN_INPUT | MUX_MODE0) /* mmc0_clk.mmc0_clk */
@@ -254,7 +240,7 @@ 
	status = "okay";

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&i2c0_pins_default>;

	pinctrl-1 = <&i2c0_pins_default>;

	pinctrl-1 = <&i2c0_pins_sleep>;

	clock-frequency = <400000>;



	at24@50 {
@@ -262,17 +248,10 @@ 
		pagesize = <64>;

		reg = <0x50>;

	};

};



&i2c1 {

	status = "okay";

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&i2c1_pins_default>;

	pinctrl-1 = <&i2c1_pins_default>;

	clock-frequency = <400000>;



	tps: tps62362@60 {

		compatible = "ti,tps62362";

		reg = <0x60>;

		regulator-name = "VDD_MPU";

		regulator-min-microvolt = <950000>;

		regulator-max-microvolt = <1330000>;

arch/arm/boot/dts/am57xx-beagle-x15.dts

+0 −8
Original line number Diff line number Diff line
@@ -549,14 +549,6 @@ 
	pinctrl-0 = <&usb1_pins>;

};



&omap_dwc3_1 {

	extcon = <&extcon_usb1>;

};



&omap_dwc3_2 {

	extcon = <&extcon_usb2>;

};



&usb2 {

	dr_mode = "peripheral";

};

arch/arm/boot/dts/dm8168-evm.dts

+25 −0
Original line number Diff line number Diff line
@@ -35,6 +35,18 @@ 
			DM816X_IOPAD(0x0aac, PIN_INPUT | MUX_MODE0)	/* SPI_D1 */

		>;

	};



	usb0_pins: pinmux_usb0_pins {

		pinctrl-single,pins = <

			DM816X_IOPAD(0x0d00, MUX_MODE0)			/* USB0_DRVVBUS */

		>;

	};



	usb1_pins: pinmux_usb0_pins {

		pinctrl-single,pins = <

			DM816X_IOPAD(0x0d04, MUX_MODE0)			/* USB1_DRVVBUS */

		>;

	};

};



&i2c1 {
@@ -127,3 +139,16 @@ 
&mmc1 {

	vmmc-supply = <&vmmcsd_fixed>;

};



/* At least dm8168-evm rev c won't support multipoint, later may */

&usb0 {

	pinctrl-names = "default";

	pinctrl-0 = <&usb0_pins>;

	mentor,multipoint = <0>;

};



&usb1 {

	pinctrl-names = "default";

	pinctrl-0 = <&usb1_pins>;

	mentor,multipoint = <0>;

};

arch/arm/boot/dts/dm816x.dtsi

+30 −4
Original line number Diff line number Diff line
@@ -97,10 +97,31 @@ 


			/* Device Configuration Registers */

			scm_conf: syscon@600 {

				compatible = "syscon";

				compatible = "syscon", "simple-bus";

				reg = <0x600 0x110>;

				#address-cells = <1>;

				#size-cells = <1>;

				ranges = <0 0x600 0x110>;



				usb_phy0: usb-phy@20 {

					compatible = "ti,dm8168-usb-phy";

					reg = <0x20 0x8>;

					reg-names = "phy";

					clocks = <&main_fapll 6>;

					clock-names = "refclk";

					#phy-cells = <0>;

					syscon = <&scm_conf>;

				};



				usb_phy1: usb-phy@28 {

					compatible = "ti,dm8168-usb-phy";

					reg = <0x28 0x8>;

					reg-names = "phy";

					clocks = <&main_fapll 6>;

					clock-names = "refclk";

					#phy-cells = <0>;

					syscon = <&scm_conf>;

				};

			};



			scrm_clocks: clocks {
@@ -357,7 +378,10 @@ 
				reg-names = "mc", "control";

				interrupts = <18>;

				interrupt-names = "mc";

				dr_mode = "otg";

				dr_mode = "host";

				interface-type = <0>;

				phys = <&usb_phy0>;

				phy-names = "usb2-phy";

				mentor,multipoint = <1>;

				mentor,num-eps = <16>;

				mentor,ram-bits = <12>;
@@ -366,13 +390,15 @@ 


			usb1: usb@47401800 {

				compatible = "ti,musb-am33xx";

				status = "disabled";

				reg = <0x47401c00 0x400

				       0x47401800 0x200>;

				reg-names = "mc", "control";

				interrupts = <19>;

				interrupt-names = "mc";

				dr_mode = "otg";

				dr_mode = "host";

				interface-type = <0>;

				phys = <&usb_phy1>;

				phy-names = "usb2-phy";

				mentor,multipoint = <1>;

				mentor,num-eps = <16>;

				mentor,ram-bits = <12>;