openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Some Nomadik Device Tree updates for the v3.14 cycle: 

- Drop 0x prefixes
 
 - Get rid of explicit GPIO management
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.15 (GNU/Linux)
 
 iQIcBAABAgAGBQJSq6K8AAoJEEEQszewGV1zFkkP/jZEnJ/pBEcdiCVZGc6UGcIk
 ITGpqkY6Baq9W3j4g8BINEcT1h8zPk/ZxICE+GpzgeKd3K2u00p44mMixZXVFHaI
 umP98AbzvTP3ZdBL+v93uNm5dTcIEG1jdvC8BsgJs80KsYv/6HKPvT2RfF1vfsri
 S2ZrbIlWXRGeCqERfctilOrGD0HUbAM7tD4LuiBd14LWfc40OswHjweUsKvqESj9
 DS3F6Eo9y1oZcdOZJ2zOqep61rBiuJ8yyQ/TGG1/fKcKDrS+pd21bOn4DKkq3OMw
 Of1OHvylxjiId060kgbEpBvRtH2GsjO4rd9jLzcuzg+/apSqoxHoYaRuWucOeTF3
 5PQ2FMjlkcRMJMZjNHg6v3I/OFy1KXiWpSN6IN7p/VgB7V9krNQFxruxS/bW/Mzu
 DTtvJV3YoNXVl5Krf9oEAjLn3mEn2SXKxlgtaMuvElQF2V1xZ4KzH0fvlJIpZJTn
 O38UoalNDJKJDZ/Db+TnNmFN28ApoT+wXdUPRRuyojhwcHwmNMuqEwGP1Jtjc9ts
 yFEH6Hohdli0Uvgfj4lBU2pZIRqq2qIIehLJ/MyO4sCN4BNV5ZJRynDLmbCQ4DXM
 H2gJxvm6pY3ORN+Ry2ii4PXmvmc3X5ihU6ejVXtfyO77ZD81Z8fcRqiH5iFqNJ0/
 +Tzr9G+dE5DFOv+Jw2Ml
 =QVcj
 -----END PGP SIGNATURE-----

Merge tag 'nomadik-dt-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/dt

From Linus Walleij:
Some Nomadik Device Tree updates for the v3.14 cycle:

- Drop 0x prefixes

- Get rid of explicit GPIO management

* tag 'nomadik-dt-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: nomadik: get rid of explicit ethernet GPIO management
  ARM: nomadik: Remove '0x's from nomadik stn8815 DTS file
This commit is contained in:
Kevin Hilman 2013-12-19 07:24:35 -08:00
parent e7b4a8dfc8 6568eccd10
commit 1cfe0874c1
3 changed files with 2 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/boot/dts/ste-nomadik-s8815.dts
View File

@ -67,10 +67,6 @@ user_button_default_cfg {
/* Custom board node with GPIO pins to active etc */
usb-s8815 {
/* The S8815 is using this very GPIO pin for the SMSC91x IRQs */
ethernet-gpio {
gpios = <&gpio3 8 0x1>;
};
/* This will bias the MMC/SD card detect line */
mmcsd-gpio {
gpios = <&gpio3 16 0x1>;

4
arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
View File

@ -769,14 +769,14 @@ amba {
#size-cells = <1>;
ranges;
vica: intc@0x10140000 {
vica: intc@10140000 {
compatible = "arm,versatile-vic";
interrupt-controller;
#interrupt-cells = <1>;
reg = <0x10140000 0x20>;
};
vicb: intc@0x10140020 {
vicb: intc@10140020 {
compatible = "arm,versatile-vic";
interrupt-controller;
#interrupt-cells = <1>;

32
arch/arm/mach-nomadik/cpu-8815.c
View File

@ -109,38 +109,6 @@ static void cpu8815_restart(enum reboot_mode mode, const char *cmd)
writel(1, srcbase + 0x18);
}
/*
* The SMSC911x IRQ is connected to a GPIO pin, but the driver expects
* to simply request an IRQ passed as a resource. So the GPIO pin needs
* to be requested by this hog and set as input.
*/
static int __init cpu8815_eth_init(void)
{
struct device_node *eth;
int gpio, irq, err;
eth = of_find_node_by_path("/usb-s8815/ethernet-gpio");
if (!eth) {
pr_info("could not find any ethernet GPIO\n");
return 0;
}
gpio = of_get_gpio(eth, 0);
err = gpio_request(gpio, "eth_irq");
if (err) {
pr_info("failed to request ethernet GPIO\n");
return -ENODEV;
}
err = gpio_direction_input(gpio);
if (err) {
pr_info("failed to set ethernet GPIO as input\n");
return -ENODEV;
}
irq = gpio_to_irq(gpio);
pr_info("enabled USB-S8815 ethernet GPIO %d, IRQ %d\n", gpio, irq);
return 0;
}
device_initcall(cpu8815_eth_init);
/*
* This GPIO pin turns on a line that is used to detect card insertion
* on this board.