Skip to content

Commit

Permalink
Merge branch 'fixes' into for-next
Browse files Browse the repository at this point in the history 
* fixes: (27 commits)
  firmware: arm_scpi: Revert updates made during v4.15 merge window
  arm: dts: marvell: Add missing #phy-cells to usb-nop-xceiv
  arm64: dts: sort vendor subdirectories in Makefile alphabetically
  MAINTAINERS: exclude other Socionext SoC DT files from ARM/UNIPHIER entry
  arm64: dts: uniphier: remove unnecessary interrupt-parent
  arm64: dts: uniphier: correct on-board device IRQ number for PXs3
  optee: fix invalid of_node_put() in optee_driver_init()
  Revert "ARM: dts: imx53: add srtc node"
  ARM: dts: vf610-zii-dev-rev-c: Fix the I2C EEPROM address
  ARM: dts: am437x-cm-t43: Correct the dmas property of spi0
  ARM: dts: am4372: Correct the interrupts_properties of McASP
  ARM: dts: logicpd-somlv: Fix wl127x pinmux
  ARM: dts: logicpd-som-lv: Fix gpmc addresses for NAND and enet
  ARM: dts: Fix omap4 hang with GPS connected to USB by using wakeupgen
  ARM: OMAP2+: Missing error code in omap_device_build()
  ARM: AM33xx: PRM: Remove am33xx_pwrdm_read_prev_pwrst function
  ARM: OMAP2+: Fix SRAM virt to phys translation for save_secure_ram_context
  ARM: dts: NSP: Fix PPI interrupt types
  ARM: dts: NSP: Disable AHCI controller for HR NSP boards
  ARM: dts: r8a779x: Add '#reset-cells' in cpg-mssr
  ...
  • Loading branch information
Olof Johansson committed Dec 4, 2017
2 parents 4fbd8d1 + 81faa55 commit ee4c54d
Show file tree
Hide file tree
Showing 58 changed files with 236 additions and 180 deletions.
2 changes: 2 additions & 0 deletions Documentation/devicetree/bindings/usb/am33xx-usb.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ usb: usb@47400000 {
reg = <0x47401300 0x100>;
reg-names = "phy";
ti,ctrl_mod = <&ctrl_mod>;
#phy-cells = <0>;
};

usb0: usb@47401000 {
Expand Down Expand Up @@ -141,6 +142,7 @@ usb: usb@47400000 {
reg = <0x47401b00 0x100>;
reg-names = "phy";
ti,ctrl_mod = <&ctrl_mod>;
#phy-cells = <0>;
};

usb1: usb@47401800 {
Expand Down
2 changes: 1 addition & 1 deletion MAINTAINERS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2046,7 +2046,7 @@ F: arch/arm/boot/dts/uniphier*
F: arch/arm/include/asm/hardware/cache-uniphier.h
F: arch/arm/mach-uniphier/
F: arch/arm/mm/cache-uniphier.c
F: arch/arm64/boot/dts/socionext/
F: arch/arm64/boot/dts/socionext/uniphier*
F: drivers/bus/uniphier-system-bus.c
F: drivers/clk/uniphier/
F: drivers/gpio/gpio-uniphier.c
Expand Down
2 changes: 2 additions & 0 deletions arch/arm/boot/dts/am33xx.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -630,6 +630,7 @@
reg-names = "phy";
status = "disabled";
ti,ctrl_mod = <&usb_ctrl_mod>;
#phy-cells = <0>;
};

usb0: usb@47401000 {
Expand Down Expand Up @@ -678,6 +679,7 @@
reg-names = "phy";
status = "disabled";
ti,ctrl_mod = <&usb_ctrl_mod>;
#phy-cells = <0>;
};

usb1: usb@47401800 {
Expand Down
6 changes: 4 additions & 2 deletions arch/arm/boot/dts/am4372.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -927,7 +927,8 @@
reg = <0x48038000 0x2000>,
<0x46000000 0x400000>;
reg-names = "mpu", "dat";
interrupts = <80>, <81>;
interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "tx", "rx";
status = "disabled";
dmas = <&edma 8 2>,
Expand All @@ -941,7 +942,8 @@
reg = <0x4803C000 0x2000>,
<0x46400000 0x400000>;
reg-names = "mpu", "dat";
interrupts = <82>, <83>;
interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "tx", "rx";
status = "disabled";
dmas = <&edma 10 2>,
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/am437x-cm-t43.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,8 +301,8 @@
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&spi0_pins>;
dmas = <&edma 16
&edma 17>;
dmas = <&edma 16 0
&edma 17 0>;
dma-names = "tx0", "rx0";

flash: w25q64cvzpig@0 {
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/armada-385-db-ap.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@
usb3_phy: usb3_phy {
compatible = "usb-nop-xceiv";
vcc-supply = <&reg_xhci0_vbus>;
#phy-cells = <0>;
};

reg_xhci0_vbus: xhci0-vbus {
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/armada-385-linksys.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
usb3_1_phy: usb3_1-phy {
compatible = "usb-nop-xceiv";
vcc-supply = <&usb3_1_vbus>;
#phy-cells = <0>;
};

usb3_1_vbus: usb3_1-vbus {
Expand Down
2 changes: 2 additions & 0 deletions arch/arm/boot/dts/armada-385-synology-ds116.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,11 +191,13 @@
usb3_0_phy: usb3_0_phy {
compatible = "usb-nop-xceiv";
vcc-supply = <&reg_usb3_0_vbus>;
#phy-cells = <0>;
};

usb3_1_phy: usb3_1_phy {
compatible = "usb-nop-xceiv";
vcc-supply = <&reg_usb3_1_vbus>;
#phy-cells = <0>;
};

reg_usb3_0_vbus: usb3-vbus0 {
Expand Down
2 changes: 2 additions & 0 deletions arch/arm/boot/dts/armada-388-gp.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,11 +276,13 @@
usb2_1_phy: usb2_1_phy {
compatible = "usb-nop-xceiv";
vcc-supply = <&reg_usb2_1_vbus>;
#phy-cells = <0>;
};

usb3_phy: usb3_phy {
compatible = "usb-nop-xceiv";
vcc-supply = <&reg_usb3_vbus>;
#phy-cells = <0>;
};

reg_usb3_vbus: usb3-vbus {
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/bcm-nsp.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,15 @@
timer@20200 {
compatible = "arm,cortex-a9-global-timer";
reg = <0x20200 0x100>;
interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>;
interrupts = <GIC_PPI 11 IRQ_TYPE_EDGE_RISING>;
clocks = <&periph_clk>;
};

twd-timer@20600 {
compatible = "arm,cortex-a9-twd-timer";
reg = <0x20600 0x20>;
interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) |
IRQ_TYPE_LEVEL_HIGH)>;
IRQ_TYPE_EDGE_RISING)>;
clocks = <&periph_clk>;
};

Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/bcm283x.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -639,5 +639,6 @@

usbphy: phy {
compatible = "usb-nop-xceiv";
#phy-cells = <0>;
};
};
4 changes: 0 additions & 4 deletions arch/arm/boot/dts/bcm958623hr.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,6 @@
status = "okay";
};

&sata {
status = "okay";
};

&qspi {
bspi-sel = <0>;
flash: m25p80@0 {
Expand Down
4 changes: 0 additions & 4 deletions arch/arm/boot/dts/bcm958625hr.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,6 @@
status = "okay";
};

&sata {
status = "okay";
};

&srab {
compatible = "brcm,bcm58625-srab", "brcm,nsp-srab";
status = "okay";
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/dm814x.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
reg = <0x47401300 0x100>;
reg-names = "phy";
ti,ctrl_mod = <&usb_ctrl_mod>;
#phy-cells = <0>;
};

usb0: usb@47401000 {
Expand Down
9 changes: 0 additions & 9 deletions arch/arm/boot/dts/imx53.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -433,15 +433,6 @@
clock-names = "ipg", "per";
};

srtc: srtc@53fa4000 {
compatible = "fsl,imx53-rtc", "fsl,imx25-rtc";
reg = <0x53fa4000 0x4000>;
interrupts = <24>;
interrupt-parent = <&tzic>;
clocks = <&clks IMX5_CLK_SRTC_GATE>;
clock-names = "ipg";
};

iomuxc: iomuxc@53fa8000 {
compatible = "fsl,imx53-iomuxc";
reg = <0x53fa8000 0x4000>;
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@
};

&gpmc {
ranges = <1 0 0x08000000 0x1000000>; /* CS1: 16MB for LAN9221 */
ranges = <0 0 0x30000000 0x1000000 /* CS0: 16MB for NAND */
1 0 0x2c000000 0x1000000>; /* CS1: 16MB for LAN9221 */

ethernet@gpmc {
pinctrl-names = "default";
Expand Down
17 changes: 11 additions & 6 deletions arch/arm/boot/dts/logicpd-som-lv.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,12 @@
hsusb2_phy: hsusb2_phy {
compatible = "usb-nop-xceiv";
reset-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; /* gpio_4 */
#phy-cells = <0>;
};
};

&gpmc {
ranges = <0 0 0x00000000 0x1000000>; /* CS0: 16MB for NAND */
ranges = <0 0 0x30000000 0x1000000>; /* CS0: 16MB for NAND */

nand@0,0 {
compatible = "ti,omap2-nand";
Expand Down Expand Up @@ -121,7 +122,7 @@

&mmc3 {
interrupts-extended = <&intc 94 &omap3_pmx_core2 0x46>;
pinctrl-0 = <&mmc3_pins>;
pinctrl-0 = <&mmc3_pins &wl127x_gpio>;
pinctrl-names = "default";
vmmc-supply = <&wl12xx_vmmc>;
non-removable;
Expand All @@ -132,8 +133,8 @@
wlcore: wlcore@2 {
compatible = "ti,wl1273";
reg = <2>;
interrupt-parent = <&gpio5>;
interrupts = <24 IRQ_TYPE_LEVEL_HIGH>; /* gpio 152 */
interrupt-parent = <&gpio1>;
interrupts = <2 IRQ_TYPE_LEVEL_HIGH>; /* gpio 2 */
ref-clock-frequency = <26000000>;
};
};
Expand All @@ -157,8 +158,6 @@
OMAP3_CORE1_IOPAD(0x2166, PIN_INPUT_PULLUP | MUX_MODE3) /* sdmmc2_dat5.sdmmc3_dat1 */
OMAP3_CORE1_IOPAD(0x2168, PIN_INPUT_PULLUP | MUX_MODE3) /* sdmmc2_dat6.sdmmc3_dat2 */
OMAP3_CORE1_IOPAD(0x216a, PIN_INPUT_PULLUP | MUX_MODE3) /* sdmmc2_dat6.sdmmc3_dat3 */
OMAP3_CORE1_IOPAD(0x2184, PIN_INPUT_PULLUP | MUX_MODE4) /* mcbsp4_clkx.gpio_152 */
OMAP3_CORE1_IOPAD(0x2a0c, PIN_OUTPUT | MUX_MODE4) /* sys_boot1.gpio_3 */
OMAP3_CORE1_IOPAD(0x21d0, PIN_INPUT_PULLUP | MUX_MODE3) /* mcspi1_cs1.sdmmc3_cmd */
OMAP3_CORE1_IOPAD(0x21d2, PIN_INPUT_PULLUP | MUX_MODE3) /* mcspi1_cs2.sdmmc_clk */
>;
Expand Down Expand Up @@ -228,6 +227,12 @@
OMAP3_WKUP_IOPAD(0x2a0e, PIN_OUTPUT | MUX_MODE4) /* sys_boot2.gpio_4 */
>;
};
wl127x_gpio: pinmux_wl127x_gpio_pin {
pinctrl-single,pins = <
OMAP3_WKUP_IOPAD(0x2a0c, PIN_INPUT | MUX_MODE4) /* sys_boot0.gpio_2 */
OMAP3_WKUP_IOPAD(0x2a0c, PIN_OUTPUT | MUX_MODE4) /* sys_boot1.gpio_3 */
>;
};
};

&omap3_pmx_core2 {
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/omap3-beagle-xm.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@
compatible = "usb-nop-xceiv";
reset-gpios = <&gpio5 19 GPIO_ACTIVE_LOW>; /* gpio_147 */
vcc-supply = <&hsusb2_power>;
#phy-cells = <0>;
};

tfp410: encoder0 {
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/omap3-beagle.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
compatible = "usb-nop-xceiv";
reset-gpios = <&gpio5 19 GPIO_ACTIVE_LOW>; /* gpio_147 */
vcc-supply = <&hsusb2_power>;
#phy-cells = <0>;
};

sound {
Expand Down
2 changes: 2 additions & 0 deletions arch/arm/boot/dts/omap3-cm-t3x.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,14 @@
hsusb1_phy: hsusb1_phy {
compatible = "usb-nop-xceiv";
vcc-supply = <&hsusb1_power>;
#phy-cells = <0>;
};

/* HS USB Host PHY on PORT 2 */
hsusb2_phy: hsusb2_phy {
compatible = "usb-nop-xceiv";
vcc-supply = <&hsusb2_power>;
#phy-cells = <0>;
};

ads7846reg: ads7846-reg {
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/omap3-evm-common.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
compatible = "usb-nop-xceiv";
reset-gpios = <&gpio1 21 GPIO_ACTIVE_LOW>; /* gpio_21 */
vcc-supply = <&hsusb2_power>;
#phy-cells = <0>;
};

leds {
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/omap3-gta04.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@
hsusb2_phy: hsusb2_phy {
compatible = "usb-nop-xceiv";
reset-gpios = <&gpio6 14 GPIO_ACTIVE_LOW>;
#phy-cells = <0>;
};

tv0: connector {
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/omap3-igep0020-common.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
compatible = "usb-nop-xceiv";
reset-gpios = <&gpio1 24 GPIO_ACTIVE_LOW>; /* gpio_24 */
vcc-supply = <&hsusb1_power>;
#phy-cells = <0>;
};

tfp410: encoder {
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/omap3-igep0030-common.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
hsusb2_phy: hsusb2_phy {
compatible = "usb-nop-xceiv";
reset-gpios = <&gpio2 22 GPIO_ACTIVE_LOW>; /* gpio_54 */
#phy-cells = <0>;
};
};

Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/omap3-lilly-a83x.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
hsusb1_phy: hsusb1_phy {
compatible = "usb-nop-xceiv";
vcc-supply = <&reg_vcc3>;
#phy-cells = <0>;
};
};

Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/omap3-overo-base.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
compatible = "usb-nop-xceiv";
reset-gpios = <&gpio6 23 GPIO_ACTIVE_LOW>; /* gpio_183 */
vcc-supply = <&hsusb2_power>;
#phy-cells = <0>;
};

/* Regulator to trigger the nPoweron signal of the Wifi module */
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/omap3-pandora-common.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@
compatible = "usb-nop-xceiv";
reset-gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; /* GPIO_16 */
vcc-supply = <&vaux2>;
#phy-cells = <0>;
};

/* HS USB Host VBUS supply
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/omap3-tao3530.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
compatible = "usb-nop-xceiv";
reset-gpios = <&gpio6 2 GPIO_ACTIVE_LOW>; /* gpio_162 */
vcc-supply = <&hsusb2_power>;
#phy-cells = <0>;
};

sound {
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/omap3.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -715,6 +715,7 @@
compatible = "ti,ohci-omap3";
reg = <0x48064400 0x400>;
interrupts = <76>;
remote-wakeup-connected;
};

usbhsehci: ehci@48064800 {
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/omap4-droid4-xt894.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
/* HS USB Host PHY on PORT 1 */
hsusb1_phy: hsusb1_phy {
compatible = "usb-nop-xceiv";
#phy-cells = <0>;
};

/* LCD regulator from sw5 source */
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/omap4-duovero.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
hsusb1_phy: hsusb1_phy {
compatible = "usb-nop-xceiv";
reset-gpios = <&gpio2 30 GPIO_ACTIVE_LOW>; /* gpio_62 */
#phy-cells = <0>;

pinctrl-names = "default";
pinctrl-0 = <&hsusb1phy_pins>;
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/omap4-panda-common.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
hsusb1_phy: hsusb1_phy {
compatible = "usb-nop-xceiv";
reset-gpios = <&gpio2 30 GPIO_ACTIVE_LOW>; /* gpio_62 */
#phy-cells = <0>;
vcc-supply = <&hsusb1_power>;
clocks = <&auxclk3_ck>;
clock-names = "main_clk";
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/omap4-var-som-om44.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@

reset-gpios = <&gpio6 17 GPIO_ACTIVE_LOW>; /* gpio 177 */
vcc-supply = <&vbat>;
#phy-cells = <0>;

clocks = <&auxclk3_ck>;
clock-names = "main_clk";
Expand Down
Loading

0 comments on commit ee4c54d

Please sign in to comment.