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

Commit 150a8dcf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC board specific changes (part 1) from Olof Johansson:
 "These changes are all for board specific files.  These used to make up
  a large portion of the ARM changes in the past, but as we are
  generalizing the support and moving to device tree probing, this has
  gotten significantly smaller.

  The only platform actually adding new code here at the moment is
  Renesas shmobile, as they are still busy converting their code to
  device tree and have not come far enough to not need it."

* tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (43 commits)
  ARM: msm: USB_MSM_OTG needs USB_PHY
  ARM: davinci: da850 evm: fix const qualifier placement
  ARM: davinci: da850 board: add remoteproc support
  ARM: pxa: move debug uart code
  ARM: pxa: select PXA935 on saar & tavorevb
  ARM: mmp: add more compatible names in gpio driver
  ARM: pxa: move PXA_GPIO_TO_IRQ macro
  ARM: pxa: remove cpu_is_xxx in gpio driver
  ARM: Kirkwood: update Network Space Mini v2 description
  ARM: Kirkwood: DT board setup for CloudBox
  ARM: Kirkwood: sort board entries by ASCII-code order
  ARM: OMAP: board-4430sdp: Provide regulator to pwm-backlight
  ARM: OMAP: zoom: Use pwm stack for lcd and keyboard backlight
  ARM: OMAP2+: omap2plus_defconfig: Add support for BMP085 pressure sensor
  omap2+: Remove useless Makefile line
  omap2+: Remove useless Makefile line
  ARM: OMAP: RX-51: add missing regulator supply definitions for lis3lv02d
  ARM: OMAP1: fix omap_udc registration
  ARM: davinci: use is IS_ENABLED macro
  ARM: kirkwood: add MACH_GURUPLUG_DT to defconfig
  ...
parents e3d98847 21bdcc1a

Documentation/devicetree/bindings/gpio/mrvl-gpio.txt

+5 −2
Original line number Diff line number Diff line 
* Marvell PXA GPIO controller



Required properties:

- compatible : Should be "mrvl,pxa-gpio" or "mrvl,mmp-gpio"

- compatible : Should be "intel,pxa25x-gpio", "intel,pxa26x-gpio",

		"intel,pxa27x-gpio", "intel,pxa3xx-gpio",

		"marvell,pxa93x-gpio", "marvell,mmp-gpio" or

		"marvell,mmp2-gpio".

- reg : Address and length of the register set for the device

- interrupts : Should be the port interrupt shared by all gpio pins.

  There're three gpio interrupts in arch-pxa, and they're gpio0,
@@ -18,7 +21,7 @@ Required properties: 
Example:



	gpio: gpio@d4019000 {

		compatible = "mrvl,mmp-gpio";

		compatible = "marvell,mmp-gpio";

		reg = <0xd4019000 0x1000>;

		interrupts = <49>;

		interrupt-name = "gpio_mux";

arch/arm/Kconfig.debug

+12 −3
Original line number Diff line number Diff line
@@ -330,6 +330,13 @@ choice 
		  Say Y here if you want kernel low-level debugging support

		  on PicoXcell based platforms.



	config DEBUG_PXA_UART1

		depends on ARCH_PXA

		bool "Use PXA UART1 for low-level debug"

		help

		  Say Y here if you want kernel low-level debugging support

		  on PXA UART1.



	config DEBUG_REALVIEW_STD_PORT

		bool "RealView Default UART"

		depends on ARCH_REALVIEW
@@ -615,6 +622,7 @@ config DEBUG_LL_INCLUDE 
	default "debug/bcm2835.S" if DEBUG_BCM2835

	default "debug/cns3xxx.S" if DEBUG_CNS3XXX

	default "debug/exynos.S" if DEBUG_EXYNOS_UART

	default "debug/highbank.S" if DEBUG_HIGHBANK_UART

	default "debug/icedcc.S" if DEBUG_ICEDCC

	default "debug/imx.S" if DEBUG_IMX1_UART || \

				 DEBUG_IMX25_UART || \
@@ -624,20 +632,21 @@ config DEBUG_LL_INCLUDE 
				 DEBUG_IMX51_UART || \

				 DEBUG_IMX53_UART ||\

				 DEBUG_IMX6Q_UART

	default "debug/highbank.S" if DEBUG_HIGHBANK_UART

	default "debug/mvebu.S" if DEBUG_MVEBU_UART

	default "debug/mxs.S" if DEBUG_IMX23_UART || DEBUG_IMX28_UART

	default "debug/nomadik.S" if DEBUG_NOMADIK_UART

	default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART

	default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART

	default "debug/pxa.S" if DEBUG_PXA_UART1 || DEBUG_MMP_UART2 || \

				 DEBUG_MMP_UART3

	default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || DEBUG_SIRFMARCO_UART1

	default "debug/socfpga.S" if DEBUG_SOCFPGA_UART

	default "debug/sunxi.S" if DEBUG_SUNXI_UART0 || DEBUG_SUNXI_UART1

	default "debug/tegra.S" if DEBUG_TEGRA_UART

	default "debug/ux500.S" if DEBUG_UX500_UART

	default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \

		DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1

	default "debug/vt8500.S" if DEBUG_VT8500_UART0

	default "debug/tegra.S" if DEBUG_TEGRA_UART

	default "debug/ux500.S" if DEBUG_UX500_UART

	default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1

	default "mach/debug-macro.S"

arch/arm/boot/dts/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -61,7 +61,8 @@ dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb \ 
dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \

	integratorcp.dtb

dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb

dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-dns320.dtb \

dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \

	kirkwood-dns320.dtb \

	kirkwood-dns325.dtb \

	kirkwood-dockstar.dtb \

	kirkwood-dreamplug.dtb \
@@ -75,6 +76,7 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-dns320.dtb \ 
	kirkwood-lschlv2.dtb \

	kirkwood-lsxhl.dtb \

	kirkwood-mplcec4.dtb \

	kirkwood-netgear_readynas_duo_v2.dtb \

	kirkwood-ns2.dtb \

	kirkwood-ns2lite.dtb \

	kirkwood-ns2max.dtb \
@@ -153,7 +155,9 @@ dtb-$(CONFIG_ARCH_U8500) += snowball.dtb \ 
	ccu9540.dtb

dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \

	r8a7740-armadillo800eva.dtb \

	r8a7779-marzen-reference.dtb \

	sh73a0-kzm9g.dtb \

	sh73a0-kzm9g-reference.dtb \

	sh7372-mackerel.dtb

dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_cyclone5.dtb \

	socfpga_vt.dtb

arch/arm/boot/dts/kirkwood-cloudbox.dts

0 → 100644
+89 −0
Original line number Diff line number Diff line 
/dts-v1/;



/include/ "kirkwood.dtsi"

/include/ "kirkwood-6281.dtsi"



/ {

	model = "LaCie CloudBox";

	compatible = "lacie,cloudbox", "marvell,kirkwood-88f6702", "marvell,kirkwood";



	memory {

		device_type = "memory";

		reg = <0x00000000 0x10000000>;

	};



	chosen {

		bootargs = "console=ttyS0,115200n8";

	};



	ocp@f1000000 {

		pinctrl: pinctrl@10000 {

			pinctrl-0 = < &pmx_spi &pmx_uart0

					&pmx_cloudbox_sata0 >;

			pinctrl-names = "default";



			pmx_cloudbox_sata0: pmx-cloudbox-sata0 {

				marvell,pins = "mpp15";

				marvell,function = "sata0";

			};

		};



		serial@12000 {

			clock-frequency = <166666667>;

			status = "okay";

		};



		sata@80000 {

			status = "okay";

			nr-ports = <1>;

		};



		spi@10600 {

			status = "okay";



			flash@0 {

				#address-cells = <1>;

				#size-cells = <1>;

				compatible = "mx25l4005a";

				reg = <0>;

				spi-max-frequency = <20000000>;

				mode = <0>;



				partition@0 {

					reg = <0x0 0x80000>;

					label = "u-boot";

				};

			};

		};

	};



	gpio_keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;



		button@1 {

			label = "Power push button";

			linux,code = <116>;

			gpios = <&gpio0 16 1>;

		};

	};



	gpio-leds {

		compatible = "gpio-leds";



		red-fail {

			label = "cloudbox:red:fail";

			gpios = <&gpio0 14 0>;

		};

		blue-sata {

			label = "cloudbox:blue:sata";

			gpios = <&gpio0 15 0>;

		};

	};



	gpio_poweroff {

		compatible = "gpio-poweroff";

		gpios = <&gpio0 17 0>;

	};

};

arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts

0 → 100644
+180 −0
Original line number Diff line number Diff line 
/dts-v1/;



/include/ "kirkwood.dtsi"

/include/ "kirkwood-6282.dtsi"



/ {

	model = "NETGEAR ReadyNAS Duo v2";

	compatible = "netgear,readynas-duo-v2", "netgear,readynas", "marvell,kirkwood-88f6282", "marvell,kirkwood";



	memory { /* 256 MB */

		device_type = "memory";

		reg = <0x00000000 0x10000000>;

	};



	chosen {

		bootargs = "console=ttyS0,115200n8 earlyprintk";

	};



	ocp@f1000000 {

		pinctrl: pinctrl@10000 {



			pinctrl-0 = < &pmx_uart0

				      &pmx_button_power

				      &pmx_button_backup

				      &pmx_button_reset

				      &pmx_led_blue_power

				      &pmx_led_blue_activity

				      &pmx_led_blue_disk1

				      &pmx_led_blue_disk2

				      &pmx_led_blue_backup >;

			pinctrl-names = "default";



			pmx_button_power: pmx-button-power {

				marvell,pins = "mpp47";

				marvell,function = "gpio";

			};

			pmx_button_backup: pmx-button-backup {

				marvell,pins = "mpp45";

				marvell,function = "gpio";

			};

			pmx_button_reset: pmx-button-reset {

				marvell,pins = "mpp13";

				marvell,function = "gpio";

			};

			pmx_led_blue_power: pmx-led-blue-power {

				marvell,pins = "mpp31";

				marvell,function = "gpio";

			};

			pmx_led_blue_activity: pmx-led-blue-activity {

				marvell,pins = "mpp38";

				marvell,function = "gpio";

			};

			pmx_led_blue_disk1: pmx-led-blue-disk1 {

				marvell,pins = "mpp23";

				marvell,function = "gpio";

			};

			pmx_led_blue_disk2: pmx-led-blue-disk2 {

				marvell,pins = "mpp22";

				marvell,function = "gpio";

			};

			pmx_led_blue_backup: pmx-led-blue-backup {

				marvell,pins = "mpp29";

				marvell,function = "gpio";

			};

		};



		i2c@11000 {

			status = "okay";



			rs5c372a: rs5c372a@32 {

				compatible = "ricoh,rs5c372a";

				reg = <0x32>;

			};

		};



		serial@12000 {

			status = "okay";

		};



		nand@3000000 {

			status = "okay";



			partition@0 {

				label = "u-boot";

				reg = <0x0000000 0x180000>;

				read-only;

			};



			partition@180000 {

				label = "u-boot-env";

				reg = <0x180000 0x20000>;

			};



			partition@200000 {

				label = "uImage";

				reg = <0x0200000 0x600000>;

			};



			partition@800000 {

				label = "minirootfs";

				reg = <0x0800000 0x1000000>;

			};



			partition@1800000 {

				label = "jffs2";

				reg = <0x1800000 0x6800000>;

			};

		};



		sata@80000 {

			status = "okay";

			nr-ports = <2>;

		};

	};



	gpio-leds {

		compatible = "gpio-leds";



		power_led {

			label = "status:blue:power_led";

			gpios = <&gpio0 31 1>;   /* GPIO 31 Active Low */

			linux,default-trigger = "default-on";

		};

		activity_led {

			label = "status:blue:activity_led";

			gpios = <&gpio1 6 1>;    /* GPIO 38 Active Low */

		};

		disk1_led {

			label = "status:blue:disk1_led";

			gpios = <&gpio0 23 1>;   /* GPIO 23 Active Low */

		};

		disk2_led {

			label = "status:blue:disk2_led";

			gpios = <&gpio0 22 1>;   /* GPIO 22 Active Low */

		};

		backup_led {

			label = "status:blue:backup_led";

			gpios = <&gpio0 29 1>;   /* GPIO 29 Active Low*/

		};

	};



	gpio_keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;

		button@1 {

			label = "Power Button";

			linux,code = <116>;     /* KEY_POWER */

			gpios = <&gpio1 15 1>;

		};

		button@2 {

			label = "Reset Button";

			linux,code = <0x198>;   /* KEY_RESTART */

			gpios = <&gpio0 13 1>;

		};

		button@3 {

			label = "Backup Button";

			linux,code = <133>;     /* KEY_COPY */

			gpios = <&gpio1 13 1>;

		};

	};



        regulators {

                compatible = "simple-bus";

                #address-cells = <1>;

                #size-cells = <0>;



                usb_power: regulator@1 {

                        compatible = "regulator-fixed";

                        reg = <1>;

                        regulator-name = "USB 3.0 Power";

                        regulator-min-microvolt = <5000000>;

                        regulator-max-microvolt = <5000000>;

                        enable-active-high;

                        regulator-always-on;

                        regulator-boot-on;

                        gpio = <&gpio1 14 0>;

                };

        };

};