Commit 2ac9d7aa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Driver specific changes

Again, a lot of platforms have changes in here: pxa, samsung, omap,
at91, imx, ...

* tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (54 commits)
  ARM: sa1100: clean up of the clock support
  ARM: pxa: add dummy clock for sa1100-rtc
  RTC: sa1100: support sa1100, pxa and mmp soc families
  RTC: sa1100: remove redundant code of setting alarm
  RTC: sa1100: Clean out ost register
  Input: zylonite-wm97xx - replace IRQ_GPIO() with gpio_to_irq()
  pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()
  ARM: EXYNOS: Modified files for SPI consolidation work
  ARM: S5P64X0: Enable SDHCI support
  ARM: S5P64X0: Add lookup of sdhci-s3c clocks using generic names
  ARM: S5P64X0: Add HSMMC setup for host Controller
  ARM: EXYNOS: Add USB OHCI support to ORIGEN board
  USB: Add Samsung Exynos OHCI diver
  ARM: EXYNOS: Add USB OHCI support to SMDKV310 board
  ARM: EXYNOS: Add USB OHCI device
  net: macb: fix build break with !CONFIG_OF
  i2c: tegra: Support DVC controller in device tree
  i2c: tegra: Add __devinit/exit to probe/remove
  net/at91_ether: use gpio_is_valid for phy IRQ line
  ARM: at91/net: add macb ethernet controller in 9g45/9g20 DT
  ...
parents 5ede3ceb dcf7ec5e

Documentation/devicetree/bindings/net/macb.txt

0 → 100644
+25 −0
Original line number Diff line number Diff line 
* Cadence MACB/GEM Ethernet controller



Required properties:

- compatible: Should be "cdns,[<chip>-]{macb|gem}"

  Use "cdns,at91sam9260-macb" Atmel at91sam9260 and at91sam9263 SoCs.

  Use "cdns,at32ap7000-macb" for other 10/100 usage or use the generic form: "cdns,macb".

  Use "cnds,pc302-gem" for Picochip picoXcell pc302 and later devices based on

  the Cadence GEM, or the generic form: "cdns,gem".

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

- interrupts: Should contain macb interrupt

- phy-mode: String, operation mode of the PHY interface.

  Supported values are: "mii", "rmii", "gmii", "rgmii".



Optional properties:

- local-mac-address: 6 bytes, mac address



Examples:



	macb0: ethernet@fffc4000 {

		compatible = "cdns,at32ap7000-macb";

		reg = <0xfffc4000 0x4000>;

		interrupts = <21>;

		phy-mode = "rmii";

		local-mac-address = [3a 0e 03 04 05 06];

	};

arch/arm/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -597,6 +597,7 @@ config ARCH_MMP 
	select ARCH_REQUIRE_GPIOLIB

	select CLKDEV_LOOKUP

	select GENERIC_CLOCKEVENTS

	select GPIO_PXA

	select HAVE_SCHED_CLOCK

	select TICK_ONESHOT

	select PLAT_PXA
@@ -682,6 +683,7 @@ config ARCH_PXA 
	select CLKSRC_MMIO

	select ARCH_REQUIRE_GPIOLIB

	select GENERIC_CLOCKEVENTS

	select GPIO_PXA

	select HAVE_SCHED_CLOCK

	select TICK_ONESHOT

	select PLAT_PXA
@@ -749,7 +751,7 @@ config ARCH_SA1100 
	select ARCH_HAS_CPUFREQ

	select CPU_FREQ

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	select CLKDEV_LOOKUP

	select HAVE_SCHED_CLOCK

	select TICK_ONESHOT

	select ARCH_REQUIRE_GPIOLIB

arch/arm/boot/dts/at91sam9g20.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -114,6 +114,13 @@ 
				atmel,use-dma-tx;

				status = "disabled";

			};



			macb0: ethernet@fffc4000 {

				compatible = "cdns,at32ap7000-macb", "cdns,macb";

				reg = <0xfffc4000 0x100>;

				interrupts = <21>;

				status = "disabled";

			};

		};

	};

};

arch/arm/boot/dts/at91sam9g45.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -101,6 +101,13 @@ 
				atmel,use-dma-tx;

				status = "disabled";

			};



			macb0: ethernet@fffbc000 {

				compatible = "cdns,at32ap7000-macb", "cdns,macb";

				reg = <0xfffbc000 0x100>;

				interrupts = <25>;

				status = "disabled";

			};

		};

	};

};

arch/arm/boot/dts/at91sam9m10g45ek.dts

+5 −0
Original line number Diff line number Diff line
@@ -30,6 +30,11 @@ 
			usart1: serial@fff90000 {

				status = "okay";

			};



			macb0: ethernet@fffbc000 {

				phy-mode = "rmii";

				status = "okay";

			};

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE