Skip to content

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

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
Show whitespace changes
Inline Side-by-side
Showing with 83 additions and 67 deletions
arch/arm/boot/dts/am335x-bone-common.dtsi
View file @ 6af714b0
...@@ -195,6 +195,7 @@ &usb1_phy { ...@@ -195,6 +195,7 @@ &usb1_phy {
&usb0 { &usb0 {
status = "okay"; status = "okay";
dr_mode = "peripheral";
}; };
&usb1 { &usb1 {
......
arch/arm/boot/dts/am437x-idk-evm.dts
View file @ 6af714b0
...@@ -133,20 +133,6 @@ i2c0_pins_sleep: i2c0_pins_sleep { ...@@ -133,20 +133,6 @@ i2c0_pins_sleep: i2c0_pins_sleep {
>; >;
}; };
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 { mmc1_pins_default: pinmux_mmc1_pins_default {
pinctrl-single,pins = < pinctrl-single,pins = <
0x100 (PIN_INPUT | MUX_MODE0) /* mmc0_clk.mmc0_clk */ 0x100 (PIN_INPUT | MUX_MODE0) /* mmc0_clk.mmc0_clk */
...@@ -254,7 +240,7 @@ &i2c0 { ...@@ -254,7 +240,7 @@ &i2c0 {
status = "okay"; status = "okay";
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-0 = <&i2c0_pins_default>; pinctrl-0 = <&i2c0_pins_default>;
pinctrl-1 = <&i2c0_pins_default>; pinctrl-1 = <&i2c0_pins_sleep>;
clock-frequency = <400000>; clock-frequency = <400000>;
at24@50 { at24@50 {
...@@ -262,17 +248,10 @@ at24@50 { ...@@ -262,17 +248,10 @@ at24@50 {
pagesize = <64>; pagesize = <64>;
reg = <0x50>; 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 { tps: tps62362@60 {
compatible = "ti,tps62362"; compatible = "ti,tps62362";
reg = <0x60>;
regulator-name = "VDD_MPU"; regulator-name = "VDD_MPU";
regulator-min-microvolt = <950000>; regulator-min-microvolt = <950000>;
regulator-max-microvolt = <1330000>; regulator-max-microvolt = <1330000>;
......
arch/arm/boot/dts/am57xx-beagle-x15.dts
View file @ 6af714b0
...@@ -549,14 +549,6 @@ &usb1 { ...@@ -549,14 +549,6 @@ &usb1 {
pinctrl-0 = <&usb1_pins>; pinctrl-0 = <&usb1_pins>;
}; };
&omap_dwc3_1 {
extcon = <&extcon_usb1>;
};
&omap_dwc3_2 {
extcon = <&extcon_usb2>;
};
&usb2 { &usb2 {
dr_mode = "peripheral"; dr_mode = "peripheral";
}; };
arch/arm/boot/dts/dm8168-evm.dts
View file @ 6af714b0
...@@ -35,6 +35,18 @@ DM816X_IOPAD(0x0aa8, PIN_INPUT | MUX_MODE0) /* SPI_D0 */ ...@@ -35,6 +35,18 @@ DM816X_IOPAD(0x0aa8, PIN_INPUT | MUX_MODE0) /* SPI_D0 */
DM816X_IOPAD(0x0aac, PIN_INPUT | MUX_MODE0) /* SPI_D1 */ 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 { &i2c1 {
...@@ -127,3 +139,16 @@ m25p80@0 { ...@@ -127,3 +139,16 @@ m25p80@0 {
&mmc1 { &mmc1 {
vmmc-supply = <&vmmcsd_fixed>; 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
View file @ 6af714b0
...@@ -97,10 +97,31 @@ dm816x_pinmux: pinmux@800 { ...@@ -97,10 +97,31 @@ dm816x_pinmux: pinmux@800 {
/* Device Configuration Registers */ /* Device Configuration Registers */
scm_conf: syscon@600 { scm_conf: syscon@600 {
compatible = "syscon"; compatible = "syscon", "simple-bus";
reg = <0x600 0x110>; reg = <0x600 0x110>;
#address-cells = <1>; #address-cells = <1>;
#size-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 { scrm_clocks: clocks {
...@@ -357,7 +378,10 @@ usb0: usb@47401000 { ...@@ -357,7 +378,10 @@ usb0: usb@47401000 {
reg-names = "mc", "control"; reg-names = "mc", "control";
interrupts = <18>; interrupts = <18>;
interrupt-names = "mc"; interrupt-names = "mc";
dr_mode = "otg"; dr_mode = "host";
interface-type = <0>;
phys = <&usb_phy0>;
phy-names = "usb2-phy";
mentor,multipoint = <1>; mentor,multipoint = <1>;
mentor,num-eps = <16>; mentor,num-eps = <16>;
mentor,ram-bits = <12>; mentor,ram-bits = <12>;
...@@ -366,13 +390,15 @@ usb0: usb@47401000 { ...@@ -366,13 +390,15 @@ usb0: usb@47401000 {
usb1: usb@47401800 { usb1: usb@47401800 {
compatible = "ti,musb-am33xx"; compatible = "ti,musb-am33xx";
status = "disabled";
reg = <0x47401c00 0x400 reg = <0x47401c00 0x400
0x47401800 0x200>; 0x47401800 0x200>;
reg-names = "mc", "control"; reg-names = "mc", "control";
interrupts = <19>; interrupts = <19>;
interrupt-names = "mc"; interrupt-names = "mc";
dr_mode = "otg"; dr_mode = "host";
interface-type = <0>;
phys = <&usb_phy1>;
phy-names = "usb2-phy";
mentor,multipoint = <1>; mentor,multipoint = <1>;
mentor,num-eps = <16>; mentor,num-eps = <16>;
mentor,ram-bits = <12>; mentor,ram-bits = <12>;
......
arch/arm/boot/dts/dra7-evm.dts
View file @ 6af714b0
...@@ -543,14 +543,6 @@ partition@9 { ...@@ -543,14 +543,6 @@ partition@9 {
}; };
}; };
&omap_dwc3_1 {
extcon = <&extcon_usb1>;
};
&omap_dwc3_2 {
extcon = <&extcon_usb2>;
};
&usb1 { &usb1 {
dr_mode = "peripheral"; dr_mode = "peripheral";
pinctrl-names = "default"; pinctrl-names = "default";
......
arch/arm/boot/dts/dra7.dtsi
View file @ 6af714b0
...@@ -249,8 +249,8 @@ sdma: dma-controller@4a056000 { ...@@ -249,8 +249,8 @@ sdma: dma-controller@4a056000 {
<GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
#dma-cells = <1>; #dma-cells = <1>;
#dma-channels = <32>; dma-channels = <32>;
#dma-requests = <127>; dma-requests = <127>;
}; };
gpio1: gpio@4ae10000 { gpio1: gpio@4ae10000 {
...@@ -1090,8 +1090,8 @@ sata_phy: phy@4A096000 { ...@@ -1090,8 +1090,8 @@ sata_phy: phy@4A096000 {
<0x4A096800 0x40>; /* pll_ctrl */ <0x4A096800 0x40>; /* pll_ctrl */
reg-names = "phy_rx", "phy_tx", "pll_ctrl"; reg-names = "phy_rx", "phy_tx", "pll_ctrl";
ctrl-module = <&omap_control_sata>; ctrl-module = <&omap_control_sata>;
clocks = <&sys_clkin1>; clocks = <&sys_clkin1>, <&sata_ref_clk>;
clock-names = "sysclk"; clock-names = "sysclk", "refclk";
#phy-cells = <0>; #phy-cells = <0>;
}; };
......
arch/arm/boot/dts/dra72-evm.dts
View file @ 6af714b0
...@@ -380,14 +380,6 @@ &usb2_phy2 { ...@@ -380,14 +380,6 @@ &usb2_phy2 {
phy-supply = <&ldo4_reg>; phy-supply = <&ldo4_reg>;
}; };
&omap_dwc3_1 {
extcon = <&extcon_usb1>;
};
&omap_dwc3_2 {
extcon = <&extcon_usb2>;
};
&usb1 { &usb1 {
dr_mode = "peripheral"; dr_mode = "peripheral";
pinctrl-names = "default"; pinctrl-names = "default";
......
arch/arm/boot/dts/omap2.dtsi
View file @ 6af714b0
...@@ -87,8 +87,8 @@ sdma: dma-controller@48056000 { ...@@ -87,8 +87,8 @@ sdma: dma-controller@48056000 {
<14>, <14>,
<15>; <15>;
#dma-cells = <1>; #dma-cells = <1>;
#dma-channels = <32>; dma-channels = <32>;
#dma-requests = <64>; dma-requests = <64>;
}; };
i2c1: i2c@48070000 { i2c1: i2c@48070000 {
......
arch/arm/boot/dts/omap3-n900.dts
View file @ 6af714b0
...@@ -16,6 +16,13 @@ / { ...@@ -16,6 +16,13 @@ / {
model = "Nokia N900"; model = "Nokia N900";
compatible = "nokia,omap3-n900", "ti,omap3430", "ti,omap3"; compatible = "nokia,omap3-n900", "ti,omap3430", "ti,omap3";
aliases {
i2c0;
i2c1 = &i2c1;
i2c2 = &i2c2;
i2c3 = &i2c3;
};
cpus { cpus {
cpu@0 { cpu@0 {
cpu0-supply = <&vcc>; cpu0-supply = <&vcc>;
...@@ -704,7 +711,7 @@ ethernet@gpmc { ...@@ -704,7 +711,7 @@ ethernet@gpmc {
compatible = "smsc,lan91c94"; compatible = "smsc,lan91c94";
interrupt-parent = <&gpio2>; interrupt-parent = <&gpio2>;
interrupts = <22 IRQ_TYPE_LEVEL_HIGH>; /* gpio54 */ interrupts = <22 IRQ_TYPE_LEVEL_HIGH>; /* gpio54 */
reg = <1 0x300 0xf>; /* 16 byte IO range at offset 0x300 */ reg = <1 0 0xf>; /* 16 byte IO range */
bank-width = <2>; bank-width = <2>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ethernet_pins>; pinctrl-0 = <&ethernet_pins>;
......
arch/arm/boot/dts/omap3.dtsi
View file @ 6af714b0
...@@ -155,8 +155,8 @@ sdma: dma-controller@48056000 { ...@@ -155,8 +155,8 @@ sdma: dma-controller@48056000 {
<14>, <14>,
<15>; <15>;
#dma-cells = <1>; #dma-cells = <1>;
#dma-channels = <32>; dma-channels = <32>;
#dma-requests = <96>; dma-requests = <96>;
}; };
omap3_pmx_core: pinmux@48002030 { omap3_pmx_core: pinmux@48002030 {
......
arch/arm/boot/dts/omap4.dtsi
View file @ 6af714b0
...@@ -223,8 +223,8 @@ sdma: dma-controller@4a056000 { ...@@ -223,8 +223,8 @@ sdma: dma-controller@4a056000 {
<GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
#dma-cells = <1>; #dma-cells = <1>;
#dma-channels = <32>; dma-channels = <32>;
#dma-requests = <127>; dma-requests = <127>;
}; };
gpio1: gpio@4a310000 { gpio1: gpio@4a310000 {
......
arch/arm/boot/dts/omap5.dtsi
View file @ 6af714b0
...@@ -238,8 +238,8 @@ sdma: dma-controller@4a056000 { ...@@ -238,8 +238,8 @@ sdma: dma-controller@4a056000 {
<GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
#dma-cells = <1>; #dma-cells = <1>;
#dma-channels = <32>; dma-channels = <32>;
#dma-requests = <127>; dma-requests = <127>;
}; };
gpio1: gpio@4ae10000 { gpio1: gpio@4ae10000 {
...@@ -929,8 +929,8 @@ sata_phy: phy@4a096000 { ...@@ -929,8 +929,8 @@ sata_phy: phy@4a096000 {
<0x4A096800 0x40>; /* pll_ctrl */ <0x4A096800 0x40>; /* pll_ctrl */
reg-names = "phy_rx", "phy_tx", "pll_ctrl"; reg-names = "phy_rx", "phy_tx", "pll_ctrl";
ctrl-module = <&omap_control_sata>; ctrl-module = <&omap_control_sata>;
clocks = <&sys_clkin>; clocks = <&sys_clkin>, <&sata_ref_clk>;
clock-names = "sysclk"; clock-names = "sysclk", "refclk";
#phy-cells = <0>; #phy-cells = <0>;
}; };
}; };
......
arch/arm/configs/omap2plus_defconfig
View file @ 6af714b0
...@@ -114,6 +114,7 @@ CONFIG_MTD_PHYSMAP_OF=y ...@@ -114,6 +114,7 @@ CONFIG_MTD_PHYSMAP_OF=y
CONFIG_MTD_NAND=y CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_ECC_BCH=y CONFIG_MTD_NAND_ECC_BCH=y
CONFIG_MTD_NAND_OMAP2=y CONFIG_MTD_NAND_OMAP2=y
CONFIG_MTD_NAND_OMAP_BCH=y
CONFIG_MTD_ONENAND=y CONFIG_MTD_ONENAND=y
CONFIG_MTD_ONENAND_VERIFY_WRITE=y CONFIG_MTD_ONENAND_VERIFY_WRITE=y
CONFIG_MTD_ONENAND_OMAP2=y CONFIG_MTD_ONENAND_OMAP2=y
...@@ -248,6 +249,7 @@ CONFIG_TWL6040_CORE=y ...@@ -248,6 +249,7 @@ CONFIG_TWL6040_CORE=y
CONFIG_REGULATOR_PALMAS=y CONFIG_REGULATOR_PALMAS=y
CONFIG_REGULATOR_PBIAS=y CONFIG_REGULATOR_PBIAS=y
CONFIG_REGULATOR_TI_ABB=y CONFIG_REGULATOR_TI_ABB=y
CONFIG_REGULATOR_TPS62360=m
CONFIG_REGULATOR_TPS65023=y CONFIG_REGULATOR_TPS65023=y
CONFIG_REGULATOR_TPS6507X=y CONFIG_REGULATOR_TPS6507X=y
CONFIG_REGULATOR_TPS65217=y CONFIG_REGULATOR_TPS65217=y
...@@ -374,7 +376,7 @@ CONFIG_PWM_TIEHRPWM=m ...@@ -374,7 +376,7 @@ CONFIG_PWM_TIEHRPWM=m
CONFIG_PWM_TWL=m CONFIG_PWM_TWL=m
CONFIG_PWM_TWL_LED=m CONFIG_PWM_TWL_LED=m
CONFIG_OMAP_USB2=m CONFIG_OMAP_USB2=m
CONFIG_TI_PIPE3=m CONFIG_TI_PIPE3=y
CONFIG_EXT2_FS=y CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y CONFIG_EXT3_FS=y
# CONFIG_EXT3_FS_XATTR is not set # CONFIG_EXT3_FS_XATTR is not set
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7