Skip to content

Commit

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

Pull ARM SoC fixes from Arnd Bergmann:
 "These bug fixes are for the largest part for mvebu/kirkwood, which saw
  a few regressions after the clock infrastructure was enabled, and for
  OMAP, which showed a few more preexisting bugs with the new
  multiplatform support.

  Other small fixes are for imx, mxs, tegra, spear and socfpga"

* tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (37 commits)
  ARM: spear3xx: Use correct pl080 header file
  Arm: socfpga: pl330: Add #dma-cells for generic dma binding support
  ARM: multiplatform: Sort the max gpio numbers.
  ARM: imx: fix typo "DEBUG_IMX50_IMX53_UART"
  ARM: imx: pll1_sys should be an initial on clk
  arm: mach-orion5x: fix typo in compatible string of a .dts file
  arm: mvebu: fix address-cells in mpic DT node
  arm: plat-orion: fix address decoding when > 4GB is used
  arm: mvebu: Reduce reg-io-width with UARTs
  ARM: Dove: add RTC device node
  arm: mvebu: enable the USB ports on Armada 370 Reference Design board
  ARM: dove: drop "select COMMON_CLK_DOVE"
  rtc: rtc-mv: Add support for clk to avoid lockups
  gpio: mvebu: Add clk support to prevent lockup
  ARM: kirkwood: fix to retain gbe MAC addresses for DT kernels
  ARM: kirkwood: of_serial: fix clock gating by removing clock-frequency
  ARM: mxs: cfa10049: Fix fb initialisation function
  ARM: SPEAr13xx: Fix typo "ARCH_HAVE_CPUFREQ"
  ARM: OMAP: RX-51: add missing USB phy binding
  clk: Tegra: Remove duplicate smp_twd clock
  ...
  • Loading branch information
@torvalds
torvalds committed Mar 12, 2013
2 parents 4388817 + 27f423f commit 6d9431a
Show file tree
Hide file tree
Showing 57 changed files with 131 additions and 97 deletions.
8 changes: 5 additions & 3 deletions arch/arm/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,6 @@ config ARCH_IXP4XX
config ARCH_DOVE
bool "Marvell Dove"
select ARCH_REQUIRE_GPIOLIB
select COMMON_CLK_DOVE
select CPU_V7
select GENERIC_CLOCKEVENTS
select MIGHT_HAVE_PCI
Expand Down Expand Up @@ -1657,13 +1656,16 @@ config LOCAL_TIMERS
accounting to be spread across the timer interval, preventing a
"thundering herd" at every timer tick.

# The GPIO number here must be sorted by descending number. In case of
# a multiplatform kernel, we just want the highest value required by the
# selected platforms.
config ARCH_NR_GPIO
int
default 1024 if ARCH_SHMOBILE || ARCH_TEGRA
default 355 if ARCH_U8500
default 264 if MACH_H4700
default 512 if SOC_OMAP5
default 355 if ARCH_U8500
default 288 if ARCH_VT8500 || ARCH_SUNXI
default 264 if MACH_H4700
default 0
help
Maximum number of GPIOs in the system.
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/Kconfig.debug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ config DEBUG_IMX_UART_PORT
DEBUG_IMX31_UART || \
DEBUG_IMX35_UART || \
DEBUG_IMX51_UART || \
DEBUG_IMX50_IMX53_UART || \
DEBUG_IMX53_UART || \
DEBUG_IMX6Q_UART
default 1
help
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,4 +115,4 @@ i:
$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \
$(obj)/Image System.map "$(INSTALL_PATH)"

subdir- := bootp compressed
subdir- := bootp compressed dts
8 changes: 8 additions & 0 deletions arch/arm/boot/dts/armada-370-rd.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,13 @@
status = "okay";
/* No CD or WP GPIOs */
};

usb@d0050000 {
status = "okay";
};

usb@d0051000 {
status = "okay";
};
};
};
5 changes: 2 additions & 3 deletions arch/arm/boot/dts/armada-370-xp.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
mpic: interrupt-controller@d0020000 {
compatible = "marvell,mpic";
#interrupt-cells = <1>;
#address-cells = <1>;
#size-cells = <1>;
interrupt-controller;
};
Expand All @@ -54,15 +53,15 @@
reg = <0xd0012000 0x100>;
reg-shift = <2>;
interrupts = <41>;
reg-io-width = <4>;
reg-io-width = <1>;
status = "disabled";
};
serial@d0012100 {
compatible = "snps,dw-apb-uart";
reg = <0xd0012100 0x100>;
reg-shift = <2>;
interrupts = <42>;
reg-io-width = <4>;
reg-io-width = <1>;
status = "disabled";
};

Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/armada-xp.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,15 @@
reg = <0xd0012200 0x100>;
reg-shift = <2>;
interrupts = <43>;
reg-io-width = <4>;
reg-io-width = <1>;
status = "disabled";
};
serial@d0012300 {
compatible = "snps,dw-apb-uart";
reg = <0xd0012300 0x100>;
reg-shift = <2>;
interrupts = <44>;
reg-io-width = <4>;
reg-io-width = <1>;
status = "disabled";
};

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/bcm2835.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
compatible = "fixed-clock";
reg = <1>;
#clock-cells = <0>;
clock-frequency = <150000000>;
clock-frequency = <250000000>;
};
};
};
5 changes: 5 additions & 0 deletions arch/arm/boot/dts/dove.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,11 @@
status = "disabled";
};

rtc@d8500 {
compatible = "marvell,orion-rtc";
reg = <0xd8500 0x20>;
};

crypto: crypto@30000 {
compatible = "marvell,orion-crypto";
reg = <0x30000 0x10000>,
Expand Down
3 changes: 1 addition & 2 deletions arch/arm/boot/dts/imx53-mba53.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,9 @@
fsl,pins = <689 0x10000 /* DISP1_DRDY */
482 0x10000 /* DISP1_HSYNC */
489 0x10000 /* DISP1_VSYNC */
684 0x10000 /* DISP1_DAT_0 */
515 0x10000 /* DISP1_DAT_22 */
523 0x10000 /* DISP1_DAT_23 */
543 0x10000 /* DISP1_DAT_21 */
545 0x10000 /* DISP1_DAT_21 */
553 0x10000 /* DISP1_DAT_20 */
558 0x10000 /* DISP1_DAT_19 */
564 0x10000 /* DISP1_DAT_18 */
Expand Down
2 changes: 0 additions & 2 deletions arch/arm/boot/dts/kirkwood-dns320.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,10 @@

ocp@f1000000 {
serial@12000 {
clock-frequency = <166666667>;
status = "okay";
};

serial@12100 {
clock-frequency = <166666667>;
status = "okay";
};
};
Expand Down
1 change: 0 additions & 1 deletion arch/arm/boot/dts/kirkwood-dns325.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
};
};
serial@12000 {
clock-frequency = <200000000>;
status = "okay";
};
};
Expand Down
1 change: 0 additions & 1 deletion arch/arm/boot/dts/kirkwood-dockstar.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
};
};
serial@12000 {
clock-frequency = <200000000>;
status = "ok";
};

Expand Down
1 change: 0 additions & 1 deletion arch/arm/boot/dts/kirkwood-dreamplug.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
};
};
serial@12000 {
clock-frequency = <200000000>;
status = "ok";
};

Expand Down
1 change: 0 additions & 1 deletion arch/arm/boot/dts/kirkwood-goflexnet.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
};
};
serial@12000 {
clock-frequency = <200000000>;
status = "ok";
};

Expand Down
1 change: 0 additions & 1 deletion arch/arm/boot/dts/kirkwood-ib62x0.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
};
};
serial@12000 {
clock-frequency = <200000000>;
status = "okay";
};

Expand Down
1 change: 0 additions & 1 deletion arch/arm/boot/dts/kirkwood-iconnect.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@
};
};
serial@12000 {
clock-frequency = <200000000>;
status = "ok";
};

Expand Down
1 change: 0 additions & 1 deletion arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@
};

serial@12000 {
clock-frequency = <200000000>;
status = "ok";
};

Expand Down
1 change: 0 additions & 1 deletion arch/arm/boot/dts/kirkwood-km_kirkwood.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
};

serial@12000 {
clock-frequency = <200000000>;
status = "ok";
};

Expand Down
1 change: 0 additions & 1 deletion arch/arm/boot/dts/kirkwood-lschlv2.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

ocp@f1000000 {
serial@12000 {
clock-frequency = <166666667>;
status = "okay";
};
};
Expand Down
1 change: 0 additions & 1 deletion arch/arm/boot/dts/kirkwood-lsxhl.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

ocp@f1000000 {
serial@12000 {
clock-frequency = <200000000>;
status = "okay";
};
};
Expand Down
1 change: 0 additions & 1 deletion arch/arm/boot/dts/kirkwood-mplcec4.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@
};

serial@12000 {
clock-frequency = <200000000>;
status = "ok";
};

Expand Down
1 change: 0 additions & 1 deletion arch/arm/boot/dts/kirkwood-ns2-common.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
};

serial@12000 {
clock-frequency = <166666667>;
status = "okay";
};

Expand Down
1 change: 0 additions & 1 deletion arch/arm/boot/dts/kirkwood-nsa310.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@
};

serial@12000 {
clock-frequency = <200000000>;
status = "ok";
};

Expand Down
2 changes: 0 additions & 2 deletions arch/arm/boot/dts/kirkwood-openblocks_a6.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,10 @@

ocp@f1000000 {
serial@12000 {
clock-frequency = <200000000>;
status = "ok";
};

serial@12100 {
clock-frequency = <200000000>;
status = "ok";
};

Expand Down
1 change: 0 additions & 1 deletion arch/arm/boot/dts/kirkwood-topkick.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@
};

serial@12000 {
clock-frequency = <200000000>;
status = "ok";
};

Expand Down
5 changes: 3 additions & 2 deletions arch/arm/boot/dts/kirkwood.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
interrupt-controller;
#interrupt-cells = <2>;
interrupts = <35>, <36>, <37>, <38>;
clocks = <&gate_clk 7>;
};

gpio1: gpio@10140 {
Expand All @@ -49,6 +50,7 @@
interrupt-controller;
#interrupt-cells = <2>;
interrupts = <39>, <40>, <41>;
clocks = <&gate_clk 7>;
};

serial@12000 {
Expand All @@ -57,7 +59,6 @@
reg-shift = <2>;
interrupts = <33>;
clocks = <&gate_clk 7>;
/* set clock-frequency in board dts */
status = "disabled";
};

Expand All @@ -67,14 +68,14 @@
reg-shift = <2>;
interrupts = <34>;
clocks = <&gate_clk 7>;
/* set clock-frequency in board dts */
status = "disabled";
};

rtc@10300 {
compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc";
reg = <0x10300 0x20>;
interrupts = <53>;
clocks = <&gate_clk 7>;
};

spi@10600 {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

/ {
model = "LaCie Ethernet Disk mini V2";
compatible = "lacie,ethernet-disk-mini-v2", "marvell-orion5x-88f5182", "marvell,orion5x";
compatible = "lacie,ethernet-disk-mini-v2", "marvell,orion5x-88f5182", "marvell,orion5x";

memory {
reg = <0x00000000 0x4000000>; /* 64 MB */
Expand Down
3 changes: 3 additions & 0 deletions arch/arm/boot/dts/socfpga.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@
compatible = "arm,pl330", "arm,primecell";
reg = <0xffe01000 0x1000>;
interrupts = <0 180 4>;
#dma-cells = <1>;
#dma-channels = <8>;
#dma-requests = <32>;
};
};

Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/tegra20.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@
compatible = "arm,cortex-a9-twd-timer";
reg = <0x50040600 0x20>;
interrupts = <1 13 0x304>;
clocks = <&tegra_car 132>;
};

intc: interrupt-controller {
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/tegra30.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@
compatible = "arm,cortex-a9-twd-timer";
reg = <0x50040600 0x20>;
interrupts = <1 13 0xf04>;
clocks = <&tegra_car 214>;
};

intc: interrupt-controller {
Expand Down
1 change: 1 addition & 0 deletions arch/arm/configs/mxs_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ CONFIG_SND_SOC=y
CONFIG_SND_MXS_SOC=y
CONFIG_SND_SOC_MXS_SGTL5000=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_CHIPIDEA=y
CONFIG_USB_CHIPIDEA_HOST=y
CONFIG_USB_STORAGE=y
Expand Down
2 changes: 2 additions & 0 deletions arch/arm/configs/omap2plus_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ CONFIG_INPUT_MISC=y
CONFIG_INPUT_TWL4030_PWRBUTTON=y
CONFIG_VT_HW_CONSOLE_BINDING=y
# CONFIG_LEGACY_PTYS is not set
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_NR_UARTS=32
CONFIG_SERIAL_8250_EXTENDED=y
CONFIG_SERIAL_8250_MANY_PORTS=y
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-imx/clk-imx6q.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ static struct clk *clk[clk_max];
static struct clk_onecell_data clk_data;

static enum mx6q_clks const clks_init_on[] __initconst = {
mmdc_ch0_axi, rom,
mmdc_ch0_axi, rom, pll1_sys,
};

static struct clk_div_table clk_enet_ref_table[] = {
Expand Down
Loading

0 comments on commit 6d9431a

Please sign in to comment.