Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe2e27bb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC fixes for SPEAr from Olof Johansson:
 "These are arriving very late in the release cycle, but there has been
  a change of maintainers on the SPEAr platform and they have needed a
  while to get going.

  The patch count is higher than I would like at this point, but they're
  all relevant fixes and well-contained in their own platform code.  I
  still think it's suitable 3.5 material and I don't think it should
  increase the need for a -rc8 since they are so contained."

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: SPEAr600: Fix timer interrupt definition in spear600.dtsi
  ARM: dts: SPEAr320: Boot the board in EXTENDED_MODE
  ARM: dts: SPEAr320: Fix compatible string
  Clk: SPEAr1340: Update sys clock parent array
  clk: SPEAr1340: Fix clk enable register for uart1 and i2c1.
  ARM: SPEAr13xx: Fix Interrupt bindings
  Clk:spear6xx:Fix: Rename clk ids within predefined limit
  Clk:spear3xx:Fix: Rename clk ids within predefined limit
  clk:spear1310:Fix: Rename clk ids within predefined limit
  clk:spear1340:Fix: Rename clk ids within predefined limit
parents a9866ba4 bae7641b

arch/arm/boot/dts/spear13xx.dtsi

+6 −5
Original line number Original line Diff line number Diff line
@@ -43,8 +43,8 @@ 




	pmu {

	pmu {

		compatible = "arm,cortex-a9-pmu";

		compatible = "arm,cortex-a9-pmu";

		interrupts = <0 8 0x04

		interrupts = <0 6 0x04

			      0 9 0x04>;

			      0 7 0x04>;

	};

	};





	L2: l2-cache {

	L2: l2-cache {
@@ -119,8 +119,8 @@ 
		gmac0: eth@e2000000 {

		gmac0: eth@e2000000 {

			compatible = "st,spear600-gmac";

			compatible = "st,spear600-gmac";

			reg = <0xe2000000 0x8000>;

			reg = <0xe2000000 0x8000>;

			interrupts = <0 23 0x4

			interrupts = <0 33 0x4

				      0 24 0x4>;

				      0 34 0x4>;

			interrupt-names = "macirq", "eth_wake_irq";

			interrupt-names = "macirq", "eth_wake_irq";

			status = "disabled";

			status = "disabled";

		};

		};
@@ -202,6 +202,7 @@ 
			kbd@e0300000 {

			kbd@e0300000 {

				compatible = "st,spear300-kbd";

				compatible = "st,spear300-kbd";

				reg = <0xe0300000 0x1000>;

				reg = <0xe0300000 0x1000>;

				interrupts = <0 52 0x4>;

				status = "disabled";

				status = "disabled";

			};

			};
@@ -224,7 +225,7 @@ 
			serial@e0000000 {

			serial@e0000000 {

				compatible = "arm,pl011", "arm,primecell";

				compatible = "arm,pl011", "arm,primecell";

				reg = <0xe0000000 0x1000>;

				reg = <0xe0000000 0x1000>;

				interrupts = <0 36 0x4>;

				interrupts = <0 35 0x4>;

				status = "disabled";

				status = "disabled";

			};

			};

arch/arm/boot/dts/spear320-evb.dts

+3 −3
Original line number Original line Diff line number Diff line
@@ -15,8 +15,8 @@ 
/include/ "spear320.dtsi"

/include/ "spear320.dtsi"





/ {

/ {

	model = "ST SPEAr300 Evaluation Board";

	model = "ST SPEAr320 Evaluation Board";

	compatible = "st,spear300-evb", "st,spear300";

	compatible = "st,spear320-evb", "st,spear320";

	#address-cells = <1>;

	#address-cells = <1>;

	#size-cells = <1>;

	#size-cells = <1>;
@@ -26,7 +26,7 @@ 




	ahb {

	ahb {

		pinmux@b3000000 {

		pinmux@b3000000 {

			st,pinmux-mode = <3>;

			st,pinmux-mode = <4>;

			pinctrl-names = "default";

			pinctrl-names = "default";

			pinctrl-0 = <&state_default>;

			pinctrl-0 = <&state_default>;

arch/arm/boot/dts/spear600.dtsi

+1 −0
Original line number Original line Diff line number Diff line
@@ -181,6 +181,7 @@ 
			timer@f0000000 {

			timer@f0000000 {

				compatible = "st,spear-timer";

				compatible = "st,spear-timer";

				reg = <0xf0000000 0x400>;

				reg = <0xf0000000 0x400>;

				interrupt-parent = <&vic0>;

				interrupts = <16>;

				interrupts = <16>;

			};

			};

		};

		};

arch/arm/mach-spear3xx/spear3xx.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -87,7 +87,7 @@ void __init spear3xx_map_io(void) 




static void __init spear3xx_timer_init(void)

static void __init spear3xx_timer_init(void)

{

{

	char pclk_name[] = "pll3_48m_clk";

	char pclk_name[] = "pll3_clk";

	struct clk *gpt_clk, *pclk;

	struct clk *gpt_clk, *pclk;





	spear3xx_clk_init();

	spear3xx_clk_init();

arch/arm/mach-spear6xx/spear6xx.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -423,7 +423,7 @@ void __init spear6xx_map_io(void) 




static void __init spear6xx_timer_init(void)

static void __init spear6xx_timer_init(void)

{

{

	char pclk_name[] = "pll3_48m_clk";

	char pclk_name[] = "pll3_clk";

	struct clk *gpt_clk, *pclk;

	struct clk *gpt_clk, *pclk;





	spear6xx_clk_init();

	spear6xx_clk_init();