Skip to content

Commit

Permalink
Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel…
Browse files Browse the repository at this point in the history 
…/git/arm/arm-soc

Pull ARM SoC fixes from Olof Johansson:
 "Our first real batch of fixes this release cycle.  Nothing really
  concerning, and diffstat is a bit inflated due to some DT contents
  moving around on STi platforms.

  There's a collection of them here:

   - A fixup for a build breakage that hits on arm64 allmodconfig in
     QCOM SCM firmware drivers
   - MMC fixes for OMAP that had quite a bit of breakage this merge
     window.
   - Misc build/warning fixes on PXA and OMAP
   - A couple of minor fixes for Beagleboard X15 which is now starting
     to see a few more users in the wild"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (31 commits)
  ARM: sti: dt: adapt DT to fix probe/bind issues in DRM driver
  ARM: dts: fix omap2+ address translation for pbias
  firmware: qcom: scm: Add function stubs for ARM64
  ARM: dts: am57xx-beagle-x15: use palmas-usb for USB2
  ARM: omap2plus_defconfig: enable GPIO_PCA953X
  ARM: dts: omap5-uevm.dts: fix i2c5 pinctrl offsets
  ARM: OMAP2+: AM43XX: Enable autoidle for clks in am43xx_init_late
  ARM: dts: am57xx-beagle-x15: Update Phy supplies
  ARM: pxa: balloon3: Fix build error
  ARM: dts: Fixup model name for HP t410 dts
  ARM: dts: DRA7: fix a typo in ethernet
  ARM: omap2plus_defconfig: make PCF857x built-in
  ARM: dts: Use ti,pbias compatible string for pbias
  ARM: OMAP5: Cleanup options for SoC only build
  ARM: DRA7: Select missing options for SoC only build
  ARM: OMAP2+: board-generic: Remove stale of_irq macros
  ARM: OMAP4+: PM: erratum is used by OMAP5 and DRA7 as well
  ARM: dts: omap3-igep: Move eth IRQ pinmux to IGEPv2 common dtsi
  ARM: dts: am57xx-beagle-x15: Add wakeup irq for mcp79410
  ARM: dts: am335x-phycore-som: Fix mpu voltage
  ...
  • Loading branch information
Linus Torvalds committed Sep 27, 2015
2 parents 69ea8b8 + e46fc90 commit 685b5f1
Show file tree
Hide file tree
Showing 34 changed files with 278 additions and 162 deletions.
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/am335x-phycore-som.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,10 +252,10 @@
};

vdd1_reg: regulator@2 {
/* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */
/* VDD_MPU voltage limits 0.95V - 1.325V with +/-4% tolerance */
regulator-name = "vdd_mpu";
regulator-min-microvolt = <912500>;
regulator-max-microvolt = <1312500>;
regulator-max-microvolt = <1378000>;
regulator-boot-on;
regulator-always-on;
};
Expand Down
46 changes: 29 additions & 17 deletions arch/arm/boot/dts/am57xx-beagle-x15.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,6 @@
pinctrl-0 = <&extcon_usb1_pins>;
};

extcon_usb2: extcon_usb2 {
compatible = "linux,extcon-usb-gpio";
id-gpio = <&gpio7 24 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&extcon_usb2_pins>;
};

hdmi0: connector {
compatible = "hdmi-connector";
label = "hdmi";
Expand Down Expand Up @@ -326,12 +319,6 @@
>;
};

extcon_usb2_pins: extcon_usb2_pins {
pinctrl-single,pins = <
0x3e8 (PIN_INPUT_PULLUP | MUX_MODE14) /* uart1_ctsn.gpio7_24 */
>;
};

tpd12s015_pins: pinmux_tpd12s015_pins {
pinctrl-single,pins = <
0x3b0 (PIN_OUTPUT | MUX_MODE14) /* gpio7_10 CT_CP_HPD */
Expand Down Expand Up @@ -432,14 +419,23 @@
};

ldo3_reg: ldo3 {
/* VDDA_1V8_PHY */
/* VDDA_1V8_PHYA */
regulator-name = "ldo3";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
regulator-boot-on;
};

ldo4_reg: ldo4 {
/* VDDA_1V8_PHYB */
regulator-name = "ldo4";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
regulator-boot-on;
};

ldo9_reg: ldo9 {
/* VDD_RTC */
regulator-name = "ldo9";
Expand Down Expand Up @@ -495,6 +491,14 @@
gpio-controller;
#gpio-cells = <2>;
};

extcon_usb2: tps659038_usb {
compatible = "ti,palmas-usb-vid";
ti,enable-vbus-detection;
ti,enable-id-detection;
id-gpios = <&gpio7 24 GPIO_ACTIVE_HIGH>;
};

};

tmp102: tmp102@48 {
Expand All @@ -517,7 +521,8 @@
mcp_rtc: rtc@6f {
compatible = "microchip,mcp7941x";
reg = <0x6f>;
interrupts = <GIC_SPI 2 IRQ_TYPE_EDGE_RISING>; /* IRQ_SYS_1N */
interrupts-extended = <&crossbar_mpu GIC_SPI 2 IRQ_TYPE_EDGE_RISING>,
<&dra7_pmx_core 0x424>;

pinctrl-names = "default";
pinctrl-0 = <&mcp79410_pins_default>;
Expand Down Expand Up @@ -579,7 +584,6 @@
pinctrl-0 = <&mmc1_pins_default>;

vmmc-supply = <&ldo1_reg>;
vmmc_aux-supply = <&vdd_3v3>;
bus-width = <4>;
cd-gpios = <&gpio6 27 0>; /* gpio 219 */
};
Expand Down Expand Up @@ -623,6 +627,14 @@
};

&usb2 {
/*
* Stand alone usage is peripheral only.
* However, with some resistor modifications
* this port can be used via expansion connectors
* as "host" or "dual-role". If so, provide
* the necessary dr_mode override in the expansion
* board's DT.
*/
dr_mode = "peripheral";
};

Expand Down Expand Up @@ -681,7 +693,7 @@

&hdmi {
status = "ok";
vdda-supply = <&ldo3_reg>;
vdda-supply = <&ldo4_reg>;

pinctrl-names = "default";
pinctrl-0 = <&hdmi_pins>;
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/dm8148-evm.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@

&cpsw_emac0 {
phy_id = <&davinci_mdio>, <0>;
phy-mode = "mii";
phy-mode = "rgmii";
};

&cpsw_emac1 {
phy_id = <&davinci_mdio>, <1>;
phy-mode = "mii";
phy-mode = "rgmii";
};
6 changes: 3 additions & 3 deletions arch/arm/boot/dts/dm8148-t410.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "dm814x.dtsi"

/ {
model = "DM8148 EVM";
model = "HP t410 Smart Zero Client";
compatible = "hp,t410", "ti,dm8148";

memory {
Expand All @@ -19,10 +19,10 @@

&cpsw_emac0 {
phy_id = <&davinci_mdio>, <0>;
phy-mode = "mii";
phy-mode = "rgmii";
};

&cpsw_emac1 {
phy_id = <&davinci_mdio>, <1>;
phy-mode = "mii";
phy-mode = "rgmii";
};
8 changes: 4 additions & 4 deletions arch/arm/boot/dts/dm814x.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,9 +181,9 @@
ti,hwmods = "timer3";
};

control: control@160000 {
control: control@140000 {
compatible = "ti,dm814-scm", "simple-bus";
reg = <0x160000 0x16d000>;
reg = <0x140000 0x16d000>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0 0x160000 0x16d000>;
Expand Down Expand Up @@ -321,9 +321,9 @@
mac-address = [ 00 00 00 00 00 00 ];
};

phy_sel: cpsw-phy-sel@0x48160650 {
phy_sel: cpsw-phy-sel@48140650 {
compatible = "ti,am3352-cpsw-phy-sel";
reg= <0x48160650 0x4>;
reg= <0x48140650 0x4>;
reg-names = "gmii-sel";
};
};
Expand Down
5 changes: 3 additions & 2 deletions arch/arm/boot/dts/dra7.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,10 @@
reg = <0x0 0x1400>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0 0x0 0x1400>;

pbias_regulator: pbias_regulator {
compatible = "ti,pbias-omap";
compatible = "ti,pbias-dra7", "ti,pbias-omap";
reg = <0xe00 0x4>;
syscon = <&scm_conf>;
pbias_mmc_reg: pbias_mmc_omap5 {
Expand Down Expand Up @@ -1417,7 +1418,7 @@
ti,irqs-safe-map = <0>;
};

mac: ethernet@4a100000 {
mac: ethernet@48484000 {
compatible = "ti,dra7-cpsw","ti,cpsw";
ti,hwmods = "gmac";
clocks = <&dpll_gmac_ck>, <&gmac_gmii_ref_clk_div>;
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/omap2430.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,15 @@
reg = <0x270 0x240>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0 0x270 0x240>;

scm_clocks: clocks {
#address-cells = <1>;
#size-cells = <0>;
};

pbias_regulator: pbias_regulator {
compatible = "ti,pbias-omap";
compatible = "ti,pbias-omap2", "ti,pbias-omap";
reg = <0x230 0x4>;
syscon = <&scm_conf>;
pbias_mmc_reg: pbias_mmc_omap2430 {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/omap3-beagle.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@

tfp410_pins: pinmux_tfp410_pins {
pinctrl-single,pins = <
0x194 (PIN_OUTPUT | MUX_MODE4) /* hdq_sio.gpio_170 */
0x196 (PIN_OUTPUT | MUX_MODE4) /* hdq_sio.gpio_170 */
>;
};

Expand Down
6 changes: 0 additions & 6 deletions arch/arm/boot/dts/omap3-igep.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,6 @@
>;
};

smsc9221_pins: pinmux_smsc9221_pins {
pinctrl-single,pins = <
0x1a2 (PIN_INPUT | MUX_MODE4) /* mcspi1_cs2.gpio_176 */
>;
};

i2c1_pins: pinmux_i2c1_pins {
pinctrl-single,pins = <
0x18a (PIN_INPUT | MUX_MODE0) /* i2c1_scl.i2c1_scl */
Expand Down
6 changes: 6 additions & 0 deletions arch/arm/boot/dts/omap3-igep0020-common.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,12 @@
OMAP3_CORE1_IOPAD(0x217a, PIN_INPUT | MUX_MODE0) /* uart2_rx.uart2_rx */
>;
};

smsc9221_pins: pinmux_smsc9221_pins {
pinctrl-single,pins = <
OMAP3_CORE1_IOPAD(0x21d2, PIN_INPUT | MUX_MODE4) /* mcspi1_cs2.gpio_176 */
>;
};
};

&omap3_pmx_core2 {
Expand Down
25 changes: 13 additions & 12 deletions arch/arm/boot/dts/omap3.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,22 @@
};

scm_conf: scm_conf@270 {
compatible = "syscon";
compatible = "syscon", "simple-bus";
reg = <0x270 0x330>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0 0x270 0x330>;

pbias_regulator: pbias_regulator {
compatible = "ti,pbias-omap3", "ti,pbias-omap";
reg = <0x2b0 0x4>;
syscon = <&scm_conf>;
pbias_mmc_reg: pbias_mmc_omap2430 {
regulator-name = "pbias_mmc_omap2430";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3000000>;
};
};

scm_clocks: clocks {
#address-cells = <1>;
Expand Down Expand Up @@ -202,17 +214,6 @@
dma-requests = <96>;
};

pbias_regulator: pbias_regulator {
compatible = "ti,pbias-omap";
reg = <0x2b0 0x4>;
syscon = <&scm_conf>;
pbias_mmc_reg: pbias_mmc_omap2430 {
regulator-name = "pbias_mmc_omap2430";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3000000>;
};
};

gpio1: gpio@48310000 {
compatible = "ti,omap3-gpio";
reg = <0x48310000 0x200>;
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/omap4.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,10 @@
reg = <0x5a0 0x170>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0 0x5a0 0x170>;

pbias_regulator: pbias_regulator {
compatible = "ti,pbias-omap";
compatible = "ti,pbias-omap4", "ti,pbias-omap";
reg = <0x60 0x4>;
syscon = <&omap4_padconf_global>;
pbias_mmc_reg: pbias_mmc_omap4 {
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/omap5-uevm.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,8 @@

i2c5_pins: pinmux_i2c5_pins {
pinctrl-single,pins = <
0x184 (PIN_INPUT | MUX_MODE0) /* i2c5_scl */
0x186 (PIN_INPUT | MUX_MODE0) /* i2c5_sda */
0x186 (PIN_INPUT | MUX_MODE0) /* i2c5_scl */
0x188 (PIN_INPUT | MUX_MODE0) /* i2c5_sda */
>;
};

Expand Down
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/omap5.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,10 @@
reg = <0x5a0 0xec>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0 0x5a0 0xec>;

pbias_regulator: pbias_regulator {
compatible = "ti,pbias-omap";
compatible = "ti,pbias-omap5", "ti,pbias-omap";
reg = <0x60 0x4>;
syscon = <&omap5_padconf_global>;
pbias_mmc_reg: pbias_mmc_omap5 {
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/rk3288-veyron.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@
};

&hdmi {
ddc-i2c-bus = <&i2c5>;
status = "okay";
};

Expand Down
Loading

0 comments on commit 685b5f1

Please sign in to comment.