Skip to content

Commit

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

Pull ARM SoC fixes from Arnd Bergmann:
 "The arm-soc bug fixes this time around are mostly for the omap
  platform, coming from a pull request from Tony Lindgren and are almost
  entirely fixing dts files.

  The other two changes enable support for the shmobile platform in
  generic armv7 kernels and change some properties in the ARM64
  reference board dts files"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: multi_v7_defconfig: Enable shmobile platforms
  arm64: Add L2 cache topology to ARM Ltd boards/models
  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
  • Loading branch information
Linus Torvalds committed Feb 28, 2015
2 parents 8d20a3d + 4a3a6f8 commit 895c8b7
Show file tree
Hide file tree
Showing 18 changed files with 190 additions and 72 deletions.
1 change: 1 addition & 0 deletions arch/arm/boot/dts/am335x-bone-common.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@

&usb0 {
status = "okay";
dr_mode = "peripheral";
};

&usb1 {
Expand Down
25 changes: 2 additions & 23 deletions arch/arm/boot/dts/am437x-idk-evm.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -254,25 +240,18 @@
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 {
compatible = "at24,24c256";
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>;
Expand Down
8 changes: 0 additions & 8 deletions arch/arm/boot/dts/am57xx-beagle-x15.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -549,14 +549,6 @@
pinctrl-0 = <&usb1_pins>;
};

&omap_dwc3_1 {
extcon = <&extcon_usb1>;
};

&omap_dwc3_2 {
extcon = <&extcon_usb2>;
};

&usb2 {
dr_mode = "peripheral";
};
25 changes: 25 additions & 0 deletions arch/arm/boot/dts/dm8168-evm.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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>;
};
34 changes: 30 additions & 4 deletions arch/arm/boot/dts/dm816x.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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>;
Expand All @@ -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>;
Expand Down
8 changes: 0 additions & 8 deletions arch/arm/boot/dts/dra7-evm.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -543,14 +543,6 @@
};
};

&omap_dwc3_1 {
extcon = <&extcon_usb1>;
};

&omap_dwc3_2 {
extcon = <&extcon_usb2>;
};

&usb1 {
dr_mode = "peripheral";
pinctrl-names = "default";
Expand Down
8 changes: 4 additions & 4 deletions arch/arm/boot/dts/dra7.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,8 @@
<GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
#dma-cells = <1>;
#dma-channels = <32>;
#dma-requests = <127>;
dma-channels = <32>;
dma-requests = <127>;
};

gpio1: gpio@4ae10000 {
Expand Down Expand Up @@ -1090,8 +1090,8 @@
<0x4A096800 0x40>; /* pll_ctrl */
reg-names = "phy_rx", "phy_tx", "pll_ctrl";
ctrl-module = <&omap_control_sata>;
clocks = <&sys_clkin1>;
clock-names = "sysclk";
clocks = <&sys_clkin1>, <&sata_ref_clk>;
clock-names = "sysclk", "refclk";
#phy-cells = <0>;
};

Expand Down
8 changes: 0 additions & 8 deletions arch/arm/boot/dts/dra72-evm.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -380,14 +380,6 @@
phy-supply = <&ldo4_reg>;
};

&omap_dwc3_1 {
extcon = <&extcon_usb1>;
};

&omap_dwc3_2 {
extcon = <&extcon_usb2>;
};

&usb1 {
dr_mode = "peripheral";
pinctrl-names = "default";
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/omap2.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@
<14>,
<15>;
#dma-cells = <1>;
#dma-channels = <32>;
#dma-requests = <64>;
dma-channels = <32>;
dma-requests = <64>;
};

i2c1: i2c@48070000 {
Expand Down
9 changes: 8 additions & 1 deletion arch/arm/boot/dts/omap3-n900.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@
model = "Nokia N900";
compatible = "nokia,omap3-n900", "ti,omap3430", "ti,omap3";

aliases {
i2c0;
i2c1 = &i2c1;
i2c2 = &i2c2;
i2c3 = &i2c3;
};

cpus {
cpu@0 {
cpu0-supply = <&vcc>;
Expand Down Expand Up @@ -704,7 +711,7 @@
compatible = "smsc,lan91c94";
interrupt-parent = <&gpio2>;
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>;
pinctrl-names = "default";
pinctrl-0 = <&ethernet_pins>;
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/omap3.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,8 @@
<14>,
<15>;
#dma-cells = <1>;
#dma-channels = <32>;
#dma-requests = <96>;
dma-channels = <32>;
dma-requests = <96>;
};

omap3_pmx_core: pinmux@48002030 {
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/omap4.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,8 @@
<GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
#dma-cells = <1>;
#dma-channels = <32>;
#dma-requests = <127>;
dma-channels = <32>;
dma-requests = <127>;
};

gpio1: gpio@4a310000 {
Expand Down
8 changes: 4 additions & 4 deletions arch/arm/boot/dts/omap5.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,8 @@
<GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
#dma-cells = <1>;
#dma-channels = <32>;
#dma-requests = <127>;
dma-channels = <32>;
dma-requests = <127>;
};

gpio1: gpio@4ae10000 {
Expand Down Expand Up @@ -929,8 +929,8 @@
<0x4A096800 0x40>; /* pll_ctrl */
reg-names = "phy_rx", "phy_tx", "pll_ctrl";
ctrl-module = <&omap_control_sata>;
clocks = <&sys_clkin>;
clock-names = "sysclk";
clocks = <&sys_clkin>, <&sata_ref_clk>;
clock-names = "sysclk", "refclk";
#phy-cells = <0>;
};
};
Expand Down
Loading

0 comments on commit 895c8b7

Please sign in to comment.