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

Commit 7b9e3a6a 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 from Olof Johansson:
 "A set of fixes for ARM platforms for 3.12.  Among them:

   - A fix for build breakage in the MTD subsystem for some PXA devices.
     David Woodhouse has this patch in his for-next branch but has not
     been responding to our requests to send it up so here it is.  I
     should have amended the commit message to describe the build
     failure for CONFIG_OF=n setups, but forgot and now it's down in the
     stack of commits.

   - Added device-tree for the BeagleBone Black.  Turns out people have
     been using the older "regualar" bone DT for the newer boards, and
     there's risk of damaging hardware that way.

   - Misc DT and regular fixes for OMAP.

   - Fix to make the ST-Ericsson "snowball" boards boot with
     multi_v7_defconfig, and enable one of the ST-E reference boards on
     the same config.

   - Kconfig cleanup for u300 to hide submenus when the platform isn't
     enabled.

   - Enable ARM_ATAG_DTB_COMPAT to let firmware override command line
     when booting with an appended devicetree on non-DT-enabled firmware
     (needed to boot snowball)"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (26 commits)
  ARM: multi_v7: add HREFv60 to multi_v7 defconfig
  ARM: OMAP2+: mux: fix trivial typo in name
  ARM: OMAP4 SMP: Corrected a typo fucntions to functions
  ARM: OMAP4: cpuidle: fix: call cpu_cluster_pm_exit conditionally
  mailbox: remove unnecessary platform_set_drvdata()
  ARM: mach-omap2: gpmc: Fix warning when CONFIG_ARM_LPAE=y
  ARM: OMAP: fix return value check in omap_device_build_from_dt()
  ARM: OMAP4: Fix clock_get error for GPMC during boot
  ARM: sa1100: collie.c: fall back to jedec_probe flash detection
  ARM: u300: hide submenus
  ARM: dts: igep00x0: Add pinmux configuration for MCBSP2
  ARM: dts: Fix muxing and regulator for wl12xx on the SDIO bus for blaze
  ARM: dts: Fix muxing and regulator for wl12xx on the SDIO bus for pandaboard
  mtd: nand: pxa3xx: Remove unneeded ifdef CONFIG_OF
  ARM: multi_v7_defconfig: enable ARM_ATAG_DTB_COMPAT
  ARM: ux500: disable outer cache debug
  ARM: dts: OMAP5: fix ocp2scp DTS data
  ARM: dts: OMAP5: fix reg property size
  ARM: dts: am335x-bone*: add DT for BeagleBone Black
  ARM: dts: omap3-beagle-xm: fix string error in compatible property
  ...
parents b75ff5e8 660e1c2f

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ 
	am335x-evm.dtb \

	am335x-evmsk.dtb \

	am335x-bone.dtb \

	am335x-boneblack.dtb \

	am3517-evm.dtb \

	am3517_mt_ventoux.dtb \

	am43x-epos-evm.dtb

arch/arm/boot/dts/am335x-bone-common.dtsi

0 → 100644
+262 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



/ {

	model = "TI AM335x BeagleBone";

	compatible = "ti,am335x-bone", "ti,am33xx";



	cpus {

		cpu@0 {

			cpu0-supply = <&dcdc2_reg>;

		};

	};



	memory {

		device_type = "memory";

		reg = <0x80000000 0x10000000>; /* 256 MB */

	};



	am33xx_pinmux: pinmux@44e10800 {

		pinctrl-names = "default";

		pinctrl-0 = <&clkout2_pin>;



		user_leds_s0: user_leds_s0 {

			pinctrl-single,pins = <

				0x54 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a5.gpio1_21 */

				0x58 (PIN_OUTPUT_PULLUP | MUX_MODE7)	/* gpmc_a6.gpio1_22 */

				0x5c (PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a7.gpio1_23 */

				0x60 (PIN_OUTPUT_PULLUP | MUX_MODE7)	/* gpmc_a8.gpio1_24 */

			>;

		};



		i2c0_pins: pinmux_i2c0_pins {

			pinctrl-single,pins = <

				0x188 (PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c0_sda.i2c0_sda */

				0x18c (PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c0_scl.i2c0_scl */

			>;

		};



		uart0_pins: pinmux_uart0_pins {

			pinctrl-single,pins = <

				0x170 (PIN_INPUT_PULLUP | MUX_MODE0)	/* uart0_rxd.uart0_rxd */

				0x174 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* uart0_txd.uart0_txd */

			>;

		};



		clkout2_pin: pinmux_clkout2_pin {

			pinctrl-single,pins = <

				0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3)	/* xdma_event_intr1.clkout2 */

			>;

		};



		cpsw_default: cpsw_default {

			pinctrl-single,pins = <

				/* Slave 1 */

				0x110 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxerr.mii1_rxerr */

				0x114 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txen.mii1_txen */

				0x118 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxdv.mii1_rxdv */

				0x11c (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd3.mii1_txd3 */

				0x120 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd2.mii1_txd2 */

				0x124 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd1.mii1_txd1 */

				0x128 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd0.mii1_txd0 */

				0x12c (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_txclk.mii1_txclk */

				0x130 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxclk.mii1_rxclk */

				0x134 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd3.mii1_rxd3 */

				0x138 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd2.mii1_rxd2 */

				0x13c (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd1.mii1_rxd1 */

				0x140 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd0.mii1_rxd0 */

			>;

		};



		cpsw_sleep: cpsw_sleep {

			pinctrl-single,pins = <

				/* Slave 1 reset value */

				0x110 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x114 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x118 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x11c (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x120 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x124 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x128 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x12c (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x130 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x134 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x138 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x13c (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x140 (PIN_INPUT_PULLDOWN | MUX_MODE7)

			>;

		};



		davinci_mdio_default: davinci_mdio_default {

			pinctrl-single,pins = <

				/* MDIO */

				0x148 (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0)	/* mdio_data.mdio_data */

				0x14c (PIN_OUTPUT_PULLUP | MUX_MODE0)			/* mdio_clk.mdio_clk */

			>;

		};



		davinci_mdio_sleep: davinci_mdio_sleep {

			pinctrl-single,pins = <

				/* MDIO reset value */

				0x148 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7)

			>;

		};

	};



	ocp {

		uart0: serial@44e09000 {

			pinctrl-names = "default";

			pinctrl-0 = <&uart0_pins>;



			status = "okay";

		};



		musb: usb@47400000 {

			status = "okay";



			control@44e10000 {

				status = "okay";

			};



			usb-phy@47401300 {

				status = "okay";

			};



			usb-phy@47401b00 {

				status = "okay";

			};



			usb@47401000 {

				status = "okay";

			};



			usb@47401800 {

				status = "okay";

				dr_mode = "host";

			};



			dma-controller@07402000  {

				status = "okay";

			};

		};



		i2c0: i2c@44e0b000 {

			pinctrl-names = "default";

			pinctrl-0 = <&i2c0_pins>;



			status = "okay";

			clock-frequency = <400000>;



			tps: tps@24 {

				reg = <0x24>;

			};



		};

	};



	leds {

		pinctrl-names = "default";

		pinctrl-0 = <&user_leds_s0>;



		compatible = "gpio-leds";



		led@2 {

			label = "beaglebone:green:heartbeat";

			gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "heartbeat";

			default-state = "off";

		};



		led@3 {

			label = "beaglebone:green:mmc0";

			gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "mmc0";

			default-state = "off";

		};



		led@4 {

			label = "beaglebone:green:usr2";

			gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};



		led@5 {

			label = "beaglebone:green:usr3";

			gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

	};

};



/include/ "tps65217.dtsi"



&tps {

	regulators {

		dcdc1_reg: regulator@0 {

			regulator-always-on;

		};



		dcdc2_reg: regulator@1 {

			/* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */

			regulator-name = "vdd_mpu";

			regulator-min-microvolt = <925000>;

			regulator-max-microvolt = <1325000>;

			regulator-boot-on;

			regulator-always-on;

		};



		dcdc3_reg: regulator@2 {

			/* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */

			regulator-name = "vdd_core";

			regulator-min-microvolt = <925000>;

			regulator-max-microvolt = <1150000>;

			regulator-boot-on;

			regulator-always-on;

		};



		ldo1_reg: regulator@3 {

			regulator-always-on;

		};



		ldo2_reg: regulator@4 {

			regulator-always-on;

		};



		ldo3_reg: regulator@5 {

			regulator-always-on;

		};



		ldo4_reg: regulator@6 {

			regulator-always-on;

		};

	};

};



&cpsw_emac0 {

	phy_id = <&davinci_mdio>, <0>;

	phy-mode = "mii";

};



&cpsw_emac1 {

	phy_id = <&davinci_mdio>, <1>;

	phy-mode = "mii";

};



&mac {

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&cpsw_default>;

	pinctrl-1 = <&cpsw_sleep>;



};



&davinci_mdio {

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&davinci_mdio_default>;

	pinctrl-1 = <&davinci_mdio_sleep>;

};

arch/arm/boot/dts/am335x-bone.dts

+1 −255
Original line number Diff line number Diff line
@@ -8,258 +8,4 @@ 
/dts-v1/;



#include "am33xx.dtsi"



/ {

	model = "TI AM335x BeagleBone";

	compatible = "ti,am335x-bone", "ti,am33xx";



	cpus {

		cpu@0 {

			cpu0-supply = <&dcdc2_reg>;

		};

	};



	memory {

		device_type = "memory";

		reg = <0x80000000 0x10000000>; /* 256 MB */

	};



	am33xx_pinmux: pinmux@44e10800 {

		pinctrl-names = "default";

		pinctrl-0 = <&clkout2_pin>;



		user_leds_s0: user_leds_s0 {

			pinctrl-single,pins = <

				0x54 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a5.gpio1_21 */

				0x58 (PIN_OUTPUT_PULLUP | MUX_MODE7)	/* gpmc_a6.gpio1_22 */

				0x5c (PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a7.gpio1_23 */

				0x60 (PIN_OUTPUT_PULLUP | MUX_MODE7)	/* gpmc_a8.gpio1_24 */

			>;

		};



		i2c0_pins: pinmux_i2c0_pins {

			pinctrl-single,pins = <

				0x188 (PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c0_sda.i2c0_sda */

				0x18c (PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c0_scl.i2c0_scl */

			>;

		};



		uart0_pins: pinmux_uart0_pins {

			pinctrl-single,pins = <

				0x170 (PIN_INPUT_PULLUP | MUX_MODE0)	/* uart0_rxd.uart0_rxd */

				0x174 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* uart0_txd.uart0_txd */

			>;

		};



		clkout2_pin: pinmux_clkout2_pin {

			pinctrl-single,pins = <

				0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3)	/* xdma_event_intr1.clkout2 */

			>;

		};



		cpsw_default: cpsw_default {

			pinctrl-single,pins = <

				/* Slave 1 */

				0x110 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxerr.mii1_rxerr */

				0x114 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txen.mii1_txen */

				0x118 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxdv.mii1_rxdv */

				0x11c (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd3.mii1_txd3 */

				0x120 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd2.mii1_txd2 */

				0x124 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd1.mii1_txd1 */

				0x128 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd0.mii1_txd0 */

				0x12c (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_txclk.mii1_txclk */

				0x130 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxclk.mii1_rxclk */

				0x134 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd3.mii1_rxd3 */

				0x138 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd2.mii1_rxd2 */

				0x13c (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd1.mii1_rxd1 */

				0x140 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd0.mii1_rxd0 */

			>;

		};



		cpsw_sleep: cpsw_sleep {

			pinctrl-single,pins = <

				/* Slave 1 reset value */

				0x110 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x114 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x118 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x11c (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x120 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x124 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x128 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x12c (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x130 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x134 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x138 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x13c (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x140 (PIN_INPUT_PULLDOWN | MUX_MODE7)

			>;

		};



		davinci_mdio_default: davinci_mdio_default {

			pinctrl-single,pins = <

				/* MDIO */

				0x148 (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0)	/* mdio_data.mdio_data */

				0x14c (PIN_OUTPUT_PULLUP | MUX_MODE0)			/* mdio_clk.mdio_clk */

			>;

		};



		davinci_mdio_sleep: davinci_mdio_sleep {

			pinctrl-single,pins = <

				/* MDIO reset value */

				0x148 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7)

			>;

		};

	};



	ocp {

		uart0: serial@44e09000 {

			pinctrl-names = "default";

			pinctrl-0 = <&uart0_pins>;



			status = "okay";

		};



		musb: usb@47400000 {

			status = "okay";



			control@44e10000 {

				status = "okay";

			};



			usb-phy@47401300 {

				status = "okay";

			};



			usb-phy@47401b00 {

				status = "okay";

			};



			usb@47401000 {

				status = "okay";

			};



			usb@47401800 {

				status = "okay";

				dr_mode = "host";

			};



			dma-controller@07402000  {

				status = "okay";

			};

		};



		i2c0: i2c@44e0b000 {

			pinctrl-names = "default";

			pinctrl-0 = <&i2c0_pins>;



			status = "okay";

			clock-frequency = <400000>;



			tps: tps@24 {

				reg = <0x24>;

			};



		};

	};



	leds {

		pinctrl-names = "default";

		pinctrl-0 = <&user_leds_s0>;



		compatible = "gpio-leds";



		led@2 {

			label = "beaglebone:green:heartbeat";

			gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "heartbeat";

			default-state = "off";

		};



		led@3 {

			label = "beaglebone:green:mmc0";

			gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "mmc0";

			default-state = "off";

		};



		led@4 {

			label = "beaglebone:green:usr2";

			gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};



		led@5 {

			label = "beaglebone:green:usr3";

			gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

	};

};



/include/ "tps65217.dtsi"



&tps {

	regulators {

		dcdc1_reg: regulator@0 {

			regulator-always-on;

		};



		dcdc2_reg: regulator@1 {

			/* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */

			regulator-name = "vdd_mpu";

			regulator-min-microvolt = <925000>;

			regulator-max-microvolt = <1325000>;

			regulator-boot-on;

			regulator-always-on;

		};



		dcdc3_reg: regulator@2 {

			/* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */

			regulator-name = "vdd_core";

			regulator-min-microvolt = <925000>;

			regulator-max-microvolt = <1150000>;

			regulator-boot-on;

			regulator-always-on;

		};



		ldo1_reg: regulator@3 {

			regulator-always-on;

		};



		ldo2_reg: regulator@4 {

			regulator-always-on;

		};



		ldo3_reg: regulator@5 {

			regulator-always-on;

		};



		ldo4_reg: regulator@6 {

			regulator-always-on;

		};

	};

};



&cpsw_emac0 {

	phy_id = <&davinci_mdio>, <0>;

	phy-mode = "mii";

};



&cpsw_emac1 {

	phy_id = <&davinci_mdio>, <1>;

	phy-mode = "mii";

};



&mac {

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&cpsw_default>;

	pinctrl-1 = <&cpsw_sleep>;



};



&davinci_mdio {

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&davinci_mdio_default>;

	pinctrl-1 = <&davinci_mdio_sleep>;

};
 
#include "am335x-bone-common.dtsi"

arch/arm/boot/dts/am335x-boneblack.dts

0 → 100644
+17 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

/dts-v1/;



#include "am33xx.dtsi"

#include "am335x-bone-common.dtsi"



&ldo3_reg {

	regulator-min-microvolt = <1800000>;

	regulator-max-microvolt = <1800000>;

	regulator-always-on;

};

arch/arm/boot/dts/imx27.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ 
				compatible = "fsl,imx27-cspi";

				reg = <0x1000e000 0x1000>;

				interrupts = <16>;

				clocks = <&clks 53>, <&clks 53>;

				clocks = <&clks 53>, <&clks 60>;

				clock-names = "ipg", "per";

				status = "disabled";

			};
@@ -198,7 +198,7 @@ 
				compatible = "fsl,imx27-cspi";

				reg = <0x1000f000 0x1000>;

				interrupts = <15>;

				clocks = <&clks 52>, <&clks 52>;

				clocks = <&clks 52>, <&clks 60>;

				clock-names = "ipg", "per";

				status = "disabled";

			};
@@ -309,7 +309,7 @@ 
				compatible = "fsl,imx27-cspi";

				reg = <0x10017000 0x1000>;

				interrupts = <6>;

				clocks = <&clks 51>, <&clks 51>;

				clocks = <&clks 51>, <&clks 60>;

				clock-names = "ipg", "per";

				status = "disabled";

			};